Update to 2.4.1

ok jasper@, matthieu@

81 files changed, 24857 insertions, 16122 deletions

diff --git a/dist/xkeyboard-config/Makefile.am b/dist/xkeyboard-config/Makefile.am
index e98117e8e..943539fc6 100644
--- a/dist/xkeyboard-config/Makefile.am
+++ b/dist/xkeyboard-config/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs
+SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs man
 
 pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = xkeyboard-config.pc
diff --git a/dist/xkeyboard-config/Makefile.in b/dist/xkeyboard-config/Makefile.in
index 54b5570a9..8f7feb69e 100644
--- a/dist/xkeyboard-config/Makefile.in
+++ b/dist/xkeyboard-config/Makefile.in
@@ -32,12 +32,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/xkeyboard-config.pc.in \
 	$(srcdir)/xkeyboard-config.spec.in $(top_srcdir)/configure \
-	ABOUT-NLS AUTHORS COPYING ChangeLog NEWS TODO config.rpath \
-	install-sh missing
+	ABOUT-NLS AUTHORS COPYING ChangeLog NEWS TODO config.guess \
+	config.rpath config.sub install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -124,8 +126,12 @@ GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -143,11 +149,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -166,9 +176,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -190,6 +205,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -197,6 +213,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -208,14 +226,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -242,7 +268,7 @@ top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs
+SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs man
 pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = xkeyboard-config.pc
 EXTRA_DIST = config.rpath COPYING CREDITS README \
diff --git a/dist/xkeyboard-config/NEWS b/dist/xkeyboard-config/NEWS
index 98ac6c05c..00ae0db79 100644
--- a/dist/xkeyboard-config/NEWS
+++ b/dist/xkeyboard-config/NEWS
@@ -1,3 +1,5 @@
+2.4.1	Critical bug fixed: many Ctl+Alt combinations broken
+2.4	9 bugs fixed, a number of translations updated
 2.3	First scheduled (and reasonably polished) release since GNOME3.
 	Serious cleanup of descriptions
 	18 bugfixes, updated translations
diff --git a/dist/xkeyboard-config/aclocal.m4 b/dist/xkeyboard-config/aclocal.m4
index 5f77e7426..72a108021 100644
--- a/dist/xkeyboard-config/aclocal.m4
+++ b/dist/xkeyboard-config/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.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 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'.])])
@@ -707,7 +707,8 @@ AC_DEFUN([AM_NLS],
 # ----------------------------------
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -753,7 +754,8 @@ m4_define([_PKG_CONFIG],
     pkg_cv_[]$1="$$1"
  elif test -n "$PKG_CONFIG"; then
     PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
 		     [pkg_failed=yes])
  else
     pkg_failed=untried
@@ -801,9 +803,9 @@ if test $pkg_failed = yes; then
    	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -837,6 +839,1555 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
+dnl xorg-macros.m4.  Generated from xorg-macros.m4.in xorgversion.m4 by configure.
+dnl
+dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+dnl 
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the "Software"),
+dnl to deal in the Software without restriction, including without limitation
+dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
+dnl and/or sell copies of the Software, and to permit persons to whom the
+dnl Software is furnished to do so, subject to the following conditions:
+dnl
+dnl The above copyright notice and this permission notice (including the next
+dnl paragraph) shall be included in all copies or substantial portions of the
+dnl Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+dnl DEALINGS IN THE SOFTWARE.
+
+# XORG_MACROS_VERSION(required-version)
+# -------------------------------------
+# Minimum version: 1.1.0
+#
+# If you're using a macro added in Version 1.1 or newer, include this in
+# your configure.ac with the minimum required version, such as:
+# XORG_MACROS_VERSION(1.1)
+#
+# To ensure that this macro is defined, also add:
+# m4_ifndef([XORG_MACROS_VERSION],
+#     [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+#
+#
+# See the "minimum version" comment for each macro you use to see what 
+# version you require.
+m4_defun([XORG_MACROS_VERSION],[
+m4_define([vers_have], [1.15.0])
+m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
+m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
+m4_if(m4_cmp(maj_have, maj_needed), 0,,
+    [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
+m4_if(m4_version_compare(vers_have, [$1]), -1,
+    [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
+m4_undefine([vers_have])
+m4_undefine([maj_have])
+m4_undefine([maj_needed])
+]) # XORG_MACROS_VERSION
+
+# XORG_PROG_RAWCPP()
+# ------------------
+# Minimum version: 1.0.0
+#
+# Find cpp program and necessary flags for use in pre-processing text files
+# such as man pages and config files
+AC_DEFUN([XORG_PROG_RAWCPP],[
+AC_REQUIRE([AC_PROG_CPP])
+AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], 
+   [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
+
+# Check for flag to avoid builtin definitions - assumes unix is predefined,
+# which is not the best choice for supporting other OS'es, but covers most
+# of the ones we need for now.
+AC_MSG_CHECKING([if $RAWCPP requires -undef])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])])
+if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
+	AC_MSG_RESULT([no])
+else
+	if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
+		RAWCPPFLAGS=-undef
+		AC_MSG_RESULT([yes])
+	# under Cygwin unix is still defined even with -undef
+	elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
+		RAWCPPFLAGS="-undef -ansi"
+		AC_MSG_RESULT([yes, with -ansi])
+	else
+		AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef.  I don't know what to do.])
+	fi
+fi
+rm -f conftest.$ac_ext
+
+AC_MSG_CHECKING([if $RAWCPP requires -traditional])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve   "whitespace"?]])])
+if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
+	AC_MSG_RESULT([no])
+else
+	if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
+		RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional.  I don't know what to do.])
+	fi
+fi
+rm -f conftest.$ac_ext
+AC_SUBST(RAWCPPFLAGS)
+]) # XORG_PROG_RAWCPP
+
+# XORG_MANPAGE_SECTIONS()
+# -----------------------
+# Minimum version: 1.0.0
+#
+# Determine which sections man pages go in for the different man page types
+# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
+# Not sure if there's any better way than just hardcoding by OS name.
+# Override default settings by setting environment variables
+# Added MAN_SUBSTS in version 1.8
+# Added AC_PROG_SED in version 1.8
+
+AC_DEFUN([XORG_MANPAGE_SECTIONS],[
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_SED])
+
+if test x$APP_MAN_SUFFIX = x    ; then
+    APP_MAN_SUFFIX=1
+fi
+if test x$APP_MAN_DIR = x    ; then
+    APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
+fi
+
+if test x$LIB_MAN_SUFFIX = x    ; then
+    LIB_MAN_SUFFIX=3
+fi
+if test x$LIB_MAN_DIR = x    ; then
+    LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
+fi
+
+if test x$FILE_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	FILE_MAN_SUFFIX=4  ;;
+	*)		FILE_MAN_SUFFIX=5  ;;
+    esac
+fi
+if test x$FILE_MAN_DIR = x    ; then
+    FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
+fi
+
+if test x$MISC_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	MISC_MAN_SUFFIX=5  ;;
+	*)		MISC_MAN_SUFFIX=7  ;;
+    esac
+fi
+if test x$MISC_MAN_DIR = x    ; then
+    MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
+fi
+
+if test x$DRIVER_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	DRIVER_MAN_SUFFIX=7  ;;
+	*)		DRIVER_MAN_SUFFIX=4  ;;
+    esac
+fi
+if test x$DRIVER_MAN_DIR = x    ; then
+    DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
+fi
+
+if test x$ADMIN_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	ADMIN_MAN_SUFFIX=1m ;;
+	*)		ADMIN_MAN_SUFFIX=8  ;;
+    esac
+fi
+if test x$ADMIN_MAN_DIR = x    ; then
+    ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
+fi
+
+
+AC_SUBST([APP_MAN_SUFFIX])
+AC_SUBST([LIB_MAN_SUFFIX])
+AC_SUBST([FILE_MAN_SUFFIX])
+AC_SUBST([MISC_MAN_SUFFIX])
+AC_SUBST([DRIVER_MAN_SUFFIX])
+AC_SUBST([ADMIN_MAN_SUFFIX])
+AC_SUBST([APP_MAN_DIR])
+AC_SUBST([LIB_MAN_DIR])
+AC_SUBST([FILE_MAN_DIR])
+AC_SUBST([MISC_MAN_DIR])
+AC_SUBST([DRIVER_MAN_DIR])
+AC_SUBST([ADMIN_MAN_DIR])
+
+XORG_MAN_PAGE="X Version 11"
+AC_SUBST([XORG_MAN_PAGE])
+MAN_SUBSTS="\
+	-e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
+	-e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
+	-e 's|__xservername__|Xorg|g' \
+	-e 's|__xconfigfile__|xorg.conf|g' \
+	-e 's|__projectroot__|\$(prefix)|g' \
+	-e 's|__apploaddir__|\$(appdefaultdir)|g' \
+	-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
+	-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
+	-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
+	-e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \
+	-e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \
+	-e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'"
+AC_SUBST([MAN_SUBSTS])
+
+]) # XORG_MANPAGE_SECTIONS
+
+# XORG_CHECK_SGML_DOCTOOLS([MIN-VERSION])
+# ------------------------
+# Minimum version: 1.7.0
+#
+# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent
+# provided by xorg-sgml-doctools, if installed.
+AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[
+AC_MSG_CHECKING([for X.Org SGML entities m4_ifval([$1],[>= $1])])
+XORG_SGML_PATH=
+PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])],
+    [XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`],
+    [m4_ifval([$1],[:],
+        [if test x"$cross_compiling" != x"yes" ; then
+            AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent],
+                          [XORG_SGML_PATH=$prefix/share/sgml])
+         fi])
+    ])
+
+# Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing
+# the path and the name of the doc stylesheet
+if test "x$XORG_SGML_PATH" != "x" ; then
+   AC_MSG_RESULT([$XORG_SGML_PATH])
+   STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11
+   XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl
+else
+   AC_MSG_RESULT([no])
+fi
+
+AC_SUBST(XORG_SGML_PATH)
+AC_SUBST(STYLESHEET_SRCDIR)
+AC_SUBST(XSL_STYLESHEET)
+AM_CONDITIONAL([HAVE_STYLESHEETS], [test "x$XSL_STYLESHEET" != "x"])
+]) # XORG_CHECK_SGML_DOCTOOLS
+
+# XORG_CHECK_LINUXDOC
+# -------------------
+# Minimum version: 1.0.0
+#
+# Defines the variable MAKE_TEXT if the necessary tools and
+# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt.
+# Whether or not the necessary tools and files are found can be checked
+# with the AM_CONDITIONAL "BUILD_LINUXDOC"
+AC_DEFUN([XORG_CHECK_LINUXDOC],[
+AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
+AC_REQUIRE([XORG_WITH_PS2PDF])
+
+AC_PATH_PROG(LINUXDOC, linuxdoc)
+
+AC_MSG_CHECKING([whether to build documentation])
+
+if test x$XORG_SGML_PATH != x && test x$LINUXDOC != x ; then
+   BUILDDOC=yes
+else
+   BUILDDOC=no
+fi
+
+AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes])
+
+AC_MSG_RESULT([$BUILDDOC])
+
+AC_MSG_CHECKING([whether to build pdf documentation])
+
+if test x$have_ps2pdf != xno && test x$BUILD_PDFDOC != xno; then
+   BUILDPDFDOC=yes
+else
+   BUILDPDFDOC=no
+fi
+
+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
+
+AC_MSG_RESULT([$BUILDPDFDOC])
+
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt -f"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
+MAKE_PDF="$PS2PDF"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC  -B html --split=0"
+
+AC_SUBST(MAKE_TEXT)
+AC_SUBST(MAKE_PS)
+AC_SUBST(MAKE_PDF)
+AC_SUBST(MAKE_HTML)
+]) # XORG_CHECK_LINUXDOC
+
+# XORG_CHECK_DOCBOOK
+# -------------------
+# Minimum version: 1.0.0
+#
+# Checks for the ability to build output formats from SGML DocBook source.
+# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC"
+# indicates whether the necessary tools and files are found and, if set,
+# $(MAKE_XXX) blah.sgml will produce blah.xxx.
+AC_DEFUN([XORG_CHECK_DOCBOOK],[
+AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
+
+BUILDTXTDOC=no
+BUILDPDFDOC=no
+BUILDPSDOC=no
+BUILDHTMLDOC=no
+
+AC_PATH_PROG(DOCBOOKPS, docbook2ps)
+AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
+AC_PATH_PROG(DOCBOOKHTML, docbook2html)
+AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
+
+AC_MSG_CHECKING([whether to build text documentation])
+if test x$XORG_SGML_PATH != x && test x$DOCBOOKTXT != x &&
+   test x$BUILD_TXTDOC != xno; then
+	BUILDTXTDOC=yes
+fi
+AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
+AC_MSG_RESULT([$BUILDTXTDOC])
+
+AC_MSG_CHECKING([whether to build PDF documentation])
+if test x$XORG_SGML_PATH != x && test x$DOCBOOKPDF != x &&
+   test x$BUILD_PDFDOC != xno; then
+	BUILDPDFDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
+AC_MSG_RESULT([$BUILDPDFDOC])
+
+AC_MSG_CHECKING([whether to build PostScript documentation])
+if test x$XORG_SGML_PATH != x && test x$DOCBOOKPS != x &&
+   test x$BUILD_PSDOC != xno; then
+	BUILDPSDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
+AC_MSG_RESULT([$BUILDPSDOC])
+
+AC_MSG_CHECKING([whether to build HTML documentation])
+if test x$XORG_SGML_PATH != x && test x$DOCBOOKHTML != x &&
+   test x$BUILD_HTMLDOC != xno; then
+	BUILDHTMLDOC=yes
+fi
+AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes])
+AC_MSG_RESULT([$BUILDHTMLDOC])
+
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS"
+MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML"
+
+AC_SUBST(MAKE_TEXT)
+AC_SUBST(MAKE_PS)
+AC_SUBST(MAKE_PDF)
+AC_SUBST(MAKE_HTML)
+]) # XORG_CHECK_DOCBOOK
+
+# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT])
+# ----------------
+# Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a module to test for the
+# presence of the tool and obtain it's path in separate variables. Coupled with
+# the --with-xmlto option, it allows maximum flexibilty in making decisions
+# as whether or not to use the xmlto package. When DEFAULT is not specified,
+# --with-xmlto assumes 'auto'.
+#
+# Interface to module:
+# HAVE_XMLTO: 	used in makefiles to conditionally generate documentation
+# XMLTO:	returns the path of the xmlto program found
+#		returns the path set by the user in the environment
+# --with-xmlto:	'yes' user instructs the module to use xmlto
+#		'no' user instructs the module not to use xmlto
+#
+# Added in version 1.10.0
+# HAVE_XMLTO_TEXT: used in makefiles to conditionally generate text documentation
+#                  xmlto for text output requires either lynx, links, or w3m browsers
+#
+# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_XMLTO],[
+AC_ARG_VAR([XMLTO], [Path to xmlto command])
+m4_define([_defopt], m4_default([$2], [auto]))
+AC_ARG_WITH(xmlto,
+	AS_HELP_STRING([--with-xmlto],
+	   [Use xmlto to regenerate documentation (default: ]_defopt[)]),
+	   [use_xmlto=$withval], [use_xmlto=]_defopt)
+m4_undefine([_defopt])
+
+if test "x$use_xmlto" = x"auto"; then
+   AC_PATH_PROG([XMLTO], [xmlto])
+   if test "x$XMLTO" = "x"; then
+        AC_MSG_WARN([xmlto not found - documentation targets will be skipped])
+	have_xmlto=no
+   else
+        have_xmlto=yes
+   fi
+elif test "x$use_xmlto" = x"yes" ; then
+   AC_PATH_PROG([XMLTO], [xmlto])
+   if test "x$XMLTO" = "x"; then
+        AC_MSG_ERROR([--with-xmlto=yes specified but xmlto not found in PATH])
+   fi
+   have_xmlto=yes
+elif test "x$use_xmlto" = x"no" ; then
+   if test "x$XMLTO" != "x"; then
+      AC_MSG_WARN([ignoring XMLTO environment variable since --with-xmlto=no was specified])
+   fi
+   have_xmlto=no
+else
+   AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no'])
+fi
+
+# Test for a minimum version of xmlto, if provided.
+m4_ifval([$1],
+[if test "$have_xmlto" = yes; then
+    # scrape the xmlto version
+    AC_MSG_CHECKING([the xmlto version])
+    xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3`
+    AC_MSG_RESULT([$xmlto_version])
+    AS_VERSION_COMPARE([$xmlto_version], [$1],
+        [if test "x$use_xmlto" = xauto; then
+            AC_MSG_WARN([xmlto version $xmlto_version found, but $1 needed])
+            have_xmlto=no
+        else
+            AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed])
+        fi])
+fi])
+
+# Test for the ability of xmlto to generate a text target
+have_xmlto_text=no
+cat > conftest.xml << "EOF"
+EOF
+AS_IF([test "$have_xmlto" = yes],
+      [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
+             [have_xmlto_text=yes],
+             [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
+rm -f conftest.xml
+AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
+AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
+]) # XORG_WITH_XMLTO
+
+# XORG_WITH_XSLTPROC([MIN-VERSION], [DEFAULT])
+# --------------------------------------------
+# Minimum version: 1.12.0
+# Minimum version for optional DEFAULT argument: 1.12.0
+#
+# XSLT (Extensible Stylesheet Language Transformations) is a declarative,
+# XML-based language used for the transformation of XML documents.
+# The xsltproc command line tool is for applying XSLT stylesheets to XML documents.
+# It is used under the cover by xmlto to generate html files from DocBook/XML.
+# The XSLT processor is often used as a standalone tool for transformations.
+# It should not be assumed that this tool is used only to work with documnetation.
+# When DEFAULT is not specified, --with-xsltproc assumes 'auto'.
+#
+# Interface to module:
+# HAVE_XSLTPROC: used in makefiles to conditionally generate documentation
+# XSLTPROC:	 returns the path of the xsltproc program found
+#		 returns the path set by the user in the environment
+# --with-xsltproc: 'yes' user instructs the module to use xsltproc
+#		  'no' user instructs the module not to use xsltproc
+# have_xsltproc: returns yes if xsltproc found in PATH or no
+#
+# If the user sets the value of XSLTPROC, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_XSLTPROC],[
+AC_ARG_VAR([XSLTPROC], [Path to xsltproc command])
+# Preserves the interface, should it be implemented later
+m4_ifval([$1], [m4_warn([syntax], [Checking for xsltproc MIN-VERSION is not implemented])])
+m4_define([_defopt], m4_default([$2], [auto]))
+AC_ARG_WITH(xsltproc,
+	AS_HELP_STRING([--with-xsltproc],
+	   [Use xsltproc for the transformation of XML documents (default: ]_defopt[)]),
+	   [use_xsltproc=$withval], [use_xsltproc=]_defopt)
+m4_undefine([_defopt])
+
+if test "x$use_xsltproc" = x"auto"; then
+   AC_PATH_PROG([XSLTPROC], [xsltproc])
+   if test "x$XSLTPROC" = "x"; then
+        AC_MSG_WARN([xsltproc not found - cannot transform XML documents])
+	have_xsltproc=no
+   else
+        have_xsltproc=yes
+   fi
+elif test "x$use_xsltproc" = x"yes" ; then
+   AC_PATH_PROG([XSLTPROC], [xsltproc])
+   if test "x$XSLTPROC" = "x"; then
+        AC_MSG_ERROR([--with-xsltproc=yes specified but xsltproc not found in PATH])
+   fi
+   have_xsltproc=yes
+elif test "x$use_xsltproc" = x"no" ; then
+   if test "x$XSLTPROC" != "x"; then
+      AC_MSG_WARN([ignoring XSLTPROC environment variable since --with-xsltproc=no was specified])
+   fi
+   have_xsltproc=no
+else
+   AC_MSG_ERROR([--with-xsltproc expects 'yes' or 'no'])
+fi
+
+AM_CONDITIONAL([HAVE_XSLTPROC], [test "$have_xsltproc" = yes])
+]) # XORG_WITH_XSLTPROC
+
+# XORG_WITH_PERL([MIN-VERSION], [DEFAULT])
+# ----------------------------------------
+# Minimum version: 1.15.0
+#
+# PERL (Practical Extraction and Report Language) is a language optimized for
+# scanning arbitrary text files, extracting information from those text files,
+# and printing reports based on that information.
+#
+# When DEFAULT is not specified, --with-perl assumes 'auto'.
+#
+# Interface to module:
+# HAVE_PERL: used in makefiles to conditionally scan text files
+# PERL:	     returns the path of the perl program found
+#	     returns the path set by the user in the environment
+# --with-perl: 'yes' user instructs the module to use perl
+#	       'no' user instructs the module not to use perl
+# have_perl: returns yes if perl found in PATH or no
+#
+# If the user sets the value of PERL, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_PERL],[
+AC_ARG_VAR([PERL], [Path to perl command])
+# Preserves the interface, should it be implemented later
+m4_ifval([$1], [m4_warn([syntax], [Checking for perl MIN-VERSION is not implemented])])
+m4_define([_defopt], m4_default([$2], [auto]))
+AC_ARG_WITH(perl,
+	AS_HELP_STRING([--with-perl],
+	   [Use perl for extracting information from files (default: ]_defopt[)]),
+	   [use_perl=$withval], [use_perl=]_defopt)
+m4_undefine([_defopt])
+
+if test "x$use_perl" = x"auto"; then
+   AC_PATH_PROG([PERL], [perl])
+   if test "x$PERL" = "x"; then
+        AC_MSG_WARN([perl not found - cannot extract information and report])
+	have_perl=no
+   else
+        have_perl=yes
+   fi
+elif test "x$use_perl" = x"yes" ; then
+   AC_PATH_PROG([PERL], [perl])
+   if test "x$PERL" = "x"; then
+        AC_MSG_ERROR([--with-perl=yes specified but perl not found in PATH])
+   fi
+   have_perl=yes
+elif test "x$use_perl" = x"no" ; then
+   if test "x$PERL" != "x"; then
+      AC_MSG_WARN([ignoring PERL environment variable since --with-perl=no was specified])
+   fi
+   have_perl=no
+else
+   AC_MSG_ERROR([--with-perl expects 'yes' or 'no'])
+fi
+
+AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes])
+]) # XORG_WITH_PERL
+
+# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT])
+# ----------------
+# Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a module to test for the
+# presence of the tool and obtain it's path in separate variables. Coupled with
+# the --with-asciidoc option, it allows maximum flexibilty in making decisions
+# as whether or not to use the asciidoc package. When DEFAULT is not specified,
+# --with-asciidoc assumes 'auto'.
+#
+# Interface to module:
+# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
+# ASCIIDOC:	 returns the path of the asciidoc program found
+#		 returns the path set by the user in the environment
+# --with-asciidoc: 'yes' user instructs the module to use asciidoc
+#		  'no' user instructs the module not to use asciidoc
+#
+# If the user sets the value of ASCIIDOC, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_ASCIIDOC],[
+AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
+m4_define([_defopt], m4_default([$2], [auto]))
+AC_ARG_WITH(asciidoc,
+	AS_HELP_STRING([--with-asciidoc],
+	   [Use asciidoc to regenerate documentation (default: ]_defopt[)]),
+	   [use_asciidoc=$withval], [use_asciidoc=]_defopt)
+m4_undefine([_defopt])
+
+if test "x$use_asciidoc" = x"auto"; then
+   AC_PATH_PROG([ASCIIDOC], [asciidoc])
+   if test "x$ASCIIDOC" = "x"; then
+        AC_MSG_WARN([asciidoc not found - documentation targets will be skipped])
+	have_asciidoc=no
+   else
+        have_asciidoc=yes
+   fi
+elif test "x$use_asciidoc" = x"yes" ; then
+   AC_PATH_PROG([ASCIIDOC], [asciidoc])
+   if test "x$ASCIIDOC" = "x"; then
+        AC_MSG_ERROR([--with-asciidoc=yes specified but asciidoc not found in PATH])
+   fi
+   have_asciidoc=yes
+elif test "x$use_asciidoc" = x"no" ; then
+   if test "x$ASCIIDOC" != "x"; then
+      AC_MSG_WARN([ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified])
+   fi
+   have_asciidoc=no
+else
+   AC_MSG_ERROR([--with-asciidoc expects 'yes' or 'no'])
+fi
+m4_ifval([$1],
+[if test "$have_asciidoc" = yes; then
+    # scrape the asciidoc version
+    AC_MSG_CHECKING([the asciidoc version])
+    asciidoc_version=`$ASCIIDOC --version 2>/dev/null | cut -d' ' -f2`
+    AC_MSG_RESULT([$asciidoc_version])
+    AS_VERSION_COMPARE([$asciidoc_version], [$1],
+        [if test "x$use_asciidoc" = xauto; then
+            AC_MSG_WARN([asciidoc version $asciidoc_version found, but $1 needed])
+            have_asciidoc=no
+        else
+            AC_MSG_ERROR([asciidoc version $asciidoc_version found, but $1 needed])
+        fi])
+fi])
+AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
+]) # XORG_WITH_ASCIIDOC
+
+# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
+# --------------------------------
+# Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a module to test for the
+# presence of the tool and obtain it's path in separate variables. Coupled with
+# the --with-doxygen option, it allows maximum flexibilty in making decisions
+# as whether or not to use the doxygen package. When DEFAULT is not specified,
+# --with-doxygen assumes 'auto'.
+#
+# Interface to module:
+# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
+# DOXYGEN:	 returns the path of the doxygen program found
+#		 returns the path set by the user in the environment
+# --with-doxygen: 'yes' user instructs the module to use doxygen
+#		  'no' user instructs the module not to use doxygen
+#
+# If the user sets the value of DOXYGEN, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_DOXYGEN],[
+AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
+m4_define([_defopt], m4_default([$2], [auto]))
+AC_ARG_WITH(doxygen,
+	AS_HELP_STRING([--with-doxygen],
+	   [Use doxygen to regenerate documentation (default: ]_defopt[)]),
+	   [use_doxygen=$withval], [use_doxygen=]_defopt)
+m4_undefine([_defopt])
+
+if test "x$use_doxygen" = x"auto"; then
+   AC_PATH_PROG([DOXYGEN], [doxygen])
+   if test "x$DOXYGEN" = "x"; then
+        AC_MSG_WARN([doxygen not found - documentation targets will be skipped])
+	have_doxygen=no
+   else
+        have_doxygen=yes
+   fi
+elif test "x$use_doxygen" = x"yes" ; then
+   AC_PATH_PROG([DOXYGEN], [doxygen])
+   if test "x$DOXYGEN" = "x"; then
+        AC_MSG_ERROR([--with-doxygen=yes specified but doxygen not found in PATH])
+   fi
+   have_doxygen=yes
+elif test "x$use_doxygen" = x"no" ; then
+   if test "x$DOXYGEN" != "x"; then
+      AC_MSG_WARN([ignoring DOXYGEN environment variable since --with-doxygen=no was specified])
+   fi
+   have_doxygen=no
+else
+   AC_MSG_ERROR([--with-doxygen expects 'yes' or 'no'])
+fi
+m4_ifval([$1],
+[if test "$have_doxygen" = yes; then
+    # scrape the doxygen version
+    AC_MSG_CHECKING([the doxygen version])
+    doxygen_version=`$DOXYGEN --version 2>/dev/null`
+    AC_MSG_RESULT([$doxygen_version])
+    AS_VERSION_COMPARE([$doxygen_version], [$1],
+        [if test "x$use_doxygen" = xauto; then
+            AC_MSG_WARN([doxygen version $doxygen_version found, but $1 needed])
+            have_doxygen=no
+        else
+            AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed])
+        fi])
+fi])
+AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
+]) # XORG_WITH_DOXYGEN
+
+# XORG_WITH_GROFF([DEFAULT])
+# ----------------
+# Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a module to test for the
+# presence of the tool and obtain it's path in separate variables. Coupled with
+# the --with-groff option, it allows maximum flexibilty in making decisions
+# as whether or not to use the groff package. When DEFAULT is not specified,
+# --with-groff assumes 'auto'.
+#
+# Interface to module:
+# HAVE_GROFF:	 used in makefiles to conditionally generate documentation
+# HAVE_GROFF_MM: the memorandum macros (-mm) package
+# HAVE_GROFF_MS: the -ms macros package
+# GROFF:	 returns the path of the groff program found
+#		 returns the path set by the user in the environment
+# --with-groff:	 'yes' user instructs the module to use groff
+#		 'no' user instructs the module not to use groff
+#
+# Added in version 1.9.0:
+# HAVE_GROFF_HTML: groff has dependencies to output HTML format:
+#		   pnmcut pnmcrop pnmtopng pnmtops from the netpbm package.
+#		   psselect from the psutils package.
+#		   the ghostcript package. Refer to the grohtml man pages
+#
+# If the user sets the value of GROFF, AC_PATH_PROG skips testing the path.
+#
+# OS and distros often splits groff in a basic and full package, the former
+# having the groff program and the later having devices, fonts and macros
+# Checking for the groff executable is not enough.
+#
+# If macros are missing, we cannot assume that groff is useless, so we don't
+# unset HAVE_GROFF or GROFF env variables.
+# HAVE_GROFF_?? can never be true while HAVE_GROFF is false.
+#
+AC_DEFUN([XORG_WITH_GROFF],[
+AC_ARG_VAR([GROFF], [Path to groff command])
+m4_define([_defopt], m4_default([$1], [auto]))
+AC_ARG_WITH(groff,
+	AS_HELP_STRING([--with-groff],
+	   [Use groff to regenerate documentation (default: ]_defopt[)]),
+	   [use_groff=$withval], [use_groff=]_defopt)
+m4_undefine([_defopt])
+
+if test "x$use_groff" = x"auto"; then
+   AC_PATH_PROG([GROFF], [groff])
+   if test "x$GROFF" = "x"; then
+        AC_MSG_WARN([groff not found - documentation targets will be skipped])
+	have_groff=no
+   else
+        have_groff=yes
+   fi
+elif test "x$use_groff" = x"yes" ; then
+   AC_PATH_PROG([GROFF], [groff])
+   if test "x$GROFF" = "x"; then
+        AC_MSG_ERROR([--with-groff=yes specified but groff not found in PATH])
+   fi
+   have_groff=yes
+elif test "x$use_groff" = x"no" ; then
+   if test "x$GROFF" != "x"; then
+      AC_MSG_WARN([ignoring GROFF environment variable since --with-groff=no was specified])
+   fi
+   have_groff=no
+else
+   AC_MSG_ERROR([--with-groff expects 'yes' or 'no'])
+fi
+
+# We have groff, test for the presence of the macro packages
+if test "x$have_groff" = x"yes"; then
+    AC_MSG_CHECKING([for ${GROFF} -ms macros])
+    if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then
+        groff_ms_works=yes
+    else
+        groff_ms_works=no
+    fi
+    AC_MSG_RESULT([$groff_ms_works])
+    AC_MSG_CHECKING([for ${GROFF} -mm macros])
+    if ${GROFF} -mm -I. /dev/null >/dev/null 2>&1 ; then
+        groff_mm_works=yes
+    else
+        groff_mm_works=no
+    fi
+    AC_MSG_RESULT([$groff_mm_works])
+fi
+
+# We have groff, test for HTML dependencies, one command per package
+if test "x$have_groff" = x"yes"; then
+   AC_PATH_PROGS(GS_PATH, [gs gswin32c])
+   AC_PATH_PROG(PNMTOPNG_PATH, [pnmtopng])
+   AC_PATH_PROG(PSSELECT_PATH, [psselect])
+   if test "x$GS_PATH" != "x" -a "x$PNMTOPNG_PATH" != "x" -a "x$PSSELECT_PATH" != "x"; then
+      have_groff_html=yes
+   else
+      have_groff_html=no
+      AC_MSG_WARN([grohtml dependencies not found - HTML Documentation skipped. Refer to grohtml man pages])
+   fi
+fi
+
+# Set Automake conditionals for Makefiles
+AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes])
+AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes])
+AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
+AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
+]) # XORG_WITH_GROFF
+
+# XORG_WITH_FOP([MIN-VERSION], [DEFAULT])
+# ---------------------------------------
+# Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
+# Minimum version for optional MIN-VERSION argument: 1.15.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a module to test for the
+# presence of the tool and obtain it's path in separate variables. Coupled with
+# the --with-fop option, it allows maximum flexibilty in making decisions
+# as whether or not to use the fop package. When DEFAULT is not specified,
+# --with-fop assumes 'auto'.
+#
+# Interface to module:
+# HAVE_FOP: 	used in makefiles to conditionally generate documentation
+# FOP:	 	returns the path of the fop program found
+#		returns the path set by the user in the environment
+# --with-fop: 	'yes' user instructs the module to use fop
+#		'no' user instructs the module not to use fop
+#
+# If the user sets the value of FOP, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_FOP],[
+AC_ARG_VAR([FOP], [Path to fop command])
+m4_define([_defopt], m4_default([$2], [auto]))
+AC_ARG_WITH(fop,
+	AS_HELP_STRING([--with-fop],
+	   [Use fop to regenerate documentation (default: ]_defopt[)]),
+	   [use_fop=$withval], [use_fop=]_defopt)
+m4_undefine([_defopt])
+
+if test "x$use_fop" = x"auto"; then
+   AC_PATH_PROG([FOP], [fop])
+   if test "x$FOP" = "x"; then
+        AC_MSG_WARN([fop not found - documentation targets will be skipped])
+	have_fop=no
+   else
+        have_fop=yes
+   fi
+elif test "x$use_fop" = x"yes" ; then
+   AC_PATH_PROG([FOP], [fop])
+   if test "x$FOP" = "x"; then
+        AC_MSG_ERROR([--with-fop=yes specified but fop not found in PATH])
+   fi
+   have_fop=yes
+elif test "x$use_fop" = x"no" ; then
+   if test "x$FOP" != "x"; then
+      AC_MSG_WARN([ignoring FOP environment variable since --with-fop=no was specified])
+   fi
+   have_fop=no
+else
+   AC_MSG_ERROR([--with-fop expects 'yes' or 'no'])
+fi
+
+# Test for a minimum version of fop, if provided.
+m4_ifval([$1],
+[if test "$have_fop" = yes; then
+    # scrape the fop version
+    AC_MSG_CHECKING([for fop minimum version])
+    fop_version=`$FOP -version 2>/dev/null | cut -d' ' -f3`
+    AC_MSG_RESULT([$fop_version])
+    AS_VERSION_COMPARE([$fop_version], [$1],
+        [if test "x$use_fop" = xauto; then
+            AC_MSG_WARN([fop version $fop_version found, but $1 needed])
+            have_fop=no
+        else
+            AC_MSG_ERROR([fop version $fop_version found, but $1 needed])
+        fi])
+fi])
+AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
+]) # XORG_WITH_FOP
+
+# XORG_WITH_PS2PDF([DEFAULT])
+# ----------------
+# Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a module to test for the
+# presence of the tool and obtain it's path in separate variables. Coupled with
+# the --with-ps2pdf option, it allows maximum flexibilty in making decisions
+# as whether or not to use the ps2pdf package. When DEFAULT is not specified,
+# --with-ps2pdf assumes 'auto'.
+#
+# Interface to module:
+# HAVE_PS2PDF: 	used in makefiles to conditionally generate documentation
+# PS2PDF:	returns the path of the ps2pdf program found
+#		returns the path set by the user in the environment
+# --with-ps2pdf: 'yes' user instructs the module to use ps2pdf
+#		 'no' user instructs the module not to use ps2pdf
+#
+# If the user sets the value of PS2PDF, AC_PATH_PROG skips testing the path.
+#
+AC_DEFUN([XORG_WITH_PS2PDF],[
+AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
+m4_define([_defopt], m4_default([$1], [auto]))
+AC_ARG_WITH(ps2pdf,
+	AS_HELP_STRING([--with-ps2pdf],
+	   [Use ps2pdf to regenerate documentation (default: ]_defopt[)]),
+	   [use_ps2pdf=$withval], [use_ps2pdf=]_defopt)
+m4_undefine([_defopt])
+
+if test "x$use_ps2pdf" = x"auto"; then
+   AC_PATH_PROG([PS2PDF], [ps2pdf])
+   if test "x$PS2PDF" = "x"; then
+        AC_MSG_WARN([ps2pdf not found - documentation targets will be skipped])
+	have_ps2pdf=no
+   else
+        have_ps2pdf=yes
+   fi
+elif test "x$use_ps2pdf" = x"yes" ; then
+   AC_PATH_PROG([PS2PDF], [ps2pdf])
+   if test "x$PS2PDF" = "x"; then
+        AC_MSG_ERROR([--with-ps2pdf=yes specified but ps2pdf not found in PATH])
+   fi
+   have_ps2pdf=yes
+elif test "x$use_ps2pdf" = x"no" ; then
+   if test "x$PS2PDF" != "x"; then
+      AC_MSG_WARN([ignoring PS2PDF environment variable since --with-ps2pdf=no was specified])
+   fi
+   have_ps2pdf=no
+else
+   AC_MSG_ERROR([--with-ps2pdf expects 'yes' or 'no'])
+fi
+AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
+]) # XORG_WITH_PS2PDF
+
+# XORG_ENABLE_DOCS (enable_docs=yes)
+# ----------------
+# Minimum version: 1.6.0
+#
+# Documentation tools are not always available on all platforms and sometimes
+# not at the appropriate level. This macro enables a builder to skip all
+# documentation targets except traditional man pages.
+# Combined with the specific tool checking macros XORG_WITH_*, it provides
+# maximum flexibilty in controlling documentation building.
+# Refer to:
+# XORG_WITH_XMLTO         --with-xmlto
+# XORG_WITH_ASCIIDOC      --with-asciidoc
+# XORG_WITH_DOXYGEN       --with-doxygen
+# XORG_WITH_FOP           --with-fop
+# XORG_WITH_GROFF         --with-groff
+# XORG_WITH_PS2PDF        --with-ps2pdf
+#
+# Interface to module:
+# ENABLE_DOCS: 	  used in makefiles to conditionally generate documentation
+# --enable-docs: 'yes' user instructs the module to generate docs
+#		 'no' user instructs the module not to generate docs
+# parm1:	specify the default value, yes or no.
+#
+AC_DEFUN([XORG_ENABLE_DOCS],[
+m4_define([docs_default], m4_default([$1], [yes]))
+AC_ARG_ENABLE(docs,
+	AS_HELP_STRING([--enable-docs],
+	   [Enable building the documentation (default: ]docs_default[)]),
+	   [build_docs=$enableval], [build_docs=]docs_default)
+m4_undefine([docs_default])
+AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
+AC_MSG_CHECKING([whether to build documentation])
+AC_MSG_RESULT([$build_docs])
+]) # XORG_ENABLE_DOCS
+
+# XORG_ENABLE_DEVEL_DOCS (enable_devel_docs=yes)
+# ----------------
+# Minimum version: 1.6.0
+#
+# This macro enables a builder to skip all developer documentation.
+# Combined with the specific tool checking macros XORG_WITH_*, it provides
+# maximum flexibilty in controlling documentation building.
+# Refer to:
+# XORG_WITH_XMLTO         --with-xmlto
+# XORG_WITH_ASCIIDOC      --with-asciidoc
+# XORG_WITH_DOXYGEN       --with-doxygen
+# XORG_WITH_FOP           --with-fop
+# XORG_WITH_GROFF         --with-groff
+# XORG_WITH_PS2PDF        --with-ps2pdf
+#
+# Interface to module:
+# ENABLE_DEVEL_DOCS:	used in makefiles to conditionally generate developer docs
+# --enable-devel-docs:	'yes' user instructs the module to generate developer docs
+#			'no' user instructs the module not to generate developer docs
+# parm1:		specify the default value, yes or no.
+#
+AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
+m4_define([devel_default], m4_default([$1], [yes]))
+AC_ARG_ENABLE(devel-docs,
+	AS_HELP_STRING([--enable-devel-docs],
+	   [Enable building the developer documentation (default: ]devel_default[)]),
+	   [build_devel_docs=$enableval], [build_devel_docs=]devel_default)
+m4_undefine([devel_default])
+AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
+AC_MSG_CHECKING([whether to build developer documentation])
+AC_MSG_RESULT([$build_devel_docs])
+]) # XORG_ENABLE_DEVEL_DOCS
+
+# XORG_ENABLE_SPECS (enable_specs=yes)
+# ----------------
+# Minimum version: 1.6.0
+#
+# This macro enables a builder to skip all functional specification targets.
+# Combined with the specific tool checking macros XORG_WITH_*, it provides
+# maximum flexibilty in controlling documentation building.
+# Refer to:
+# XORG_WITH_XMLTO         --with-xmlto
+# XORG_WITH_ASCIIDOC      --with-asciidoc
+# XORG_WITH_DOXYGEN       --with-doxygen
+# XORG_WITH_FOP           --with-fop
+# XORG_WITH_GROFF         --with-groff
+# XORG_WITH_PS2PDF        --with-ps2pdf
+#
+# Interface to module:
+# ENABLE_SPECS:		used in makefiles to conditionally generate specs
+# --enable-specs:	'yes' user instructs the module to generate specs
+#			'no' user instructs the module not to generate specs
+# parm1:		specify the default value, yes or no.
+#
+AC_DEFUN([XORG_ENABLE_SPECS],[
+m4_define([spec_default], m4_default([$1], [yes]))
+AC_ARG_ENABLE(specs,
+	AS_HELP_STRING([--enable-specs],
+	   [Enable building the specs (default: ]spec_default[)]),
+	   [build_specs=$enableval], [build_specs=]spec_default)
+m4_undefine([spec_default])
+AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
+AC_MSG_CHECKING([whether to build functional specifications])
+AC_MSG_RESULT([$build_specs])
+]) # XORG_ENABLE_SPECS
+
+# XORG_ENABLE_UNIT_TESTS (enable_unit_tests=auto)
+# ----------------------------------------------
+# Minimum version: 1.13.0
+#
+# This macro enables a builder to enable/disable unit testing
+# It makes no assumption about the test cases implementation
+# Test cases may or may not use Automake "Support for test suites"
+# They may or may not use the software utility library GLib
+#
+# When used in conjunction with XORG_WITH_GLIB, use both AM_CONDITIONAL
+# ENABLE_UNIT_TESTS and HAVE_GLIB. Not all unit tests may use glib.
+# The variable enable_unit_tests is used by other macros in this file.
+#
+# Interface to module:
+# ENABLE_UNIT_TESTS:	used in makefiles to conditionally build tests
+# enable_unit_tests:    used in configure.ac for additional configuration
+# --enable-unit-tests:	'yes' user instructs the module to build tests
+#			'no' user instructs the module not to build tests
+# parm1:		specify the default value, yes or no.
+#
+AC_DEFUN([XORG_ENABLE_UNIT_TESTS],[
+AC_BEFORE([$0], [XORG_WITH_GLIB])
+AC_BEFORE([$0], [XORG_LD_WRAP])
+m4_define([_defopt], m4_default([$1], [auto]))
+AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests],
+	[Enable building unit test cases (default: ]_defopt[)]),
+	[enable_unit_tests=$enableval], [enable_unit_tests=]_defopt)
+m4_undefine([_defopt])
+AM_CONDITIONAL(ENABLE_UNIT_TESTS, [test "x$enable_unit_tests" != xno])
+AC_MSG_CHECKING([whether to build unit test cases])
+AC_MSG_RESULT([$enable_unit_tests])
+]) # XORG_ENABLE_UNIT_TESTS
+
+# XORG_WITH_GLIB([MIN-VERSION], [DEFAULT])
+# ----------------------------------------
+# Minimum version: 1.13.0
+#
+# GLib is a library which provides advanced data structures and functions.
+# This macro enables a module to test for the presence of Glib.
+#
+# When used with ENABLE_UNIT_TESTS, it is assumed GLib is used for unit testing.
+# Otherwise the value of $enable_unit_tests is blank.
+#
+# Interface to module:
+# HAVE_GLIB: used in makefiles to conditionally build targets
+# with_glib: used in configure.ac to know if GLib has been found
+# --with-glib:	'yes' user instructs the module to use glib
+#		'no' user instructs the module not to use glib
+#
+AC_DEFUN([XORG_WITH_GLIB],[
+AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+m4_define([_defopt], m4_default([$2], [auto]))
+AC_ARG_WITH(glib, AS_HELP_STRING([--with-glib],
+	[Use GLib library for unit testing (default: ]_defopt[)]),
+	[with_glib=$withval], [with_glib=]_defopt)
+m4_undefine([_defopt])
+
+have_glib=no
+# Do not probe GLib if user explicitly disabled unit testing
+if test "x$enable_unit_tests" != x"no"; then
+  # Do not probe GLib if user explicitly disabled it
+  if test "x$with_glib" != x"no"; then
+    m4_ifval(
+      [$1],
+      [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $1], [have_glib=yes], [have_glib=no])],
+      [PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no])]
+    )
+  fi
+fi
+
+# Not having GLib when unit testing has been explicitly requested is an error
+if test "x$enable_unit_tests" = x"yes"; then
+  if test "x$have_glib" = x"no"; then
+    AC_MSG_ERROR([--enable-unit-tests=yes specified but glib-2.0 not found])
+  fi
+fi
+
+# Having unit testing disabled when GLib has been explicitly requested is an error
+if test "x$enable_unit_tests" = x"no"; then
+  if test "x$with_glib" = x"yes"; then
+    AC_MSG_ERROR([--enable-unit-tests=yes specified but glib-2.0 not found])
+  fi
+fi
+
+# Not having GLib when it has been explicitly requested is an error
+if test "x$with_glib" = x"yes"; then
+  if test "x$have_glib" = x"no"; then
+    AC_MSG_ERROR([--with-glib=yes specified but glib-2.0 not found])
+  fi
+fi
+
+AM_CONDITIONAL([HAVE_GLIB], [test "$have_glib" = yes])
+]) # XORG_WITH_GLIB
+
+# XORG_LD_WRAP
+# ------------
+# Minimum version: 1.13.0
+#
+# Check if linker supports -wrap, passed via compiler flags
+#
+# When used with ENABLE_UNIT_TESTS, it is assumed -wrap is used for unit testing.
+# Otherwise the value of $enable_unit_tests is blank.
+#
+AC_DEFUN([XORG_LD_WRAP],[
+XORG_CHECK_LINKER_FLAGS([-Wl,-wrap,exit],[have_ld_wrap=yes],[have_ld_wrap=no])
+# Not having ld wrap when unit testing has been explicitly requested is an error
+if test "x$enable_unit_tests" = x"yes"; then
+  if test "x$have_ld_wrap" = x"no"; then
+    AC_MSG_ERROR([--enable-unit-tests=yes specified but ld -wrap support is not available])
+  fi
+fi
+AM_CONDITIONAL([HAVE_LD_WRAP], [test "$have_ld_wrap" = yes])
+#
+]) # XORG_LD_WRAP
+
+# XORG_CHECK_LINKER_FLAGS
+# -----------------------
+# SYNOPSIS
+#
+#   XORG_CHECK_LINKER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE])
+#
+# DESCRIPTION
+#
+#   Check whether the given linker FLAGS work with the current language's
+#   linker, or whether they give an error.
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   NOTE: Based on AX_CHECK_COMPILER_FLAGS.
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Mike Frysinger <vapier@gentoo.org>
+#   Copyright (c) 2009 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2009 Matteo Frigo
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.#
+AC_DEFUN([XORG_CHECK_LINKER_FLAGS],
+[AC_MSG_CHECKING([whether the linker accepts $1])
+dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname:
+AS_LITERAL_IF([$1],
+  [AC_CACHE_VAL(AS_TR_SH(xorg_cv_linker_flags_[$1]), [
+      ax_save_FLAGS=$LDFLAGS
+      LDFLAGS="$1"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+        AS_TR_SH(xorg_cv_linker_flags_[$1])=yes,
+        AS_TR_SH(xorg_cv_linker_flags_[$1])=no)
+      LDFLAGS=$ax_save_FLAGS])],
+  [ax_save_FLAGS=$LDFLAGS
+   LDFLAGS="$1"
+   AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+     eval AS_TR_SH(xorg_cv_linker_flags_[$1])=yes,
+     eval AS_TR_SH(xorg_cv_linker_flags_[$1])=no)
+   LDFLAGS=$ax_save_FLAGS])
+eval xorg_check_linker_flags=$AS_TR_SH(xorg_cv_linker_flags_[$1])
+AC_MSG_RESULT($xorg_check_linker_flags)
+if test "x$xorg_check_linker_flags" = xyes; then
+	m4_default([$2], :)
+else
+	m4_default([$3], :)
+fi
+]) # XORG_CHECK_LINKER_FLAGS
+
+# XORG_CHECK_MALLOC_ZERO
+# ----------------------
+# Minimum version: 1.0.0
+#
+# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
+# malloc(0) returns NULL.  Packages should add one of these cflags to
+# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
+AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
+AC_ARG_ENABLE(malloc0returnsnull,
+	AS_HELP_STRING([--enable-malloc0returnsnull],
+		       [malloc(0) returns NULL (default: auto)]),
+	[MALLOC_ZERO_RETURNS_NULL=$enableval],
+	[MALLOC_ZERO_RETURNS_NULL=auto])
+
+AC_MSG_CHECKING([whether malloc(0) returns NULL])
+if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
+	AC_RUN_IFELSE([AC_LANG_PROGRAM([
+#include <stdlib.h>
+],[
+    char *m0, *r0, *c0, *p;
+    m0 = malloc(0);
+    p = malloc(10);
+    r0 = realloc(p,0);
+    c0 = calloc(0,10);
+    exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1);
+])],
+		[MALLOC_ZERO_RETURNS_NULL=yes],
+		[MALLOC_ZERO_RETURNS_NULL=no],
+		[MALLOC_ZERO_RETURNS_NULL=yes])
+fi
+AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
+
+if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then
+	MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL"
+	XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS
+	XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC"
+else
+	MALLOC_ZERO_CFLAGS=""
+	XMALLOC_ZERO_CFLAGS=""
+	XTMALLOC_ZERO_CFLAGS=""
+fi
+
+AC_SUBST([MALLOC_ZERO_CFLAGS])
+AC_SUBST([XMALLOC_ZERO_CFLAGS])
+AC_SUBST([XTMALLOC_ZERO_CFLAGS])
+]) # XORG_CHECK_MALLOC_ZERO
+
+# XORG_WITH_LINT()
+# ----------------
+# Minimum version: 1.1.0
+#
+# This macro enables the use of a tool that flags some suspicious and
+# non-portable constructs (likely to be bugs) in C language source code.
+# It will attempt to locate the tool and use appropriate options.
+# There are various lint type tools on different platforms.
+#
+# Interface to module:
+# LINT:		returns the path to the tool found on the platform
+#		or the value set to LINT on the configure cmd line
+#		also an Automake conditional
+# LINT_FLAGS:	an Automake variable with appropriate flags
+#
+# --with-lint:	'yes' user instructs the module to use lint
+#		'no' user instructs the module not to use lint (default)
+#
+# If the user sets the value of LINT, AC_PATH_PROG skips testing the path.
+# If the user sets the value of LINT_FLAGS, they are used verbatim.
+#
+AC_DEFUN([XORG_WITH_LINT],[
+
+AC_ARG_VAR([LINT], [Path to a lint-style command])
+AC_ARG_VAR([LINT_FLAGS], [Flags for the lint-style command])
+AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
+		[Use a lint-style source code checker (default: disabled)])],
+		[use_lint=$withval], [use_lint=no])
+
+# Obtain platform specific info like program name and options
+# The lint program on FreeBSD and NetBSD is different from the one on Solaris
+case $host_os in
+  *linux* | *openbsd* | kfreebsd*-gnu | darwin* | cygwin*)
+	lint_name=splint
+	lint_options="-badflag"
+	;;
+  *freebsd* | *netbsd*)
+	lint_name=lint
+	lint_options="-u -b"
+	;;
+  *solaris*)
+	lint_name=lint
+	lint_options="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
+	;;
+esac
+
+# Test for the presence of the program (either guessed by the code or spelled out by the user)
+if test "x$use_lint" = x"yes" ; then
+   AC_PATH_PROG([LINT], [$lint_name])
+   if test "x$LINT" = "x"; then
+        AC_MSG_ERROR([--with-lint=yes specified but lint-style tool not found in PATH])
+   fi
+elif test "x$use_lint" = x"no" ; then
+   if test "x$LINT" != "x"; then
+      AC_MSG_WARN([ignoring LINT environment variable since --with-lint=no was specified])
+   fi
+else
+   AC_MSG_ERROR([--with-lint expects 'yes' or 'no'. Use LINT variable to specify path.])
+fi
+
+# User supplied flags override default flags
+if test "x$LINT_FLAGS" != "x"; then
+   lint_options=$LINT_FLAGS
+fi
+
+AC_SUBST([LINT_FLAGS],[$lint_options])
+AM_CONDITIONAL(LINT, [test "x$LINT" != x])
+
+]) # XORG_WITH_LINT
+
+# XORG_LINT_LIBRARY(LIBNAME)
+# --------------------------
+# Minimum version: 1.1.0
+#
+# Sets up flags for building lint libraries for checking programs that call
+# functions in the library.
+#
+# Interface to module:
+# LINTLIB		- Automake variable with the name of lint library file to make
+# MAKE_LINT_LIB		- Automake conditional
+#
+# --enable-lint-library:  - 'yes' user instructs the module to created a lint library
+#			  - 'no' user instructs the module not to create a lint library (default)
+
+AC_DEFUN([XORG_LINT_LIBRARY],[
+AC_REQUIRE([XORG_WITH_LINT])
+AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
+	[Create lint library (default: disabled)])],
+	[make_lint_lib=$enableval], [make_lint_lib=no])
+
+if test "x$make_lint_lib" = x"yes" ; then
+   LINTLIB=llib-l$1.ln
+   if test "x$LINT" = "x"; then
+        AC_MSG_ERROR([Cannot make lint library without --with-lint])
+   fi
+elif test "x$make_lint_lib" != x"no" ; then
+   AC_MSG_ERROR([--enable-lint-library expects 'yes' or 'no'.])
+fi
+
+AC_SUBST(LINTLIB)
+AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
+
+]) # XORG_LINT_LIBRARY
+
+# XORG_COMPILER_BRAND
+# -------------------
+# Minimum version: 1.14.0
+#
+# Checks for various brands of compilers and sets flags as appropriate:
+#   GNU gcc - relies on AC_PROG_CC (via AC_PROG_CC_C99) to set GCC to "yes"
+#   clang compiler - sets CLANGCC to "yes"
+#   Intel compiler - sets INTELCC to "yes"
+#   Sun/Oracle Solaris Studio cc - sets SUNCC to "yes"
+#
+AC_DEFUN([XORG_COMPILER_BRAND], [
+AC_REQUIRE([AC_PROG_CC_C99])
+AC_CHECK_DECL([__clang__], [CLANGCC="yes"], [CLANGCC="no"])
+AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
+AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+]) # XORG_COMPILER_BRAND
+
+# XORG_CWARNFLAGS
+# ---------------
+# Minimum version: 1.2.0
+#
+# Defines CWARNFLAGS to enable C compiler warnings.
+#
+AC_DEFUN([XORG_CWARNFLAGS], [
+AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_COMPILER_BRAND])
+if  test "x$GCC" = xyes ; then
+    CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
+-Wbad-function-cast -Wformat=2"
+    case `$CC -dumpversion` in
+    3.4.* | 4.*)
+	CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
+	;;
+    esac
+else
+    if test "x$SUNCC" = "xyes"; then
+	CWARNFLAGS="-v"
+    fi
+fi
+AC_SUBST(CWARNFLAGS)
+]) # XORG_CWARNFLAGS
+
+# XORG_STRICT_OPTION
+# -----------------------
+# Minimum version: 1.3.0
+#
+# Add configure option to enable strict compilation flags, such as treating
+# warnings as fatal errors.
+# If --enable-strict-compilation is passed to configure, adds strict flags to
+# $CWARNFLAGS.
+#
+# Starting in 1.14.0 also exports $STRICT_CFLAGS for use in other tests or
+# when strict compilation is unconditionally desired.
+AC_DEFUN([XORG_STRICT_OPTION], [
+# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
+AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_COMPILER_BRAND])
+AC_REQUIRE([XORG_CWARNFLAGS])
+
+AC_ARG_ENABLE(strict-compilation,
+			  AS_HELP_STRING([--enable-strict-compilation],
+			  [Enable all warnings from compiler and make them errors (default: disabled)]),
+			  [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
+if test "x$GCC" = xyes ; then
+    STRICT_CFLAGS="-pedantic -Werror"
+    # Add -Werror=attributes if supported (gcc 4.2 & later)
+    AC_MSG_CHECKING([if $CC supports -Werror=attributes])
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $STRICT_CFLAGS -Werror=attributes"
+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([return 0;])],
+		      [STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes"
+		       AC_MSG_RESULT([yes])],
+		      [AC_MSG_RESULT([no])])
+    CFLAGS="$save_CFLAGS"
+elif test "x$SUNCC" = "xyes"; then
+    STRICT_CFLAGS="-errwarn"
+elif test "x$INTELCC" = "xyes"; then
+    STRICT_CFLAGS="-Werror"
+fi
+if test "x$STRICT_COMPILE" = "xyes"; then
+    CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+fi
+AC_SUBST([STRICT_CFLAGS])
+AC_SUBST([CWARNFLAGS])
+]) # XORG_STRICT_OPTION
+
+# XORG_DEFAULT_OPTIONS
+# --------------------
+# Minimum version: 1.3.0
+#
+# Defines default options for X.Org modules.
+#
+AC_DEFUN([XORG_DEFAULT_OPTIONS], [
+AC_REQUIRE([AC_PROG_INSTALL])
+XORG_CWARNFLAGS
+XORG_STRICT_OPTION
+XORG_RELEASE_VERSION
+XORG_CHANGELOG
+XORG_INSTALL
+XORG_MANPAGE_SECTIONS
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
+    [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
+]) # XORG_DEFAULT_OPTIONS
+
+# XORG_INSTALL()
+# ----------------
+# Minimum version: 1.4.0
+#
+# Defines the variable INSTALL_CMD as the command to copy
+# INSTALL from $prefix/share/util-macros.
+#
+AC_DEFUN([XORG_INSTALL], [
+AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
+INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
+mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
+|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
+echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
+AC_SUBST([INSTALL_CMD])
+]) # XORG_INSTALL
+dnl Copyright 2005 Red Hat, Inc
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation.
+dnl
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or substantial portions of the Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name of the copyright holders shall
+dnl not be used in advertising or otherwise to promote the sale, use or
+dnl other dealings in this Software without prior written authorization
+dnl from the copyright holders.
+dnl
+
+# XORG_RELEASE_VERSION
+# --------------------
+# Defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
+ 
+AC_DEFUN([XORG_RELEASE_VERSION],[
+	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+		[`echo $PACKAGE_VERSION | cut -d . -f 1`],
+		[Major version of this package])
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
+	if test "x$PVM" = "x"; then
+		PVM="0"
+	fi
+	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+		[$PVM],
+		[Minor version of this package])
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
+	if test "x$PVP" = "x"; then
+		PVP="0"
+	fi
+	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+		[$PVP],
+		[Patch version of this package])
+])
+
+# XORG_CHANGELOG()
+# ----------------
+# Minimum version: 1.2.0
+#
+# Defines the variable CHANGELOG_CMD as the command to generate
+# ChangeLog from git.
+#
+#
+AC_DEFUN([XORG_CHANGELOG], [
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
+mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
+|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
+echo 'git directory not found: installing possibly empty changelog.' >&2)"
+AC_SUBST([CHANGELOG_CMD])
+]) # XORG_CHANGELOG
+
 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
diff --git a/dist/xkeyboard-config/compat/Makefile.in b/dist/xkeyboard-config/compat/Makefile.in
index 519879cf3..31780bf50 100644
--- a/dist/xkeyboard-config/compat/Makefile.in
+++ b/dist/xkeyboard-config/compat/Makefile.in
@@ -36,6 +36,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 DIST_COMMON = README $(dist_compat_DATA) $(dist_dir_DATA) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/xkbrules.am
@@ -74,8 +76,12 @@ am__installdirs = "$(DESTDIR)$(compatdir)" "$(DESTDIR)$(dirdir)"
 DATA = $(dist_compat_DATA) $(dist_dir_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -93,11 +99,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -116,9 +126,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -140,6 +155,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -147,6 +163,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -158,14 +176,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/compat/xfree86 b/dist/xkeyboard-config/compat/xfree86
index e08b0db20..cf4a8b22b 100644
--- a/dist/xkeyboard-config/compat/xfree86
+++ b/dist/xkeyboard-config/compat/xfree86
@@ -47,6 +47,13 @@ default partial xkb_compatibility "basic"  {
     interpret XF86_ClearGrab {
         action = Private(type=0x86, data="ClsGrb");
     };
+    interpret XF86LogGrabInfo {
+        action = Private(type=0x86, data="PrGrbs");
+    };
+    interpret XF86LogWindowTree {
+        action = Private(type=0x86, data="PrWins");
+    };
+
     interpret XF86_Next_VMode {
         action = Private(type=0x86, data="+VMode");
     };
diff --git a/dist/xkeyboard-config/config.guess b/dist/xkeyboard-config/config.guess
new file mode 100755
index 000000000..c2246a4f7
--- /dev/null
+++ b/dist/xkeyboard-config/config.guess
@@ -0,0 +1,1502 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
+
+timestamp='2009-12-30'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[456])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+        exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/dist/xkeyboard-config/config.sub b/dist/xkeyboard-config/config.sub
new file mode 100755
index 000000000..c2d125724
--- /dev/null
+++ b/dist/xkeyboard-config/config.sub
@@ -0,0 +1,1714 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
+
+timestamp='2010-01-22'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze)
+		os=
+		basic_machine=$1
+		;;
+        -bluegene*)
+	        os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nios | nios2 \
+	| ns16k | ns32k \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+		;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+        -os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+        -tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+        -nacl*)
+	        ;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+        mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+    	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/dist/xkeyboard-config/configure b/dist/xkeyboard-config/configure
index 302f7d726..13be689ac 100755
--- a/dist/xkeyboard-config/configure
+++ b/dist/xkeyboard-config/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for xkeyboard-config 2.3.
+# Generated by GNU Autoconf 2.68 for xkeyboard-config 2.4.1.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -89,6 +89,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -214,11 +215,18 @@ IFS=$as_save_IFS
   # 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.
+	# Preserve -v and -x to the replacement shell.
 	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+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -549,8 +557,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.3'
-PACKAGE_STRING='xkeyboard-config 2.3'
+PACKAGE_VERSION='2.4.1'
+PACKAGE_STRING='xkeyboard-config 2.4.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -668,6 +676,32 @@ PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
 XKBCOMP
+HAVE_XSLTPROC_FALSE
+HAVE_XSLTPROC_TRUE
+XSLTPROC
+MAN_SUBSTS
+XORG_MAN_PAGE
+ADMIN_MAN_DIR
+DRIVER_MAN_DIR
+MISC_MAN_DIR
+FILE_MAN_DIR
+LIB_MAN_DIR
+APP_MAN_DIR
+ADMIN_MAN_SUFFIX
+DRIVER_MAN_SUFFIX
+MISC_MAN_SUFFIX
+FILE_MAN_SUFFIX
+LIB_MAN_SUFFIX
+APP_MAN_SUFFIX
+SED
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -736,6 +770,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_maintainer_mode
+with_xsltproc
 with_xkb_base
 with_xkb_rules_symlink
 enable_compat_rules
@@ -746,6 +781,7 @@ enable_dependency_tracking
       ac_precious_vars='build_alias
 host_alias
 target_alias
+XSLTPROC
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
@@ -1161,7 +1197,7 @@ Try \`$0 --help' for more information"
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1299,7 +1335,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 2.3 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1361,12 +1397,16 @@ Program names:
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xkeyboard-config 2.3:";;
+     short | recursive ) echo "Configuration of xkeyboard-config 2.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1385,10 +1425,13 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-xsltproc         Use xsltproc for the transformation of XML documents
+                          (default: auto)
   --with-xkb-base=DIR     XKB base path [DATADIR/X11/xkb]
   --with-xkb-rules-symlink=NAME1(,NAME2)*        create symlink(s) to "old style" rules files (xfree86 and/or xorg)
 
 Some influential environment variables:
+  XSLTPROC    Path to xsltproc command
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
@@ -1471,8 +1514,8 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 2.3
-generated by GNU Autoconf 2.67
+xkeyboard-config configure 2.4.1
+generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1518,7 +1561,7 @@ 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;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1564,7 +1607,7 @@ fi
   # 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;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1577,7 +1620,7 @@ 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 eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1632,7 +1675,7 @@ 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;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
@@ -1668,7 +1711,7 @@ 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;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1710,7 +1753,7 @@ 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;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1723,10 +1766,10 @@ fi
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1789,7 +1832,7 @@ $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 eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1798,7 +1841,7 @@ 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;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1811,7 +1854,7 @@ 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 eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1829,15 +1872,15 @@ 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;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} 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 2.3, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+It was created by xkeyboard-config $as_me 2.4.1, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -2095,7 +2138,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2233,7 +2276,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 { $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 ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2320,11 +2363,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2410,7 +2453,7 @@ if test "$cross_compiling" != no; then
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $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 ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2450,7 +2493,7 @@ if test -z "$ac_cv_prog_STRIP"; then
 set dummy strip; ac_word=$2
 { $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 ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2503,7 +2546,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 { $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 ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2554,7 +2597,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $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 ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2594,7 +2637,7 @@ done
 $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 eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2652,7 +2695,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='2.3'
+ VERSION='2.4.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2716,13 +2759,452 @@ fi
 
 
 
+# Require X.Org macros 1.12 or later for XORG_WITH_XSLTPROC
+
+
+
+
+
+
+
+
+
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+
+
+
+
+if test x$APP_MAN_SUFFIX = x    ; then
+    APP_MAN_SUFFIX=1
+fi
+if test x$APP_MAN_DIR = x    ; then
+    APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
+fi
+
+if test x$LIB_MAN_SUFFIX = x    ; then
+    LIB_MAN_SUFFIX=3
+fi
+if test x$LIB_MAN_DIR = x    ; then
+    LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
+fi
+
+if test x$FILE_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	FILE_MAN_SUFFIX=4  ;;
+	*)		FILE_MAN_SUFFIX=5  ;;
+    esac
+fi
+if test x$FILE_MAN_DIR = x    ; then
+    FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
+fi
+
+if test x$MISC_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	MISC_MAN_SUFFIX=5  ;;
+	*)		MISC_MAN_SUFFIX=7  ;;
+    esac
+fi
+if test x$MISC_MAN_DIR = x    ; then
+    MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
+fi
+
+if test x$DRIVER_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	DRIVER_MAN_SUFFIX=7  ;;
+	*)		DRIVER_MAN_SUFFIX=4  ;;
+    esac
+fi
+if test x$DRIVER_MAN_DIR = x    ; then
+    DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
+fi
+
+if test x$ADMIN_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	ADMIN_MAN_SUFFIX=1m ;;
+	*)		ADMIN_MAN_SUFFIX=8  ;;
+    esac
+fi
+if test x$ADMIN_MAN_DIR = x    ; then
+    ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+XORG_MAN_PAGE="X Version 11"
+
+MAN_SUBSTS="\
+	-e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
+	-e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
+	-e 's|__xservername__|Xorg|g' \
+	-e 's|__xconfigfile__|xorg.conf|g' \
+	-e 's|__projectroot__|\$(prefix)|g' \
+	-e 's|__apploaddir__|\$(appdefaultdir)|g' \
+	-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
+	-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
+	-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
+	-e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \
+	-e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \
+	-e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'"
+
+
+
+
+
+# Preserves the interface, should it be implemented later
+
+
+
+# Check whether --with-xsltproc was given.
+if test "${with_xsltproc+set}" = set; then :
+  withval=$with_xsltproc; use_xsltproc=$withval
+else
+  use_xsltproc=auto
+fi
+
+
+
+if test "x$use_xsltproc" = x"auto"; then
+   # Extract the first word of "xsltproc", so it can be a program name with args.
+set dummy xsltproc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XSLTPROC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $XSLTPROC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XSLTPROC=$ac_cv_path_XSLTPROC
+if test -n "$XSLTPROC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+$as_echo "$XSLTPROC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+   if test "x$XSLTPROC" = "x"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xsltproc not found - cannot transform XML documents" >&5
+$as_echo "$as_me: WARNING: xsltproc not found - cannot transform XML documents" >&2;}
+	have_xsltproc=no
+   else
+        have_xsltproc=yes
+   fi
+elif test "x$use_xsltproc" = x"yes" ; then
+   # Extract the first word of "xsltproc", so it can be a program name with args.
+set dummy xsltproc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XSLTPROC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $XSLTPROC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XSLTPROC=$ac_cv_path_XSLTPROC
+if test -n "$XSLTPROC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+$as_echo "$XSLTPROC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+   if test "x$XSLTPROC" = "x"; then
+        as_fn_error $? "--with-xsltproc=yes specified but xsltproc not found in PATH" "$LINENO" 5
+   fi
+   have_xsltproc=yes
+elif test "x$use_xsltproc" = x"no" ; then
+   if test "x$XSLTPROC" != "x"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&5
+$as_echo "$as_me: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&2;}
+   fi
+   have_xsltproc=no
+else
+   as_fn_error $? "--with-xsltproc expects 'yes' or 'no'" "$LINENO" 5
+fi
+
+ if test "$have_xsltproc" = yes; then
+  HAVE_XSLTPROC_TRUE=
+  HAVE_XSLTPROC_FALSE='#'
+else
+  HAVE_XSLTPROC_TRUE='#'
+  HAVE_XSLTPROC_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+
 
 
 # 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:${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 ${ac_cv_path_XKBCOMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $XKBCOMP in
@@ -2808,13 +3290,14 @@ if test "x$enable_runtime_deps" = "xyes"; then
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $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_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -2857,7 +3340,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
 set dummy pkg-config; ac_word=$2
 { $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_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -2936,6 +3419,7 @@ if test -n "$DEPS_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "xproto >= 7.0.20 x11 >= 1.4.3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -2952,6 +3436,7 @@ if test -n "$DEPS_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "xproto >= 7.0.20 x11 >= 1.4.3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -2971,9 +3456,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xproto >= 7.0.20 x11 >= 1.4.3" 2>&1`
+	        DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xproto >= 7.0.20 x11 >= 1.4.3" 2>&1`
         else
-	        DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "xproto >= 7.0.20 x11 >= 1.4.3" 2>&1`
+	        DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xproto >= 7.0.20 x11 >= 1.4.3" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DEPS_PKG_ERRORS" >&5
@@ -3121,7 +3606,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $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 ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3161,7 +3646,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $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 ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3214,7 +3699,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $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 ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3254,7 +3739,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $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 ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3313,7 +3798,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $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 ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3357,7 +3842,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $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 ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3412,7 +3897,7 @@ fi
 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_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3527,7 +4012,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3570,7 +4055,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3629,7 +4114,7 @@ $as_echo "$ac_try_echo"; } >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3640,7 +4125,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $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 ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3681,7 +4166,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3691,7 +4176,7 @@ OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $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 ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3728,7 +4213,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $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 ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3806,7 +4291,7 @@ else
 fi
 { $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 ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -3905,7 +4390,7 @@ depcc="$CC"   am_compiler_list=
 
 { $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 ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4057,7 +4542,7 @@ fi
 set dummy intltool-update; ac_word=$2
 { $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 ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_UPDATE in
@@ -4097,7 +4582,7 @@ fi
 set dummy intltool-merge; ac_word=$2
 { $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 ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_MERGE in
@@ -4137,7 +4622,7 @@ fi
 set dummy intltool-extract; ac_word=$2
 { $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 ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_EXTRACT in
@@ -4298,7 +4783,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
 set dummy xgettext; ac_word=$2
 { $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 ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $XGETTEXT in
@@ -4338,7 +4823,7 @@ fi
 set dummy msgmerge; ac_word=$2
 { $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 ${ac_cv_path_MSGMERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGMERGE in
@@ -4378,7 +4863,7 @@ fi
 set dummy msgfmt; ac_word=$2
 { $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 ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGFMT in
@@ -4418,7 +4903,7 @@ fi
 set dummy gmsgfmt; ac_word=$2
 { $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 ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -4469,7 +4954,7 @@ fi
 set dummy perl; ac_word=$2
 { $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 ${ac_cv_path_INTLTOOL_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_PERL in
@@ -4553,7 +5038,7 @@ else
   case $host in
     *-*-solaris*)
                         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 :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   DATADIRNAME=share
 else
   DATADIRNAME=lib
@@ -4594,7 +5079,7 @@ 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 ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -4710,7 +5195,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4722,7 +5207,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 { $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 ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4785,7 +5270,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
 
 { $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 ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4852,7 +5337,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
 
 { $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 ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4983,7 +5468,7 @@ done
    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 :
+if test "x$ac_cv_header_locale_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LOCALE_H 1
 _ACEOF
@@ -4995,7 +5480,7 @@ done
     if test $ac_cv_header_locale_h = yes; then
     { $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 ${am_cv_val_LC_MESSAGES+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5035,7 +5520,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
     INTLLIBS=
 
     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 :
+if test "x$ac_cv_header_libintl_h" = xyes; then :
   gt_cv_func_dgettext_libintl="no"
       libintl_extra_libs=""
 
@@ -5044,7 +5529,7 @@ if test "x$ac_cv_header_libintl_h" = x""yes; then :
       #
       { $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 ${gt_cv_func_ngettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5075,7 +5560,7 @@ $as_echo "$gt_cv_func_ngettext_libc" >&6; }
       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
 	      { $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 ${gt_cv_func_dgettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5108,7 +5593,7 @@ $as_echo "$gt_cv_func_dgettext_libc" >&6; }
         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 :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
@@ -5127,7 +5612,7 @@ done
 
         { $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 ${ac_cv_lib_intl_bindtextdomain+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5161,10 +5646,10 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $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 :
+if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; 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 ${ac_cv_lib_intl_ngettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5198,10 +5683,10 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $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 :
+if test "x$ac_cv_lib_intl_ngettext" = xyes; 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 ${ac_cv_lib_intl_dgettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5235,7 +5720,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $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" = xyes; then :
   gt_cv_func_dgettext_libintl=yes
 fi
 
@@ -5251,7 +5736,7 @@ $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
 $as_echo "" >&6; }
   	  { $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 ${ac_cv_lib_intl_ngettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5285,10 +5770,10 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $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 :
+if test "x$ac_cv_lib_intl_ngettext" = xyes; 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 ${ac_cv_lib_intl_dcgettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5322,7 +5807,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $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" = xyes; then :
   gt_cv_func_dgettext_libintl=yes
 			libintl_extra_libs=-liconv
 else
@@ -5347,7 +5832,7 @@ fi
           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 :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
@@ -5385,7 +5870,7 @@ $as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
 set dummy msgfmt; ac_word=$2
 { $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 ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -5422,7 +5907,7 @@ fi
 	  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 :
+if test "x$ac_cv_func_dcgettext" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DCGETTEXT 1
 _ACEOF
@@ -5463,7 +5948,7 @@ fi
 set dummy gmsgfmt; ac_word=$2
 { $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 ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -5504,7 +5989,7 @@ fi
 set dummy xgettext; ac_word=$2
 { $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 ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -5555,7 +6040,7 @@ else
   case $host in
 	    *-*-solaris*)
 	    	                	    	                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 :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   CATOBJEXT=.gmo
                DATADIRNAME=share
 else
@@ -5689,7 +6174,7 @@ ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ja ka ko
 
 
 
-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 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 types/Makefile xkeyboard-config.pc 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 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 types/Makefile xkeyboard-config.pc xkeyboard-config.spec docs/Makefile man/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5755,10 +6240,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $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
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $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;}
@@ -5837,6 +6333,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_XSLTPROC_TRUE}" && test -z "${HAVE_XSLTPROC_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_XSLTPROC\" 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_fn_error $? "conditional \"CREATE_RULES_SYMLINK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -5858,7 +6358,7 @@ fi
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -5959,6 +6459,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6265,8 +6766,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # 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 2.3, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+This file was extended by xkeyboard-config $as_me 2.4.1, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -6322,8 +6823,8 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xkeyboard-config config.status 2.3
-configured by $0, generated by GNU Autoconf 2.67,
+xkeyboard-config config.status 2.4.1
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -6475,9 +6976,10 @@ do
     "xkeyboard-config.pc") CONFIG_FILES="$CONFIG_FILES xkeyboard-config.pc" ;;
     "xkeyboard-config.spec") CONFIG_FILES="$CONFIG_FILES xkeyboard-config.spec" ;;
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -6499,9 +7001,10 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -6509,12 +7012,13 @@ $debug ||
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -6536,7 +7040,7 @@ else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -6564,7 +7068,7 @@ done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -6612,7 +7116,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -6644,7 +7148,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -6684,7 +7188,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -6703,7 +7207,7 @@ do
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -6712,7 +7216,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -6738,8 +7242,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -6875,21 +7379,22 @@ s&@INSTALL@&$ac_INSTALL&;t t
 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_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || 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"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $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;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
diff --git a/dist/xkeyboard-config/configure.in b/dist/xkeyboard-config/configure.in
index e4008a973..fa4baef95 100644
--- a/dist/xkeyboard-config/configure.in
+++ b/dist/xkeyboard-config/configure.in
@@ -1,8 +1,17 @@
-AC_INIT(xkeyboard-config, 2.3)
+AC_INIT(xkeyboard-config, 2.4.1)
 AC_CONFIG_SRCDIR(rules/base.xml.in)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require X.Org macros 1.12 or later for XORG_WITH_XSLTPROC
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.12 or later before
+          running autoconf/autogen])])
+XORG_MACROS_VERSION(1.12)
+XORG_MANPAGE_SECTIONS
+XORG_WITH_XSLTPROC
+AC_PROG_SED
+
 AC_SUBST(VERSION)
 
 AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found])
@@ -104,6 +113,7 @@ types/Makefile
 xkeyboard-config.pc
 xkeyboard-config.spec
 docs/Makefile
+man/Makefile
 ])
 
 echo '***********************************************************'
diff --git a/dist/xkeyboard-config/docs/Makefile.in b/dist/xkeyboard-config/docs/Makefile.in
index 10a1d4b9b..306e0dee5 100644
--- a/dist/xkeyboard-config/docs/Makefile.in
+++ b/dist/xkeyboard-config/docs/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = docs
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -44,8 +46,12 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -63,11 +69,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -86,9 +96,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -110,6 +125,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -117,6 +133,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -128,14 +146,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/geometry/Makefile.in b/dist/xkeyboard-config/geometry/Makefile.in
index 5a1dfe6fd..e7536d9b6 100644
--- a/dist/xkeyboard-config/geometry/Makefile.in
+++ b/dist/xkeyboard-config/geometry/Makefile.in
@@ -36,6 +36,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 DIST_COMMON = README $(dist_dir_DATA) $(dist_geom_DATA) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/xkbrules.am
@@ -114,8 +116,12 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -133,11 +139,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -156,9 +166,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -180,6 +195,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -187,6 +203,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -198,14 +216,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/geometry/digital_vndr/Makefile.in b/dist/xkeyboard-config/geometry/digital_vndr/Makefile.in
index d1302eff3..a0faadccc 100644
--- a/dist/xkeyboard-config/geometry/digital_vndr/Makefile.in
+++ b/dist/xkeyboard-config/geometry/digital_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = geometry/digital_vndr
 DIST_COMMON = $(dist_geom_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(geomdir)"
 DATA = $(dist_geom_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/geometry/sgi_vndr/Makefile.in b/dist/xkeyboard-config/geometry/sgi_vndr/Makefile.in
index 8566224b7..7856a7849 100644
--- a/dist/xkeyboard-config/geometry/sgi_vndr/Makefile.in
+++ b/dist/xkeyboard-config/geometry/sgi_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = geometry/sgi_vndr
 DIST_COMMON = $(dist_geom_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(geomdir)"
 DATA = $(dist_geom_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/keycodes/Makefile.in b/dist/xkeyboard-config/keycodes/Makefile.in
index 87ff572a3..f1a4f1178 100644
--- a/dist/xkeyboard-config/keycodes/Makefile.in
+++ b/dist/xkeyboard-config/keycodes/Makefile.in
@@ -36,6 +36,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 DIST_COMMON = README $(dist_dir_DATA) $(dist_keycodes_DATA) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/xkbrules.am
@@ -114,8 +116,12 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -133,11 +139,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -156,9 +166,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -180,6 +195,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -187,6 +203,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -198,14 +216,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/keycodes/digital_vndr/Makefile.in b/dist/xkeyboard-config/keycodes/digital_vndr/Makefile.in
index eeff6c5e8..96910505d 100644
--- a/dist/xkeyboard-config/keycodes/digital_vndr/Makefile.in
+++ b/dist/xkeyboard-config/keycodes/digital_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = keycodes/digital_vndr
 DIST_COMMON = $(dist_keycodes_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(keycodesdir)"
 DATA = $(dist_keycodes_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/keycodes/sgi_vndr/Makefile.in b/dist/xkeyboard-config/keycodes/sgi_vndr/Makefile.in
index fb9e0a1fa..7fbcf5c6e 100644
--- a/dist/xkeyboard-config/keycodes/sgi_vndr/Makefile.in
+++ b/dist/xkeyboard-config/keycodes/sgi_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = keycodes/sgi_vndr
 DIST_COMMON = $(dist_keycodes_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(keycodesdir)"
 DATA = $(dist_keycodes_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/keymap/Makefile.in b/dist/xkeyboard-config/keymap/Makefile.in
index a0ce71f5c..6a3e094c6 100644
--- a/dist/xkeyboard-config/keymap/Makefile.in
+++ b/dist/xkeyboard-config/keymap/Makefile.in
@@ -36,6 +36,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 DIST_COMMON = README $(dist_dir_DATA) $(dist_keymap_DATA) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/xkbrules.am
@@ -114,8 +116,12 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -133,11 +139,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -156,9 +166,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -180,6 +195,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -187,6 +203,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -198,14 +216,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/keymap/digital_vndr/Makefile.in b/dist/xkeyboard-config/keymap/digital_vndr/Makefile.in
index 6f3a37882..80750d7ac 100644
--- a/dist/xkeyboard-config/keymap/digital_vndr/Makefile.in
+++ b/dist/xkeyboard-config/keymap/digital_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = keymap/digital_vndr
 DIST_COMMON = $(dist_keymap_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(keymapdir)"
 DATA = $(dist_keymap_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/keymap/sgi_vndr/Makefile.in b/dist/xkeyboard-config/keymap/sgi_vndr/Makefile.in
index 33ed5c816..4b4960431 100644
--- a/dist/xkeyboard-config/keymap/sgi_vndr/Makefile.in
+++ b/dist/xkeyboard-config/keymap/sgi_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = keymap/sgi_vndr
 DIST_COMMON = $(dist_keymap_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(keymapdir)"
 DATA = $(dist_keymap_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/keymap/sun_vndr/Makefile.in b/dist/xkeyboard-config/keymap/sun_vndr/Makefile.in
index fbacb90aa..14550ee45 100644
--- a/dist/xkeyboard-config/keymap/sun_vndr/Makefile.in
+++ b/dist/xkeyboard-config/keymap/sun_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = keymap/sun_vndr
 DIST_COMMON = $(dist_keymap_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(keymapdir)"
 DATA = $(dist_keymap_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/man/Makefile.am b/dist/xkeyboard-config/man/Makefile.am
new file mode 100644
index 000000000..2e9deaa48
--- /dev/null
+++ b/dist/xkeyboard-config/man/Makefile.am
@@ -0,0 +1,17 @@
+EXTRA_DIST = man.xsl
+
+if HAVE_XSLTPROC
+miscmandir = $(MISC_MAN_DIR)
+miscman_PRE = xkeyboard-config.man
+miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@)
+CLEANFILES = $(miscman_DATA) $(miscman_PRE)
+SUFFIXES = .$(MISC_MAN_SUFFIX) .man
+MAN_SUBSTS += -e 's|__xkb_base__|$(xkb_base)|g'
+
+xkeyboard-config.man: $(top_builddir)/rules/evdev.xml $(srcdir)/man.xsl
+	$(XSLTPROC) -nonet $(srcdir)/man.xsl $(top_builddir)/rules/evdev.xml > $@
+
+.man.$(MISC_MAN_SUFFIX):
+	$(SED) $(MAN_SUBSTS) < $< > $@
+
+endif
diff --git a/dist/xkeyboard-config/man/Makefile.in b/dist/xkeyboard-config/man/Makefile.in
new file mode 100644
index 000000000..e66e30614
--- /dev/null
+++ b/dist/xkeyboard-config/man/Makefile.in
@@ -0,0 +1,433 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@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 = :
+build_triplet = @build@
+host_triplet = @host@
+@HAVE_XSLTPROC_TRUE@am__append_1 = -e 's|__xkb_base__|$(xkb_base)|g'
+subdir = man
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_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 = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(miscmandir)"
+DATA = $(miscman_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+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@
+DEPS_CFLAGS = @DEPS_CFLAGS@
+DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+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@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@ $(am__append_1)
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+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@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
+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 = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+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@
+EXTRA_DIST = man.xsl
+@HAVE_XSLTPROC_TRUE@miscmandir = $(MISC_MAN_DIR)
+@HAVE_XSLTPROC_TRUE@miscman_PRE = xkeyboard-config.man
+@HAVE_XSLTPROC_TRUE@miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@)
+@HAVE_XSLTPROC_TRUE@CLEANFILES = $(miscman_DATA) $(miscman_PRE)
+@HAVE_XSLTPROC_TRUE@SUFFIXES = .$(MISC_MAN_SUFFIX) .man
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .$(MISC_MAN_SUFFIX) .man
+$(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 man/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign man/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
+$(am__aclocal_m4_deps):
+install-miscmanDATA: $(miscman_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(miscmandir)" || $(MKDIR_P) "$(DESTDIR)$(miscmandir)"
+	@list='$(miscman_DATA)'; test -n "$(miscmandir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(miscmandir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(miscmandir)" || exit $$?; \
+	done
+
+uninstall-miscmanDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(miscman_DATA)'; test -n "$(miscmandir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(miscmandir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(miscmandir)" && rm -f $$files
+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 "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$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)$(miscmandir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_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
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-miscmanDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+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-miscmanDATA
+
+.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-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-miscmanDATA 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-miscmanDATA
+
+
+@HAVE_XSLTPROC_TRUE@xkeyboard-config.man: $(top_builddir)/rules/evdev.xml $(srcdir)/man.xsl
+@HAVE_XSLTPROC_TRUE@	$(XSLTPROC) -nonet $(srcdir)/man.xsl $(top_builddir)/rules/evdev.xml > $@
+
+@HAVE_XSLTPROC_TRUE@.man.$(MISC_MAN_SUFFIX):
+@HAVE_XSLTPROC_TRUE@	$(SED) $(MAN_SUBSTS) < $< > $@
+
+# 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/dist/xkeyboard-config/man/man.xsl b/dist/xkeyboard-config/man/man.xsl
new file mode 100644
index 000000000..a5bd14d01
--- /dev/null
+++ b/dist/xkeyboard-config/man/man.xsl
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
+    <xsl:output method="text" encoding="UTF-8" doctype-system="xkb.dtd"/>
+    <xsl:template match="/xkbConfigRegistry">
+        <xsl:text><![CDATA[.\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
+.TH XKEYBOARD-CONFIG __miscmansuffix__ __vendorversion__
+.SH NAME
+xkeyboard-config \- XKB data description files
+.SH DESCRIPTION
+xkeyboard-config provides the description files for the X Keyboard
+Extension (XKB). The configuration options below are usually applied with
+setxkbmap(__appmansuffix__).
+.SH MODELS
+.TS
+left,box;
+lB lB
+___
+lB l.
+Model	Description
+]]></xsl:text>
+        <xsl:apply-templates select="modelList"/>
+        <xsl:text><![CDATA[
+.TE
+.SH LAYOUTS
+.TS
+left,box;
+lB lB
+____
+lB l.
+Layout(Variant)	Description
+]]></xsl:text>
+        <xsl:apply-templates select="layoutList"/>
+        <xsl:text><![CDATA[
+.TE
+.SH OPTIONS
+]]></xsl:text>
+        <xsl:apply-templates select="optionList"/>
+        <xsl:text><![CDATA[
+.SH FILES
+__xkb_base__/compat
+
+__xkb_base__/compiled
+
+__xkb_base__/geometry
+
+__xkb_base__/keycodes
+
+__xkb_base__/keymap
+
+__xkb_base__/rules
+
+__xkb_base__/semantics
+
+__xkb_base__/symbols
+
+__xkb_base__/types
+
+.SH SEE ALSO
+setxkbmap(__appmansuffix__)
+]]></xsl:text>
+    </xsl:template>
+
+<!-- split model/description into a normal table -->
+    <xsl:template match="modelList">
+        <xsl:for-each select="model">
+            <xsl:value-of select="configItem/name"/><xsl:text>&#9;</xsl:text><xsl:value-of select="configItem/description"/>
+            <xsl:text>&#10;</xsl:text>
+        </xsl:for-each>
+    </xsl:template>
+
+<!-- split layout/variant/description into a table like this
+
+        layout1                 description
+        layout1(variant1)       description
+        layout1(variant2)       description
+        layout2                 description
+        layout2(variant1)       description
+-->
+    <xsl:template match="layoutList">
+        <xsl:for-each select="layout">
+            <xsl:value-of select="configItem/name"/>
+            <xsl:text>&#9;</xsl:text>
+            <xsl:value-of select="configItem/description"/>
+            <xsl:text>&#10;</xsl:text>
+            <xsl:for-each select="variantList/variant">
+                <xsl:value-of select="../../configItem/name"/>
+                <xsl:text>(</xsl:text>
+                <xsl:value-of select="configItem/name"/>
+                <xsl:text>)</xsl:text>
+                <xsl:text>&#9;</xsl:text>
+                <xsl:value-of select="configItem/description"/>
+                <xsl:text>&#10;</xsl:text>
+            </xsl:for-each>
+            <xsl:text>&#10;</xsl:text>
+            <xsl:text>_&#10;</xsl:text>
+        </xsl:for-each>
+    </xsl:template>
+
+<!-- split option into a table like this
+
+option description:
+        optarg          description
+        optarg          description
+        optarg          description
+
+option2 description:
+        optarg          description
+        optarg          description
+-->
+    <xsl:template match="optionList">
+        <xsl:for-each select="group">
+            <xsl:text><![CDATA[
+.SS]]></xsl:text>
+            <xsl:text>&#10;</xsl:text>
+            <xsl:value-of select="configItem/description"/>
+            <xsl:text><![CDATA[
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option	Description
+]]></xsl:text>
+            <xsl:for-each select="option">
+                <xsl:value-of select="configItem/name"/>
+                <xsl:text>&#9;</xsl:text>
+                <xsl:value-of select="configItem/description"/>
+                <xsl:text>&#10;</xsl:text>
+            </xsl:for-each>
+            <xsl:text><![CDATA[
+.TE
+
+]]></xsl:text>
+        </xsl:for-each>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/dist/xkeyboard-config/po/bg.po b/dist/xkeyboard-config/po/bg.po
index 29adf2521..698e7fd15 100644
--- a/dist/xkeyboard-config/po/bg.po
+++ b/dist/xkeyboard-config/po/bg.po
@@ -48,10 +48,10 @@
 # Предпочита се дълго тире „—“ пред скоби „()“.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.3\n"
+"Project-Id-Version: xkeyboard-config-2.3.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-17 21:08+0100\n"
-"PO-Revision-Date: 2011-05-19 06:23+0300\n"
+"POT-Creation-Date: 2011-09-15 21:25+0100\n"
+"PO-Revision-Date: 2011-09-18 12:09+0300\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -65,35 +65,20 @@ msgid "&lt;Less/Greater&gt;"
 msgstr "„&lt;&gt;“"
 
 #: ../rules/base.xml.in.h:2
-msgid ""
-"&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with "
-"another 3rd-level-chooser)"
-msgstr ""
-"„&lt;&gt;“ избира третото ниво и го заключва заедно с друг клавиш за трето "
-"ниво"
+msgid "&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "„&lt;&gt;“ избира третото ниво и го заключва заедно с друг клавиш за трето ниво"
 
 #: ../rules/base.xml.in.h:3
-msgid ""
-"&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when "
-"pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr ""
-"„&lt;&gt;“ избира петото ниво, заключва го заедно с друг клавиш за пето ниво "
-"и го отключва при единично натискане"
+msgid "&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "„&lt;&gt;“ избира петото ниво, заключва го заедно с друг клавиш за пето ниво и го отключва при единично натискане"
 
 #: ../rules/base.xml.in.h:4
-msgid ""
-"&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with "
-"another 5th-level-chooser"
-msgstr ""
-"„&lt;&gt;“ избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "„&lt;&gt;“ избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
 
 #: ../rules/base.xml.in.h:5
-msgid ""
-"&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with "
-"another 5th-level-chooser, one press releases the lock"
-msgstr ""
-"„&lt;&gt;“ избира петото ниво, заключва го заедно с друг клавиш за пето ниво "
-"и го отключва при единично натискане"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "„&lt;&gt;“ избира петото ниво, заключва го заедно с друг клавиш за пето ниво и го отключва при единично натискане"
 
 #: ../rules/base.xml.in.h:6
 msgid "A4Tech KB-21"
@@ -216,12 +201,8 @@ msgid "Apple Aluminium Keyboard (JIS)"
 msgstr "Apple Aluminium Keyboard — стандарт JIS"
 
 #: ../rules/base.xml.in.h:36
-msgid ""
-"Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num "
-"Lock)"
-msgstr ""
-"Apple Aluminium Keyboard — симулиране на клавиши за PC (Print, Scroll Lock, "
-"Pause, Num Lock)"
+msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
+msgstr "Apple Aluminium Keyboard — симулиране на клавиши за PC (Print, Scroll Lock, Pause, Num Lock)"
 
 #: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
@@ -275,7 +256,7 @@ msgstr "арменска"
 msgid "Armenian (alternative eastern)"
 msgstr "арменска — източна, алтернативна"
 
-#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:50
 msgid "Armenian (alternative phonetic)"
 msgstr "арменска — фонетична, алтернативна"
 
@@ -357,20 +338,15 @@ msgstr "BTC 9019U"
 
 #: ../rules/base.xml.in.h:70
 msgid "BTC 9116U Mini Wireless Internet and Gaming"
-msgstr ""
-"BTC 9116U Mini Wireless Internet and Gaming — безжична, за Интернет и игри"
+msgstr "BTC 9116U Mini Wireless Internet and Gaming — безжична, за Интернет и игри"
 
 #: ../rules/base.xml.in.h:71
 msgid "Backslash"
 msgstr "Обратно наклонена черта"
 
 #: ../rules/base.xml.in.h:72
-msgid ""
-"Backslash (chooses 3rd level, latches when pressed together with another 3rd-"
-"level-chooser)"
-msgstr ""
-"Обратно наклонената черта избира третото ниво и го заключва заедно с друг "
-"клавиш за трето ниво"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Обратно наклонената черта избира третото ниво и го заключва заедно с друг клавиш за трето ниво"
 
 #: ../rules/base.xml.in.h:73
 msgid "Bambara"
@@ -441,3382 +417,3292 @@ msgid "Bengali"
 msgstr "бенгалска"
 
 #: ../rules/base.xml.in.h:90
+msgid "Bengali (Baishakhi Inscript)"
+msgstr "бенгалска — байшаки, индийска"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bengali (Baishakhi)"
+msgstr "бенгалска — байшаки"
+
+#: ../rules/base.xml.in.h:92
+msgid "Bengali (Bornona)"
+msgstr "бенгалска — борона"
+
+#: ../rules/base.xml.in.h:93
 msgid "Bengali (Probhat)"
 msgstr "бенгалска — пробхат"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:94
+msgid "Bengali (Uni Gitanjali)"
+msgstr "бенгалска — уни гитанжали"
+
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "берберска — мароканска, фонетична за тифинах, алтернативна"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "берберска — мароканска, за тифинах, алтернативна"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:97
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "берберска — мароканска, разширена фонетична за тифинах"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:98
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "берберска — мароканска, разширена за тифинах"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:99
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "берберска — мароканска, фонетична за тифинах"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:100
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "берберска — мароканска, за тифинах"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian"
 msgstr "босненска"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:102
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "босненска — американска с босненски диграфи"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:103
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "босненска — американска с босненски букви"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:104
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "босненска — с босненски диграфи"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:105
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "босненска — с „«»“"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Двата Alt-а заедно"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Двата Ctrl-а заедно"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Двата Shift-а заедно"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:109
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
-msgstr ""
-"Двата Shift-а заедно включват Caps Lock, самостоятелен Shift го изключва"
+msgstr "Двата Shift-а заедно включват Caps Lock, самостоятелен Shift го изключва"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:110
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Двата Shift-а заедно превключват Caps Lock"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:111
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Двата Shift-а заедно превключват ShiftLock"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:112
 msgid "Braille"
 msgstr "брайл"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:113
 msgid "Braille (left hand)"
 msgstr "брайл за левичари"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:114
 msgid "Braille (right hand)"
 msgstr "брайл за десничари"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:115
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard — за Интернет"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:116
 msgid "Bulgarian"
 msgstr "българска"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:117
 msgid "Bulgarian (new phonetic)"
 msgstr "българска — нова фонетична"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:118
 msgid "Bulgarian (traditional phonetic)"
 msgstr "българска — традиционна фонетична"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:119
 msgid "Burmese"
 msgstr "бурманска"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:120
+msgid "Cameroon Multilingual (azerty)"
+msgstr "камерунска — многоезична, azerty"
+
+#: ../rules/base.xml.in.h:121
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "камерунска — многоезична, qwerty"
+
+#: ../rules/base.xml.in.h:122
 msgid "Canadian Multilingual"
 msgstr "канадска — многоезична"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:123
 msgid "Canadian Multilingual (first part)"
 msgstr "канадска — многоезична, първа част"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:124
 msgid "Canadian Multilingual (second part)"
 msgstr "канадска — многоезична, втора част"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:120
-msgid ""
-"Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-"
-"level-chooser)"
-msgstr ""
-"Caps Lock избира третото ниво и го заключва заедно с друг клавиш за трето "
-"ниво"
+#: ../rules/base.xml.in.h:126
+msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Caps Lock избира третото ниво и го заключва заедно с друг клавиш за трето ниво"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Caps Lock (към първата подредба), Shift+Caps Lock (към последната)"
 
-#: ../rules/base.xml.in.h:122
-msgid ""
-"Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
+#: ../rules/base.xml.in.h:128
+msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Caps Lock (докато е натиснат), Alt+Caps Lock замества Caps Lock"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
-msgstr ""
-"Caps Lock работи като Shift със заключване. Shift временно отменя Caps Lock"
+msgstr "Caps Lock работи като Shift със заключване. Shift временно отменя Caps Lock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
-msgstr ""
-"Caps Lock работи като Shift със заключване. Shift не влияе на Caps Lock"
+msgstr "Caps Lock работи като Shift със заключване. Shift не влияе на Caps Lock"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:131
+msgid "Caps Lock as Ctrl"
+msgstr "Caps Lock е Ctrl"
+
+#: ../rules/base.xml.in.h:132
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock е изключен"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:133
 msgid "Caps Lock key behavior"
 msgstr "Поведение на Caps Lock"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:134
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Caps Lock сменя състоянието Shift за всички клавиши"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:135
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock сменя състоянието Shift само на буквените клавиши"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:136
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
-msgstr ""
-"Caps Lock използва вътрешна промяна на регистъра. Shift временно отменя Caps "
-"Lock"
+msgstr "Caps Lock използва вътрешна промяна на регистъра. Shift временно отменя Caps Lock"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:137
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
-msgstr ""
-"Caps Lock използва вътрешна промяна на регистъра. Shift не влияе на Caps Lock"
+msgstr "Caps Lock използва вътрешна промяна на регистъра. Shift не влияе на Caps Lock"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:138
 msgid "Catalan"
 msgstr "каталунска"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:139
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "каталунска — испанска с „Ŀ“"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:140
 msgid "Cherokee"
 msgstr "черокска"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:141
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:142
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:143
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd — алтернативен вариант"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:144
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:145
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:146
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:147
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:148
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard — за Интернет"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:149
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:150
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:151
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:152
 msgid "Chinese"
 msgstr "китайска"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:153
 msgid "Chuvash"
 msgstr "чувашка"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:154
 msgid "Chuvash (Latin)"
 msgstr "чувашка — латиница"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:155
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:156
 msgid "CloGaelach"
 msgstr "келтска латиница"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard — за лесен достъп"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard — за Интернет, 13 допълнителни клавиша"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard — за Интернет, 18 допълнителни клавиша"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:160
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard — за Интернет, 7 допълнителни клавиша"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:161
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:162
 msgid "Compose key position"
 msgstr "Положение на Compose"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control+Alt+Backspace"
 
-#: ../rules/base.xml.in.h:157
+#: ../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:158
+#: ../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:159
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000 — безжична"
 
-#: ../rules/base.xml.in.h:160
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "кримски татарски — „Q“ горе-вляво, Добруджа-Q"
-
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "кримски татарски — турска, „Q“ горе-вляво, алтернативна"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Turkish F)"
 msgstr "кримски татарски — турска, „F“ горе-вляво"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "кримски татарски — турска, „Q“ горе-вляво"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Croatian"
 msgstr "хърватска"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "хърватска — американска с хърватски диграфи"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:172
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "хърватска — американска с хърватски букви"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Croatian (use Croatian digraphs)"
 msgstr "хърватска — с хърватски диграфи"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:174
 msgid "Croatian (use guillemets for quotes)"
 msgstr "хърватска — с „«»“"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:175
 msgid "Ctrl key position"
 msgstr "Положение на Ctrl"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:176
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:177
 msgid "Czech"
 msgstr "чешка"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "чешка — UCW, само букви с надредни знаци"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "чешка — американски Дворак с поддръжка на UCW"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:180
 msgid "Czech (qwerty)"
 msgstr "чешка — qwerty"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:181
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "чешка — qwerty с „\\“"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "чешка — с „\\|“"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Danish"
 msgstr "датска"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Danish (Dvorak)"
 msgstr "датска — Дворак"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Danish (Macintosh)"
 msgstr "датска — за Макинтош"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "датска — за Макинтош, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Danish (eliminate dead keys)"
 msgstr "датска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Default numeric keypad keys"
 msgstr "Стандартни клавиши на цифровата клавиатура"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell 101-key PC"
 msgstr "Клавиатура на Dell със 101 клавиша за PC"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx — за мобилен компютър"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell Laptop/notebook Precision M series — за мобилен компютър"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dell Latitude series laptop"
 msgstr "За преносим компютър Dell Latitude"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:197
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keybard — за мултимедия"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard — безжична"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dhivehi"
 msgstr "дивеи"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801/9802 series"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
 msgid "Dutch"
 msgstr "холандска"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:203
 msgid "Dutch (Macintosh)"
 msgstr "холандска — за Макинтош"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:204
 msgid "Dutch (Sun dead keys)"
 msgstr "холандска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:205
 msgid "Dutch (standard)"
 msgstr "холандска — стандартна"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:206
 msgid "Dzongkha"
 msgstr "дзонка"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:207
 msgid "Enable extra typographic characters"
 msgstr "Допълнителни типографски знаци"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:208
 msgid "English (Cameroon Dvorak)"
 msgstr "английска — камерунска, Дворак"
 
-#: ../rules/base.xml.in.h:203
-msgid "English (Cameroon qwerty)"
-msgstr "английска — камерунска, qwerty"
-
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:209
 msgid "English (Cameroon)"
 msgstr "английска — камерунска"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:210
 msgid "English (Canada)"
 msgstr "английска — канадска"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:211
 msgid "English (Colemak)"
 msgstr "английска — Коулмак"
 
 # FIXME алтернативна да е след международна
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:212
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "английска — Дворак, международна, алтернативна, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:213
 msgid "English (Dvorak international with dead keys)"
 msgstr "английска — Дворак, международна, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:214
 msgid "English (Dvorak)"
 msgstr "английска — Дворак"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:215
 msgid "English (Ghana)"
 msgstr "английска — ганайска"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:216
 msgid "English (Ghana, GILLBT)"
 msgstr "английска — ганайска, GILLBT"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:217
 msgid "English (Ghana, multilingual)"
 msgstr "английска — ганайска, международна"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:218
 msgid "English (India, with RupeeSign)"
 msgstr "английска — индийска, с „₨“"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:219
 msgid "English (Macintosh)"
 msgstr "английска — за Макинтош"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:220
 msgid "English (Mali, US Macintosh)"
 msgstr "английска — малийска, американска за Макинтош"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:221
 msgid "English (Mali, US international)"
 msgstr "английска — малийска, американска международна"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:222
 msgid "English (Nigeria)"
 msgstr "английска — нигерийска"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:223
 msgid "English (South Africa)"
 msgstr "английска — южноафриканска"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:224
 msgid "English (UK)"
 msgstr "английска — великобританска"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:225
 msgid "English (UK, Colemak)"
 msgstr "английска — великобританска, Коулмак"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, Dvorak with UK punctuation)"
-msgstr ""
-"английска — великобританска, с пунктуация на Обединеното кралство, Дворак"
+msgstr "английска — великобританска, с пунктуация на Обединеното кралство, Дворак"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:227
 msgid "English (UK, Dvorak)"
 msgstr "английска — великобританска, Дворак"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:228
 msgid "English (UK, Macintosh international)"
 msgstr "английска  — великобританска, за Макинтош, международна"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:229
 msgid "English (UK, Macintosh)"
 msgstr "английска — великобританска, за Макинтош"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:230
 msgid "English (UK, extended WinKeys)"
 msgstr "английска  — великобританска, разширена, с клавиши на Windows"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:231
 msgid "English (UK, international with dead keys)"
 msgstr "английска  — великобританска, международна, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:232 ../rules/base.extras.xml.in.h:8
 msgid "English (US)"
 msgstr "английска — американска"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:233
 msgid "English (US, alternative international)"
 msgstr "английска — американска, международна, алтернативна"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:234
 msgid "English (US, international with dead keys)"
 msgstr "английска — американска, международна, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:235
 msgid "English (US, with euro on 5)"
 msgstr "английска — американска, c „€“ при 5"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:236
 msgid "English (classic Dvorak)"
 msgstr "английска — класически Дворак"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:237
 msgid "English (international AltGr dead keys)"
 msgstr "английска — международна, с „мъртви“ клавиши чрез AltGr"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:238
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "английска — смяна на подредбата при натискане на „*“ и „/“"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:239
 msgid "English (left handed Dvorak)"
 msgstr "английска — Дворак за левичари"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:240
 msgid "English (programmer Dvorak)"
 msgstr "английска — Дворак за програмисти"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:241
 msgid "English (right handed Dvorak)"
 msgstr "английска — Дворак за десничари"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:242
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:243
 msgid "Enter on keypad"
 msgstr "Enter на цифровата клавиатура"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:244
 msgid "Esperanto"
 msgstr "есперантска"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:245
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "есперантска — португалска, нативна"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:246
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "есперантска — разменени „;“ и „\"“, остаряла"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:247
 msgid "Estonian"
 msgstr "естонска"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:248
 msgid "Estonian (Dvorak)"
 msgstr "естонска — Дворак"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:249
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "естонска — американска с естонски букви"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:250
 msgid "Estonian (eliminate dead keys)"
 msgstr "естонска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:251
 msgid "Euro on 2"
 msgstr "„€“ при „2“"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:252
 msgid "Euro on 4"
 msgstr "„€“ при „4“"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:253
 msgid "Euro on 5"
 msgstr "„€“ при „5“"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:254
 msgid "Euro on E"
 msgstr "„€“ при „E“"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:255
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:256
 msgid "Ewe"
 msgstr "еве"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:257
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:258
 msgid "Faroese"
 msgstr "фарьорска"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:259
 msgid "Faroese (eliminate dead keys)"
 msgstr "фарьорска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:260
 msgid "Filipino"
 msgstr "филипинска"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "филипинска — Дворак на Кейпуел за байбаин"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:262
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "филипинска — Дворак на Кейпуел за латиница"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "филипинска — QWERF 2006 на Кейпуел за байбаин"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "филипинска — QWERF 2006 на Кейпуел за латиница"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:265
 msgid "Filipino (Colemak Baybayin)"
 msgstr "филипинска — Коулмак за байбаин"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:266
 msgid "Filipino (Colemak Latin)"
 msgstr "филипинска — Коулмак за латиница"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:267
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "филипинска — Дворак за байбаин"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:268
 msgid "Filipino (Dvorak Latin)"
 msgstr "филипинска — Дворак за латиница"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:269
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "филипинска — QWERTY за байбаин"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:270
 msgid "Finnish"
 msgstr "финландска"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:271
 msgid "Finnish (Macintosh)"
 msgstr "финландска — за Макинтош"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:272
 msgid "Finnish (classic)"
 msgstr "финландска — класическа"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:273
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "финландска — класическа, без „мъртви“ клавиши"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:276
 msgid "Four-level key with abstract separators"
 msgstr "Клавиш на четири нива с абстрактни разделители"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:277
 msgid "Four-level key with comma"
 msgstr "Клавиш на четири нива с десетична запетая"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:278
 msgid "Four-level key with dot"
 msgstr "Клавиш на четири нива с десетична точка"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:279
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Клавиш на четири нива с десетична точка, само латиница по ISO-8859-9"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:280
 msgid "Four-level key with momayyez"
 msgstr "Клавиш на четири нива с арабска десетична запетая"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:281
 msgid "French"
 msgstr "френска"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:282
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "френска — Дворак, bépo, ергономична"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:283
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "френска — Дворак, bépo, ергономична, само латиница по ISO 8859-9"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:284
 msgid "French (Breton)"
 msgstr "френска — бретонска"
 
-#: ../rules/base.xml.in.h:280
-msgid "French (Cameroon azerty)"
-msgstr "френска — камерунска, azerty"
-
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:285
 msgid "French (Cameroon)"
 msgstr "френска — камерунска"
 
-#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:286 ../rules/base.extras.xml.in.h:11
 msgid "French (Canada)"
 msgstr "френска — канадска"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:287
 msgid "French (Canada, Dvorak)"
 msgstr "френска — канадска, Дворак"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:288
 msgid "French (Canada, legacy)"
 msgstr "френска — канадска, остаряла"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:289
 msgid "French (Democratic Republic of the Congo)"
 msgstr "френска — конгоанска"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:290
 msgid "French (Dvorak)"
 msgstr "френска — Дворак"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:291
 msgid "French (Guinea)"
 msgstr "френска — гвинейска"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:292
 msgid "French (Macintosh)"
 msgstr "френска — за Макинтош"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:293
 msgid "French (Mali, alternative)"
 msgstr "френска — малийска, алтернативна"
 
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:294
 msgid "French (Morocco)"
 msgstr "френска — мароканска"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:295
 msgid "French (Sun dead keys)"
 msgstr "френска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:296
 msgid "French (Switzerland)"
 msgstr "френска — швейцарска"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:297
 msgid "French (Switzerland, Macintosh)"
 msgstr "френска — швейцарска, за Макинтош"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:298
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "френска — швейцарска, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:299
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "френска — швейцарска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:300
 msgid "French (alternative)"
 msgstr "френска — алтернативна"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:301
 msgid "French (alternative, Sun dead keys)"
 msgstr "френска — алтернативна, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:302
 msgid "French (alternative, eliminate dead keys)"
 msgstr "френска — алтернативна, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:303
 msgid "French (alternative, latin-9 only)"
 msgstr "френска — алтернативна, само латиница по ISO 8859-9"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:304
 msgid "French (eliminate dead keys)"
 msgstr "френска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:305
 msgid "French (legacy, alternative)"
 msgstr "френска — алтернативна, остаряла"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:306
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "френска — алтернативна, остаряла, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:307
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "френска — алтернативна, остаряла, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:308
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO laptop — за мобилен компютър"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:309
 msgid "Fula"
 msgstr "фула"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:310
 msgid "Ga"
 msgstr "га"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:311
 msgid "Generic 101-key PC"
 msgstr "Стандартна клавиатура за PC със 101 клавиша"
 
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:312
 msgid "Generic 102-key (Intl) PC"
 msgstr "Стандартна клавиатура за PC със 102 клавиша — международна"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:313
 msgid "Generic 104-key PC"
 msgstr "Стандартна клавиатура за PC със 104 клавиша"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:314
 msgid "Generic 105-key (Intl) PC"
 msgstr "Стандартна клавиатура за PC със 105 клавиша — международна"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:315
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:316
 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:313
+#: ../rules/base.xml.in.h:317
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:318
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:319
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:320
 msgid "Georgian"
 msgstr "грузинска"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:321
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "грузинска — azerty на Цкапо"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:322
 msgid "Georgian (Italy)"
 msgstr "грузинска — италианска"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:323
 msgid "Georgian (MESS)"
 msgstr "грузинска — MESS"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:324
 msgid "Georgian (ergonomic)"
 msgstr "грузинска — ергономична"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:325 ../rules/base.extras.xml.in.h:12
 msgid "German"
 msgstr "немска"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:326
 msgid "German (Austria)"
 msgstr "немска — австрийска"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:327
 msgid "German (Austria, Macintosh)"
 msgstr "немска — австрийска, за Макинтош"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:328
 msgid "German (Austria, Sun dead keys)"
 msgstr "немска — австрийска, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:329
 msgid "German (Austria, eliminate dead keys)"
 msgstr "немска, австрийска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:330
 msgid "German (Dvorak)"
 msgstr "немска — Дворак"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:331
 msgid "German (Macintosh)"
 msgstr "немска — за Макинтош"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:332
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "немска — за Макинтош, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:333
 msgid "German (Neo 2)"
 msgstr "немска — Neo 2, добавени гръцки букви"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:334
 msgid "German (Sun dead keys)"
 msgstr "немска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:335
 msgid "German (Switzerland)"
 msgstr "немска — швейцарска"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:336
 msgid "German (Switzerland, Macintosh)"
 msgstr "немска — швейцарска, за Макинтош"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:337
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "немска — швейцарска, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:338
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "немска — швейцарска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:339
 msgid "German (Switzerland, legacy)"
 msgstr "немска — швейцарска, остаряла"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:340
 msgid "German (dead acute)"
 msgstr "немска — с „мъртво“ ударение"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:341
 msgid "German (dead grave acute)"
 msgstr "немска — с „мъртво“ тежко ударение"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:342
 msgid "German (eliminate dead keys)"
 msgstr "немска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:339
-msgid "German (qwerty)"
-msgstr "немска — qwerty"
-
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:343
 msgid "Greek"
 msgstr "гръцка"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:344
 msgid "Greek (eliminate dead keys)"
 msgstr "гръцка — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:345
 msgid "Greek (extended)"
 msgstr "гръцка — разширена"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:346
 msgid "Greek (polytonic)"
 msgstr "гръцка — политонална"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:347
 msgid "Greek (simple)"
 msgstr "гръцка — опростена"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:348
 msgid "Gujarati"
 msgstr "гуджарати"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:349
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:350
 msgid "HTC Dream"
 msgstr "HTC Dream"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:351
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard — за весело хакерстване"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:352
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking Keyboard for Mac — за весело хакерстване"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:353
 msgid "Hausa"
 msgstr "хауска"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:354
 msgid "Hebrew"
 msgstr "иврит"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:355
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "иврит — библейска, Тиро"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:356
 msgid "Hebrew (lyx)"
 msgstr "иврит — LyX"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:357
 msgid "Hebrew (phonetic)"
 msgstr "иврит — фонетична"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard — за Интернет"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard Mini 110 Notebook — за мобилен компютър"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:367
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:368
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x Multimedia Keyboard — за мултимедия"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:369
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:370
 msgid "Hexadecimal"
 msgstr "шестнадесетична"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:371
 msgid "Hindi (Bolnagri)"
 msgstr "хинди — Болнагри"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:372
 msgid "Hindi (Wx)"
 msgstr "хинди — Wx"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:373
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:374
 msgid "Htc Dream phone"
 msgstr "Телефон HTC Dream"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian"
 msgstr "унгарска"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "унгарска — 101 клавиша, qwerty, „,“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "унгарска — 101 клавиша, qwerty, „,“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "унгарска — 101 клавиша, qwerty, „.“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "унгарска — 101 клавиша, qwerty, „.“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "унгарска — 101 клавиша, qwertz, „,“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "унгарска — 101 клавиша, qwertz, „,“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "унгарска — 101 клавиша, qwertz, „.“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "унгарска — 101 клавиша, qwertz, „.“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "унгарска — 102 клавиша, qwerty, „,“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "унгарска — 102 клавиша, qwerty, „,“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "унгарска — 102 клавиша, qwerty, „.“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "унгарска — 102 клавиша, qwerty, „.“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "унгарска — 102 клавиша, qwertz, „,“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "унгарска — 102 клавиша, qwertz, „,“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "унгарска — 102 клавиша, qwertz, „.“, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "унгарска — 102 клавиша, qwertz, „.“, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:392
 msgid "Hungarian (eliminate dead keys)"
 msgstr "унгарска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:393
 msgid "Hungarian (qwerty)"
 msgstr "унгарска — qwerty"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:394
 msgid "Hungarian (standard)"
 msgstr "унгарска — стандартна"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:395
 msgid "Hyper is mapped to Win-keys"
 msgstr "И двата Win-а са Hyper"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:396
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:397
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:398
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:399
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:400
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:401
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic"
 msgstr "исландска"
 
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (Dvorak)"
 msgstr "исландска — Дворак"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:404
 msgid "Icelandic (Macintosh)"
 msgstr "исландска — за Макинтош"
 
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:405
 msgid "Icelandic (Sun dead keys)"
 msgstr "исландска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:406
 msgid "Icelandic (eliminate dead keys)"
 msgstr "исландска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:407
 msgid "Igbo"
 msgstr "игбо"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:408
 msgid "Indian"
 msgstr "индийска"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:409
 msgid "Inuktitut"
 msgstr "ескимоска"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:410
 msgid "Iraqi"
 msgstr "иракска"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:411
 msgid "Irish"
 msgstr "ирландска"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:412
 msgid "Irish (UnicodeExpert)"
 msgstr "ирландска — експертна за Уникод"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:413
 msgid "Italian"
 msgstr "италианска"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:414
 msgid "Italian (Macintosh)"
 msgstr "италианска — за Макинтош"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:415
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "италианска — американска с италиански букви"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:416
 msgid "Italian (eliminate dead keys)"
 msgstr "италианска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:417
 msgid "Japanese"
 msgstr "японска"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (Kana 86)"
 msgstr "японска — кана 86"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (Kana)"
 msgstr "японска — кана"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:420
 msgid "Japanese (Macintosh)"
 msgstr "японска — за Макинтош"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:421
 msgid "Japanese (OADG 109A)"
 msgstr "японска — OADG 109A"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:422
 msgid "Japanese (PC-98xx Series)"
 msgstr "японска — серии PC-98xx"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:423
 msgid "Japanese keyboard options"
 msgstr "Настройки за японска клавиатура"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:424
 msgid "Kalmyk"
 msgstr "калмикска"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:425
 msgid "Kana Lock key is locking"
 msgstr "Клавишът Lock на кана заключва"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:426
 msgid "Kannada"
 msgstr "канареска"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:427
 msgid "Kashubian"
 msgstr "кашубска"
 
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:428
 msgid "Kazakh"
 msgstr "казахска"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:429
 msgid "Kazakh (with Russian)"
 msgstr "казахска с руски букви"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:430
 msgid "Key sequence to kill the X server"
 msgstr "Клавишна комбинация за убиването на X сървъра"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:431
 msgid "Key to choose 3rd level"
 msgstr "Клавиш за избор третото ниво"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:432
 msgid "Key to choose 5th level"
 msgstr "Клавиш за избор петото ниво"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:433
 msgid "Key(s) to change layout"
 msgstr "Клавиш(и) за смяна на подредбата"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:434
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:435
 msgid "Khmer (Cambodia)"
 msgstr "кхмерска — камбоджанска"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:436
 msgid "Kikuyu"
 msgstr "кикуйска"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:437
 msgid "Kinesis"
 msgstr "Кинезис"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:438
 msgid "Komi"
 msgstr "комска"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:439
 msgid "Korean"
 msgstr "корейска"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:440
 msgid "Korean (101/104 key compatible)"
 msgstr "корейска — съвместима със 101/104 клавиша"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "кюрдска — иранска, арабски и латински букви"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iran, F)"
 msgstr "кюрдска — иранска, „F“ горе-вляво"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "кюрдска — иранска, латиница, „Q“ горе-вляво, алтернативна"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "кюрдска — иранска, латиница, „Q“ горе-вляво"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "кюрдска — иракска, арабски и латински букви"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Iraq, F)"
 msgstr "кюрдска — иракска, „F“ горе-вляво"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "кюрдска — иракска, латиница, „Q“ горе-вляво, алтернативна"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "кюрдска — иракска, латиница, „Q“ горе-вляво"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Syria, F)"
 msgstr "кюрдска — сирийска, „F“ горе-вляво"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "кюрдска — сирийска, латиница, „Q“ горе-вляво, алтернативна"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "кюрдска — сирийска, латиница, „Q“ горе-вляво"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:452
 msgid "Kurdish (Turkey, F)"
 msgstr "кюрдска — турска, „F“ горе-вляво"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:453
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "кюрдска — турска, латиница, „Q“ горе-вляво, алтернативна"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:454
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "кюрдска — турска, латиница, „Q“ горе-вляво"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:455
 msgid "Kyrgyz"
 msgstr "киргистанска"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:456
 msgid "Kyrgyz (phonetic)"
 msgstr "киргистанска — фонетична"
 
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:457
 msgid "Lao"
 msgstr "лаоска"
 
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:458
 msgid "Lao (STEA proposed standard layout)"
 msgstr "лаоска — стандартна подредба по STEA"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:459
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr ""
-"Laptop/notebook Compaq Laptop Keyboard — за мобилен компютър, напр. Armada"
+msgstr "Laptop/notebook Compaq Laptop Keyboard — за мобилен компютър, напр. Armada"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:460
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr ""
-"Laptop/notebook Compaq Internet Keyboard — за мобилен компютър, напр. "
-"Presario, и Интернет"
+msgstr "Laptop/notebook Compaq Internet Keyboard — за мобилен компютър, напр. Presario, и Интернет"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:461
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Laptop/notebook eMachines m68xx — за мобилен компютър"
 
-#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+#: ../rules/base.xml.in.h:462 ../rules/base.extras.xml.in.h:16
 msgid "Latvian"
 msgstr "латвийска"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:463
 msgid "Latvian (F variant)"
 msgstr "латвийска — с „F“"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:464
 msgid "Latvian (adapted)"
 msgstr "латвийска — адаптирана"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:465
 msgid "Latvian (apostrophe variant)"
 msgstr "латвийска — с „'“"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:466
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "латвийска — ергономична, ūgjrmv"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:467
 msgid "Latvian (modern)"
 msgstr "латвийска — модерна"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:468
 msgid "Latvian (tilde variant)"
 msgstr "латвийска — с „~“"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:469
 msgid "Left Alt"
 msgstr "Левият Alt"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:470
 msgid "Left Alt (while pressed)"
 msgstr "Левият Alt (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:471
 msgid "Left Alt is swapped with Left Win"
 msgstr "Левият Alt е разменен с левия Win"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:472
 msgid "Left Ctrl"
 msgstr "Левият Ctrl"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:473
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Левият Ctrl (към първата подредба), десният Ctrl (към последната)"
 
-#: ../rules/base.xml.in.h:471
+#: ../rules/base.xml.in.h:474
+msgid "Left Ctrl as Meta"
+msgstr "Левият Ctrl е Meta"
+
+#: ../rules/base.xml.in.h:475
 msgid "Left Ctrl+Left Shift"
 msgstr "Левият Ctrl+левият Shift"
 
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:476
 msgid "Left Shift"
 msgstr "Левият Shift"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:477
 msgid "Left Win"
 msgstr "Левият Win"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:478
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Левият Win (към първата подредба), десният Win/Menu (към последната)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:479
 msgid "Left Win (while pressed)"
 msgstr "Левият Win (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:476
-msgid ""
-"Left Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser"
-msgstr ""
-"Левият Win избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
+#: ../rules/base.xml.in.h:480
+msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Левият Win избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
 
-#: ../rules/base.xml.in.h:477
-msgid ""
-"Left Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser, one press releases the lock"
-msgstr ""
-"Левият Win избира петото ниво, заключва го заедно с друг клавиш за пето ниво "
-"и го отключва при единично натискане"
+#: ../rules/base.xml.in.h:481
+msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "Левият Win избира петото ниво, заключва го заедно с друг клавиш за пето ниво и го отключва при единично натискане"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:482
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
-msgstr ""
-"Левият Ctrl+левият Win (към първата подредба), десният Ctrl+Menu (към "
-"последната)"
+msgstr "Левият Ctrl+левият Win (към първата подредба), десният Ctrl+Menu (към последната)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:483
 msgid "Legacy"
 msgstr "остаряла"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:484
 msgid "Legacy Wang 724"
 msgstr "Остаряла Wang 724"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:486
 msgid "Legacy key with comma"
 msgstr "Остарял клавиш с десетична запетая"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:487
 msgid "Legacy key with dot"
 msgstr "Остарял клавиш с десетична точка"
 
-#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+#: ../rules/base.xml.in.h:488 ../rules/base.extras.xml.in.h:25
 msgid "Lithuanian"
 msgstr "литовска"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "литовска — IBM LST 1205-92"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:490
 msgid "Lithuanian (LEKP)"
 msgstr "литовска — LEKP"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:491
 msgid "Lithuanian (LEKPa)"
 msgstr "литовска — LEKPa"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:492
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "литовска — американска с литовски букви"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:493
 msgid "Lithuanian (standard)"
 msgstr "литовска — стандартна"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Access Keyboard"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop — безжична"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop — алтернативен вариант"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300 — безжична"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator — безжична"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:500
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical — оптична"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro — алтернативен вариант 2"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch — безжична"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator — безжична"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:504
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Logitech G15, допълнителни клавиши чрез G15daemon"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech Generic Keyboard — стандартна"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Logitech Internet 350 Keyboard — за Интернет"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard — за Интернет"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:508
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard — за Интернет"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:509
 msgid "Logitech Media Elite Keyboard"
 msgstr "Logitech Media Elite Keyboard"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:510
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
-msgstr ""
-"Logitech Ultra-X Cordless Media Desktop Keyboard — безжична, за мултимедия"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard — безжична, за мултимедия"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:511
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Logitech Ultra-X Keyboard"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:512
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Logitech diNovo Edge Keyboard"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:513
 msgid "Logitech diNovo Keyboard"
 msgstr "Logitech diNovo Keyboard"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:514
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:515
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard — model Y-RB6, безжична"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:516
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE — за Интернет"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:517
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE — USB, за Интернет"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:518
 msgid "Lower Sorbian"
 msgstr "долно сорбска"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:519
 msgid "Lower Sorbian (qwertz)"
 msgstr "долно сорбска — qwertz"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:520
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:521
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro — международна"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:522
 msgid "Macedonian"
 msgstr "македонска"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:523
 msgid "Macedonian (eliminate dead keys)"
 msgstr "македонска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:524
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:525
 msgid "Macintosh Old"
 msgstr "Macintosh Old — стар вариант"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Caps Lock е допълнителен Backspace"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
-msgstr ""
-"Caps Lock е допълнителен Control, запазване на клавишния символ Caps_Lock"
-
-#: ../rules/base.xml.in.h:524
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Caps Lock е допълнителен Ctrl"
+msgstr "Caps Lock е допълнителен Control, запазване на клавишния символ Caps_Lock"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional ESC"
 msgstr "Caps Lock е допълнителен Esc"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:529
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Caps Lock е допълнителен Hyper"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:530
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Caps Lock е допълнителен Num Lock"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:531
 msgid "Make Caps Lock an additional Super"
 msgstr "Caps Lock е допълнителен Super"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:532
 msgid "Malayalam"
 msgstr "малаяламска"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:533
 msgid "Malayalam (Lalitha)"
 msgstr "малаяламска — лалита"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:534
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
-msgstr "малаяламска — разширена писменост с „₨“"
+msgstr "малаяламска — разширена индийска с „₨“"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:535
 msgid "Maltese"
 msgstr "малтийска"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:536
 msgid "Maltese (with US layout)"
 msgstr "малтийска — американска подредба"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:537
 msgid "Maori"
 msgstr "маорска"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:538
 msgid "Mari"
 msgstr "марийска"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:539
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:540
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard — за лесен достъп"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:541
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:542
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:543
+msgid "Menu as Right Ctrl"
+msgstr "Menu е десният Ctrl"
+
+#: ../rules/base.xml.in.h:544
 msgid "Meta is mapped to Left Win"
 msgstr "Левият Win е Meta"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:545
 msgid "Meta is mapped to Win keys"
 msgstr "И двата Win-а са Meta"
 
-#: ../rules/base.xml.in.h:542
-msgid "Meta on Left Ctrl"
-msgstr "Левият Ctrl отговаря на Meta"
-
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve Keyboard 2000"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard — за Интернет"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Swedish — за Интернет, шведска"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:550
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural Keyboard Elite"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr ""
-"Microsoft Natural Keyboard Pro/Microsoft Internet Keyboard Pro — за Интернет"
+msgstr "Microsoft Natural Keyboard Pro/Microsoft Internet Keyboard Pro — за Интернет"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:553
 msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr ""
-"Microsoft Natural Keyboard Pro USB/Microsoft Internet Keyboard Pro — за "
-"Интернет"
+msgstr "Microsoft Natural Keyboard Pro USB/Microsoft Internet Keyboard Pro — за Интернет"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-msgstr ""
-"Microsoft Natural Wireless Ergonomic Keyboard 4000 — безжична, ергономична"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000 — безжична, ергономична"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:555
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr ""
-"Microsoft Natural Wireless Ergonomic Keyboard 7000 — безжична, ергономична"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000 — безжична, ергономична"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:556
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard — за офиса"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:557
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Wireless Multimedia Keyboard 1.0A — безжична, за мултимедия"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:558
 msgid "Miscellaneous compatibility options"
 msgstr "Разни настройки за съвместимост"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:559
 msgid "Mongolian"
 msgstr "монголска"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin"
 msgstr "черногорска"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:561
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "черногорска — кирилица с „«»“"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:562
 msgid "Montenegrin (Cyrillic)"
 msgstr "черногорска — кирилица"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:563
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "черногорска — кирилица с разменени „З“ и „Ж“"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "черногорска — латиница за Уникод, qwerty"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:565
 msgid "Montenegrin (Latin Unicode)"
 msgstr "черногорска — латиница за Уникод"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:566
 msgid "Montenegrin (Latin qwerty)"
 msgstr "черногорска — латиница, qwerty"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:567
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "черногорска — латиница с „«»“"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:568
 msgid "NICOLA-F style Backspace"
 msgstr "Backspace на мястото определено от подредбата NICOLA-F"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:569
 msgid "Nepali"
 msgstr "непалска"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at fourth level"
 msgstr "Интервал без разделяне на четвърто ниво"
 
-#: ../rules/base.xml.in.h:568
-msgid ""
-"Non-breakable space character at fourth level, thin non-breakable space "
-"character at sixth level"
-msgstr ""
-"Интервал без разделяне на четвърто ниво и тесен интервал без разделяне на "
-"шесто ниво"
+#: ../rules/base.xml.in.h:571
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Интервал без разделяне на четвърто ниво и тесен интервал без разделяне на шесто ниво"
 
-#: ../rules/base.xml.in.h:569
-msgid ""
-"Non-breakable space character at fourth level, thin non-breakable space "
-"character at sixth level (via Ctrl+Shift)"
-msgstr ""
-"Интервал без разделяне на четвърто ниво и тесен интервал без разделяне на "
-"шесто ниво (с Ctrl+Shift)"
+#: ../rules/base.xml.in.h:572
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Интервал без разделяне на четвърто ниво и тесен интервал без разделяне на шесто ниво (с Ctrl+Shift)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at second level"
 msgstr "Интервал без разделяне на второ ниво"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:574
 msgid "Non-breakable space character at third level"
 msgstr "Интервал без разделяне на трето ниво"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:575
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Интервал без разделяне на трето ниво и нищо на четвърто ниво"
 
-#: ../rules/base.xml.in.h:573
-msgid ""
-"Non-breakable space character at third level, thin non-breakable space "
-"character at fourth level"
-msgstr ""
-"Интервал без разделяне на трето ниво и тесен интервал без разделяне на "
-"четвърто ниво"
+#: ../rules/base.xml.in.h:576
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Интервал без разделяне на трето ниво и тесен интервал без разделяне на четвърто ниво"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:577
 msgid "Northern Saami (Finland)"
 msgstr "северносамска — финландска"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:578
 msgid "Northern Saami (Norway)"
 msgstr "северносамска — норвежка"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:579
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "северносамска — норвежка, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:580
 msgid "Northern Saami (Sweden)"
 msgstr "северносамска — шведска"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:581
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:582
 msgid "Norwegian"
 msgstr "норвежка"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (Dvorak)"
 msgstr "норвежка — Дворак"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:584
 msgid "Norwegian (Macintosh)"
 msgstr "норвежка — за Макинтош"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:585
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "норвежка — за Макинтош, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:586
 msgid "Norwegian (eliminate dead keys)"
 msgstr "норвежка — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:587
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:588
 msgid "Numeric keypad delete key behaviour"
 msgstr "Поведение на клавиша за триене на цифровата клавиатура"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:589
 msgid "Numeric keypad keys work as with Macintosh"
 msgstr "Цифровата клавиатура функционира като в Макинтош"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:590
 msgid "Numeric keypad layout selection"
 msgstr "Избор на подредбата на цифровата клавиатура"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:591
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:592
 msgid "Occitan"
 msgstr "провансалска"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:593
 msgid "Ogham"
 msgstr "огамска"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:594
 msgid "Ogham (IS434)"
 msgstr "огамска — IS434"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:595
 msgid "Oriya"
 msgstr "орийска"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:596
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Ortek MCK-800 MM/Internet keyboard — за Интернет"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:597
 msgid "Ossetian (Georgia)"
 msgstr "осетинска — грузинска"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:598
 msgid "Ossetian (WinKeys)"
 msgstr "осетинска — с клавиши на Windows"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:599
 msgid "Ossetian (legacy)"
 msgstr "осетинска — остаряла"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:600
 msgid "PC-98xx Series"
 msgstr "Серии PC-98xx"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:601
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "панонска русинска — еднозвучна"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:602
 msgid "Pashto"
 msgstr "пащунска"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:603
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "пащунска — афганистанска, OLPC"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:604
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:27
 msgid "Persian"
 msgstr "персийска"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:606
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "персийска — афганистанска, дарийски OLPC"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:607
 msgid "Persian (with Persian Keypad)"
 msgstr "персийска — с персийска цифрова клавиатура"
 
-#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:28
 msgid "Polish"
 msgstr "палска"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:609
 msgid "Polish (Dvorak)"
 msgstr "полска — Дворак"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:610
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "полска — Дворак, «„”» при «1»"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:611
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "полска — Дворак, «„”» при «'\"»"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:612
 msgid "Polish (programmer Dvorak)"
 msgstr "полска — Дворак за програмисти"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:613
 msgid "Polish (qwertz)"
 msgstr "полска — qwertz"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese"
 msgstr "португалска"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil)"
 msgstr "португалска — бразилска"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "португалска — бразилска, Дворак"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "португалска — бразилска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:618
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "португалска — бразилска, нативна за есперанто"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:619
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "португалска — бразилска, нативна за САЩ"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:620
 msgid "Portuguese (Brazil, nativo)"
 msgstr "португалска — бразилска, нативна"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Macintosh)"
 msgstr "португалска — за Макинтош"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "португалска — за Макинтош, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "португалска — за Макинтош, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "португалска — нативна за САЩ"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:625
 msgid "Portuguese (Nativo)"
 msgstr "португалска — нативна"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:626
 msgid "Portuguese (Sun dead keys)"
 msgstr "португалска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:627
 msgid "Portuguese (eliminate dead keys)"
 msgstr "португалска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:628
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager — KTEZ-1000"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:629
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:630
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "панджаби — гурмуки джелум"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:631
 msgid "Punjabi (Gurmukhi)"
 msgstr "панджаби — гурмуки"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:632
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt"
 msgstr "Десният Alt"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt (while pressed)"
 msgstr "Десният Alt (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:632
-msgid ""
-"Right Alt chooses 5th level and activates level5-Lock when pressed together "
-"with another 5th-level-chooser, one press releases the lock"
-msgstr ""
-"Десният Alt избира петото ниво, заключва го заедно с друг клавиш за пето "
-"ниво и го отключва при единично натискане"
+#: ../rules/base.xml.in.h:635
+msgid "Right Alt as Right Ctrl"
+msgstr "Десният Alt е десен Ctrl"
 
-#: ../rules/base.xml.in.h:633
-msgid ""
-"Right Alt chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser"
-msgstr ""
-"Десният Alt избира петото ниво и го заключва заедно с друг клавиш за пето "
-"ниво"
+#: ../rules/base.xml.in.h:636
+msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "Десният Alt избира петото ниво, заключва го заедно с друг клавиш за пето ниво и го отключва при единично натискане"
 
-#: ../rules/base.xml.in.h:634
-msgid ""
-"Right Alt chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser, one press releases the lock"
-msgstr ""
-"Десният Alt избира петото ниво, заключва го заедно с друг клавиш за пето "
-"ниво и го отключва при единично натискане"
+#: ../rules/base.xml.in.h:637
+msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Десният Alt избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:638
+msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "Десният Alt избира петото ниво, заключва го заедно с друг клавиш за пето ниво и го отключва при единично натискане"
+
+#: ../rules/base.xml.in.h:639
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Десният Alt никога не избира третото ниво"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:640
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Десният Alt, Shift+десният Alt са Multi"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl"
 msgstr "Десният Ctrl"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:642
 msgid "Right Ctrl (while pressed)"
 msgstr "Десният Ctrl (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:643
 msgid "Right Ctrl as Right Alt"
 msgstr "Десният Ctrl е десен Alt"
 
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl is mapped to Menu"
-msgstr "Десният Ctrl е Meta"
-
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:644
 msgid "Right Ctrl+Right Shift"
 msgstr "Десният Ctrl+десният Shift"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:645
 msgid "Right Shift"
 msgstr "Десният Shift"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:646
 msgid "Right Win"
 msgstr "Десният Win"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:647
 msgid "Right Win (while pressed)"
 msgstr "Десният Win (докато е натиснат)"
 
-#: ../rules/base.xml.in.h:645
-msgid ""
-"Right Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser"
-msgstr ""
-"Десният Win избира петото ниво и го заключва заедно с друг клавиш за пето "
-"ниво"
+#: ../rules/base.xml.in.h:648
+msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Десният Win избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
 
-#: ../rules/base.xml.in.h:646
-msgid ""
-"Right Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser, one press releases the lock"
-msgstr ""
-"Десният Win избира петото ниво, заключва го заедно с друг клавиш за пето "
-"ниво и го отключва при единично натискане"
+#: ../rules/base.xml.in.h:649
+msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "Десният Win избира петото ниво, заключва го заедно с друг клавиш за пето ниво и го отключва при единично натискане"
 
-#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+#: ../rules/base.xml.in.h:650 ../rules/base.extras.xml.in.h:30
 msgid "Romanian"
 msgstr "румънска"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (Germany)"
 msgstr "румънска — немска"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "немска — немска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (WinKeys)"
 msgstr "румънска — с клавиши на Windows"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:654
 msgid "Romanian (cedilla)"
 msgstr "румънска — букви с „¸“"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (standard cedilla)"
 msgstr "румънска — стандартна, букви с „¸“"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "румънска — стандартна"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:657
 msgid "Rupee on 4"
 msgstr "„₨“ при „4“"
 
-#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:658 ../rules/base.extras.xml.in.h:32
 msgid "Russian"
 msgstr "руска"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:659
 msgid "Russian (DOS)"
 msgstr "руска — DOS"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Georgia)"
 msgstr "руска — грузинска"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Germany, phonetic)"
 msgstr "руска — германска, фонетична"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "руска — казахстанска, за казахски"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:663
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "руска — полска, фонетична, Дворак"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:664
 msgid "Russian (Sweden, phonetic)"
 msgstr "руска — шведска, фонетична"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:665
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "руска — шведска, фонетична, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:666
 msgid "Russian (US, phonetic)"
 msgstr "руска — американска, фонетична"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:667
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "руска — украинска, републикански стандарт"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:668
 msgid "Russian (legacy)"
 msgstr "руска — остаряла"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:669
 msgid "Russian (phonetic WinKeys)"
 msgstr "руска — фонетична, с клавиши на Windows"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:670
 msgid "Russian (phonetic)"
 msgstr "руска — фонетична"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:671
 msgid "Russian (typewriter)"
 msgstr "руска — за пишеща машина"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:672
 msgid "Russian (typewriter, legacy)"
 msgstr "руска — за пишеща машина, остаряла"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:673
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard — безжична, за мултимедия"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:674
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:675
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:676
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:677
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:678
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500 — ергономична"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:679
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:680
 msgid "Saisiyat (Taiwan)"
 msgstr "сайсиятска — тайванска"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:681
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:682
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:683
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:684
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:685
 msgid "Semi-colon on third level"
 msgstr "Точка и запетая на третото ниво"
 
-#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:686 ../rules/base.extras.xml.in.h:35
 msgid "Serbian"
 msgstr "сръбска"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "сръбска — латиница за Уникод, qwerty"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin Unicode)"
 msgstr "сръбска — латиница за Уникод"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:689
 msgid "Serbian (Latin qwerty)"
 msgstr "сръбска — латиница, qwerty"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Latin with guillemets)"
 msgstr "сръбска — латиница с „«»“"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (Latin)"
 msgstr "сръбска — латиница"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:692
 msgid "Serbian (Russia)"
 msgstr "сръбска — руска"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:693
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "сръбска — разменени „З“ и „Ж“"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:694
 msgid "Serbian (with guillemets)"
 msgstr "сръбска — с „«»“"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:695
 msgid "Serbo-Croatian (US)"
 msgstr "сърбохърватска — американска"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:696
 msgid "Shift cancels Caps Lock"
 msgstr "Shift отменя Caps Lock"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:697
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Shift не отменя Caps Lock, а избира третото ниво"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:698
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Shift за цифровата клавиатура както в MS Windows"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:699
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:700
 msgid "Sindhi"
 msgstr "синдхи"
 
-#: ../rules/base.xml.in.h:698
-msgid "Sinhala"
-msgstr "синхала"
+#: ../rules/base.xml.in.h:701
+msgid "Sinhala (phonetic)"
+msgstr "синхала — фонетична"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
 msgid "Slovak"
 msgstr "словашка"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
 msgid "Slovak (extended Backslash)"
 msgstr "словашка — с „\\“"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
 msgid "Slovak (qwerty)"
 msgstr "словашка — qwerty"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "словашка — qwerty, с „\\“"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
 msgid "Slovenian"
 msgstr "словенска"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "словенска — американска със словенски букви"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "словенска — с „«»“"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
 msgid "Spanish"
 msgstr "испанска"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Dvorak)"
 msgstr "испанска — Дворак"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American)"
 msgstr "испанска — латиноамериканска"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "испанска — латиноамериканска, с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "испанска — латиноамериканска, без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "испанска — латиноамериканска, с мъртва „~“"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (Macintosh)"
 msgstr "испанска — за Макинтош"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Spanish (Sun dead keys)"
 msgstr "испанска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Spanish (eliminate dead keys)"
 msgstr "испанска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Spanish (include dead tilde)"
 msgstr "испанска — с „мъртва“ тилда"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 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:717
+#: ../rules/base.xml.in.h:720
 msgid "Sun Type 5/6"
 msgstr "На Sun, вид 5/6"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard — за мултимедия"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swahili (Kenya)"
 msgstr "суахили — кенийска"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swahili (Tanzania)"
 msgstr "суахили — танзанийска"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Размяна на Ctrl и Caps Lock"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
 msgid "Swap ESC and Caps Lock"
 msgstr "Размяна на Esc и Caps Lock"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish"
 msgstr "шведска"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (Dvorak)"
 msgstr "шведска — Дворак"
 
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:728
 msgid "Swedish (Macintosh)"
 msgstr "шведска — за Макинтош"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
 msgid "Swedish (Svdvorak)"
 msgstr "шведска — шведски Дворак"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:730
 msgid "Swedish (eliminate dead keys)"
 msgstr "шведска — без „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:728
+#: ../rules/base.xml.in.h:731
 msgid "Swedish Sign Language"
 msgstr "шведска — жестомимична"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:732
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook — за таблет"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
 msgid "Syriac"
 msgstr "сириакска"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
 msgid "Syriac (phonetic)"
 msgstr "сириакска — фонетична"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
 msgid "Taiwanese"
 msgstr "тайванска"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
 msgid "Taiwanese (indigenous)"
 msgstr "тайванска — туземна"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
 msgid "Tajik"
 msgstr "таджикска"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
 msgid "Tajik (legacy)"
 msgstr "таджикска — остаряла"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
 msgid "Tamil"
 msgstr "тамилска"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "тамилска — шриланкска, за пишеща машина, кодиране TAB"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "тамилска — шриланкска, Уникод"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (TAB typewriter)"
 msgstr "тамилска — за пишеща машина, кодиране TAB"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
 msgid "Tamil (TSCII typewriter)"
 msgstr "тамилска — за пишеща машина, кодиране TSCII"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
 msgid "Tamil (Unicode)"
 msgstr "тамилска — Уникод"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
 msgid "Tamil (keyboard with numerals)"
 msgstr "тамилска — с таймилски цифри"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
 msgid "Tatar"
 msgstr "татарска"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
 msgid "Telugu"
 msgstr "телугу"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
 msgid "Thai"
 msgstr "тайландска"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
 msgid "Thai (Pattachote)"
 msgstr "тайландска — патачотска"
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:751
 msgid "Thai (TIS-820.2538)"
 msgstr "тайландска — TIS-820.2538"
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
 msgid "Tibetan"
 msgstr "тибетска"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
 msgid "Tibetan (with ASCII numerals)"
 msgstr "тибетска — с цифри от ASCII"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "към съответния клавиш в Dvorak"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "към съответния клавиш Qwerty"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Включване на клавиши за придвижване чрез Shift+Num Lock"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:758
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic — безжична"
 
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
 msgid "Tswana"
 msgstr "тсуанска"
 
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:762
 msgid "Turkish"
 msgstr "турска"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (Alt-Q)"
 msgstr "турска — „Q“ горе-вляво, алтернативна"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
 msgid "Turkish (F)"
 msgstr "турска — „F“ горе-вляво"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
 msgid "Turkish (Sun dead keys)"
 msgstr "турска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
 msgid "Turkish (international with dead keys)"
 msgstr "турска — международна, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:767
 msgid "Turkmen"
 msgstr "тюркменска"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
 msgid "Turkmen (Alt-Q)"
 msgstr "тюркменска — „Q“ горе-вляво, алтернативна"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:772
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB — режим 102/105:EU"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:773
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB — режим 106:JP"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:774
 msgid "Udmurt"
 msgstr "удмуртска"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian"
 msgstr "украинска"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (WinKeys)"
 msgstr "украинска — с клавиши на Windows"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "украинска — еднозвучна, алтернативна"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (legacy)"
 msgstr "украинска — остаряла"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
 msgid "Ukrainian (phonetic)"
 msgstr "украинска — фонетична"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
 msgid "Ukrainian (standard RSTU)"
 msgstr "украинска — републикански стандарт"
 
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
 msgid "Ukrainian (typewriter)"
 msgstr "украинска — за пишеща машина"
 
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:782
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Допълненията от Уникод (стрелки и математически операции)"
 
-#: ../rules/base.xml.in.h:780
-msgid ""
-"Unicode additions (arrows and math operators). Math operators on default "
-"level"
-msgstr ""
-"Допълненията от Уникод (стрелки и математически операции). Операциите са на "
-"стандартното ниво"
+#: ../rules/base.xml.in.h:783
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:784
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (Pakistan)"
 msgstr "урду — пакистанска"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "урду — пакистанска, CRULP"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (Pakistan, NLA)"
 msgstr "урду — пакистанска, NLA"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
 msgid "Urdu (WinKeys)"
 msgstr "урду — с клавиши на Windows"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:789
 msgid "Urdu (alternative phonetic)"
 msgstr "урду — фонетична, алтернативна"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
 msgid "Urdu (phonetic)"
 msgstr "урду — фонетична"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Индикация чрез клавиатурен светодиод за смяна на подредбата"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:792
 msgid "Using space key to input non-breakable space character"
 msgstr "Генериране на интервал без разделяне с клавишa за интервал"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:793
 msgid "Usual space at any level"
 msgstr "Нормален интервал на всички нива"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:794
 msgid "Uyghur"
 msgstr "уйгурска"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek"
 msgstr "узбекска"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
 msgid "Uzbek (Afghanistan)"
 msgstr "узбекска — афганистанска"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "узбекска — афганистанска, OLPC"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
 msgid "Uzbek (Latin)"
 msgstr "узбекска — латиница"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
 msgid "Vietnamese"
 msgstr "виетнамска"
 
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard — за Интернет"
 
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
-msgstr ""
-"Цифрова клавиатура — Wang 724, с допълненията от Уникод (стрелки и "
-"математически операции)"
+msgstr "Цифрова клавиатура — Wang 724, с допълненията от Уникод (стрелки и математически операции)"
 
-#: ../rules/base.xml.in.h:799
-msgid ""
-"Wang 724 keypad with Unicode additions (arrows and math operators). Math "
-"operators on default level"
-msgstr ""
-"Цифрова клавиатура Wang 724, с допълненията от Уникод (стрелки и "
-"математически операции). Операциите са на стандартното ниво"
+#: ../rules/base.xml.in.h:802
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Цифрова клавиатура Wang 724, с допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:803
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
 msgid "Wolof"
 msgstr "Уолоф"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard — за Интернет"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
 msgid "Yakut"
 msgstr "якутска"
 
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
 msgid "Yoruba"
 msgstr "йоруба"
 
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level"
 msgstr "Разделител с нулева широчина на второ ниво"
 
-#: ../rules/base.xml.in.h:806
-msgid ""
-"Zero-width non-joiner character at second level, non-breakable space "
-"character at third level"
-msgstr ""
-"Разделител с нулева широчина на второ ниво и интервал без разделяне на трето "
-"ниво"
-
-#: ../rules/base.xml.in.h:807
-msgid ""
-"Zero-width non-joiner character at second level, non-breakable space "
-"character at third level, nothing at fourth level"
-msgstr ""
-"Разделител с нулева широчина на второ ниво, интервал без разделяне на трето "
-"ниво и нищо на четвърто ниво"
-
-#: ../rules/base.xml.in.h:808
-msgid ""
-"Zero-width non-joiner character at second level, non-breakable space "
-"character at third level, thin non-breakable space at fourth level"
-msgstr ""
-"Разделител с нулева широчина на второ ниво, интервал без разделяне на трето "
-"ниво и тесен интервал без разделяне на четвърто ниво"
-
 #: ../rules/base.xml.in.h:809
-msgid ""
-"Zero-width non-joiner character at second level, non-breakable space "
-"character at third level, zero-width joiner at fourth level"
-msgstr ""
-"Разделител с нулева широчина на второ ниво, интервал без разделяне на трето "
-"ниво и съединител с нулева широчина на четвърто ниво"
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
+msgstr "Разделител с нулева широчина на второ ниво и интервал без разделяне на трето ниво"
 
 #: ../rules/base.xml.in.h:810
-msgid ""
-"Zero-width non-joiner character at second level, zero-width joiner character "
-"at third level"
-msgstr ""
-"Разделител с нулева широчина на второ ниво и съединител с нулева широчина на "
-"трето ниво"
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
+msgstr "Разделител с нулева широчина на второ ниво, интервал без разделяне на трето ниво и нищо на четвърто ниво"
 
 #: ../rules/base.xml.in.h:811
-msgid ""
-"Zero-width non-joiner character at second level, zero-width joiner character "
-"at third level, non-breakable space character at fourth level"
-msgstr ""
-"Разделител с нулева широчина на второ ниво, съединител с нулева широчина на "
-"трето ниво и интервал без разделяне на четвърто ниво"
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
+msgstr "Разделител с нулева широчина на второ ниво, интервал без разделяне на трето ниво и тесен интервал без разделяне на четвърто ниво"
 
 #: ../rules/base.xml.in.h:812
-msgid ""
-"Zero-width non-joiner character at third level, zero-width joiner at fourth "
-"level"
-msgstr ""
-"Разделител с нулева широчина на трето ниво и съединител с нулева широчина на "
-"четвърто ниво"
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
+msgstr "Разделител с нулева широчина на второ ниво, интервал без разделяне на трето ниво и съединител с нулева широчина на четвърто ниво"
 
 #: ../rules/base.xml.in.h:813
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
+msgstr "Разделител с нулева широчина на второ ниво и съединител с нулева широчина на трето ниво"
+
+#: ../rules/base.xml.in.h:814
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
+msgstr "Разделител с нулева широчина на второ ниво, съединител с нулева широчина на трето ниво и интервал без разделяне на четвърто ниво"
+
+#: ../rules/base.xml.in.h:815
+msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
+msgstr "Разделител с нулева широчина на трето ниво и съединител с нулева широчина на четвърто ниво"
+
+#: ../rules/base.xml.in.h:816
 msgid "ak"
 msgstr "Акн"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:817
 msgid "am"
 msgstr "Амх"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
 msgid "ar"
 msgstr "Арб"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
 msgid "avn"
 msgstr "Авт"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:820
 msgid "az"
 msgstr "Азр"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
 msgid "be"
 msgstr "Бел"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
 msgid "ber"
 msgstr "Брб"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
 msgid "bg"
 msgstr "Бъл"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
 msgid "bm"
 msgstr "Бмб"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
 msgid "bn"
 msgstr "Бнг"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
 msgid "brl"
 msgstr "Брл"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
 msgid "bs"
 msgstr "Бсн"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
 msgid "ca"
 msgstr "Ктл"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
 msgid "chr"
 msgstr "Чрк"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
 msgid "cm"
 msgstr "Кмр"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:831 ../rules/base.extras.xml.in.h:38
 msgid "crh"
 msgstr "Ттр"
 
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
 msgid "cs"
 msgstr "Чшк"
 
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
 msgid "da"
 msgstr "Дтс"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:39
 msgid "de"
 msgstr "Нмс"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
 msgid "dv"
 msgstr "Две"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
 msgid "dz"
 msgstr "Дзн"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
 msgid "ee"
 msgstr "Еве"
 
-#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:40
 msgid "en"
 msgstr "Анг"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
 msgid "eo"
 msgstr "Есп"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
 msgid "es"
 msgstr "Исп"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
 msgid "et"
 msgstr "Ест"
 
-#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:41
 msgid "fa"
 msgstr "Прс"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
 msgid "ff"
 msgstr "Фла"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
 msgid "fi"
 msgstr "Фнл"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
 msgid "fo"
 msgstr "Фрр"
 
-#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:846 ../rules/base.extras.xml.in.h:42
 msgid "fr"
 msgstr "Фрн"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
 msgid "gaa"
 msgstr "Га "
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
 msgid "gr"
 msgstr "Грц"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:849
 msgid "gu"
 msgstr "Гдж"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
 msgid "ha"
 msgstr "Хск"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
 msgid "he"
 msgstr "Ивр"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:852
 msgid "hi"
 msgstr "Хнд"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
 msgid "hr"
 msgstr "Хрв"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
 msgid "hu"
 msgstr "Унг"
 
-#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
+#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:43
 msgid "hy"
 msgstr "Арм"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
 msgid "ie"
 msgstr "Ирл"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
 msgid "ig"
 msgstr "Игб"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:858
 msgid "ike"
 msgstr "Еск"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
 msgid "in"
 msgstr "Инд"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
 msgid "is"
 msgstr "Еск"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
 msgid "it"
 msgstr "Итл"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
 msgid "ja"
 msgstr "Япн"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:863
 msgid "ka"
 msgstr "Грз"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
 msgid "ki"
 msgstr "Крг"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
 msgid "kk"
 msgstr "Кзх"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
 msgid "km"
 msgstr "Кхм"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:867
 msgid "kn"
 msgstr "Кнр"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
 msgid "ko"
 msgstr "Крс"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
 msgid "ku"
 msgstr "Крд"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
 msgid "lo"
 msgstr "Лск"
 
-#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:871 ../rules/base.extras.xml.in.h:45
 msgid "lt"
 msgstr "Лит"
 
-#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:46
 msgid "lv"
 msgstr "Лат"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:873
 msgid "mi"
 msgstr "Мрс"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
 msgid "mk"
 msgstr "Мкд"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
 msgid "ml"
 msgstr "Млл"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
 msgid "mn"
 msgstr "Мнг"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
 msgid "mt"
 msgstr "Млт"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:878
 msgid "my"
 msgstr "Брм"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
 msgid "ne"
 msgstr "Нпл"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
 msgid "nl"
 msgstr "Хлн"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:881
 msgid "no"
 msgstr "Нрв"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
 msgid "or"
 msgstr "Ори"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
 msgid "pa"
 msgstr "Пнд"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
 msgid "ph"
 msgstr "Флп"
 
-#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:47
 msgid "pl"
 msgstr "Плс"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
 msgid "ps"
 msgstr "Пщн"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
 msgid "pt"
 msgstr "Прт"
 
-#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
+#: ../rules/base.xml.in.h:888 ../rules/base.extras.xml.in.h:48
 msgid "ro"
 msgstr "Рмн"
 
-#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:889 ../rules/base.extras.xml.in.h:49
 msgid "ru"
 msgstr "Рск"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
 msgid "sd"
 msgstr "Снд"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
 msgid "si"
 msgstr "Снх"
 
 # славашка
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
 msgid "sk"
 msgstr "Слш"
 
 # славенска
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
 msgid "sl"
 msgstr "Слн"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
 msgid "sq"
 msgstr "Алб"
 
-#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
+#: ../rules/base.xml.in.h:895 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "Срб"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
 msgid "sv"
 msgstr "Швд"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
 msgid "sw"
 msgstr "Схл"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
 msgid "syc"
 msgstr "Срк"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
 msgid "ta"
 msgstr "Тмл"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
 msgid "te"
 msgstr "Тлг"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
 msgid "tg"
 msgstr "Тдж"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
 msgid "th"
 msgstr "Тск"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
 msgid "tk"
 msgstr "Трк"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:904
 msgid "tn"
 msgstr "Тсн"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
 msgid "tr"
 msgstr "Трс"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
 msgid "uk"
 msgstr "Укр"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
 msgid "ur"
 msgstr "Урд"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
 msgid "uz"
 msgstr "Узб"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
 msgid "vi"
 msgstr "Втн"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:910
 msgid "wo"
 msgstr "Улф"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:911
 msgid "xsy"
 msgstr "Сст"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:912
 msgid "yo"
 msgstr "Йрб"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
 msgid "zh"
 msgstr "Ктс"
 
@@ -3824,6 +3710,10 @@ msgstr "Ктс"
 msgid "APL Keyboard Symbols"
 msgstr "знаци на клавишите в APL"
 
+#: ../rules/base.extras.xml.in.h:3
+msgid "Armenian (OLPC phonetic)"
+msgstr "арменска — фонетична, OLPC"
+
 #: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
 msgstr " ацинска"
@@ -3836,83 +3726,94 @@ msgstr "авестийска"
 msgid "Couer D'alene Salish"
 msgstr "селиш на кор дален"
 
-#: ../rules/base.extras.xml.in.h:8
+#: ../rules/base.extras.xml.in.h:7
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "кримски татарски — „Q“ горе-вляво, Добруджа-Q"
+
+#: ../rules/base.extras.xml.in.h:9
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "английска — международна, с комбинации по Уникод чрез AltGr"
 
-#: ../rules/base.extras.xml.in.h:9
+#: ../rules/base.extras.xml.in.h:10
 msgid "English (US, international AltGr Unicode combining, alternative)"
-msgstr ""
-"английска — международна, с комбинации по Уникод чрез AltGr, алтернативна"
+msgstr "английска — международна, с комбинации по Уникод чрез AltGr, алтернативна"
+
+#: ../rules/base.extras.xml.in.h:13
+msgid "German (US keyboard with German letters)"
+msgstr "немска — американска с немски букви"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "немска — унгарски букви, без „мъртви“ клавиши"
+
+#: ../rules/base.extras.xml.in.h:15
 msgid "Kutenai"
 msgstr "кутенейска"
 
-#: ../rules/base.extras.xml.in.h:13
+#: ../rules/base.extras.xml.in.h:17
 msgid "Latvian (US Colemak)"
 msgstr "латвийска — американска, Коулмак"
 
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:18
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "латвийска — американска, Коулмак, с „'“"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:19
 msgid "Latvian (US Dvorak)"
 msgstr "латвийска — американска, Дворак"
 
-#: ../rules/base.extras.xml.in.h:16
+#: ../rules/base.extras.xml.in.h:20
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "латвийска — американска, Дворак, „Y“ при интервала"
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "латвийска — американска, Дворак, „-“ при интервала"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (programmer US Dvorak)"
 msgstr "латвийска — американска, Дворак за програмисти"
 
-#: ../rules/base.extras.xml.in.h:19
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "латвийска — американска, Дворак за програмисти, „Y“ при интервала"
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "латвийска — американска, Дворак за програмисти, „-“ при интервала"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:26
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "литовска — американска, Дворак с литовски букви"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:29
 msgid "Polish (international with dead keys)"
 msgstr "полска — международна, с „мъртви“ клавиши"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:31
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "румънска — ергономична, десетопръстна"
 
-#: ../rules/base.extras.xml.in.h:29
-msgid "Russian (with UKR and BEL layout)"
-msgstr "руска — с украинска и белоруска подредби"
+#: ../rules/base.extras.xml.in.h:33
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "руска — с украинско-белоруска подредба"
 
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:34
 msgid "Secwepemctsin"
 msgstr "шъкуъпмъктчин"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "сръбска — комбиниращи ударения вместо „мъртви“ клавиши"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "apl"
 msgstr "APL"
 
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:44
 msgid "kut"
 msgstr "Ктн"
 
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:50
 msgid "shs"
 msgstr "Шкп"
diff --git a/dist/xkeyboard-config/po/ca.po b/dist/xkeyboard-config/po/ca.po
index 5a7d737e4..b1e64c7f0 100644
--- a/dist/xkeyboard-config/po/ca.po
+++ b/dist/xkeyboard-config/po/ca.po
@@ -5,10 +5,10 @@
 # Josep Ma. Ferrer <txemaq@gmail.com>, 2007, 2008, 2009, 2010, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.3\n"
+"Project-Id-Version: xkeyboard-config-2.3.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-17 21:08+0100\n"
-"PO-Revision-Date: 2011-05-19 21:32+0200\n"
+"POT-Creation-Date: 2011-09-15 21:25+0100\n"
+"PO-Revision-Date: 2011-09-17 20:45+0200\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "Language: ca\n"
@@ -214,7 +214,7 @@ msgstr "Armeni"
 msgid "Armenian (alternative eastern)"
 msgstr "Armeni (oriental alternatiu)"
 
-#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:50
 msgid "Armenian (alternative phonetic)"
 msgstr "Armeni (fonètic alternatiu)"
 
@@ -375,3278 +375,3290 @@ msgid "Bengali"
 msgstr "Bengalí"
 
 #: ../rules/base.xml.in.h:90
+msgid "Bengali (Baishakhi Inscript)"
+msgstr "Bengalí (Inscript Baishakhi)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bengali (Baishakhi)"
+msgstr "Bengalí (Baishakhi)"
+
+#: ../rules/base.xml.in.h:92
+msgid "Bengali (Bornona)"
+msgstr "Bengalí (Bornona)"
+
+#: ../rules/base.xml.in.h:93
 msgid "Bengali (Probhat)"
 msgstr "Bengalí (Probhat)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:94
+msgid "Bengali (Uni Gitanjali)"
+msgstr "Bengalí (Uni Gitanjali)"
+
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berber (Marroc, Tifinagh fonètic alternatiu)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berber (Marroc, Tifinagh alternatiu)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:97
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berber (Marroc, Tifinagh fonètic ampliat)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:98
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berber (Marroc, Tifinagh ampliat)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:99
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berber (Marroc, Tifinagh fonètic)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:100
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berber (Marroc, Tifinagh)"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian"
 msgstr "Bosnià"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:102
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosnià (teclat EUA amb dígrafs bosnians)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:103
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosnià (teclat EUA amb lletres bosnianes)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:104
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosnià (usa dígrafs bosnians)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:105
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosnià (usa cometes angulars per les cometes)"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Les dues tecles Alt juntes"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Les dues tecles Ctrl juntes"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Les dues tecles Maj juntes"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:109
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Les dues tecles Maj juntes commuten Bloq Maj, una tecla Maj ho desactiva"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:110
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Les dues tecles Maj juntes commuten Bloq Maj"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:111
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Les dues tecles Maj juntes commuten Bloq Maj"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:112
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:113
 msgid "Braille (left hand)"
 msgstr "Braille (ma esquerra)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:114
 msgid "Braille (right hand)"
 msgstr "Braille (ma dretà)"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:115
 msgid "Brother Internet Keyboard"
 msgstr "Teclat Brother Internet"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:116
 msgid "Bulgarian"
 msgstr "Búlgar"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:117
 msgid "Bulgarian (new phonetic)"
 msgstr "Búlgar (fonètic nou)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:118
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Búlgar (fonètic tradicional)"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:119
 msgid "Burmese"
 msgstr "Birmà"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:120
+msgid "Cameroon Multilingual (azerty)"
+msgstr "Camerun multilingüe (azerty)"
+
+#: ../rules/base.xml.in.h:121
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "Camerun multilingüe (qwerty)"
+
+#: ../rules/base.xml.in.h:122
 msgid "Canadian Multilingual"
 msgstr "Canadenc multilingüe"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:123
 msgid "Canadian Multilingual (first part)"
 msgstr "Canadenc multilingüe (primera part)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:124
 msgid "Canadian Multilingual (second part)"
 msgstr "Canadenc multilingüe (segona part)"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock"
 msgstr "Bloq Majús"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr "Bloq Maj (selecciona el nivell 3r, bloqueja en prémer conjuntament amb un altre selector de nivell 3r)"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Bloq Maj (a la primera disposició), Maj+Bloq Maj (a la darrera disposició)"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Bloq Maj (mentre està premuda), Alt+Bloq Maj efectua l'acció de Bloq Maj original"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Bloq Maj actua com a Maj amb bloqueig. Maj «pausa» Bloq Maj"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Bloq Maj actua com a Maj amb bloqueig. Maj no afecta a Bloq Maj"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:131
+msgid "Caps Lock as Ctrl"
+msgstr "Bloq Majús com a Ctrl"
+
+#: ../rules/base.xml.in.h:132
 msgid "Caps Lock is disabled"
 msgstr "Bloq Maj està deshabilitat"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:133
 msgid "Caps Lock key behavior"
 msgstr "Comportament de la tecla Bloq Maj"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:134
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Bloq Maj commuta Maj, de manera que afecta a totes les tecles"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:135
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Bloq Maj commuta les majúscules normals dels caràcters alfabètics"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:136
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Bloq Maj usa internament les majúscules. Maj «pausa» Bloq Maj"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:137
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Bloq Maj usa internament les majúscules. Maj no afecta a Bloq Maj"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:138
 msgid "Catalan"
 msgstr "Català"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:139
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Català (Espanya, L amb punt volat)"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:140
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:141
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:142
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:143
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (opció alternativa)"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:144
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:145
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:146
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:147
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:148
 msgid "Chicony Internet Keyboard"
 msgstr "Teclat Chicony Internet"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:149
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:150
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:151
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:152
 msgid "Chinese"
 msgstr "Xinès"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:153
 msgid "Chuvash"
 msgstr "Chuvash"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:154
 msgid "Chuvash (Latin)"
 msgstr "Chuvash (llatí)"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:155
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:156
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Easy Access Keyboard"
 msgstr "Teclat Compaq Easy Access"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Teclat Compaq Internet (13 tecles)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Teclat Compaq Internet (18 tecles)"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:160
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Teclat Compaq Internet (7 tecles)"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:161
 msgid "Compaq iPaq Keyboard"
 msgstr "Teclat Compaq iPaq"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:162
 msgid "Compose key position"
 msgstr "Posició de la tecla Compose"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Retrocés"
 
-#: ../rules/base.xml.in.h:157
+#: ../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:158
+#: ../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:159
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:160
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "Tàtar de Crimea (Dobruja Q)"
-
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Tàtar de Crimea (Turc Alt-Q)"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Tàtar de Crimea (Turc F)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Tàtar de Crimea (Turc Q)"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Croatian"
 msgstr "Croat"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Croat (teclat EUA amb dígrafs croats)"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:172
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Croat (teclat EUA amb lletres croates)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Croat (usa dígrafs croats)"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:174
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Croat (usa cometes angulars per les cometes)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:175
 msgid "Ctrl key position"
 msgstr "Posició de la tecla Ctrl"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:176
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Maj"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:177
 msgid "Czech"
 msgstr "Txec"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Txec (disposició UCW, només lletres accentuades)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Txec (dvorak EUA que permet UCW CZ)"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:180
 msgid "Czech (qwerty)"
 msgstr "Txec (qwerty)"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:181
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Txec (qwerty, barra inversa ampliada)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Txec (amb la tecla &lt;\\|&gt;)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Danish"
 msgstr "Danès"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Danish (Dvorak)"
 msgstr "Danès (dvorak)"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Danish (Macintosh)"
 msgstr "Danès (Macintosh)"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Danès (Macintosh, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Danish (eliminate dead keys)"
 msgstr "Danès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Default numeric keypad keys"
 msgstr "Tecles del teclat numèric per defecte"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell 101-key PC"
 msgstr "Dell PC 101 tecles"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Portàtil Dell Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Portàtil Dell sèrie Precision M"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dell Latitude series laptop"
 msgstr "Portàtil Dell sèrie Latitude"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:197
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Teclat Dell USB Multimedia"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Teclat Dexxa Wireless Desktop"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dhivehi"
 msgstr "Diveí"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond sèries 9801 / 9802"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
 msgid "Dutch"
 msgstr "Holandès"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:203
 msgid "Dutch (Macintosh)"
 msgstr "Holandès (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:204
 msgid "Dutch (Sun dead keys)"
 msgstr "Holandès (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:205
 msgid "Dutch (standard)"
 msgstr "Holandès (estàndard)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:206
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:207
 msgid "Enable extra typographic characters"
 msgstr "Habilita els caràcters tipogràfics extres"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:208
 msgid "English (Cameroon Dvorak)"
 msgstr "Anglès (dvorak del Camerun)"
 
-#: ../rules/base.xml.in.h:203
-msgid "English (Cameroon qwerty)"
-msgstr "Anglès (qwerty del Camerun)"
-
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:209
 msgid "English (Cameroon)"
 msgstr "Anglès (Camerun)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:210
 msgid "English (Canada)"
 msgstr "Anglès (Canadà)"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:211
 msgid "English (Colemak)"
 msgstr "Anglès (Colemak)"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:212
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Anglès (dvorak internacional alternatiu sense tecles mortes)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:213
 msgid "English (Dvorak international with dead keys)"
 msgstr "Anglès (dvorak internacional amb tecles mortes)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:214
 msgid "English (Dvorak)"
 msgstr "Anglès (dvorak)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:215
 msgid "English (Ghana)"
 msgstr "Anglès (Ghana)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:216
 msgid "English (Ghana, GILLBT)"
 msgstr "Anglès (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:217
 msgid "English (Ghana, multilingual)"
 msgstr "Anglès (Ghana, multilingüe)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:218
 msgid "English (India, with RupeeSign)"
 msgstr "Anglès (Índia, amb signe de rupia)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:219
 msgid "English (Macintosh)"
 msgstr "Anglès (Macintosh)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:220
 msgid "English (Mali, US Macintosh)"
 msgstr "Anglès (Mali, Macintosh EUA)"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:221
 msgid "English (Mali, US international)"
 msgstr "Anglès (Mali, internacional EUA)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:222
 msgid "English (Nigeria)"
 msgstr "Anglès (Nigèria)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:223
 msgid "English (South Africa)"
 msgstr "Anglès (Sud-àfrica)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:224
 msgid "English (UK)"
 msgstr "Anglès (RU)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:225
 msgid "English (UK, Colemak)"
 msgstr "Anglès (RU, Colemak)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Anglès (RU, dvorak amb puntuació RU)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:227
 msgid "English (UK, Dvorak)"
 msgstr "Anglès (RU, dvorak)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:228
 msgid "English (UK, Macintosh international)"
 msgstr "Anglès (RU, Macintosh internacional)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:229
 msgid "English (UK, Macintosh)"
 msgstr "Anglès (RU, Macintosh)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:230
 msgid "English (UK, extended WinKeys)"
 msgstr "Anglès (RU, tecles Win ampliades)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:231
 msgid "English (UK, international with dead keys)"
 msgstr "Anglès (RU, internacional amb tecles mortes)"
 
-#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:232 ../rules/base.extras.xml.in.h:8
 msgid "English (US)"
 msgstr "Anglès (EUA)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:233
 msgid "English (US, alternative international)"
 msgstr "Anglès (EUA, internacional alternatiu)"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:234
 msgid "English (US, international with dead keys)"
 msgstr "Anglès (EUA, internacional amb tecles mortes)"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:235
 msgid "English (US, with euro on 5)"
 msgstr "Anglès (EUA, amb l'euro en el 5)"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:236
 msgid "English (classic Dvorak)"
 msgstr "Anglès (dvorak clàssic)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:237
 msgid "English (international AltGr dead keys)"
 msgstr "Anglès (internacional tecles mortes AltGr)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:238
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Anglès (commutació de disposició en la tecla de multiplicació/divisió)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:239
 msgid "English (left handed Dvorak)"
 msgstr "Anglès (dvorak esquerrà)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:240
 msgid "English (programmer Dvorak)"
 msgstr "Anglès (dvorak de programador)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:241
 msgid "English (right handed Dvorak)"
 msgstr "Anglès (dvorak dretà)"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:242
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:243
 msgid "Enter on keypad"
 msgstr "Retorn en el teclat numèric"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:244
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:245
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Esperanto (Portugal, natiu)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:246
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (punt i coma i cometa desplaçats, obsolet)"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:247
 msgid "Estonian"
 msgstr "Estonià"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:248
 msgid "Estonian (Dvorak)"
 msgstr "Estonià (dvorak)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:249
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estonià (teclat EUA amb lletres estonianes)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:250
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estonià (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:251
 msgid "Euro on 2"
 msgstr "Euro en el 2"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:252
 msgid "Euro on 4"
 msgstr "Euro en el 4"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:253
 msgid "Euro on 5"
 msgstr "Euro en el 5"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:254
 msgid "Euro on E"
 msgstr "Euro en la E "
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:255
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:256
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:257
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:258
 msgid "Faroese"
 msgstr "Feroès"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:259
 msgid "Faroese (eliminate dead keys)"
 msgstr "Feroès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:260
 msgid "Filipino"
 msgstr "Filipí"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filipí (Capewell-dvorak Baybayin)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:262
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filipí (Capewell-dvorak llatí)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filipí (Capewell-QWERF 2006 Baybayin)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filipí (Capewell-QWERF 2006 llatí)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:265
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filipí (Colemak Baybayin)"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:266
 msgid "Filipino (Colemak Latin)"
 msgstr "Filipí (Colemak llatí)"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:267
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Filipí (dvorak Baybayin)"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:268
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filipí (dvorak llatí)"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:269
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filipí (QWERTY Baybayin)"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:270
 msgid "Finnish"
 msgstr "Finès"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:271
 msgid "Finnish (Macintosh)"
 msgstr "Finès (Macintosh)"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:272
 msgid "Finnish (classic)"
 msgstr "Finès (clàssic)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:273
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finès (clàssic, elimina les tecles mortes)"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:276
 msgid "Four-level key with abstract separators"
 msgstr "Tecla de quatre nivells amb separadors abstractes"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:277
 msgid "Four-level key with comma"
 msgstr "Tecla de quatre nivells amb coma"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:278
 msgid "Four-level key with dot"
 msgstr "Tecla de quatre nivells amb punt"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:279
 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:275
+#: ../rules/base.xml.in.h:280
 msgid "Four-level key with momayyez"
 msgstr "Tecla de quatre nivells amb momayyez"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:281
 msgid "French"
 msgstr "Francès"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:282
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Francès (Bepo, ergonòmic, tipus dvorak)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:283
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Francès (Bepo, ergonòmic, tipus dvorak, només latin-9)"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:284
 msgid "French (Breton)"
 msgstr "Francès (Bretó)"
 
-#: ../rules/base.xml.in.h:280
-msgid "French (Cameroon azerty)"
-msgstr "Francès (azerty del Camerun)"
-
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:285
 msgid "French (Cameroon)"
 msgstr "Francès (Camerun)"
 
-#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:286 ../rules/base.extras.xml.in.h:11
 msgid "French (Canada)"
 msgstr "Francès (Canadà)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:287
 msgid "French (Canada, Dvorak)"
 msgstr "Francès (Canadà, dvorak)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:288
 msgid "French (Canada, legacy)"
 msgstr "Francès (Canadà, antic)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:289
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Francès (República Democràtica del Congo)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:290
 msgid "French (Dvorak)"
 msgstr "Francès (dvorak)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:291
 msgid "French (Guinea)"
 msgstr "Francès (Guinea)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:292
 msgid "French (Macintosh)"
 msgstr "Francès (Macintosh)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:293
 msgid "French (Mali, alternative)"
 msgstr "Francès (Mali, alternatiu)"
 
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:294
 msgid "French (Morocco)"
 msgstr "Francès (Marroc)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:295
 msgid "French (Sun dead keys)"
 msgstr "Francès (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:296
 msgid "French (Switzerland)"
 msgstr "Francès (Suïssa)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:297
 msgid "French (Switzerland, Macintosh)"
 msgstr "Francès (Suïssa, Macintosh)"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:298
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Francès (Suïssa, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:299
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Francès (Suïssa, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:300
 msgid "French (alternative)"
 msgstr "Francès (alternatiu)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:301
 msgid "French (alternative, Sun dead keys)"
 msgstr "Francès (alternatiu, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:302
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Francès (alternatiu, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:303
 msgid "French (alternative, latin-9 only)"
 msgstr "Francès (alternatiu, només latin-9)"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:304
 msgid "French (eliminate dead keys)"
 msgstr "Francès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:305
 msgid "French (legacy, alternative)"
 msgstr "Francès (antic, alternatiu)"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:306
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Francès (antic, alternatiu, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:307
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Francès (antic, alternatiu, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:308
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO portàtil"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:309
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:310
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:311
 msgid "Generic 101-key PC"
 msgstr "PC genèric de 101 tecles"
 
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:312
 msgid "Generic 102-key (Intl) PC"
 msgstr "PC genèric de 102 tecles (intl)"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:313
 msgid "Generic 104-key PC"
 msgstr "PC genèric de 104 tecles"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:314
 msgid "Generic 105-key (Intl) PC"
 msgstr "PC genèric de 105 tecles (intl)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:315
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:316
 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:313
+#: ../rules/base.xml.in.h:317
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:318
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:319
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:320
 msgid "Georgian"
 msgstr "Georgià"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:321
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Georgià (França, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:322
 msgid "Georgian (Italy)"
 msgstr "Georgià (Itàlia)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:323
 msgid "Georgian (MESS)"
 msgstr "Georgià (MESS)"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:324
 msgid "Georgian (ergonomic)"
 msgstr "Georgià (ergonòmic)"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:325 ../rules/base.extras.xml.in.h:12
 msgid "German"
 msgstr "Alemany"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:326
 msgid "German (Austria)"
 msgstr "Alemany (Àustria)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:327
 msgid "German (Austria, Macintosh)"
 msgstr "Alemany (Àustria, Macintosh)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:328
 msgid "German (Austria, Sun dead keys)"
 msgstr "Alemany (Àustria, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:329
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Alemany (Àustria, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:330
 msgid "German (Dvorak)"
 msgstr "Alemany (dvorak)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:331
 msgid "German (Macintosh)"
 msgstr "Alemany (Macintosh)"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:332
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Alemany (Macintosh, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:333
 msgid "German (Neo 2)"
 msgstr "Alemany (Neo 2)"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:334
 msgid "German (Sun dead keys)"
 msgstr "Alemany (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:335
 msgid "German (Switzerland)"
 msgstr "Alemany (Suïssa)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:336
 msgid "German (Switzerland, Macintosh)"
 msgstr "Alemany (Suïssa, Macintosh)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:337
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Alemany (Suïssa, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:338
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Alemany (Suïssa, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:339
 msgid "German (Switzerland, legacy)"
 msgstr "Alemany (Suïssa, antic)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:340
 msgid "German (dead acute)"
 msgstr "Alemany (accent mort)"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:341
 msgid "German (dead grave acute)"
 msgstr "Alemany (accent greu mort)"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:342
 msgid "German (eliminate dead keys)"
 msgstr "Alemany (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:339
-msgid "German (qwerty)"
-msgstr "Alemany (qwerty)"
-
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:343
 msgid "Greek"
 msgstr "Grec"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:344
 msgid "Greek (eliminate dead keys)"
 msgstr "Grec (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:345
 msgid "Greek (extended)"
 msgstr "Grec (ampliat)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:346
 msgid "Greek (polytonic)"
 msgstr "Grec (politònic)"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:347
 msgid "Greek (simple)"
 msgstr "Grec (senzill)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:348
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:349
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:350
 msgid "HTC Dream"
 msgstr "HTC Dream"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:351
 msgid "Happy Hacking Keyboard"
 msgstr "Teclat Happy Hacking"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:352
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Teclat Happy Hacking per a Mac"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:353
 msgid "Hausa"
 msgstr "Haussa"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:354
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:355
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Hebreu (bíblic, Tiro)"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:356
 msgid "Hebrew (lyx)"
 msgstr "Hebreu (lyx)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:357
 msgid "Hebrew (phonetic)"
 msgstr "Hebreu (fonètic)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Teclat Hewlett-Packard Internet"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard Mini 110 Notebook"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:367
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:368
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Teclat Hewlett-Packard SK-250x Multimedia"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:369
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:370
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:371
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (Bolnagri)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:372
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:373
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:374
 msgid "Htc Dream phone"
 msgstr "Telèfon HTC Dream"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian"
 msgstr "Hongarès"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Hongarès (101/qwerty/coma/tecles mortes)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Hongarès (101/qwerty/coma/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Hongarès (101/qwerty/punt/tecles mortes)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Hongarès (101/qwerty/punt/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Hongarès (101/qwertz/coma/tecles mortes)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Hongarès (101/qwertz/coma/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Hongarès (101/qwertz/punt/tecles mortes)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Hongarès (101/qwertz/punt/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Hongarès (102/qwerty/coma/tecles mortes)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Hongarès (102/qwerty/coma/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Hongarès (102/qwerty/punt/tecles mortes)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Hongarès (102/qwerty/punt/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Hongarès (102/qwertz/coma/tecles mortes)"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Hongarès (102/qwertz/coma/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Hongarès (102/qwertz/punt/tecles mortes)"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Hongarès (102/qwertz/punt/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:392
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Hongarès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:393
 msgid "Hungarian (qwerty)"
 msgstr "Hongarès (qwerty)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:394
 msgid "Hungarian (standard)"
 msgstr "Hongarès (estàndard)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:395
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper s'assigna a les tecles Win"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:396
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:397
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:398
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:399
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:400
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:401
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic"
 msgstr "Islandès"
 
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (Dvorak)"
 msgstr "Islandès (dvorak)"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:404
 msgid "Icelandic (Macintosh)"
 msgstr "Islandès (Macintosh)"
 
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:405
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islandès (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:406
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islandès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:407
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:408
 msgid "Indian"
 msgstr "Indi"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:409
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:410
 msgid "Iraqi"
 msgstr "Iraquià"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:411
 msgid "Irish"
 msgstr "Irlandès"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:412
 msgid "Irish (UnicodeExpert)"
 msgstr "Irlandès (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:413
 msgid "Italian"
 msgstr "Italià"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:414
 msgid "Italian (Macintosh)"
 msgstr "Italià (Macintosh)"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:415
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Italià (teclat EUA amb lletres italianes)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:416
 msgid "Italian (eliminate dead keys)"
 msgstr "Italià (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:417
 msgid "Japanese"
 msgstr "Japonès"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (Kana 86)"
 msgstr "Japonès (Kana 86)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (Kana)"
 msgstr "Japonès (Kana)"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:420
 msgid "Japanese (Macintosh)"
 msgstr "Japonès (Macintosh)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:421
 msgid "Japanese (OADG 109A)"
 msgstr "Japonès (OADG 109A)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:422
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japonès (sèries PC-98xx)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:423
 msgid "Japanese keyboard options"
 msgstr "Opcions del teclat japonès"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:424
 msgid "Kalmyk"
 msgstr "Calmuc"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:425
 msgid "Kana Lock key is locking"
 msgstr "La tecla de bloqueig Kana està blocant"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:426
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:427
 msgid "Kashubian"
 msgstr "Caixubi"
 
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:428
 msgid "Kazakh"
 msgstr "Kazakh"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:429
 msgid "Kazakh (with Russian)"
 msgstr "Kazakh (amb rus)"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:430
 msgid "Key sequence to kill the X server"
 msgstr "Seqüència de tecles per a matar el servidor X"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:431
 msgid "Key to choose 3rd level"
 msgstr "Tecla per a seleccionar el 3r nivell"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:432
 msgid "Key to choose 5th level"
 msgstr "Tecla per a seleccionar el 5è nivell"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:433
 msgid "Key(s) to change layout"
 msgstr "Tecla(es) per a canviar la disposició"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:434
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:435
 msgid "Khmer (Cambodia)"
 msgstr "Khmer (Cambotja)"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:436
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:437
 msgid "Kinesis"
 msgstr "Kinesis"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:438
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:439
 msgid "Korean"
 msgstr "Coreà"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:440
 msgid "Korean (101/104 key compatible)"
 msgstr "Coreà (compatible de 101/104 tecles)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurd (Iran, àrab-llatí)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iran, F)"
 msgstr "Kurd (Iran, F)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Kurd (Iran, llatí Alt-Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurd (Iran, llatí Q)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurd (Iraq, àrab-llatí)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurd (Iraq, F)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurd (Iraq, llatí Alt-Q)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurd (Iraq, llatí Q)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Syria, F)"
 msgstr "Kurd (Síria, F)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurd (Síria, llatí Alt-Q)"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurd (Síria, llatí Q)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:452
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurd (Turquia, F)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:453
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurd (Turquia, llatí Alt-Q)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:454
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurd (Turquia, llatí Q)"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:455
 msgid "Kyrgyz"
 msgstr "Kirguís"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:456
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirguís (fonètic)"
 
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:457
 msgid "Lao"
 msgstr "Laosià"
 
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:458
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Laosià (disposició estàndard proposada per STEA)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:459
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Teclat de portàtil Compaq (p.ex. Armada)"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:460
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Teclat Internet de portàtil Compaq (p.ex. Presario)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:461
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Portàtil eMachines m68xx"
 
-#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+#: ../rules/base.xml.in.h:462 ../rules/base.extras.xml.in.h:16
 msgid "Latvian"
 msgstr "Letó"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:463
 msgid "Latvian (F variant)"
 msgstr "Letó (variant F)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:464
 msgid "Latvian (adapted)"
 msgstr "Letó (adaptat)"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:465
 msgid "Latvian (apostrophe variant)"
 msgstr "Letó (variant amb apòstrof)"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:466
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Letó (ergonòmic, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:467
 msgid "Latvian (modern)"
 msgstr "Letó (modern)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:468
 msgid "Latvian (tilde variant)"
 msgstr "Letó (variant titlla)"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:469
 msgid "Left Alt"
 msgstr "Alt esquerra"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:470
 msgid "Left Alt (while pressed)"
 msgstr "Alt esquerra (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:471
 msgid "Left Alt is swapped with Left Win"
 msgstr "Alt esquerra està intercanviada amb la tecla Win esquerra"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:472
 msgid "Left Ctrl"
 msgstr "Ctrl esquerra"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:473
 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:471
+#: ../rules/base.xml.in.h:474
+msgid "Left Ctrl as Meta"
+msgstr "Ctrl esquerra com a Meta"
+
+#: ../rules/base.xml.in.h:475
 msgid "Left Ctrl+Left Shift"
 msgstr "Ctrl esquerra + Maj esquerra"
 
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:476
 msgid "Left Shift"
 msgstr "Maj esquerra"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:477
 msgid "Left Win"
 msgstr "Win esquerra"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:478
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Win esquerra (a la primera disposició), Win/Menú dreta (a la darrera disposició)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:479
 msgid "Left Win (while pressed)"
 msgstr "Win esquerra (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:480
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Win esquerra selecciona el nivell 5è, bloqueja en prémer conjuntament amb un altre selector de nivell 5è"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:481
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Win esquerra selecciona el nivell 5è, bloqueja en prémer conjuntament amb un altre selector de nivell 5è, una pulsació allibera el bloqueig"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:482
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Ctrl esquerra+Win esquerra (a la primera disposició), Ctrl dreta+Menú (a la segona disposició)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:483
 msgid "Legacy"
 msgstr "Antic"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:484
 msgid "Legacy Wang 724"
 msgstr "Wang 724 antic"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:486
 msgid "Legacy key with comma"
 msgstr "Tecla antiga amb coma"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:487
 msgid "Legacy key with dot"
 msgstr "Tecla antiga amb punt"
 
-#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+#: ../rules/base.xml.in.h:488 ../rules/base.extras.xml.in.h:25
 msgid "Lithuanian"
 msgstr "Lituà"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Lituà (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:490
 msgid "Lithuanian (LEKP)"
 msgstr "Lituà (LEKP)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:491
 msgid "Lithuanian (LEKPa)"
 msgstr "Lituà (LEKPa)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:492
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Lituà (teclat EUA amb lletres lituanes)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:493
 msgid "Lithuanian (standard)"
 msgstr "Lituà (estàndard)"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Access Keyboard"
 msgstr "Teclat Logitech Access"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop (opció alternativa)"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:500
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro (opció alternativa 2)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:504
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Logitech G15 amb tecles extres via G15daemon"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Generic Keyboard"
 msgstr "Teclat Logitech genèric"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Teclat Logitech Internet 350"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Internet Keyboard"
 msgstr "Teclat Logitech Internet"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:508
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Teclat Logitech Internet Navigator"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:509
 msgid "Logitech Media Elite Keyboard"
 msgstr "Teclat Logitech Media Elite"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:510
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Teclat Logitech Ultra-X Cordless Media Desktop"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:511
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Teclat Logitech Ultra-X"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:512
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Teclat Logitech diNovo Edge"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:513
 msgid "Logitech diNovo Keyboard"
 msgstr "Teclat Logitech diNovo"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:514
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:515
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Teclat Logitech iTouch Cordless (model Y-RB6)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:516
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Teclat Logitech iTouch Internet Navigator SE"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:517
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Teclat Logitech iTouch Internet Navigator SE (USB)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:518
 msgid "Lower Sorbian"
 msgstr "Baix sòrab"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:519
 msgid "Lower Sorbian (qwertz)"
 msgstr "Baix sòrab (qwertz)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:520
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:521
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Intl)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:522
 msgid "Macedonian"
 msgstr "Macedoni"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:523
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macedoni (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:524
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:525
 msgid "Macintosh Old"
 msgstr "Macintosh antic"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Converteix Bloq Maj en un Retrocés addicional"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Converteix Bloq Maj en un Bloq Núm addicional però manté el «keysym» «Caps_Lock»"
 
-#: ../rules/base.xml.in.h:524
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Converteix Bloq Maj en un Ctrl addicional"
-
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional ESC"
 msgstr "Converteix Bloq Maj en un Esc addicional"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:529
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Converteix Bloq Maj en un Hyper addicional"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:530
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Converteix Bloq Maj en un Bloq Núm addicional"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:531
 msgid "Make Caps Lock an additional Super"
 msgstr "Converteix Bloq Maj en un Super addicional"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:532
 msgid "Malayalam"
 msgstr "Malaiàlam"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:533
 msgid "Malayalam (Lalitha)"
 msgstr "Malaiàlam (Lalitha)"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:534
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malaiàlam (Inscript realçat, amb el signe de rupia)"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:535
 msgid "Maltese"
 msgstr "Maltès"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:536
 msgid "Maltese (with US layout)"
 msgstr "Maltès (amb disposició EUA)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:537
 msgid "Maori"
 msgstr "Maori"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:538
 msgid "Mari"
 msgstr "Mari"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:539
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:540
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Teclat Memorex MX2500 EZ-Access"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:541
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:542
 msgid "Menu"
 msgstr "Menú"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:543
+msgid "Menu as Right Ctrl"
+msgstr "Menú com a Ctrl dreta"
+
+#: ../rules/base.xml.in.h:544
 msgid "Meta is mapped to Left Win"
 msgstr "Meta s'assigna a la tecla Win esquerra"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:545
 msgid "Meta is mapped to Win keys"
 msgstr "Meta s'assigna a les tecles Win"
 
-#: ../rules/base.xml.in.h:542
-msgid "Meta on Left Ctrl"
-msgstr "Meta en el Ctrl esquerre"
-
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve Keyboard 2000"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Internet Keyboard"
 msgstr "Teclat Microsoft Internet"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Suec"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:550
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Teclat Microsoft Natural Elite"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Teclat Microsoft Natural Pro / Teclat Microsoft Internet Pro"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Teclat Microsoft Natural Pro OEM"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:553
 msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
 msgstr "Teclat Microsoft Natural Pro USB / Teclat Microsoft Internet Pro"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Teclat Microsoft Natural Wireless Ergonomic 4000"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:555
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Teclat Microsoft Natural Wireless Ergonomic 7000"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:556
 msgid "Microsoft Office Keyboard"
 msgstr "Teclat Microsoft Office"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:557
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Teclat Microsoft Wireless Multimedia 1.0A"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:558
 msgid "Miscellaneous compatibility options"
 msgstr "Opcions de compatibilitat diverses"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:559
 msgid "Mongolian"
 msgstr "Mongol"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin"
 msgstr "Montenegrí"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:561
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrí (ciríl·lic amb cometes angulars)"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:562
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrí (ciríl·lic)"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:563
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrí (ciríl·lic, Z i ZHE intercanviades)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Montenegrí (llatí Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:565
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Montenegrí (llatí Unicode)"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:566
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Montenegrí (llatí qwerty)"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:567
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrí (llatí amb cometes angulars)"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:568
 msgid "NICOLA-F style Backspace"
 msgstr "Retrocés estil NICOLA-F"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:569
 msgid "Nepali"
 msgstr "Nepalès"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at fourth level"
 msgstr "Caràcter d'espai sense salt al nivell quart"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Caràcter d'espai sense salt al nivell quart, i un caràcter d'espai fi sense salt al nivell sisè"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:572
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Caràcter d'espai sense salt al nivell quart, un caràcter d'espai fi sense salt al nivell sisè (via Ctrl+Maj)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at second level"
 msgstr "La tecla d'espai produeix un caràcter d'espai sense salt al nivell segon"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:574
 msgid "Non-breakable space character at third level"
 msgstr "La tecla d'espai produeix un caràcter d'espai sense salt al nivell tercer"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:575
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "La tecla d'espai produeix un caràcter d'espai sense salt al nivell tercer, i res al nivell quart"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:576
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "La tecla d'espai produeix un caràcter d'espai sense salt al nivell tercer, i un caràcter d'espai fi sense salt al nivell quart"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:577
 msgid "Northern Saami (Finland)"
 msgstr "Sami Nord (Finlàndia)"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:578
 msgid "Northern Saami (Norway)"
 msgstr "Sami Nord (Noruega)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:579
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Sami Nord (Noruega, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:580
 msgid "Northern Saami (Sweden)"
 msgstr "Sami del nord (Suècia)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:581
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:582
 msgid "Norwegian"
 msgstr "Noruec"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (Dvorak)"
 msgstr "Noruec (dvorak)"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:584
 msgid "Norwegian (Macintosh)"
 msgstr "Noruec (Macintosh)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:585
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Noruec (Macintosh, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:586
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Noruec (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:587
 msgid "Num Lock"
 msgstr "Bloq Núm"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:588
 msgid "Numeric keypad delete key behaviour"
 msgstr "Comportament de la tecla de supressió del teclat numèric"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:589
 msgid "Numeric keypad keys work as with Macintosh"
 msgstr "Les tecles del teclat numèric funcionen com al Macintosh"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:590
 msgid "Numeric keypad layout selection"
 msgstr "Selecció de la disposició del teclat numèric"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:591
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:592
 msgid "Occitan"
 msgstr "Occità"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:593
 msgid "Ogham"
 msgstr "Ogham"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:594
 msgid "Ogham (IS434)"
 msgstr "Ogham (IS434)"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:595
 msgid "Oriya"
 msgstr "Oriya"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:596
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Teclat Ortek MCK-800 MM/Internet"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:597
 msgid "Ossetian (Georgia)"
 msgstr "Osset (Geòrgia)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:598
 msgid "Ossetian (WinKeys)"
 msgstr "Osset (tecles Win)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:599
 msgid "Ossetian (legacy)"
 msgstr "Osset (antic)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:600
 msgid "PC-98xx Series"
 msgstr "Sèries PC-98xx"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:601
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Rutè Pannònic (homofònic)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:602
 msgid "Pashto"
 msgstr "Paixtu"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:603
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Paixtu (Afganistan, OLPC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:604
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:27
 msgid "Persian"
 msgstr "Persa"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:606
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persa (Afganistan, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:607
 msgid "Persian (with Persian Keypad)"
 msgstr "Persa (amb teclat persa)"
 
-#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:28
 msgid "Polish"
 msgstr "Polonès"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:609
 msgid "Polish (Dvorak)"
 msgstr "Polonès (dvorak)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:610
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Polonès (dvorak, cometes poloneses a la tecla 1)"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:611
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Polonès (dvorak, cometes poloneses a la tecla cometes)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:612
 msgid "Polish (programmer Dvorak)"
 msgstr "Polonès (dvorak de programador)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:613
 msgid "Polish (qwertz)"
 msgstr "Polonès (qwertz)"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese"
 msgstr "Portuguès"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil)"
 msgstr "Portuguès (Brasil)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portuguès (Brasil, dvorak)"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portuguès (Brasil, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:618
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portuguès (Brasil, natiu per a l'esperanto)"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:619
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portuguès (Brasil, natiu per als teclats EUA)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:620
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portuguès (Brasil, natiu)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Macintosh)"
 msgstr "Portuguès (Macintosh)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portuguès (Macintosh, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portuguès (Macintosh, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portuguès (natiu per als teclats EUA)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:625
 msgid "Portuguese (Nativo)"
 msgstr "Portuguès (natiu)"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:626
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portuguès (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:627
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portuguès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:628
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:629
 msgid "PrtSc"
 msgstr "ImprPant"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:630
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Panjabi (Gurmukhi Jhelum)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:631
 msgid "Punjabi (Gurmukhi)"
 msgstr "Panjabi (Gurmukhi)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:632
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt"
 msgstr "Alt dreta"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt (while pressed)"
 msgstr "Alt dreta (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:635
+msgid "Right Alt as Right Ctrl"
+msgstr "Alt dreta com a Ctrl dreta"
+
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Alt dreta selecciona el nivell 5è i activa el bloqueig de nivell 5è en prémer conjuntament amb un altre selector de nivell 5è, una pulsació allibera el bloqueig"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:637
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Alt dreta selecciona el nivell 5è, bloqueja en prémer conjuntament amb un altre selector de nivell 5è"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:638
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Alt dreta selecciona el nivell 5è, bloqueja en prémer conjuntament amb un altre selector de nivell 5è, una pulsació allibera el bloqueig"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:639
 msgid "Right Alt key never chooses 3rd level"
 msgstr "La tecla Alt dreta mai selecciona el 3r nivell"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:640
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Alt dreta, Maj+Alt dreta és la Multi_Key"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl"
 msgstr "Ctrl dreta"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:642
 msgid "Right Ctrl (while pressed)"
 msgstr "Ctrl dreta (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:643
 msgid "Right Ctrl as Right Alt"
 msgstr "Ctrl dreta com a Alt dreta"
 
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl is mapped to Menu"
-msgstr "Ctrl dreta s'assigna a Menú"
-
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:644
 msgid "Right Ctrl+Right Shift"
 msgstr "Ctrl dreta+Maj dreta"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:645
 msgid "Right Shift"
 msgstr "Maj dreta"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:646
 msgid "Right Win"
 msgstr "Win dreta"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:647
 msgid "Right Win (while pressed)"
 msgstr "Win dreta (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:648
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Win dreta selecciona el nivell 5è, bloqueja en prémer conjuntament amb un altre selector de nivell 5è"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:649
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Win dreta selecciona el nivell 5è, bloqueja en prémer conjuntament amb un altre selector de nivell 5è, una pulsació allibera el bloqueig"
 
-#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+#: ../rules/base.xml.in.h:650 ../rules/base.extras.xml.in.h:30
 msgid "Romanian"
 msgstr "Romanès"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (Germany)"
 msgstr "Romanès (Alemanya)"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Romanès (Alemanya, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (WinKeys)"
 msgstr "Romanès (tecles Win)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:654
 msgid "Romanian (cedilla)"
 msgstr "Romanès (ce trencada)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (standard cedilla)"
 msgstr "Romanès (ce trencada estàndard)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Romanès (estàndard)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:657
 msgid "Rupee on 4"
 msgstr "Rupia en el 4"
 
-#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:658 ../rules/base.extras.xml.in.h:32
 msgid "Russian"
 msgstr "Rus"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:659
 msgid "Russian (DOS)"
 msgstr "Rus (DOS)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Georgia)"
 msgstr "Rus (Geòrgia)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Germany, phonetic)"
 msgstr "Rus (alemany, fonètic)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Rus (Kazakhstan amb Kazakh)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:663
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Rus (Polònia, fonètic dvorak)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:664
 msgid "Russian (Sweden, phonetic)"
 msgstr "Rus (Suècia, fonètic)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:665
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Rus (Suècia, fonètic, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:666
 msgid "Russian (US, phonetic)"
 msgstr "Rus (EUA, fonètic)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:667
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Rus (Ucraïna, estàndard RSTU)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:668
 msgid "Russian (legacy)"
 msgstr "Rus (antic)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:669
 msgid "Russian (phonetic WinKeys)"
 msgstr "Rus (fonètic tecles Win)"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:670
 msgid "Russian (phonetic)"
 msgstr "Rus (fonètic)"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:671
 msgid "Russian (typewriter)"
 msgstr "Rus (màquina d'escriure)"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:672
 msgid "Russian (typewriter, legacy)"
 msgstr "Rus (màquina d'escriure, antic)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:673
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "Teclat SILVERCREST Multimedia Wireless"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:674
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:675
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:676
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:677
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:678
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:679
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:680
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Taiwan)"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:681
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:682
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:683
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:684
 msgid "Scroll Lock"
 msgstr "Bloq Despl"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:685
 msgid "Semi-colon on third level"
 msgstr "Punt i coma al tercer nivell"
 
-#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:686 ../rules/base.extras.xml.in.h:35
 msgid "Serbian"
 msgstr "Serbi"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbi (llatí Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbi (llatí Unicode)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:689
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbi (llatí qwerty)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbi (llatí amb cometes angulars)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (Latin)"
 msgstr "Serbi (llatí)"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:692
 msgid "Serbian (Russia)"
 msgstr "Serbi (Rússia)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:693
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Serbi (Z i ZHE intercanviades)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:694
 msgid "Serbian (with guillemets)"
 msgstr "Serbi (llatí amb cometes angulars)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:695
 msgid "Serbo-Croatian (US)"
 msgstr "Serbocroat (EUA)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:696
 msgid "Shift cancels Caps Lock"
 msgstr "Maj cancel·la Bloq Maj"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:697
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Maj no cancel·la Bloq Núm, en el seu lloc selecciona el 3r nivell"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:698
 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:696
+#: ../rules/base.xml.in.h:699
 msgid "Shift+Caps Lock"
 msgstr "Maj+Bloq Maj"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:700
 msgid "Sindhi"
 msgstr "Sindhi"
 
-#: ../rules/base.xml.in.h:698
-msgid "Sinhala"
-msgstr "Singalès"
+#: ../rules/base.xml.in.h:701
+msgid "Sinhala (phonetic)"
+msgstr "Singalès (fonètic)"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
 msgid "Slovak"
 msgstr "Eslovac"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
 msgid "Slovak (extended Backslash)"
 msgstr "Eslovac (barra inversa ampliada)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
 msgid "Slovak (qwerty)"
 msgstr "Eslovac (qwerty)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Eslovac (qwerty, barra inversa ampliada)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
 msgid "Slovenian"
 msgstr "Eslovè"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Eslovè (teclat EUA amb lletres eslovenes)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Eslovè (usa cometes angulars per les cometes)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
 msgid "Spanish"
 msgstr "Espanyol"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Dvorak)"
 msgstr "Espanyol (dvorak)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American)"
 msgstr "Espanyol (llatinoamericà)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Espanyol (llatinoamericà, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Espanyol (llatinoamericà, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Espanyol (llatinoamericà, inclou la titlla morta)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (Macintosh)"
 msgstr "Espanyol (Macintosh)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Spanish (Sun dead keys)"
 msgstr "Espanyol (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Spanish (eliminate dead keys)"
 msgstr "Espanyol (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Spanish (include dead tilde)"
 msgstr "Espanyol (inclou la titlla morta)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 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:717
+#: ../rules/base.xml.in.h:720
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Super Power Multimedia Keyboard"
 msgstr "Teclat Super Power Multimedia"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swahili (Kenya)"
 msgstr "Suahili (Kenya)"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swahili (Tanzania)"
 msgstr "Suahili (Tanzània)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Intercanvia Ctrl i Bloq Maj"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
 msgid "Swap ESC and Caps Lock"
 msgstr "Intercanvia Esc i Bloq Maj"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish"
 msgstr "Suec"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (Dvorak)"
 msgstr "Suec (dvorak)"
 
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:728
 msgid "Swedish (Macintosh)"
 msgstr "Suec (Macintosh)"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
 msgid "Swedish (Svdvorak)"
 msgstr "Suec (Svdvorak)"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:730
 msgid "Swedish (eliminate dead keys)"
 msgstr "Suec (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:728
+#: ../rules/base.xml.in.h:731
 msgid "Swedish Sign Language"
 msgstr "Idioma de signes suec"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:732
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
 msgid "Syriac"
 msgstr "Siri"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
 msgid "Syriac (phonetic)"
 msgstr "Siríac (fonètic)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
 msgid "Taiwanese"
 msgstr "Taiwanès"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
 msgid "Taiwanese (indigenous)"
 msgstr "Taiwanès (indígena)"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
 msgid "Tajik"
 msgstr "Tadjik"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
 msgid "Tajik (legacy)"
 msgstr "Tadjik (antic)"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
 msgid "Tamil"
 msgstr "Tàmil"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tàmil (Sri Lanka, tipus d'escriptura TAB)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tàmil (Sri Lanka, Unicode)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (TAB typewriter)"
 msgstr "Tàmil (tipus d'escriptura TAB)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tàmil (tipus d'escriptura TSCII)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
 msgid "Tamil (Unicode)"
 msgstr "Tàmil (Unicode)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tàmil (teclat amb nombres)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
 msgid "Tatar"
 msgstr "Tàtar"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
 msgid "Thai"
 msgstr "Tai"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
 msgid "Thai (Pattachote)"
 msgstr "Tai (Pattachote)"
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:751
 msgid "Thai (TIS-820.2538)"
 msgstr "Tai (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
 msgid "Tibetan"
 msgstr "Tibetà"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibetà (amb nombres ASCII)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "A la tecla corresponent en un teclat dvorak."
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "A la tecla corresponent en un teclat qwerty."
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Commuta les tecles de cursor amb Maj + BloqNum."
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:758
 msgid "Trust Direct Access Keyboard"
 msgstr "Teclat Trust Direct Access"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Teclat Trust Wireless Classic"
 
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
 msgid "Tswana"
 msgstr "Tswana"
 
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:762
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (Alt-Q)"
 msgstr "Turc (Alt-Q)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
 msgid "Turkish (F)"
 msgstr "Turc (F)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
 msgid "Turkish (Sun dead keys)"
 msgstr "Turc (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
 msgid "Turkish (international with dead keys)"
 msgstr "Turc (internacional amb tecles mortes)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:767
 msgid "Turkmen"
 msgstr "Turcman"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
 msgid "Turkmen (Alt-Q)"
 msgstr "Turcman (Alt-Q)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:772
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (mode 102/105:EU)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:773
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (mode 106:JP)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:774
 msgid "Udmurt"
 msgstr "Udmurt"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian"
 msgstr "Ucraïnès"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (WinKeys)"
 msgstr "Ucraïnès (tecles Win)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Ucraïnès (homofònic)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (legacy)"
 msgstr "Ucraïnès (antic)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
 msgid "Ukrainian (phonetic)"
 msgstr "Ucraïnès (fonètic)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ucraïnès (estàndard RSTU)"
 
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
 msgid "Ukrainian (typewriter)"
 msgstr "Ucraïnès (màquina d'escriure)"
 
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:782
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Addicions Unicode (fletxes i operadors matemàtics)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:783
 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 per defecte"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:784
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (Pakistan)"
 msgstr "Urdú (Pakistan)"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdú (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdú (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
 msgid "Urdu (WinKeys)"
 msgstr "Urdú (tecles Win)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:789
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdú (fonètic alternatiu)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
 msgid "Urdu (phonetic)"
 msgstr "Urdú (fonètic)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
 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:789
+#: ../rules/base.xml.in.h:792
 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:790
+#: ../rules/base.xml.in.h:793
 msgid "Usual space at any level"
 msgstr "Espai normal en qualsevol nivell"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:794
 msgid "Uyghur"
 msgstr "Uigur"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek"
 msgstr "Uzbek"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
 msgid "Uzbek (Afghanistan)"
 msgstr "Uzbek (Afganistan)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Uzbek (Afganistan, OLPC)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
 msgid "Uzbek (Latin)"
 msgstr "Uzbek (llatí)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "Teclat ViewSonic KU-306 Internet"
 
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
 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:799
+#: ../rules/base.xml.in.h:802
 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:800
+#: ../rules/base.xml.in.h:803
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
 msgid "Wolof"
 msgstr "Wolof"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
 msgid "Yahoo! Internet Keyboard"
 msgstr "Teclat Yahoo! Internet"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
 msgid "Yakut"
 msgstr "Iacut"
 
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
 msgid "Yoruba"
 msgstr "Ioruba"
 
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level"
 msgstr "Caràcter separador d'amplada zero al nivell segon"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:809
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Caràcter separador d'amplada zero al nivell segon, i un caràcter d'espai sense salt al nivell tercer"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:810
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Caràcter separador d'amplada zero al nivell segon, un caràcter d'espai sense salt al nivell tercer, i res al nivell quart"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:811
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Caràcter separador d'amplada zero al nivell segon, un caràcter d'espai sense salt al nivell tercer, i un caràcter d'espai fi sense salt al nivell quart"
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:812
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Caràcter separador d'amplada zero al nivell segon, un caràcter d'espai sense salt al nivell tercer, i un enllaç d'amplada zero al nivell quart"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:813
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Caràcter separador d'amplada zero al nivell segon, un caràcter d'enllaç d'amplada zero al nivell tercer"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:814
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Caràcter separador d'amplada zero al nivell segon, un caràcter d'enllaç d'amplada zero al nivell tercer, i un caràcter d'espai sense salt al nivell quart"
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:815
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Caràcter separador d'amplada zero al nivell tercer, un enllaç d'amplada zero al nivell quart"
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:816
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:817
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:820
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
 msgid "ca"
 msgstr "ca"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:831 ../rules/base.extras.xml.in.h:38
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:39
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:40
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:41
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:846 ../rules/base.extras.xml.in.h:42
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:849
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:852
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
+#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:43
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:858
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:863
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:867
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:871 ../rules/base.extras.xml.in.h:45
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:46
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:873
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:878
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:881
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:47
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
+#: ../rules/base.xml.in.h:888 ../rules/base.extras.xml.in.h:48
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:889 ../rules/base.extras.xml.in.h:49
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
+#: ../rules/base.xml.in.h:895 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:904
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:910
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:911
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:912
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
 msgid "zh"
 msgstr "zh"
 
@@ -3654,6 +3666,10 @@ msgstr "zh"
 msgid "APL Keyboard Symbols"
 msgstr "Símbols de teclat APL"
 
+#: ../rules/base.extras.xml.in.h:3
+msgid "Armenian (OLPC phonetic)"
+msgstr "Armeni (fonètic OLPC)"
+
 #: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
 msgstr "Atsina"
@@ -3666,86 +3682,119 @@ msgstr "Avèstic"
 msgid "Couer D'alene Salish"
 msgstr "Couer D'alene Salish"
 
-#: ../rules/base.extras.xml.in.h:8
+#: ../rules/base.extras.xml.in.h:7
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Tàtar de Crimea (Dobruja Q)"
+
+#: ../rules/base.extras.xml.in.h:9
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Anglès (EUA, combinació internacional Unicode AltGr)"
 
-#: ../rules/base.extras.xml.in.h:9
+#: ../rules/base.extras.xml.in.h:10
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Anglès (EUA, combinació internacional Unicode AltGr, alternativa)"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:13
+msgid "German (US keyboard with German letters)"
+msgstr "Alemany (teclat US amb lletres alemanyes)"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "Alemany (amb lletres hongareses i sense tecles mortes)"
+
+#: ../rules/base.extras.xml.in.h:15
 msgid "Kutenai"
 msgstr "Kutenai"
 
-#: ../rules/base.extras.xml.in.h:13
+#: ../rules/base.extras.xml.in.h:17
 msgid "Latvian (US Colemak)"
 msgstr "Letó (Colemak EUA)"
 
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:18
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Letó (Colemak EUA, variant amb apòstrof)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:19
 msgid "Latvian (US Dvorak)"
 msgstr "Letó (dvorak EUA)"
 
-#: ../rules/base.extras.xml.in.h:16
+#: ../rules/base.extras.xml.in.h:20
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Letó (dvorak EUA, variant Y)"
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Letó (dvorak EUA, variant menys)"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Letó (dvorak de programador EUA)"
 
-#: ../rules/base.extras.xml.in.h:19
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Letó (dvorak de programador EUA, variant Y)"
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Letó (dvorak de programador EUA, variant menys)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:26
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Lituà (dvorak EUA amb lletres lituanes)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:29
 msgid "Polish (international with dead keys)"
 msgstr "Polonès (internacional amb tecles mortes)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:31
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Romanès (ergonòmic Touchtype)"
 
-#: ../rules/base.extras.xml.in.h:29
-msgid "Russian (with UKR and BEL layout)"
-msgstr "Rus (amb disposicions UKR i BEL)"
+#: ../rules/base.extras.xml.in.h:33
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "Rus (amb disposició ucraïnesa-bielorussa)"
 
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:34
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Serbi (combinació d'accents en lloc de tecles mortes)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "apl"
 msgstr "apl"
 
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:44
 msgid "kut"
 msgstr "kut"
 
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:50
 msgid "shs"
 msgstr "shs"
 
+#~ msgid "English (Cameroon qwerty)"
+#~ msgstr "Anglès (qwerty del Camerun)"
+
+#~ msgid "French (Cameroon azerty)"
+#~ msgstr "Francès (azerty del Camerun)"
+
+#~ msgid "German (qwerty)"
+#~ msgstr "Alemany (qwerty)"
+
+#~ msgid "Make Caps Lock an additional Ctrl"
+#~ msgstr "Converteix Bloq Maj en un Ctrl addicional"
+
+#~ msgid "Meta on Left Ctrl"
+#~ msgstr "Meta en el Ctrl esquerre"
+
+#~ msgid "Right Ctrl is mapped to Menu"
+#~ msgstr "Ctrl dreta s'assigna a Menú"
+
+#~ msgid "Sinhala"
+#~ msgstr "Singalès"
+
 #~ msgid "Afg"
 #~ msgstr "Afg"
 
@@ -3773,9 +3822,6 @@ msgstr "shs"
 #~ msgid "GBr"
 #~ msgstr "GBr"
 
-#~ msgid "German (Romanian keyboard with German letters)"
-#~ msgstr "Alemany (teclat romanès amb lletres alemanyes)"
-
 #~ msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
 #~ msgstr "Alemany (teclat romanès amb lletres alemanyes, elimina les tecles mortes)"
 
diff --git a/dist/xkeyboard-config/po/da.po b/dist/xkeyboard-config/po/da.po
index de1e7f96a..09d961469 100644
--- a/dist/xkeyboard-config/po/da.po
+++ b/dist/xkeyboard-config/po/da.po
@@ -31,10 +31,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.3\n"
+"Project-Id-Version: xkeyboard-config-2.3.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-17 21:08+0100\n"
-"PO-Revision-Date: 2011-05-24 23:06+0100\n"
+"POT-Creation-Date: 2011-09-15 21:25+0100\n"
+"PO-Revision-Date: 2011-09-18 23:06+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -240,7 +240,7 @@ msgstr "Armensk"
 msgid "Armenian (alternative eastern)"
 msgstr "Armensk (alternativ østlig)"
 
-#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:50
 msgid "Armenian (alternative phonetic)"
 msgstr "Armensk (alternativ fonetisk)"
 
@@ -406,629 +406,650 @@ msgstr "BenQ X-Touch 800"
 msgid "Bengali"
 msgstr "Bengali"
 
+# http://en.wikipedia.org/wiki/InScript_keyboard
 #: ../rules/base.xml.in.h:90
+msgid "Bengali (Baishakhi Inscript)"
+msgstr "Bengali (baishakhi inscript)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bengali (Baishakhi)"
+msgstr "Bengali (baishakhi)"
+
+#: ../rules/base.xml.in.h:92
+msgid "Bengali (Bornona)"
+msgstr "Bengali (bornona)"
+
+#: ../rules/base.xml.in.h:93
 msgid "Bengali (Probhat)"
 msgstr "Bengali (probhat)"
 
+#: ../rules/base.xml.in.h:94
+msgid "Bengali (Uni Gitanjali)"
+msgstr "Bengali (uni gitanjali)"
+
 # http://retskrivningsordbogen.dk/ro/ro.htm?q=berb
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berbisk (Marokko, tifinagh alternativ fonetisk)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berbisk (Marokko, Tifinagh alternativ)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:97
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berbisk (Marokko, Tifinagh udvidet fonetisk)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:98
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berbisk (Marokko, Tifinagh udvidet)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:99
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berbisk (Marokko, Tifinagh fonetisk)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:100
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berbisk (Marokko, Tifinagh)"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian"
 msgstr "Bosnisk"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:102
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosnisk (US-tastatur med bosniske digrafer)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:103
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosnisk (US-tastatur med bosniske bogstaver)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:104
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosnisk (anvend bosniske digrafer)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:105
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosnisk (anvend »« som anførelsestegn)"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Begge Alt-taster sammen"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Begge Ctrl-taster sammen"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Begge skift-taster sammen"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:109
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Begge skift-taster sammen aktiverer Caps Lock, en Skift-tast deaktiverer"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:110
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Begge skift-taster sammen skifter Caps Lock"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:111
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Begge skift-taster sammen skifter SkiftLock"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:112
 msgid "Braille"
 msgstr "Blindeskrift"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:113
 msgid "Braille (left hand)"
 msgstr "Blindeskrift (venstre hånd)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:114
 msgid "Braille (right hand)"
 msgstr "Blindeskrift (højre hånd)"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:115
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:116
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:117
 msgid "Bulgarian (new phonetic)"
 msgstr "Bulgarsk (ny fonetisk)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:118
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bulgarsk (traditionel fonetisk)"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:119
 msgid "Burmese"
 msgstr "Burmesisk"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:120
+msgid "Cameroon Multilingual (azerty)"
+msgstr "Camerounsk flersproget (azerty)"
+
+#: ../rules/base.xml.in.h:121
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "Camerounsk flersproget (qwerty)"
+
+#: ../rules/base.xml.in.h:122
 msgid "Canadian Multilingual"
 msgstr "Canadisk flersproget"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:123
 msgid "Canadian Multilingual (first part)"
 msgstr "Canadisk flersproget (første del)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:124
 msgid "Canadian Multilingual (second part)"
 msgstr "Canadisk flersproget (anden del)"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr "Caps Lock (vælger tredje niveau, låser når trykket ned sammen med en anden tredje niveauvælger)"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Caps Lock (skifter til første layout), Skift+Caps Lock (skifter til sidste layout)"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Caps Lock (mens presset ned), Alt+Caps Lock udfører den oprindleige capslockhandling"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock agerer som skiftetasten med lås. Skift »pauser« Caps Lock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock agerer som skiftetasten med lås. Skift påvirker ikke Caps Lock"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:131
+msgid "Caps Lock as Ctrl"
+msgstr "Caps Lock som Ctrl"
+
+#: ../rules/base.xml.in.h:132
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock er slået fra"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:133
 msgid "Caps Lock key behavior"
 msgstr "Opførsel for Caps Lock-tast"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:134
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Caps Lock ændrer Skift så alle taster bliver påvirket"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:135
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock slår små/store bogstaver til/fra"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:136
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock bruger intern forstørrelse af bogstaver. Skift sætter Caps Lock »på hold«"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:137
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock bruger intern forstørrelse af bogstaver. Skift påvirker ikke Caps Lock"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:138
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:139
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Catalansk (Spanien, med midterpunktum L)"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:140
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:141
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UBEGRÆNSET"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:142
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:143
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (alternativ)"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:144
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry  CyBo@rd USB-hub"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:145
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:146
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:147
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:148
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:149
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:150
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:151
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:152
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:153
 msgid "Chuvash"
 msgstr "Chuvash"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:154
 msgid "Chuvash (Latin)"
 msgstr "Chuvash (latin)"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:155
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:156
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 taster)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 taster)"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:160
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 taster)"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:161
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:162
 msgid "Compose key position"
 msgstr "Placering af Composetast"
 
 # Backspace kunne også være Slet tilbage
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Rettelsestast"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Kontrol ligger på Alt-tasterne, Alt ligger på Win-tasterne"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Kontrol ligger på Win-tasterne (og de normale Ctrl-taster)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:160
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "Krimtatarsk (Dobruja Q)"
-
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Krimtatarsk (tyrkisk Alt-Q)"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Krimtatarsk (tyrkisk F)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Krimtatarsk (tyrkisk Q)"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Kroatisk (US-tastatur med kroatiske digrafer)"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:172
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Kroatisk (US-tastatur med kroatiske bogstaver)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Kroatisk (anvend kroatiske digrafer)"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:174
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Kroatisk (anvend »« som anførelsestegn)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:175
 msgid "Ctrl key position"
 msgstr "Ctrl-tast placering"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:176
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Skift"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:177
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Tjekkisk (UCW-layout, kun bogstaver med accent)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Tjekkisk (US Dvorak med CZ UCW-understøttelse)"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:180
 msgid "Czech (qwerty)"
 msgstr "Tjekkisk (qwerty)"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:181
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Tjekkisk (qwerty, udvidet omvendt skråstreg)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Tjekkisk (med &lt;\\|&gt;-tast)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Danish"
 msgstr "Dansk"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Danish (Dvorak)"
 msgstr "Dansk (dvorak)"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Danish (Macintosh)"
 msgstr "Dansk (Macintosh)"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Dansk (Macintosh, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Danish (eliminate dead keys)"
 msgstr "Dansk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Default numeric keypad keys"
 msgstr "Standard numerisk tastatur taster"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell 101-key PC"
 msgstr "Dell 101-taster PC"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell bærbar/notebook Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell bærbar/notebook Precision M serie"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dell Latitude series laptop"
 msgstr "Dell Latitude serie bærbar"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dell SK-8125"
 msgstr "Dell Sk-8125"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:197
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia tastatur"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dhivehi"
 msgstr "Dhivehi"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802-serie"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
 msgid "Dutch"
 msgstr "Hollandsk"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:203
 msgid "Dutch (Macintosh)"
 msgstr "Hollandsk (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:204
 msgid "Dutch (Sun dead keys)"
 msgstr "Hollandsk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:205
 msgid "Dutch (standard)"
 msgstr "Hollandsk (standard)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:206
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:207
 msgid "Enable extra typographic characters"
 msgstr "Slå ekstra typografiske karakterer til"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:208
 msgid "English (Cameroon Dvorak)"
 msgstr "Engelsk (camerounsk dvorak)"
 
-#: ../rules/base.xml.in.h:203
-msgid "English (Cameroon qwerty)"
-msgstr "Engelsk (camerounsk qwerty)"
-
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:209
 msgid "English (Cameroon)"
 msgstr "Engelsk (camerounsk)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:210
 msgid "English (Canada)"
 msgstr "Engelsk (Canada)"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:211
 msgid "English (Colemak)"
 msgstr "Engelsk (Colemak)"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:212
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Engelsk (Dvorak alternativ international ingen døde taster)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:213
 msgid "English (Dvorak international with dead keys)"
 msgstr "Engelsk (Dvorak international med døde taster)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:214
 msgid "English (Dvorak)"
 msgstr "Engelsk (Dvorak)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:215
 msgid "English (Ghana)"
 msgstr "Engelsk (Ghana)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:216
 msgid "English (Ghana, GILLBT)"
 msgstr "Engelsk (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:217
 msgid "English (Ghana, multilingual)"
 msgstr "Engelsk (Ghana, flersproget)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:218
 msgid "English (India, with RupeeSign)"
 msgstr "Engelsk (Indien, med rupeetegn)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:219
 msgid "English (Macintosh)"
 msgstr "Engelsk (Macintosh)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:220
 msgid "English (Mali, US Macintosh)"
 msgstr "Engelsk (Mali, US Macintosh)"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:221
 msgid "English (Mali, US international)"
 msgstr "Engelsk (Mali, US international)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:222
 msgid "English (Nigeria)"
 msgstr "Engelsk (Nigeria)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:223
 msgid "English (South Africa)"
 msgstr "Engelsk (Sydafrika)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:224
 msgid "English (UK)"
 msgstr "Engelsk (UK)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:225
 msgid "English (UK, Colemak)"
 msgstr "Engelsk (UK, Colemak)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Engelsk (UK, Dvorak med UK-tegnsætning)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:227
 msgid "English (UK, Dvorak)"
 msgstr "Engelsk (UK, Dvorak)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:228
 msgid "English (UK, Macintosh international)"
 msgstr "Engelsk (UK, Macintosh international)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:229
 msgid "English (UK, Macintosh)"
 msgstr "Engelsk (UK, Macintosh)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:230
 msgid "English (UK, extended WinKeys)"
 msgstr "Engelsk (UK, udvidede Wintaster)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:231
 msgid "English (UK, international with dead keys)"
 msgstr "Engelsk (UK, international med døde taster)"
 
-#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:232 ../rules/base.extras.xml.in.h:8
 msgid "English (US)"
 msgstr "Engelsk (US)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:233
 msgid "English (US, alternative international)"
 msgstr "Engelsk (US, alternativ international)"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:234
 msgid "English (US, international with dead keys)"
 msgstr "Engelsk (US, international med døde taster)"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:235
 msgid "English (US, with euro on 5)"
 msgstr "Engelsk (US, med euro på 5)"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:236
 msgid "English (classic Dvorak)"
 msgstr "Engelsk (klassisk dvorak)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:237
 msgid "English (international AltGr dead keys)"
 msgstr "Engelsk (international AltGr døde taster)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:238
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Engelsk (skift layout på gange-/divideretast)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:239
 msgid "English (left handed Dvorak)"
 msgstr "Engelsk (venstrehåndet dvorak)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:240
 msgid "English (programmer Dvorak)"
 msgstr "Engelsk (programmørdvorak)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:241
 msgid "English (right handed Dvorak)"
 msgstr "Engelsk (højrehåndet dvorak)"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:242
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:243
 msgid "Enter on keypad"
 msgstr "Retur på numerisk tastatur"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:244
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:245
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Esperanto (Portugal, Nativo)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:246
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (forkert placeret semikolon og anførelsestegn, forældet)"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:247
 msgid "Estonian"
 msgstr "Estisk"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:248
 msgid "Estonian (Dvorak)"
 msgstr "Estisk (dvorak)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:249
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estisk (US-tastatur med estiske bogstaver)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:250
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estisk (slå døde taster fra)"
 
@@ -1037,2244 +1058,2236 @@ msgstr "Estisk (slå døde taster fra)"
 # på to" mere beskrivende, selv om strengen isoleret set stadig kan være
 # forvirrende. Når teksten står i en sammenhæng, er det nok ikke så
 # vigtigt om det er det ene eller det andet.
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:251
 msgid "Euro on 2"
 msgstr "Euro på 2"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:252
 msgid "Euro on 4"
 msgstr "Euro på 4"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:253
 msgid "Euro on 5"
 msgstr "Euro på 5"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:254
 msgid "Euro on E"
 msgstr "Euro på E"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:255
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:256
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:257
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:258
 msgid "Faroese"
 msgstr "Færøsk"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:259
 msgid "Faroese (eliminate dead keys)"
 msgstr "Færøsk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:260
 msgid "Filipino"
 msgstr "Filippinsk"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filippinsk (Capewell-dvorak baybayin)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:262
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filippinsk (Capewell-dvorak latin)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filippinsk (Capewell-QWERF 2006 baybayin)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filippinsk (Capewell-QWERF 2006 latin)"
 
 # http://en.wikipedia.org/wiki/Baybayin
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:265
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filippinsk (Colemak baybayin)"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:266
 msgid "Filipino (Colemak Latin)"
 msgstr "Filippinsk (Colemak latin)"
 
 # http://en.wikipedia.org/wiki/Baybayin
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:267
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Filippinsk (Dvorak baybayin)"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:268
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filippinsk (Dvorak latin)"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:269
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filippinsk (QWERTY baybayin)"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:270
 msgid "Finnish"
 msgstr "Finsk"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:271
 msgid "Finnish (Macintosh)"
 msgstr "Finsk (Macintosh)"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:272
 msgid "Finnish (classic)"
 msgstr "Finsk (klassisk)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:273
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finsk (klassisk, slå døde taster fra)"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:276
 msgid "Four-level key with abstract separators"
 msgstr "Niveau fire tast med abstrakt adskillelser"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:277
 msgid "Four-level key with comma"
 msgstr "Niveau fire tast med komma"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:278
 msgid "Four-level key with dot"
 msgstr "Niveau fire tast med punktum"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:279
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Niveau fire tast med punktum, latin-9 begrænsning"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:280
 msgid "Four-level key with momayyez"
 msgstr "Niveau fire tast med momayyez"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:281
 msgid "French"
 msgstr "Fransk"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:282
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Fransk (Bepo, ergonomisk, dvorakmåde)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:283
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Fransk (Bepo, ergonomisk, dvorakmåde, kun latin-9)"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:284
 msgid "French (Breton)"
 msgstr "Fransk (bretonsk)"
 
-#: ../rules/base.xml.in.h:280
-msgid "French (Cameroon azerty)"
-msgstr "Fransk (camerounsk azerty)"
-
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:285
 msgid "French (Cameroon)"
 msgstr "Fransk (camerounsk)"
 
-#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:286 ../rules/base.extras.xml.in.h:11
 msgid "French (Canada)"
 msgstr "Fransk (Canada)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:287
 msgid "French (Canada, Dvorak)"
 msgstr "Fransk (Canada, dvorak)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:288
 msgid "French (Canada, legacy)"
 msgstr "Fransk (Canada, forældet)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:289
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Fransk (Congo, Den Demokratiske Republik)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:290
 msgid "French (Dvorak)"
 msgstr "Fransk (dvorak)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:291
 msgid "French (Guinea)"
 msgstr "Fransk (Guinea)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:292
 msgid "French (Macintosh)"
 msgstr "Fransk (Macintosh)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:293
 msgid "French (Mali, alternative)"
 msgstr "Fransk (Mali, alternativ)"
 
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:294
 msgid "French (Morocco)"
 msgstr "Fransk (Marokko)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:295
 msgid "French (Sun dead keys)"
 msgstr "Fransk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:296
 msgid "French (Switzerland)"
 msgstr "Fransk (Schweiz)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:297
 msgid "French (Switzerland, Macintosh)"
 msgstr "Fransk (Schweiz, Macintosh)"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:298
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Fransk (Schweiz, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:299
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Fransk (Schweiz, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:300
 msgid "French (alternative)"
 msgstr "Fransk (alternativ)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:301
 msgid "French (alternative, Sun dead keys)"
 msgstr "Fransk (alternativ, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:302
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Fransk (alternativ, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:303
 msgid "French (alternative, latin-9 only)"
 msgstr "Fransk (alternativ, kun latin-9)"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:304
 msgid "French (eliminate dead keys)"
 msgstr "Fransk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:305
 msgid "French (legacy, alternative)"
 msgstr "Fransk (forældet, alternativ)"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:306
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Fransk (forældet, alternativ, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:307
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Fransk (forældet, alternativ, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:308
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO bærbar"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:309
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:310
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:311
 msgid "Generic 101-key PC"
 msgstr "Generisk 101-taster PC"
 
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:312
 msgid "Generic 102-key (Intl) PC"
 msgstr "Generisk 102-taster (Intl) PC"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:313
 msgid "Generic 104-key PC"
 msgstr "Generisk 104-taster PC"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:314
 msgid "Generic 105-key (Intl) PC"
 msgstr "Generisk 105-taster (Intl) PC"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:315
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:316
 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:313
+#: ../rules/base.xml.in.h:317
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:318
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:319
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:320
 msgid "Georgian"
 msgstr "Georgisk"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:321
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Geogrisk (Frankrig, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:322
 msgid "Georgian (Italy)"
 msgstr "Georgisk (Italien)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:323
 msgid "Georgian (MESS)"
 msgstr "Georgisk (MESS)"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:324
 msgid "Georgian (ergonomic)"
 msgstr "Georgisk (ergonomisk)"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:325 ../rules/base.extras.xml.in.h:12
 msgid "German"
 msgstr "Tysk"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:326
 msgid "German (Austria)"
 msgstr "Tysk (Østrig)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:327
 msgid "German (Austria, Macintosh)"
 msgstr "Tysk (Østrig, Macintosh)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:328
 msgid "German (Austria, Sun dead keys)"
 msgstr "Tysk (Østrig, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:329
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Tysk (Østrig, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:330
 msgid "German (Dvorak)"
 msgstr "Tysk (dvorak)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:331
 msgid "German (Macintosh)"
 msgstr "Tysk (Macintosh)"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:332
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Tysk (Macintosh, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:333
 msgid "German (Neo 2)"
 msgstr "Tysk (Neo 2)"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:334
 msgid "German (Sun dead keys)"
 msgstr "Tysk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:335
 msgid "German (Switzerland)"
 msgstr "Tysk (Schweiz)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:336
 msgid "German (Switzerland, Macintosh)"
 msgstr "Tysk (Schweiz, Macintosh)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:337
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Tysk (Schweiz, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:338
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Tysk (Schweiz, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:339
 msgid "German (Switzerland, legacy)"
 msgstr "Tysk (Schweiz, forældet)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:340
 msgid "German (dead acute)"
 msgstr "Tysk (død accent)"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:341
 msgid "German (dead grave acute)"
 msgstr "Tysk (død accent grave)"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:342
 msgid "German (eliminate dead keys)"
 msgstr "Tysk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:339
-msgid "German (qwerty)"
-msgstr "Tysk (qwerty)"
-
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:343
 msgid "Greek"
 msgstr "Græsk"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:344
 msgid "Greek (eliminate dead keys)"
 msgstr "Græsk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:345
 msgid "Greek (extended)"
 msgstr "Græsk (udvidet)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:346
 msgid "Greek (polytonic)"
 msgstr "Græsk (polytonisk)"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:347
 msgid "Greek (simple)"
 msgstr "Græsk (simpel)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:348
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:349
 msgid "Gyration"
 msgstr "Roteren"
 
 # http://en.wikipedia.org/wiki/HTC_Dream
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:350
 msgid "HTC Dream"
 msgstr "HTC-Dream"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:351
 msgid "Happy Hacking Keyboard"
 msgstr "Glædelig hacking tastatur"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:352
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Glædelig hacking tastatur til Mac"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:353
 msgid "Hausa"
 msgstr "Hausa"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:354
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:355
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Hebraisk (bibelsk, Tiro)"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:356
 msgid "Hebrew (lyx)"
 msgstr "Hebraisk (lyx)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:357
 msgid "Hebrew (phonetic)"
 msgstr "Hebraisk (fonetisk)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard Mini 110 Notebook"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:367
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:368
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x Multimedia tastatur"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:369
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:370
 msgid "Hexadecimal"
 msgstr "Sekstentals"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:371
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (bolnagri)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:372
 msgid "Hindi (Wx)"
 msgstr "Hindi (wx)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:373
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:374
 msgid "Htc Dream phone"
 msgstr "Htc Dream-telefon"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Ungarsk (101/qwerty/komma/døde taster)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Ungarsk (101/qwerty/komma/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Ungarsk (101/qwerty/punktum/døde taster)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Ungarsk (101/qwerty/punktum/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Ungarsk (101/qwertz/komma/døde taster)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Ungarsk (101/qwertz/komma/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Ungarsk (101/qwertz/punktum/døde taster)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Ungarsk (101/qwertz/punktum/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Ungarsk (102/qwerty/komma/døde taster)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Ungarsk (102/qwerty/komma/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Ungarsk (102/qwerty/punktum/døde taster)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Ungarsk (102/qwerty/punktum/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Ungarsk (102/qwertz/komma/døde taster)"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Ungarsk (102/qwertz/komma/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Ungarsk (102/qwertz/punktum/døde taster)"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Ungarsk (102/qwertz/punktum/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:392
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Ungarsk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:393
 msgid "Hungarian (qwerty)"
 msgstr "Ungarsk (qwerty)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:394
 msgid "Hungarian (standard)"
 msgstr "Ungarsk (standard)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:395
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper ligger på Win-tasterne"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:396
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:397
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:398
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:399
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:400
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:401
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic"
 msgstr "Islandsk"
 
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (Dvorak)"
 msgstr "Islandsk (Dvorak)"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:404
 msgid "Icelandic (Macintosh)"
 msgstr "Islandsk (Macintosh)"
 
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:405
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islandsk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:406
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islandsk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:407
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:408
 msgid "Indian"
 msgstr "Indisk"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:409
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:410
 msgid "Iraqi"
 msgstr "Irakisk"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:411
 msgid "Irish"
 msgstr "Irsk"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:412
 msgid "Irish (UnicodeExpert)"
 msgstr "Irsk (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:413
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:414
 msgid "Italian (Macintosh)"
 msgstr "Italiensk (Macintosh)"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:415
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Italiensk (US-tastatur med italienske bogstaver)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:416
 msgid "Italian (eliminate dead keys)"
 msgstr "Italiensk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:417
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (Kana 86)"
 msgstr "Japansk (Kana 86)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (Kana)"
 msgstr "Japansk (Kana)"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:420
 msgid "Japanese (Macintosh)"
 msgstr "Japansk (Macintosh)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:421
 msgid "Japanese (OADG 109A)"
 msgstr "Japansk (OADG 109A)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:422
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japansk (pc-98xx-serie)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:423
 msgid "Japanese keyboard options"
 msgstr "Japanske tastaturvalg"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:424
 msgid "Kalmyk"
 msgstr "Kalmyk"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:425
 msgid "Kana Lock key is locking"
 msgstr "Kana låsetast låser"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:426
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:427
 msgid "Kashubian"
 msgstr "Kashubian"
 
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:428
 msgid "Kazakh"
 msgstr "Kasakhisk"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:429
 msgid "Kazakh (with Russian)"
 msgstr "Kasakhisk (med russisk)"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:430
 msgid "Key sequence to kill the X server"
 msgstr "Tastsekvens for at slå X-serveren ned"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:431
 msgid "Key to choose 3rd level"
 msgstr "Tast for at vælge tredje niveau"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:432
 msgid "Key to choose 5th level"
 msgstr "Tast for at vælge femte niveau"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:433
 msgid "Key(s) to change layout"
 msgstr "Tast(er) for at skifte layout"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:434
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:435
 msgid "Khmer (Cambodia)"
 msgstr "Khmerisk (Cambodja)"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:436
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:437
 msgid "Kinesis"
 msgstr "Kinesis"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:438
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:439
 msgid "Korean"
 msgstr "Koreansk"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:440
 msgid "Korean (101/104 key compatible)"
 msgstr "Koreansk (101/104 tastkompatibel)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurdisk (Iran, arabisk-latin)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iran, F)"
 msgstr "Kurdisk (Iran, F)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Kurdisk (Iran, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurdisk (Iran, latin Q)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurdisk (Irak, arabisk-latin)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurdisk (Irak, F)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurdisk (Irak, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurdisk (Irak, latin Q)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Syria, F)"
 msgstr "Kurdisk (Syrien, F)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurdisk (Syrien, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurdisk (Syrien, latin Q)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:452
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurdisk (Tyrkiet, F)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:453
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurdisk (Tyrkiet, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:454
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurdisk (Tyrkiet, latin Q)"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:455
 msgid "Kyrgyz"
 msgstr "Kirgisisk"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:456
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgisisk (fonetisk)"
 
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:457
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:458
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Lao (STEA-foreslået standardlayout)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:459
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Bærbar Compaq (fx Armada) Laptop Keyboard"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:460
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Bærbar/notebook Compaq (fx Presario) Internet Keyboard"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:461
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Bærbar/notebook eMachines m68xx"
 
-#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+#: ../rules/base.xml.in.h:462 ../rules/base.extras.xml.in.h:16
 msgid "Latvian"
 msgstr "Lettisk"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:463
 msgid "Latvian (F variant)"
 msgstr "Lettisk (F-variant)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:464
 msgid "Latvian (adapted)"
 msgstr "Lettisk (adapteret)"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:465
 msgid "Latvian (apostrophe variant)"
 msgstr "Lettisk (apostrofvariant)"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:466
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Lettisk (ergonomisk, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:467
 msgid "Latvian (modern)"
 msgstr "Lettisk (moderne)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:468
 msgid "Latvian (tilde variant)"
 msgstr "Lettisk (tildevariant)"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:469
 msgid "Left Alt"
 msgstr "Venstre Alt"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:470
 msgid "Left Alt (while pressed)"
 msgstr "Venstre Alt (mens trykket ned)"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:471
 msgid "Left Alt is swapped with Left Win"
 msgstr "Venstre Alt ombyttes med venstre Win-tast"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:472
 msgid "Left Ctrl"
 msgstr "Venstre Ctrl"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:473
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Venstre Ctrl (skifter til første layout), Højre Ctrl (skifter til sidste layout)"
 
-#: ../rules/base.xml.in.h:471
+#: ../rules/base.xml.in.h:474
+msgid "Left Ctrl as Meta"
+msgstr "Venstre Ctrl som Meta"
+
+#: ../rules/base.xml.in.h:475
 msgid "Left Ctrl+Left Shift"
 msgstr "Venstre Ctrl+Venstre Skift"
 
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:476
 msgid "Left Shift"
 msgstr "Venstre Skift"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:477
 msgid "Left Win"
 msgstr "Venstre Win"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:478
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Venstre Win (skifter til første layout), Højre Win/Menu (skifter til sidste layout)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:479
 msgid "Left Win (while pressed)"
 msgstr "Venstre Win-tast (mens trykket ned)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:480
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Venstre Win-tast vælger femte niveau, låser når trykket ned sammen med en anden femte niveauvælger"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:481
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Venstre Win-tast vælger femte niveau, låser når trykket ned sammen med en anden femte niveauvælger, et tryk frigiver låsen"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:482
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Venstre Ctrl+Venstre Win (til første layout), Højre Ctrl+Menu (til andet layout)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:483
 msgid "Legacy"
 msgstr "Forældet"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:484
 msgid "Legacy Wang 724"
 msgstr "Forældet Wang 724"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:486
 msgid "Legacy key with comma"
 msgstr "Forældet tast med komma"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:487
 msgid "Legacy key with dot"
 msgstr "Forældet tast med punktum"
 
-#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+#: ../rules/base.xml.in.h:488 ../rules/base.extras.xml.in.h:25
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litauisk (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:490
 msgid "Lithuanian (LEKP)"
 msgstr "Litauisk (LEKP)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:491
 msgid "Lithuanian (LEKPa)"
 msgstr "Litauisk (LEKPa)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:492
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litauisk (US-tastatur med litauiske bogstaver)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:493
 msgid "Lithuanian (standard)"
 msgstr "Litauisk (standard)"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Access Keyboard"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop (alternativ valg)"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:500
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro (alternativ tilvalg 2)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:504
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Logitech G15 ekstra taster via G15daemon"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech Generic Keyboard"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Logitech Internet 350 Keyboard"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:508
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:509
 msgid "Logitech Media Elite Keyboard"
 msgstr "Logitech Media Elite Keyboard"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:510
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:511
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Logitech Ultra-X Keyboard"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:512
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Logitech diNovo Edge Keyboard"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:513
 msgid "Logitech diNovo Keyboard"
 msgstr "Logitech diNovo Keyboard"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:514
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:515
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:516
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:517
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:518
 msgid "Lower Sorbian"
 msgstr "Nedersorbisk"
 
 # nedersorbisk, tror jeg
 # (el. nedre Lausitz)
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:519
 msgid "Lower Sorbian (qwertz)"
 msgstr "Nedersorbisk (qwertz)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:520
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:521
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Intl)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:522
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:523
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Makedonsk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:524
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:525
 msgid "Macintosh Old"
 msgstr "Macintosh gammel"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Gør Caps Lock til en ekstra rettelsestast"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Gør Caps Lock til en ekstra Control men behold Caps_Lock keysym"
 
-#: ../rules/base.xml.in.h:524
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Gør Caps Lock til en ekstra Ctrl"
-
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional ESC"
 msgstr "Gør Caps Lock til en ekstra Esc"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:529
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Gør Caps Lock til en ekstra Hyper"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:530
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Gør Caps Lock til en ekstra NumLock"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:531
 msgid "Make Caps Lock an additional Super"
 msgstr "Gør Caps Lock til en ekstra Super"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:532
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:533
 msgid "Malayalam (Lalitha)"
 msgstr "Malayalamsk (Lalitha)"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:534
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malayalamsk (udvidet inscript med Rupeetegn)"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:535
 msgid "Maltese"
 msgstr "Maltesisk"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:536
 msgid "Maltese (with US layout)"
 msgstr "Maltesisk (med US-layout)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:537
 msgid "Maori"
 msgstr "Maori"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:538
 msgid "Mari"
 msgstr "Mari"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:539
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:540
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:541
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:542
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:543
+msgid "Menu as Right Ctrl"
+msgstr "Menu som højre Ctrl"
+
+#: ../rules/base.xml.in.h:544
 msgid "Meta is mapped to Left Win"
 msgstr "Meta ligger på venstre Win-tast"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:545
 msgid "Meta is mapped to Win keys"
 msgstr "Meta ligger på Win-tasterne"
 
-#: ../rules/base.xml.in.h:542
-msgid "Meta on Left Ctrl"
-msgstr "Meta på venstre Ctrl"
-
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve Keyboard 2000"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, svensk"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:550
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural Keyboard Elite"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:553
 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:551
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:555
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:556
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:557
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:558
 msgid "Miscellaneous compatibility options"
 msgstr "Diverse kompatibilitetsvalg"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:559
 msgid "Mongolian"
 msgstr "Mongolsk"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin"
 msgstr "Montenegrinsk"
 
 # guillemets er dem her: »«
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:561
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrinsk (kyrillisk med anførelsestegnene »«)"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:562
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrinsk (kyrillisk)"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:563
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrinsk (kyrillisk, Z og ZHE ombyttet)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Montenegrinsk (latin Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:565
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Montenegrinsk (latin Unicode)"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:566
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Montenegrinsk (latin qwerty)"
 
 # guillemets er dem her: »«
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:567
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrinsk (latin med anførelsestegnene »«)"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:568
 msgid "NICOLA-F style Backspace"
 msgstr "NICOLA-F-stil rettelsestast"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:569
 msgid "Nepali"
 msgstr "Nepalesisk"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at fourth level"
 msgstr "Ubrydelig mellemrumskarakter på fjerde niveau"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Ubrydelig mellemrumskarakter på fjerde niveau, tynd ubrydelige mellemrumskarakter på sjette niveau"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:572
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Ubrydelig mellemrumskarakter på fjerde niveau, tynd ubrydelige mellemrumskarakter på sjette niveau (via Ctrl+Skift)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at second level"
 msgstr "Ubrydelig mellemrumskarakter på andet niveau"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:574
 msgid "Non-breakable space character at third level"
 msgstr "Ubrydelig mellemrumskarakter på tredje niveau"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:575
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Ubrydelig mellemrumskarakter på tredje niveau, intet på fjerde niveau"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:576
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Ubrydelig mellemrumskarakter på tredje niveau, tynd ubrydelig mellemrumskarakter på fjerde niveau"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:577
 msgid "Northern Saami (Finland)"
 msgstr "Nordligt samisk (Finland)"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:578
 msgid "Northern Saami (Norway)"
 msgstr "Nordligt samisk (Norge)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:579
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Nordligt samisk (Norge, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:580
 msgid "Northern Saami (Sweden)"
 msgstr "Nordligt samisk (Sverige)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:581
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:582
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (Dvorak)"
 msgstr "Norsk (dvorak)"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:584
 msgid "Norwegian (Macintosh)"
 msgstr "Norsk (Macintosh)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:585
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Norsk (Macintosh, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:586
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norsk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:587
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:588
 msgid "Numeric keypad delete key behaviour"
 msgstr "Numerisk tastatur slettetast opførsel"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:589
 msgid "Numeric keypad keys work as with Macintosh"
 msgstr "Numerisk tastatur taster fungerer som med Macintosh"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:590
 msgid "Numeric keypad layout selection"
 msgstr "Numerisk tastatur layout udvælgelse"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:591
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:592
 msgid "Occitan"
 msgstr "Occitansk"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:593
 msgid "Ogham"
 msgstr "Ogham"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:594
 msgid "Ogham (IS434)"
 msgstr "Ogham (IS434)"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:595
 msgid "Oriya"
 msgstr "Oriya"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:596
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Ortek MCK-800 MM/Internet keyboard"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:597
 msgid "Ossetian (Georgia)"
 msgstr "Occitansk (Georgien)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:598
 msgid "Ossetian (WinKeys)"
 msgstr "Occitansk (Wintaster)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:599
 msgid "Ossetian (legacy)"
 msgstr "Occitansk (forældet)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:600
 msgid "PC-98xx Series"
 msgstr "PC-98xx-serie"
 
 # Pannonian Rusyn or simply Rusyn (Ruthenian) is a Slavic language or dialect spoken 
 # in north-western Serbia and eastern Croatia 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:601
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Pannonisk rusyn (homofonisk)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:602
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:603
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Pashto (Afghanistan, OLPC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:604
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:27
 msgid "Persian"
 msgstr "Persisk"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:606
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persisk (Afghanistan, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:607
 msgid "Persian (with Persian Keypad)"
 msgstr "Persisk (med persisk numerisk tastatur)"
 
-#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:28
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:609
 msgid "Polish (Dvorak)"
 msgstr "Polsk (dvorak)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:610
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Polsk (dvorak, polske anførelsestegn på tast 1)"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:611
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Polsk (dvorak, polske anførelsestegn på anførelsestast)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:612
 msgid "Polish (programmer Dvorak)"
 msgstr "Polsk (programmørdvorak)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:613
 msgid "Polish (qwertz)"
 msgstr "Polsk (qwertz)"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil)"
 msgstr "Portugisisk (brasiliansk)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugisisk (brasiliansk, dvorak)"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugisisk (brasiliansk, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:618
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugisisk (brasiliansk, nativo for esperanto)"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:619
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugisisk (brasiliansk, nativo for USA-tastaturer)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:620
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugisisk (brasiliansk, nativo)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Macintosh)"
 msgstr "Portugisisk (Macintosh)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portugisisk (Macintosh, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portugisisk (Macintosh, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugisisk (nativo for USA-tastaturer)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:625
 msgid "Portuguese (Nativo)"
 msgstr "Portugisisk (nativo)"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:626
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugisisk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:627
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugisisk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:628
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:629
 msgid "PrtSc"
 msgstr "Prtsc"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:630
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Punjabi (Gurmukhi Jhelum)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:631
 msgid "Punjabi (Gurmukhi)"
 msgstr "Punjabi (Gurmukhi)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:632
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt"
 msgstr "Højre Alt"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt (while pressed)"
 msgstr "Højre Alt (mens trykket ned)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:635
+msgid "Right Alt as Right Ctrl"
+msgstr "Højre Alt-tast virker som højre Ctrl"
+
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Højre Alt vælger femte niveau og låser niveau 5-lås når trykket ned sammen med en anden femte niveauvælger, et tryk frigiver låsen"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:637
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Højre Alt vælge femte niveau, låser når trykket ned sammen med en anden femte niveauvælger"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:638
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Højre Alt vælge femte niveau, låser når trykket ned sammen med en anden femte niveauvælger, et tryk frigiver låsen"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:639
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Højre Alt-tast vælger aldrig tredje niveau"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:640
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Højre Alt-tast, Skift+højre Alt-tast er fler_tast"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl"
 msgstr "Højre Ctrl"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:642
 msgid "Right Ctrl (while pressed)"
 msgstr "Højre Ctrl-tast (mens trykket ned)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:643
 msgid "Right Ctrl as Right Alt"
 msgstr "Højre Ctrl-tast virker som højre Alt"
 
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl is mapped to Menu"
-msgstr "Højre Ctrl ligger på Menu"
-
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:644
 msgid "Right Ctrl+Right Shift"
 msgstr "Højre Ctrl+Højre Skift"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:645
 msgid "Right Shift"
 msgstr "Højre Skift"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:646
 msgid "Right Win"
 msgstr "Højre Win"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:647
 msgid "Right Win (while pressed)"
 msgstr "Højre Win-tast (mens trykket ned)"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:648
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Højre Win-tast vælger femte niveau, låser når trykket ned sammen med en anden femte niveauvælger"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:649
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Højre Win-tast vælger femte niveau, låser når trykket ned sammen med en anden femte niveauvælger, et tryk frigiver låsen"
 
-#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+#: ../rules/base.xml.in.h:650 ../rules/base.extras.xml.in.h:30
 msgid "Romanian"
 msgstr "Rumænsk"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (Germany)"
 msgstr "Rumænsk (Tyskland)"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Rumænsk (Tyskland, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (WinKeys)"
 msgstr "Rumænsk (Wintaster)"
 
 # http://da.wikipedia.org/wiki/%C3%87
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:654
 msgid "Romanian (cedilla)"
 msgstr "Rumænsk (cedille)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (standard cedilla)"
 msgstr "Rumænsk (standardcedille)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Rumænsk (standard)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:657
 msgid "Rupee on 4"
 msgstr "Rupee på 4"
 
-#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:658 ../rules/base.extras.xml.in.h:32
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:659
 msgid "Russian (DOS)"
 msgstr "Russisk (DOS)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Georgia)"
 msgstr "Russisk (georgisk)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Germany, phonetic)"
 msgstr "Russisk (Tyskland, fonetisk)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Russisk (Kasakhstan, med kazakhisk)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:663
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Russisk (Polen, fonetisk dvorak)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:664
 msgid "Russian (Sweden, phonetic)"
 msgstr "Russisk (Sverige, fonetisk)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:665
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Russisk (Sverige, fonetisk, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:666
 msgid "Russian (US, phonetic)"
 msgstr "Russisk (US, fonetisk)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:667
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Russisk (Ukraine, standard RSTU)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:668
 msgid "Russian (legacy)"
 msgstr "Russisk (forældet)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:669
 msgid "Russian (phonetic WinKeys)"
 msgstr "Russisk (fonetisk Wintaster)"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:670
 msgid "Russian (phonetic)"
 msgstr "Russisk (fonetisk)"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:671
 msgid "Russian (typewriter)"
 msgstr "Russisk (skrivemaskine)"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:672
 msgid "Russian (typewriter, legacy)"
 msgstr "Russisk (skrivemaskine, forældet)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:673
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:674
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:675
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:676
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:677
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:678
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:679
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:680
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Taiwan)"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:681
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:682
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:683
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:684
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:685
 msgid "Semi-colon on third level"
 msgstr "Semikolon på tredje niveau"
 
-#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:686 ../rules/base.extras.xml.in.h:35
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbisk (latin unicode qwerty)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbisk (latin unicode)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:689
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbisk (latin qwerty)"
 
 # guillemets er dem her: »«
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbisk (latin med anførelsestegnene »«)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (Latin)"
 msgstr "Serbisk (latin)"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:692
 msgid "Serbian (Russia)"
 msgstr "Serbisk (Rusland)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:693
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Serbisk (Z og ZHE ombyttet)"
 
 # guillemets er dem her: »«
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:694
 msgid "Serbian (with guillemets)"
 msgstr "Serbisk (med anførelsestegnene »«)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:695
 msgid "Serbo-Croatian (US)"
 msgstr "Serbisk-kroatisk (US)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:696
 msgid "Shift cancels Caps Lock"
 msgstr "Skift afbryder Caps Lock"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:697
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Skift afbryder ikke Num Lock, vælger tredje niveau i steden for"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:698
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Skift med numeriske taster virker som i MS Windows"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:699
 msgid "Shift+Caps Lock"
 msgstr "Skift+Caps Lock"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:700
 msgid "Sindhi"
 msgstr "Sindhi"
 
-#: ../rules/base.xml.in.h:698
-msgid "Sinhala"
-msgstr "Sinhala"
+#: ../rules/base.xml.in.h:701
+msgid "Sinhala (phonetic)"
+msgstr "Singalesisk (fonetisk)"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
 msgid "Slovak (extended Backslash)"
 msgstr "Slovakisk (udvidet omvendt skråstreg)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
 msgid "Slovak (qwerty)"
 msgstr "Slovakisk (qwerty)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Slovakisk (qwerty, udvidet omvendt skråstreg)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Slovensk (US-tastatur med slovenske bogstaver)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Slovensk (anvend »« som anførelsestegn)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Dvorak)"
 msgstr "Spansk (dvorak)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American)"
 msgstr "Spansk (latinamerikansk)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Spansk (latinamerikansk, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Spansk (latinamerikansk, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Spansk (latinamerikansk, inkluder død tilde)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (Macintosh)"
 msgstr "Spansk (Macintosh)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Spanish (Sun dead keys)"
 msgstr "Spansk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Spanish (eliminate dead keys)"
 msgstr "Spansk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Spanish (include dead tilde)"
 msgstr "Spansk (inkluder død tilde)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Specialtaster (Ctrl+Alt+&lt;key&gt;) håndteret i en server"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Sun Type 5/6"
 msgstr "Sun type 5/6"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swahili (Kenya)"
 msgstr "Swahili (Kenya)"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swahili (Tanzania)"
 msgstr "Swahili (Tanzania)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Ombyt Ctrl og Caps Lock"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
 msgid "Swap ESC and Caps Lock"
 msgstr "Ombyt ESC og Caps Lock"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (Dvorak)"
 msgstr "Svensk (dvorak)"
 
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:728
 msgid "Swedish (Macintosh)"
 msgstr "Svensk (Macintosh)"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
 msgid "Swedish (Svdvorak)"
 msgstr "Svensk (svdvorak)"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:730
 msgid "Swedish (eliminate dead keys)"
 msgstr "Svensk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:728
+#: ../rules/base.xml.in.h:731
 msgid "Swedish Sign Language"
 msgstr "Svensk tegnsprog"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:732
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet-pc)"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
 msgid "Syriac"
 msgstr "Syrisk"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
 msgid "Syriac (phonetic)"
 msgstr "Syrisk (fonetisk)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
 msgid "Taiwanese"
 msgstr "Taiwanesisk"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
 msgid "Taiwanese (indigenous)"
 msgstr "Taiwanesisk (indfødte)"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
 msgid "Tajik"
 msgstr "Tadsjikisk"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
 msgid "Tajik (legacy)"
 msgstr "Tadsjikisk (forældet)"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
 msgid "Tamil"
 msgstr "Tamilsk"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamilsk (Sri Lanka, TAB-skrivemaskine)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamilsk (Sri Lanka, unicode)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamilsk (TAB-skrivemaskine)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamilsk (TSCII-skrivemaskine)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
 msgid "Tamil (Unicode)"
 msgstr "Tamilsk (unicode)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamilsk (tastatur med numre)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
 msgid "Tatar"
 msgstr "Tatar"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
 msgid "Thai"
 msgstr "Thai"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
 msgid "Thai (Pattachote)"
 msgstr "Thai (pattachote)"
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:751
 msgid "Thai (TIS-820.2538)"
 msgstr "Thai (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
 msgid "Tibetan"
 msgstr "Tibetansk"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibetansk (med ASCII-numre)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Til den tilsvarende tast i et Dvoraktastatur."
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Til den tilsvarende tast på et Qwertytastatur."
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Skift pegetaster med Skift + NumLock."
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:758
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
 msgid "Tswana"
 msgstr "Tswana"
 
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:762
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (Alt-Q)"
 msgstr "Tyrkisk (Alt-Q)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
 msgid "Turkish (F)"
 msgstr "Tyrkisk (F)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
 msgid "Turkish (Sun dead keys)"
 msgstr "Tyrkisk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
 msgid "Turkish (international with dead keys)"
 msgstr "Tyrkisk (international med døde taster)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:767
 msgid "Turkmen"
 msgstr "Turkmensk"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmensk (Alt-Q)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:772
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU-tilstand)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:773
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP-tilstand)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:774
 msgid "Udmurt"
 msgstr "Udmurt"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukrainsk (Wintaster)"
 
 # Pannonian Rusyn or simply Rusyn (Ruthenian) is a Slavic language or dialect spoken 
 # in north-western Serbia and eastern Croatia 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Ukrainsk (homofonisk)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (legacy)"
 msgstr "Ukrainsk (forældet)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
 msgid "Ukrainian (phonetic)"
 msgstr "Ukrainsk (fonetisk)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukrainsk (standard RSTU)"
 
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
 msgid "Ukrainian (typewriter)"
 msgstr "Ukrainsk (skrivemaskine)"
 
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:782
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode tilføjelser (pile og matematiske tegn)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:783
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Unicode tilføjelser (pile og matematiske tegn). Matematiske tegn på standardniveau"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:784
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (Pakistan)"
 msgstr "Urdu (Pakistan)"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (Win-taster)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:789
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (alternativ fonetisk)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
 msgid "Urdu (phonetic)"
 msgstr "Urdu (fonetisk)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Brug tastatur-LED til at vise alternativ layout"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:792
 msgid "Using space key to input non-breakable space character"
 msgstr "Brug mellemrum for at indtaste ubrydelig mellemrumskarakter"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:793
 msgid "Usual space at any level"
 msgstr "Normal mellemrum på alle niveauer"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:794
 msgid "Uyghur"
 msgstr "Uyghur"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek"
 msgstr "Usbekisk"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
 msgid "Uzbek (Afghanistan)"
 msgstr "Usbekisk (Afghanistan)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Usbekisk (Afghanistan, OLPC)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
 msgid "Uzbek (Latin)"
 msgstr "Usbekisk (latin)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard"
 
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Wang 724 numerisk tastatur med Unicode-tilføjelser (pile og matematiske tegn)"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:802
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Wang 724 numerisk tastatur med Unicode-tilføjelser (pile og matematiske tegn). Matematiske tegn på standardniveau"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:803
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
 msgid "Wolof"
 msgstr "Wolof"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
 msgid "Yakut"
 msgstr "Yakut"
 
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
 msgid "Yoruba"
 msgstr "Yoruba"
 
@@ -3286,427 +3299,427 @@ msgstr "Yoruba"
 # is desirable to keep the words closer together. The ZWNJ is represented in Unicode 
 # is U+200C, and can be represented in HTML as &#x200C;, &#8204; or &zwnj;. Kilde eng.
 # wikipedia 12. maj 2010
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level"
 msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:809
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt mellemrumstegn på tredje niveau"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:810
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt på mellemrum på tredje niveau"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:811
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt mellemrumstegn på tredje niveau"
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:812
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt mellemrumstegn på tredje niveau, ubrydeligt mellemrumstegn (ZWNJ) på fjerde niveau"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:813
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ombrydeligt mellemrumstegn på tredje niveau"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:814
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ombrydeligt mellemrumstegn på tredje niveau, ubrydeligt mellemrumsteng på fjerde niveau"
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:815
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på tredje niveau, ombrydeligt mellemrumstegn på fjerde niveau"
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:816
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:817
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:820
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
 msgid "ca"
 msgstr "ca"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:831 ../rules/base.extras.xml.in.h:38
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:39
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:40
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:41
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:846 ../rules/base.extras.xml.in.h:42
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:849
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:852
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
+#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:43
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:858
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:863
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:867
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:871 ../rules/base.extras.xml.in.h:45
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:46
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:873
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:878
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:881
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:47
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
+#: ../rules/base.xml.in.h:888 ../rules/base.extras.xml.in.h:48
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:889 ../rules/base.extras.xml.in.h:49
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
+#: ../rules/base.xml.in.h:895 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:904
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:910
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:911
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:912
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
 msgid "zh"
 msgstr "zh"
 
@@ -3714,6 +3727,10 @@ msgstr "zh"
 msgid "APL Keyboard Symbols"
 msgstr "APL-tastatursymboler"
 
+#: ../rules/base.extras.xml.in.h:3
+msgid "Armenian (OLPC phonetic)"
+msgstr "Armensk (OLPC-fonetisk)"
+
 #: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
 msgstr "Atsina"
@@ -3728,83 +3745,116 @@ msgstr "Avestisk"
 msgid "Couer D'alene Salish"
 msgstr "Couer D'alene Salish"
 
-#: ../rules/base.extras.xml.in.h:8
+#: ../rules/base.extras.xml.in.h:7
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Krimtatarsk (Dobruja Q)"
+
+#: ../rules/base.extras.xml.in.h:9
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Engelsk (US, international AltGr Unicode-sammensætning)"
 
-#: ../rules/base.extras.xml.in.h:9
+#: ../rules/base.extras.xml.in.h:10
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Engelsk (US, international AltGr Unicode-sammensætning, alternativ)"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:13
+msgid "German (US keyboard with German letters)"
+msgstr "Tysk (US-tastatur med tyske bogstaver)"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "Tysk (med ungarske bogstaver og ingen døde taster)"
+
+#: ../rules/base.extras.xml.in.h:15
 msgid "Kutenai"
 msgstr "Kutenai"
 
-#: ../rules/base.extras.xml.in.h:13
+#: ../rules/base.extras.xml.in.h:17
 msgid "Latvian (US Colemak)"
 msgstr "Lettisk (US Colemak)"
 
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:18
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Lettisk (US Colemak, apostrofvariant)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:19
 msgid "Latvian (US Dvorak)"
 msgstr "Lettisk (US dvorak)"
 
-#: ../rules/base.extras.xml.in.h:16
+#: ../rules/base.extras.xml.in.h:20
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Lettisk (US dvorak, Y-variant)"
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Lettisk (US dvorak, minus variant)"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Lettisk (programmør US dvorak)"
 
-#: ../rules/base.extras.xml.in.h:19
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Lettisk (programmør US dvorak, Y-variant)"
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Lettisk (programmør US dvorak, minus variant)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:26
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Litauisk (US dvorak med litauiske bogstaver)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:29
 msgid "Polish (international with dead keys)"
 msgstr "Polsk (international med døde taster)"
 
 # touchtype = blindskrift (altså at skrive uden at kigge)
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:31
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Rumænsk (ergonomisk maskinskrivning)"
 
-#: ../rules/base.extras.xml.in.h:29
-msgid "Russian (with UKR and BEL layout)"
-msgstr "Russisk (med UKR- og BEL-layout)"
+#: ../rules/base.extras.xml.in.h:33
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "Russisk (med ukrainsk-hviderussisk layout)"
 
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:34
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Serbisk (sammensætte accenter frem for døde taster)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "apl"
 msgstr "apl"
 
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:44
 msgid "kut"
 msgstr "kut"
 
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:50
 msgid "shs"
 msgstr "shs"
+
+#~ msgid "English (Cameroon qwerty)"
+#~ msgstr "Engelsk (camerounsk qwerty)"
+
+#~ msgid "French (Cameroon azerty)"
+#~ msgstr "Fransk (camerounsk azerty)"
+
+#~ msgid "German (qwerty)"
+#~ msgstr "Tysk (qwerty)"
+
+#~ msgid "Make Caps Lock an additional Ctrl"
+#~ msgstr "Gør Caps Lock til en ekstra Ctrl"
+
+#~ msgid "Meta on Left Ctrl"
+#~ msgstr "Meta på venstre Ctrl"
+
+#~ msgid "Right Ctrl is mapped to Menu"
+#~ msgstr "Højre Ctrl ligger på Menu"
+
+#~ msgid "Sinhala"
+#~ msgstr "Sinhala"
diff --git a/dist/xkeyboard-config/po/de.po b/dist/xkeyboard-config/po/de.po
index 4de8c47dd..b1b861ef1 100644
--- a/dist/xkeyboard-config/po/de.po
+++ b/dist/xkeyboard-config/po/de.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.3\n"
+"Project-Id-Version: xkeyboard-config-2.3.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-17 21:08+0100\n"
-"PO-Revision-Date: 2011-05-19 20:11+0100\n"
+"POT-Creation-Date: 2011-09-15 21:25+0100\n"
+"PO-Revision-Date: 2011-09-17 15:08+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -214,7 +214,7 @@ msgstr "Armenisch"
 msgid "Armenian (alternative eastern)"
 msgstr "Armenisch (Alternative, östlich)"
 
-#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:50
 msgid "Armenian (alternative phonetic)"
 msgstr "Armenisch (alternativ, phonetisch)"
 
@@ -375,3278 +375,3290 @@ msgid "Bengali"
 msgstr "Bengalisch"
 
 #: ../rules/base.xml.in.h:90
+msgid "Bengali (Baishakhi Inscript)"
+msgstr "Bengalisch (Baishakhi Inscript)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bengali (Baishakhi)"
+msgstr "Bengalisch (Baishakhi)"
+
+#: ../rules/base.xml.in.h:92
+msgid "Bengali (Bornona)"
+msgstr "Bengalisch (Bornona)"
+
+#: ../rules/base.xml.in.h:93
 msgid "Bengali (Probhat)"
 msgstr "Bengalisch (Probhat)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:94
+msgid "Bengali (Uni Gitanjali)"
+msgstr "Bengalisch (Uni Gitanjali)"
+
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berber (Marokko, Tifinagh alternativ, phonetisch)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "TBerber (Marokko, Tifinagh alternativ)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:97
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berber (Marokko, Tifinagh erweitert, phonetisch)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:98
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berber (Marokko, Tifinagh erweitert)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:99
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berber (Marokko, Tifinagh phonetisch)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:100
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berber (Marokko, Tifinagh)"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:102
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosnisch (US-Tastatur mit bosnischen Digraphen)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:103
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosnisch (US-Tastatur mit bosnischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:104
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosnisch (Bosnische Digraphen verwenden)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:105
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosnisch (Anführungszeichen für Zitate verwenden)"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Beide Alt-Tasten gleichzeitig"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Beide Steuerungstasten gleichzeitig"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Beide Umschalttasten gleichzeitig"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:109
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Beide Umschalttasten gleichzeitig schalten CapsLock ein und aus, eine Umschalttaste deaktiviert"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:110
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Beide Umschalttasten gleichzeitig schalten CapsLock ein und aus"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:111
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Beide Umschalttasten gleichzeitig schalten ShiftLock ein und aus"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:112
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:113
 msgid "Braille (left hand)"
 msgstr "Braille (linkshändig)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:114
 msgid "Braille (right hand)"
 msgstr "Braille (rechtshändig)"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:115
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:116
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:117
 msgid "Bulgarian (new phonetic)"
 msgstr "Bulgarisch (neu phonetisch)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:118
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bulgarisch (traditionell phonetisch)"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:119
 msgid "Burmese"
 msgstr "Burmesisch"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:120
+msgid "Cameroon Multilingual (azerty)"
+msgstr "Kamerunisch, mehrsprachig (azerty)"
+
+#: ../rules/base.xml.in.h:121
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "Kamerunisch, mehrsprachig (qwerty)"
+
+#: ../rules/base.xml.in.h:122
 msgid "Canadian Multilingual"
 msgstr "Kanadisch, mehrsprachig"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:123
 msgid "Canadian Multilingual (first part)"
 msgstr "Kanadisch, mehrsprachig (erster Teil)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:124
 msgid "Canadian Multilingual (second part)"
 msgstr "Kanadisch, mehrsprachig (zweiter Teil)"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock"
 msgstr "Feststelltaste"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr "Feststelltaste wählt die dritte Ebene, sperrt wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der dritten Ebene"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Feststelltaste (zur ersten Belegung), Umschalttaste+Feststelltaste (zur letzten Belegung)"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Feststelltaste (gedrückt halten), Alt+Feststelltaste führen die normale Feststelltasten-Aktion aus"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Feststelltaste arbeitet als Umschalttaste mit Sperrung. Umschalttaste »unterbricht« Feststelltaste"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Feststelltaste arbeitet als Umschalttaste mit Sperrung. Umschalttaste beeinflusst Feststelltaste nicht"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:131
+msgid "Caps Lock as Ctrl"
+msgstr "Feststelltaste als Strg-Taste"
+
+#: ../rules/base.xml.in.h:132
 msgid "Caps Lock is disabled"
 msgstr "Feststelltaste ist deaktiviert"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:133
 msgid "Caps Lock key behavior"
 msgstr "Verhalten der Feststelltaste"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:134
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Feststelltaste kehrt Umschalttaste um, so dass alle Tasten beeinflusst werden"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:135
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Feststelltaste kehrt die normale Großschreibung alphabetischer Zeichen um"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:136
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Feststelltaste verwendet interne Großschreibung. Umschalttaste »unterbricht« Feststelltaste"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:137
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Feststelltaste verwendet interne Großschreibung. Umschalttaste beeinflusst Feststelltaste nicht"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:138
 msgid "Catalan"
 msgstr "Katalanisch"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:139
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Katalanisch (Spanische Variante mit mittelpunktiertem L)"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:140
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:141
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:142
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:143
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (alternative Option)"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:144
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:145
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:146
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:147
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:148
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:149
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:150
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:151
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:152
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:153
 msgid "Chuvash"
 msgstr "Tschuwaschisch"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:154
 msgid "Chuvash (Latin)"
 msgstr "Tschuwaschisch (lateinische Schrift)"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:155
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:156
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 Tasten)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 Tasten)"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:160
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 Tasten)"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:161
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:162
 msgid "Compose key position"
 msgstr "Position der Compose-Taste"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Strg + Alt + Löschtaste"
 
-#: ../rules/base.xml.in.h:157
+#: ../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:158
+#: ../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:159
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:160
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "Krimtatarisch (Dobruja Q)"
-
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Krimtatarisch (Türkisch Alt-Q)"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Krimtatarisch (Türkisch F)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Krimtatarisch (Türkisch Q)"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Kroatisch (US-Tastatur mit kroatischen Digraphen)"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:172
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Kroatisch (US-Tastatur mit kroatischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Kroatisch (Kroatische Digraphen verwenden)"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:174
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Kroatisch (Anführungszeichen für Zitate verwenden)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:175
 msgid "Ctrl key position"
 msgstr "Position der Strg-Taste"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:176
 msgid "Ctrl+Shift"
 msgstr "Strg+Umschalttaste"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:177
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Tschechisch (UCW-Belegung, nur akzentuierte Buchstaben)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Tschechisch (US Dvorak mit CZ-UCW-Unterstützung)"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:180
 msgid "Czech (qwerty)"
 msgstr "Tschechisch (qwerty)"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:181
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Tschechisch (qwerty, erweiterter Backslash)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Tschechisch (mit &lt;\\|&gt;-Taste)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Danish"
 msgstr "Dänisch"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Danish (Dvorak)"
 msgstr "Dänisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Danish (Macintosh)"
 msgstr "Dänisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Dänisch (Macintosh, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Danish (eliminate dead keys)"
 msgstr "Dänisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Default numeric keypad keys"
 msgstr "Vorgegebene Nummernblocktasten"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell 101-key PC"
 msgstr "Dell PC-Tastatur mit 101 Tasten"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell Laptop/Notebook Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell Laptop/Notebook Precision-M-Serie"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dell Latitude series laptop"
 msgstr "Dell Latitude-Laptop"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:197
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keybard"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dhivehi"
 msgstr "Dhivehi"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802-Serie"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:203
 msgid "Dutch (Macintosh)"
 msgstr "Niederländisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:204
 msgid "Dutch (Sun dead keys)"
 msgstr "Niederländisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:205
 msgid "Dutch (standard)"
 msgstr "Niederländisch (Standard)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:206
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:207
 msgid "Enable extra typographic characters"
 msgstr "Typographische Sonderzeichen aktivieren"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:208
 msgid "English (Cameroon Dvorak)"
 msgstr "Englisch (Kamerun, Dvorak)"
 
-#: ../rules/base.xml.in.h:203
-msgid "English (Cameroon qwerty)"
-msgstr "Englisch (Kamerun, qwerty)"
-
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:209
 msgid "English (Cameroon)"
 msgstr "Englisch (Kamerun)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:210
 msgid "English (Canada)"
 msgstr "Englisch (Kanada)"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:211
 msgid "English (Colemak)"
 msgstr "Englisch (Colemak)"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:212
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Englisch (Dvorak Alternative international, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:213
 msgid "English (Dvorak international with dead keys)"
 msgstr "Englisch (Dvorak International, mit Akzenttasten)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:214
 msgid "English (Dvorak)"
 msgstr "Englisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:215
 msgid "English (Ghana)"
 msgstr "Englisch (Ghana)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:216
 msgid "English (Ghana, GILLBT)"
 msgstr "Englisch (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:217
 msgid "English (Ghana, multilingual)"
 msgstr "Englisch (Ghana, mehrsprachig)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:218
 msgid "English (India, with RupeeSign)"
 msgstr "Englisch (Indien, mit Rupie-Symbol)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:219
 msgid "English (Macintosh)"
 msgstr "Englisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:220
 msgid "English (Mali, US Macintosh)"
 msgstr "Englisch (Mali, USA Macintosh)"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:221
 msgid "English (Mali, US international)"
 msgstr "Englisch (Mali, USA International)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:222
 msgid "English (Nigeria)"
 msgstr "Englisch (Nigeria)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:223
 msgid "English (South Africa)"
 msgstr "Englisch (Südafrika)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:224
 msgid "English (UK)"
 msgstr "Englisch (Britisch)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:225
 msgid "English (UK, Colemak)"
 msgstr "English (Britisch, Colemak)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Englisch (Dvorak mit britischer Punktierung)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:227
 msgid "English (UK, Dvorak)"
 msgstr "Englisch (Britisch, Dvorak)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:228
 msgid "English (UK, Macintosh international)"
 msgstr "Englisch (Britisch, Macintosh international)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:229
 msgid "English (UK, Macintosh)"
 msgstr "Englisch (Britisch, Macintosh)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:230
 msgid "English (UK, extended WinKeys)"
 msgstr "Englisch (Britisch erweitert, Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:231
 msgid "English (UK, international with dead keys)"
 msgstr "Englisch (Britisch international, mit Akzenttasten)"
 
-#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:232 ../rules/base.extras.xml.in.h:8
 msgid "English (US)"
 msgstr "English (USA)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:233
 msgid "English (US, alternative international)"
 msgstr "Englisch (USA, international alternativ)"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:234
 msgid "English (US, international with dead keys)"
 msgstr "Englisch (USA International, mit Akzenttasten)"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:235
 msgid "English (US, with euro on 5)"
 msgstr "Englisch (USA, mit Euro-Symbol auf 5)"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:236
 msgid "English (classic Dvorak)"
 msgstr "Englisch (Dvorak, klassisch)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:237
 msgid "English (international AltGr dead keys)"
 msgstr "Englisch (international, AltGr-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:238
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Englisch (Belegungsumschalter auf der Multiplikations-/Divisionstaste)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:239
 msgid "English (left handed Dvorak)"
 msgstr "Englisch (Dvorak, linkshändig)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:240
 msgid "English (programmer Dvorak)"
 msgstr "Englisch (Dvorak für Programmierer)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:241
 msgid "English (right handed Dvorak)"
 msgstr "Englisch (Dvorak, rechtshändig)"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:242
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:243
 msgid "Enter on keypad"
 msgstr "Eingabetaste im Nummernblock"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:244
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:245
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Esperanto (Portugal, Nativo)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:246
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (falsch platziertes Semikolon und Anführungszeichen, veraltet)"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:247
 msgid "Estonian"
 msgstr "Estnisch"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:248
 msgid "Estonian (Dvorak)"
 msgstr "Estnisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:249
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estnisch (US-Tastatur mit estnischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:250
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estnisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:251
 msgid "Euro on 2"
 msgstr "Euro auf 2"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:252
 msgid "Euro on 4"
 msgstr "Euro auf 4"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:253
 msgid "Euro on 5"
 msgstr "Euro auf 5"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:254
 msgid "Euro on E"
 msgstr "Euro auf E"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:255
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:256
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:257
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:258
 msgid "Faroese"
 msgstr "Färöisch"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:259
 msgid "Faroese (eliminate dead keys)"
 msgstr "Färöisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:260
 msgid "Filipino"
 msgstr "Philippinisch"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Philippinisch (Capewell-Dvorak, Baybayin)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:262
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Philippinisch (Capewell-Dvorak, Lateinisch)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Philippinisch (Capewell-QWERF 2006, Baybayin)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Philippinisch (Capewell-QWERF 2006, lateinisch)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:265
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Philippinisch (Colemak, Baybayin)"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:266
 msgid "Filipino (Colemak Latin)"
 msgstr "Philippinisch (Colemak, lateinisch)"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:267
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Philippinisch (Dvorak, Baybayin)"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:268
 msgid "Filipino (Dvorak Latin)"
 msgstr "Philippinisch (Dvorak, lateinisch)"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:269
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Philippinisch (QWERTY, Baybayin)"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:270
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:271
 msgid "Finnish (Macintosh)"
 msgstr "Finnisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:272
 msgid "Finnish (classic)"
 msgstr "Finnisch (klassisch)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:273
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finnisch (klassisch, ohne Akzenttasten)"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:276
 msgid "Four-level key with abstract separators"
 msgstr "Taste der vierten Ebene mit abstrakten Trennern"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:277
 msgid "Four-level key with comma"
 msgstr "Taste der vierten Ebene mit Komma"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:278
 msgid "Four-level key with dot"
 msgstr "Taste der vierten Ebene mit Punkt"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:279
 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:275
+#: ../rules/base.xml.in.h:280
 msgid "Four-level key with momayyez"
 msgstr "Taste der vierten Ebene mit »momayyez«"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:281
 msgid "French"
 msgstr "Französisch"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:282
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Französich (Bepo, ergonomisch, Dvorak-ähnlich)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:283
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Französisch (Bepo, ergonomisch, Dvorak-ähnlich, nur latin-9)"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:284
 msgid "French (Breton)"
 msgstr "Französisch (Bretonisch)"
 
-#: ../rules/base.xml.in.h:280
-msgid "French (Cameroon azerty)"
-msgstr "Französisch (Kamerun, azerty)"
-
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:285
 msgid "French (Cameroon)"
 msgstr "Französisch (Kamerun)"
 
-#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:286 ../rules/base.extras.xml.in.h:11
 msgid "French (Canada)"
 msgstr "Französisch (Kanada)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:287
 msgid "French (Canada, Dvorak)"
 msgstr "Französisch (Kanada, Dvorak)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:288
 msgid "French (Canada, legacy)"
 msgstr "Französisch (Kanada, veraltet)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:289
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Französisch (Demokratische Republik Kongo)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:290
 msgid "French (Dvorak)"
 msgstr "Französisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:291
 msgid "French (Guinea)"
 msgstr "Französisch (Guinea)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:292
 msgid "French (Macintosh)"
 msgstr "Französisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:293
 msgid "French (Mali, alternative)"
 msgstr "Französisch (Mali, Alternative)"
 
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:294
 msgid "French (Morocco)"
 msgstr "Französisch (Marokko)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:295
 msgid "French (Sun dead keys)"
 msgstr "Französisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:296
 msgid "French (Switzerland)"
 msgstr "Französisch (Schweiz)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:297
 msgid "French (Switzerland, Macintosh)"
 msgstr "Französisch (Schweiz, Macintosh)"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:298
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Französisch (Schweiz, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:299
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Französisch (Schweiz, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:300
 msgid "French (alternative)"
 msgstr "Französisch (alternativ)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:301
 msgid "French (alternative, Sun dead keys)"
 msgstr "Französisch (Alternative, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:302
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Französisch (Alternative, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:303
 msgid "French (alternative, latin-9 only)"
 msgstr "Französisch (Alternative, nur latin-9)"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:304
 msgid "French (eliminate dead keys)"
 msgstr "Französisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:305
 msgid "French (legacy, alternative)"
 msgstr "Französisch (Alternative, veraltet)"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:306
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Französisch (Alternative, veraltet, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:307
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Französisch (Alternative, veraltet, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:308
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO Laptop"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:309
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:310
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:311
 msgid "Generic 101-key PC"
 msgstr "Generische PC-Tastatur mit 101 Tasten"
 
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:312
 msgid "Generic 102-key (Intl) PC"
 msgstr "Generische PC-Tastatur mit 102 Tasten (Intl)"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:313
 msgid "Generic 104-key PC"
 msgstr "Generische PC-Tastatur mit 104 Tasten"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:314
 msgid "Generic 105-key (Intl) PC"
 msgstr "Generische PC-Tastatur mit 105 Tasten (Intl)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:315
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:316
 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:313
+#: ../rules/base.xml.in.h:317
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:318
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:319
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:320
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:321
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Georgisch (Frankreich, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:322
 msgid "Georgian (Italy)"
 msgstr "Georgisch (Italien)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:323
 msgid "Georgian (MESS)"
 msgstr "Georgisch (MESS)"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:324
 msgid "Georgian (ergonomic)"
 msgstr "Georgisch (ergonomisch)"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:325 ../rules/base.extras.xml.in.h:12
 msgid "German"
 msgstr "Deutsch"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:326
 msgid "German (Austria)"
 msgstr "Deutsch (Österreich)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:327
 msgid "German (Austria, Macintosh)"
 msgstr "Deutsch (Österreich, Macintosh)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:328
 msgid "German (Austria, Sun dead keys)"
 msgstr "Deutsch (Österreich, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:329
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Deutsch (Österreich, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:330
 msgid "German (Dvorak)"
 msgstr "Deutsch (Dvorak)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:331
 msgid "German (Macintosh)"
 msgstr "Deutsch (Macintosh)"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:332
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Deutsch (Macintosh, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:333
 msgid "German (Neo 2)"
 msgstr "Deutsch (Neo 2)"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:334
 msgid "German (Sun dead keys)"
 msgstr "Deutsch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:335
 msgid "German (Switzerland)"
 msgstr "Deutsch (Schweiz)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:336
 msgid "German (Switzerland, Macintosh)"
 msgstr "Deutsch (Schweiz, Macintosh)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:337
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Deutsch (Schweiz, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:338
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Deutsch (Schweiz, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:339
 msgid "German (Switzerland, legacy)"
 msgstr "Deutsch (Schweiz, veraltet)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:340
 msgid "German (dead acute)"
 msgstr "Deutsch (Nur Acute-(')Akzentzeichen)"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:341
 msgid "German (dead grave acute)"
 msgstr "Deutsch (Nur Grave-(`) und Acute-(')Akzentzeichen)"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:342
 msgid "German (eliminate dead keys)"
 msgstr "Deutsch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:339
-msgid "German (qwerty)"
-msgstr "Deutsch (qwerty)"
-
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:343
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:344
 msgid "Greek (eliminate dead keys)"
 msgstr "Griechisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:345
 msgid "Greek (extended)"
 msgstr "Griechisch (erweitert)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:346
 msgid "Greek (polytonic)"
 msgstr "Griechisch (polytonisch)"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:347
 msgid "Greek (simple)"
 msgstr "Griechisch (vereinfacht)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:348
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:349
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:350
 msgid "HTC Dream"
 msgstr "HTC Dream"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:351
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:352
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "»Happy Hacking Keyboard« für Mac"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:353
 msgid "Hausa"
 msgstr "Haussa"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:354
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:355
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Hebräisch (Biblisch, Tiro)"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:356
 msgid "Hebrew (lyx)"
 msgstr "Hebräisch (lyx)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:357
 msgid "Hebrew (phonetic)"
 msgstr "Hebräisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard Mini 110 Notebook"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:367
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:368
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:369
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:370
 msgid "Hexadecimal"
 msgstr "Hexadezimal"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:371
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (Bolnagri)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:372
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:373
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:374
 msgid "Htc Dream phone"
 msgstr "HTC Dream Mobiltelefon"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Ungarisch (101/qwerty/Komma/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Ungarisch (101/qwerty/Komma/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Ungarisch (101/qwerty/Punkt/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Ungarisch (101/qwerty/Punkt/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Ungarisch (101/qwertz/Komma/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Ungarisch (101/qwertz/Komma/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Ungarisch (101/qwertz/Punkt/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Ungarisch (101/qwertz/Punkt/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Ungarisch (102/qwerty/Komma/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Ungarisch (102/qwerty/Komma/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Ungarisch (102/qwerty/Punkt/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Ungarisch (102/qwerty/Punkt/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Ungarisch (102/qwertz/Komma/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Ungarisch (102/qwertz/Komma/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Ungarisch (102/qwertz/Punkt/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Ungarisch (102/qwertz/Punkt/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:392
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Ungarisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:393
 msgid "Hungarian (qwerty)"
 msgstr "Ungarisch (qwerty)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:394
 msgid "Hungarian (standard)"
 msgstr "Ungarisch (Standard)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:395
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper ist den Win-Tasten zugeordnet"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:396
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:397
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:398
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:399
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:400
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:401
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic"
 msgstr "Isländisch"
 
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (Dvorak)"
 msgstr "Isländisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:404
 msgid "Icelandic (Macintosh)"
 msgstr "Isländisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:405
 msgid "Icelandic (Sun dead keys)"
 msgstr "Isländisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:406
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Isländisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:407
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:408
 msgid "Indian"
 msgstr "Indisch"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:409
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:410
 msgid "Iraqi"
 msgstr "Irakisch"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:411
 msgid "Irish"
 msgstr "Irisch"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:412
 msgid "Irish (UnicodeExpert)"
 msgstr "Irisch (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:413
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:414
 msgid "Italian (Macintosh)"
 msgstr "Italienisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:415
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Italienisch (US-Tastatur mit italienischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:416
 msgid "Italian (eliminate dead keys)"
 msgstr "Italienisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:417
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (Kana 86)"
 msgstr "Japanisch (Kana 86)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (Kana)"
 msgstr "Japanisch (Kana)"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:420
 msgid "Japanese (Macintosh)"
 msgstr "Japanisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:421
 msgid "Japanese (OADG 109A)"
 msgstr "Japanisch (OADG 109A)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:422
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japanisch (PC-98xx-Serie)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:423
 msgid "Japanese keyboard options"
 msgstr "Japanische Tastaturoptionen"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:424
 msgid "Kalmyk"
 msgstr "Kalmykisch"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:425
 msgid "Kana Lock key is locking"
 msgstr "Kana-Sperrtaste ist gesperrt"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:426
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:427
 msgid "Kashubian"
 msgstr "Kaschubisch"
 
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:428
 msgid "Kazakh"
 msgstr "Kasachisch"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:429
 msgid "Kazakh (with Russian)"
 msgstr "Kasachisch (mit russischer Belegung)"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:430
 msgid "Key sequence to kill the X server"
 msgstr "Tastenkombination zum erzwungenen Beenden des X-Servers"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:431
 msgid "Key to choose 3rd level"
 msgstr "Taste zum Wechsel in die dritte Tastaturebene"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:432
 msgid "Key to choose 5th level"
 msgstr "Taste zum Wechsel in die fünfte Tastaturebene"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:433
 msgid "Key(s) to change layout"
 msgstr "Taste(n) zum Wechseln der Belegung"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:434
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:435
 msgid "Khmer (Cambodia)"
 msgstr "Khmer (Kambodscha)"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:436
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:437
 msgid "Kinesis"
 msgstr "Kinesis"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:438
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:439
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:440
 msgid "Korean (101/104 key compatible)"
 msgstr "Koreanisch (101/104-Tasten kompatibel)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurdisch (Iran, Arabisch-Lateinisch)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iran, F)"
 msgstr "Kurdisch (Iran, F)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Kurdisch (Iran, Lateinisches Alt-Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurdisch (Iran, Lateinisches Q)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurdisch (Irak, Arabisch-Lateinisch)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurdisch (Irak, F)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurdisch (Irak, Lateinisches Alt-Q)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurdisch (Irak, lateinisches Q)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Syria, F)"
 msgstr "Kurdisch (Syrien, F)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurdisch (Syrien, lateinisches Alt-Q)"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurdisch (Syrien, lateinisches Q)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:452
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurdisch (Türkei, F)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:453
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurdisch (Türkei, lateinisches Alt-Q)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:454
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurdisch (Türkei, lateinisches Q)"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:455
 msgid "Kyrgyz"
 msgstr "Kirgisisch"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:456
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgisisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:457
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:458
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Laotisch (durch STEA vorgeschlagene Standardbelegung)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:459
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Compaq Laptop/Notebook-Tastatur (z.B. Armada) Laptop-Tastatur"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:460
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Compaq Laptop/Notebook-Tastatur (z.B. Presario) Laptop-Tastatur"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:461
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Laptop/notebook eMachines m68xx"
 
-#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+#: ../rules/base.xml.in.h:462 ../rules/base.extras.xml.in.h:16
 msgid "Latvian"
 msgstr "Lettisch"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:463
 msgid "Latvian (F variant)"
 msgstr "Lettisch (F-Variante)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:464
 msgid "Latvian (adapted)"
 msgstr "Lettisch (angepasst)"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:465
 msgid "Latvian (apostrophe variant)"
 msgstr "Lettisch, (Apostroph-Variante)"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:466
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Georgisch (ergonomisch, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:467
 msgid "Latvian (modern)"
 msgstr "Lettisch (modern)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:468
 msgid "Latvian (tilde variant)"
 msgstr "Lettisch (Tilde-Variante)"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:469
 msgid "Left Alt"
 msgstr "Linke Alt-Taste"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:470
 msgid "Left Alt (while pressed)"
 msgstr "Linke Alt-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:471
 msgid "Left Alt is swapped with Left Win"
 msgstr "Linke Alt-Taste ist gegen linke Windows-Taste vertauscht"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:472
 msgid "Left Ctrl"
 msgstr "Linke Strg-Taste"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:473
 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:471
+#: ../rules/base.xml.in.h:474
+msgid "Left Ctrl as Meta"
+msgstr "Linke Strg-Taste als Meta"
+
+#: ../rules/base.xml.in.h:475
 msgid "Left Ctrl+Left Shift"
 msgstr "Linke Strg-Taste+Linke Umschalttaste"
 
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:476
 msgid "Left Shift"
 msgstr "Linke Umschalttaste"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:477
 msgid "Left Win"
 msgstr "Linke Windows-Taste"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:478
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Linke Windows-Taste (zur ersten Belegung), rechte Windows/Menütaste (zur letzten Belegung)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:479
 msgid "Left Win (while pressed)"
 msgstr "Linke Windows-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:480
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Linke Win-Taste wählt die fünfte Ebene, sperrt wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der fünften Ebene"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:481
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Linke Win-Taste wählt die fünfte Ebene, sperrt wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der fünften Ebene. Einmaliges Drücken löst die Sperrung."
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:482
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Linke Strg-Taste und linke Win-Taste (zur ersten Belegung), rechte Strg-Taste und Menütaste (zur zweiten Belegung)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:483
 msgid "Legacy"
 msgstr "Veraltet"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:484
 msgid "Legacy Wang 724"
 msgstr "Wang 724 (veraltet)"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:486
 msgid "Legacy key with comma"
 msgstr "Veraltete Taste mit Komma"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:487
 msgid "Legacy key with dot"
 msgstr "Veraltete Taste mit Punkt"
 
-#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+#: ../rules/base.xml.in.h:488 ../rules/base.extras.xml.in.h:25
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litauisch (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:490
 msgid "Lithuanian (LEKP)"
 msgstr "Litauisch (LEKP)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:491
 msgid "Lithuanian (LEKPa)"
 msgstr "Litauisch (LEKPa)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:492
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litauisch (US-Tastatur mit litauischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:493
 msgid "Lithuanian (standard)"
 msgstr "Litauisch (Standard)"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Access Keyboard"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop (alternative Option)"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:500
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro (alternative Option 2)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:504
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Logitech G15-Sondertasten über den G1-Daemon"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Generic Keyboard"
 msgstr "Generische Logitech-Tastatur"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Logitech Internet 350 Keyboard"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:508
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:509
 msgid "Logitech Media Elite Keyboard"
 msgstr "Logitech Media Elite Keyboard"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:510
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:511
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Logitech Ultra-X Keyboard"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:512
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Logitech diNovo Edge Keyboard"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:513
 msgid "Logitech diNovo Keyboard"
 msgstr "Logitech diNovo Keyboard"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:514
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:515
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (Modell Y-RB6)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:516
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:517
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:518
 msgid "Lower Sorbian"
 msgstr "Niedersorbisch"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:519
 msgid "Lower Sorbian (qwertz)"
 msgstr "Niedersorbisch (qwertz)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:520
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:521
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Intl)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:522
 msgid "Macedonian"
 msgstr "Mazedonisch"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:523
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Mazedonisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:524
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:525
 msgid "Macintosh Old"
 msgstr "Macintosh (Alt)"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Feststelltaste als zusätzliche Löschtaste verwenden"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Feststelltaste als zusätzliche Strg-Taste verwenden, aber Caps_Lock als Schnellzugriff erhalten"
 
-#: ../rules/base.xml.in.h:524
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Feststelltaste als zusätzliche Strg-Taste verwenden"
-
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional ESC"
 msgstr "Feststelltaste als zusätzliche Esc-Taste verwenden"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:529
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Feststelltaste als zusätzliche Hyper-Taste verwenden"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:530
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Feststelltaste als zusätzliche NumLock-Taste verwenden"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:531
 msgid "Make Caps Lock an additional Super"
 msgstr "Feststelltaste als zusätzliche Super-Taste verwenden"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:532
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:533
 msgid "Malayalam (Lalitha)"
 msgstr "Malayalam (Lalitha)"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:534
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malayalam (verbessertes Inscript mit Rupie-Symbol)"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:535
 msgid "Maltese"
 msgstr "Maltesisch"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:536
 msgid "Maltese (with US layout)"
 msgstr "Maltesisch (mit US-Belegung)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:537
 msgid "Maori"
 msgstr "Maori"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:538
 msgid "Mari"
 msgstr "Mari"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:539
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:540
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:541
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:542
 msgid "Menu"
 msgstr "Menü"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:543
+msgid "Menu as Right Ctrl"
+msgstr "Menü als rechte Strg-Taste"
+
+#: ../rules/base.xml.in.h:544
 msgid "Meta is mapped to Left Win"
 msgstr "Meta ist der linken Windows-Taste zugeordnet"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:545
 msgid "Meta is mapped to Win keys"
 msgstr "Meta ist den Windows-Tasten zugeordnet"
 
-#: ../rules/base.xml.in.h:542
-msgid "Meta on Left Ctrl"
-msgstr "Meta auf linker Strg-Taste"
-
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve Keyboard 2000"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Schwedisch"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:550
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural Keyboard Elite"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:553
 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:551
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:555
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:556
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:557
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:558
 msgid "Miscellaneous compatibility options"
 msgstr "Verschiedene Optionen zur Kompatibilität"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:559
 msgid "Mongolian"
 msgstr "Mongolisch"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin"
 msgstr "Montenegrinisch"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:561
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrinisch (Kyrillisch mit Anführungszeichen)"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:562
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrinisch (kyrillisch)"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:563
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrinisch, (Kyrillisch, »З« und »Ж« vertauscht)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Montenegrinisch (lateinische qwerty-Tastatur, Unicode)"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:565
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Montenegrinisch (lateinisch, Unicode)"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:566
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Montenegrinisch (lateinische qwerty-Tastatur)"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:567
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrinisch (lateinisch mit Anführungszeichen)"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:568
 msgid "NICOLA-F style Backspace"
 msgstr "Löschtaste wie NICOLA-F"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:569
 msgid "Nepali"
 msgstr "Nepalesisch"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at fourth level"
 msgstr "Nicht umbrechbares Leerzeichen in der vierten Tastaturebene"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Nicht umbrechbares Leerzeichen in der vierten Tastaturebene, schmales nicht umbrechbares Leerzeichen in der sechsten Ebene"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:572
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Nicht umbrechbares Leerzeichen in der vierten Tastaturebene, schmales nicht umbrechbares Leerzeichen in der sechsten Ebene (mit Strg + Umschalttaste)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at second level"
 msgstr "Nicht umbrechbares Leerzeichen in der zweiten Tastaturebene"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:574
 msgid "Non-breakable space character at third level"
 msgstr "Nicht umbrechbares Leerzeichen in der dritten Tastaturebene"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:575
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Nicht umbrechbares Leerzeichen in der dritten Tastaturebene, nichts in der vierten Ebene"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:576
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Nicht umbrechbares Leerzeichen in der dritten Tastaturebene, schmales nicht umbrechbares Leerzeichen in der vierten Ebene"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:577
 msgid "Northern Saami (Finland)"
 msgstr "Nördliches Saami (Finnland)"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:578
 msgid "Northern Saami (Norway)"
 msgstr "Nördliches Saami (Norwegen)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:579
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Nördliches Saami (Norwegen, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:580
 msgid "Northern Saami (Sweden)"
 msgstr "Nördliches Saami (Schweden)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:581
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:582
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (Dvorak)"
 msgstr "Norwegisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:584
 msgid "Norwegian (Macintosh)"
 msgstr "Norwegisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:585
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Norwegisch (Macintosh, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:586
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norwegisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:587
 msgid "Num Lock"
 msgstr "NumLock"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:588
 msgid "Numeric keypad delete key behaviour"
 msgstr "Verhalten der Löschtaste des Nummernblocks"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:589
 msgid "Numeric keypad keys work as with Macintosh"
 msgstr "Tasten des Nummernblocks arbeiten wie bei Mac"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:590
 msgid "Numeric keypad layout selection"
 msgstr "Belegungsauswahl des Nummernblocks"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:591
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:592
 msgid "Occitan"
 msgstr "Okzitanisch"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:593
 msgid "Ogham"
 msgstr "Ogham"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:594
 msgid "Ogham (IS434)"
 msgstr "Ogham (IS434)"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:595
 msgid "Oriya"
 msgstr "Oriya"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:596
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Ortek MCK-800 MM/Internettastatur"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:597
 msgid "Ossetian (Georgia)"
 msgstr "Ossetisch (Georgien)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:598
 msgid "Ossetian (WinKeys)"
 msgstr "Ossetisch (Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:599
 msgid "Ossetian (legacy)"
 msgstr "Ossetisch (veraltet)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:600
 msgid "PC-98xx Series"
 msgstr "PC-98xx-Serie"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:601
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Pannonisches Russinisch (homophon)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:602
 msgid "Pashto"
 msgstr "Paschtunisch"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:603
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Paschtunisch (Afghanistan, OLPC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:604
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:27
 msgid "Persian"
 msgstr "Persisch"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:606
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persisch (Afghanistan, Dari-OLPC)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:607
 msgid "Persian (with Persian Keypad)"
 msgstr "Persisch (mit persischem Nummernblock)"
 
-#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:28
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:609
 msgid "Polish (Dvorak)"
 msgstr "Polnisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:610
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Polnisch (Dvorak, polnische Anführungszeichen auf Taste 1)"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:611
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Polnisch (Dvorak, polnische Anführungszeichen auf Taste mit Zitatzeichen)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:612
 msgid "Polish (programmer Dvorak)"
 msgstr "Polnisch (Dvorak für Programmierer)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:613
 msgid "Polish (qwertz)"
 msgstr "Polnisch (qwertz)"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil)"
 msgstr "Portugiesisch (Brasilien)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugiesisch (Brasilien, Dvorak)"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugiesisch (Brasilien, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:618
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugiesisch (Brasilien, Nativo für Esperanto)"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:619
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugiesisch (Brasilien, Nativo für US-Tastaturen)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:620
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugiesisch (Brasilien, nativo)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Macintosh)"
 msgstr "Portugiesisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portugiesisch (Macintosh, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portugiesisch (Macintosh, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugiesisch (Nativo für US-Tastaturen)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:625
 msgid "Portuguese (Nativo)"
 msgstr "Portugiesisch (Nativo)"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:626
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugiesisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:627
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugiesisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:628
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:629
 msgid "PrtSc"
 msgstr "Druck"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:630
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Punjabi (Gurmukhi Jhelum)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:631
 msgid "Punjabi (Gurmukhi)"
 msgstr "Punjabi (Gurmukhi)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:632
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt"
 msgstr "Rechte Alt-Taste"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt (while pressed)"
 msgstr "Rechte Alt-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:635
+msgid "Right Alt as Right Ctrl"
+msgstr "Rechte Alt-Taste als rechte Strg-Taste"
+
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Rechte Alt-Taste wählt die fünfte Ebene, sperrt wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der fünften Ebene. Einmaliges Drücken löst die Sperrung."
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:637
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Rechte Alt-Taste wählt die fünfte Ebene, sperrt wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der fünften Ebene"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:638
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Rechte Alt-Taste wählt die fünfte Ebene, sperrt wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der fünften Ebene. Einmaliges Drücken löst die Sperrung."
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:639
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Rechte Alt-Taste wählt niemals die dritte Tastaturebene."
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:640
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Rechte Alt-Taste, Umschalttaste+rechte Alt-Taste ist Multi-Taste"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl"
 msgstr "Rechte Strg-Taste"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:642
 msgid "Right Ctrl (while pressed)"
 msgstr "Rechte Strg-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:643
 msgid "Right Ctrl as Right Alt"
 msgstr "Rechte Strg-Taste wie rechte Alt-Taste"
 
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl is mapped to Menu"
-msgstr "Rechte Strg-Taste ist dem Menü zugeordnet"
-
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:644
 msgid "Right Ctrl+Right Shift"
 msgstr "Rechte Strg-Taste und rechte Umschalttaste"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:645
 msgid "Right Shift"
 msgstr "Rechte Umschalttaste"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:646
 msgid "Right Win"
 msgstr "Rechte Windows-Taste"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:647
 msgid "Right Win (while pressed)"
 msgstr "Rechte Windows-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:648
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Rechte Win-Taste wählt die fünfte Ebene, sperrt wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der fünften Ebene"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:649
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Rechte Win-Taste wählt die fünfte Ebene, sperrt wenn gedrückt, zusammen mit einer anderen Taste zum Wählen der fünften Ebene. Einmaliges Drücken löst die Sperrung."
 
-#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+#: ../rules/base.xml.in.h:650 ../rules/base.extras.xml.in.h:30
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (Germany)"
 msgstr "Rumänisch (Deutschland)"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Rumänisch (Deutschland, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (WinKeys)"
 msgstr "Rumänisch (Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:654
 msgid "Romanian (cedilla)"
 msgstr "Rumänisch (Cedilla)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (standard cedilla)"
 msgstr "Rumänisch (Standard Cedilla)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Rumänisch (Standard)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:657
 msgid "Rupee on 4"
 msgstr "Rupie-Symbol auf 4"
 
-#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:658 ../rules/base.extras.xml.in.h:32
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:659
 msgid "Russian (DOS)"
 msgstr "Russisch (DOS)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Georgia)"
 msgstr "Russisch (Georgien)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Germany, phonetic)"
 msgstr "Russisch (Deutschland, phonetisch)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Russisch (Kasachstan, mit Kasachisch)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:663
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Russisch (Polen, phonetisch, Dvorak)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:664
 msgid "Russian (Sweden, phonetic)"
 msgstr "Russisch (Schweden, phonetisch)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:665
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Russisch (Schweden, phonetisch, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:666
 msgid "Russian (US, phonetic)"
 msgstr "Russisch (USA, phonetisch)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:667
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Russisch (Ukraine, Standard-RSTU)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:668
 msgid "Russian (legacy)"
 msgstr "Russisch (veraltet)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:669
 msgid "Russian (phonetic WinKeys)"
 msgstr "Russisch (phonetisch mit Win-Tasten)"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:670
 msgid "Russian (phonetic)"
 msgstr "Russisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:671
 msgid "Russian (typewriter)"
 msgstr "Russisch (Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:672
 msgid "Russian (typewriter, legacy)"
 msgstr "Russisch (Schreibmaschine, veraltet)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:673
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:674
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:675
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:676
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:677
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:678
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:679
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:680
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Taiwan)"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:681
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:682
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:683
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:684
 msgid "Scroll Lock"
 msgstr "Rollen"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:685
 msgid "Semi-colon on third level"
 msgstr "Semikolon in der dritten Tastaturebene"
 
-#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:686 ../rules/base.extras.xml.in.h:35
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbisch (lateinische qwerty-Tastatur, Unicode)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbisch (Lateinisch Unicode)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:689
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbisch (Lateinische qwerty-Tastatur)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbisch (Lateinisch mit Anführungszeichen)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (Latin)"
 msgstr "Serbisch (Lateinisch)"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:692
 msgid "Serbian (Russia)"
 msgstr "Serbisch (Russland)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:693
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Serbisch (»З« und »Ж« sind vertauscht)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:694
 msgid "Serbian (with guillemets)"
 msgstr "Serbisch (mit Anführungszeichen)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:695
 msgid "Serbo-Croatian (US)"
 msgstr "Serbokroatisch (US)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:696
 msgid "Shift cancels Caps Lock"
 msgstr "Umschalttaste deaktiviert Feststelltaste"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:697
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Umschalttaste deaktiviert NumLock nicht, wechselt stattdessen in die dritte Tastaturebene"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:698
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Umschalttaste funktioniert mit den Tasten des Nummernblocks wie in MS Windows"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:699
 msgid "Shift+Caps Lock"
 msgstr "Umschalt-+Feststelltaste"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:700
 msgid "Sindhi"
 msgstr "Sindhi"
 
-#: ../rules/base.xml.in.h:698
-msgid "Sinhala"
-msgstr "Singhalesisch"
+#: ../rules/base.xml.in.h:701
+msgid "Sinhala (phonetic)"
+msgstr "Sinhala (phonetisch)"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
 msgid "Slovak (extended Backslash)"
 msgstr "Slowakisch (erweiterter Backslash)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
 msgid "Slovak (qwerty)"
 msgstr "Slowakisch (qwerty)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Slowakisch (qwerty, erweiterter Backslash)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
 msgid "Slovenian"
 msgstr "Slowenisch"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Slowenisch (US-Tastatur mit slowenischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Slowenisch (Anführungszeichen für Zitate verwenden)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Dvorak)"
 msgstr "Spanisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American)"
 msgstr "Spabisch (Lateinamerikanisch)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Spanisch (Lateinamerikanisch, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Spanisch (Lateinamerikanisch, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Spanisch (Lateinamerikanisch, Akzent-Tilde einschließen)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (Macintosh)"
 msgstr "Spanisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Spanish (Sun dead keys)"
 msgstr "Spanisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Spanish (eliminate dead keys)"
 msgstr "Spanisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Spanish (include dead tilde)"
 msgstr "Spanisch (Akzent-Tilde einschließen)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 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:717
+#: ../rules/base.xml.in.h:720
 msgid "Sun Type 5/6"
 msgstr "Sun Typ 5/6"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swahili (Kenya)"
 msgstr "Swahili (Kenia)"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swahili (Tanzania)"
 msgstr "Swahili (Tansania)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Strg-Taste und Feststelltaste vertauschen"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
 msgid "Swap ESC and Caps Lock"
 msgstr "Esc und Feststelltaste vertauschen"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (Dvorak)"
 msgstr "Schwedisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:728
 msgid "Swedish (Macintosh)"
 msgstr "Schwedisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
 msgid "Swedish (Svdvorak)"
 msgstr "Schwedisch (Svdvorak)"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:730
 msgid "Swedish (eliminate dead keys)"
 msgstr "Schwedisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:728
+#: ../rules/base.xml.in.h:731
 msgid "Swedish Sign Language"
 msgstr "Schwedische Gebärdensprache"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:732
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
 msgid "Syriac"
 msgstr "Syrisch"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
 msgid "Syriac (phonetic)"
 msgstr "Syrisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
 msgid "Taiwanese"
 msgstr "Taiwanesisch"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
 msgid "Taiwanese (indigenous)"
 msgstr "Taiwanesisch (indigen)"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
 msgid "Tajik"
 msgstr "Tadschikisch"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
 msgid "Tajik (legacy)"
 msgstr "Tadschikisch (veraltet)"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
 msgid "Tamil"
 msgstr "Tamilisch"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamilisch (Sri Lanka, TAB Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamilisch (Sri Lanka, Unicode)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamilisch (TAB Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamilisch (TSCII Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
 msgid "Tamil (Unicode)"
 msgstr "Tamilisch (Unicode)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamilisch (Tastatur mit Ziffern)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
 msgid "Tatar"
 msgstr "Tatarisch"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
 msgid "Thai"
 msgstr "Thailändisch"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
 msgid "Thai (Pattachote)"
 msgstr "Thailändisch (Pattachote)"
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:751
 msgid "Thai (TIS-820.2538)"
 msgstr "Thailändisch (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
 msgid "Tibetan"
 msgstr "Tibetanisch"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibetanisch (mit ASCII-Ziffern)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Zur entsprechenden Taste einer Dvorak-Tastatur."
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Zur entsprechenden Taste einer Qwerty-Tastatur."
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Zeigertasten mit Umschalttaste + NumLock umschalten"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:758
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
 msgid "Tswana"
 msgstr "Tswana"
 
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:762
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (Alt-Q)"
 msgstr "Türkisch (Alt-Q)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
 msgid "Turkish (F)"
 msgstr "Türkisch, (F)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
 msgid "Turkish (Sun dead keys)"
 msgstr "Türkisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
 msgid "Turkish (international with dead keys)"
 msgstr "Türkisch (International, mit Akzenttasten)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:767
 msgid "Turkmen"
 msgstr "Turkmenisch"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmenisch (Alt-Q)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:772
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU-Modus)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:773
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP-Modus)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:774
 msgid "Udmurt"
 msgstr "Udmurtisch"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukrainisch (Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Ukrainisch (homophon)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (legacy)"
 msgstr "Ukrainisch (veraltet)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
 msgid "Ukrainian (phonetic)"
 msgstr "Ukrainisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukrainisch (Standard-RSTU)"
 
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
 msgid "Ukrainian (typewriter)"
 msgstr "Ukrainisch (Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:782
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode-Ergänzungen (Pfeile und mathematische Operatoren)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:783
 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:781
+#: ../rules/base.xml.in.h:784
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (Pakistan)"
 msgstr "Urdu (Pakistan)"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:789
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (Alternative, phonetisch)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
 msgid "Urdu (phonetic)"
 msgstr "Urdu (phonetisch)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Tastatur-LED zur Anzeige der alternativen Belegung verwenden"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:792
 msgid "Using space key to input non-breakable space character"
 msgstr "Leertaste zur Eingabe nicht umbrechbarer Zeichen verwenden"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:793
 msgid "Usual space at any level"
 msgstr "Leertaste gibt in jeder Ebene stets Leerzeichen aus"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:794
 msgid "Uyghur"
 msgstr "Uigurisch"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek"
 msgstr "Usbekisch"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
 msgid "Uzbek (Afghanistan)"
 msgstr "Usbekisch (Afghanistan)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Usbekisch (Afghanistan, OLPC)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
 msgid "Uzbek (Latin)"
 msgstr "Usbekisch (lateinische Schrift)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard"
 
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
 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:799
+#: ../rules/base.xml.in.h:802
 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:800
+#: ../rules/base.xml.in.h:803
 msgid "Winbook Model XP5"
 msgstr "Winbook Modell XP5"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
 msgid "Wolof"
 msgstr "Wolof"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
 msgid "Yakut"
 msgstr "Jakutisch"
 
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
 msgid "Yoruba"
 msgstr "Joruba"
 
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:809
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, nicht umbrechbares Leerzeichen in der dritten Ebene"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:810
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, nicht umbrechbares Leerzeichen in der dritten Tastaturebene, nichts in der vierten Ebene"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:811
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, nicht umbrechbares Leerzeichen in der dritten Tastaturebene, schmales nicht umbrechbares Leerzeichen in der vierten Ebene"
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:812
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, nicht umbrechbares Leerzeichen in der dritten Tastaturebene, verbindendes Zeichen der Breite Null in der vierten Ebene"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:813
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, verbindendes Zeichen der Breite Null in der dritten Ebene"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:814
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, verbindendes Zeichen der Breite Null in der dritten Ebene, nicht umbrechbares Leerzeichen in der vierten Tastaturebene"
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:815
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Nicht verbindendes Zeichen der Breite Null in der dritten Ebene, verbindendes Zeichen der Breite Null in der vierten Ebene"
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:816
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:817
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:820
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
 msgid "ca"
 msgstr "ca"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:831 ../rules/base.extras.xml.in.h:38
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:39
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:40
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:41
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:846 ../rules/base.extras.xml.in.h:42
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:849
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:852
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
+#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:43
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:858
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:863
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:867
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:871 ../rules/base.extras.xml.in.h:45
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:46
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:873
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:878
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:881
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:47
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
+#: ../rules/base.xml.in.h:888 ../rules/base.extras.xml.in.h:48
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:889 ../rules/base.extras.xml.in.h:49
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
+#: ../rules/base.xml.in.h:895 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:904
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:910
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:911
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:912
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
 msgid "zh"
 msgstr "zh"
 
@@ -3654,6 +3666,10 @@ msgstr "zh"
 msgid "APL Keyboard Symbols"
 msgstr "APL-Tastatursymbole"
 
+#: ../rules/base.extras.xml.in.h:3
+msgid "Armenian (OLPC phonetic)"
+msgstr "Armenisch (OLPC-phonetisch)"
+
 #: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
 msgstr "Atsina"
@@ -3666,247 +3682,94 @@ msgstr "Avestisch"
 msgid "Couer D'alene Salish"
 msgstr "Couer D'alene Salish"
 
-#: ../rules/base.extras.xml.in.h:8
+#: ../rules/base.extras.xml.in.h:7
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Krimtatarisch (Dobruja Q)"
+
+#: ../rules/base.extras.xml.in.h:9
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Englisch (USA international, AltGr-Unicode-Kombination)"
 
-#: ../rules/base.extras.xml.in.h:9
+#: ../rules/base.extras.xml.in.h:10
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Englisch (USA international, AltGr-Unicode-Kombination, alternativ)"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:13
+msgid "German (US keyboard with German letters)"
+msgstr "Deutsch (US-Tastatur mit deutschen Buchstaben)"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "Deutsch (mit ungarischen Buchstaben, ohne Akzenttasten)"
+
+#: ../rules/base.extras.xml.in.h:15
 msgid "Kutenai"
 msgstr "Kutenai"
 
-#: ../rules/base.extras.xml.in.h:13
+#: ../rules/base.extras.xml.in.h:17
 msgid "Latvian (US Colemak)"
 msgstr "Lettisch (US-Colemak)"
 
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:18
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Lettisch (US-Colemak, Apostroph-Variante)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:19
 msgid "Latvian (US Dvorak)"
 msgstr "LLettisch (US-Dvorak)"
 
-#: ../rules/base.extras.xml.in.h:16
+#: ../rules/base.extras.xml.in.h:20
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Lettisch (US-Dvorak, Y-Variante)"
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Lettisch (US-Dvorak, Minus-Variante)"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Lettisch (Dvorak für Programmierer)"
 
-#: ../rules/base.extras.xml.in.h:19
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Lettisch (US-Dvorak für Programmierer, Y-Variante)"
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Lettisch (US-Dvorak für Programmierer, Minus-Variante)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:26
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Litauisch (US-Tastatur mit litauischen Buchstaben)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:29
 msgid "Polish (international with dead keys)"
 msgstr "Polnisch (International, mit Akzenttasten)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:31
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Rumänisch (ergonomische Bedienung)"
 
-#: ../rules/base.extras.xml.in.h:29
-msgid "Russian (with UKR and BEL layout)"
-msgstr "Russisch (mit ukrainischer und weißrussischer Belegung)"
+#: ../rules/base.extras.xml.in.h:33
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "Russisch (mit ukrainisch-weißrussischer Belegung)"
 
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:34
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Serbisch (Akzente kombinieren anstelle von Akzenttasten)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "apl"
 msgstr "apl"
 
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:44
 msgid "kut"
 msgstr "kut"
 
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:50
 msgid "shs"
 msgstr "shs"
-
-#~ msgid "Afg"
-#~ msgstr "Afg"
-
-#~ msgid "Chinese (Tibetan)"
-#~ msgstr "Chinesisch (Tibetanisch)"
-
-#~ msgid "Chinese (Uyghur)"
-#~ msgstr "Chinesisch (Uigurisch)"
-
-#~ msgid "Danish (Mac)"
-#~ msgstr "Dänisch (Macintosh)"
-
-#~ msgid "English (UK, Mac)"
-#~ msgstr "Englisch (Britisch, Macintosh)"
-
-#~ msgid "Finnish (Mac)"
-#~ msgstr "Finnisch (Macintosh)"
-
-#~ msgid "Finnish (northern Saami)"
-#~ msgstr "Finnisch (ördliches Saami)"
-
-#~ msgid "GBr"
-#~ msgstr "GBr"
-
-#~ msgid "German (Romanian keyboard with German letters)"
-#~ msgstr "Deutsch (Rumänische Tastatur mit deutschen Buchstaben)"
-
-#~ msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
-#~ msgstr "Deutsch (Rumänische Tastatur mit deutschen Buchstaben, ohne Akzenttasten)"
-
-#~ msgid "Irish (Ogham)"
-#~ msgstr "Irisch (Ogham)"
-
-#~ msgid "Italian (Georgian)"
-#~ msgstr "Italienisch (Georgisch)"
-
-#~ msgid "Kurdish (Iran, latin alt-Q)"
-#~ msgstr "Kurdisch (Iran, Lateinisches Alt-Q)"
-
-#~ msgid "Māori"
-#~ msgstr "Māori"
-
-#~ msgid "Norwegian (Northern Saami"
-#~ msgstr "Norwegisch (Nördliches Saami)"
-
-#~ msgid "Philippines - Dvorak (Baybayin)"
-#~ msgstr "Philippinen - Dvorak (Baybayin)"
-
-#~ msgid "Portuguese (Nativo for Esperanto)"
-#~ msgstr "Portugiesisch (Nativo für Esperanto)"
-
-#~ msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-#~ msgstr "Rumänisch (Krimtatarisch, Dobruca-2 Q)"
-
-#~ msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-#~ msgstr "Rumänisch (Krimtatarisch, Türkisch Alt-Q)"
-
-#~ msgid "Romanian (Crimean Tatar Turkish F)"
-#~ msgstr "Rumänisch (Krimtatarisch, Türkisch F)"
-
-#~ msgid "Russian (Chuvash)"
-#~ msgstr "Russisch (Tschuwaschisch)"
-
-#~ msgid "Russian (Kalmyk)"
-#~ msgstr "Russisch (Kalmykisch)"
-
-#~ msgid "Russian (Komi)"
-#~ msgstr "Russisch (Komi)"
-
-#~ msgid "Russian (Mari)"
-#~ msgstr "Russisch (Mari)"
-
-#~ msgid "Russian (Ossetian, legacy)"
-#~ msgstr "Russisch (Ossetisch, veraltet)"
-
-#~ msgid "Russian (Serbian)"
-#~ msgstr "Russisch (Serbisch)"
-
-#~ msgid "Russian (Tatar)"
-#~ msgstr "Russisch (Tatarisch)"
-
-#~ msgid "Russian (Udmurt)"
-#~ msgstr "Russisch (Udmurtisch)"
-
-#~ msgid "Russian (Yakut)"
-#~ msgstr "Russisch (Jakutisch)"
-
-#~ msgid "Spanish (Mac)"
-#~ msgstr "Spanisch (Macintosh)"
-
-#~ msgid "Swedish (northern Saami)"
-#~ msgstr "Schwedisch (Nördliches Saami)"
-
-#~ msgid "Swiss"
-#~ msgstr "Schweizerdeutsch"
-
-#~ msgid "Swiss (legacy)"
-#~ msgstr "Schweiz (veraltet)"
-
-#~ msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
-#~ msgstr "Türkisch (Krimtatarisch, türkisches Alt-Q)"
-
-#~ msgid "Turkish (Crimean Tatar Turkish F)"
-#~ msgstr "Türkisch (Krimtatarisch, türkisches F)"
-
-#~ msgid "Turkish (Crimean Tatar Turkish Q)"
-#~ msgstr "KTürkisch (Krimtatarisch, türkisches Q)"
-
-#~ msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-#~ msgstr "Ukrainisch (Krimtatarisch, Türkisch Alt-Q)"
-
-#~ msgid "Ukrainian (Crimean Tatar Turkish F)"
-#~ msgstr "Ukrainisch (Krimtatarisch, Türkisch F)"
-
-#~ msgid "Ukrainian (Crimean Tatar Turkish Q)"
-#~ msgstr "Ukrainisch (Krimtatarisch, Türkisch Q)"
-
-#~ msgid "Ukrainian (standard RSTU on Russian layout)"
-#~ msgstr "Ukrainisch (Standard-RSTU mit russischer Belegung)"
-
-#~ msgid "irq"
-#~ msgstr "irq"
-
-#~ msgid "srp"
-#~ msgstr "srp"
-
-#~ msgid "twn"
-#~ msgstr "twn"
-
-#~ msgid "APL"
-#~ msgstr "APL"
-
-#~ msgid "Iran"
-#~ msgstr "Iran"
-
-#~ msgid "Lithuania"
-#~ msgstr "Litauen"
-
-#~ msgid "Lithuania - Dvorak"
-#~ msgstr "Litauen - Dvorak"
-
-#~ msgid "Ltu"
-#~ msgstr "Ltu"
-
-#~ msgid "Romania"
-#~ msgstr "Rumänien"
-
-#~ msgid "Rou"
-#~ msgstr "Rou"
-
-#~ msgid "Rus"
-#~ msgstr "Rus"
-
-#~ msgid "Russia"
-#~ msgstr "Russland"
-
-#~ msgid "Serbia"
-#~ msgstr "Serbien"
-
-#~ msgid "Srb"
-#~ msgstr "Srb"
-
-#~ msgid "USA"
-#~ msgstr "USA"
diff --git a/dist/xkeyboard-config/po/eo.po b/dist/xkeyboard-config/po/eo.po
index b0088e195..79dc9d5b8 100644
--- a/dist/xkeyboard-config/po/eo.po
+++ b/dist/xkeyboard-config/po/eo.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.1.99\n"
+"Project-Id-Version: xkeyboard-config 2.3\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-03-25 22:27+0000\n"
-"PO-Revision-Date: 2011-04-17 14:19-0300\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-06-25 19:01-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -85,153 +85,153 @@ msgid "Advance Scorpius KI"
 msgstr "Advance Scorpius KI"
 
 #: ../rules/base.xml.in.h:18
-msgid "Afg"
-msgstr "Afg"
-
-#: ../rules/base.xml.in.h:19
 msgid "Afghani"
 msgstr "Paŝtoa"
 
-#: ../rules/base.xml.in.h:20
+#: ../rules/base.xml.in.h:19
 msgid "Akan"
 msgstr "Akan"
 
-#: ../rules/base.xml.in.h:21
+#: ../rules/base.xml.in.h:20
 msgid "Albanian"
 msgstr "Albana"
 
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:21
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt kaj Meta estas ĉe la klavoj Alt"
 
-#: ../rules/base.xml.in.h:23
+#: ../rules/base.xml.in.h:22
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Alt estas mapita al la dekstra klavo Win kaj Super al Menu"
 
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:23
 msgid "Alt+Caps Lock"
 msgstr "Alt+Caps Lock"
 
-#: ../rules/base.xml.in.h:25
+#: ../rules/base.xml.in.h:24
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:26
+#: ../rules/base.xml.in.h:25
 msgid "Alt+Shift"
 msgstr "Alt+Shift"
 
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:26
 msgid "Alt+Space"
 msgstr "Alt+Space"
 
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:27
 msgid "Alt/Win key behavior"
 msgstr "Alt/Win, klava funkciado"
 
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:28
 msgid "Amharic"
 msgstr "Amhara"
 
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:29
 msgid "Any Alt key"
 msgstr "Iu ajn klavo Alt"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr "Iu ajn klavo Win"
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr "Iu ajn klavo Win (dum premata)"
 
-#: ../rules/base.xml.in.h:33
+#: ../rules/base.xml.in.h:32
 msgid "Apple"
 msgstr "Apple"
 
-#: ../rules/base.xml.in.h:34
+#: ../rules/base.xml.in.h:33
 msgid "Apple Aluminium Keyboard (ANSI)"
 msgstr "Apple Aluminium Keyboard (ANSI)"
 
-#: ../rules/base.xml.in.h:35
+#: ../rules/base.xml.in.h:34
 msgid "Apple Aluminium Keyboard (ISO)"
 msgstr "Apple Aluminium Keyboard (ISO)"
 
-#: ../rules/base.xml.in.h:36
+#: ../rules/base.xml.in.h:35
 msgid "Apple Aluminium Keyboard (JIS)"
 msgstr "Apple Aluminium Keyboard (JIS)"
 
-#: ../rules/base.xml.in.h:37
+#: ../rules/base.xml.in.h:36
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "Apple Aluminium Keyboard: ŝajnigi klavojn de PC (Print, Scroll Lock, Pause, Num Lock)"
 
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
 msgstr "Apple Laptop"
 
-#: ../rules/base.xml.in.h:39
+#: ../rules/base.xml.in.h:38
 msgid "Arabic"
 msgstr "Araba"
 
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:39
 msgid "Arabic (Buckwalter)"
 msgstr "Araba (Buckwalter)"
 
-#: ../rules/base.xml.in.h:41
+#: ../rules/base.xml.in.h:40
 msgid "Arabic (Morocco)"
 msgstr "Araba (Maroko)"
 
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:41
 msgid "Arabic (Pakistan)"
 msgstr "Araba (Pakistano)"
 
-#: ../rules/base.xml.in.h:43
+#: ../rules/base.xml.in.h:42
 msgid "Arabic (Syria)"
 msgstr "Araba (Sirio)"
 
-#: ../rules/base.xml.in.h:44
+#: ../rules/base.xml.in.h:43
 msgid "Arabic (azerty)"
 msgstr "Araba (azerty)"
 
-#: ../rules/base.xml.in.h:45
+#: ../rules/base.xml.in.h:44
 msgid "Arabic (azerty/digits)"
 msgstr "Araba (azerty/ciferoj)"
 
-#: ../rules/base.xml.in.h:46
+#: ../rules/base.xml.in.h:45
 msgid "Arabic (digits)"
 msgstr "Araba (ciferoj)"
 
-#: ../rules/base.xml.in.h:47
+#: ../rules/base.xml.in.h:46
 msgid "Arabic (qwerty)"
 msgstr "Araba (qwerty)"
 
-#: ../rules/base.xml.in.h:48
+#: ../rules/base.xml.in.h:47
 msgid "Arabic (qwerty/digits)"
 msgstr "Araba (qwerty/ciferoj)"
 
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
 msgid "Armenian"
 msgstr "Armena"
 
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:49
 msgid "Armenian (alternative eastern)"
 msgstr "Armena (alternativa orienta)"
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
 msgid "Armenian (alternative phonetic)"
 msgstr "Armena (alternativa fonetika)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 msgid "Armenian (eastern)"
 msgstr "Armena (oriento)"
 
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:52
 msgid "Armenian (phonetic)"
 msgstr "Armena (fonetika)"
 
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:53
 msgid "Armenian (western)"
 msgstr "Armena (okcidenta)"
 
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturia (Hispanujo, kun subpunktita H kaj subpunktita L)"
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "Asus Laptop"
@@ -249,13 +249,13 @@ msgid "Avatime"
 msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijan (Cyrillic)"
-msgstr "Azerbajĝano (Cirila)"
-
-#: ../rules/base.xml.in.h:60
 msgid "Azerbaijani"
 msgstr "Azerbajĝana"
 
+#: ../rules/base.xml.in.h:60
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Azerbajĝana (Cirila)"
+
 #: ../rules/base.xml.in.h:61
 msgid "Azona RF2300 wireless Internet Keyboard"
 msgstr "Azona RF2300 sendrata Internet Keyboard"
@@ -301,3456 +301,3616 @@ msgid "Backslash"
 msgstr "Retroklino"
 
 #: ../rules/base.xml.in.h:72
-msgid "Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr "Retroklavo elektas 3-an nivelon, ŝlosas kiam premite kun alia 3-nivela elektilo"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Retroklavo (elektas 3-an nivelon, ŝlosas kiam premite kun alia 3-nivela elektilo"
 
 #: ../rules/base.xml.in.h:73
 msgid "Bambara"
 msgstr "Bambara"
 
 #: ../rules/base.xml.in.h:74
+msgid "Bashkirian"
+msgstr "Baŝkira"
+
+#: ../rules/base.xml.in.h:75
 msgid "Belarusian"
 msgstr "Belorusa"
 
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:76
 msgid "Belarusian (Latin)"
 msgstr "Belorusa (Latina)"
 
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:77
 msgid "Belarusian (legacy)"
 msgstr "Belorusa (malmoderna)"
 
-#: ../rules/base.xml.in.h:77
+#: ../rules/base.xml.in.h:78
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../rules/base.xml.in.h:78
+#: ../rules/base.xml.in.h:79
 msgid "Belgian (ISO alternate)"
 msgstr "Belga (Alternativa ISO)"
 
-#: ../rules/base.xml.in.h:79
+#: ../rules/base.xml.in.h:80
 msgid "Belgian (Sun dead keys)"
 msgstr "Belga (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belga (Wang modelo 724 azerty)"
 
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:82
 msgid "Belgian (alternative)"
 msgstr "Belga (alternativa)"
 
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:83
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belga (alternativa, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belga (alternativa, nur latin-9)"
 
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:85
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belga (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:85
+#: ../rules/base.xml.in.h:86
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:86
+#: ../rules/base.xml.in.h:87
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:87
+#: ../rules/base.xml.in.h:88
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:89
 msgid "Bengali"
 msgstr "Bengala"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:90
 msgid "Bengali (Probhat)"
 msgstr "Bengala (Probhat)"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:91
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berbera (Maroko, Tifinagh alternativa fonetika)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berbera (Maroko, Tifinagh alternativa)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berbera (Maroko, Tifinagh etendita fonetika)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berbera (Maroko, Tifinagh etendita)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berbera (Maroko, Tifinagh fonetika)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berbera (Maroko, Tifinagh)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bosnian"
 msgstr "Bosna"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosna (usona klavaro kun bosnaj duliteraĵoj)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosna (usona klavaro kun bosnaj literoj)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosna (uzi bosnajn duliteraĵojn)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosna (uzi angul-citilojn por citiloj)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Both Alt keys together"
 msgstr "Ambaŭ klavoj Alt kune"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Both Ctrl keys together"
 msgstr "Ambaŭ klavoj Ctrl kune"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Both Shift keys together"
 msgstr "Ambaŭ klavoj Shift kune"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:105
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Ambaŭ klavoj Shift kune ŝaltas Caps Lock, unu klavo Shift malŝaltas"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Ambaŭ klavoj Shift kune alternigas Caps Lock"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Ambaŭ klavoj Shift kune (mal)ŝaltas ShiftLock"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:108
 msgid "Braille"
 msgstr "Brajla"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:109
 msgid "Braille (left hand)"
 msgstr "Brajla (maldekstra mano)"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Braille (right hand)"
 msgstr "Brajla (dekstra mano)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:111
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:112
 msgid "Bulgarian"
 msgstr "Bulgara"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Bulgarian (new phonetic)"
 msgstr "Bulgara (nova fonetika)"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bulgara (tradicia fonetika)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:115
 msgid "Burmese"
 msgstr "Birma"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:116
 msgid "Canadian Multilingual"
 msgstr "Kanada Plurlingva"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Canadian Multilingual (first part)"
 msgstr "Kanada Plurlingva (unua parto)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "Canadian Multilingual (second part)"
 msgstr "Kanada Plurlingva (dua parto)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:119
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:120
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr "Caps Lock (elektas 3-an nivelon, ŝlosas kiam premite kun alia 3-nivela elektilo)"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Caps Lock (al la unua aranĝo), Shift+Caps Lock (al la lasta aranĝo)"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:122
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Caps Lock (dum premata), Alt+Caps Lock restarigas la originalan uskligon"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:123
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock funkcias kiel Shift kun ŝlosado. Shift \"paŭzigas\" Caps Lock"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:124
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock funkcias kiel Shift kun ŝlosado. Shift ne influas Caps Lock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock estas malebligita"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock key behavior"
 msgstr "Funkciado de la klavo Caps Lock"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Caps Lock alternigas Shift, influante ĉiujn klavojn"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock alternigas la ordinaran uskligon de alfabetaj signoj"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock uzas internan uskligon. Shift \"paŭzigas\" Caps Lock"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock uzas internan uskligon. Shift ne influas Cap sLock"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:131
 msgid "Catalan"
 msgstr "Kataluna"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:132
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Kataluna (Hispanujo, kun centro-punktita L)"
+
+#: ../rules/base.xml.in.h:133
 msgid "Cherokee"
 msgstr "Ĉeroka"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:134
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:135
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:136
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (alternativa opcio)"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:137
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:138
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:139
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:141
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:142
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:143
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:144
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:145
 msgid "Chinese"
 msgstr "Ĉina"
 
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "Ĉina (Tibeta kun ciferoj ASCII)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "Ĉina (Tibeta)"
-
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "Ĉina (Ujgura)"
+msgid "Chuvash"
+msgstr "Ĉuvaŝa"
 
 #: ../rules/base.xml.in.h:147
+msgid "Chuvash (Latin)"
+msgstr "Ĉuvaŝa (Latina)"
+
+#: ../rules/base.xml.in.h:148
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:149
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:150
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:151
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 klavoj)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:152
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 klavoj)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 klavoj)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:154
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:155
 msgid "Compose key position"
 msgstr "Pozicio de la klavo 'Compose'"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:156
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:157
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "'Control' estas mapita al klavoj 'Alt', 'Alt' estas mapita al klavoj 'Win'"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:158
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "'Control' estas mapita al klavoj 'Win' (kaj al la kutimaj klavoj 'Ctrl')"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:159
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:160
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Krime-tatara (Dobruja Q)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krime-tatara (Turka Alt-Q)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krime-tatara (Turka F)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krime-tatara (Turka Q)"
+
+#: ../rules/base.xml.in.h:164
 msgid "Croatian"
 msgstr "Kroata"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:165
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Kroata (Usona klavaro kun kroataj duliteraĵoj)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:166
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Kroata (Usona klavaro kun kroataj literoj)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
-msgstr "Kroata (Uzi kroatajn duliteraĵojn)"
+#: ../rules/base.xml.in.h:167
+msgid "Croatian (use Croatian digraphs)"
+msgstr "Kroata (uzi kroatajn duliteraĵojn)"
 
-#: ../rules/base.xml.in.h:162
-msgid "Croatian (Use guillemets for quotes)"
-msgstr "Kroata (Uzi angul-citilojn por citiloj)"
+#: ../rules/base.xml.in.h:168
+msgid "Croatian (use guillemets for quotes)"
+msgstr "Kroata (uzi angul-citilojn por citiloj)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Ctrl key position"
 msgstr "Pozicio de la klavo 'Ctrl'"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Czech"
 msgstr "Ĉeĥa"
 
-#: ../rules/base.xml.in.h:166
-msgid "Czech (UCW layout accented letters only)"
+#: ../rules/base.xml.in.h:172
+msgid "Czech (UCW layout, accented letters only)"
 msgstr "Ĉeĥa (Aranĝo UCW, nur diakritaĵoj)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Ĉeĥa (Usona Dvorak kun subteno al CZ UCW)"
 
-#: ../rules/base.xml.in.h:168
-msgid "Czech (With &lt;\\|&gt; key)"
-msgstr "Ĉeĥa (Kun klavo &lt;\\|&gt;)"
-
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:174
 msgid "Czech (qwerty)"
 msgstr "Ĉeĥa (qwerty)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:175
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Ĉeĥa (qwerty, etendita Retroklino)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:176
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Ĉeĥa (kun klavo &lt;\\|&gt;)"
+
+#: ../rules/base.xml.in.h:177
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Danish"
 msgstr "Dana"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Danish (Dvorak)"
 msgstr "Dana (Dvorako)"
 
-#: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
-msgstr "Dana (Mac)"
+#: ../rules/base.xml.in.h:180
+msgid "Danish (Macintosh)"
+msgstr "Dana (Macintosh)"
 
-#: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
-msgstr "Dana (Mac, forigi senpaŝajn klavojn)"
+#: ../rules/base.xml.in.h:181
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Dana (Macintosh, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Danish (eliminate dead keys)"
 msgstr "Dana (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "Default numeric keypad keys"
 msgstr "Implicitaj ciferoj en cifer-klavaro"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Dell 101-key PC"
 msgstr "Dell 101-klava PC"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell Laptop/notebook Precision M series"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Dell Latitude series laptop"
 msgstr "Dell Latitude series laptop"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dhivehi"
 msgstr "Mahla"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802 serio"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dutch"
 msgstr "Nederlanda"
 
-#: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
-msgstr "Nederlanda (Mac)"
+#: ../rules/base.xml.in.h:197
+msgid "Dutch (Macintosh)"
+msgstr "Nederlanda (Macintosh)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dutch (Sun dead keys)"
 msgstr "Nederlanda (Senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dutch (standard)"
 msgstr "Nederlanda (norma)"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dzongkha"
 msgstr "Dzonka"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Enable extra typographic characters"
 msgstr "Ebligi kromajn tipografiajn signojn"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
+msgid "English (Cameroon Dvorak)"
+msgstr "Angla (Kameruno, Dvorako)"
+
+#: ../rules/base.xml.in.h:203
+msgid "English (Cameroon qwerty)"
+msgstr "Angla (Kameruno, qwerty)"
+
+#: ../rules/base.xml.in.h:204
+msgid "English (Cameroon)"
+msgstr "Angla (Kameruno)"
+
+#: ../rules/base.xml.in.h:205
 msgid "English (Canada)"
 msgstr "Angla (Kanado)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:206
 msgid "English (Colemak)"
 msgstr "Angla (Colemak)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:207
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Angla (Dvoraka alternativa internacia, neniu senpaŝa klavo)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:208
 msgid "English (Dvorak international with dead keys)"
 msgstr "Angla (Dvorak internacia kun senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:209
 msgid "English (Dvorak)"
 msgstr "Angla (Dvorako)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:210
 msgid "English (Ghana)"
 msgstr "Angla (Ganao)"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:211
 msgid "English (Ghana, GILLBT)"
 msgstr "Angla (Ganao, GILLBT)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:212
 msgid "English (Ghana, multilingual)"
 msgstr "Angla (Ganao, plurlingva)"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:213
 msgid "English (India, with RupeeSign)"
 msgstr "Angla (Hindujo, kun RupiSigno)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:214
 msgid "English (Macintosh)"
 msgstr "Angla (Macintosh)"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
-msgstr "Angla (Malio , usona Mac)"
+#: ../rules/base.xml.in.h:215
+msgid "English (Mali, US Macintosh)"
+msgstr "Angla (Malio , usona Macintosh)"
 
-#: ../rules/base.xml.in.h:207
-msgid "English (Mali, USA international)"
+#: ../rules/base.xml.in.h:216
+msgid "English (Mali, US international)"
 msgstr "Angla (Malio, usona internacia)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:217
 msgid "English (Nigeria)"
 msgstr "Angla (Niĝerio)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:218
 msgid "English (South Africa)"
 msgstr "Angla (Sud-Afriko)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:219
 msgid "English (UK)"
 msgstr "Angla (UK)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:220
 msgid "English (UK, Colemak)"
 msgstr "Angla (UK, Colemak)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
-msgstr "Angla (UK, Dvoraka interpunkcio de UK)"
+#: ../rules/base.xml.in.h:221
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Angla (UK, Dvoraka kun interpunkcio de UK)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:222
 msgid "English (UK, Dvorak)"
 msgstr "Angla (UK, Dvoraka)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
-msgstr "Angla (UK, internacia Mac)"
+#: ../rules/base.xml.in.h:223
+msgid "English (UK, Macintosh international)"
+msgstr "Angla (UK, internacia Macintosh)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
+#: ../rules/base.xml.in.h:224
+msgid "English (UK, Macintosh)"
 msgstr "Angla (UK, Macintosh)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
-msgstr "Angla (UK, etendite, Win-klavoj"
+#: ../rules/base.xml.in.h:225
+msgid "English (UK, extended WinKeys)"
+msgstr "Angla (UK, etenditaj Win-klavoj"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, international with dead keys)"
 msgstr "Angla (UK, internacia kun senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
 msgid "English (US)"
 msgstr "Angla (US)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:228
 msgid "English (US, alternative international)"
 msgstr "Angla (US, alternativa internacia)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:229
 msgid "English (US, international with dead keys)"
 msgstr "Angla (US, internacia kun senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:230
 msgid "English (US, with euro on 5)"
 msgstr "Angla (US, kun eŭro ĉe 5)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:231
 msgid "English (classic Dvorak)"
 msgstr "Angla (klasika Dvorako)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:232
 msgid "English (international AltGr dead keys)"
 msgstr "Angla (internacia kun senpaŝaj klavoj per AltGr)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:233
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Angla (baskuli aranĝon per la klavo multipliko/divido"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:234
 msgid "English (left handed Dvorak)"
 msgstr "Angla (maldekstreca Dvorako)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:235
 msgid "English (programmer Dvorak)"
 msgstr "Angla (Dvorako por programistoj)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:236
 msgid "English (right handed Dvorak)"
 msgstr "Angla (dekstreca Dvorako)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:237
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:238
 msgid "Enter on keypad"
 msgstr "Enen-klavo en ciferklavaro"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:239
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:240
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Esperanto (Portugalujo, Nativo)"
+
+#: ../rules/base.xml.in.h:241
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (translokitaj punktokomo kaj citilo, malaktuale)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:242
 msgid "Estonian"
 msgstr "Estona"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:243
 msgid "Estonian (Dvorak)"
 msgstr "Estona (Dvorako)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:244
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estona (Usona klavaro kun estonaj literoj)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:245
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estona (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:246
 msgid "Euro on 2"
 msgstr "EŭroSigno ĉe 2"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:247
 msgid "Euro on 4"
 msgstr "EŭroSigno ĉe 4"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:248
 msgid "Euro on 5"
 msgstr "EŭroSigno ĉe 5"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:249
 msgid "Euro on E"
 msgstr "EŭroSigno ĉe E"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:250
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:251
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:252
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:253
 msgid "Faroese"
 msgstr "Feroa"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:254
 msgid "Faroese (eliminate dead keys)"
 msgstr "Feroa (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:255
 msgid "Filipino"
 msgstr "Filipina"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:256
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filipina (Capewell-Dvorako, Baybayin)"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:257
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filipina (Capewell-Dvorako, Latina)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:258
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filipina (Capewell-QWERF 2006, Baybayin)"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:259
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filipina (Capewell-QWERF 2006, Latina)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:260
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filipina (Colemak, Baybayin)"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Colemak Latin)"
 msgstr "Filipina (Colemak, latina)"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:262
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Filipina (Dvoraka Baybayin)"
+
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filipina (Dvorako, latina)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filipina (QWERTY, Baybayin)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:265
 msgid "Finnish"
 msgstr "Finna"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
-msgstr "Finna (Mac)"
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
+msgstr "Finna (Macintosh)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:267
 msgid "Finnish (classic)"
 msgstr "Finna (klasika)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:268
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finna (klasika, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:258
-msgid "Finnish (northern Saami)"
-msgstr "Finna (norda samea)"
-
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:271
 msgid "Four-level key with abstract separators"
 msgstr "Kvar-nivela klavo kun abstraktaj apartigiloj"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:272
 msgid "Four-level key with comma"
 msgstr "Kvar-nivela klavo kun komo"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:273
 msgid "Four-level key with dot"
 msgstr "Kvar-nivela klavo kun punkto"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:274
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Kvar-nivela klavo kun punkto, limigite al latin-9"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:275
 msgid "Four-level key with momayyez"
 msgstr "Kvar-nivela klavo kun 'momayyez'"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:276
 msgid "French"
 msgstr "Franca"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:277
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Franca (Bepo, komforteca, Dvorake)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:278
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Franca (Bepo, komforteca, Dvorake, nur latin-9)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:279
 msgid "French (Breton)"
 msgstr "Franca (Bretona)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:280
+msgid "French (Cameroon azerty)"
+msgstr "Franca (Kameruno, azerty)"
+
+#: ../rules/base.xml.in.h:281
+msgid "French (Cameroon)"
+msgstr "Franca (Kameruno)"
+
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "Franca (Kanado)"
+
+#: ../rules/base.xml.in.h:283
 msgid "French (Canada, Dvorak)"
 msgstr "Franca (Kanado, Dvorako)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:284
 msgid "French (Canada, legacy)"
 msgstr "Franca (Kanado, malmoderna)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:285
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Franca (Demokratia Respubliko de Kongo)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:286
 msgid "French (Dvorak)"
 msgstr "Franca (Dvorako)"
 
-#: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
-msgstr "Franca (Kartvela AZERTY Tskapo)"
-
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:287
 msgid "French (Guinea)"
 msgstr "Franca (Gvineo)"
 
-#: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
-msgstr "Franca (Mac)"
+#: ../rules/base.xml.in.h:288
+msgid "French (Macintosh)"
+msgstr "Franca (Macintosh)"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:289
 msgid "French (Mali, alternative)"
 msgstr "Franca (Malio, alternativa)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:290
 msgid "French (Morocco)"
 msgstr "Franca (Maroko)"
 
-#: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
-msgstr "Franca (Okcitana)"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:291
 msgid "French (Sun dead keys)"
 msgstr "Franca (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:292
 msgid "French (Switzerland)"
 msgstr "Franca (Svislando)"
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
-msgstr "Franca (Svislando, Mac)"
+#: ../rules/base.xml.in.h:293
+msgid "French (Switzerland, Macintosh)"
+msgstr "Franca (Svislando, Macintosh)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:294
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Franca (Svislando, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:295
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Franca (Svislando, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:296
 msgid "French (alternative)"
 msgstr "Franca (alternativa)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:297
 msgid "French (alternative, Sun dead keys)"
 msgstr "Franca (alternava, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:298
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Franca (alternativa, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:299
 msgid "French (alternative, latin-9 only)"
 msgstr "Franca (alternativa, nur latin-9)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:300
 msgid "French (eliminate dead keys)"
 msgstr "Franca (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
-msgstr "Franca (malmoderna alternativa)"
+#: ../rules/base.xml.in.h:301
+msgid "French (legacy, alternative)"
+msgstr "Franca (malmoderna, alternativa)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:302
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Franca (malmoderna, alternativa, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:303
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Franca (malmoderna, alternativa, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:304
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Tekokomputilo Fujitsu-Siemens Computers AMILO"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:305
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:295
-msgid "GBr"
-msgstr "GBr"
-
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:306
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:307
 msgid "Generic 101-key PC"
 msgstr "Ĝenerala 101-klava PC"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:308
 msgid "Generic 102-key (Intl) PC"
 msgstr "Ĝenerala 102-klava (Intl) PC"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:309
 msgid "Generic 104-key PC"
 msgstr "Ĝenerala 104-klava PC"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:310
 msgid "Generic 105-key (Intl) PC"
 msgstr "Ĝenerala 105-klava (Intl) PC"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:311
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:312
 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:303
+#: ../rules/base.xml.in.h:313
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:314
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:315
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:316
 msgid "Georgian"
 msgstr "Kartvela"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:317
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Kartvela (Franca, AZERTY Tskapo)"
+
+#: ../rules/base.xml.in.h:318
+msgid "Georgian (Italy)"
+msgstr "Kartvela (Italujo)"
+
+#: ../rules/base.xml.in.h:319
 msgid "Georgian (MESS)"
 msgstr "Kartvela (MESS)"
 
-#: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
-msgstr "Kartvela (Oseta)"
-
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:320
 msgid "Georgian (ergonomic)"
 msgstr "Kartvela (komforteca)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:321
 msgid "German"
 msgstr "Germana"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:322
 msgid "German (Austria)"
 msgstr "Germana (Aŭstrujo)"
 
-#: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
-msgstr "Germana (Aŭstrujo, Mac)"
+#: ../rules/base.xml.in.h:323
+msgid "German (Austria, Macintosh)"
+msgstr "Germana (Aŭstrujo, Macintosh)"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:324
 msgid "German (Austria, Sun dead keys)"
 msgstr "Germana (Aŭstrujo, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:325
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Germana (Aŭstrujo, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:326
 msgid "German (Dvorak)"
 msgstr "Germana (Dvorako)"
 
-#: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
-msgstr "Germana (Mac)"
+#: ../rules/base.xml.in.h:327
+msgid "German (Macintosh)"
+msgstr "Germana (Macintosh)"
 
-#: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
-msgstr "Germana (Mac, forigi senpaŝajn klavojn)"
+#: ../rules/base.xml.in.h:328
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Germana (Macintosh, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:329
 msgid "German (Neo 2)"
 msgstr "Germana (Neo 2)"
 
-#: ../rules/base.xml.in.h:319
-msgid "German (Romanian keyboard with German letters)"
-msgstr "Germana (Rumana klavaro kun germanaj literoj)"
-
-#: ../rules/base.xml.in.h:320
-msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
-msgstr "Germana (Rumana klavaro kun germanaj literoj, forigi senpaŝajn klavojn)"
-
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:330
 msgid "German (Sun dead keys)"
 msgstr "Germana (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
-msgstr "Germana (Svislando, Mac)"
+#: ../rules/base.xml.in.h:331
+msgid "German (Switzerland)"
+msgstr "Germana (Svislando)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
+msgstr "Germana (Svislando, Macintosh)"
+
+#: ../rules/base.xml.in.h:333
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Germana (Svislando, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:334
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Germana (Svislando, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:335
+msgid "German (Switzerland, legacy)"
+msgstr "Germana (Svislando, malmoderna)"
+
+#: ../rules/base.xml.in.h:336
 msgid "German (dead acute)"
 msgstr "Germana (senpaŝa dekstra korno)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:337
 msgid "German (dead grave acute)"
 msgstr "Germana (senpaŝa maldekstra/dekstra korno)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:338
 msgid "German (eliminate dead keys)"
 msgstr "Germana (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
-msgstr "Germana (malsupra Soraba qwertz)"
-
-#: ../rules/base.xml.in.h:329
-msgid "German (lower Sorbian)"
-msgstr "Germana (malsupra Soraba)"
-
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:339
 msgid "German (qwerty)"
 msgstr "Germana (qwerty)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:340
 msgid "Greek"
 msgstr "Greka"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:341
 msgid "Greek (eliminate dead keys)"
 msgstr "Greka (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:342
 msgid "Greek (extended)"
 msgstr "Greka (etendite)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:343
 msgid "Greek (polytonic)"
 msgstr "Greka (plurtona)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:344
 msgid "Greek (simple)"
 msgstr "Greka (simpla)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:345
 msgid "Gujarati"
 msgstr "Guĝarata"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:346
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:347
 msgid "HTC Dream"
 msgstr "HTC Dream"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:348
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:349
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking Keyboard por Mac"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:350
 msgid "Hausa"
 msgstr "Haŭsa"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:351
 msgid "Hebrew"
 msgstr "Hebrea"
 
-#: ../rules/base.xml.in.h:343
-msgid "Hebrew (Phonetic)"
-msgstr "Hebrea (Fonetika)"
-
-#: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
-msgstr "Hebrea (Tiro)"
+#: ../rules/base.xml.in.h:352
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Hebrea (Biblia, Tiro)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "Hebrew (lyx)"
 msgstr "Hebrea (lyx)"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
+msgid "Hebrew (phonetic)"
+msgstr "Hebrea (fonetika)"
+
+#: ../rules/base.xml.in.h:355
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:356
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard Mini 110 Notebook"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:357
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:367
 msgid "Hexadecimal"
 msgstr "Deksesume"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:368
 msgid "Hindi (Bolnagri)"
 msgstr "Hinda (Bolnagri)"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:369
 msgid "Hindi (Wx)"
 msgstr "Hinda (Wx)"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:370
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:371
 msgid "Htc Dream phone"
 msgstr "Htc Dream - telefono"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:372
 msgid "Hungarian"
 msgstr "Hungara"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:373
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Hungara (101/qwerty/komo/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:374
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Hungara (101/qwerty/komo/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Hungara (101/qwerty/punkto/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Hungara (101/qwerty/punkto/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Hungara (101/qwertz/komo/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Hungara (101/qwertz/komo/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Hungara (101/qwertz/punkto/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Hungara (101/qwertz/punkto/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Hungara (102/qwerty/komo/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Hungara (102/qwerty/komo/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Hungara (102/qwerty/punkto/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Hungara (102/qwerty/punkto/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Hungara (102/qwertz/komo/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Hungara (102/qwertz/komo/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Hungara (102/qwertz/punkto/senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Hungara (102/qwertz/punkto/forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Hungara (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (qwerty)"
 msgstr "Hungara (qwerty)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (standard)"
 msgstr "Hungara (norma)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:392
 msgid "Hyper is mapped to Win-keys"
 msgstr "'Hyper' estas mapita al la klavoj 'Win'"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:393
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:394
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:395
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:396
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:397
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:398
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:399
 msgid "Icelandic"
 msgstr "Islanda"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:400
 msgid "Icelandic (Dvorak)"
 msgstr "Islanda (Dvorako)"
 
-#: ../rules/base.xml.in.h:392
-msgid "Icelandic (Mac)"
-msgstr "Islanda (Mac)"
+#: ../rules/base.xml.in.h:401
+msgid "Icelandic (Macintosh)"
+msgstr "Islanda (Macintosh)"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islanda (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islanda (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:404
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:405
 msgid "Indian"
 msgstr "Hinda"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:406
 msgid "Inuktitut"
 msgstr "Inuita"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:407
 msgid "Iraqi"
 msgstr "Iraka"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:408
 msgid "Irish"
 msgstr "Irlanda"
 
-#: ../rules/base.xml.in.h:400
-msgid "Irish (CloGaelach)"
-msgstr "Irlanda (CloGaelach)"
-
-#: ../rules/base.xml.in.h:401
-msgid "Irish (Ogham IS434)"
-msgstr "Irlanda (Ogamo IS434)"
-
-#: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
-msgstr "Irlanda (Ogamo)"
-
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:409
 msgid "Irish (UnicodeExpert)"
 msgstr "Irlanda (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:410
 msgid "Italian"
 msgstr "Itala"
 
-#: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
-msgstr "Itala (Kartvela)"
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
-msgstr "Itala (Mac)"
+#: ../rules/base.xml.in.h:411
+msgid "Italian (Macintosh)"
+msgstr "Itala (Macintosh)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:412
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Itala (usona klavaro kun italaj literoj)"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:413
 msgid "Italian (eliminate dead keys)"
 msgstr "Itala (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:414
 msgid "Japanese"
 msgstr "Nipona"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:415
 msgid "Japanese (Kana 86)"
 msgstr "Nipona (Kanao 86)"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:416
 msgid "Japanese (Kana)"
 msgstr "Nipona (Kanao)"
 
-#: ../rules/base.xml.in.h:412
-msgid "Japanese (Mac)"
-msgstr "Nipono (Mac)"
+#: ../rules/base.xml.in.h:417
+msgid "Japanese (Macintosh)"
+msgstr "Nipono (Macintosh)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (OADG 109A)"
 msgstr "Nipona (OADG 109A)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (PC-98xx Series)"
 msgstr "Nipona (Serio PC-98xx)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:420
 msgid "Japanese keyboard options"
-msgstr "Opcioj de nipona klavaro"
+msgstr "Elektebloj de nipona klavaro"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:421
+msgid "Kalmyk"
+msgstr "Kalmyk"
+
+#: ../rules/base.xml.in.h:422
 msgid "Kana Lock key is locking"
 msgstr "Kanaa klavo 'Lock' ŝlosigas"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:423
 msgid "Kannada"
 msgstr "Kanara"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:424
+msgid "Kashubian"
+msgstr "Kaŝuba"
+
+#: ../rules/base.xml.in.h:425
 msgid "Kazakh"
 msgstr "Kazaĥa"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:426
 msgid "Kazakh (with Russian)"
 msgstr "Kazaĥa (kun Rusa)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:427
 msgid "Key sequence to kill the X server"
 msgstr "Klav-sekvo por formortigi la X-servilon"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:428
 msgid "Key to choose 3rd level"
 msgstr "Klavo por elekti 3-an nivelon"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:429
 msgid "Key to choose 5th level"
 msgstr "Klavo por elekti 5-an nivelon"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:430
 msgid "Key(s) to change layout"
 msgstr "Klavo(j) por ŝanĝi la aranĝon"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:431
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:425
-msgid "Khmer (Cambodian)"
-msgstr "Kmera (Kamboĝa)"
+#: ../rules/base.xml.in.h:432
+msgid "Khmer (Cambodia)"
+msgstr "Kmera (Kamboĝo)"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:433
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:434
 msgid "Kinesis"
 msgstr "Kinesis"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:435
+msgid "Komi"
+msgstr "Komia"
+
+#: ../rules/base.xml.in.h:436
 msgid "Korean"
 msgstr "Korea"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Korean (101/104 key compatible)"
 msgstr "Korea (kongrua al 101/104 klavoj)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurda (Irano, Araba-Latina)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Kurdish (Iran, F)"
 msgstr "Kurda, (Irano, F)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kurda (Irano, Latina Alt-Q)"
+
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurda, (Irano, Latina Q)"
 
-#: ../rules/base.xml.in.h:433
-msgid "Kurdish (Iran, latin alt-Q)"
-msgstr "Kurda (Iran, Latina Alt-Q)"
-
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurda (Irako, Araba-Latina)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurda, (Irako, F)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurda (Irako, Latina Alt-Q)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurda (Irako, Latina Q)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Syria, F)"
 msgstr "Kurda (Sirio, F)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurda (Sirio, Latina Alt-Q)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurda, (Sirio, Latina Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurda, (Turkujo, F)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurda (Turkujo, Latina Alt-Q)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurda (Turkujo, Latina Q)"
 
-#: ../rules/base.xml.in.h:444
-msgid "Kutenai"
-msgstr "Kutenai"
-
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:452
 msgid "Kyrgyz"
 msgstr "Kirgiza"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:453
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgiza (fonetika)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:454
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:455
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Lao (norma aranĝo proponita de STEA)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:456
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:457
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:458
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Laptop/notebook eMachines m68xx"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
 msgid "Latvian"
 msgstr "Latva"
 
-#: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
-msgstr "Latva (variaĵo ' de citilo)"
-
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:460
 msgid "Latvian (F variant)"
 msgstr "Latva (variaĵo F)"
 
-#: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
-msgstr "Latva (Tilda ~ variaĵo)"
+#: ../rules/base.xml.in.h:461
+msgid "Latvian (adapted)"
+msgstr "Latva (adaptita)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:462
+msgid "Latvian (apostrophe variant)"
+msgstr "Latva (citila variaĵo)"
+
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Latva (komforteca, ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:464
+msgid "Latvian (modern)"
+msgstr "Latva (moderna)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "Latva (tilda variaĵo)"
+
+#: ../rules/base.xml.in.h:466
 msgid "Left Alt"
 msgstr "Maldekstra Alt"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:467
 msgid "Left Alt (while pressed)"
 msgstr "Maldekstra 'Alt' (dum premata)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:468
 msgid "Left Alt is swapped with Left Win"
 msgstr "La maldekstra 'Alt' estas permutita kun la maldekstra klavo 'Win'"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:469
 msgid "Left Ctrl"
 msgstr "Maldekstra Ctrl"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:470
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Maldekstra Ctrl (por la unua aranĝo), Dekstra Ctrl (por la lasta aranĝo)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:471
 msgid "Left Ctrl+Left Shift"
 msgstr "Maldekstra Ctrl+Maldekstra Shift"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:472
 msgid "Left Shift"
 msgstr "Maldekstra Shift"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:473
 msgid "Left Win"
 msgstr "Maldekstra Win"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:474
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Maldekstra Win (al la unua aranĝo), Dekstra Win/Menu (al la lasta aranĝo)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:475
 msgid "Left Win (while pressed)"
 msgstr "Maldekstra Win (dum premata)"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:476
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Maldekstra Win elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:477
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Maldekstra Win elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo, unu premo malfaras la ŝloson"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:478
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Maldekstra Ctrl + Dekstra Win (por la unua aranĝo), Dekstra Ctrl + Menu (por la dua aranĝo)"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:479
 msgid "Legacy"
 msgstr "Malmoderna"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:480
 msgid "Legacy Wang 724"
 msgstr "Malmoderna Wang 724"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:482
 msgid "Legacy key with comma"
 msgstr "Malmoderna klavo kun komo"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:483
 msgid "Legacy key with dot"
 msgstr "Malmoderna klavo kun punkto"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
 msgid "Lithuanian"
 msgstr "Litova"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:485
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litova (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:486
 msgid "Lithuanian (LEKP)"
 msgstr "Litova (LEKP)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:487
 msgid "Lithuanian (LEKPa)"
 msgstr "Litova (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:488
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litova (Usona klavaro kun litovaj literoj)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (standard)"
 msgstr "Litova (norma)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:490
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Access Keyboard"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:491
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:492
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop (alternativa opcio)"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:493
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro (alternativa opcio 2)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:500
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Logitech G15 extra keys via G15daemon"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech - Ĝenerala Klavaro"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Logitech Internet 350 Keyboard"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:504
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Media Elite Keyboard"
 msgstr "Logitech Media Elite Keyboard"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Logitech Ultra-X Keyboard"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:508
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Logitech diNovo Edge Keyboard"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:509
 msgid "Logitech diNovo Keyboard"
 msgstr "Logitech diNovo Keyboard"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:510
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:511
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:512
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:513
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:514
+msgid "Lower Sorbian"
+msgstr "Malsupra Soraba)"
+
+#: ../rules/base.xml.in.h:515
+msgid "Lower Sorbian (qwertz)"
+msgstr "Malsupra Soraba (qwertz)"
+
+#: ../rules/base.xml.in.h:516
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:517
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Intl)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:518
 msgid "Macedonian"
 msgstr "Makedona"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:519
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Makedona (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:520
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:521
 msgid "Macintosh Old"
 msgstr "Macintosh 'Malnova'"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:522
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Igi Caps Lock kroman Retroklavon"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:523
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Igi Caps Lock kroman Control sed teni la simbolklavon Caps_Lock (keysym)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:524
 msgid "Make Caps Lock an additional Ctrl"
 msgstr "Igi Caps Lock kroman Ctrl"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:525
 msgid "Make Caps Lock an additional ESC"
 msgstr "Igi Caps Lock kroman ESC"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Igi Caps Lock kroman Hyper"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Igi Caps Lock kroman Num Lock"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional Super"
 msgstr "Igi Caps Lock kroman Super"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:529
 msgid "Malayalam"
 msgstr "Malajala"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:530
 msgid "Malayalam (Lalitha)"
 msgstr "Malajala (Lalitha)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:531
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malajala (plibonigita Inscript kun Rupi-Signo)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:532
 msgid "Maltese"
 msgstr "Malta"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:533
 msgid "Maltese (with US layout)"
 msgstr "Malta (kun usona aranĝo)"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:534
+msgid "Maori"
+msgstr "Maoria"
+
+#: ../rules/base.xml.in.h:535
+msgid "Mari"
+msgstr "Maria"
+
+#: ../rules/base.xml.in.h:536
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:537
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:538
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:539
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:540
 msgid "Meta is mapped to Left Win"
 msgstr "Meta estas mapita al la Maldekstra Win"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:541
 msgid "Meta is mapped to Win keys"
 msgstr "Meta estas mapita al la klavoj Win"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:542
 msgid "Meta on Left Ctrl"
 msgstr "Meta ĉe Maldekstra Ctrl"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:543
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve Keyboard 2000"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:544
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:545
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Sveda"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural Keyboard Elite"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:550
 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:537
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Microsoft Natura Sendrata Komforteca Klavaro 4000"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Microsoft Natura Sendrata Komforteca Klavaro 7000"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:553
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:555
 msgid "Miscellaneous compatibility options"
 msgstr "Ceteraj kongruaj opcioj"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:556
 msgid "Mongolian"
 msgstr "Mongola"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:557
 msgid "Montenegrin"
 msgstr "Montenegra"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:558
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegra (Cirila kun angul-citiloj)"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:559
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegra (Cirila)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegra (Cirila, Z kaj ZHE interŝanĝita)"
 
-#: ../rules/base.xml.in.h:547
-msgid "Montenegrin (Latin qwerty)"
-msgstr "Montenegra (Latina qwerty)"
+#: ../rules/base.xml.in.h:561
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Montenegra (Latina Unikodo qwerty)"
 
-#: ../rules/base.xml.in.h:548
-msgid "Montenegrin (Latin unicode qwerty)"
-msgstr "Montenegra (Latina unikoda qwerty)"
+#: ../rules/base.xml.in.h:562
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Montenegra (Latina Unikodo)"
 
-#: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
-msgstr "Montenegra (Latina unikoda)"
+#: ../rules/base.xml.in.h:563
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Montenegra (Latina qwerty)"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegra (Latina kun angul-citiloj)"
 
-#: ../rules/base.xml.in.h:551
-msgid "Māori"
-msgstr "Maoria"
-
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:565
 msgid "NICOLA-F style Backspace"
 msgstr "Retropaŝo laŭ estilo NICOLA-F"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:566
 msgid "Nepali"
 msgstr "Nepala"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:567
 msgid "Non-breakable space character at fourth level"
 msgstr "Ne-rompebla spaco-signo ĉe la 4-a nivelo"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:568
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Ne-rompebla spaco-signo ĉe la 4-a nivelo, maldika ne-rompebla spaco-signo ĉe la 6-a nivelo"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:569
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Ne-rompebla spaco-signo ĉe la 4-a nivelo, maldika ne-rompebla spaco-signo ĉe la 6-a nivelo (per Ctrl+Shift)"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at second level"
 msgstr "Ne-rompebla spaco-signo ĉe la 2-a nivelo"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at third level"
 msgstr "Ne-rompebla spaco-signo ĉe la 3-a nivelo"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:572
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Ne-rompebla spaco-signo ĉe la 3-a nivelo, nenio ĉe la 4-a nivelo"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Ne-rompebla spaco-signo ĉe la 3-a nivelo, maldika ne-rompebla spaco-signo ĉe la 4-a nivelo"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:574
+msgid "Northern Saami (Finland)"
+msgstr "Norda Samea (Finlando)"
+
+#: ../rules/base.xml.in.h:575
+msgid "Northern Saami (Norway)"
+msgstr "Norda Samea (Norvegujo)"
+
+#: ../rules/base.xml.in.h:576
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Norda Samea (Norvegujo, forigi senpaŝajn klavojn)"
+
+#: ../rules/base.xml.in.h:577
+msgid "Northern Saami (Sweden)"
+msgstr "Norda Samea (Svedujo)"
+
+#: ../rules/base.xml.in.h:578
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:579
 msgid "Norwegian"
 msgstr "Norvega"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:580
 msgid "Norwegian (Dvorak)"
 msgstr "Norvega (Dvorako)"
 
-#: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
-msgstr "Norvega (Mac)"
-
-#: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
-msgstr "Norvega (Mac, forigi senpaŝajn klavojn)"
+#: ../rules/base.xml.in.h:581
+msgid "Norwegian (Macintosh)"
+msgstr "Norvega (Macintosh)"
 
-#: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
-msgstr "Norvega (Norda Samea)"
+#: ../rules/base.xml.in.h:582
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Norvega (Macintosh, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norvega (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:568
-msgid "Norwegian (northern Saami, eliminate dead keys)"
-msgstr "Norvega (Norda Samea, forigi senpaŝajn klavojn)"
-
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:584
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:585
 msgid "Numeric keypad delete key behaviour"
 msgstr "Funkciado de la forig-klavo de la ciferklavaro"
 
-#: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
-msgstr "La klavoj de la ciferklavaro funkcias same kiel en Mac"
+#: ../rules/base.xml.in.h:586
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "La klavoj de la ciferklavaro funkcias same kiel en Macintosh"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:587
 msgid "Numeric keypad layout selection"
 msgstr "Elektado de aranĝo por la ciferklavaro"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:588
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:589
+msgid "Occitan"
+msgstr "Okcitana"
+
+#: ../rules/base.xml.in.h:590
+msgid "Ogham"
+msgstr "Ogamo"
+
+#: ../rules/base.xml.in.h:591
+msgid "Ogham (IS434)"
+msgstr "Ogamo (IS434)"
+
+#: ../rules/base.xml.in.h:592
 msgid "Oriya"
 msgstr "Orija"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:593
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Ortek MCK-800 MM/Internet keyboard"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:594
+msgid "Ossetian (Georgia)"
+msgstr "Oseta (Kartvelujo)"
+
+#: ../rules/base.xml.in.h:595
+msgid "Ossetian (WinKeys)"
+msgstr "Oseta (Win-Klavoj)"
+
+#: ../rules/base.xml.in.h:596
+msgid "Ossetian (legacy)"
+msgstr "Oseta (malmoderna)"
+
+#: ../rules/base.xml.in.h:597
 msgid "PC-98xx Series"
 msgstr "PC-98xx Series"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:598
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Panona Rusina (homofonia)"
+
+#: ../rules/base.xml.in.h:599
 msgid "Pashto"
 msgstr "Paŝtoa"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:600
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Paŝtoa (Afganujo, OLPC)"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:601
 msgid "Pause"
 msgstr "Paŭso"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
 msgid "Persian"
 msgstr "Persa"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:603
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persa (Afganujo, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:604
 msgid "Persian (with Persian Keypad)"
 msgstr "Persa (kun Persa Ciferklavaro)"
 
-#: ../rules/base.xml.in.h:583
-msgid "Philippines - Dvorak (Baybayin)"
-msgstr "Filipinoj - Dvorako (Baybayin)"
-
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
 msgid "Polish"
 msgstr "Pola"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:606
 msgid "Polish (Dvorak)"
 msgstr "Pola (Dvorako)"
 
-#: ../rules/base.xml.in.h:586
-msgid "Polish (Dvorak, polish quotes on key 1)"
+#: ../rules/base.xml.in.h:607
+msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Pola (Dvorako, polaj citiloj ĉe klavo 1)"
 
-#: ../rules/base.xml.in.h:587
-msgid "Polish (Dvorak, polish quotes on quotemark key)"
+#: ../rules/base.xml.in.h:608
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Pola (Dvorako, polaj citiloj ĉe citila klavo)"
 
-#: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
-msgstr "Pola (Kaŝuba)"
-
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:609
 msgid "Polish (programmer Dvorak)"
 msgstr "Pola (Dvorako por programistoj)"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:610
 msgid "Polish (qwertz)"
 msgstr "Pola (qwertz)"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:611
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:612
 msgid "Portuguese (Brazil)"
 msgstr "Portugala (Brazilo)"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:613
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugala (Brazilo, Dvorak)"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugala (Brazilo, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugala (Brazilo, nativo por Esperanto)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugala (Brazilo, nativo por usonaj klavaroj)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugala (Brazilo, Nativo)"
 
-#: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
-msgstr "Portugala (Mac)"
-
-#: ../rules/base.xml.in.h:599
-msgid "Portuguese (Mac, Sun dead keys)"
-msgstr "Portugala (Mac, senpaŝaj klavoj de Sun)"
+#: ../rules/base.xml.in.h:618
+msgid "Portuguese (Macintosh)"
+msgstr "Portugala (Macintosh)"
 
-#: ../rules/base.xml.in.h:600
-msgid "Portuguese (Mac, eliminate dead keys)"
-msgstr "Portugala (Mac, forigi senpaŝajn klavojn)"
+#: ../rules/base.xml.in.h:619
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portugala (Macintosh, senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr "Portugala (Nativo por Esperanto)"
+#: ../rules/base.xml.in.h:620
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Portugala (Macintosh, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugala (Nativo por usonaj klavaroj)"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Nativo)"
 msgstr "Portugala (Nativo)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugala (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugala (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:625
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:626
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:627
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Panĝaba (Gurmukia de Jhelum)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:628
 msgid "Punjabi (Gurmukhi)"
 msgstr "Panĝaba (Gurmukia)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:629
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:630
 msgid "Right Alt"
 msgstr "Dekstra Alt"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:631
 msgid "Right Alt (while pressed)"
 msgstr "Dekstra Alt (dum premata)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:632
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Dekstra Alt elektas 5-an nivelon kaj ŝlosas nivelon 5 kiam premite kun alia 5-nivela elektilo, unu premo malfaras la ŝloson"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Dekstra Alt elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Dekstra Alt elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo, unu premo malfaras la ŝloson"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:635
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Dekstra Alt neniam elektas la 3-an nivelon"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Dekstra Alt, Shift+Dekstra Alt estas Multi_Key"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:637
 msgid "Right Ctrl"
 msgstr "Dekstra Ctrl"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:638
 msgid "Right Ctrl (while pressed)"
 msgstr "Dekstra Ctrl (dum premata)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:639
 msgid "Right Ctrl as Right Alt"
 msgstr "Dekstra Ctrl kiel Dekstran Alt"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:640
 msgid "Right Ctrl is mapped to Menu"
 msgstr "Dekstra Ctrl estas mapita al Menu"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl+Right Shift"
 msgstr "Dekstra Ctrl+Dekstra Shift"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:642
 msgid "Right Shift"
 msgstr "Dekstra Shift"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:643
 msgid "Right Win"
 msgstr "Dekstra Win"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:644
 msgid "Right Win (while pressed)"
 msgstr "Dekstra Win (dum premata)"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:645
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Dekstra Win elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:646
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Dekstra Win elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo, unu premo malfaras la ŝloson"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
 msgid "Romanian"
 msgstr "Rumana"
 
-#: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr "Rumana (Krime-tatara, Dobruca-1 Q)"
-
-#: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr "Rumana (Krime-tatara, Dobruca-2 Q)"
-
-#: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Rumana (Krime-tatara, Turka Alt-Q)"
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (Germany)"
+msgstr "Rumana (Germanujo)"
 
-#: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
-msgstr "Rumana (Krime-tatara, Turka F)"
+#: ../rules/base.xml.in.h:649
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Rumana (Germanujo, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:650
 msgid "Romanian (WinKeys)"
 msgstr "Rumana (WinKeys)"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (cedilla)"
 msgstr "Rumana (Subhoko)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (standard cedilla)"
 msgstr "Rumana (norma subhoko)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (standard)"
 msgstr "Rumana (norma)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:654
 msgid "Rupee on 4"
 msgstr "Rupio ĉe 4"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
 msgid "Russian"
 msgstr "Rusa"
 
-#: ../rules/base.xml.in.h:639
-msgid "Russian (Bashkirian)"
-msgstr "Rusa (Baŝkira)"
-
-#: ../rules/base.xml.in.h:640
-msgid "Russian (Chuvash Latin)"
-msgstr "Rusa (Ĉuvaŝa Latina)"
-
-#: ../rules/base.xml.in.h:641
-msgid "Russian (Chuvash)"
-msgstr "Rusa (Ĉuvaŝa)"
-
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:656
 msgid "Russian (DOS)"
 msgstr "Rusa (DOS)"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:657
 msgid "Russian (Georgia)"
 msgstr "Rusa (Kartvela)"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:658
 msgid "Russian (Germany, phonetic)"
 msgstr "Rusa (Germana, fonetika)"
 
-#: ../rules/base.xml.in.h:645
-msgid "Russian (Kalmyk)"
-msgstr "Rusa (Kalmuka)"
-
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:659
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Rusa (Kazaĥujo, kun Kazaĥa)"
 
-#: ../rules/base.xml.in.h:647
-msgid "Russian (Komi)"
-msgstr "Rusa (Komi)"
-
-#: ../rules/base.xml.in.h:648
-msgid "Russian (Mari)"
-msgstr "Rusa (Maria)"
-
-#: ../rules/base.xml.in.h:649
-msgid "Russian (Ossetian, WinKeys)"
-msgstr "Rusa (Oseta, WinKeys)"
-
-#: ../rules/base.xml.in.h:650
-msgid "Russian (Ossetian, legacy)"
-msgstr "Rusa (Oseta, malmoderna)"
-
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Rusa (Polujo, fonetika Dvorako)"
 
-#: ../rules/base.xml.in.h:652
-msgid "Russian (Serbian)"
-msgstr "Rusa (Serba)"
-
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Sweden, phonetic)"
 msgstr "Rusa (Svedujo, fonetika)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Rusa (Svedujo, fonetika, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:655
-msgid "Russian (Tatar)"
-msgstr "Rusa (Tatara)"
-
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:663
 msgid "Russian (US, phonetic)"
 msgstr "Rusa (Usono, fonetika)"
 
-#: ../rules/base.xml.in.h:657
-msgid "Russian (Udmurt)"
-msgstr "Rusa (Udmurta)"
-
-#: ../rules/base.xml.in.h:658
-msgid "Russian (Yakut)"
-msgstr "Rusa (Jakuta)"
+#: ../rules/base.xml.in.h:664
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Rusa (Ukrajnujo, norma RSTU)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:665
 msgid "Russian (legacy)"
 msgstr "Rusa (malmoderna)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:666
 msgid "Russian (phonetic WinKeys)"
 msgstr "Rusa (fonetika WinKeys)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:667
 msgid "Russian (phonetic)"
 msgstr "Rusa (fonetika)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:668
 msgid "Russian (typewriter)"
 msgstr "Rusa (skribmaŝina)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:669
 msgid "Russian (typewriter, legacy)"
 msgstr "Rusa (skribmaŝina, malmoderna)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:670
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:671
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:672
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:673
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:674
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:675
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:676
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:677
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Tajvano)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:678
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:679
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:680
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:681
 msgid "Scroll Lock"
 msgstr "Ruluma Baskulo"
 
-#: ../rules/base.xml.in.h:676
-msgid "Secwepemctsin"
-msgstr "Secwepemctsin"
-
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:682
 msgid "Semi-colon on third level"
 msgstr "Punkto-komo ĉe la 3-a nivelo"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
 msgid "Serbian"
 msgstr "Serba"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serba (Latina Unikoda qwerty)"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin Unicode)"
 msgstr "Serba (Latina Unikoda)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:686
 msgid "Serbian (Latin qwerty)"
 msgstr "Serba (Latina qwerty)"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serba (Latina kun angul-citiloj)"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin)"
 msgstr "Serba (Latina)"
 
-#: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr "Serba (Panona Rusina Homofonia)"
+#: ../rules/base.xml.in.h:689
+msgid "Serbian (Russia)"
+msgstr "Serba (Rusujo)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Serba (Z kaj ZHE permutitaj)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (with guillemets)"
 msgstr "Serba (kun angul-citiloj)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:692
 msgid "Serbo-Croatian (US)"
 msgstr "Serb-Kroata (Usona)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:693
 msgid "Shift cancels Caps Lock"
 msgstr "Shift nuligas Caps Lock"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:694
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Shift ne nuligas Num Lock, elektas 3-an nivelon anstataŭe"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:695
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Shift kun la ciferklavaro funkcias same kiel en MS Windows"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:696
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:697
 msgid "Sindhi"
 msgstr "Sinda"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:698
 msgid "Sinhala"
 msgstr "Sinhala"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:699
 msgid "Slovak"
 msgstr "Slovaka"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:700
 msgid "Slovak (extended Backslash)"
 msgstr "Slovaka (etendita Retroklino)"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:701
 msgid "Slovak (qwerty)"
 msgstr "Slovaka (qwerty)"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:702
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Slovaka (qwerty, etendita Retroklino)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Slovene"
+#: ../rules/base.xml.in.h:703
+msgid "Slovenian"
 msgstr "Slovena"
 
-#: ../rules/base.xml.in.h:699
-msgid "Slovene (US keyboard with Slovenian letters)"
+#: ../rules/base.xml.in.h:704
+msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Slovena (Usona klavaro kun slovenaj literoj)"
 
-#: ../rules/base.xml.in.h:700
-msgid "Slovene (use guillemets for quotes)"
+#: ../rules/base.xml.in.h:705
+msgid "Slovenian (use guillemets for quotes)"
 msgstr "Slovena (uzi angul-citilojn por citiloj)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:706
 msgid "Spanish"
 msgstr "Hispana"
 
-#: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr "Hispana (Asturia variaĵo kun subpunktita H kaj subpunktita L)"
-
-#: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr "Hispana (Kataluna variaĵo kun centro-punktita L)"
-
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Spanish (Dvorak)"
 msgstr "Hispana (Dvorako)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Spanish (Latin American)"
 msgstr "Hispana (Latin-amerika)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Hispana (Latin-amerika, senpaŝaj klavoj de Sun)"
+
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Hispana (Latin-amerika, forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Hispana (Latin-amerika, inkluzive senpaŝa tildo)"
 
-#: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, sun dead keys)"
-msgstr "Hispana (Latin-amerika, senpaŝaj klavoj de Sun)"
-
-#: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
-msgstr "Hispana (Mac)"
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Macintosh)"
+msgstr "Hispana (Macintosh)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Sun dead keys)"
 msgstr "Hispana (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (eliminate dead keys)"
 msgstr "Hispana (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (include dead tilde)"
 msgstr "Hispana (inkluzive senpaŝa tildo)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Specialaj klavoj (Ctrl+Alt+&lt;klavo&gt;) traktotaj en servilo"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 msgid "Swahili (Kenya)"
 msgstr "Svahila (Kenjo)"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Swahili (Tanzania)"
 msgstr "Svahila (Tanzanio)"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Permuti Ctrl kaj Caps Lock"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swap ESC and Caps Lock"
 msgstr "Permuti ESC kaj Caps Lock"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swedish"
 msgstr "Sveda"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swedish (Dvorak)"
 msgstr "Sveda (Dvorako)"
 
-#: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
-msgstr "Sveda (Mac)"
+#: ../rules/base.xml.in.h:725
+msgid "Swedish (Macintosh)"
+msgstr "Sveda (Macintosh)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish (Svdvorak)"
 msgstr "Sveda (Svdvorak)"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (eliminate dead keys)"
 msgstr "Sveda (forigi senpaŝajn klavojn)"
 
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
-msgstr "Sveda (norda samea)"
-
-#: ../rules/base.xml.in.h:726
-msgid "Swiss"
-msgstr "Svisa"
-
-#: ../rules/base.xml.in.h:727
-msgid "Swiss (legacy)"
-msgstr "Svisa (malmoderna)"
-
 #: ../rules/base.xml.in.h:728
+msgid "Swedish Sign Language"
+msgstr "Sveda Gesto-Lingvo"
+
+#: ../rules/base.xml.in.h:729
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tabuleta PC)"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:730
 msgid "Syriac"
 msgstr "Siria"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:731
 msgid "Syriac (phonetic)"
 msgstr "Siria (fonetika)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:732
 msgid "Taiwanese"
 msgstr "Tajvana"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:733
 msgid "Taiwanese (indigenous)"
 msgstr "Tajvana (indiĝena)"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:734
 msgid "Tajik"
 msgstr "Taĝika"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:735
 msgid "Tajik (legacy)"
 msgstr "Taĝika (malmoderna)"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:736
 msgid "Tamil"
 msgstr "Tamila"
 
 # Parou aqui !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:737
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamila (Sri-lanko, Skribmaŝino TAB)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:738
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamila (Sri-lanko, Unikodo)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:739
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamila (Skribmaŝino TAB)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamila (Skribmaŝino TSCII)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Unicode)"
 msgstr "Tamila (Unikodo)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamila (klavaro kun ciferoj)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:743
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:744
+msgid "Tatar"
+msgstr "Tatara"
+
+#: ../rules/base.xml.in.h:745
 msgid "Telugu"
 msgstr "Telugua"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
 msgid "Thai"
 msgstr "Taja"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Taja (Pattachote)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
 msgid "Thai (TIS-820.2538)"
 msgstr "Taja (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
+msgid "Tibetan"
+msgstr "Tibeta"
+
+#: ../rules/base.xml.in.h:750
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibeta (kun ciferoj ASCII)"
+
+#: ../rules/base.xml.in.h:751
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Al la ekvivalenta klavo en Dvoraka klavaro."
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:752
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Al la ekvivalenta klavo en klavaro Qwerty."
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:753
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Alterni Mus-Klavojn per Shift + NumLock."
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:754
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:755
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:756
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:757
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:758
 msgid "Tswana"
 msgstr "Cvana"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:759
 msgid "Turkish"
 msgstr "Turka"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:760
 msgid "Turkish (Alt-Q)"
 msgstr "Turka (Alt-Q)"
 
-#: ../rules/base.xml.in.h:757
-msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
-msgstr "Turka (Krime-tatara Turka Alt-Q)"
-
-#: ../rules/base.xml.in.h:758
-msgid "Turkish (Crimean Tatar Turkish F)"
-msgstr "Turka (Krime-tatara Turka F)"
-
-#: ../rules/base.xml.in.h:759
-msgid "Turkish (Crimean Tatar Turkish Q)"
-msgstr "Turka (Krime-tatara Turka Q)"
-
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:761
 msgid "Turkish (F)"
 msgstr "Turka (F)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:762
 msgid "Turkish (Sun dead keys)"
 msgstr "Turka (senpaŝaj klavoj de Sun)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (international with dead keys)"
 msgstr "Turka (internacia kun senpaŝaj klavoj)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:764
 msgid "Turkmen"
 msgstr "Turkmena"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:765
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmena (Alt-Q)"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:766
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:767
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:768
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (reĝimo 102/105:EU)"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (reĝimo 106:JP)"
 
-#: ../rules/base.xml.in.h:770
-msgid "Ukrainian"
-msgstr "Ukrajna"
-
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Ukrajna (Krime-tatara Turka Alt-Q)"
+msgid "Udmurt"
+msgstr "Udmurta"
 
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "Ukrajna (Krime-tatara Turka F)"
+msgid "Ukrainian"
+msgstr "Ukrajna"
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "Ukrajna (Krime-tatara Turka Q)"
-
-#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukrajna (WinKeys)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (homophonic)"
 msgstr "Ukrajna (homofonia)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (legacy)"
 msgstr "Ukrajna (malmoderna)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (phonetic)"
 msgstr "Ukrajna (fonetika)"
 
-#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr "Ukrajna (norma RSTU en Rusa aranĝo)"
-
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukrajna (norma RSTU)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (typewriter)"
 msgstr "Ukrajna (skribmaŝino)"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:779
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unikodaj aldonoj (sagoj kaj operaci-simboloj)"
 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:780
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Unikodaj aldonoj (sagoj kaj operaci-simboloj). Operaci-simboloj en la implicita nivelo."
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:781
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:782
 msgid "Urdu (Pakistan)"
 msgstr "Urdua (Pakistano)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:783
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdua (Pakistano, CRULP)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:784
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdua (Pakistano, NLA)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (WinKeys)"
 msgstr "Urdua (WinKeys)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdua (alternativa fonetika)"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (phonetic)"
 msgstr "Urdua (fonetika)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:788
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Uzi la LED de klavaro por indiki alternativan aranĝon"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:789
 msgid "Using space key to input non-breakable space character"
 msgstr "Uzado de spac-klavo por enmeti ne-rompeblan spaco-signon"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:790
 msgid "Usual space at any level"
 msgstr "Kutima spaco-signo ĉe iu ajn nivelo"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "Ujgura"
+
+#: ../rules/base.xml.in.h:792
 msgid "Uzbek"
 msgstr "Uzbeka"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:793
 msgid "Uzbek (Afghanistan)"
 msgstr "Uzbeka (Afganujo)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:794
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Uzbeka (Afganujo, OLPC)"
 
-#: ../rules/base.xml.in.h:796
-msgid "Uzbek (Crimean Tatar Turkish Alt-Q)"
-msgstr "Uzbeka (Krime-tatara Turka Alt-Q)"
-
-#: ../rules/base.xml.in.h:797
-msgid "Uzbek (Crimean Tatar Turkish F)"
-msgstr "Uzbeka (Krime-tatara Turka F)"
-
-#: ../rules/base.xml.in.h:798
-msgid "Uzbek (Crimean Tatar Turkish Q)"
-msgstr "Uzbeka (Krime-tatara Turka Q)"
-
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek (Latin)"
 msgstr "Uzbeka (Latina)"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:796
 msgid "Vietnamese"
 msgstr "Vjetnama"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:797
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard"
 
-#: ../rules/base.xml.in.h:802
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Wang 724 ciferklavaro kun unikodaj aldonoj (sagoj kaj operaci-simboloj)"
+#: ../rules/base.xml.in.h:798
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+msgstr "Wang 724 ciferklavaro kun Unikodaj aldonoj (sagoj kaj operaci-simboloj)"
 
-#: ../rules/base.xml.in.h:803
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Wang 724 ciferklavaro kun unikodaj aldonoj (sagoj kaj operaci-simboloj). Operaci-simboloj en la implicita nivelo"
+#: ../rules/base.xml.in.h:799
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Wang 724 ciferklavaro kun Unikodaj aldonoj (sagoj kaj operaci-simboloj). Operaci-simboloj en la apriora nivelo"
 
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:800
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:801
 msgid "Wolof"
 msgstr "Volofa"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:802
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:803
+msgid "Yakut"
+msgstr "Jakuta"
+
+#: ../rules/base.xml.in.h:804
 msgid "Yoruba"
 msgstr "Joruba"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:805
 msgid "Zero-width non-joiner character at second level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe dua nivelo"
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:806
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la dua nivelo, ne-rompebla spaco-signo ĉe la tria nivelo"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:807
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la dua nivelo, ne-rompebla spaco-signo ĉe la tria nivelo, nenio ĉe la kvara nivelo"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la dua nivelo, ne-rompebla spaco-signo ĉe la tria nivelo, maldika ne-rompebla spaco-signo ĉe la kvara nivelo"
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:809
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la dua nivelo, ne-rompebla spaco-signo ĉe la tria nivelo, nul-larĝa kuniga signo ĉe la kvara nivelo"
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:810
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la dua nivelo, nul-larĝa kuniga signo ĉe la tria nivelo"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:811
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la dua nivelo, nul-larĝa kuniga signo ĉe la tria nivelo, ne-rompebla spaco-signo ĉe la kvara nivelo"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:812
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Nul-larĝa ne-kuniga signo ĉe la tria nivelo, nul-larĝa kuniga signo ĉe la kvara nivelo"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:813
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:814
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:815
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:816
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:817
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:818
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:819
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:820
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:821
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:822
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:823
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:824
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:825
 msgid "ca"
 msgstr "ca"
 
-#: ../rules/base.xml.in.h:829
-msgid "che"
-msgstr "che"
-
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:826
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:827
+msgid "cm"
+msgstr "cm"
+
+#: ../rules/base.xml.in.h:828
+msgid "crh"
+msgstr "crh"
+
+#: ../rules/base.xml.in.h:829
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:830
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:831
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:832
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:833
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:834
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:836
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:837
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:838
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:840
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:841
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:842
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:844
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:845
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:846
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:847
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:848
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:849
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:850
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:851
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:853
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:854
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:855
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:856
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:859
-msgid "irq"
-msgstr "irq"
-
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:857
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:858
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:859
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:860
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:861
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:862
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:863
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:864
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:865
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:866
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:870
-msgid "kut"
-msgstr "kut"
-
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:867
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:870
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:871
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:872
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:873
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:874
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:875
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:876
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:877
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:878
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:879
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:880
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:881
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:883
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:884
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:887
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:892
-msgid "shs"
-msgstr "shs"
-
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:888
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:889
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:890
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:891
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:898
-msgid "srp"
-msgstr "srp"
-
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:893
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:894
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:895
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:896
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:897
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:898
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:899
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:900
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:901
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:902
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:909
-msgid "twn"
-msgstr "twn"
-
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:903
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:904
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:905
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:906
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:907
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:908
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:909
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:910
 msgid "zh"
 msgstr "zh"
 
 #: ../rules/base.extras.xml.in.h:1
-msgid "APL"
-msgstr "APL"
-
-#: ../rules/base.extras.xml.in.h:2
-msgid "Iran"
-msgstr "Irano"
-
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr "Irano - Avesta"
+msgid "APL Keyboard Symbols"
+msgstr "Klavar-simboloj APL"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "Litovujo"
+msgid "Atsina"
+msgstr "Atsina"
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
-msgstr "Litovujo - Dvorako"
+msgid "Avestan"
+msgstr "Avesta"
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "Ltu"
-
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "Rumanujo"
+msgid "Couer D'alene Salish"
+msgstr "Couer D'alene Salish"
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr "Rumanujo - Komforteca Touchtype"
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Angla (Usono, internacia AltGr-Unikoda kunmiksado)"
 
 #: ../rules/base.extras.xml.in.h:9
-msgid "Rou"
-msgstr "Rou"
-
-#: ../rules/base.extras.xml.in.h:10
-msgid "Rus"
-msgstr "Rus"
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "Angla (Usono, internacia AltGr-Unikoda kunmiksado, alternativa)"
 
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "Rusujo"
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
-msgstr "Serbujo"
+msgid "Kutenai"
+msgstr "Kutenai"
 
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
-msgstr "Serbujo - Kunmiksado de diakritaĵoj anstataŭ senpaŝaj klavoj"
+msgid "Latvian (US Colemak)"
+msgstr "Latva (Usona Colemak)"
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
-msgstr "Srb"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Latva (Usona Colemak, citila variaĵo)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "Usono"
+msgid "Latvian (US Dvorak)"
+msgstr "Latva (Usona Dvorako)"
 
 #: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
-msgstr "Usono - Atsina"
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Latva (Usona Dvorako, variaĵo Y)"
 
 #: ../rules/base.extras.xml.in.h:17
-msgid "USA - Couer D'alene Salish"
-msgstr "Usono - Couer D'alene Salish"
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr "Latva (Usona Dvorako, variaĵo minusa)"
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
-msgstr "Usono - Internacia (AltGr-Unikoda kunmiksado)"
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Latva (Usona Dvorako por programistoj)"
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
-msgstr "Usono - Internacia (AltGr-Unikoda kunmiksado, alternativa)"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Latva (Usona Dvorak por programistoj, variaĵo Y)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Latva (Usona Dvorak por programistoj, variaĵo minusa)"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Litova (Usona Dvorako kun litovaj literoj)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "Pola (internacia kun senpaŝaj klavoj)"
+
+#: ../rules/base.extras.xml.in.h:27
+msgid "Romanian (ergonomic Touchtype)"
+msgstr "Rumana (komforteca Touchtype)"
+
+#: ../rules/base.extras.xml.in.h:29
+msgid "Russian (with UKR and BEL layout)"
+msgstr "Rusa (kun aranĝoj UKR kaj BEL)"
+
+#: ../rules/base.extras.xml.in.h:30
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "Serba (kunmiksado de diakritaĵoj anstataŭ senpaŝaj klavoj)"
+
+#: ../rules/base.extras.xml.in.h:33
+msgid "apl"
+msgstr "apl"
+
+#: ../rules/base.extras.xml.in.h:38
+msgid "kut"
+msgstr "kut"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "shs"
+msgstr "shs"
+
+#~ msgid "Afg"
+#~ msgstr "Afg"
+
+#~ msgid "Chinese (Tibetan)"
+#~ msgstr "Ĉina (Tibeta)"
+
+#~ msgid "Chinese (Uyghur)"
+#~ msgstr "Ĉina (Ujgura)"
+
+#~ msgid "Danish (Mac)"
+#~ msgstr "Dana (Mac)"
+
+#~ msgid "English (UK, Mac)"
+#~ msgstr "Angla (UK, Macintosh)"
+
+#~ msgid "Finnish (Mac)"
+#~ msgstr "Finna (Mac)"
+
+#~ msgid "Finnish (northern Saami)"
+#~ msgstr "Finna (norda samea)"
+
+#~ msgid "French (Occitan)"
+#~ msgstr "Franca (Okcitana)"
+
+#~ msgid "GBr"
+#~ msgstr "GBr"
+
+#~ msgid "German (Romanian keyboard with German letters)"
+#~ msgstr "Germana (Rumana klavaro kun germanaj literoj)"
+
+#~ msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
+#~ msgstr "Germana (Rumana klavaro kun germanaj literoj, forigi senpaŝajn klavojn)"
+
+#~ msgid "Irish (Ogham)"
+#~ msgstr "Irlanda (Ogamo)"
+
+#~ msgid "Italian (Georgian)"
+#~ msgstr "Itala (Kartvela)"
+
+#~ msgid "Kurdish (Iran, latin alt-Q)"
+#~ msgstr "Kurda (Iran, Latina Alt-Q)"
+
+#~ msgid "Māori"
+#~ msgstr "Maoria"
+
+#~ msgid "Norwegian (Northern Saami"
+#~ msgstr "Norvega (Norda Samea)"
+
+#~ msgid "Philippines - Dvorak (Baybayin)"
+#~ msgstr "Filipinoj - Dvorako (Baybayin)"
+
+#~ msgid "Portuguese (Nativo for Esperanto)"
+#~ msgstr "Portugala (Nativo por Esperanto)"
+
+#~ msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
+#~ msgstr "Rumana (Krime-tatara, Dobruca-2 Q)"
+
+#~ msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Rumana (Krime-tatara, Turka Alt-Q)"
+
+#~ msgid "Romanian (Crimean Tatar Turkish F)"
+#~ msgstr "Rumana (Krime-tatara, Turka F)"
+
+#~ msgid "Russian (Chuvash)"
+#~ msgstr "Rusa (Ĉuvaŝa)"
+
+#~ msgid "Russian (Kalmyk)"
+#~ msgstr "Rusa (Kalmuka)"
+
+#~ msgid "Russian (Komi)"
+#~ msgstr "Rusa (Komi)"
+
+#~ msgid "Russian (Mari)"
+#~ msgstr "Rusa (Maria)"
+
+#~ msgid "Russian (Ossetian, legacy)"
+#~ msgstr "Rusa (Oseta, malmoderna)"
+
+#~ msgid "Russian (Serbian)"
+#~ msgstr "Rusa (Serba)"
+
+#~ msgid "Russian (Tatar)"
+#~ msgstr "Rusa (Tatara)"
+
+#~ msgid "Russian (Udmurt)"
+#~ msgstr "Rusa (Udmurta)"
+
+#~ msgid "Russian (Yakut)"
+#~ msgstr "Rusa (Jakuta)"
+
+#~ msgid "Spanish (Mac)"
+#~ msgstr "Hispana (Mac)"
+
+#~ msgid "Swedish (northern Saami)"
+#~ msgstr "Sveda (norda samea)"
+
+#~ msgid "Swiss"
+#~ msgstr "Svisa"
+
+#~ msgid "Swiss (legacy)"
+#~ msgstr "Svisa (malmoderna)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Turka (Krime-tatara Turka Alt-Q)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish F)"
+#~ msgstr "Turka (Krime-tatara Turka F)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish Q)"
+#~ msgstr "Turka (Krime-tatara Turka Q)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Ukrajna (Krime-tatara Turka Alt-Q)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish F)"
+#~ msgstr "Ukrajna (Krime-tatara Turka F)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish Q)"
+#~ msgstr "Ukrajna (Krime-tatara Turka Q)"
+
+#~ msgid "Ukrainian (standard RSTU on Russian layout)"
+#~ msgstr "Ukrajna (norma RSTU en Rusa aranĝo)"
+
+#~ msgid "irq"
+#~ msgstr "irq"
+
+#~ msgid "srp"
+#~ msgstr "srp"
+
+#~ msgid "twn"
+#~ msgstr "twn"
+
+#~ msgid "APL"
+#~ msgstr "APL"
+
+#~ msgid "Iran"
+#~ msgstr "Irano"
+
+#~ msgid "Lithuania"
+#~ msgstr "Litovujo"
+
+#~ msgid "Lithuania - Dvorak"
+#~ msgstr "Litovujo - Dvorako"
+
+#~ msgid "Ltu"
+#~ msgstr "Ltu"
+
+#~ msgid "Romania"
+#~ msgstr "Rumanujo"
+
+#~ msgid "Rou"
+#~ msgstr "Rou"
+
+#~ msgid "Rus"
+#~ msgstr "Rus"
+
+#~ msgid "Russia"
+#~ msgstr "Rusujo"
+
+#~ msgid "Serbia"
+#~ msgstr "Serbujo"
+
+#~ msgid "Srb"
+#~ msgstr "Srb"
+
+#~ msgid "USA"
+#~ msgstr "Usono"
 
 #~ msgid "(F)"
 #~ msgstr "(F)"
@@ -3836,9 +3996,6 @@ msgstr "Usono - Internacia (AltGr-Unikoda kunmiksado, alternativa)"
 #~ msgid "Chn"
 #~ msgstr "Chn"
 
-#~ msgid "Chuvash"
-#~ msgstr "Ĉuvaŝa"
-
 #~ msgid "Classic"
 #~ msgstr "Klasike"
 
@@ -3941,9 +4098,6 @@ msgstr "Usono - Internacia (AltGr-Unikoda kunmiksado, alternativa)"
 #~ msgid "Jpn"
 #~ msgstr "Jpn"
 
-#~ msgid "Kalmyk"
-#~ msgstr "Kalmyk"
-
 #~ msgid "Kana"
 #~ msgstr "Kanao"
 
@@ -4001,9 +4155,6 @@ msgstr "Usono - Internacia (AltGr-Unikoda kunmiksado, alternativa)"
 #~ msgid "Mao"
 #~ msgstr "Mao"
 
-#~ msgid "Maori"
-#~ msgstr "Maoria"
-
 #~ msgid "Mkd"
 #~ msgstr "Mkd"
 
@@ -4052,12 +4203,6 @@ msgstr "Usono - Internacia (AltGr-Unikoda kunmiksado, alternativa)"
 #~ msgid "OLPC Southern Uzbek"
 #~ msgstr "OLPC Suda Uzbekujo"
 
-#~ msgid "Occitan"
-#~ msgstr "Okcitana"
-
-#~ msgid "Ogham"
-#~ msgstr "Ogamo"
-
 #~ msgid "Ossetian"
 #~ msgstr "Oseta"
 
@@ -4115,15 +4260,9 @@ msgstr "Usono - Internacia (AltGr-Unikoda kunmiksado, alternativa)"
 #~ msgid "Syria"
 #~ msgstr "Sirio"
 
-#~ msgid "Tatar"
-#~ msgstr "Tatara"
-
 #~ msgid "Tha"
 #~ msgstr "Tha"
 
-#~ msgid "Tibetan"
-#~ msgstr "Tibeta"
-
 #~ msgid "Tifinagh"
 #~ msgstr "Tifinagh"
 
@@ -4136,9 +4275,6 @@ msgstr "Usono - Internacia (AltGr-Unikoda kunmiksado, alternativa)"
 #~ msgid "Tza"
 #~ msgstr "Tza"
 
-#~ msgid "Udmurt"
-#~ msgstr "Udmurta"
-
 #~ msgid "Ukr"
 #~ msgstr "Ukr"
 
diff --git a/dist/xkeyboard-config/po/es.po b/dist/xkeyboard-config/po/es.po
index 816aef68d..d4b94f5a7 100644
--- a/dist/xkeyboard-config/po/es.po
+++ b/dist/xkeyboard-config/po/es.po
@@ -1,15 +1,16 @@
-# translation of xkeyboard-config-2.1.99.po to Spanish
+# translation of xkeyboard-config-2.3.po to Spanish
 # This file is distributed under the same license as the xkeyboard-config package.
 # Copyright (C) 2006 The free software foundation
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2006.
-# Jorge González González <aloriel@gmail.com>,  2009, 2010, 2011.
+# Jorge González <jorgegonz@svn.gnome.org>,  2009, 2010, 2011.
+# Jorge González González <aloriel@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.1.99\n"
+"Project-Id-Version: xkeyboard-config-2.3\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-03-25 22:27+0000\n"
-"PO-Revision-Date: 2011-03-31 09:33+0200\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-07-23 20:09+0200\n"
 "Last-Translator: Jorge González González <aloriel@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
@@ -17,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: ../rules/base.xml.in.h:1
 msgid "&lt;Less/Greater&gt;"
@@ -88,153 +89,153 @@ msgid "Advance Scorpius KI"
 msgstr "Advance Scorpius KI"
 
 #: ../rules/base.xml.in.h:18
-msgid "Afg"
-msgstr "Afg"
-
-#: ../rules/base.xml.in.h:19
 msgid "Afghani"
 msgstr "Afgano"
 
-#: ../rules/base.xml.in.h:20
+#: ../rules/base.xml.in.h:19
 msgid "Akan"
 msgstr "Akan"
 
-#: ../rules/base.xml.in.h:21
+#: ../rules/base.xml.in.h:20
 msgid "Albanian"
 msgstr "Albanés"
 
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:21
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt y Meta están en las teclas Alt"
 
-#: ../rules/base.xml.in.h:23
+#: ../rules/base.xml.in.h:22
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Alt está mapeada a la tecla Windows derecha y Super a la tecla Menú"
 
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:23
 msgid "Alt+Caps Lock"
 msgstr "Alt+Bloq Mayús"
 
-#: ../rules/base.xml.in.h:25
+#: ../rules/base.xml.in.h:24
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:26
+#: ../rules/base.xml.in.h:25
 msgid "Alt+Shift"
 msgstr "Alt+Mayús"
 
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:26
 msgid "Alt+Space"
 msgstr "Alt+Espacio"
 
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:27
 msgid "Alt/Win key behavior"
 msgstr "Comportamiento de la tecla Alt/Windows"
 
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:28
 msgid "Amharic"
 msgstr "Amharico"
 
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:29
 msgid "Any Alt key"
 msgstr "Cualquier tecla Alt"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr "Cualquier tecla Windows"
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr "Cualquier tecla Windows (al pulsarla)"
 
-#: ../rules/base.xml.in.h:33
+#: ../rules/base.xml.in.h:32
 msgid "Apple"
 msgstr "Apple"
 
-#: ../rules/base.xml.in.h:34
+#: ../rules/base.xml.in.h:33
 msgid "Apple Aluminium Keyboard (ANSI)"
 msgstr "Teclado de aluminio de Apple (ANSI)"
 
-#: ../rules/base.xml.in.h:35
+#: ../rules/base.xml.in.h:34
 msgid "Apple Aluminium Keyboard (ISO)"
 msgstr "Teclado de aluminio de Apple (ISO)"
 
-#: ../rules/base.xml.in.h:36
+#: ../rules/base.xml.in.h:35
 msgid "Apple Aluminium Keyboard (JIS)"
 msgstr "Teclado de aluminio de Apple (JIS)"
 
-#: ../rules/base.xml.in.h:37
+#: ../rules/base.xml.in.h:36
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "Teclado de aluminio de Apple: emular teclas PC (Imprimir, Bloq Despl, Pausa, Bloq Num)"
 
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
 msgstr "Portátil Apple"
 
-#: ../rules/base.xml.in.h:39
+#: ../rules/base.xml.in.h:38
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:39
 msgid "Arabic (Buckwalter)"
 msgstr "Árabe (Buckwalter)"
 
-#: ../rules/base.xml.in.h:41
+#: ../rules/base.xml.in.h:40
 msgid "Arabic (Morocco)"
 msgstr "Árabbe (Marruecos)"
 
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:41
 msgid "Arabic (Pakistan)"
 msgstr "Árabe (Pakistán)"
 
-#: ../rules/base.xml.in.h:43
+#: ../rules/base.xml.in.h:42
 msgid "Arabic (Syria)"
 msgstr "Árabe (Siria)"
 
-#: ../rules/base.xml.in.h:44
+#: ../rules/base.xml.in.h:43
 msgid "Arabic (azerty)"
 msgstr "Árabe (azerty)"
 
-#: ../rules/base.xml.in.h:45
+#: ../rules/base.xml.in.h:44
 msgid "Arabic (azerty/digits)"
 msgstr "Árabe (azerty/dígitos)"
 
-#: ../rules/base.xml.in.h:46
+#: ../rules/base.xml.in.h:45
 msgid "Arabic (digits)"
 msgstr "Árabe (dígitos)"
 
-#: ../rules/base.xml.in.h:47
+#: ../rules/base.xml.in.h:46
 msgid "Arabic (qwerty)"
 msgstr "Árabe (qwery)"
 
-#: ../rules/base.xml.in.h:48
+#: ../rules/base.xml.in.h:47
 msgid "Arabic (qwerty/digits)"
 msgstr "Árabe (qwerty/dígitos)"
 
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
 msgid "Armenian"
 msgstr "Armenio"
 
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:49
 msgid "Armenian (alternative eastern)"
 msgstr "Armenio (alternativa oriental)"
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
 msgid "Armenian (alternative phonetic)"
 msgstr "Armenio (alternativa fonética)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 msgid "Armenian (eastern)"
 msgstr "Armenio (oriental)"
 
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:52
 msgid "Armenian (phonetic)"
 msgstr "Armenio (fonético)"
 
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:53
 msgid "Armenian (western)"
 msgstr "Armenio (occidental)"
 
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturiano (español, con H de medio punto y L de medio punto)"
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "Portátil Asus"
@@ -252,13 +253,13 @@ msgid "Avatime"
 msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijan (Cyrillic)"
-msgstr "Azerbaiján (cirílico)"
-
-#: ../rules/base.xml.in.h:60
 msgid "Azerbaijani"
 msgstr "Azerbaijaní"
 
+#: ../rules/base.xml.in.h:60
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Azerbajaní (cirílico)"
+
 #: ../rules/base.xml.in.h:61
 msgid "Azona RF2300 wireless Internet Keyboard"
 msgstr "Azona RF2300 wireless Internet Keyboard"
@@ -304,3455 +305,3615 @@ msgid "Backslash"
 msgstr "Contrabarra"
 
 #: ../rules/base.xml.in.h:72
-msgid "Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr "Contrabarra elige el 3º nivel, bloquea al pulsarse junto con otro selector de 3º nivel"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Contrabarra (elige el 3º nivel, bloquea al pulsarse junto con otro selector de 3º nivel)"
 
 #: ../rules/base.xml.in.h:73
 msgid "Bambara"
 msgstr "Bambara"
 
 #: ../rules/base.xml.in.h:74
+msgid "Bashkirian"
+msgstr "Bashkiriano"
+
+#: ../rules/base.xml.in.h:75
 msgid "Belarusian"
 msgstr "Bielorruso"
 
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:76
 msgid "Belarusian (Latin)"
 msgstr "Bielorruso (latino)"
 
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:77
 msgid "Belarusian (legacy)"
 msgstr "Bielorruso (heredado)"
 
-#: ../rules/base.xml.in.h:77
+#: ../rules/base.xml.in.h:78
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../rules/base.xml.in.h:78
+#: ../rules/base.xml.in.h:79
 msgid "Belgian (ISO alternate)"
 msgstr "Belga (alternativa ISO)"
 
-#: ../rules/base.xml.in.h:79
+#: ../rules/base.xml.in.h:80
 msgid "Belgian (Sun dead keys)"
 msgstr "Belga (teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belga (modelo azerty 724 de Wang)"
 
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:82
 msgid "Belgian (alternative)"
 msgstr "Belga (alternativa)"
 
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:83
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belga (alternativa, teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belga (alternativa, sólo latin-9)"
 
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:85
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belga (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:85
+#: ../rules/base.xml.in.h:86
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:86
+#: ../rules/base.xml.in.h:87
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:87
+#: ../rules/base.xml.in.h:88
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:89
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:90
 msgid "Bengali (Probhat)"
 msgstr "Bengalí (Probhat)"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:91
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Bereber (Marruecos, alternativa fonética tifinagh)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Bereber (Marruecos, alternativa tifinagh)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Bereber (Marruecos, tifinagh fonético extendido)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Bereber (Marruecos, tifinagh extendido)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Bereber (Marruecos, tifinagh fonético)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Bereber (Marruecos, Tifinagh)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bosnian"
 msgstr "Bosnio"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
-msgstr "Bosnio (teclado de EE. UU. con digrafos bosnios)"
+msgstr "Bosnio (teclado de EE. UU. con dígrafos bosnios)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosnio (teclado de EE. UU. con letras bosnias)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bosnian (use Bosnian digraphs)"
-msgstr "Bosnio (usar digrafos bosnios)"
+msgstr "Bosnio (usar dígrafos bosnios)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosnio (usar guillemots para comillas)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Both Alt keys together"
 msgstr "Ambas teclas Alt juntas"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Both Ctrl keys together"
 msgstr "Ambas teclas Ctrl juntas"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Both Shift keys together"
 msgstr "Ambas teclas Mayús juntas"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:105
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Ambas teclas Mayús juntas conmutan Bloq Mayús, una tecla Mayús lo desactiva"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Ambas teclas Mayús juntas conmutan Bloq Mayús"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Ambas teclas Mayús juntas conmutan Bloq Despl"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:108
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:109
 msgid "Braille (left hand)"
 msgstr "Braille (zurdo)"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Braille (right hand)"
 msgstr "Braille (diestro)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:111
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:112
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Bulgarian (new phonetic)"
 msgstr "Búlgaro (fonética nueva)"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Búlgaro (fonética tradicional)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:115
 msgid "Burmese"
 msgstr "Burmese"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:116
 msgid "Canadian Multilingual"
 msgstr "Canadiense multilingüe"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Canadian Multilingual (first part)"
 msgstr "Canadiense multilingüe (primera parte)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "Canadian Multilingual (second part)"
 msgstr "Canadiense multilingüe (segunda parte)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:119
 msgid "Caps Lock"
 msgstr "Bloqueo de mayúsculas"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:120
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr "Bloq Mayús (elige el 3º nivel, bloquea al pulsarse junto con otro selector de 3º nivel)"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Bloq Mayús (a la primera distribución), Mayús+Bloq Mayús (a la última distribución)"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:122
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Bloq Mayús (al pulsarse), Alt+Bloq Mayús realiza la acción original de bloqueo de mayúsculas"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:123
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Bloq Mayús actúa como Mayús con bloqueo; Mayús «pausa» Bloq Mayús"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:124
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Bloq Mayús actúa como Mayús con bloqueo; Mayús no afecta a Bloq Mayús"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock is disabled"
 msgstr "Bloq Mayús está desactivado"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock key behavior"
 msgstr "Comportamiento de Bloq Mayús"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Bloq Mayús cambia Mayús de forma que todas las teclas están afectadas"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Bloq Mayús cambia la capitalización normal de los caracteres alfabéticos"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Bloq Mayús usa la capitalización interna; Mayús «pausa» el Bloq Mayús"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Bloq Mayús usa la capitalización interna; Mayús no afecta a Bloq Mayús"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:131
 msgid "Catalan"
 msgstr "Catalán"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:132
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Catalán (español, con L de medio punto)"
+
+#: ../rules/base.xml.in.h:133
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:134
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:135
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:136
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (opción alternativa)"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:137
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:138
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:139
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:141
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:142
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:143
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:144
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:145
 msgid "Chinese"
 msgstr "Chino"
 
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "Chino (tibetano con numerales ASCII)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "Chino (tibetano)"
-
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "Chino (uyghur)"
+msgid "Chuvash"
+msgstr "Chuvash"
 
 #: ../rules/base.xml.in.h:147
+msgid "Chuvash (Latin)"
+msgstr "Cuvash (latino)"
+
+#: ../rules/base.xml.in.h:148
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:149
+msgid "CloGaelach"
+msgstr "Cló Gaelach"
+
+#: ../rules/base.xml.in.h:150
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:151
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 teclas)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:152
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 teclas)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 teclas)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:154
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:155
 msgid "Compose key position"
 msgstr "Posición de la tecla Componer"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:156
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Retroceso"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:157
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Control está mapeada a las teclas Alt, Alt está mapeado a las teclas Windows"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:158
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Control está mapeada a las teclas Windows (y las teclas Ctrl usuales)"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:159
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:160
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Tártaro de Crimea (Dobruca Q)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Tártaro de Crimea (turco Alt-Q)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Tártaro de Crimea (F turca)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Tártaro de Crimea (Q turca)"
+
+#: ../rules/base.xml.in.h:164
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:165
 msgid "Croatian (US keyboard with Croatian digraphs)"
-msgstr "Croata (teclado de EE. UU. con digrafos croatas)"
+msgstr "Croata (teclado de EE. UU. con dígrafos croatas)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:166
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Croata (teclado de EE. UU. con letras croatas)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
-msgstr "Croata (usar digrafos croatas)"
+#: ../rules/base.xml.in.h:167
+msgid "Croatian (use Croatian digraphs)"
+msgstr "Croata (usar dígrafos croatas)"
 
-#: ../rules/base.xml.in.h:162
-msgid "Croatian (Use guillemets for quotes)"
+#: ../rules/base.xml.in.h:168
+msgid "Croatian (use guillemets for quotes)"
 msgstr "Croata (usar guillemots para comillas)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Ctrl key position"
 msgstr "Posición de la tecla Ctrl"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Mayús"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Czech"
 msgstr "Checo"
 
-#: ../rules/base.xml.in.h:166
-msgid "Czech (UCW layout accented letters only)"
-msgstr "Checo (distribución UCW sólo teclas con tilde)"
+#: ../rules/base.xml.in.h:172
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "Checo (distribución UCW, sólo teclas con tilde)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Checo (teclado Dvorak EE. UU. con soporte para UCW checo)"
 
-#: ../rules/base.xml.in.h:168
-msgid "Czech (With &lt;\\|&gt; key)"
-msgstr "Checo (con tecla «\\|»)"
-
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:174
 msgid "Czech (qwerty)"
 msgstr "Checo (qwery)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:175
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Checo (qwerty, contrabarra extendida)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:176
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Checo (con tecla «\\|»)"
+
+#: ../rules/base.xml.in.h:177
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Danish"
 msgstr "Danés"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Danish (Dvorak)"
 msgstr "Danés (Dvorak)"
 
-#: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
-msgstr "Danés (Mac)"
+#: ../rules/base.xml.in.h:180
+msgid "Danish (Macintosh)"
+msgstr "Danés (Macintosh)"
 
-#: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
-msgstr "Danés (Mac, eliminar teclas muertas)"
+#: ../rules/base.xml.in.h:181
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Danés (Macintosh, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Danish (eliminate dead keys)"
 msgstr "Danés (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "Default numeric keypad keys"
 msgstr "Teclas del teclado numérico predeterminado"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Dell 101-key PC"
 msgstr "Dell PC 101 teclas"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell Laptop/notebook Precision M series"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Dell Latitude series laptop"
 msgstr "Portátil Dell Latitude"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dhivehi"
 msgstr "Dhivehi"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802 series"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
-msgstr "Holandés (Mac)"
+#: ../rules/base.xml.in.h:197
+msgid "Dutch (Macintosh)"
+msgstr "Holandés (Macintosh)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dutch (Sun dead keys)"
 msgstr "Holandés (teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dutch (standard)"
 msgstr "Holandés (estándar)"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Enable extra typographic characters"
 msgstr "Activar caracteres tipográficos adicionales"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
+msgid "English (Cameroon Dvorak)"
+msgstr "Inglés (Dvorak de Camerún)"
+
+#: ../rules/base.xml.in.h:203
+msgid "English (Cameroon qwerty)"
+msgstr "Inglés (qwerty de Camerún)"
+
+#: ../rules/base.xml.in.h:204
+msgid "English (Cameroon)"
+msgstr "Inglés (Camerún)"
+
+#: ../rules/base.xml.in.h:205
 msgid "English (Canada)"
 msgstr "Inglés (Canadá)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:206
 msgid "English (Colemak)"
 msgstr "Inglés (Colemark)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:207
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Inglés (alternativa Dvorak internacional sin teclas muertas)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:208
 msgid "English (Dvorak international with dead keys)"
 msgstr "Inglés (Dvorak internacional con teclas muertas)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:209
 msgid "English (Dvorak)"
 msgstr "Inglés (Dvorak)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:210
 msgid "English (Ghana)"
 msgstr "Inglés (Ghana)"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:211
 msgid "English (Ghana, GILLBT)"
 msgstr "Inglés (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:212
 msgid "English (Ghana, multilingual)"
 msgstr "Inglés (Ghana, multilingue)"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:213
 msgid "English (India, with RupeeSign)"
 msgstr "Inglés (India, con signo de rupia)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:214
 msgid "English (Macintosh)"
 msgstr "Inglés (Macintosh)"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
-msgstr "Inglés (Malí, Mac de EE. UU.)"
+#: ../rules/base.xml.in.h:215
+msgid "English (Mali, US Macintosh)"
+msgstr "Inglés (Malí, Macintosh de EE. UU.)"
 
-#: ../rules/base.xml.in.h:207
-msgid "English (Mali, USA international)"
+#: ../rules/base.xml.in.h:216
+msgid "English (Mali, US international)"
 msgstr "Inglés (Malí, EE. UU. internacional)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:217
 msgid "English (Nigeria)"
 msgstr "Inglés (Nigeria)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:218
 msgid "English (South Africa)"
 msgstr "Inglés (Sudáfrica)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:219
 msgid "English (UK)"
 msgstr "Inglés (RU)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:220
 msgid "English (UK, Colemak)"
 msgstr "Inglés (RU, Colemark)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
-msgstr "Dvorak (RU, puntuación Dvorak para RU)"
+#: ../rules/base.xml.in.h:221
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Inglés (RU, Dvorak con puntuación para RU)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:222
 msgid "English (UK, Dvorak)"
 msgstr "Inglés (RU, Dvorak)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
-msgstr "Inglés (RU, Mac internacional)"
+#: ../rules/base.xml.in.h:223
+msgid "English (UK, Macintosh international)"
+msgstr "Inglés (RU, Macintosh internacional)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
-msgstr "Inglés (RU, Mac)"
+#: ../rules/base.xml.in.h:224
+msgid "English (UK, Macintosh)"
+msgstr "Inglés (RU, Macintosh)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
-msgstr "Inglés (RU, extendido, con teclas Windows)"
+#: ../rules/base.xml.in.h:225
+msgid "English (UK, extended WinKeys)"
+msgstr "Inglés (RU, extendido con teclas Windows)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, international with dead keys)"
 msgstr "Inglés (RU, internacional con teclas muertas)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
 msgid "English (US)"
 msgstr "Inglés (EE. UU.)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:228
 msgid "English (US, alternative international)"
 msgstr "Inglés (EE. UU. alternativa internacional)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:229
 msgid "English (US, international with dead keys)"
 msgstr "Inglés (EE. UU. internacional con teclas muertas)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:230
 msgid "English (US, with euro on 5)"
 msgstr "Inglés (EE. UU. con euro en el 5)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:231
 msgid "English (classic Dvorak)"
 msgstr "Inglés (Dvorak clásico)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:232
 msgid "English (international AltGr dead keys)"
 msgstr "Inglés (internacional con teclas muertas Alt Gr)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:233
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Inglés (cambio de distribución en la tecla multiplicar/dividir)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:234
 msgid "English (left handed Dvorak)"
 msgstr "Inglés (Dvorak para zurdos)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:235
 msgid "English (programmer Dvorak)"
 msgstr "Inglés (Dvorak de programador)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:236
 msgid "English (right handed Dvorak)"
 msgstr "Inglés (Dvorak para diestros)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:237
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:238
 msgid "Enter on keypad"
 msgstr "Intro en el teclado numérico"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:239
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:240
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Esperanto (Portugal, Nativo)"
+
+#: ../rules/base.xml.in.h:241
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Estonio (punto y coma y comilla desplazadas, obsoleto)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:242
 msgid "Estonian"
 msgstr "Estonio"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:243
 msgid "Estonian (Dvorak)"
 msgstr "Estonio (Dvorak)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:244
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estonio (teclado EE. UU. con letras estonias)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:245
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estonio (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:246
 msgid "Euro on 2"
 msgstr "Euro en el 2"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:247
 msgid "Euro on 4"
 msgstr "Euro en el 4"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:248
 msgid "Euro on 5"
 msgstr "Euro en el 5"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:249
 msgid "Euro on E"
 msgstr "Euro en la E"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:250
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:251
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:252
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:253
 msgid "Faroese"
 msgstr "Faroés"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:254
 msgid "Faroese (eliminate dead keys)"
 msgstr "Faroés (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:255
 msgid "Filipino"
 msgstr "Filipino"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:256
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filipino (Capewell-Dvorak baybayin)"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:257
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filipino (Capewell-Dvorak latino)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:258
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filipino (Capewell-QWERF 2006 baybayin)"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:259
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filipino (Capewell-QWERF 2006 latino)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:260
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filipino (Colemak baybayin)"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Colemak Latin)"
 msgstr "Filipino (Colemak latino)"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:262
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Filipino (Dvorak baybayin)"
+
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filipino (Dvorak latino)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filipino (QWERTY baybayin)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:265
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
-msgstr "Croata (Mac_Croatian)"
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
+msgstr "Finlandés (Macintosh)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:267
 msgid "Finnish (classic)"
 msgstr "Finlandés (clásico)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:268
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finlandés (clásico, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:258
-msgid "Finnish (northern Saami)"
-msgstr "Finlandés (saami del norte)"
-
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:271
 msgid "Four-level key with abstract separators"
 msgstr "Tecla de cuarto nivel con separadores abstractos"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:272
 msgid "Four-level key with comma"
 msgstr "Tecla de cuarto nivel con coma"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:273
 msgid "Four-level key with dot"
 msgstr "Tecla de cuarto nivel con punto"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:274
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Tecla de cuarto nivel con punto, restricción latin-9"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:275
 msgid "Four-level key with momayyez"
 msgstr "Tecla de cuarto nivel con momayyez"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:276
 msgid "French"
 msgstr "Francés"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:277
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Francés (bepo, ergonómico, forma Dvorak)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:278
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Francés (bepo, ergonómico, forma Dvorak, sólo latin-9)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:279
 msgid "French (Breton)"
 msgstr "Francés (bretón)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:280
+msgid "French (Cameroon azerty)"
+msgstr "Francés (azerty de Camerún)"
+
+#: ../rules/base.xml.in.h:281
+msgid "French (Cameroon)"
+msgstr "Francés (Camerún)"
+
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "Francés (Canadá)"
+
+#: ../rules/base.xml.in.h:283
 msgid "French (Canada, Dvorak)"
 msgstr "Francés (Canadá, Dvorak)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:284
 msgid "French (Canada, legacy)"
 msgstr "Francés (Canadá, heredado)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:285
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Francés (República Democrática del Congo)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:286
 msgid "French (Dvorak)"
 msgstr "Francés (Dvorak)"
 
-#: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
-msgstr "Francés (AZERTY tskapo georgiano)"
-
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:287
 msgid "French (Guinea)"
 msgstr "Francés (Guinea)"
 
-#: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
-msgstr "Francés (Mac)"
+#: ../rules/base.xml.in.h:288
+msgid "French (Macintosh)"
+msgstr "Francés (Macintosh)"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:289
 msgid "French (Mali, alternative)"
 msgstr "Francés (Malí, alternativa)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:290
 msgid "French (Morocco)"
 msgstr "Francés (Marruecos)"
 
-#: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
-msgstr "Francés (occitano)"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:291
 msgid "French (Sun dead keys)"
 msgstr "Francés (teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:292
 msgid "French (Switzerland)"
 msgstr "Francés (Suiza)"
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
-msgstr "Francés (Suiza, Mac)"
+#: ../rules/base.xml.in.h:293
+msgid "French (Switzerland, Macintosh)"
+msgstr "Francés (Suiza, Macintosh)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:294
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Francés (Suiza, teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:295
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Francés (Suiza, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:296
 msgid "French (alternative)"
 msgstr "Francés (alternativa)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:297
 msgid "French (alternative, Sun dead keys)"
 msgstr "Francés (alternativa, teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:298
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Francés (alternativa, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:299
 msgid "French (alternative, latin-9 only)"
 msgstr "Francés (alternativa, sólo latin-9)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:300
 msgid "French (eliminate dead keys)"
 msgstr "Francés (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
+#: ../rules/base.xml.in.h:301
+msgid "French (legacy, alternative)"
 msgstr "Francés (heredado, alternativa)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:302
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Francés (heredado, alternativa, teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:303
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Francés (heredado, alternativa, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:304
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Portátil Fujitsu-Siemens Computers AMILO"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:305
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:295
-msgid "GBr"
-msgstr "GBr"
-
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:306
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:307
 msgid "Generic 101-key PC"
 msgstr "PC genérico 101 teclas"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:308
 msgid "Generic 102-key (Intl) PC"
 msgstr "PC genérico 102 teclas (intl)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:309
 msgid "Generic 104-key PC"
 msgstr "PC genérico 104 teclas"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:310
 msgid "Generic 105-key (Intl) PC"
 msgstr "PC genérico 105 teclas (intl)"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:311
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:312
 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:303
+#: ../rules/base.xml.in.h:313
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:314
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:315
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:316
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:317
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Georgiano (Francia, AZERTY tskapo)"
+
+#: ../rules/base.xml.in.h:318
+msgid "Georgian (Italy)"
+msgstr "Georgiano (Italia)"
+
+#: ../rules/base.xml.in.h:319
 msgid "Georgian (MESS)"
 msgstr "Georgiano (MESS)"
 
-#: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
-msgstr "Georgiano (osetio)"
-
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:320
 msgid "Georgian (ergonomic)"
 msgstr "Georgiano (ergonómico)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:321
 msgid "German"
 msgstr "Alemán"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:322
 msgid "German (Austria)"
 msgstr "Alemán (Austria)"
 
-#: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
-msgstr "Alemán (Austria, Mac)"
+#: ../rules/base.xml.in.h:323
+msgid "German (Austria, Macintosh)"
+msgstr "Alemán (Austria, Macintosh)"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:324
 msgid "German (Austria, Sun dead keys)"
 msgstr "Alemán (Austria, teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:325
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Alemán (Austria, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:326
 msgid "German (Dvorak)"
 msgstr "Alemán (Dvorak)"
 
-#: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
-msgstr "Alemán (Mac)"
+#: ../rules/base.xml.in.h:327
+msgid "German (Macintosh)"
+msgstr "Alemán (Macintosh)"
 
-#: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
-msgstr "Alemán (Mac, eliminar teclas muertas)"
+#: ../rules/base.xml.in.h:328
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Alemán (Macintosh, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:329
 msgid "German (Neo 2)"
 msgstr "Alemán (Neo 2)"
 
-#: ../rules/base.xml.in.h:319
-msgid "German (Romanian keyboard with German letters)"
-msgstr "Alemán (teclado rumano con letras alemanas)"
-
-#: ../rules/base.xml.in.h:320
-msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
-msgstr "Alemán (teclado rumano con teclas alemanas, eliminar teclas muertas)"
-
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:330
 msgid "German (Sun dead keys)"
 msgstr "Alemán (teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
-msgstr "Alemán (Suiza, Mac)"
+#: ../rules/base.xml.in.h:331
+msgid "German (Switzerland)"
+msgstr "Alemán (Suiza)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
+msgstr "Alemán (Suiza, Macintosh)"
+
+#: ../rules/base.xml.in.h:333
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Alemán (Suiza, teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:334
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Alemán (Suiza, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:335
+msgid "German (Switzerland, legacy)"
+msgstr "Alemán (Suiza, heredado)"
+
+#: ../rules/base.xml.in.h:336
 msgid "German (dead acute)"
 msgstr "Alemán (acento muerto)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:337
 msgid "German (dead grave acute)"
 msgstr "Alemán (acento grave muerto)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:338
 msgid "German (eliminate dead keys)"
 msgstr "Alemán (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
-msgstr "Alemán (bajo sorbio qwertz)"
-
-#: ../rules/base.xml.in.h:329
-msgid "German (lower Sorbian)"
-msgstr "Alemán (bajo sorbio)"
-
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:339
 msgid "German (qwerty)"
 msgstr "Alemán (qwerty)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:340
 msgid "Greek"
 msgstr "Griego"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:341
 msgid "Greek (eliminate dead keys)"
 msgstr "Griego (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:342
 msgid "Greek (extended)"
 msgstr "Griego (extendido)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:343
 msgid "Greek (polytonic)"
 msgstr "Griego (politónico)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:344
 msgid "Greek (simple)"
 msgstr "Griego (simple)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:345
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:346
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:347
 msgid "HTC Dream"
 msgstr "HTC Dream"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:348
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:349
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking Keyboard para Mac"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:350
 msgid "Hausa"
 msgstr "Hausa"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:351
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../rules/base.xml.in.h:343
-msgid "Hebrew (Phonetic)"
-msgstr "Hebreo (fonético)"
-
-#: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
-msgstr "Hebreo (tiro)"
+#: ../rules/base.xml.in.h:352
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Hebreo (bíblico, tiro)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "Hebrew (lyx)"
 msgstr "Hebreo (lyx)"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
+msgid "Hebrew (phonetic)"
+msgstr "Hebreo (fonético)"
+
+#: ../rules/base.xml.in.h:355
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:356
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard Mini 110 Notebook"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:357
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:367
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:368
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (bolnagri)"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:369
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:370
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:371
 msgid "Htc Dream phone"
 msgstr "Teléfono HTC Dream"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:372
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:373
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Húngaro (101/qwerty/coma/teclas muertas)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:374
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Húngaro (101/qwerty/coma/eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Húngaro (101/qwerty/punto/teclas muertas)"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Húngaro (101/qwerty/punto/eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Húngaro (101/qwertz/coma/teclas muertas)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Húngaro (101/qwertz/coma/eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Húngaro (101/qwertz/punto/teclas muertas)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Húngaro (101/qwertz/punto/eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Húngaro (102/qwerty/coma/teclas muertas)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Húngaro (102/qwerty/coma/eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Húngaro (102/qwerty/punto/teclas muertas)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Húngaro (102/qwerty/punto/eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Húngaro (102/qwertz/coma/teclas muertas)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Húngaro (102/qwertz/coma/eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Húngaro (102/qwertz/punto/teclas muertas)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Húngaro (102/qwertz/punto/eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Húngaro (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (qwerty)"
 msgstr "Húngaro (qwerty)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (standard)"
 msgstr "Húngaro (estándar)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:392
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper está mapeada a las teclas Windows"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:393
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:394
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:395
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:396
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:397
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:398
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:399
 msgid "Icelandic"
 msgstr "Islandés"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:400
 msgid "Icelandic (Dvorak)"
 msgstr "Islandés (Dvorak)"
 
-#: ../rules/base.xml.in.h:392
-msgid "Icelandic (Mac)"
-msgstr "Islandés (Mac)"
+#: ../rules/base.xml.in.h:401
+msgid "Icelandic (Macintosh)"
+msgstr "Islandés (Macintosh)"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islandés (teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islandés (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:404
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:405
 msgid "Indian"
 msgstr "Indio"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:406
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:407
 msgid "Iraqi"
 msgstr "Iraquí"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:408
 msgid "Irish"
 msgstr "Irlandés"
 
-#: ../rules/base.xml.in.h:400
-msgid "Irish (CloGaelach)"
-msgstr "Irlandés (clogaelach)"
-
-#: ../rules/base.xml.in.h:401
-msgid "Irish (Ogham IS434)"
-msgstr "Irlandés (ogham IS434)"
-
-#: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
-msgstr "Irlandés (ogham)"
-
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:409
 msgid "Irish (UnicodeExpert)"
 msgstr "Irlandés (UnicodeExperto)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:410
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
-msgstr "Italiano (georgiano)"
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
-msgstr "Italiano (Mac)"
+#: ../rules/base.xml.in.h:411
+msgid "Italian (Macintosh)"
+msgstr "Italiano (Macintosh)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:412
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Italiano (teclado EE. UU. con letras italianas)"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:413
 msgid "Italian (eliminate dead keys)"
 msgstr "Italiano (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:414
 msgid "Japanese"
 msgstr "Japones"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:415
 msgid "Japanese (Kana 86)"
 msgstr "Japonés (kana 86)"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:416
 msgid "Japanese (Kana)"
 msgstr "Japonés (kana)"
 
-#: ../rules/base.xml.in.h:412
-msgid "Japanese (Mac)"
-msgstr "Japonés (Mac)"
+#: ../rules/base.xml.in.h:417
+msgid "Japanese (Macintosh)"
+msgstr "Japonés (Macintosh)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (OADG 109A)"
 msgstr "Japonés (OADG 109A)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japonés (series PC-98xx)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:420
 msgid "Japanese keyboard options"
 msgstr "Opciones de teclado japonés"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:421
+msgid "Kalmyk"
+msgstr "Calmuco"
+
+#: ../rules/base.xml.in.h:422
 msgid "Kana Lock key is locking"
 msgstr "La tecla Bloq Kana está bloqueando"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:423
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:424
+msgid "Kashubian"
+msgstr "Casubio"
+
+#: ../rules/base.xml.in.h:425
 msgid "Kazakh"
 msgstr "Kazajo"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:426
 msgid "Kazakh (with Russian)"
 msgstr "Kazajo (con ruso)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:427
 msgid "Key sequence to kill the X server"
 msgstr "Secuencia de teclas para matar el servidor X"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:428
 msgid "Key to choose 3rd level"
 msgstr "Tecla para seleccionar el 3er nivel"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:429
 msgid "Key to choose 5th level"
 msgstr "Tecla para seleccionar el 5o nivel"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:430
 msgid "Key(s) to change layout"
 msgstr "Tecla(s) para cambiar la distribución"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:431
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:425
-msgid "Khmer (Cambodian)"
-msgstr "Khmer (camboyano)"
+#: ../rules/base.xml.in.h:432
+msgid "Khmer (Cambodia)"
+msgstr "Khmer (Camboya)"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:433
 msgid "Kikuyu"
 msgstr "kikuyu"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:434
 msgid "Kinesis"
 msgstr "Kinesis"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:435
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:436
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Korean (101/104 key compatible)"
 msgstr "Coreano (101/104 teclas compatible)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurdo (Irán, arábigolatino)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Kurdish (Iran, F)"
 msgstr "Kurdo (Irán, F)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kurdo (Irán, latino Alt-Q)"
+
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurdo (Irán latino Q)"
 
-#: ../rules/base.xml.in.h:433
-msgid "Kurdish (Iran, latin alt-Q)"
-msgstr "Kurdo (latino Alt-Q)"
-
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurdo (Irak, arábigolatino)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurdo (Irak, F)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurdo (Irak, latino Alt-Q)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurdo (Irak, latino Q)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Syria, F)"
 msgstr "Kurdo (Siria, F)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurdo (Siria, latino Alt-Q)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurdo (Siria, latino Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurdo (Turquía, F)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurdo (Turquía, latino Alt-Q)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurdo (Turquía, latino Q)"
 
-#: ../rules/base.xml.in.h:444
-msgid "Kutenai"
-msgstr "Kutenai"
-
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:452
 msgid "Kyrgyz"
 msgstr "Kirguí"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:453
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirguí (fonético)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:454
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:455
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Lao (distribución propuesta STEA estándar)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:456
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:457
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:458
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Laptop/notebook eMachines m68xx"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
 msgid "Latvian"
 msgstr "Letón"
 
-#: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
-msgstr "Letón (variante con apóstrofo «'»)"
-
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:460
 msgid "Latvian (F variant)"
 msgstr "Letón (variante de letra F)"
 
-#: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
-msgstr "Letón (variante virgulilla «~»)"
+#: ../rules/base.xml.in.h:461
+msgid "Latvian (adapted)"
+msgstr "Letón (adaptado)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:462
+msgid "Latvian (apostrophe variant)"
+msgstr "Letón (variante con apóstrofo)"
+
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Letón (ergonómico, ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:464
+msgid "Latvian (modern)"
+msgstr "Letón (moderno)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "Letón (variante virgulilla)"
+
+#: ../rules/base.xml.in.h:466
 msgid "Left Alt"
 msgstr "Alt izquierda"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:467
 msgid "Left Alt (while pressed)"
 msgstr "Alt izquierda (mientras está pulsado)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:468
 msgid "Left Alt is swapped with Left Win"
 msgstr "Alt izquierda está cambiado con Windows izquierda"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:469
 msgid "Left Ctrl"
 msgstr "Ctrl izquierda"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:470
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Ctrl izquierda (a la primera distribución), Ctrl derecha (a la última distribución)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:471
 msgid "Left Ctrl+Left Shift"
 msgstr "Ctrl izquierda + Mayús izquierda"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:472
 msgid "Left Shift"
 msgstr "Mayús izquierda"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:473
 msgid "Left Win"
 msgstr "Win izquierda"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:474
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Win izquierda (a la primera distribución), Win/Menu derecha (a la última distribución)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:475
 msgid "Left Win (while pressed)"
 msgstr "Tecla Windows izquierda (al pulsarla)"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:476
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Win izquierda elige el 5º nivel, bloquea al pulsarse junto con otro selector de 5º nivel"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:477
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Win izquierda elige el 5º nivel, bloquea al pulsarse junto con otro selector de 5º nivel, una pulsación libera el bloqueo"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:478
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Ctrl izquierda + Ctrl derecha (a la primera distribución), Ctrl derecha + Menú (a la segunda distribución)"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:479
 msgid "Legacy"
 msgstr "Heredado"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:480
 msgid "Legacy Wang 724"
 msgstr "Wang 724 heredado"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:482
 msgid "Legacy key with comma"
 msgstr "Tecla heredada con coma"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:483
 msgid "Legacy key with dot"
 msgstr "Tecla heredada con punto"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:485
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Lituano (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:486
 msgid "Lithuanian (LEKP)"
 msgstr "Lituano (LEKP)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:487
 msgid "Lithuanian (LEKPa)"
 msgstr "Lituano (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:488
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Lituano (teclado de EE. UU. con letras lituanas)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (standard)"
 msgstr "Lituano (estándar)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:490
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Access Keyboard"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:491
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:492
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (opción alternativa)"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:493
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro (opción alternativa 2)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:500
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Logitech G15 extra keys via G15daemon"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech, teclado genérico"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Logitech Internet 350 Keyboard"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:504
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Media Elite Keyboard"
 msgstr "Logitech Media Elite Keyboard"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Logitech Ultra-X Keyboard"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:508
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Logitech diNovo Edge Keyboard"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:509
 msgid "Logitech diNovo Keyboard"
 msgstr "Logitech diNovo Keyboard"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:510
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:511
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (modelo Y-RB6)"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:512
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:513
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:514
+msgid "Lower Sorbian"
+msgstr "Bajo sorbio"
+
+#: ../rules/base.xml.in.h:515
+msgid "Lower Sorbian (qwertz)"
+msgstr "Bajo sorbio (qwertz)"
+
+#: ../rules/base.xml.in.h:516
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:517
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Intl)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:518
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:519
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macedonio (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:520
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:521
 msgid "Macintosh Old"
 msgstr "Macintosh antiguo"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:522
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Hacer de Bloq Mayús un Retroceso adicional"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:523
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Hacer de Bloq Mayús un Control adicional pero mantener el símbolo de tecla Caps_Lock"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:524
 msgid "Make Caps Lock an additional Ctrl"
 msgstr "Hacer de Bloq Mayús un Ctrl adicional"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:525
 msgid "Make Caps Lock an additional ESC"
 msgstr "Hacer de Bloq Mayús un Esc adicional"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Hacer de Bloq Mayús un Hyper adicional"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Hacer de Bloq Mayús un Bloq Num adicional"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional Super"
 msgstr "Hacer de Bloq Mayús un Super adicional"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:529
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:530
 msgid "Malayalam (Lalitha)"
 msgstr "Malayalam (lalitha)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:531
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malayam (InScript mejorado con signo de rupia)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:532
 msgid "Maltese"
 msgstr "Maltés"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:533
 msgid "Maltese (with US layout)"
 msgstr "Maltés (con distribución para EE. UU.)"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:534
+msgid "Maori"
+msgstr "Maorí"
+
+#: ../rules/base.xml.in.h:535
+msgid "Mari"
+msgstr "Mari"
+
+#: ../rules/base.xml.in.h:536
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:537
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:538
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:539
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:540
 msgid "Meta is mapped to Left Win"
 msgstr "Meta está mapeada a la tecla Windows izquierda"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:541
 msgid "Meta is mapped to Win keys"
 msgstr "Meta está mapeada a las teclas Windows"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:542
 msgid "Meta on Left Ctrl"
 msgstr "Meta en Ctrl izquierda"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:543
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve Keyboard 2000"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:544
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:545
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, sueco"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural Keyboard Elite"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:550
 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:537
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:553
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:555
 msgid "Miscellaneous compatibility options"
 msgstr "Opciones misceláneas de compatiblidad"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:556
 msgid "Mongolian"
 msgstr "Mongol"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:557
 msgid "Montenegrin"
 msgstr "Montenegrino"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:558
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrino (cirílico con guillemots)"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:559
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrino (cirílico)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrino (cirílico, Z y ZHE intercambiados)"
 
-#: ../rules/base.xml.in.h:547
-msgid "Montenegrin (Latin qwerty)"
-msgstr "Montenegrino (latino qwerty)"
-
-#: ../rules/base.xml.in.h:548
-msgid "Montenegrin (Latin unicode qwerty)"
+#: ../rules/base.xml.in.h:561
+msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Montenegrino (latino Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
+#: ../rules/base.xml.in.h:562
+msgid "Montenegrin (Latin Unicode)"
 msgstr "Montenegrino (latino Unicode)"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:563
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Montenegrino (latino qwerty)"
+
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrino (latino con guillemots)"
 
-#: ../rules/base.xml.in.h:551
-msgid "Māori"
-msgstr "Maorí"
-
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:565
 msgid "NICOLA-F style Backspace"
 msgstr "Retroceso estilo NICOLA-F"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:566
 msgid "Nepali"
 msgstr "Nepalí"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:567
 msgid "Non-breakable space character at fourth level"
 msgstr "Carácter de espacio no separable en el cuarto nivel"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:568
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Carácter de espacio no separable en el cuarto nivel, carácter de espacio estrecho no separable en el sexto nivel"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:569
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Carácter de espacio no separable en el cuarto nivel, carácter de espacio estrecho no separable en el sexto nivel (a través de Ctrl+Mayús)"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at second level"
 msgstr "Carácter de espacio no separable en el segundo nivel"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at third level"
 msgstr "Carácter de espacio no separable en el tercer nivel"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:572
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Carácter de espacio no separable en el tercer nivel, nada en el cuarto nivel"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Carácter de espacio no separable en el tercer nivel, carácter de espacio estrecho no separable en el cuarto nivel"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:574
+msgid "Northern Saami (Finland)"
+msgstr "Lapón del norte (Finlandia)"
+
+#: ../rules/base.xml.in.h:575
+msgid "Northern Saami (Norway)"
+msgstr "Lapón del norte (Noruega)"
+
+#: ../rules/base.xml.in.h:576
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Lapón del norte (Noruego, eliminar teclas muertas)"
+
+#: ../rules/base.xml.in.h:577
+msgid "Northern Saami (Sweden)"
+msgstr "Lapón del norte (Suecia)"
+
+#: ../rules/base.xml.in.h:578
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:579
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:580
 msgid "Norwegian (Dvorak)"
 msgstr "Noruego (Dvorak)"
 
-#: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
-msgstr "Noruego (Mac)"
-
-#: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
-msgstr "Noruego (Mac, eliminar teclas muertas)"
+#: ../rules/base.xml.in.h:581
+msgid "Norwegian (Macintosh)"
+msgstr "Noruego (Macintosh)"
 
-#: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
-msgstr "Noruego (saami del norte)"
+#: ../rules/base.xml.in.h:582
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Noruego (Macintosh, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Noruego (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:568
-msgid "Norwegian (northern Saami, eliminate dead keys)"
-msgstr "Noruego (saami del norte, eliminar teclas muertas)"
-
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:584
 msgid "Num Lock"
 msgstr "Bloq Num"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:585
 msgid "Numeric keypad delete key behaviour"
 msgstr "Comportamiento de la tecla Supr del teclado numérico"
 
-#: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
-msgstr "Las teclas del teclado numérico funcionan como en un Mac"
+#: ../rules/base.xml.in.h:586
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "Las teclas del teclado numérico funcionan como en un Macintosh"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:587
 msgid "Numeric keypad layout selection"
 msgstr "Selección de distribución de teclado numérico"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:588
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:589
+msgid "Occitan"
+msgstr "Occitano"
+
+#: ../rules/base.xml.in.h:590
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:591
+msgid "Ogham (IS434)"
+msgstr "Ogam (IS434)"
+
+#: ../rules/base.xml.in.h:592
 msgid "Oriya"
 msgstr "Oriya"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:593
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Teclado Oretec MCK-800 MM/Internet"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:594
+msgid "Ossetian (Georgia)"
+msgstr "Osetio (Georgia)"
+
+#: ../rules/base.xml.in.h:595
+msgid "Ossetian (WinKeys)"
+msgstr "Osetio (teclas Windows)"
+
+#: ../rules/base.xml.in.h:596
+msgid "Ossetian (legacy)"
+msgstr "Osetio (heredado)"
+
+#: ../rules/base.xml.in.h:597
 msgid "PC-98xx Series"
 msgstr "PC-98xx Series"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:598
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Rusino de Panonia (homofónico)"
+
+#: ../rules/base.xml.in.h:599
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:600
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Pashto (Afganistán, OLPC)"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:601
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
 msgid "Persian"
 msgstr "Persa"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:603
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persa (Afganistán, OLPC dari)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:604
 msgid "Persian (with Persian Keypad)"
 msgstr "Persa (con teclado persa)"
 
-#: ../rules/base.xml.in.h:583
-msgid "Philippines - Dvorak (Baybayin)"
-msgstr "Filipinas: Dvorak (baybayin)"
-
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:606
 msgid "Polish (Dvorak)"
 msgstr "Polaco (Dvorak)"
 
-#: ../rules/base.xml.in.h:586
-msgid "Polish (Dvorak, polish quotes on key 1)"
+#: ../rules/base.xml.in.h:607
+msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Polaco (Dvorak, comillas polacas en la tecla 1)"
 
-#: ../rules/base.xml.in.h:587
-msgid "Polish (Dvorak, polish quotes on quotemark key)"
+#: ../rules/base.xml.in.h:608
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Polaco (Dvorak, comillas polacas en la tecla de comillas)"
 
-#: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
-msgstr "Polaco (casubio)"
-
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:609
 msgid "Polish (programmer Dvorak)"
 msgstr "Polaco (Dvorak de programador)"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:610
 msgid "Polish (qwertz)"
 msgstr "Polaco (qwertz)"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:611
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:612
 msgid "Portuguese (Brazil)"
 msgstr "Portugués (Brasil)"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:613
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugués (Brasil, Dvorak)"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugués (Brasil, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugués (Brasil, nativo para esperanto)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugués (Brasil, nativo para teclados de EE. UU.)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugués (Brasil, nativo)"
 
-#: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
-msgstr "Portugués (Mac)"
-
-#: ../rules/base.xml.in.h:599
-msgid "Portuguese (Mac, Sun dead keys)"
-msgstr "Portugués (Mac, teclas muertas de Sun)"
+#: ../rules/base.xml.in.h:618
+msgid "Portuguese (Macintosh)"
+msgstr "Portugués (Macintosh)"
 
-#: ../rules/base.xml.in.h:600
-msgid "Portuguese (Mac, eliminate dead keys)"
-msgstr "Portugués (Mac, eliminar teclas muertas)"
+#: ../rules/base.xml.in.h:619
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portugués (Macintosh, teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr "Portugués (nativo para esperanto)"
+#: ../rules/base.xml.in.h:620
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Portugués (Macintosh, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugués (nativo para teclados de EE. UU.)"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Nativo)"
 msgstr "Portugués (nativo)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugués (teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugués (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:625
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:626
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:627
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Panyabí (gurmukhi jhelum)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:628
 msgid "Punjabi (Gurmukhi)"
 msgstr "Panyabí (gurmukhi)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:629
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:630
 msgid "Right Alt"
 msgstr "Alt derecho"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:631
 msgid "Right Alt (while pressed)"
 msgstr "Alt derecho (mientras está pulsado)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:632
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Alt derecho elige el 5º nivel y activa el bloqueo de 5º nivel al pulsarse junto con otro selector de 5º nivel, una pulsación libera el bloqueo"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Alt derecha elige el 5º nivel, bloquea al pulsarse junto con otro selector de 5º nivel"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Alt derecha elige el 5º nivel, bloquea al pulsarse junto con otro selector de 5º nivel, una pulsación libera el bloqueo"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:635
 msgid "Right Alt key never chooses 3rd level"
 msgstr "La tecla Alt derecha nunca elige el 3er nivel"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "La tecla Alt derecha, Mayús+Alt derecha es tecla Multi"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:637
 msgid "Right Ctrl"
 msgstr "Ctrl derecho"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:638
 msgid "Right Ctrl (while pressed)"
 msgstr "Ctrl derecho (mientras está pulsado)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:639
 msgid "Right Ctrl as Right Alt"
 msgstr "Ctrl derecho como Alt derecho"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:640
 msgid "Right Ctrl is mapped to Menu"
 msgstr "Ctrl derecho está mapeada a la tecla Menú"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl+Right Shift"
 msgstr "Ctrl derecho + Mayús derecho"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:642
 msgid "Right Shift"
 msgstr "Mayús derecho"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:643
 msgid "Right Win"
 msgstr "Windows derecho"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:644
 msgid "Right Win (while pressed)"
 msgstr "La tecla Windows (mientras está pulsada)"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:645
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Win derecha elige el 5º nivel, bloquea al pulsarse junto con otro selector de 5º nivel"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:646
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Win derecha elige el 5º nivel, bloquea al pulsarse junto con otro selector de 5º nivel, una pulsación libera el bloqueo"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr "Rumano (Dobruca-1 Q del tártaro de Crimea)"
-
-#: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr "Rumano (Dobruca-2 Q del tártaro de Crimea)"
-
-#: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Rumano (Alt-Q turca del tártaro de Crimea)"
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (Germany)"
+msgstr "Rumano (Alemania)"
 
-#: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
-msgstr "Rumano (F turca del tártaro de Crimea)"
+#: ../rules/base.xml.in.h:649
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Rumano (Alemania, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:650
 msgid "Romanian (WinKeys)"
 msgstr "Rumano (teclas Windows)"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (cedilla)"
 msgstr "Rumano (cedilla)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (standard cedilla)"
 msgstr "Rumano (cedilla estándar)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (standard)"
 msgstr "Rumano (estándar)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:654
 msgid "Rupee on 4"
 msgstr "Rupia en el 4"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../rules/base.xml.in.h:639
-msgid "Russian (Bashkirian)"
-msgstr "Ruso (bashkiriano)"
-
-#: ../rules/base.xml.in.h:640
-msgid "Russian (Chuvash Latin)"
-msgstr "Ruso (chuvash latino)"
-
-#: ../rules/base.xml.in.h:641
-msgid "Russian (Chuvash)"
-msgstr "Ruso (chuvash)"
-
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:656
 msgid "Russian (DOS)"
 msgstr "Ruso (DOS)"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:657
 msgid "Russian (Georgia)"
 msgstr "Ruso (Georgia)"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:658
 msgid "Russian (Germany, phonetic)"
 msgstr "Ruso (Alemania, fonético)"
 
-#: ../rules/base.xml.in.h:645
-msgid "Russian (Kalmyk)"
-msgstr "Ruso (calmuco)"
-
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:659
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Ruso (Kazajstán, con kazajo)"
 
-#: ../rules/base.xml.in.h:647
-msgid "Russian (Komi)"
-msgstr "Ruso (komi)"
-
-#: ../rules/base.xml.in.h:648
-msgid "Russian (Mari)"
-msgstr "Ruso (mari)"
-
-#: ../rules/base.xml.in.h:649
-msgid "Russian (Ossetian, WinKeys)"
-msgstr "Ruso (osetio, teclas Windows)"
-
-#: ../rules/base.xml.in.h:650
-msgid "Russian (Ossetian, legacy)"
-msgstr "Ruso (osetio, heredado)"
-
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Ruso (Polonia, Dvorak fonético)"
 
-#: ../rules/base.xml.in.h:652
-msgid "Russian (Serbian)"
-msgstr "Ruso (serbio)"
-
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Sweden, phonetic)"
 msgstr "Ruso (sueco, fonético)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Ruso (sueco, fonético, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:655
-msgid "Russian (Tatar)"
-msgstr "Ruso (tártaro)"
-
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:663
 msgid "Russian (US, phonetic)"
 msgstr "Ruso (EE. UU., fonético)"
 
-#: ../rules/base.xml.in.h:657
-msgid "Russian (Udmurt)"
-msgstr "Ruso (urdmurto)"
-
-#: ../rules/base.xml.in.h:658
-msgid "Russian (Yakut)"
-msgstr "Ruso (yakuto)"
+#: ../rules/base.xml.in.h:664
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Ruso (ucraniano estándar RSTU)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:665
 msgid "Russian (legacy)"
 msgstr "Ruso (heredado)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:666
 msgid "Russian (phonetic WinKeys)"
 msgstr "Ruso (fonético con teclas Windows)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:667
 msgid "Russian (phonetic)"
 msgstr "Ruso (fonético)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:668
 msgid "Russian (typewriter)"
 msgstr "Ruso (máquina de escribir)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:669
 msgid "Russian (typewriter, legacy)"
 msgstr "Ruso (máquina de escribir, heredado)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:670
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:671
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:672
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:673
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:674
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:675
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:676
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:677
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Taiwán)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:678
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:679
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:680
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:681
 msgid "Scroll Lock"
 msgstr "Bloq Despl"
 
-#: ../rules/base.xml.in.h:676
-msgid "Secwepemctsin"
-msgstr "Shuswap"
-
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:682
 msgid "Semi-colon on third level"
 msgstr "Punto y coma en tercer nivel"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbio (latino Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbio (latino Unicode)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:686
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbio (latino qwerty)"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbio (latino con guillemots)"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin)"
 msgstr "Serbio (latino)"
 
-#: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr "Serbio (rusino de Panonia homofónico)"
+#: ../rules/base.xml.in.h:689
+msgid "Serbian (Russia)"
+msgstr "Serbio (Rusia)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Serbio (Z y ZHE intercambiados)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (with guillemets)"
 msgstr "Serbio (con guillemots)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:692
 msgid "Serbo-Croatian (US)"
 msgstr "Serbocroata (EE. UU.)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:693
 msgid "Shift cancels Caps Lock"
 msgstr "Mayús cancela Bloq Mayús"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:694
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Mayús no cancela Bloq Num, en su lugar elije el 3er nivel"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:695
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Mayús con las teclas del teclado numérico funcionan como en MS Windows"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:696
 msgid "Shift+Caps Lock"
 msgstr "Mayús+Bloq Mayús"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:697
 msgid "Sindhi"
 msgstr "Sindhi"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:698
 msgid "Sinhala"
 msgstr "Sinhala"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:699
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:700
 msgid "Slovak (extended Backslash)"
 msgstr "Eslovaco (contrabarra extendida)"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:701
 msgid "Slovak (qwerty)"
 msgstr "Eslovaco (qwerty)"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:702
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Eslovaco (qwerty, contrabarra extendida)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Slovene"
+#: ../rules/base.xml.in.h:703
+msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../rules/base.xml.in.h:699
-msgid "Slovene (US keyboard with Slovenian letters)"
+#: ../rules/base.xml.in.h:704
+msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Esloveno (teclado EE. UU. con letras eslovenas)"
 
-#: ../rules/base.xml.in.h:700
-msgid "Slovene (use guillemets for quotes)"
+#: ../rules/base.xml.in.h:705
+msgid "Slovenian (use guillemets for quotes)"
 msgstr "Esloveno (usar guillemots para comillas)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:706
 msgid "Spanish"
 msgstr "Español"
 
-#: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr "Español (variante asturiana con H de medio punto y L de medio punto)"
-
-#: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr "Español (variante catalana con L de medio punto)"
-
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Spanish (Dvorak)"
 msgstr "Español (Dvorak)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Spanish (Latin American)"
 msgstr "Español (latinoamericano)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Español (latinoamericano, teclas muertas de Sun)"
+
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Español (latinoamericano, eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Español (latinoamericano, incluir tilde muerta)"
 
-#: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, sun dead keys)"
-msgstr "Español (latinoamericano, teclas muertas de Sun)"
-
-#: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
-msgstr "Español (Mac)"
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Macintosh)"
+msgstr "Español (Macintosh)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Sun dead keys)"
 msgstr "Español (teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (eliminate dead keys)"
 msgstr "Español (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (include dead tilde)"
 msgstr "Español (incluir tilde muerta)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Teclas especiales (Ctrl+Alt+«tecla») manipuladas en un servidor"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Sun Type 5/6"
 msgstr "Sun tipo 5/6"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 msgid "Swahili (Kenya)"
 msgstr "Swahili (Kenia)"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Swahili (Tanzania)"
 msgstr "Swahili (Tanzania)"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Intercambiar Ctrl y Bloq Mayús"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swap ESC and Caps Lock"
 msgstr "Intercambiar ESC y Bloq Mayús"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swedish (Dvorak)"
 msgstr "Sueco (Dvorak)"
 
-#: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
-msgstr "Sueco (Mac)"
+#: ../rules/base.xml.in.h:725
+msgid "Swedish (Macintosh)"
+msgstr "Sueco (Macintosh)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish (Svdvorak)"
 msgstr "Sueco (Svdvorak)"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (eliminate dead keys)"
 msgstr "Sueco (eliminar teclas muertas)"
 
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
-msgstr "Sueco (Saami del norte)"
-
-#: ../rules/base.xml.in.h:726
-msgid "Swiss"
-msgstr "Suizo"
-
-#: ../rules/base.xml.in.h:727
-msgid "Swiss (legacy)"
-msgstr "Suizo (heredado)"
-
 #: ../rules/base.xml.in.h:728
+msgid "Swedish Sign Language"
+msgstr "Lenguaje de signos sueco"
+
+#: ../rules/base.xml.in.h:729
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:730
 msgid "Syriac"
 msgstr "Sirio"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:731
 msgid "Syriac (phonetic)"
 msgstr "Sirio (fonético)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:732
 msgid "Taiwanese"
 msgstr "Taiwanés"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:733
 msgid "Taiwanese (indigenous)"
 msgstr "Taiwanés (autóctono)"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:734
 msgid "Tajik"
 msgstr "Tajico"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:735
 msgid "Tajik (legacy)"
 msgstr "Tajico (heredado)"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:736
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:737
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamil (Sri Lanka, máquina de escribir TAB)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:738
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamil (Sri Lanka, Unicode)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:739
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamil (máquina de escribir TAB)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamil (máquina de escribir TSCII)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Unicode)"
 msgstr "Tamil (Unicode)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamil (teclado con números)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:743
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:744
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../rules/base.xml.in.h:745
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
 msgid "Thai"
 msgstr "Tailandés"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Tailandés (Pattachote)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
 msgid "Thai (TIS-820.2538)"
 msgstr "Tailandés (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
+msgid "Tibetan"
+msgstr "Tibetano"
+
+#: ../rules/base.xml.in.h:750
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetano (con numerales ASCII)"
+
+#: ../rules/base.xml.in.h:751
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "A la tecla correspondiente en un teclado Dvorak."
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:752
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "A la tecla correspondiente en un teclado Qwerty."
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:753
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Cambiar las teclas de flechas con Mayús + Bloq Num"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:754
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:755
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:756
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:757
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:758
 msgid "Tswana"
 msgstr "Tswana"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:759
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:760
 msgid "Turkish (Alt-Q)"
 msgstr "Turco (Alt-Q)"
 
-#: ../rules/base.xml.in.h:757
-msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
-msgstr "Turco (Alt-Q turca del tártaro de Crimea)"
-
-#: ../rules/base.xml.in.h:758
-msgid "Turkish (Crimean Tatar Turkish F)"
-msgstr "Turco (F turca del tártaro de Crimea)"
-
-#: ../rules/base.xml.in.h:759
-msgid "Turkish (Crimean Tatar Turkish Q)"
-msgstr "Turco (Q turca del tártaro de Crimea)"
-
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:761
 msgid "Turkish (F)"
 msgstr "Turco (F)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:762
 msgid "Turkish (Sun dead keys)"
 msgstr "Turco (teclas muertas de Sun)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (international with dead keys)"
 msgstr "Turco (internacional con teclas muertas)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:764
 msgid "Turkmen"
 msgstr "Turkmenistano"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:765
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmenistano (Alt-Q)"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:766
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:767
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:768
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:modo EU)"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (106:modo JP)"
 
-#: ../rules/base.xml.in.h:770
-msgid "Ukrainian"
-msgstr "Ucraniano"
-
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Ucraniano (Alt-Q turca del tártaro de Crimea)"
+msgid "Udmurt"
+msgstr "Udmurto"
 
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "Ucraniano (F turca del tártaro de Crimea)"
+msgid "Ukrainian"
+msgstr "Ucraniano"
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "Ucraniano (Q turca del tártaro de Crimea)"
-
-#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (WinKeys)"
 msgstr "Ucraniano (teclas Windows)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (homophonic)"
 msgstr "Ucraniano (homofónico)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (legacy)"
 msgstr "Ucraniano (heredado)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (phonetic)"
 msgstr "Ucraniano (fonético)"
 
-#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr "Ucraniano (estándar RSTU con distribución rusa)"
-
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ucraniano (estándar RSTU)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (typewriter)"
 msgstr "Ucraniano (máquina de escribir)"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:779
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Adiciones Unicode (flechas y operadores matemáticos)"
 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:780
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Adiciones Unicode (flechas y operadores matemáticos); operadores matemáticos en el nivel predeterminado"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:781
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:782
 msgid "Urdu (Pakistan)"
 msgstr "Urdu (Pakistán)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:783
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakistán, CRULP)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:784
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakistán, NLA)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (teclas Windows)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (fonético alternativo)"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (phonetic)"
 msgstr "Urdu (fonético)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:788
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Usar LED del teclado para mostrar la distribución alternativa"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:789
 msgid "Using space key to input non-breakable space character"
 msgstr "Usando la tecla espacio para introducir un carácter de espacio no separable"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:790
 msgid "Usual space at any level"
 msgstr "Espacio usual en cualquier nivel"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "Uigur"
+
+#: ../rules/base.xml.in.h:792
 msgid "Uzbek"
 msgstr "Uzbeco"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:793
 msgid "Uzbek (Afghanistan)"
 msgstr "Uzbeco (Afganistán)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:794
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Uzbeco (Afganistán, OLPC)"
 
-#: ../rules/base.xml.in.h:796
-msgid "Uzbek (Crimean Tatar Turkish Alt-Q)"
-msgstr "Uzbeco (Alt-Q turca del tártaro de Crimea)"
-
-#: ../rules/base.xml.in.h:797
-msgid "Uzbek (Crimean Tatar Turkish F)"
-msgstr "Uzbeco (F turca del tártaro de Crimea)"
-
-#: ../rules/base.xml.in.h:798
-msgid "Uzbek (Crimean Tatar Turkish Q)"
-msgstr "Uzbeco (Q turca del tártaro de Crimea)"
-
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek (Latin)"
 msgstr "Uzbeco (latino)"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:796
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:797
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "Teclado para internet ViewSonic KU-306"
 
-#: ../rules/base.xml.in.h:802
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+#: ../rules/base.xml.in.h:798
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Teclado numérico Wang 724 con adiciones Unicode (flechas y operadores matemáticos)"
 
-#: ../rules/base.xml.in.h:803
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+#: ../rules/base.xml.in.h:799
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Teclado numérico Wang 724 con adiciones Unicode (flechas y operadores matemáticos); operadores matemáticos en el nivel predeterminado"
 
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:800
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:801
 msgid "Wolof"
 msgstr "Wolof"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:802
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:803
+msgid "Yakut"
+msgstr "Yakuto"
+
+#: ../rules/base.xml.in.h:804
 msgid "Yoruba"
 msgstr "Yoruba"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:805
 msgid "Zero-width non-joiner character at second level"
 msgstr "Carácer de espacio irrompible de anchura cero («ZWNJ») en el segundo nivel"
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:806
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Carácer de espacio irrompible de anchura cero («ZWNJ») en el segundo nivel, carácter de espacio no separable en el tercer nivel"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:807
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Carácer de espacio irrompible de anchura cero («ZWNJ») en el segundo nivel, carácter de espacio no separable en el tercer nivel, nada en el cuarto nivel"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Carácer de espacio irrompible de anchura cero («ZWNJ») en el segundo nivel, carácter de espacio no separable en el tercer nivel, espacio estrecho no separable en el cuarto nivel"
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:809
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Carácer de espacio irrompible de anchura cero («ZWNJ») en el segundo nivel, carácter de espacio no separable en el tercer nivel, espacio de anchura cero rompible («ZWJ») en el cuarto nivel"
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:810
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Carácer de espacio irrompible de anchura cero («ZWNJ») en el segundo nivel, carácter de espacio de anchura cero rompible («ZWJ») en el tercer nivel"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:811
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Carácer de espacio irrompible de anchura cero («ZWNJ») en el segundo nivel, carácter de espacio de anchura cero rompible («ZWJ») en el tercer nivel, caracter de espacio no separable en el cuarto nivel"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:812
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Carácer de espacio irrompible de anchura cero («ZWNJ») en el tercer nivel, carácter de anchura cero rompible («ZWJ») en el cuarto nivel"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:813
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:814
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:815
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:816
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:817
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:818
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:819
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:820
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:821
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:822
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:823
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:824
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:825
 msgid "ca"
 msgstr "ca"
 
-#: ../rules/base.xml.in.h:829
-msgid "che"
-msgstr "che"
-
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:826
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:827
+msgid "cm"
+msgstr "cm"
+
+#: ../rules/base.xml.in.h:828
+msgid "crh"
+msgstr "crh"
+
+#: ../rules/base.xml.in.h:829
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:830
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:831
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:832
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:833
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:834
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:836
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:837
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:838
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:840
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:841
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:842
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:844
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:845
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:846
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:847
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:848
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:849
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:850
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:851
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:853
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:854
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:855
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:856
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:859
-msgid "irq"
-msgstr "irq"
-
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:857
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:858
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:859
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:860
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:861
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:862
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:863
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:864
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:865
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:866
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:870
-msgid "kut"
-msgstr "kut"
-
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:867
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:870
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:871
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:872
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:873
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:874
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:875
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:876
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:877
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:878
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:879
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:880
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:881
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:883
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:884
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:887
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:892
-msgid "shs"
-msgstr "shs"
-
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:888
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:889
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:890
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:891
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:898
-msgid "srp"
-msgstr "srp"
-
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:893
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:894
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:895
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:896
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:897
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:898
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:899
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:900
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:901
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:902
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:909
-msgid "twn"
-msgstr "twn"
-
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:903
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:904
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:905
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:906
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:907
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:908
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:909
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:910
 msgid "zh"
 msgstr "zh"
 
 #: ../rules/base.extras.xml.in.h:1
-msgid "APL"
-msgstr "APL"
-
-#: ../rules/base.extras.xml.in.h:2
-msgid "Iran"
-msgstr "Irán"
-
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr "Irán: avéstico"
+msgid "APL Keyboard Symbols"
+msgstr "Símbolos de teclado APL"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "Lituania"
+msgid "Atsina"
+msgstr "Atsina"
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
-msgstr "Lituania: Dvorak"
+msgid "Avestan"
+msgstr "Avéstico"
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "Ltu"
-
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "Rumanía"
+msgid "Couer D'alene Salish"
+msgstr "Coeur d’Alene salish"
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr "Rumanía: tipo de pulsación ergonómica"
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Inglés (EE. UU., internacional combinando AltGr Unicode)"
 
 #: ../rules/base.extras.xml.in.h:9
-msgid "Rou"
-msgstr "Rou"
-
-#: ../rules/base.extras.xml.in.h:10
-msgid "Rus"
-msgstr "Rus"
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "Inglés (EE. UU., internacional combinando AltGr Unicode, alternativa)"
 
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "Rusia"
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
-msgstr "Serbia"
+msgid "Kutenai"
+msgstr "Kutenai"
 
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
-msgstr "Serbia: combinar tildes en lugar de teclas muertas"
+msgid "Latvian (US Colemak)"
+msgstr "Letón (Colemark RU)"
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
-msgstr "Srb"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Letón (Colemark de RU, variante con apóstrofo)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "EE. UU."
+msgid "Latvian (US Dvorak)"
+msgstr "Letón (Dvorak de EE. UU.)"
 
 #: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
-msgstr "EE. UU.: Atsina"
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Letón (Dvorak de EE. UU., variante Y)"
 
 #: ../rules/base.extras.xml.in.h:17
-msgid "USA - Couer D'alene Salish"
-msgstr "EE. UU.: Coeur d’Alene salish"
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr "Letón (Dvorak de EE. UU., variante menos)"
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
-msgstr "EE. UU.: internacional (combinando AltGr Unicode)"
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Letón (programador, Dvorak de EE. UU.)"
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
-msgstr "EE. UU.: internacional (combinando AltGr Unicode, alternativa)"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Letón (programador, Dvorak de EE. UU., variante Y)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Letón (programador, Dvorak de EE. UU., variante menos)"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Lituano (Dvorak de EE. UU. con letras lituanas)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "Polaco (internacional con teclas muertas)"
+
+#: ../rules/base.extras.xml.in.h:27
+msgid "Romanian (ergonomic Touchtype)"
+msgstr "Rumanía (tipo de pulsación ergonómica)"
+
+#: ../rules/base.extras.xml.in.h:29
+msgid "Russian (with UKR and BEL layout)"
+msgstr "Ruso (con distribución ucraniana y bielorrusa)"
+
+#: ../rules/base.extras.xml.in.h:30
+msgid "Secwepemctsin"
+msgstr "Shuswap"
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "Serbio (combinar tildes en lugar de teclas muertas)"
+
+#: ../rules/base.extras.xml.in.h:33
+msgid "apl"
+msgstr "apl"
+
+#: ../rules/base.extras.xml.in.h:38
+msgid "kut"
+msgstr "kut"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "shs"
+msgstr "shs"
+
+#~ msgid "Afg"
+#~ msgstr "Afg"
+
+#~ msgid "Chinese (Tibetan)"
+#~ msgstr "Chino (tibetano)"
+
+#~ msgid "Chinese (Uyghur)"
+#~ msgstr "Chino (uyghur)"
+
+#~ msgid "Danish (Mac)"
+#~ msgstr "Danés (Mac)"
+
+#~ msgid "English (UK, Mac)"
+#~ msgstr "Inglés (RU, Mac)"
+
+#~ msgid "Finnish (Mac)"
+#~ msgstr "Croata (Mac_Croatian)"
+
+#~ msgid "Finnish (northern Saami)"
+#~ msgstr "Finlandés (saami del norte)"
+
+#~ msgid "French (Occitan)"
+#~ msgstr "Francés (occitano)"
+
+#~ msgid "GBr"
+#~ msgstr "GBr"
+
+#~ msgid "German (Romanian keyboard with German letters)"
+#~ msgstr "Alemán (teclado rumano con letras alemanas)"
+
+#~ msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
+#~ msgstr "Alemán (teclado rumano con teclas alemanas, eliminar teclas muertas)"
+
+#~ msgid "Irish (Ogham)"
+#~ msgstr "Irlandés (ogham)"
+
+#~ msgid "Italian (Georgian)"
+#~ msgstr "Italiano (georgiano)"
+
+#~ msgid "Kurdish (Iran, latin alt-Q)"
+#~ msgstr "Kurdo (latino Alt-Q)"
+
+#~ msgid "Māori"
+#~ msgstr "Maorí"
+
+#~ msgid "Norwegian (Northern Saami"
+#~ msgstr "Noruego (saami del norte)"
+
+#~ msgid "Philippines - Dvorak (Baybayin)"
+#~ msgstr "Filipinas: Dvorak (baybayin)"
+
+#~ msgid "Portuguese (Nativo for Esperanto)"
+#~ msgstr "Portugués (nativo para esperanto)"
+
+#~ msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
+#~ msgstr "Rumano (Dobruca-2 Q del tártaro de Crimea)"
+
+#~ msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Rumano (Alt-Q turca del tártaro de Crimea)"
+
+#~ msgid "Romanian (Crimean Tatar Turkish F)"
+#~ msgstr "Rumano (F turca del tártaro de Crimea)"
+
+#~ msgid "Russian (Chuvash)"
+#~ msgstr "Ruso (chuvash)"
+
+#~ msgid "Russian (Kalmyk)"
+#~ msgstr "Ruso (calmuco)"
+
+#~ msgid "Russian (Komi)"
+#~ msgstr "Ruso (komi)"
+
+#~ msgid "Russian (Mari)"
+#~ msgstr "Ruso (mari)"
+
+#~ msgid "Russian (Ossetian, legacy)"
+#~ msgstr "Ruso (osetio, heredado)"
+
+#~ msgid "Russian (Serbian)"
+#~ msgstr "Ruso (serbio)"
+
+#~ msgid "Russian (Tatar)"
+#~ msgstr "Ruso (tártaro)"
+
+#~ msgid "Russian (Udmurt)"
+#~ msgstr "Ruso (urdmurto)"
+
+#~ msgid "Russian (Yakut)"
+#~ msgstr "Ruso (yakuto)"
+
+#~ msgid "Spanish (Mac)"
+#~ msgstr "Español (Mac)"
+
+#~ msgid "Swedish (northern Saami)"
+#~ msgstr "Sueco (Saami del norte)"
+
+#~ msgid "Swiss"
+#~ msgstr "Suizo"
+
+#~ msgid "Swiss (legacy)"
+#~ msgstr "Suizo (heredado)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Turco (Alt-Q turca del tártaro de Crimea)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish F)"
+#~ msgstr "Turco (F turca del tártaro de Crimea)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish Q)"
+#~ msgstr "Turco (Q turca del tártaro de Crimea)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Ucraniano (Alt-Q turca del tártaro de Crimea)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish F)"
+#~ msgstr "Ucraniano (F turca del tártaro de Crimea)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish Q)"
+#~ msgstr "Ucraniano (Q turca del tártaro de Crimea)"
+
+#~ msgid "Ukrainian (standard RSTU on Russian layout)"
+#~ msgstr "Ucraniano (estándar RSTU con distribución rusa)"
+
+#~ msgid "irq"
+#~ msgstr "irq"
+
+#~ msgid "srp"
+#~ msgstr "srp"
+
+#~ msgid "twn"
+#~ msgstr "twn"
+
+#~ msgid "APL"
+#~ msgstr "APL"
+
+#~ msgid "Iran"
+#~ msgstr "Irán"
+
+#~ msgid "Lithuania"
+#~ msgstr "Lituania"
+
+#~ msgid "Lithuania - Dvorak"
+#~ msgstr "Lituania: Dvorak"
+
+#~ msgid "Ltu"
+#~ msgstr "Ltu"
+
+#~ msgid "Romania"
+#~ msgstr "Rumanía"
+
+#~ msgid "Rou"
+#~ msgstr "Rou"
+
+#~ msgid "Rus"
+#~ msgstr "Rus"
+
+#~ msgid "Russia"
+#~ msgstr "Rusia"
+
+#~ msgid "Serbia"
+#~ msgstr "Serbia"
+
+#~ msgid "Srb"
+#~ msgstr "Srb"
+
+#~ msgid "USA"
+#~ msgstr "EE. UU."
 
 #~ msgid "(F)"
 #~ msgstr "(F)"
@@ -3838,9 +3999,6 @@ msgstr "EE. UU.: internacional (combinando AltGr Unicode, alternativa)"
 #~ msgid "Chn"
 #~ msgstr "Chn"
 
-#~ msgid "Chuvash"
-#~ msgstr "Chuvash"
-
 #~ msgid "Classic"
 #~ msgstr "Clásico"
 
@@ -3943,9 +4101,6 @@ msgstr "EE. UU.: internacional (combinando AltGr Unicode, alternativa)"
 #~ msgid "Jpn"
 #~ msgstr "Jpn"
 
-#~ msgid "Kalmyk"
-#~ msgstr "Calmuco"
-
 #~ msgid "Kana"
 #~ msgstr "Kana"
 
@@ -4003,9 +4158,6 @@ msgstr "EE. UU.: internacional (combinando AltGr Unicode, alternativa)"
 #~ msgid "Mao"
 #~ msgstr "Mao"
 
-#~ msgid "Maori"
-#~ msgstr "Maorí"
-
 #~ msgid "Mkd"
 #~ msgstr "Mkd"
 
@@ -4054,12 +4206,6 @@ msgstr "EE. UU.: internacional (combinando AltGr Unicode, alternativa)"
 #~ msgid "OLPC Southern Uzbek"
 #~ msgstr "OLPC uzbeco del sur"
 
-#~ msgid "Occitan"
-#~ msgstr "Occitano"
-
-#~ msgid "Ogham"
-#~ msgstr "Ogham"
-
 #~ msgid "Ossetian"
 #~ msgstr "Osetio"
 
@@ -4117,15 +4263,9 @@ msgstr "EE. UU.: internacional (combinando AltGr Unicode, alternativa)"
 #~ msgid "Syria"
 #~ msgstr "Siria"
 
-#~ msgid "Tatar"
-#~ msgstr "Tatar"
-
 #~ msgid "Tha"
 #~ msgstr "Tha"
 
-#~ msgid "Tibetan"
-#~ msgstr "Tibetano"
-
 #~ msgid "Tifinagh"
 #~ msgstr "Tifinagh"
 
@@ -4138,9 +4278,6 @@ msgstr "EE. UU.: internacional (combinando AltGr Unicode, alternativa)"
 #~ msgid "Tza"
 #~ msgstr "Tza"
 
-#~ msgid "Udmurt"
-#~ msgstr "Udmurto"
-
 #~ msgid "Ukr"
 #~ msgstr "Ucr"
 
diff --git a/dist/xkeyboard-config/po/fr.po b/dist/xkeyboard-config/po/fr.po
index 0779f4f95..4783d2636 100644
--- a/dist/xkeyboard-config/po/fr.po
+++ b/dist/xkeyboard-config/po/fr.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.3\n"
+"Project-Id-Version: xkeyboard-config 2.3.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-17 21:08+0100\n"
-"PO-Revision-Date: 2011-05-18 23:39+0200\n"
+"POT-Creation-Date: 2011-09-15 21:25+0100\n"
+"PO-Revision-Date: 2011-09-18 00:12+0200\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -217,7 +217,7 @@ msgstr "Arménien"
 msgid "Armenian (alternative eastern)"
 msgstr "Arménien (variante, orientale)"
 
-#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:50
 msgid "Armenian (alternative phonetic)"
 msgstr "Arménien (variante, phonétique)"
 
@@ -378,3385 +378,3396 @@ msgstr "BenQ X-Touch 800"
 msgid "Bengali"
 msgstr "Bengali"
 
+# InScript = Indian Script
 #: ../rules/base.xml.in.h:90
+msgid "Bengali (Baishakhi Inscript)"
+msgstr "Bengali (Inscript Baishakhi)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bengali (Baishakhi)"
+msgstr "Bengali (Baishakhi)"
+
+#: ../rules/base.xml.in.h:92
+msgid "Bengali (Bornona)"
+msgstr "Bengali (Bornona)"
+
+#: ../rules/base.xml.in.h:93
 msgid "Bengali (Probhat)"
 msgstr "Bengali (Probhat)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:94
+msgid "Bengali (Uni Gitanjali)"
+msgstr "Bengali (Uni Gitanjali)"
+
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berbère (Maroc, variante Tifinagh phonétique)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berbère (Maroc, variante Tifinagh)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:97
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berbère (Maroc, Tifinagh étendu phonétique)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:98
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berbère (Maroc, Tifinagh étendu)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:99
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berbère (Maroc, Tifinagh phonétique)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:100
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berbère (Maroc, Tifinagh)"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian"
 msgstr "Bosniaque"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:102
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosniaque (clavier US avec digraphes bosniaques)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:103
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosniaque (clavier US avec lettres bosniaques)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:104
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosniaque (utilise les digraphes bosniaques)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:105
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosniaque (utilise des guillemets typographiques à la place des guillemets simples)"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Les deux Alt ensemble"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Les deux Ctrl ensemble"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Les deux Maj. ensemble"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:109
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Les deux touches majuscule activent le verrouillage majuscule, une le désactive"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:110
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Les deux touches Maj. activent ou désactivent Verr. maj."
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:111
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Les deux touches Maj. activent ou désactivent le blocage majuscule"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:112
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:113
 msgid "Braille (left hand)"
 msgstr "Braille (main gauche)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:114
 msgid "Braille (right hand)"
 msgstr "Braille (main droite)"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:115
 msgid "Brother Internet Keyboard"
 msgstr "Brother : Clavier internet"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:116
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:117
 msgid "Bulgarian (new phonetic)"
 msgstr "Bulgare (phonétique, nouveau)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:118
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bulgare (phonétique, traditionnel)"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:119
 msgid "Burmese"
 msgstr "Birman"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:120
+msgid "Cameroon Multilingual (azerty)"
+msgstr "Cameroun multilingue (azerty)"
+
+#: ../rules/base.xml.in.h:121
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "Cameroun multilingue (qwerty)"
+
+#: ../rules/base.xml.in.h:122
 msgid "Canadian Multilingual"
 msgstr "Canadien multilingue"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:123
 msgid "Canadian Multilingual (first part)"
 msgstr "Canadien multilingue (première partie)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:124
 msgid "Canadian Multilingual (second part)"
 msgstr "Canadien multilingue (seconde partie)"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock"
 msgstr "Verr. maj."
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr "Verr. maj. (sélectionne le 3e niveau ; s'enclenche par un appui simultané avec un autre sélecteur de 3e niveau)"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Verr. maj. (première disposition), Maj.+Verr. maj. (dernière disposition)"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Verr. maj. (si enfoncé), Alt+Verr. maj. joue le rôle original de Verr. maj."
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Verr. maj. agit comme un verrouillage de maj. Maj. l'annule temporairement"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Verr. maj. agit comme maj. quand il est verrouillé. Maj. n'a pas d'effet sur verr. Maj."
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:131
+msgid "Caps Lock as Ctrl"
+msgstr "Verr. maj. comme Ctrl"
+
+#: ../rules/base.xml.in.h:132
 msgid "Caps Lock is disabled"
 msgstr "Verr. maj. est désactivé"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:133
 msgid "Caps Lock key behavior"
 msgstr "Comportement de la touche Verr. maj."
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:134
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Verr. maj. active ou désactive maj., ce qui affecte toutes les touches"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:135
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Verr. maj. active ou désactive la mise en majuscule usuelle des caractères alphabétiques"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:136
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Verr. maj. utilise la mise en majuscule interne. Maj. annule temporairement Verr. maj."
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:137
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Verr. maj. utilise la mise en majuscule interne. Maj. n'a pas d'effet sur Verr. maj."
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:138
 msgid "Catalan"
 msgstr "Catalan"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:139
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Catalan (Espagne, avec L point médian)"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:140
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:141
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:142
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:143
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (variante)"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:144
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd concentrateur USB"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:145
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:146
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:147
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:148
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony clavier internet"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:149
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:150
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:151
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:152
 msgid "Chinese"
 msgstr "Chinois"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:153
 msgid "Chuvash"
 msgstr "Chuvash"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Tchouvache
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:154
 msgid "Chuvash (Latin)"
 msgstr "Tchouvache (latin)"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:155
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:156
 msgid "CloGaelach"
 msgstr "Cló Gaelach"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet (13 touches)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet (18 touches)"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:160
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet (7 touches)"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:161
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:162
 msgid "Compose key position"
 msgstr "Position de la touche Compose"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Eff. arrière"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Ctrl est placé sur les touches Alt., Alt. sur les touches Windows"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Ctrl est placé sur les touches Windows (et les touches Ctrl habituelles)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:160
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "Tatar de Crimée (Q dobroudja)"
-
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Tatar de Crimée (Alt.-Q turc)"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Tatar de Crimée (F turc)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Tatar de Crimée (Q turc)"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Croatian"
 msgstr "Croate"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Croate (clavier US avec digraphes croates)"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:172
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Croate (clavier US avec lettres croates)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Croate (utilise les digraphes croates)"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:174
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Croate (utilise des guillemets typo. au lieu des guillemets simples)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:175
 msgid "Ctrl key position"
 msgstr "Position de la touche Ctrl"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:176
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Maj."
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:177
 msgid "Czech"
 msgstr "Tchèque"
 
 # http://repo.or.cz/w/ucwcs-xkb.git/blob_plain/HEAD:/README
 # http://www.ucw.cz/
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Tchèque (disposition UCW, lettres accentuées seulement)"
 
 # http://repo.or.cz/w/ucwcs-xkb.git/blob_plain/HEAD:/README
 # http://www.ucw.cz/
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Tchèque (Dvorak US avec support UCW CZ)"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:180
 msgid "Czech (qwerty)"
 msgstr "Tchèque (qwerty)"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:181
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Tchèque (qwerty, barre oblique inverse étendue)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Tchèque (avec la touche &lt;\\|&gt;)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Danish"
 msgstr "Danois"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Danish (Dvorak)"
 msgstr "Danois (Dvorak)"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Danish (Macintosh)"
 msgstr "Danois (Macintosh)"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Danois (Macintosh, sans touche morte)"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Danish (eliminate dead keys)"
 msgstr "Danois (sans touche morte)"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Default numeric keypad keys"
 msgstr "Touches du pavé numérique par défaut"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell 101-key PC"
 msgstr "Dell PC 101 touches"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell portable Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell portable Precision série M"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dell Latitude series laptop"
 msgstr "Dell portable de la série Latitude"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:197
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell clavier multimédia USB"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa clavier sans fil"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dhivehi"
 msgstr "Divehi"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond séries 9801 / 9802"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
 msgid "Dutch"
 msgstr "Néerlandais"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:203
 msgid "Dutch (Macintosh)"
 msgstr "Néerlandais (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:204
 msgid "Dutch (Sun dead keys)"
 msgstr "Néerlandais (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:205
 msgid "Dutch (standard)"
 msgstr "Néerlandais (standard)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:206
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:207
 msgid "Enable extra typographic characters"
 msgstr "Active des caractères typographiques supplémentaires"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Cameroun
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:208
 msgid "English (Cameroon Dvorak)"
 msgstr "Anglais (Cameroun, Dvorak)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Cameroun
-#: ../rules/base.xml.in.h:203
-msgid "English (Cameroon qwerty)"
-msgstr "Anglais (Cameroun, qwerty)"
-
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Cameroun
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:209
 msgid "English (Cameroon)"
 msgstr "Anglais (Cameroun)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:210
 msgid "English (Canada)"
 msgstr "Anglais (Canada)"
 
 # http://colemak.com/
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:211
 msgid "English (Colemak)"
 msgstr "Anglais (Colemak)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:212
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Anglais (Dvorak, variante internationale, sans touche morte)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:213
 msgid "English (Dvorak international with dead keys)"
 msgstr "Anglais (Dvorak, international avec touche morte)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:214
 msgid "English (Dvorak)"
 msgstr "Anglais (Dvorak)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:215
 msgid "English (Ghana)"
 msgstr "Anglais (Ghana)"
 
 # http://www.gillbt.org/
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:216
 msgid "English (Ghana, GILLBT)"
 msgstr "Anglais (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:217
 msgid "English (Ghana, multilingual)"
 msgstr "Anglais (Ghana, multilingue)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:218
 msgid "English (India, with RupeeSign)"
 msgstr "Anglais (Inde, avec le symbole Roupie)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:219
 msgid "English (Macintosh)"
 msgstr "Anglais (Macintosh)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:220
 msgid "English (Mali, US Macintosh)"
 msgstr "Anglais (Mali, Macintosh USA)"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:221
 msgid "English (Mali, US international)"
 msgstr "Anglais (Mali, USA international)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:222
 msgid "English (Nigeria)"
 msgstr "Anglais (Nigeria)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:223
 msgid "English (South Africa)"
 msgstr "Anglais (Afrique du Sud)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:224
 msgid "English (UK)"
 msgstr "Anglais (Royaume-Uni)"
 
 # http://colemak.com/
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:225
 msgid "English (UK, Colemak)"
 msgstr "Anglais (Royaume-Uni, Colemak)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Anglais (Royaume-Uni, Dvorak, ponctuation britannique)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:227
 msgid "English (UK, Dvorak)"
 msgstr "Anglais (Royaume-Uni, Dvorak)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:228
 msgid "English (UK, Macintosh international)"
 msgstr "Anglais (Royaume-Uni, Macintosh international)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:229
 msgid "English (UK, Macintosh)"
 msgstr "Anglais (Royaume-Uni, Macintosh)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:230
 msgid "English (UK, extended WinKeys)"
 msgstr "Anglais (Royaume-Uni, touche Windows étendue)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:231
 msgid "English (UK, international with dead keys)"
 msgstr "Anglais (Royaume-Uni, international, avec touches mortes)"
 
-#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:232 ../rules/base.extras.xml.in.h:8
 msgid "English (US)"
 msgstr "Anglais (USA)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:233
 msgid "English (US, alternative international)"
 msgstr "Anglais (USA, variante internationale)"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:234
 msgid "English (US, international with dead keys)"
 msgstr "Anglais (USA, variante internationale, avec touches mortes)"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:235
 msgid "English (US, with euro on 5)"
 msgstr "Anglais (USA, avec l'Euro sur le 5)"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:236
 msgid "English (classic Dvorak)"
 msgstr "Anglais (Dvorak classique)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:237
 msgid "English (international AltGr dead keys)"
 msgstr "Anglais (international, AltGr, touches mortes)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:238
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Anglais (la touche multiplier/diviser modifie la disposition clavier)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:239
 msgid "English (left handed Dvorak)"
 msgstr "Anglais (Dvorak pour gaucher)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:240
 msgid "English (programmer Dvorak)"
 msgstr "Anglais (Dvorak pour programmeur)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:241
 msgid "English (right handed Dvorak)"
 msgstr "Anglais (Dvorak pour droitier)"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:242
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:243
 msgid "Enter on keypad"
 msgstr "Entrée sur le pavé numérique"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:244
 msgid "Esperanto"
 msgstr "Espéranto"
 
 # http://tecladobrasileiro.com.br/index.php?option=com_content&task=view&id=20&Itemid=62
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:245
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Espéranto (Portugal, PT-Nativo)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:246
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Espéranto (point-virgule et guillemets simples déplacés, obsolète)"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:247
 msgid "Estonian"
 msgstr "Estonien"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:248
 msgid "Estonian (Dvorak)"
 msgstr "Estonien (Dvorak)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:249
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estonien (clavier US avec lettres estoniennes)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:250
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estonien (sans touche morte)"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:251
 msgid "Euro on 2"
 msgstr "Euro sur le 2"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:252
 msgid "Euro on 4"
 msgstr "Euro sur le 4"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:253
 msgid "Euro on 5"
 msgstr "Euro sur le 5"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:254
 msgid "Euro on E"
 msgstr "Euro sur le E"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:255
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:256
 msgid "Ewe"
 msgstr "Éwé"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:257
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:258
 msgid "Faroese"
 msgstr "Féroïen"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:259
 msgid "Faroese (eliminate dead keys)"
 msgstr "Féroïen (sans touche morte)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:260
 msgid "Filipino"
 msgstr "Filipino"
 
 # http://www.michaelcapewell.com/projects/keyboard/#The_Capewell-Dvorak_Layout
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filipino (Capewell-Dvorak, baybayin)"
 
 # http://www.michaelcapewell.com/projects/keyboard/#The_Capewell-Dvorak_Layout
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:262
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filipino (Capewell-Dvorak, latin)"
 
 # http://www.michaelcapewell.com/projects/keyboard/#The_QWERF_Layout
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filipino (Capewell-QWERF 2006, baybayin)"
 
 # http://www.michaelcapewell.com/projects/keyboard/#The_QWERF_Layout
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filipino (Capewell-QWERF 2006, latin)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:265
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filipino (Colemak, baybayin)"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:266
 msgid "Filipino (Colemak Latin)"
 msgstr "Filipino (Colemak, latin)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Baybayin
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:267
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Filipino (Dvorak, baybayin)"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:268
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filipino (Dvorak, latin)"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:269
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filipino (baybayin, qwerty)"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:270
 msgid "Finnish"
 msgstr "Finnois"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:271
 msgid "Finnish (Macintosh)"
 msgstr "Finnois (Macintosh)"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:272
 msgid "Finnish (classic)"
 msgstr "Finnois (classique)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:273
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finnois (classique, sans touche morte)"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:276
 msgid "Four-level key with abstract separators"
 msgstr "Touche à quatre niveaux avec le séparateur décimal abstrait"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:277
 msgid "Four-level key with comma"
 msgstr "Touche à quatre niveaux avec virgule"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:278
 msgid "Four-level key with dot"
 msgstr "Touche à quatre niveaux avec point"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:279
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Touche à quatre niveaux avec point, latin-9 uniquement"
 
 # Le momayyez est le séparateur décimal perse.
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:280
 msgid "Four-level key with momayyez"
 msgstr "Touche à quatre niveaux avec le séparateur décimal momayyez"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:281
 msgid "French"
 msgstr "Français"
 
 # http://bepo.fr
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:282
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Français (Bépo, ergonomique, façon Dvorak)"
 
 # http://bepo.fr
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:283
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Français (Bépo, ergonomique, façon Dvorak, latin-9 uniquement)"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:284
 msgid "French (Breton)"
 msgstr "Français (breton)"
 
-#: ../rules/base.xml.in.h:280
-msgid "French (Cameroon azerty)"
-msgstr "Français (Cameroun, azerty)"
-
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:285
 msgid "French (Cameroon)"
 msgstr "Français (Cameroun)"
 
-#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:286 ../rules/base.extras.xml.in.h:11
 msgid "French (Canada)"
 msgstr "Français (Canada)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:287
 msgid "French (Canada, Dvorak)"
 msgstr "Français (Canada, Dvorak)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:288
 msgid "French (Canada, legacy)"
 msgstr "Français (Canada, obsolète)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:289
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Français (République démocratique du Congo)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:290
 msgid "French (Dvorak)"
 msgstr "Français (Dvorak)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:291
 msgid "French (Guinea)"
 msgstr "Français (Guinée)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:292
 msgid "French (Macintosh)"
 msgstr "Français (Macintosh)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:293
 msgid "French (Mali, alternative)"
 msgstr "Français (Mali, variante)"
 
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:294
 msgid "French (Morocco)"
 msgstr "Français (Maroc)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:295
 msgid "French (Sun dead keys)"
 msgstr "Français (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:296
 msgid "French (Switzerland)"
 msgstr "Français (Suisse)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:297
 msgid "French (Switzerland, Macintosh)"
 msgstr "Français (Suisse, Macintosh)"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:298
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Français (Suisse, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:299
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Français (Suisse, sans touche morte)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:300
 msgid "French (alternative)"
 msgstr "Français (variante)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:301
 msgid "French (alternative, Sun dead keys)"
 msgstr "Français (variante, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:302
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Français (variante, sans touche morte)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:303
 msgid "French (alternative, latin-9 only)"
 msgstr "Français (variante, latin-9 uniquement)"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:304
 msgid "French (eliminate dead keys)"
 msgstr "Français (sans touche morte)"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:305
 msgid "French (legacy, alternative)"
 msgstr "Français (variante obsolète)"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:306
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Français (variante obsolète, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:307
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Français (variante obsolète, sans touche morte)"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:308
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Portable Fujitsu-Siemens Computers AMILO"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Fula_language
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:309
 msgid "Fula"
 msgstr "Peul"
 
 # Langue du Ghana.
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:310
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:311
 msgid "Generic 101-key PC"
 msgstr "PC générique 101 touches"
 
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:312
 msgid "Generic 102-key (Intl) PC"
 msgstr "PC générique 102 touches (intl)"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:313
 msgid "Generic 104-key PC"
 msgstr "PC générique 104 touches"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:314
 msgid "Generic 105-key (Intl) PC"
 msgstr "PC générique 105 touches (intl)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:315
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:316
 msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 msgstr "Genius Comfy KB-16M / MM KWD-910"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:317
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:318
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:319
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:320
 msgid "Georgian"
 msgstr "Géorgien"
 
 # As the name suggests, this layout is based on French AZERTY keyboard. The layout is based on the Georgian AZERTY layout model by Georgian language and localizaton expert Vasil "Tskapo" Kekelia.
 #
 # http://www.gakartuleba.org/layouts/index.php
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:321
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Géorgien (France, azerty Tskapo)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Oss%C3%A8te
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:322
 msgid "Georgian (Italy)"
 msgstr "Géorgien (Italie)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:323
 msgid "Georgian (MESS)"
 msgstr "Géorgien (MESS)"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:324
 msgid "Georgian (ergonomic)"
 msgstr "Géorgien (ergonomique)"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:325 ../rules/base.extras.xml.in.h:12
 msgid "German"
 msgstr "Allemand"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:326
 msgid "German (Austria)"
 msgstr "Allemand (Autriche)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:327
 msgid "German (Austria, Macintosh)"
 msgstr "Allemand (Autriche, Macintosh)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:328
 msgid "German (Austria, Sun dead keys)"
 msgstr "Allemand (Autriche, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:329
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Allemand (Autriche, sans touche morte)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:330
 msgid "German (Dvorak)"
 msgstr "Allemand (Dvorak)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:331
 msgid "German (Macintosh)"
 msgstr "Allemand (Macintosh)"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:332
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Allemand (Macintosh, sans touche morte)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Keyboard_layout#Neo
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:333
 msgid "German (Neo 2)"
 msgstr "Allemand (Neo 2)"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:334
 msgid "German (Sun dead keys)"
 msgstr "Allemand (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:335
 msgid "German (Switzerland)"
 msgstr "Allemand (Suisse)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:336
 msgid "German (Switzerland, Macintosh)"
 msgstr "Allemand (Suisse, Macintosh)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:337
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Allemand (Suisse, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:338
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Allemand (Suisse, sans touche morte)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:339
 msgid "German (Switzerland, legacy)"
 msgstr "Allemand (Suisse, obsolète)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:340
 msgid "German (dead acute)"
 msgstr "Allemand (accent aigu en touche morte)"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:341
 msgid "German (dead grave acute)"
 msgstr "Allemand (accents aigu et grave en touches mortes)"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:342
 msgid "German (eliminate dead keys)"
 msgstr "Allemand (sans touche morte)"
 
-#: ../rules/base.xml.in.h:339
-msgid "German (qwerty)"
-msgstr "Allemand (qwerty)"
-
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:343
 msgid "Greek"
 msgstr "Grec"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:344
 msgid "Greek (eliminate dead keys)"
 msgstr "Grec (sans touche morte)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:345
 msgid "Greek (extended)"
 msgstr "Grec (étendu)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Diacritiques_de_l%27alphabet_grec
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:346
 msgid "Greek (polytonic)"
 msgstr "Grec (polytonique)"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:347
 msgid "Greek (simple)"
 msgstr "Grec (simple)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Gujar%C3%A2t%C3%AE
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:348
 msgid "Gujarati"
 msgstr "Gujarâtî"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:349
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:350
 msgid "HTC Dream"
 msgstr "HTC Dream"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:351
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:352
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking pour Mac"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Haoussa
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:353
 msgid "Hausa"
 msgstr "Haoussa"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:354
 msgid "Hebrew"
 msgstr "Hébreu"
 
 # http://wiki.jewishliturgy.org/Hebrew_Font_and_Keyboard_Layout_Setup
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:355
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Hébreu (biblique, Tiro)"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:356
 msgid "Hebrew (lyx)"
 msgstr "Hébreu (lyx)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:357
 msgid "Hebrew (phonetic)"
 msgstr "Hébreu (phonétique)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard clavier internet"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard portable Mini 110"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:367
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:368
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x, clavier multimedia"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:369
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:370
 msgid "Hexadecimal"
 msgstr "Hexadécimal"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Hindi
 # http://indlinux.org/wiki/index.php/BolNagri
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:371
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (bolnagri)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:372
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:373
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:374
 msgid "Htc Dream phone"
 msgstr "Htc Dream"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Hongrois
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Hongrois (101, qwerty, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Hongrois (101, qwerty, virgule, sans touche morte)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Hongrois (101, qwerty, point, touches mortes)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Hongrois (101, qwerty, point, sans touche morte)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Hongrois (101, qwertz, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Hongrois (101, qwertz, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Hongrois (101, qwertz, point,  touches mortes)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Hongrois (101, qwertz, point, sans touche morte)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Hongrois (102, qwerty, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Hongrois (102, qwerty, virgule, sans touche morte)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Hongrois (102, qwerty, point, touches mortes)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Hongrois (102, qwerty, point, sans touche morte)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Hongrois (102, qwertz, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Hongrois (102, qwertz, virgule, sans touche morte)"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Hongrois (102, qwertz, point, touches mortes)"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Hongrois (102, qwertz, point, sans touche morte)"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:392
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Hongrois (sans touche morte)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:393
 msgid "Hungarian (qwerty)"
 msgstr "Hongrois (qwerty)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:394
 msgid "Hungarian (standard)"
 msgstr "Hongrois (standard)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:395
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper est placé sur les touches Windows"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:396
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:397
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:398
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:399
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:400
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:401
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Islandais
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic"
 msgstr "Islandais"
 
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (Dvorak)"
 msgstr "Islandais (Dvorak)"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:404
 msgid "Icelandic (Macintosh)"
 msgstr "Islandais (Macintosh)"
 
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:405
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islandais (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:406
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islandais (sans touche morte)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Igbo
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:407
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:408
 msgid "Indian"
 msgstr "Indien"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Inuktitut
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:409
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:410
 msgid "Iraqi"
 msgstr "Irakien"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:411
 msgid "Irish"
 msgstr "Irlandais"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:412
 msgid "Irish (UnicodeExpert)"
 msgstr "Irlandais (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:413
 msgid "Italian"
 msgstr "Italien"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:414
 msgid "Italian (Macintosh)"
 msgstr "Italien (Macintosh)"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:415
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Italien (clavier US avec lettres italiennes)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:416
 msgid "Italian (eliminate dead keys)"
 msgstr "Italien (sans touche morte)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:417
 msgid "Japanese"
 msgstr "Japonais"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (Kana 86)"
 msgstr "Japonais (Kana 86)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (Kana)"
 msgstr "Japonais (Kana)"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:420
 msgid "Japanese (Macintosh)"
 msgstr "Japonais (Macintosh)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:421
 msgid "Japanese (OADG 109A)"
 msgstr "Japonais (OADG 109A)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:422
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japonais (PC-98xx)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:423
 msgid "Japanese keyboard options"
 msgstr "Options des claviers japonais"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:424
 msgid "Kalmyk"
 msgstr "Kalmyk"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:425
 msgid "Kana Lock key is locking"
 msgstr "La touche « verrouillage Kana » verrouille"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Kannada
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:426
 msgid "Kannada"
 msgstr "Kannada"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Cachoube
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:427
 msgid "Kashubian"
 msgstr "Cachoube"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakh
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:428
 msgid "Kazakh"
 msgstr "Kazakh"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:429
 msgid "Kazakh (with Russian)"
 msgstr "Kazakh (avec russe)"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:430
 msgid "Key sequence to kill the X server"
 msgstr "Séquence de touches pour tuer le serveur X"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:431
 msgid "Key to choose 3rd level"
 msgstr "Touche sélectionnant le 3e niveau"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:432
 msgid "Key to choose 5th level"
 msgstr "Touche sélectionnant le 5e niveau"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:433
 msgid "Key(s) to change layout"
 msgstr "Touches modifiant la disposition du clavier"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:434
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Khmer
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:435
 msgid "Khmer (Cambodia)"
 msgstr "Khmer (Cambodge)"
 
 # Langue bantoue.
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Kikuyu_%28langue%29
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:436
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
 # Claviers.
 # http://www.kinesis-ergo.com/keyboards.htm
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:437
 msgid "Kinesis"
 msgstr "Kinesis"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Komi_%28langue%29
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:438
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:439
 msgid "Korean"
 msgstr "Coréen"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:440
 msgid "Korean (101/104 key compatible)"
 msgstr "Coréen (compatible 101/104 touches)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurde (Iran, arabe-latin)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iran, F)"
 msgstr "Kurde (Iran, F)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Kurde (Iran, Alt-Q latin)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurde (Iran, Q latin)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurde (Irak, arabe-latin)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurde (Irak, F)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurde (Irak, Alt-Q latin)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurde (Irak, Q latin)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Syria, F)"
 msgstr "Kurde (Syrie, F)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurde (Syrie, Alt-Q latin)"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurde (Syrie, Q latin)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:452
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurde (Turquie, F)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:453
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurde (Turquie, Alt-Q latin)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:454
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurde (Turquie, Q latin)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Kirghize_%28langue%29
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:455
 msgid "Kyrgyz"
 msgstr "Kirghize"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:456
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirghize (phonétique)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Lao_%28langue%29
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:457
 msgid "Lao"
 msgstr "Lao"
 
 # STEA = Agence pour la science, la technologie et l'environnement.
 # http://www.clear-vu.com.hk/resources/lao_keyboard.asp
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:458
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Lao (disposition proposée par la STEA)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:459
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Compaq portable (p.ex. Armada)"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:460
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Compaq portable clavier Internet (p.ex. Presario)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:461
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "eMachines m68xx"
 
-#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+#: ../rules/base.xml.in.h:462 ../rules/base.extras.xml.in.h:16
 msgid "Latvian"
 msgstr "Letton"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:463
 msgid "Latvian (F variant)"
 msgstr "Letton (variante F)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:464
 msgid "Latvian (adapted)"
 msgstr "Letton (adapté)"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:465
 msgid "Latvian (apostrophe variant)"
 msgstr "Letton (variante apostrophe)"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:466
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Letton (ergonomique, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:467
 msgid "Latvian (modern)"
 msgstr "Letton (moderne)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:468
 msgid "Latvian (tilde variant)"
 msgstr "Letton (variante tilde)"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:469
 msgid "Left Alt"
 msgstr "Alt gauche"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:470
 msgid "Left Alt (while pressed)"
 msgstr "Alt gauche (si enfoncé)"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:471
 msgid "Left Alt is swapped with Left Win"
 msgstr "Alt. gauche échangé avec Windows droit"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:472
 msgid "Left Ctrl"
 msgstr "Ctrl gauche"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:473
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Ctrl gauche (première disposition), Ctrl droit (dernière disposition)"
 
-#: ../rules/base.xml.in.h:471
+#: ../rules/base.xml.in.h:474
+msgid "Left Ctrl as Meta"
+msgstr "Ctrl gauche comme Méta"
+
+#: ../rules/base.xml.in.h:475
 msgid "Left Ctrl+Left Shift"
 msgstr "Ctrl gauche+Maj. gauche"
 
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:476
 msgid "Left Shift"
 msgstr "Maj. gauche"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:477
 msgid "Left Win"
 msgstr "Touche Windows gauche"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:478
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Touche Windows gauche (première disposition), touche Windows droite (dernière disposition)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:479
 msgid "Left Win (while pressed)"
 msgstr "Windows gauche (si enfoncé)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:480
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Windows gauche sélectionne le 5e niveau ; se verrouille par un appui simultané avec un autre sélecteur de 5e niveau"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:481
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Windows sélectionne le 5e niveau ; se verrouille par un appui simultané avec un autre sélecteur de 5e niveau ; un appui libère le verrou"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:482
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Ctrl gauche + Windows gauche (première disposition), Ctrl droit + Menu (seconde disposition)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:483
 msgid "Legacy"
 msgstr "Obsolète"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:484
 msgid "Legacy Wang 724"
 msgstr "Wang 724 (clavier obsolète)"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:486
 msgid "Legacy key with comma"
 msgstr "Touche obsolète avec virgule"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:487
 msgid "Legacy key with dot"
 msgstr "Touche obsolète avec point"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Lituanien
-#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+#: ../rules/base.xml.in.h:488 ../rules/base.extras.xml.in.h:25
 msgid "Lithuanian"
 msgstr "Lituanien"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Lituanien (IBM LST 1205-92)"
 
 # http://lekp.info/LithuanianErgonomic
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:490
 msgid "Lithuanian (LEKP)"
 msgstr "Lituanien (LEKP)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:491
 msgid "Lithuanian (LEKPa)"
 msgstr "Lituanien (LEKPa)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:492
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Lituanien (clavier US avec lettres lituaniennes)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:493
 msgid "Lithuanian (standard)"
 msgstr "Lituanien (standard)"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Access Keyboard"
 msgstr "Clavier Logitech Access"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop (variante)"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:500
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro (variante 2)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:504
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Touches supplémentaires Logitech G15 via le démon G15"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Generic Keyboard"
 msgstr "Clavier Logitech générique"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Clavier Logitech Internet 350"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Internet Keyboard"
 msgstr "Clavier Logitech Internet"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:508
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Clavier Logitech Internet Navigator"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:509
 msgid "Logitech Media Elite Keyboard"
 msgstr "Clavier Logitech Media Elite"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:510
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Clavier Logitech sans-fil Ultra-X Media"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:511
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Clavier Logitech Ultra-X"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:512
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Clavier Logitech diNovo Edge"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:513
 msgid "Logitech diNovo Keyboard"
 msgstr "Clavier Logitech diNovo"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:514
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:515
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless (modèle Y-RB6)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:516
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech Internet Navigator iTouch SE"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:517
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech Internet Navigator iTouch SE (USB)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:518
 msgid "Lower Sorbian"
 msgstr "Bas-sorabe"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Bas-sorabe
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:519
 msgid "Lower Sorbian (qwertz)"
 msgstr "Bas-sorabe (qwertz)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:520
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:521
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Intl)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Mac%C3%A9donien
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:522
 msgid "Macedonian"
 msgstr "Macédonien"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:523
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macédonien (sans touche morte)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:524
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:525
 msgid "Macintosh Old"
 msgstr "Macintosh (ancien)"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Faire de Verr. maj. un Effacement. arriière supplémentaire."
 
 # http://www.x.org/wiki/KeySyms
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Faire de Verr. maj. un Contrôle supplémentaire, mais garder le même nom symbolique (Caps_Lock)"
 
-#: ../rules/base.xml.in.h:524
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Faire de Verr. maj. un Contrôle supplémentaire"
-
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional ESC"
 msgstr "Faire de Verr. maj. un Échap. supplémentaire."
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:529
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Faire de Verr. maj. un Hyper supplémentaire"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:530
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Faire de Verr. maj. un Verr. Num. supplémentaire"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:531
 msgid "Make Caps Lock an additional Super"
 msgstr "Faire de Verr. maj. un Super supplémentaire."
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Malay%C3%A2lam
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:532
 msgid "Malayalam"
 msgstr "Malayâlam"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:533
 msgid "Malayalam (Lalitha)"
 msgstr "Malayâlam (lalitha)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/InScript_keyboard
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:534
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malayâlam (Inscript amélioré avec le symbole monétaire Roupie)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Maltais
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:535
 msgid "Maltese"
 msgstr "Maltais"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:536
 msgid "Maltese (with US layout)"
 msgstr "Maltais (avec disposition US)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:537
 msgid "Maori"
 msgstr "Maori"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Mari_%28langue%29
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:538
 msgid "Mari"
 msgstr "Mari"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:539
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:540
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:541
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:542
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:543
+msgid "Menu as Right Ctrl"
+msgstr "Menu comme Crtl droite"
+
+#: ../rules/base.xml.in.h:544
 msgid "Meta is mapped to Left Win"
 msgstr "Méta est placé sur Windows gauche"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:545
 msgid "Meta is mapped to Win keys"
 msgstr "Méta est placé sur les touches Windows"
 
-#: ../rules/base.xml.in.h:542
-msgid "Meta on Left Ctrl"
-msgstr "Méta s'obtient avec Ctrl gauche"
-
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Clavier Comfort Curve 2000"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Clavier internet"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Clavier Internet Pro, suédois"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:550
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural Elite"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Pro / Internet Pro"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Pro OEM"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:553
 msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Pro USB / Internet Pro"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:555
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:556
 msgid "Microsoft Office Keyboard"
 msgstr "Clavier Microsoft Office"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:557
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Clavier Microsoft Multimedia sans fil 1.0A"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:558
 msgid "Miscellaneous compatibility options"
 msgstr "Diverses options de compatibilité"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Mongol
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:559
 msgid "Mongolian"
 msgstr "Mongol"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Mont%C3%A9n%C3%A9grin
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin"
 msgstr "Monténégrin"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:561
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Monténégrin (cyrillique avec guillemets)"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:562
 msgid "Montenegrin (Cyrillic)"
 msgstr "Monténégrin (cyrillique)"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:563
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Monténégrin (cyrillique, Z et ZHE intervertis)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Monténégrin (qwerty Unicode latin)"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:565
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Monténégrin (Unicode latin)"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:566
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Monténégrin (qwerty latin)"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:567
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Monténégrin (latin avec guillemets)"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:568
 msgid "NICOLA-F style Backspace"
 msgstr "Eff. Arr. du type NICOLA-F"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/N%C3%A9palais
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:569
 msgid "Nepali"
 msgstr "Népalais"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at fourth level"
 msgstr "Espace insécable au 4e niveau"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Espace insécable au 4e niveau, espace fine insécable au 6e niveau"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:572
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Espace insécable au 4e niveau, espace fine insécable au 6e niveau (via Ctrl+Maj.)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at second level"
 msgstr "Espace insécable au 2e niveau"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:574
 msgid "Non-breakable space character at third level"
 msgstr "Espace insécable au 3e niveau"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:575
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Espace insécable au 3e niveau, rien au 4e niveau"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:576
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Espace insécable au 3e niveau, espace fine insécable au 4e niveau"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:577
 msgid "Northern Saami (Finland)"
 msgstr "Sami du Nord (Finlande)"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:578
 msgid "Northern Saami (Norway)"
 msgstr "Sami du Nord (Norvège)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:579
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Sami du Nord (Norvège, sans touche morte)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:580
 msgid "Northern Saami (Sweden)"
 msgstr "Sami du Nord (Suède)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:581
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Norv%C3%A9gien
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:582
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (Dvorak)"
 msgstr "Norvégien (Dvorak)"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:584
 msgid "Norwegian (Macintosh)"
 msgstr "Norvégien (Macintosh)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:585
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Norvégien (Macintosh, sans touche morte)"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:586
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norvégien (sans touche morte)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:587
 msgid "Num Lock"
 msgstr "Verr. Num."
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:588
 msgid "Numeric keypad delete key behaviour"
 msgstr "Comportement de la touche de Suppr. du pavé numérique"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:589
 msgid "Numeric keypad keys work as with Macintosh"
 msgstr "Les touches du pavé numérique se comportent comme sur Macintosh"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:590
 msgid "Numeric keypad layout selection"
 msgstr "Disposition du pavé numérique"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:591
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:592
 msgid "Occitan"
 msgstr "Occitan"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:593
 msgid "Ogham"
 msgstr "Ogham"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:594
 msgid "Ogham (IS434)"
 msgstr "Ogham (IS434)"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:595
 msgid "Oriya"
 msgstr "Oriya"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:596
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Ortek Clavier internet / MCK-800 MM"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:597
 msgid "Ossetian (Georgia)"
 msgstr "Ossète (Géorgie)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Oss%C3%A8te
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:598
 msgid "Ossetian (WinKeys)"
 msgstr "Ossète (touches Windows)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:599
 msgid "Ossetian (legacy)"
 msgstr "Ossète (obsolète)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:600
 msgid "PC-98xx Series"
 msgstr "PC-98xx"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:601
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Ruthène pannonien (homophonique)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:602
 msgid "Pashto"
 msgstr "Pachto"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:603
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Pachto (Afghanistan, OLPC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:604
 msgid "Pause"
 msgstr "Pause"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Persan
-#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:27
 msgid "Persian"
 msgstr "Persan"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Dari
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:606
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persan (Afghanistan, Dari, OLPC)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:607
 msgid "Persian (with Persian Keypad)"
 msgstr "Persan (avec pavé numérique persan)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Polonais
-#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:28
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:609
 msgid "Polish (Dvorak)"
 msgstr "Polonais (Dvorak)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:610
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Polonais (Dvorak, guillemets polonais sur le « 1 »)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Disposition_Dvorak
 #
 # Sur le clavier Dvorak, les guillemets sont sur une seule et même touche.
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:611
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Polonais (Dvorak, guillemets polonais sur la touche guillemets)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:612
 msgid "Polish (programmer Dvorak)"
 msgstr "Polonais (Dvorak pour le programmeur)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:613
 msgid "Polish (qwertz)"
 msgstr "Polonais (qwertz)"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil)"
 msgstr "Portugais (Brésil)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugais (Brésil, Dvorak)"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugais (Brésil, sans touche morte)"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:618
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugais (Brésil, BR-Nativo pour l'Espéranto)"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:619
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugais (Brésil, BR-Nativo pour claviers US)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard#Other_languages
 # http://tecladobrasileiro.com.br/images/stories/br-nativo/br-nativo-simples.svg
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:620
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugais (Brésil, BR-Nativo)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Macintosh)"
 msgstr "Portugais (Macintosh)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portugais (Macintosh, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portugais (Macintosh, sans touche morte)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugais (PT-Nativo pour claviers US)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:625
 msgid "Portuguese (Nativo)"
 msgstr "Portugais (PT-Nativo)"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:626
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugais (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:627
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugais (sans touche morte)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:628
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:629
 msgid "PrtSc"
 msgstr "Impr. Écr."
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Penjabi
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:630
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Penjabi (Gurmukhî, Jhelum)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:631
 msgid "Punjabi (Gurmukhi)"
 msgstr "Penjabi (Gurmukhî)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:632
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt"
 msgstr "Alt. droite"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt (while pressed)"
 msgstr "Alt. droite (si enfoncé)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:635
+msgid "Right Alt as Right Ctrl"
+msgstr "Alt. droite comme Ctrl droite"
+
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Alt. droite sélectionne le 5e niveau ; verrouille le 5e niveau par un appui simultané avec un autre sélecteur de 5e niveau ; un appui libère le verrou"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:637
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Alt. droite sélectionne le 5e niveau ; se verrouille par un appui simultané avec un autre sélecteur de 5e niveau"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:638
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Alt. droite sélectionne le 5e niveau ; se verrouille par un appui simultané avec un autre sélecteur de 5e niveau ; un appui libère le verrou"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:639
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Alt. droite ne sélectionne jamais le 3e niveau"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Touche_compose
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:640
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Alt. droite, Maj.+Alt. droite est une touche compose (Multi_Key)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl"
 msgstr "Crtl droite"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:642
 msgid "Right Ctrl (while pressed)"
 msgstr "Ctrl droite (si enfoncé)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:643
 msgid "Right Ctrl as Right Alt"
 msgstr "Ctrl droite comme Alt. droite"
 
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl is mapped to Menu"
-msgstr "Méta est placé sur Menu"
-
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:644
 msgid "Right Ctrl+Right Shift"
 msgstr "Ctrl  droite + Maj. droite"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:645
 msgid "Right Shift"
 msgstr "Maj. droite"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:646
 msgid "Right Win"
 msgstr "Windows droite"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:647
 msgid "Right Win (while pressed)"
 msgstr "Windows droite (si enfoncé)"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:648
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Windows droite sélectionne le 5e niveau ; se verrouille par un appui simultané avec un autre sélecteur de 5e niveau"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:649
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Windows droite sélectionne le 5e niveau ; se verrouille par un appui simultané avec un autre sélecteur de 5e niveau ; un appui libère le verrou"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Roumain
-#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+#: ../rules/base.xml.in.h:650 ../rules/base.extras.xml.in.h:30
 msgid "Romanian"
 msgstr "Roumain"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (Germany)"
 msgstr "Roumain (Allemagne)"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Roumain (Allemagne, sans touche morte)"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (WinKeys)"
 msgstr "Roumain (touche Windows)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:654
 msgid "Romanian (cedilla)"
 msgstr "Roumain (cédille)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (standard cedilla)"
 msgstr "Roumain (standard, cédille)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Roumain (standard)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:657
 msgid "Rupee on 4"
 msgstr "Roupie sur le 4"
 
-#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:658 ../rules/base.extras.xml.in.h:32
 msgid "Russian"
 msgstr "Russe"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:659
 msgid "Russian (DOS)"
 msgstr "Russe (DOS)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Georgia)"
 msgstr "Russe (Géorgie)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Germany, phonetic)"
 msgstr "Russe (Allemagne, phonétique)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakhstan
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakh
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Russe (Kazakhstan, avec kazakh)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:663
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Russe (Pologne, Dvorak phonétique)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:664
 msgid "Russian (Sweden, phonetic)"
 msgstr "Russe (Suède, phonétique)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:665
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Russe (Suède, phonétique, sans touche morte)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:666
 msgid "Russian (US, phonetic)"
 msgstr "Russe (US, phonétique)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:667
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Russe (Ukraine, RSTU standard)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:668
 msgid "Russian (legacy)"
 msgstr "Russe (obsolète)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:669
 msgid "Russian (phonetic WinKeys)"
 msgstr "Russe (phonétique, touches Windows)"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:670
 msgid "Russian (phonetic)"
 msgstr "Russe (phonétique)"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:671
 msgid "Russian (typewriter)"
 msgstr "Russe (machine à écrire)"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:672
 msgid "Russian (typewriter, legacy)"
 msgstr "Russe (machine à écrire, obsolète)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:673
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:674
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:675
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:676
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:677
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:678
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:679
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:680
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Taïwan)"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:681
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:682
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:683
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:684
 msgid "Scroll Lock"
 msgstr "Arrêt défilement"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:685
 msgid "Semi-colon on third level"
 msgstr "Point-virgule au 3e niveau"
 
-#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:686 ../rules/base.extras.xml.in.h:35
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbe (latin, Unicode, qwerty)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbe (latin, Unicode)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:689
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbe (latin, qwerty)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbe (Latin avec guillemets)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (Latin)"
 msgstr "Serbe (Latin)"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:692
 msgid "Serbian (Russia)"
 msgstr "Serbe (Russe)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:693
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Serbe (Z et ZHE intervertis)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:694
 msgid "Serbian (with guillemets)"
 msgstr "Serbe (avec guillemets)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Serbo-croate
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:695
 msgid "Serbo-Croatian (US)"
 msgstr "Serbo-Croate (US)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:696
 msgid "Shift cancels Caps Lock"
 msgstr "Maj. annule Verr. maj."
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:697
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Maj. n'annule pas Verr. maj., mais sélectionne le 3e niveau"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:698
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Maj. avec le pavé numérique se comporte comme dans Windows"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:699
 msgid "Shift+Caps Lock"
 msgstr "Maj.+ Verr. maj."
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Sindhi
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:700
 msgid "Sindhi"
 msgstr "Sindhî"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Cingalais
-#: ../rules/base.xml.in.h:698
-msgid "Sinhala"
-msgstr "Cingalais"
+#: ../rules/base.xml.in.h:701
+msgid "Sinhala (phonetic)"
+msgstr "Cingalais (phonétique)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Slovaque
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
 msgid "Slovak (extended Backslash)"
 msgstr "Slovaque (barre oblique inverse étendue)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
 msgid "Slovak (qwerty)"
 msgstr "Slovaque (qwerty)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Slovaque (qwerty, barre oblique inverse étendue)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Slov%C3%A8ne
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
 msgid "Slovenian"
 msgstr "Slovène"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Slovène (clavier US avec lettres slovènes)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Slovène (utilise des guillemets typographiques au lieu des guillemets simples)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Dvorak)"
 msgstr "Espagnol (Dvorak)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American)"
 msgstr "Espagnol (Amérique latine)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Espagnol (Amérique latine, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Espagnol (Amérique latine, sans touche morte)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Espagnol (Amérique latine, y compris la touche morte tilde)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (Macintosh)"
 msgstr "Espagnol (Macintosh)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Spanish (Sun dead keys)"
 msgstr "Espagnol (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Spanish (eliminate dead keys)"
 msgstr "Espagnol (sans touche morte)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Spanish (include dead tilde)"
 msgstr "Espagnol (y compris la touche morte tilde)"
 
 # https://help.ubuntu.com/7.04/user-guide/C/prefs-hardware.html
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 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 le serveur X"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Sun Type 5/6"
 msgstr "Sun type 5/6"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Swahili
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swahili (Kenya)"
 msgstr "Swahili (Kenya)"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swahili (Tanzania)"
 msgstr "Swahili (Tanzanie)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Intervertir Ctrl et Verr. maj."
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
 msgid "Swap ESC and Caps Lock"
 msgstr "Intervertir Échap. et Verr. maj."
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Su%C3%A9dois
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (Dvorak)"
 msgstr "Suédois (Dvorak)"
 
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:728
 msgid "Swedish (Macintosh)"
 msgstr "Suédois (Macintosh)"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
 msgid "Swedish (Svdvorak)"
 msgstr "Suédois (Svdvorak)"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:730
 msgid "Swedish (eliminate dead keys)"
 msgstr "Suédois (sans touche morte)"
 
-#: ../rules/base.xml.in.h:728
+#: ../rules/base.xml.in.h:731
 msgid "Swedish Sign Language"
 msgstr "Langue des signes suédoise"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:732
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablette tactile)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Syriaque
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
 msgid "Syriac"
 msgstr "Syriaque"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
 msgid "Syriac (phonetic)"
 msgstr "Syriaque (phonétique)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
 msgid "Taiwanese"
 msgstr "Taïwanais"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
 msgid "Taiwanese (indigenous)"
 msgstr "Taïwanais (indigène)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Tadjik
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
 msgid "Tajik"
 msgstr "Tadjik"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
 msgid "Tajik (legacy)"
 msgstr "Tadjik (obsolète)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Tamoul
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
 msgid "Tamil"
 msgstr "Tamoul"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamoul (Sri Lanka, machine à écrire, TAB)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamoul (Sri Lanka, Unicode)"
 
 # TAB et TSCII sont des codages tamouls.
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamoul (machine à écrire, TAB)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamoul (machine à écrire, TSCII)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
 msgid "Tamil (Unicode)"
 msgstr "Tamoul (Unicode)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamoul (clavier avec chiffres)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
 msgid "Tatar"
 msgstr "Tatar"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/T%C3%A9lougou
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
 msgid "Telugu"
 msgstr "Télougou"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Tha%C3%AF_%28langue%29
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
 msgid "Thai"
 msgstr "Thaï"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
 msgid "Thai (Pattachote)"
 msgstr "Thaï (Pattachote)"
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:751
 msgid "Thai (TIS-820.2538)"
 msgstr "Thaï (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
 msgid "Tibetan"
 msgstr "Tibétain"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibétain (avec chiffres ASCII)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Vers la touche correspondante sur un clavier Dvorak."
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Vers la touche correspondante sur un clavier qwerty."
 
 # http://who-t.blogspot.com/2010/11/xkb-mouse-emulation-removed-from.html
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Active ou désactive le contrôle de la souris (PointerKeys) avec Maj. + Verr. num."
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:758
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Classic"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Tswana
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
 msgid "Tswana"
 msgstr "Tswana"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Turc
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:762
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (Alt-Q)"
 msgstr "Turc (Alt-Q)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
 msgid "Turkish (F)"
 msgstr "Turc (F)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
 msgid "Turkish (Sun dead keys)"
 msgstr "Turc (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
 msgid "Turkish (international with dead keys)"
 msgstr "Turc (international avec touches mortes)"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Turkm%C3%A8ne
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:767
 msgid "Turkmen"
 msgstr "Turkmène"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmène (Alt-Q)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:772
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (mode 102/105:EU)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:773
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (mode 106:JP)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:774
 msgid "Udmurt"
 msgstr "Oudmourte"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Ukrainien
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukrainien (touches Windows)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Ukrainien (homophonique)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (legacy)"
 msgstr "Ukrainien (obsolète)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
 msgid "Ukrainian (phonetic)"
 msgstr "Ukrainien (phonétique)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukrainien (RSTU standard)"
 
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
 msgid "Ukrainian (typewriter)"
 msgstr "Ukrainien (machine à écrire)"
 
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:782
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Ajouts Unicode (opérateurs mathématiques et flèches)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:783
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Ajouts Unicode (opérateurs mathématiques et flèches). Les opérateurs mathématiques se trouvent au niveau par défaut"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:784
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Ourdou
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (Pakistan)"
 msgstr "Ourdou (Pakistan)"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Ourdou (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Ourdou (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
 msgid "Urdu (WinKeys)"
 msgstr "Ourdou (touches Windows)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:789
 msgid "Urdu (alternative phonetic)"
 msgstr "Ourdou (variante, phonétique)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
 msgid "Urdu (phonetic)"
 msgstr "Ourdou (phonétique)"
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=518156
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Utiliser les voyants du clavier pour indiquer une disposition alternative"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:792
 msgid "Using space key to input non-breakable space character"
 msgstr "Utiliser la barre d'espacement pour insérer une espace insécable"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:793
 msgid "Usual space at any level"
 msgstr "L'espace habituelle quelque-soit le niveau"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Ou%C3%AFghour
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:794
 msgid "Uyghur"
 msgstr "Ouïghour"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Ouzbek
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek"
 msgstr "Ouzbek"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
 msgid "Uzbek (Afghanistan)"
 msgstr "Ouzbek (Afghanistan)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Ouzbek (Afghanistan, OLPC)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
 msgid "Uzbek (Latin)"
 msgstr "Ouzbek (latin)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard"
 
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Wang 724 avec ajouts Unicode (opérateurs mathématiques et flèches)"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:802
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Wang 724 avec ajouts Unicode (opérateurs mathématiques et flèches). Les opérateurs mathématiques se trouvent au niveau par défaut"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:803
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Wolof_%28langue%29
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
 msgid "Wolof"
 msgstr "Wolof"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
 msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Clavier Internet"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Iakoute
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
 msgid "Yakut"
 msgstr "Iakute"
 
 # https://secure.wikimedia.org/wikipedia/fr/wiki/Yoruba
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
 msgid "Yoruba"
 msgstr "Yoruba"
 
 # http://hapax.qc.ca/glossaire.htm
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level"
 msgstr "Antiliant à chasse nulle au 2e niveau"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:809
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Antiliant à chasse nulle au 2e niveau. espace insécable au 3e niveau"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:810
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Antiliant à chasse nulle au 2e niveau. espace insécable au 3e niveau, rien au 4e niveau"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:811
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Antiliant à chasse nulle au 2e niveau. espace insécable au 3e niveau, espace fine insécable au 4e niveau"
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:812
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Antiliant à chasse nulle au 2e niveau. espace insécable au 3e niveau, liant à chasse nulle au 4e niveau"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:813
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Antiliant à chasse nulle au 2e niveau, liant à chasse nulle au 3e niveau"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:814
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Antiliant à chasse nulle au 2e niveau, liant à chasse nulle au 3e niveau, espace insécable au 4e niveau"
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:815
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Antiliant à chasse nulle au 3e niveau, liant à chasse nulle au 4e niveau"
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:816
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:817
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:820
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
 msgid "ca"
 msgstr "cb"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:831 ../rules/base.extras.xml.in.h:38
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:39
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:40
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:41
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:846 ../rules/base.extras.xml.in.h:42
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:849
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:852
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
+#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:43
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:858
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:863
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:867
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:871 ../rules/base.extras.xml.in.h:45
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:46
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:873
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:878
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:881
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:47
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
+#: ../rules/base.xml.in.h:888 ../rules/base.extras.xml.in.h:48
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:889 ../rules/base.extras.xml.in.h:49
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
+#: ../rules/base.xml.in.h:895 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:904
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:910
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:911
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:912
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
 msgid "zh"
 msgstr "zh"
 
@@ -3765,6 +3776,10 @@ msgstr "zh"
 msgid "APL Keyboard Symbols"
 msgstr "Symboles APL"
 
+#: ../rules/base.extras.xml.in.h:3
+msgid "Armenian (OLPC phonetic)"
+msgstr "Arménien (phonétique OLPC)"
+
 #: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
 msgstr "Atsina"
@@ -3778,84 +3793,119 @@ msgstr "Avestique"
 msgid "Couer D'alene Salish"
 msgstr "Salish Cœur d'Alène"
 
-#: ../rules/base.extras.xml.in.h:8
+#: ../rules/base.extras.xml.in.h:7
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Tatar de Crimée (Q dobroudja)"
+
+#: ../rules/base.extras.xml.in.h:9
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Anglais (USA, international, AltGr combinatoire Unicode)"
 
-#: ../rules/base.extras.xml.in.h:9
+#: ../rules/base.extras.xml.in.h:10
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Anglais (USA, international, AltGr combinatoire Unicode, variante)"
 
+#: ../rules/base.extras.xml.in.h:13
+msgid "German (US keyboard with German letters)"
+msgstr "Allemand (clavier US avec lettres allemandes)"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "Allemand (avec les lettres hongroises, sans touche mortes)"
+
 # http://www.thecanadianencyclopedia.com/index.cfm?PgNm=TCE&Params=f1ARTf0004367
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:15
 msgid "Kutenai"
-msgstr "kutenai"
+msgstr "Kutenai"
 
 # http://colemak.com/
-#: ../rules/base.extras.xml.in.h:13
+#: ../rules/base.extras.xml.in.h:17
 msgid "Latvian (US Colemak)"
 msgstr "Letton (Colemak USA)"
 
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:18
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Letton (Colemak USA, variante apostrophe)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:19
 msgid "Latvian (US Dvorak)"
 msgstr "Letton (Dvorak USA)"
 
-#: ../rules/base.extras.xml.in.h:16
+#: ../rules/base.extras.xml.in.h:20
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Letton (Dvorak USA, variante Y)"
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Letton (Dvorak USA, variante moins)"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Letton (Dvorak pour le programmeur USA)"
 
-#: ../rules/base.extras.xml.in.h:19
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Letton (Dvorak pour le programmeur USA, variante Y)"
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Letton (Dvorak pour le programmeur USA, variante moins)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:26
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Lituanien (Dvorak USA avec lettres lituaniennes)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:29
 msgid "Polish (international with dead keys)"
 msgstr "Polonais (international avec touches mortes)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:31
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Roumain (ergonomique dactylographique)"
 
-#: ../rules/base.extras.xml.in.h:29
-msgid "Russian (with UKR and BEL layout)"
-msgstr "Russe (avec dispositions UKR et BEL)"
+#: ../rules/base.extras.xml.in.h:33
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "Russe (Ukrainien-Biélorusse)"
 
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:34
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Serbe (accents combinatoires à la place des touches mortes)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "apl"
 msgstr "apl"
 
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:44
 msgid "kut"
 msgstr "kut"
 
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:50
 msgid "shs"
 msgstr "shs"
+
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Cameroun
+#~ msgid "English (Cameroon qwerty)"
+#~ msgstr "Anglais (Cameroun, qwerty)"
+
+#~ msgid "French (Cameroon azerty)"
+#~ msgstr "Français (Cameroun, azerty)"
+
+#~ msgid "German (qwerty)"
+#~ msgstr "Allemand (qwerty)"
+
+#~ msgid "Make Caps Lock an additional Ctrl"
+#~ msgstr "Faire de Verr. maj. un Contrôle supplémentaire"
+
+#~ msgid "Meta on Left Ctrl"
+#~ msgstr "Méta s'obtient avec Ctrl gauche"
+
+#~ msgid "Right Ctrl is mapped to Menu"
+#~ msgstr "Méta est placé sur Menu"
+
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Cingalais
+#~ msgid "Sinhala"
+#~ msgstr "Cingalais"
diff --git a/dist/xkeyboard-config/po/hu.po b/dist/xkeyboard-config/po/hu.po
index 9557c71b7..6f1678007 100644
--- a/dist/xkeyboard-config/po/hu.po
+++ b/dist/xkeyboard-config/po/hu.po
@@ -7,10 +7,10 @@
 # Gabor Kelemen <kelemeng@gnome.hu>, 2006, 2007, 2008, 2009, 2010, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.1.99\n"
+"Project-Id-Version: xkeyboard-config 2.3\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-03-25 22:27+0000\n"
-"PO-Revision-Date: 2011-04-04 01:36+0200\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-07-05 02:14+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "Language: hu\n"
@@ -89,153 +89,153 @@ msgid "Advance Scorpius KI"
 msgstr "Advance Scorpius KI"
 
 #: ../rules/base.xml.in.h:18
-msgid "Afg"
-msgstr "Afg"
-
-#: ../rules/base.xml.in.h:19
 msgid "Afghani"
 msgstr "Afgáni"
 
-#: ../rules/base.xml.in.h:20
+#: ../rules/base.xml.in.h:19
 msgid "Akan"
 msgstr "akan"
 
-#: ../rules/base.xml.in.h:21
+#: ../rules/base.xml.in.h:20
 msgid "Albanian"
 msgstr "Albán"
 
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:21
 msgid "Alt and Meta are on Alt keys"
 msgstr "Az Alt és Meta az Alt billentyűkön"
 
-#: ../rules/base.xml.in.h:23
+#: ../rules/base.xml.in.h:22
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Az Alt a jobb Win billentyűhöz van rendelve, a Super a Menühöz"
 
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:23
 msgid "Alt+Caps Lock"
 msgstr "Alt+Caps Lock"
 
-#: ../rules/base.xml.in.h:25
+#: ../rules/base.xml.in.h:24
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:26
+#: ../rules/base.xml.in.h:25
 msgid "Alt+Shift"
 msgstr "Alt+Shift"
 
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:26
 msgid "Alt+Space"
 msgstr "Alt+Szóköz"
 
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:27
 msgid "Alt/Win key behavior"
 msgstr "Az Alt/Win billentyűk viselkedése"
 
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:28
 msgid "Amharic"
 msgstr "Amhara"
 
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:29
 msgid "Any Alt key"
 msgstr "Bármely Alt billentyű"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr "Bármely Win billentyű"
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr "Bármely Win billentyű (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:33
+#: ../rules/base.xml.in.h:32
 msgid "Apple"
 msgstr "Apple"
 
-#: ../rules/base.xml.in.h:34
+#: ../rules/base.xml.in.h:33
 msgid "Apple Aluminium Keyboard (ANSI)"
 msgstr "Apple alumínium billentyűzet (ANSI)"
 
-#: ../rules/base.xml.in.h:35
+#: ../rules/base.xml.in.h:34
 msgid "Apple Aluminium Keyboard (ISO)"
 msgstr "Apple alumínium billentyűzet (ISO)"
 
-#: ../rules/base.xml.in.h:36
+#: ../rules/base.xml.in.h:35
 msgid "Apple Aluminium Keyboard (JIS)"
 msgstr "Apple alumínium billentyűzet (JIS)"
 
-#: ../rules/base.xml.in.h:37
+#: ../rules/base.xml.in.h:36
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "Apple alumínium billentyűzet PC-billentyűk emulálása (Print, Scroll Lock, Pause, Num Lock)"
 
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
 msgstr "Apple noteszgép"
 
-#: ../rules/base.xml.in.h:39
+#: ../rules/base.xml.in.h:38
 msgid "Arabic"
 msgstr "Arab"
 
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:39
 msgid "Arabic (Buckwalter)"
 msgstr "Arab (Buckwalter)"
 
-#: ../rules/base.xml.in.h:41
+#: ../rules/base.xml.in.h:40
 msgid "Arabic (Morocco)"
 msgstr "Arab (Marokkó)"
 
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:41
 msgid "Arabic (Pakistan)"
 msgstr "Arab (Pakisztán)"
 
-#: ../rules/base.xml.in.h:43
+#: ../rules/base.xml.in.h:42
 msgid "Arabic (Syria)"
 msgstr "Arab (Szíria)"
 
-#: ../rules/base.xml.in.h:44
+#: ../rules/base.xml.in.h:43
 msgid "Arabic (azerty)"
 msgstr "Arab (azerty)"
 
-#: ../rules/base.xml.in.h:45
+#: ../rules/base.xml.in.h:44
 msgid "Arabic (azerty/digits)"
 msgstr "Arab (azerty/számjegyek)"
 
-#: ../rules/base.xml.in.h:46
+#: ../rules/base.xml.in.h:45
 msgid "Arabic (digits)"
 msgstr "Arab (számjegyek)"
 
-#: ../rules/base.xml.in.h:47
+#: ../rules/base.xml.in.h:46
 msgid "Arabic (qwerty)"
 msgstr "Arab (qwerty)"
 
-#: ../rules/base.xml.in.h:48
+#: ../rules/base.xml.in.h:47
 msgid "Arabic (qwerty/digits)"
 msgstr "Arab (qwerty/számjegyek)"
 
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
 msgid "Armenian"
 msgstr "Örmény"
 
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:49
 msgid "Armenian (alternative eastern)"
 msgstr "Örmény (Alternatív keleti)"
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
 msgid "Armenian (alternative phonetic)"
 msgstr "Örmény (Alternatív fonetikus)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 msgid "Armenian (eastern)"
 msgstr "Örmény (keleti)"
 
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:52
 msgid "Armenian (phonetic)"
 msgstr "Örmény (fonetikus)"
 
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:53
 msgid "Armenian (western)"
 msgstr "Örmény (nyugati)"
 
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asztúri (Spanyolország, középső pontos H és alsó pontos L karakterrel)"
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "Asus noteszgép"
@@ -253,13 +253,13 @@ msgid "Avatime"
 msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijan (Cyrillic)"
-msgstr "Azerbajdzsán (cirill)"
-
-#: ../rules/base.xml.in.h:60
 msgid "Azerbaijani"
 msgstr "Azeri"
 
+#: ../rules/base.xml.in.h:60
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Azeri (cirill)"
+
 #: ../rules/base.xml.in.h:61
 msgid "Azona RF2300 wireless Internet Keyboard"
 msgstr "Azona RF2300 wireless Internet billentyűzet"
@@ -305,3452 +305,3444 @@ msgid "Backslash"
 msgstr "Fordított törtvonal"
 
 #: ../rules/base.xml.in.h:72
-msgid "Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr "Fordított törtvonal választja a 3. szintet, másik 3. szintet választóval együtt lenyomva zárol"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Fordított törtvonal (választja a 3. szintet, másik 3. szintet választóval együtt lenyomva zárol)"
 
 #: ../rules/base.xml.in.h:73
 msgid "Bambara"
 msgstr "Bambara"
 
 #: ../rules/base.xml.in.h:74
+msgid "Bashkirian"
+msgstr "Baskír"
+
+#: ../rules/base.xml.in.h:75
 msgid "Belarusian"
 msgstr "Belorusz"
 
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:76
 msgid "Belarusian (Latin)"
 msgstr "Belorusz (Latin)"
 
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:77
 msgid "Belarusian (legacy)"
 msgstr "Belorusz (hagyományos)"
 
-#: ../rules/base.xml.in.h:77
+#: ../rules/base.xml.in.h:78
 msgid "Belgian"
 msgstr "Belga"
 
-#: ../rules/base.xml.in.h:78
+#: ../rules/base.xml.in.h:79
 msgid "Belgian (ISO alternate)"
 msgstr "Belga (ISO alternatív)"
 
-#: ../rules/base.xml.in.h:79
+#: ../rules/base.xml.in.h:80
 msgid "Belgian (Sun dead keys)"
 msgstr "Belga (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belga (Wang 724-es modell, azerty)"
 
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:82
 msgid "Belgian (alternative)"
 msgstr "Belga (Alternatív)"
 
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:83
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belga (Alternatív, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belga (Alternatív, csak latin-9)"
 
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:85
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belga (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:85
+#: ../rules/base.xml.in.h:86
 msgid "BenQ X-Touch"
 msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:86
+#: ../rules/base.xml.in.h:87
 msgid "BenQ X-Touch 730"
 msgstr "BenQ X-Touch 730"
 
-#: ../rules/base.xml.in.h:87
+#: ../rules/base.xml.in.h:88
 msgid "BenQ X-Touch 800"
 msgstr "BenQ X-Touch 800"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:89
 msgid "Bengali"
 msgstr "Bengáli"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:90
 msgid "Bengali (Probhat)"
-msgstr "Bengáli (probhat)"
+msgstr "Bengáli (Probhat)"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:91
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berber (Marokkó, alternatív fonetikus Tifinagh)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berber (Marokkó, alternatív Tifinagh)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berber (Marokkó, kibővített fonetikus Tifinagh)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berber (Marokkó, kibővített Tifinagh)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berber (Marokkó, fonetikus Tifinagh)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berber (Marokkó, Tifinagh)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bosnian"
 msgstr "Bosnyák"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosnyák (US billentyűzet bosnyák billentyűkombinációkkal)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosnyák (US billentyűzet bosnyák betűkkel)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosnyák (Bosnyák billentyűkombinációk használata)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosnyák (»Csúcsos« idézőjelek használata idézetekhez)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Both Alt keys together"
 msgstr "A két Alt billentyű együtt"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Both Ctrl keys together"
 msgstr "A két Ctrl billentyű együtt"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Both Shift keys together"
 msgstr "A két Shift billentyű együtt"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:105
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "A két Shift billentyű együtt aktiválja a Caps Lockot, egy Shift deaktiválja"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "A két Shift billentyű együtt váltja a Caps Lockot"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "A két Shift billentyű együtt váltja a ShiftLockot"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:108
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:109
 msgid "Braille (left hand)"
 msgstr "Braille (balkezes)"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Braille (right hand)"
 msgstr "Braille (jobbkezes)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:111
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet billentyűzet"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:112
 msgid "Bulgarian"
 msgstr "Bolgár"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Bulgarian (new phonetic)"
 msgstr "Bolgár (új fonetikus)"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bolgár (hagyományos fonetikus)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:115
 msgid "Burmese"
 msgstr "Burmai"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:116
 msgid "Canadian Multilingual"
 msgstr "Kanadai többnyelvű"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Canadian Multilingual (first part)"
 msgstr "Kanadai többnyelvű (első rész)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "Canadian Multilingual (second part)"
 msgstr "Kanadai többnyelvű (második rész)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:119
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:120
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr "Caps Lock (választja a 3. szintet, másik 3. szintet választóval együtt lenyomva zárol)"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Caps Lock (az első kiosztásra), Shift+Caps Lock (az utolsó kiosztásra)"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:122
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Caps Lock (lenyomva tartva), Alt+Caps Lock végzi az eredeti nagybetűsítési műveletet"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:123
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "A Caps Lock Shiftként működik zárolással. A Shift „szünetelteti” a nagybetűsítést"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:124
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "A Caps Lock Shiftként működik zárolással. A Shift nem befolyásolja a nagybetűsítést"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock is disabled"
 msgstr "A Caps Lock letiltva"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock key behavior"
 msgstr "A Caps Lock billentyű viselkedése"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "A Caps Lock átváltja a Shiftet, így minden billentyű érintett"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "A Caps Lock átváltja a betűkarakterek normál kis- és nagybetűit"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "A Caps Lock belső nagybetűkre váltást használ. A Shift „szünetelteti” a nagybetűsítést"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "A Caps Lock belső nagybetűkre váltást használ. A Shift nem befolyásolja a nagybetűsítést"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:131
 msgid "Catalan"
 msgstr "Katalán"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:132
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Katalán (Spanyolország, középső pontos L karakterrel)"
+
+#: ../rules/base.xml.in.h:133
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:134
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:135
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:136
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (másik lehetőség)"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:137
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:138
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:139
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:141
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet billentyűzet"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:142
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:143
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:144
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:145
 msgid "Chinese"
 msgstr "Kínai"
 
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "Kínai (Tibeti ASCII számjegyekkel)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "Kínai (tibeti)"
-
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "Kínai (ujgur)"
+msgid "Chuvash"
+msgstr "Csuvas"
 
 #: ../rules/base.xml.in.h:147
+msgid "Chuvash (Latin)"
+msgstr "Csuvas (latin)"
+
+#: ../rules/base.xml.in.h:148
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:149
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:150
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access billentyűzet"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:151
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet billentyűzet (13 gombos)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:152
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet billentyűzet (18 gombos)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet billentyűzet (7 gombos)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:154
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq billentyűzet"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:155
 msgid "Compose key position"
 msgstr "A kombináló (Compose) billentyű helye"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:156
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:157
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "A Control az Alt billentyűkhöz, az Alt a Win billentyűkhöz van rendelve"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:158
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "A Control a Win billentyűkhöz van rendelve (és a szokásos Ctrl billentyűkhöz)"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:159
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:160
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Krími tatár (Dobrudzsa Q)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krími tatár (török Alt-Q)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krími tatár (török F)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krími tatár (török Q)"
+
+#: ../rules/base.xml.in.h:164
 msgid "Croatian"
 msgstr "Horvát"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:165
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Horvát (US billentyűzet horvát billentyűkombinációkkal)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:166
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Horvát (US billentyűzet horvát betűkkel)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
+#: ../rules/base.xml.in.h:167
+msgid "Croatian (use Croatian digraphs)"
 msgstr "Horvát (Horvát billentyűkombinációk használata)"
 
-#: ../rules/base.xml.in.h:162
-msgid "Croatian (Use guillemets for quotes)"
+#: ../rules/base.xml.in.h:168
+msgid "Croatian (use guillemets for quotes)"
 msgstr "Horvát (»Csúcsos« idézőjelek használata idézetekhez)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Ctrl key position"
 msgstr "Ctrl billentyű helyzete"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Czech"
 msgstr "Cseh"
 
-#: ../rules/base.xml.in.h:166
-msgid "Czech (UCW layout accented letters only)"
+#: ../rules/base.xml.in.h:172
+msgid "Czech (UCW layout, accented letters only)"
 msgstr "Cseh (UCW kiosztás, csak ékezetes betűk)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Cseh (US Dvorak CZ UCW támogatással)"
 
-#: ../rules/base.xml.in.h:168
-msgid "Czech (With &lt;\\|&gt; key)"
-msgstr "Cseh (az &lt;\\|&gt; billentyűvel)"
-
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:174
 msgid "Czech (qwerty)"
 msgstr "Cseh (qwerty)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:175
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Cseh (qwerty, kibővített fordított törtvonal)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:176
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Cseh (az &lt;\\|&gt; billentyűvel)"
+
+#: ../rules/base.xml.in.h:177
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Danish"
 msgstr "Dán"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Danish (Dvorak)"
 msgstr "Dán (Dvorak)"
 
-#: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
-msgstr "Dán (Mac)"
+#: ../rules/base.xml.in.h:180
+msgid "Danish (Macintosh)"
+msgstr "Dán (Macintosh)"
 
-#: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
-msgstr "Dán (Mac, halott billentyűk tiltása)"
+#: ../rules/base.xml.in.h:181
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Dán (Macintosh, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Danish (eliminate dead keys)"
 msgstr "Dán (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "Default numeric keypad keys"
 msgstr "Alapértelmezett számbillentyűk"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Dell 101-key PC"
 msgstr "Dell 101-gombos PC"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell Inspiron 6xxx/8xxx noteszgép"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell Precision M sorozatú noteszgép"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Dell Latitude series laptop"
 msgstr "Dell Latitude sorozatú noteszgép"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB multimédia-billentyűzet"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop billentyűzet"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dhivehi"
 msgstr "Dhivehi"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802 sorozat"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dutch"
 msgstr "Holland"
 
-#: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
-msgstr "Holland (Mac)"
+#: ../rules/base.xml.in.h:197
+msgid "Dutch (Macintosh)"
+msgstr "Holland (Macintosh)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dutch (Sun dead keys)"
 msgstr "Holland (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dutch (standard)"
 msgstr "Holland (szabványos)"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Enable extra typographic characters"
 msgstr "Extra tipográfiai karakterek engedélyezése"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
+msgid "English (Cameroon Dvorak)"
+msgstr "Angol (Kamerun Dvorak)"
+
+#: ../rules/base.xml.in.h:203
+msgid "English (Cameroon qwerty)"
+msgstr "Angol (Kamerun qwerty)"
+
+#: ../rules/base.xml.in.h:204
+msgid "English (Cameroon)"
+msgstr "Angol (Kamerun)"
+
+#: ../rules/base.xml.in.h:205
 msgid "English (Canada)"
 msgstr "Angol (Kanada)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:206
 msgid "English (Colemak)"
 msgstr "Angol (Colemak)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:207
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Angol (Dvorak alternatív nemzetközi, halott billentyűk nélkül)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:208
 msgid "English (Dvorak international with dead keys)"
 msgstr "Angol (Dvorak nemzetközi, halott billentyűkkel)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:209
 msgid "English (Dvorak)"
 msgstr "Angol (Dvorak)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:210
 msgid "English (Ghana)"
 msgstr "Angol (Ghána)"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:211
 msgid "English (Ghana, GILLBT)"
 msgstr "Angol (Ghána, GILLBT)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:212
 msgid "English (Ghana, multilingual)"
 msgstr "Angol (Ghána, többnyelvű)"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:213
 msgid "English (India, with RupeeSign)"
 msgstr "Angol (India, rúpiajellel)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:214
 msgid "English (Macintosh)"
 msgstr "Angol (Macintosh)"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
-msgstr "Angol (Mali, USA Mac)"
+#: ../rules/base.xml.in.h:215
+msgid "English (Mali, US Macintosh)"
+msgstr "Angol (Mali, USA Macintosh)"
 
-#: ../rules/base.xml.in.h:207
-msgid "English (Mali, USA international)"
+#: ../rules/base.xml.in.h:216
+msgid "English (Mali, US international)"
 msgstr "Angol (Mali, USA nemzetközi)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:217
 msgid "English (Nigeria)"
 msgstr "Angol (Nigéria)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:218
 msgid "English (South Africa)"
 msgstr "Angol (Dél-Afrika)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:219
 msgid "English (UK)"
 msgstr "Angol (UK)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:220
 msgid "English (UK, Colemak)"
 msgstr "Angol (UK, Colemak)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
-msgstr "Angol (UK, Dvorak UK központozás)"
+#: ../rules/base.xml.in.h:221
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Angol (UK, Dvorak UK központozással)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:222
 msgid "English (UK, Dvorak)"
 msgstr "Angol (USA, Dvorak)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
-msgstr "Angol (UK, Mac nemzetközi)"
+#: ../rules/base.xml.in.h:223
+msgid "English (UK, Macintosh international)"
+msgstr "Angol (UK, Macintosh nemzetközi)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
-msgstr "Angol (UK, Mac)"
+#: ../rules/base.xml.in.h:224
+msgid "English (UK, Macintosh)"
+msgstr "Angol (UK, Macintosh)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
-msgstr "Angol (UK, kibővített, Win billentyűk)"
+#: ../rules/base.xml.in.h:225
+msgid "English (UK, extended WinKeys)"
+msgstr "Angol (UK, kibővített Win billentyűk)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, international with dead keys)"
 msgstr "Angol (UK, nemzetközi, halott billentyűkkel)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
 msgid "English (US)"
 msgstr "Angol (US)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:228
 msgid "English (US, alternative international)"
 msgstr "Angol (USA, alternatív nemzetközi)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:229
 msgid "English (US, international with dead keys)"
 msgstr "Angol (US, nemzetközi, halott billentyűkkel)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:230
 msgid "English (US, with euro on 5)"
 msgstr "Angol (US, Euró jel az 5-ön)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:231
 msgid "English (classic Dvorak)"
 msgstr "Angol (klasszikus Dvorak)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:232
 msgid "English (international AltGr dead keys)"
 msgstr "Angol (Nemzetközi, AltGr halott billentyűkkel)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:233
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Angol (kiosztás átváltása a szorzás/osztás billentyűn)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:234
 msgid "English (left handed Dvorak)"
 msgstr "Angol (balkezes Dvorak)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:235
 msgid "English (programmer Dvorak)"
 msgstr "Angol (programozói Dvorak)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:236
 msgid "English (right handed Dvorak)"
 msgstr "Angol (jobbkezes Dvorak)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:237
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:238
 msgid "Enter on keypad"
 msgstr "Enter a számbillentyűzeten"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:239
 msgid "Esperanto"
 msgstr "Eszperantó"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:240
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Eszperantó (Portugália, Nativo)"
+
+#: ../rules/base.xml.in.h:241
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Eszperantó (elcsúszott pontosvessző és idézőjel, elavult)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:242
 msgid "Estonian"
 msgstr "Észt"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:243
 msgid "Estonian (Dvorak)"
 msgstr "Észt (Dvorak)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:244
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Észt (US billentyűzet észt betűkkel)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:245
 msgid "Estonian (eliminate dead keys)"
 msgstr "Észt (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:246
 msgid "Euro on 2"
 msgstr "Euro jel a 2-es billentyűn"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:247
 msgid "Euro on 4"
 msgstr "Euro jel a 4-es billentyűn"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:248
 msgid "Euro on 5"
 msgstr "Euro jel az 5-ös billentyűn"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:249
 msgid "Euro on E"
 msgstr "Euro jel az E billentyűn"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:250
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:251
 msgid "Ewe"
 msgstr "ewe"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:252
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:253
 msgid "Faroese"
 msgstr "Feröeri"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:254
 msgid "Faroese (eliminate dead keys)"
 msgstr "Feröeri (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:255
 msgid "Filipino"
 msgstr "Filippínó"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:256
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filippínó (Capewell-Dvorak Baybayin)"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:257
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filippínó (Capewell-Dvorak Latin)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:258
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filippínó (Capewell-QWERF 2006 Baybayin)"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:259
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filippínó (Capewell-QWERF 2006 Latin)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:260
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filippínó (Colemak Baybayin)"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Colemak Latin)"
 msgstr "Filippínó (Colemak Latin)"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:262
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Filippínó (Dvorak Baybayin)"
+
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filippínó (Dvorak Latin)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filippínó (QWERTY Baybayin)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:265
 msgid "Finnish"
 msgstr "Finn"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
-msgstr "Finn (Mac)"
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
+msgstr "Finn (Macintosh)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:267
 msgid "Finnish (classic)"
 msgstr "Finn (klasszikus)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:268
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finn (klasszikus, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:258
-msgid "Finnish (northern Saami)"
-msgstr "Finn (Északi szami)"
-
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:271
 msgid "Four-level key with abstract separators"
 msgstr "Negyedik szintű billentyű absztrakt elválasztókkal"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:272
 msgid "Four-level key with comma"
 msgstr "Negyedik szintű billentyű vesszővel"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:273
 msgid "Four-level key with dot"
 msgstr "Negyedik szintű billentyű ponttal"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:274
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Negyedik szintű billentyű ponttal, latin-9 korlátozás"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:275
 msgid "Four-level key with momayyez"
 msgstr "Negyedik szintű billentyű momayyez-val"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:276
 msgid "French"
 msgstr "Francia"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:277
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Finn (Bepo, ergonomikus, Dvorak kiosztás)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:278
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Finn (Bepo, ergonomikus, Dvorak kiosztás, csak latin-9)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:279
 msgid "French (Breton)"
 msgstr "Francia (breton)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:280
+msgid "French (Cameroon azerty)"
+msgstr "Francia (Kamerun azerty)"
+
+#: ../rules/base.xml.in.h:281
+msgid "French (Cameroon)"
+msgstr "Francia (Kamerun)"
+
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "Francia (Kanada)"
+
+#: ../rules/base.xml.in.h:283
 msgid "French (Canada, Dvorak)"
 msgstr "Francia (Kanada, Dvorak)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:284
 msgid "French (Canada, legacy)"
 msgstr "Francia (Kanada, hagyományos)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:285
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Francia (Kongói Demokratikus Köztársaság)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:286
 msgid "French (Dvorak)"
 msgstr "Francia (Dvorak)"
 
-#: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
-msgstr "Francia (Grúz AZERTY Tskapo)"
-
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:287
 msgid "French (Guinea)"
 msgstr "Francia (Guinea)"
 
-#: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
-msgstr "Francia (Mac)"
+#: ../rules/base.xml.in.h:288
+msgid "French (Macintosh)"
+msgstr "Francia (Macintosh)"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:289
 msgid "French (Mali, alternative)"
 msgstr "Francia (Mali, alternatív)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:290
 msgid "French (Morocco)"
 msgstr "Francia (Marokkó)"
 
-#: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
-msgstr "Francia (okcitán)"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:291
 msgid "French (Sun dead keys)"
 msgstr "Francia (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:292
 msgid "French (Switzerland)"
 msgstr "Francia (Svájc)"
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
-msgstr "Francia (Svájc, Mac)"
+#: ../rules/base.xml.in.h:293
+msgid "French (Switzerland, Macintosh)"
+msgstr "Francia (Svájc, Macintosh)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:294
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Francia (Svájc, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:295
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Francia (Svájc, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:296
 msgid "French (alternative)"
 msgstr "Francia (alternatív)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:297
 msgid "French (alternative, Sun dead keys)"
 msgstr "Francia (alternatív, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:298
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Francia (alternatív, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:299
 msgid "French (alternative, latin-9 only)"
 msgstr "Francia (alternatív, csak latin-9)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:300
 msgid "French (eliminate dead keys)"
 msgstr "Francia (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
-msgstr "Francia (hagyományos alternatív)"
+#: ../rules/base.xml.in.h:301
+msgid "French (legacy, alternative)"
+msgstr "Francia (hagyományos, alternatív)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:302
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Francia (hagyományos, alternatív, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:303
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Francia (hagyományos, alternatív, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:304
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO noteszgép"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:305
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:295
-msgid "GBr"
-msgstr "GBr"
-
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:306
 msgid "Ga"
 msgstr "ga"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:307
 msgid "Generic 101-key PC"
 msgstr "Általános 101 gombos PC"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:308
 msgid "Generic 102-key (Intl) PC"
 msgstr "Általános 102 gombos (nemzetközi) PC"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:309
 msgid "Generic 104-key PC"
 msgstr "Általános 104 gombos PC"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:310
 msgid "Generic 105-key (Intl) PC"
 msgstr "Általános 105 gombos (nemzetközi) PC"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:311
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:312
 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:303
+#: ../rules/base.xml.in.h:313
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:314
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:315
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:316
 msgid "Georgian"
 msgstr "Grúz"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:317
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Grúz (Franciaország, AZERTY Tskapo)"
+
+#: ../rules/base.xml.in.h:318
+msgid "Georgian (Italy)"
+msgstr "Grúz (Olaszország)"
+
+#: ../rules/base.xml.in.h:319
 msgid "Georgian (MESS)"
 msgstr "Grúz (MESS)"
 
-#: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
-msgstr "Grúz (oszét)"
-
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:320
 msgid "Georgian (ergonomic)"
 msgstr "Grúz (ergonomikus)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:321
 msgid "German"
 msgstr "Német"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:322
 msgid "German (Austria)"
 msgstr "Német (Ausztria)"
 
-#: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
-msgstr "Német (Ausztria, Mac)"
+#: ../rules/base.xml.in.h:323
+msgid "German (Austria, Macintosh)"
+msgstr "Német (Ausztria, Macintosh)"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:324
 msgid "German (Austria, Sun dead keys)"
 msgstr "Német (Ausztria, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:325
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Német (Ausztria, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:326
 msgid "German (Dvorak)"
 msgstr "Német (Dvorak)"
 
-#: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
-msgstr "Német (Mac)"
+#: ../rules/base.xml.in.h:327
+msgid "German (Macintosh)"
+msgstr "Német (Macintosh)"
 
-#: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
-msgstr "Német (Mac, halott billentyűk tiltása)"
+#: ../rules/base.xml.in.h:328
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Német (Macintosh, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:329
 msgid "German (Neo 2)"
 msgstr "Német (Neo 2)"
 
-#: ../rules/base.xml.in.h:319
-msgid "German (Romanian keyboard with German letters)"
-msgstr "Német (Román billentyűzet német betűkkel)"
-
-#: ../rules/base.xml.in.h:320
-msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
-msgstr "Német (Román billentyűzet német betűkkel, halott billentyűk tiltása)"
-
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:330
 msgid "German (Sun dead keys)"
 msgstr "Német (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
-msgstr "Német (Svájc, Mac)"
+#: ../rules/base.xml.in.h:331
+msgid "German (Switzerland)"
+msgstr "Német (Svájc)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
+msgstr "Német (Svájc, Macintosh)"
+
+#: ../rules/base.xml.in.h:333
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Német (Svájc, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:334
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Német (Svájc, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:335
+msgid "German (Switzerland, legacy)"
+msgstr "Német (Svájc, hagyományos)"
+
+#: ../rules/base.xml.in.h:336
 msgid "German (dead acute)"
 msgstr "Német (halott ékezet)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:337
 msgid "German (dead grave acute)"
 msgstr "Német (Halott grave ékezet)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:338
 msgid "German (eliminate dead keys)"
 msgstr "Német (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
-msgstr "Német (alsó szorb qwertz)"
-
-#: ../rules/base.xml.in.h:329
-msgid "German (lower Sorbian)"
-msgstr "Német (alsó szorb)"
-
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:339
 msgid "German (qwerty)"
 msgstr "Német (qwerty)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:340
 msgid "Greek"
 msgstr "Görög"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:341
 msgid "Greek (eliminate dead keys)"
 msgstr "Görög (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:342
 msgid "Greek (extended)"
 msgstr "Görög (kibővített)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:343
 msgid "Greek (polytonic)"
 msgstr "Görög (politonikus)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:344
 msgid "Greek (simple)"
 msgstr "Görög (egyszerű)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:345
 msgid "Gujarati"
 msgstr "Gudzsarati"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:346
 msgid "Gyration"
 msgstr "Forgás"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:347
 msgid "HTC Dream"
 msgstr "HTC Dream"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:348
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking billentyűzet"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:349
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking billentyűzet Mac-hez"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:350
 msgid "Hausa"
 msgstr "hausza"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:351
 msgid "Hebrew"
 msgstr "Héber"
 
-#: ../rules/base.xml.in.h:343
-msgid "Hebrew (Phonetic)"
-msgstr "Héber (fonetikus)"
-
-#: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
-msgstr "Héber (Tiro)"
+#: ../rules/base.xml.in.h:352
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Héber (Bibliai, Tiro)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "Hebrew (lyx)"
 msgstr "Héber (lyx)"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
+msgid "Hebrew (phonetic)"
+msgstr "Héber (fonetikus)"
+
+#: ../rules/base.xml.in.h:355
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet billentyűzet"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:356
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard Mini 110 Notebook"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:357
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x multimédia billentyűzet"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:367
 msgid "Hexadecimal"
 msgstr "Hexadecimális"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:368
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (Bolnagri)"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:369
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:370
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:371
 msgid "Htc Dream phone"
 msgstr "Htc Dream telefon"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:372
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:373
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Magyar (101/qwerty/vessző/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:374
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Magyar (101/qwerty/vessző/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Magyar (101/qwerty/pont/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Magyar (101/qwerty/pont/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Magyar (101/qwertz/vessző/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Magyar (101/qwertz/vessző/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Magyar (101/qwertz/pont/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Magyar (101/qwertz/pont/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Magyar (102/qwerty/vessző/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Magyar (102/qwerty/vessző/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Magyar (102/qwerty/pont/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Magyar (102/qwerty/pont/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Magyar (102/qwertz/vessző/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Magyar (102/qwertz/vessző/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Magyar (102/qwertz/pont/halott billentyűk)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Magyar (102/qwertz/pont/halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Magyar (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (qwerty)"
 msgstr "Magyar (qwerty)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (standard)"
 msgstr "Magyar (szabványos)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:392
 msgid "Hyper is mapped to Win-keys"
 msgstr "A Hyper a Win billentyűkhöz van rendelve"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:393
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:394
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:395
 msgid "IBM Space Saver"
 msgstr "IBM helytakarékos"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:396
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:397
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:398
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:399
 msgid "Icelandic"
 msgstr "Izlandi"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:400
 msgid "Icelandic (Dvorak)"
 msgstr "Izlandi (Dvorak)"
 
-#: ../rules/base.xml.in.h:392
-msgid "Icelandic (Mac)"
-msgstr "Izlandi (Mac)"
+#: ../rules/base.xml.in.h:401
+msgid "Icelandic (Macintosh)"
+msgstr "Izlandi (Macintosh)"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic (Sun dead keys)"
 msgstr "Izlandi (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Izlandi (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:404
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:405
 msgid "Indian"
 msgstr "Indiai"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:406
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:407
 msgid "Iraqi"
 msgstr "Iraki"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:408
 msgid "Irish"
 msgstr "Ír"
 
-#: ../rules/base.xml.in.h:400
-msgid "Irish (CloGaelach)"
-msgstr "Ír (CloGaelach)"
-
-#: ../rules/base.xml.in.h:401
-msgid "Irish (Ogham IS434)"
-msgstr "Ír (Ogham IS434)"
-
-#: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
-msgstr "Ír (Ogham)"
-
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:409
 msgid "Irish (UnicodeExpert)"
 msgstr "Ír (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:410
 msgid "Italian"
 msgstr "Olasz"
 
-#: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
-msgstr "Olasz (grúz)"
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
-msgstr "Olasz (Mac)"
+#: ../rules/base.xml.in.h:411
+msgid "Italian (Macintosh)"
+msgstr "Olasz (Macintosh)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:412
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Olasz (US billentyűzet olasz betűkkel)"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:413
 msgid "Italian (eliminate dead keys)"
 msgstr "Olasz (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:414
 msgid "Japanese"
 msgstr "Japán"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:415
 msgid "Japanese (Kana 86)"
 msgstr "Japán (Kana 86)"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:416
 msgid "Japanese (Kana)"
 msgstr "Japán (Kana)"
 
-#: ../rules/base.xml.in.h:412
-msgid "Japanese (Mac)"
-msgstr "Japán (Mac)"
+#: ../rules/base.xml.in.h:417
+msgid "Japanese (Macintosh)"
+msgstr "Japán (Macintosh)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (OADG 109A)"
 msgstr "Japán (OADG 109A)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japán (PC-98xx sorozat)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:420
 msgid "Japanese keyboard options"
 msgstr "Japán billentyűzet-beállítások"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:421
+msgid "Kalmyk"
+msgstr "Kalmük"
+
+#: ../rules/base.xml.in.h:422
 msgid "Kana Lock key is locking"
 msgstr "A Kana zárolásbillentyű zárol"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:423
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:424
+msgid "Kashubian"
+msgstr "Kasub"
+
+#: ../rules/base.xml.in.h:425
 msgid "Kazakh"
 msgstr "Kazah"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:426
 msgid "Kazakh (with Russian)"
 msgstr "Kazah (orosszal)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:427
 msgid "Key sequence to kill the X server"
 msgstr "Billentyűsorozat az X kiszolgáló kilövéséhez"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:428
 msgid "Key to choose 3rd level"
 msgstr "Billentyű a harmadik szint választásához"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:429
 msgid "Key to choose 5th level"
 msgstr "Billentyű az ötödik szint választásához"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:430
 msgid "Key(s) to change layout"
 msgstr "A kiosztást megváltoztató billentyűk"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:431
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:425
-msgid "Khmer (Cambodian)"
+#: ../rules/base.xml.in.h:432
+msgid "Khmer (Cambodia)"
 msgstr "Khmer (Kambodzsa)"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:433
 msgid "Kikuyu"
 msgstr "Kikuju"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:434
 msgid "Kinesis"
 msgstr "Kinesis"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:435
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:436
 msgid "Korean"
 msgstr "Koreai"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Korean (101/104 key compatible)"
 msgstr "Koreai (101/104 gomb kompatibilis)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurd (Irán, arab-latin)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Kurdish (Iran, F)"
 msgstr "Kurd (Irán, F)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kurd (Irán, latin Alt-Q)"
+
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurd (Irán, latin Q)"
 
-#: ../rules/base.xml.in.h:433
-msgid "Kurdish (Iran, latin alt-Q)"
-msgstr "Kurd (Irán, latin Alt-Q)"
-
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurd (Irak, arab-latin)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurd (Irak, F)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurd (Irak, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurd (Irak, latin Q)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Syria, F)"
 msgstr "Kurd (Szíria, F)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurd (Szíria, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurd (Szíria, latin Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurd (Törökország, F)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurd (Törökország, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurd (Törökország, latin Q)"
 
-#: ../rules/base.xml.in.h:444
-msgid "Kutenai"
-msgstr "Kutenai"
-
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:452
 msgid "Kyrgyz"
 msgstr "Kirgiz"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:453
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgiz (fonetikus)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:454
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:455
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Lao (STEA által javasolt szabványos)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:456
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Compaq noteszgép (pl. Armada) noteszgép-billentyűzet"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:457
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Compaq noteszgép (pl. Presario) Internet billentyűzet"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:458
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "eMachines m68xx noteszgép"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
 msgid "Latvian"
 msgstr "Lett"
 
-#: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
-msgstr "Lett (aposztróf (') változat)"
-
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:460
 msgid "Latvian (F variant)"
 msgstr "Lett (F-változat)"
 
-#: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
-msgstr "Lett (Tilde ~ változat)"
+#: ../rules/base.xml.in.h:461
+msgid "Latvian (adapted)"
+msgstr "Lett (adaptált)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:462
+msgid "Latvian (apostrophe variant)"
+msgstr "Lett (aposztróf változat)"
+
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Lett (ergonomikus, ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:464
+msgid "Latvian (modern)"
+msgstr "Lett (modern)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "Lett (tilde változat)"
+
+#: ../rules/base.xml.in.h:466
 msgid "Left Alt"
 msgstr "Bal Alt"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:467
 msgid "Left Alt (while pressed)"
 msgstr "Bal Alt (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:468
 msgid "Left Alt is swapped with Left Win"
 msgstr "A bal Alt fel van cserélve a bal Win billentyűvel"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:469
 msgid "Left Ctrl"
 msgstr "Bal Ctrl"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:470
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Bal Ctrl (az első kiosztásra), jobb Ctrl (az utolsó kiosztásra)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:471
 msgid "Left Ctrl+Left Shift"
 msgstr "Bal Ctrl+Bal Shift"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:472
 msgid "Left Shift"
 msgstr "Bal Shift"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:473
 msgid "Left Win"
 msgstr "Bal Win"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:474
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Bal Win (az első kiosztásra), jobb Win/Menü (az utolsó kiosztásra)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:475
 msgid "Left Win (while pressed)"
 msgstr "Bal Win (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:476
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Bal Win választja az 5. szintet, másik 5. szintet választóval együtt lenyomva zárol"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:477
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Bal Win választja az 5. szintet, másik 5. szintet választóval együtt lenyomva zárol, egy lenyomása feloldja a zárolást"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:478
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Bal Ctrl + Bal Win (az első kiosztásra), jobb Ctrl + Menü (a második kiosztásra)"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:479
 msgid "Legacy"
 msgstr "Örökölt"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:480
 msgid "Legacy Wang 724"
 msgstr "Hagyományos Wang 724"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:482
 msgid "Legacy key with comma"
 msgstr "Hagyományos számbillentyűzet vesszővel"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:483
 msgid "Legacy key with dot"
 msgstr "Hagyományos számbillentyűzet ponttal"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
 msgid "Lithuanian"
 msgstr "Litván"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:485
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litván (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:486
 msgid "Lithuanian (LEKP)"
 msgstr "Litván (LEKP)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:487
 msgid "Lithuanian (LEKPa)"
 msgstr "Litván (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:488
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litván (US billentyűzet litván betűkkel)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (standard)"
 msgstr "Litván (szabványos)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:490
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Access billentyűzet"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:491
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:492
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop (másik lehetőség)"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:493
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro (másik lehetőség)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:500
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Logitech G15, extra billentyűk a G15daemon közvetítésével"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech általános billentyűzet"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Logitech Internet 350 billentyűzet"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet billentyűzet"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:504
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator billentyűzet"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Media Elite Keyboard"
 msgstr "Logitech Media Elite billentyűzet"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Logitech Ultra-X vezeték nélküli asztali médiabillentyűzet"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Logitech Ultra-X billentyűzet"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:508
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Logitech diNovo Edge billentyűzet"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:509
 msgid "Logitech diNovo Keyboard"
 msgstr "Logitech diNovo billentyűzet"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:510
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:511
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless billentyűzet (modell: Y-RB6)"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:512
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:513
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:514
+msgid "Lower Sorbian"
+msgstr "Alsó szorb"
+
+#: ../rules/base.xml.in.h:515
+msgid "Lower Sorbian (qwertz)"
+msgstr "Alsó szorb (qwertz)"
+
+#: ../rules/base.xml.in.h:516
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:517
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Intl)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:518
 msgid "Macedonian"
 msgstr "Macedón"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:519
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macedón (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:520
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:521
 msgid "Macintosh Old"
 msgstr "Macintosh Old"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:522
 msgid "Make Caps Lock an additional Backspace"
 msgstr "A Caps Lock használata másik Backspace-ként"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:523
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "A Caps Lock használata másik Controlként, de a Caps_Lock szimbólum megtartása"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:524
 msgid "Make Caps Lock an additional Ctrl"
 msgstr "A Caps Lock használata másik Ctrl-ként"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:525
 msgid "Make Caps Lock an additional ESC"
 msgstr "A Caps Lock használata másik Esc-ként"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Hyper"
 msgstr "A Caps Lock használata másik Hyper-ként"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "A Caps Lock használata másik Num Lock-ként"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional Super"
 msgstr "A Caps Lock használata másik Super-ként"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:529
 msgid "Malayalam"
 msgstr "Malajalam"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:530
 msgid "Malayalam (Lalitha)"
 msgstr "Malajalam (lalitha)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:531
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malajalam (bővített Inscript rúpiajellel)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:532
 msgid "Maltese"
 msgstr "Máltai"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:533
 msgid "Maltese (with US layout)"
 msgstr "Máltai (US kiosztással)"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:534
+msgid "Maori"
+msgstr "Maori"
+
+#: ../rules/base.xml.in.h:535
+msgid "Mari"
+msgstr "Mari"
+
+#: ../rules/base.xml.in.h:536
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:537
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access billentyűzet"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:538
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:539
 msgid "Menu"
 msgstr "Menü"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:540
 msgid "Meta is mapped to Left Win"
 msgstr "A Meta a bal Win billentyűhöz van rendelve"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:541
 msgid "Meta is mapped to Win keys"
 msgstr "A Meta a Win billentyűkhöz van rendelve"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:542
 msgid "Meta on Left Ctrl"
 msgstr "Meta a bal Ctrl-en"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:543
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve Keyboard 2000"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:544
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet billentyűzet"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:545
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, svéd"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural Keyboard Elite"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:550
 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:537
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:553
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office billentyűzet"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft vezeték nélküli multimédia billentyűzet 1.0A"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:555
 msgid "Miscellaneous compatibility options"
 msgstr "Egyéb kompatibilitási beállítások"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:556
 msgid "Mongolian"
 msgstr "Mongol"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:557
 msgid "Montenegrin"
 msgstr "Montenegrói"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:558
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrói (Cirill, »csúcsos« idézőjelekkel)"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:559
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrói (Cirill)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrói (Cirill, a Z és a ZHE felcserélve)"
 
-#: ../rules/base.xml.in.h:547
-msgid "Montenegrin (Latin qwerty)"
-msgstr "Montenegrói (Latin qwerty)"
+#: ../rules/base.xml.in.h:561
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Montenegrói (Latin Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:548
-msgid "Montenegrin (Latin unicode qwerty)"
-msgstr "Montenegrói (Latin unicode qwerty)"
+#: ../rules/base.xml.in.h:562
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Montenegrói (Latin Unicode)"
 
-#: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
-msgstr "Montenegrói (Latin unicode)"
+#: ../rules/base.xml.in.h:563
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Montenegrói (Latin qwerty)"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrói (Latin, »csúcsos« idézőjelekkel)"
 
-#: ../rules/base.xml.in.h:551
-msgid "Māori"
-msgstr "Maori"
-
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:565
 msgid "NICOLA-F style Backspace"
 msgstr "NICOLA-F stílusú backspace"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:566
 msgid "Nepali"
 msgstr "Nepáli"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:567
 msgid "Non-breakable space character at fourth level"
 msgstr "Nem törhető szóköz karakter a negyedik szinten"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:568
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Nem törhető szóköz karakter a negyedik szinten, keskeny nem törhető szóköz karakter a hatodik szinten"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:569
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Nem törhető szóköz karakter a negyedik szinten, keskeny nem törhető szóköz karakter a hatodik szinten (a Ctrl+Shift segítségével)"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at second level"
 msgstr "Nem törhető szóköz karakter a második szinten"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at third level"
 msgstr "Nem törhető szóköz karakter a harmadik szinten"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:572
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Mem törhető szóköz karakter a harmadik szinten és semmi a negyediken"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Nem törhető szóköz karakter a harmadik szinten, keskeny nem törhető szóköz karakter a negyedik szinten"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:574
+msgid "Northern Saami (Finland)"
+msgstr "Északi szami (Finnország)"
+
+#: ../rules/base.xml.in.h:575
+msgid "Northern Saami (Norway)"
+msgstr "Északi szami (Norvégia)"
+
+#: ../rules/base.xml.in.h:576
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Északi szami (Norvégia, halott billentyűk tiltása)"
+
+#: ../rules/base.xml.in.h:577
+msgid "Northern Saami (Sweden)"
+msgstr "Északi szami (Svédország)"
+
+#: ../rules/base.xml.in.h:578
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:579
 msgid "Norwegian"
 msgstr "Norvég"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:580
 msgid "Norwegian (Dvorak)"
 msgstr "Norvég (Dvorak)"
 
-#: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
-msgstr "Norvég (Mac)"
-
-#: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
-msgstr "Norvég (Mac, halott billentyűk tiltása)"
+#: ../rules/base.xml.in.h:581
+msgid "Norwegian (Macintosh)"
+msgstr "Norvég (Macintosh)"
 
-#: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
-msgstr "Norvég (északi szami)"
+#: ../rules/base.xml.in.h:582
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Norvég (Macintosh, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norvég (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:568
-msgid "Norwegian (northern Saami, eliminate dead keys)"
-msgstr "Norvég (északi szami, halott billentyűk tiltása)"
-
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:584
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:585
 msgid "Numeric keypad delete key behaviour"
 msgstr "Számbillentyűzet Delete billentyűjének viselkedése"
 
-#: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
-msgstr "A számbillentyűk úgy működjenek, mint Macen"
+#: ../rules/base.xml.in.h:586
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "A számbillentyűk úgy működjenek, mint Macintoshon"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:587
 msgid "Numeric keypad layout selection"
 msgstr "Számbillentyűzet kiosztásválasztása"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:588
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:589
+msgid "Occitan"
+msgstr "Okcitán"
+
+#: ../rules/base.xml.in.h:590
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:591
+msgid "Ogham (IS434)"
+msgstr "Ogham (IS434)"
+
+#: ../rules/base.xml.in.h:592
 msgid "Oriya"
 msgstr "Orija"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:593
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Ortek MCK-800 MM/Internet billentyűzet"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:594
+msgid "Ossetian (Georgia)"
+msgstr "Oszét (Grúzia)"
+
+#: ../rules/base.xml.in.h:595
+msgid "Ossetian (WinKeys)"
+msgstr "Oszét (Win billentyűk)"
+
+#: ../rules/base.xml.in.h:596
+msgid "Ossetian (legacy)"
+msgstr "Oszét (hagyományos)"
+
+#: ../rules/base.xml.in.h:597
 msgid "PC-98xx Series"
 msgstr "PC-98xx Series"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:598
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Pannon ruszin (homofon)"
+
+#: ../rules/base.xml.in.h:599
 msgid "Pashto"
 msgstr "Pastu"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:600
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Pastu (Afganisztán, OLPC)"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:601
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
 msgid "Persian"
 msgstr "Perzsa"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:603
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Perzsa (Afganisztán, dari OLPC)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:604
 msgid "Persian (with Persian Keypad)"
 msgstr "Perzsa (perzsa számbillentyűzettel)"
 
-#: ../rules/base.xml.in.h:583
-msgid "Philippines - Dvorak (Baybayin)"
-msgstr "Fülöp-szigetek – Dvorak (Baybayin)"
-
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
 msgid "Polish"
 msgstr "Lengyel"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:606
 msgid "Polish (Dvorak)"
 msgstr "Lengyel (Dvorak)"
 
-#: ../rules/base.xml.in.h:586
-msgid "Polish (Dvorak, polish quotes on key 1)"
+#: ../rules/base.xml.in.h:607
+msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Lengyel (Dvorak, lengyel idézőjelek az 1 billentyűn)"
 
-#: ../rules/base.xml.in.h:587
-msgid "Polish (Dvorak, polish quotes on quotemark key)"
+#: ../rules/base.xml.in.h:608
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Lengyel (Dvorak, lengyel idézőjelek az idézőjel billentyűn)"
 
-#: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
-msgstr "Lengyel (kasub)"
-
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:609
 msgid "Polish (programmer Dvorak)"
 msgstr "Lengyel (programozói Dvorak)"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:610
 msgid "Polish (qwertz)"
 msgstr "Lengyel (qwertz)"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:611
 msgid "Portuguese"
 msgstr "Portugál"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:612
 msgid "Portuguese (Brazil)"
 msgstr "Portugál (brazil)"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:613
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugál (brazil, Dvorak)"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugál (brazil, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugál (brazil, natív az eszperantóhoz)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugál (brazil, natív a US billentyűzetekhez)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugál (brazil, natív)"
 
-#: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
-msgstr "Portugál (Mac)"
-
-#: ../rules/base.xml.in.h:599
-msgid "Portuguese (Mac, Sun dead keys)"
-msgstr "Portugál (Mac, Sun halott billentyűk)"
+#: ../rules/base.xml.in.h:618
+msgid "Portuguese (Macintosh)"
+msgstr "Portugál (Macintosh)"
 
-#: ../rules/base.xml.in.h:600
-msgid "Portuguese (Mac, eliminate dead keys)"
-msgstr "Portugál (Mac, halott billentyűk tiltása)"
+#: ../rules/base.xml.in.h:619
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portugál (Macintosh, Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr "Portugál (natív az eszperantóhoz)"
+#: ../rules/base.xml.in.h:620
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Portugál (Macintosh, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugál (natív az USA billentyűzetekhez)"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Nativo)"
 msgstr "Portugál (natív)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugál (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugál (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:625
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:626
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:627
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Pandzsábi (Gurmukhi Jhelum)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:628
 msgid "Punjabi (Gurmukhi)"
 msgstr "Pandzsábi (Gurmukhi)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:629
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:630
 msgid "Right Alt"
 msgstr "Jobb Alt"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:631
 msgid "Right Alt (while pressed)"
 msgstr "Jobb Alt (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:632
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Jobb Alt választja az 5. szintet és másik 5. szintet választóval együtt lenyomva aktiválja az 5. szintű zárolást, egy lenyomása feloldja a zárolást"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Jobb Alt választja az 5. szintet, másik 5. szintet választóval együtt lenyomva zárol"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Jobb Alt választja az 5. szintet, másik 5. szintet választóval együtt lenyomva zárol, egy lenyomása feloldja a zárolást"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:635
 msgid "Right Alt key never chooses 3rd level"
 msgstr "A jobb Alt billentyű sohasem választ harmadik szintet"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Jobb Alt, a Shift+jobb Alt kombináció a Multi_Key"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:637
 msgid "Right Ctrl"
 msgstr "Jobb Ctrl"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:638
 msgid "Right Ctrl (while pressed)"
 msgstr "Jobb Ctrl (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:639
 msgid "Right Ctrl as Right Alt"
 msgstr "Jobb Ctrl használata jobb Alt-ként"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:640
 msgid "Right Ctrl is mapped to Menu"
 msgstr "A jobb Ctrl a Menü billentyűhöz van rendelve"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl+Right Shift"
 msgstr "Jobb Ctrl + jobb Shift"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:642
 msgid "Right Shift"
 msgstr "Jobb Shift"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:643
 msgid "Right Win"
 msgstr "Jobb Win"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:644
 msgid "Right Win (while pressed)"
 msgstr "Jobb Win (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:645
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Jobb Win választja az 5. szintet, másik 5. szintet választóval együtt lenyomva zárol"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:646
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Jobb Win választja az 5. szintet, másik 5. szintet választóval együtt lenyomva zárol, egy lenyomása feloldja a zárolást"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
 msgid "Romanian"
 msgstr "Román"
 
-#: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr "Román (krími tatár, Dobruca-1 Q)"
-
-#: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr "Román (krími tatár, Dobruca-2 Q)"
-
-#: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Román (krími tatár, török Alt-Q)"
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (Germany)"
+msgstr "Román (Németország)"
 
-#: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
-msgstr "Román (krími tatár, török F)"
+#: ../rules/base.xml.in.h:649
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Román (Németország, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:650
 msgid "Romanian (WinKeys)"
 msgstr "Román (Win billentyűk)"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (cedilla)"
 msgstr "Román (cédille)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (standard cedilla)"
 msgstr "Román (szabványos cédille)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (standard)"
 msgstr "Román (szabványos)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:654
 msgid "Rupee on 4"
 msgstr "Rúpia jel a 4-es billentyűn"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
 msgid "Russian"
 msgstr "Orosz"
 
-#: ../rules/base.xml.in.h:639
-msgid "Russian (Bashkirian)"
-msgstr "Orosz (baskír)"
-
-#: ../rules/base.xml.in.h:640
-msgid "Russian (Chuvash Latin)"
-msgstr "Orosz (csuvas latin)"
-
-#: ../rules/base.xml.in.h:641
-msgid "Russian (Chuvash)"
-msgstr "Orosz (csuvas)"
-
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:656
 msgid "Russian (DOS)"
 msgstr "Orosz (DOS)"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:657
 msgid "Russian (Georgia)"
 msgstr "Orosz (Grúzia)"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:658
 msgid "Russian (Germany, phonetic)"
 msgstr "Orosz (Németország, fonetikus)"
 
-#: ../rules/base.xml.in.h:645
-msgid "Russian (Kalmyk)"
-msgstr "Orosz (kalmük)"
-
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:659
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Orosz (Kazahsztán, kazahhal)"
 
-#: ../rules/base.xml.in.h:647
-msgid "Russian (Komi)"
-msgstr "Orosz (komi)"
-
-#: ../rules/base.xml.in.h:648
-msgid "Russian (Mari)"
-msgstr "Orosz (mari)"
-
-#: ../rules/base.xml.in.h:649
-msgid "Russian (Ossetian, WinKeys)"
-msgstr "Orosz (oszét, Win billentyűk)"
-
-#: ../rules/base.xml.in.h:650
-msgid "Russian (Ossetian, legacy)"
-msgstr "Orosz (oszét, hagyományos)"
-
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Orosz (Lengyelország, fonetikus Dvorak)"
 
-#: ../rules/base.xml.in.h:652
-msgid "Russian (Serbian)"
-msgstr "Orosz (szerb)"
-
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Sweden, phonetic)"
 msgstr "Orosz (Svédország, fonetikus)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Orosz (Svédország, fonetikus, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:655
-msgid "Russian (Tatar)"
-msgstr "Orosz (tatár)"
-
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:663
 msgid "Russian (US, phonetic)"
 msgstr "Orosz (US, fonetikus)"
 
-#: ../rules/base.xml.in.h:657
-msgid "Russian (Udmurt)"
-msgstr "Orosz (udmurt)"
-
-#: ../rules/base.xml.in.h:658
-msgid "Russian (Yakut)"
-msgstr "Orosz (jakut)"
+#: ../rules/base.xml.in.h:664
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Orosz (Ukrajna, szabványos RSTU)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:665
 msgid "Russian (legacy)"
 msgstr "Orosz (hagyományos)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:666
 msgid "Russian (phonetic WinKeys)"
 msgstr "Orosz (fonetikus, Win billentyűk)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:667
 msgid "Russian (phonetic)"
 msgstr "Orosz (fonetikus)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:668
 msgid "Russian (typewriter)"
 msgstr "Orosz (írógép)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:669
 msgid "Russian (typewriter, legacy)"
 msgstr "Orosz (írógép, hagyományos)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:670
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:671
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:672
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:673
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:674
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:675
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:676
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:677
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Tajvan)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:678
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:679
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:680
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:681
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:676
-msgid "Secwepemctsin"
-msgstr "Secwepemctsin"
-
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:682
 msgid "Semi-colon on third level"
 msgstr "Pontosvessző a harmadik szinten"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
 msgid "Serbian"
 msgstr "Szerb"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Szerb (latin Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin Unicode)"
 msgstr "Szerb (latin Unicode)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:686
 msgid "Serbian (Latin qwerty)"
 msgstr "Szerb (latin qwerty)"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin with guillemets)"
 msgstr "Szerb (latin, »csúcsos« idézőjelekkel)"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin)"
 msgstr "Szerb (latin)"
 
-#: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr "Szerb (pannon ruszin homofon)"
+#: ../rules/base.xml.in.h:689
+msgid "Serbian (Russia)"
+msgstr "Szerb (Oroszország)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Szerb (a Z és a ZHE felcserélve)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (with guillemets)"
 msgstr "Szerb (»csúcsos« idézőjelekkel)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:692
 msgid "Serbo-Croatian (US)"
 msgstr "Szerbhorvát (US)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:693
 msgid "Shift cancels Caps Lock"
 msgstr "A Shift megszakítja a Caps Lockot"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:694
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "A Shift nem szakítja meg a Num Lockot, hanem a harmadik szintet választja"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:695
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "A Shift+számbillentyűk úgy működjenek, mint az MS Windowsban"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:696
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:697
 msgid "Sindhi"
 msgstr "Szindhi"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:698
 msgid "Sinhala"
 msgstr "Szingaléz"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:699
 msgid "Slovak"
 msgstr "Szlovák"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:700
 msgid "Slovak (extended Backslash)"
 msgstr "Szlovák (kibővített fordított törtvonal)"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:701
 msgid "Slovak (qwerty)"
 msgstr "Szlovák (qwerty)"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:702
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Szlovák (qwerty, kibővített fordított törtvonal)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Slovene"
+#: ../rules/base.xml.in.h:703
+msgid "Slovenian"
 msgstr "Szlovén"
 
-#: ../rules/base.xml.in.h:699
-msgid "Slovene (US keyboard with Slovenian letters)"
+#: ../rules/base.xml.in.h:704
+msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Szlovén (US billentyűzet szlovén betűkkel)"
 
-#: ../rules/base.xml.in.h:700
-msgid "Slovene (use guillemets for quotes)"
+#: ../rules/base.xml.in.h:705
+msgid "Slovenian (use guillemets for quotes)"
 msgstr "Szlovén (»Csúcsos« idézőjelek használata idézetekhez)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:706
 msgid "Spanish"
 msgstr "Spanyol"
 
-#: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr "Spanyol (Asztúri változat középső pontos H és alsó pontos L karakterrel)"
-
-#: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr "Spanyol (Katalán változat középső pontos L karakterrel)"
-
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Spanish (Dvorak)"
 msgstr "Spanyol (Dvorak)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Spanish (Latin American)"
 msgstr "Spanyol (latin-amerikai)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Spanyol (latin-amerikai, Sun halott billentyűk)"
+
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Spanyol (latin-amerikai, halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Spanyol (latin-amerikai, halott tildevel)"
 
-#: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, sun dead keys)"
-msgstr "Spanyol (latin-amerikai, Sun halott billentyűk)"
-
-#: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
-msgstr "Spanyol (Mac)"
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Macintosh)"
+msgstr "Spanyol (Macintosh)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Sun dead keys)"
 msgstr "Spanyol (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (eliminate dead keys)"
 msgstr "Spanyol (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (include dead tilde)"
 msgstr "Spanyol (halott tilde felvétele)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "A speciális billentyűket (Ctrl+Alt+&lt;billentyű&gt;) a kiszolgáló kezeli"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power multimédia billentyűzet"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 msgid "Swahili (Kenya)"
 msgstr "Szuahéli (Kenya)"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Swahili (Tanzania)"
 msgstr "Szuahéli (Tanzánia)"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Ctrl és Caps Lock felcserélése"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swap ESC and Caps Lock"
 msgstr "ESC és Caps Lock felcserélése"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swedish"
 msgstr "Svéd"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swedish (Dvorak)"
 msgstr "Svéd (Dvorak)"
 
-#: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
-msgstr "Svéd (Mac)"
+#: ../rules/base.xml.in.h:725
+msgid "Swedish (Macintosh)"
+msgstr "Svéd (Macintosh)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish (Svdvorak)"
 msgstr "Svéd (Svdvorak)"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (eliminate dead keys)"
 msgstr "Svéd (halott billentyűk tiltása)"
 
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
-msgstr "Svéd (északi szami)"
-
-#: ../rules/base.xml.in.h:726
-msgid "Swiss"
-msgstr "Svájci"
-
-#: ../rules/base.xml.in.h:727
-msgid "Swiss (legacy)"
-msgstr "Svájci (hagyományos)"
-
 #: ../rules/base.xml.in.h:728
+msgid "Swedish Sign Language"
+msgstr "Svéd jelnyelv"
+
+#: ../rules/base.xml.in.h:729
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:730
 msgid "Syriac"
 msgstr "Szír"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:731
 msgid "Syriac (phonetic)"
 msgstr "Szír (fonetikus)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:732
 msgid "Taiwanese"
 msgstr "Tajvani"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:733
 msgid "Taiwanese (indigenous)"
 msgstr "Tajvani (őslakos)"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:734
 msgid "Tajik"
 msgstr "Tádzsik"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:735
 msgid "Tajik (legacy)"
 msgstr "Tádzsik (hagyományos)"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:736
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:737
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamil (Sri Lanka, TAB írógép)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:738
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamil (Sri Lanka, Unicode)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:739
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamil (TAB írógép)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamil (TSCII írógép)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Unicode)"
 msgstr "Tamil (Unicode)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamil (billentyűzet számjegyekkel)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:743
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:744
+msgid "Tatar"
+msgstr "Tatár"
+
+#: ../rules/base.xml.in.h:745
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
 msgid "Thai"
 msgstr "Thai"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
 msgid "Thai (TIS-820.2538)"
 msgstr "Thai (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
+msgid "Tibetan"
+msgstr "Tibeti"
+
+#: ../rules/base.xml.in.h:750
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibeti (ASCII számjegyekkel)"
+
+#: ../rules/base.xml.in.h:751
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "A Dvorak billentyűzeten megfelelő billentyűre."
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:752
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "A Qwerty billentyűzeten megfelelő billentyűre."
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:753
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Mutatóbillentyűk átváltása a Shift + NumLock használatával."
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:754
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:755
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access billentyűzet"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:756
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:757
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:758
 msgid "Tswana"
 msgstr "Csvana"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:759
 msgid "Turkish"
 msgstr "Török"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:760
 msgid "Turkish (Alt-Q)"
 msgstr "Török (Alt-Q)"
 
-#: ../rules/base.xml.in.h:757
-msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
-msgstr "Török (krími tatár, török Alt-Q)"
-
-#: ../rules/base.xml.in.h:758
-msgid "Turkish (Crimean Tatar Turkish F)"
-msgstr "Török (krími tatár, török F)"
-
-#: ../rules/base.xml.in.h:759
-msgid "Turkish (Crimean Tatar Turkish Q)"
-msgstr "Török (krími tatár, török Q)"
-
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:761
 msgid "Turkish (F)"
 msgstr "Török (F)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:762
 msgid "Turkish (Sun dead keys)"
 msgstr "Török (Sun halott billentyűk)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (international with dead keys)"
 msgstr "Török (nemzetközi, halott billentyűkkel)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:764
 msgid "Turkmen"
 msgstr "Türkmén"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:765
 msgid "Turkmen (Alt-Q)"
 msgstr "Türkmén (Alt-Q)"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:766
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:767
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:768
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU mód)"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP mód)"
 
-#: ../rules/base.xml.in.h:770
-msgid "Ukrainian"
-msgstr "Ukrán"
-
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Ukrán (krími tatár, török Alt-Q)"
+msgid "Udmurt"
+msgstr "Udmurt"
 
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "Ukrán (krími tatár, török F)"
+msgid "Ukrainian"
+msgstr "Ukrán"
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "Ukrán (krími tatár, török Q)"
-
-#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukrán (Win billentyűk)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (homophonic)"
 msgstr "Ukrán (homofon)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (legacy)"
 msgstr "Ukrán (hagyományos)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (phonetic)"
 msgstr "Ukrán (fonetikus)"
 
-#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr "Ukrán (szabványos RSTU, orosz kiosztáson)"
-
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukrán (szabványos RSTU)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (typewriter)"
 msgstr "Ukrán (írógép)"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:779
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode kiegészítések (nyilak és műveleti jelek)"
 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:780
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Unicode kiegészítések (nyilak és műveleti jelek). A műveleti jelek az alapértelmezett szinten"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:781
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:782
 msgid "Urdu (Pakistan)"
 msgstr "Urdu (Pakisztán)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:783
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakisztán, CRULP)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:784
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakisztán, NLA)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (Pakisztán, Win billentyűk)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (alternatív fonetikus)"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (phonetic)"
 msgstr "Urdu (fonetikus)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:788
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Az alternatív kiosztás megjelenítése a billentyűzet LED-ek használatával"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:789
 msgid "Using space key to input non-breakable space character"
 msgstr "A szóköz billentyű használata nem törhető szóköz bevitelére"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:790
 msgid "Usual space at any level"
 msgstr "Hagyományos szóköz bármely szinten"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "Ujgur"
+
+#: ../rules/base.xml.in.h:792
 msgid "Uzbek"
 msgstr "Üzbég"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:793
 msgid "Uzbek (Afghanistan)"
 msgstr "Üzbég (Afganisztán)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:794
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Üzbég (Afganisztán, OLPC)"
 
-#: ../rules/base.xml.in.h:796
-msgid "Uzbek (Crimean Tatar Turkish Alt-Q)"
-msgstr "Üzbég (krími tatár, török Alt-Q)"
-
-#: ../rules/base.xml.in.h:797
-msgid "Uzbek (Crimean Tatar Turkish F)"
-msgstr "Üzbég (krími tatár, török F)"
-
-#: ../rules/base.xml.in.h:798
-msgid "Uzbek (Crimean Tatar Turkish Q)"
-msgstr "Üzbég (krími tatár, török Q)"
-
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek (Latin)"
 msgstr "Üzbég (latin)"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:796
 msgid "Vietnamese"
 msgstr "Vietnami"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:797
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet billentyűzet"
 
-#: ../rules/base.xml.in.h:802
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Wang 724 numerikus billentyűzet unicode bővítésekkel (nyilak és műveleti jelek)"
+#: ../rules/base.xml.in.h:798
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+msgstr "Wang 724 numerikus billentyűzet Unicode bővítésekkel (nyilak és műveleti jelek)"
 
-#: ../rules/base.xml.in.h:803
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
+#: ../rules/base.xml.in.h:799
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Wang 724 numerikus billentyűzet Unicode bővítésekkel (nyilak és műveleti jelek). A műveleti jelek az alapértelmezett szinten"
 
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:800
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:801
 msgid "Wolof"
 msgstr "Wolof"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:802
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet billentyűzet"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:803
+msgid "Yakut"
+msgstr "Jakut"
+
+#: ../rules/base.xml.in.h:804
 msgid "Yoruba"
 msgstr "Joruba"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:805
 msgid "Zero-width non-joiner character at second level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten"
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:806
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten, nem törhető szóköz karakter a harmadik szinten"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:807
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten, nem törhető szóköz karakter a harmadik szinten, semmi a negyedik szinten"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten, nem törhető szóköz karakter a harmadik szinten, keskeny nem törhető szóköz karakter a negyedik szinten"
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:809
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten, nem törhető szóköz karakter a harmadik szinten, nulla szélességű egyesítő karakter a negyedik szinten"
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:810
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten, nulla szélességű egyesítő karakter a harmadik szinten"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:811
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Nulla szélességű nem egyesítő karakter a második szinten, nulla szélességű egyesítő karakter a harmadik szinten, nem törhető szóköz karakter a negyedik szinten"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:812
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Nulla szélességű nem egyesítő karakter a harmadik szinten, nulla szélességű egyesítő karakter a negyedik szinten"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:813
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:814
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:815
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:816
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:817
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:818
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:819
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:820
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:821
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:822
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:823
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:824
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:825
 msgid "ca"
 msgstr "ca"
 
-#: ../rules/base.xml.in.h:829
-msgid "che"
-msgstr "che"
-
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:826
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:827
+msgid "cm"
+msgstr "cm"
+
+#: ../rules/base.xml.in.h:828
+msgid "crh"
+msgstr "crh"
+
+#: ../rules/base.xml.in.h:829
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:830
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:831
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:832
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:833
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:834
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:836
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:837
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:838
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:840
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:841
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:842
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:844
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:845
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:846
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:847
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:848
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:849
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:850
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:851
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:853
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:854
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:855
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:856
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:859
-msgid "irq"
-msgstr "irq"
-
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:857
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:858
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:859
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:860
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:861
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:862
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:863
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:864
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:865
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:866
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:870
-msgid "kut"
-msgstr "kut"
-
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:867
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:870
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:871
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:872
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:873
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:874
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:875
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:876
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:877
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:878
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:879
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:880
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:881
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:883
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:884
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:887
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:892
-msgid "shs"
-msgstr "shs"
-
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:888
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:889
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:890
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:891
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:898
-msgid "srp"
-msgstr "srp"
-
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:893
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:894
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:895
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:896
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:897
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:898
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:899
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:900
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:901
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:902
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:909
-msgid "twn"
-msgstr "twn"
-
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:903
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:904
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:905
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:906
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:907
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:908
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:909
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:910
 msgid "zh"
 msgstr "zh"
 
 #: ../rules/base.extras.xml.in.h:1
-msgid "APL"
-msgstr "APL"
-
-#: ../rules/base.extras.xml.in.h:2
-msgid "Iran"
-msgstr "Irán"
-
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr "Irán - Avesztán"
+msgid "APL Keyboard Symbols"
+msgstr "APL billentyűzetszimbólumok"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "Litvánia"
+msgid "Atsina"
+msgstr "Atsina"
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
-msgstr "Litvánia - Dvorak"
+msgid "Avestan"
+msgstr "Avesztán"
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "Ltu"
-
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "Románia"
+msgid "Couer D'alene Salish"
+msgstr "Couer D'alene Salish"
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr "Románia - ergonomikus Touchtype"
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Angol (USA, nemzetközi AltGr Unicode kombinálással)"
 
 #: ../rules/base.extras.xml.in.h:9
-msgid "Rou"
-msgstr "Rou"
-
-#: ../rules/base.extras.xml.in.h:10
-msgid "Rus"
-msgstr "Rus"
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "Angol (USA, Nemzetközi AltGr Unicode kombinálással, alternatív)"
 
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "Oroszország"
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
-msgstr "Szerbia"
+msgid "Kutenai"
+msgstr "Kutenai"
 
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
-msgstr "Szerbia - Ékezetek kombinálása a halott billentyűk helyett"
+msgid "Latvian (US Colemak)"
+msgstr "Lett (US Colemak)"
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
-msgstr "Srb"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Lett (US Colemak, aposztróf változat)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "USA"
+msgid "Latvian (US Dvorak)"
+msgstr "Lett (US Dvorak)"
 
 #: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
-msgstr "USA - Atsina"
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Lett (US Dvorak, Y-változat)"
 
 #: ../rules/base.extras.xml.in.h:17
-msgid "USA - Couer D'alene Salish"
-msgstr "USA - Couer D'alene Salish"
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr "Lett (US Dvorak, mínusz változat)"
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
-msgstr "USA - Nemzetközi (AltGr Unicode kombinálással)"
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Lett (programozói US Dvorak)"
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
-msgstr "USA - Nemzetközi (AltGr Unicode kombinálással, alternatív)"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Lett (programozói US Dvorak, Y-változat)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Lett (programozói US Dvorak, mínusz változat)"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Litván (US Dvorak litván betűkkel)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "Lengyel (nemzetközi, halott billentyűkkel)"
+
+#: ../rules/base.extras.xml.in.h:27
+msgid "Romanian (ergonomic Touchtype)"
+msgstr "Román (ergonomikus Touchtype)"
+
+#: ../rules/base.extras.xml.in.h:29
+msgid "Russian (with UKR and BEL layout)"
+msgstr "Orosz (UKR és BEL kiosztással)"
+
+#: ../rules/base.extras.xml.in.h:30
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "Szerb (ékezetek kombinálása a halott billentyűk helyett)"
+
+#: ../rules/base.extras.xml.in.h:33
+msgid "apl"
+msgstr "apl"
+
+#: ../rules/base.extras.xml.in.h:38
+msgid "kut"
+msgstr "kut"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "shs"
+msgstr "shs"
diff --git a/dist/xkeyboard-config/po/ja.po b/dist/xkeyboard-config/po/ja.po
index 3d72184e1..aa27a6676 100644
--- a/dist/xkeyboard-config/po/ja.po
+++ b/dist/xkeyboard-config/po/ja.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.3\n"
+"Project-Id-Version: xkeyboard-config 2.3.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-17 21:08+0100\n"
-"PO-Revision-Date: 2011-05-27 17:17+0900\n"
+"POT-Creation-Date: 2011-09-15 21:25+0100\n"
+"PO-Revision-Date: 2011-09-19 00:12+0900\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: ../rules/base.xml.in.h:1
 msgid "&lt;Less/Greater&gt;"
-msgstr ""
+msgstr "&lt;Less/Greater&gt;"
 
 #: ../rules/base.xml.in.h:2
 msgid "&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr ""
+msgstr "&lt;Less/Greater&gt; (第3層を選択する。他の第3層を選択するキーと同時に押した場合は第3層で固定する)"
 
 #: ../rules/base.xml.in.h:3
 msgid "&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
@@ -32,11 +32,11 @@ msgstr ""
 
 #: ../rules/base.xml.in.h:4
 msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr ""
+msgstr "&lt;Less/Greater&gt; で第5層を選択する。他の第5層を選択するキーと同時に押した場合は第5層で固定する"
 
 #: ../rules/base.xml.in.h:5
 msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr ""
+msgstr "&lt;Less/Greater&gt; で第5層を選択する。他の第5層を選択するキーと同時に押した場合は第5層で固定する。固定を解除する場合は第5層を選択するキーのいずれかを押す"
 
 #: ../rules/base.xml.in.h:6
 msgid "A4Tech KB-21"
@@ -72,15 +72,15 @@ msgstr "Acer ラップトップ"
 
 #: ../rules/base.xml.in.h:14
 msgid "Add the standard behavior to Menu key"
-msgstr ""
+msgstr "Menu キーに標準動作を追加する"
 
 #: ../rules/base.xml.in.h:15
 msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr ""
+msgstr "エスペラント語 circumflexe (supersigno) の追加"
 
 #: ../rules/base.xml.in.h:16
 msgid "Adding currency signs to certain keys"
-msgstr ""
+msgstr "通貨記号を特定のキーに追加割り当て"
 
 #: ../rules/base.xml.in.h:17
 msgid "Advance Scorpius KI"
@@ -102,11 +102,11 @@ msgstr "アルバニア語"
 
 #: ../rules/base.xml.in.h:21
 msgid "Alt and Meta are on Alt keys"
-msgstr ""
+msgstr "Alt と Meta を Alt キーに割り当てる"
 
 #: ../rules/base.xml.in.h:22
 msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr ""
+msgstr "Alt を右 Win キーに、Super を Menu に割り当てる"
 
 #: ../rules/base.xml.in.h:23
 msgid "Alt+Caps Lock"
@@ -135,15 +135,15 @@ msgstr "アムハラ語"
 
 #: ../rules/base.xml.in.h:29
 msgid "Any Alt key"
-msgstr ""
+msgstr "いずれかの Alt キー"
 
 #: ../rules/base.xml.in.h:30
 msgid "Any Win key"
-msgstr ""
+msgstr "いずれかの Win キー"
 
 #: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
-msgstr ""
+msgstr "いずれかの Win キー (押している間)"
 
 #: ../rules/base.xml.in.h:32
 msgid "Apple"
@@ -163,7 +163,7 @@ msgstr "Apple アルミニウムキーボード (JIS)"
 
 #: ../rules/base.xml.in.h:36
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
-msgstr ""
+msgstr "Apple アルミニウムキーボード: PC キーエミュレート (Print, Scroll Lock, Pause, Num Lock)"
 
 #: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
@@ -215,23 +215,23 @@ msgstr "アルメニア語"
 
 #: ../rules/base.xml.in.h:49
 msgid "Armenian (alternative eastern)"
-msgstr "アルメニア語 (alternative eastern)"
+msgstr "アルメニア語 (代替、東方)"
 
-#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:50
 msgid "Armenian (alternative phonetic)"
-msgstr "アルメニア語 (alternative phonetic)"
+msgstr "アルメニア語 (代替、表音)"
 
 #: ../rules/base.xml.in.h:51
 msgid "Armenian (eastern)"
-msgstr "アルメニア語 (eastern)"
+msgstr "アルメニア語 (東方)"
 
 #: ../rules/base.xml.in.h:52
 msgid "Armenian (phonetic)"
-msgstr "アルメニア語 (phonetic)"
+msgstr "アルメニア語 (表音)"
 
 #: ../rules/base.xml.in.h:53
 msgid "Armenian (western)"
-msgstr "アルメニア語 (western)"
+msgstr "アルメニア語 (西方)"
 
 # スペインのアストゥリアス地方だが、言語は? ISOコードを要調査
 #: ../rules/base.xml.in.h:54
@@ -304,11 +304,11 @@ msgstr "BTC 9116U Mini ワイヤレスインターネット・ゲーミング"
 
 #: ../rules/base.xml.in.h:71
 msgid "Backslash"
-msgstr "バックスラッシュ"
+msgstr "Backslash"
 
 #: ../rules/base.xml.in.h:72
 msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr ""
+msgstr "Backslash (第3層を選択する。他の第3層を選択するキーと同時に押した場合は第3層で固定する)"
 
 #: ../rules/base.xml.in.h:73
 msgid "Bambara"
@@ -336,31 +336,31 @@ msgstr "ベルギー語"
 
 #: ../rules/base.xml.in.h:79
 msgid "Belgian (ISO alternate)"
-msgstr "ベルギー語 (ISO alternate)"
+msgstr "ベルギー語 (ISO 代替)"
 
 #: ../rules/base.xml.in.h:80
 msgid "Belgian (Sun dead keys)"
-msgstr "ベルギー語 (Sun dead keys)"
+msgstr "ベルギー語 (Sun デッドキー付き)"
 
 #: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
-msgstr "ベルギー語 (Wang model 724 azerty)"
+msgstr "ベルギー語 (Wang モデル 724 azerty)"
 
 #: ../rules/base.xml.in.h:82
 msgid "Belgian (alternative)"
-msgstr "ベルギー語 (alternative)"
+msgstr "ベルギー語 (代替)"
 
 #: ../rules/base.xml.in.h:83
 msgid "Belgian (alternative, Sun dead keys)"
-msgstr "ベルギー語 (alternative, Sun dead keys)"
+msgstr "ベルギー語 (代替、Sun デッドキー付き)"
 
 #: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
-msgstr "ベルギー語 (alternative, latin-9 only)"
+msgstr "ベルギー語 (代替、latin-9 のみ)"
 
 #: ../rules/base.xml.in.h:85
 msgid "Belgian (eliminate dead keys)"
-msgstr "ベルギー語 (eliminate dead keys)"
+msgstr "ベルギー語 (デッドキー無し)"
 
 #: ../rules/base.xml.in.h:86
 msgid "BenQ X-Touch"
@@ -379,3346 +379,3365 @@ msgid "Bengali"
 msgstr "ベンガル語"
 
 #: ../rules/base.xml.in.h:90
+msgid "Bengali (Baishakhi Inscript)"
+msgstr "ベンガル語 (Baishakhi Inscript)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bengali (Baishakhi)"
+msgstr "ベンガル語 (Baishakhi)"
+
+#: ../rules/base.xml.in.h:92
+msgid "Bengali (Bornona)"
+msgstr "ベンガル語 (Bornona)"
+
+#: ../rules/base.xml.in.h:93
 msgid "Bengali (Probhat)"
 msgstr "ベンガル語 (Probhat)"
 
+#: ../rules/base.xml.in.h:94
+msgid "Bengali (Uni Gitanjali)"
+msgstr "ベンガル語 (Uni Gitanjali)"
+
 # ベルベル語? ISO 639 ではベルベル諸語となっている
 # 出典確認
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:97
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:98
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:99
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:100
 msgid "Berber (Morocco, Tifinagh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian"
 msgstr "ボスニア語"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:102
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
-msgstr "ボスニア語 (US keyboard with Bosnian digraphs)"
+msgstr "ボスニア語 (ボスニア語二重字付き US キーボード)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:103
 msgid "Bosnian (US keyboard with Bosnian letters)"
-msgstr "ボスニア語 (US keyboard with Bosnian letters)"
+msgstr "ボスニア語 (ボスニア語文字付き US キーボード)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:104
 msgid "Bosnian (use Bosnian digraphs)"
-msgstr "ボスニア語 (use Bosnian digraphs)"
+msgstr "ボスニア語 (ボスニア語二重字付き)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:105
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "ボスニア語 (use guillemets for quotes)"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
-msgstr ""
+msgstr "両方の Alt キーを同時に押す"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
-msgstr ""
+msgstr "両方の Ctrl キーを同時に押す"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
-msgstr ""
+msgstr "両方の Shift キーを同時に押す"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:109
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
-msgstr ""
+msgstr "両方の Shift キー同時押しで Caps Lock を有効にし、片方の Shift キーで無効にする"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:110
 msgid "Both Shift-Keys together toggle Caps Lock"
-msgstr ""
+msgstr "両方の Shift キー同時押しで Caps Lock をトグルする"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:111
 msgid "Both Shift-Keys together toggle ShiftLock"
-msgstr ""
+msgstr "両方の Shift キー同時押しで Shift ロックをトグルする"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:112
 msgid "Braille"
 msgstr "ブライユ点字"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:113
 msgid "Braille (left hand)"
 msgstr "ブライユ点字 (左手)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:114
 msgid "Braille (right hand)"
 msgstr "ブライユ点字 (右手)"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:115
 msgid "Brother Internet Keyboard"
 msgstr "Brother インターネットキーボード"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:116
 msgid "Bulgarian"
 msgstr "ブルガリア語"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:117
 msgid "Bulgarian (new phonetic)"
-msgstr "ブルガリア語 (new phonetic)"
+msgstr "ブルガリア語 (新表音)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:118
 msgid "Bulgarian (traditional phonetic)"
-msgstr "ブルガリア語 (traditional phonetic)"
+msgstr "ブルガリア語 (伝統的な表音)"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:119
 msgid "Burmese"
 msgstr "ビルマ語"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:120
+msgid "Cameroon Multilingual (azerty)"
+msgstr "カメルーン複数言語 (azerty)"
+
+#: ../rules/base.xml.in.h:121
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "カメルーン複数言語 (qwerty)"
+
+#: ../rules/base.xml.in.h:122
 msgid "Canadian Multilingual"
-msgstr ""
+msgstr "カナダ複数言語"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:123
 msgid "Canadian Multilingual (first part)"
-msgstr ""
+msgstr "カナダ複数言語 (first part)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:124
 msgid "Canadian Multilingual (second part)"
-msgstr ""
+msgstr "カナダ複数言語 (second part)"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr ""
+msgstr "Caps Lock (第3層を選択する。他の第3層を選択するキーと同時に押した場合は第3層で固定する)"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
-msgstr ""
+msgstr "Caps Lock (最初の配列に変更する)、 Shift+Caps Lock (最後の配列に変更する)"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
-msgstr ""
+msgstr "Caps Lock (押している間)、 Alt+Caps Lock で通常の Caps Lock 動作にする"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
-msgstr ""
+msgstr "Caps Lock をロック付き Shift として扱う。 Shift を押した時は Caps Lock を「一時中断」する"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
-msgstr ""
+msgstr "Caps Lock をロック付き Shift として扱う。Shift は Caps Lock に影響を及ぼさない"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:131
+msgid "Caps Lock as Ctrl"
+msgstr "Caps Lock を Ctrl として扱う"
+
+#: ../rules/base.xml.in.h:132
 msgid "Caps Lock is disabled"
-msgstr ""
+msgstr "Caps Lock を無効にする"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:133
 msgid "Caps Lock key behavior"
 msgstr "Caps Lock キーの動作"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:134
 msgid "Caps Lock toggles Shift so all keys are affected"
-msgstr ""
+msgstr "Caps Lock は Shift をトグルし、すべてのキーが影響を受ける"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:135
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:136
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:137
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr ""
 
 # 地図帳では Catalonia がカタルーニャとなっているが、カタロニアの方が
 # 一般的だと思われる
 # ISOコードもカタロニア語表記
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:138
 msgid "Catalan"
 msgstr "カタロニア語"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:139
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "カタロニア語 (スペイン、with middle-dot L)"
 
 # ISO 639 にもあり
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:140
 msgid "Cherokee"
 msgstr "チェロキー語"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:141
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:142
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:143
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (alternate option)"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:144
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:145
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:146
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:147
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:148
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony インターネットキーボード"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:149
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:150
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:151
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:152
 msgid "Chinese"
 msgstr "中国語"
 
 # ISO 639 より
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:153
 msgid "Chuvash"
 msgstr "チュヴァシュ語"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:154
 msgid "Chuvash (Latin)"
-msgstr "チュヴァシュ語 (Latin)"
+msgstr "チュヴァシュ語 (ラテン)"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:155
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:156
 msgid "CloGaelach"
 msgstr ""
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access キーボード"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq インターネットキーボード (13 キー)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq インターネットキーボード (18 キー)"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:160
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq インターネットキーボード (7 キー)"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:161
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq キーボード"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:162
 msgid "Compose key position"
 msgstr "Compose キーの位置"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
-msgstr ""
+msgstr "Control を Alt キーに割り当て、 Alt を Win キーに割り当てる"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
-msgstr ""
+msgstr "Control を Win キーに割り当てる (通常の Ctrl キーとする)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative デスクトップワイヤレス 7000"
 
-# ISO 639 より
-#: ../rules/base.xml.in.h:160
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "クリミア・タタール語 (Dobruja Q)"
-
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "クリミア・タタール語 (トルコ語 Alt-Q)"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Turkish F)"
 msgstr "クリミア・タタール語 (トルコ語 F)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "クリミア・タタール語 (トルコ語 Q)"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Croatian"
 msgstr "クロアチア語"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Croatian (US keyboard with Croatian digraphs)"
-msgstr "クロアチア語 (US keyboard with Croatian digraphs)"
+msgstr "クロアチア語 (クロアチア語二重字付き US キーボード)"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:172
 msgid "Croatian (US keyboard with Croatian letters)"
-msgstr "クロアチア語 (US keyboard with Croatian letters)"
+msgstr "クロアチア語 (クロアチア語文字付き US キーボード)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Croatian (use Croatian digraphs)"
-msgstr "クロアチア語 (use Croatian digraphs)"
+msgstr "クロアチア語 (クロアチア語二重字付き)"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:174
 msgid "Croatian (use guillemets for quotes)"
 msgstr "クロアチア語 (use guillemets for quotes)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:175
 msgid "Ctrl key position"
 msgstr "Ctrl キーの位置"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:176
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:177
 msgid "Czech"
 msgstr "チェコ語"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "チェコ語 (UCW 配列、アクセント付き文字のみ)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Czech (US Dvorak with CZ UCW support)"
-msgstr "チェコ語 (US Dvorak with CZ UCW support)"
+msgstr "チェコ語 (チェコ UCW サポート付き US Dvorak)"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:180
 msgid "Czech (qwerty)"
 msgstr "チェコ語 (qwerty)"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:181
 msgid "Czech (qwerty, extended Backslash)"
-msgstr "チェコ語 (qwerty, extended Backslash)"
+msgstr "チェコ語 (qwerty、Backslash 拡張)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "チェコ語 (&lt;\\|&gt; キー付き)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Danish"
 msgstr "デンマーク語"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Danish (Dvorak)"
 msgstr "デンマーク語 (Dvorak)"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Danish (Macintosh)"
 msgstr "デンマーク語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Danish (Macintosh, eliminate dead keys)"
-msgstr "デンマーク語 (Macintosh, eliminate dead keys)"
+msgstr "デンマーク語 (Macintosh、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Danish (eliminate dead keys)"
-msgstr "デンマーク語 (eliminate dead keys)"
+msgstr "デンマーク語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Default numeric keypad keys"
-msgstr ""
+msgstr "デフォルトのテンキー"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell 101-key PC"
 msgstr "Dell 101キー PC"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell ラップトップ/ノートブック Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell ラップトップ/ノートブック Precision M series"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dell Latitude series laptop"
 msgstr "Dell Latitude シリーズラップトップ"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:197
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB マルチメディアキーボード"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa ワイヤレスデスクトップキーボード"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dhivehi"
 msgstr "Dhivehi"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802 シリーズ"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
 msgid "Dutch"
 msgstr "オランダ語"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:203
 msgid "Dutch (Macintosh)"
 msgstr "オランダ語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:204
 msgid "Dutch (Sun dead keys)"
-msgstr "オランダ語 (Sun dead keys)"
+msgstr "オランダ語 (Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:205
 msgid "Dutch (standard)"
 msgstr "オランダ語 (標準)"
 
 # ISO 639 より
 # ブータン
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:206
 msgid "Dzongkha"
 msgstr "ゾンカ語"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:207
 msgid "Enable extra typographic characters"
-msgstr ""
+msgstr "追加の印刷文字を有効にする"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:208
 msgid "English (Cameroon Dvorak)"
 msgstr "英語 (カメルーン Dvorak)"
 
-#: ../rules/base.xml.in.h:203
-msgid "English (Cameroon qwerty)"
-msgstr "英語 (カメルーン qwerty)"
-
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:209
 msgid "English (Cameroon)"
 msgstr "英語 (カメルーン)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:210
 msgid "English (Canada)"
 msgstr "英語 (カナダ)"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:211
 msgid "English (Colemak)"
 msgstr "英語 (Colemak)"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:212
 msgid "English (Dvorak alternative international no dead keys)"
-msgstr "英語 (Dvorak alternative international no dead keys)"
+msgstr "英語 (Dvorak 代替、国際、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:213
 msgid "English (Dvorak international with dead keys)"
-msgstr "英語 (Dvorak international with dead keys)"
+msgstr "英語 (Dvorak 国際、デッドキー付き)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:214
 msgid "English (Dvorak)"
 msgstr "英語 (Dvorak)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:215
 msgid "English (Ghana)"
 msgstr "英語 (ガーナ)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:216
 msgid "English (Ghana, GILLBT)"
 msgstr "英語 (ガーナ、GILLBT)"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:217
 msgid "English (Ghana, multilingual)"
-msgstr "英語 (ガーナ、多言語)"
+msgstr "英語 (ガーナ、複数言語)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:218
 msgid "English (India, with RupeeSign)"
 msgstr "英語 (インド、ルピー記号付き)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:219
 msgid "English (Macintosh)"
 msgstr "英語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:220
 msgid "English (Mali, US Macintosh)"
 msgstr "英語 (マリ、US Macintosh)"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:221
 msgid "English (Mali, US international)"
-msgstr "英語 (マリ、US international)"
+msgstr "英語 (マリ、US 国際)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:222
 msgid "English (Nigeria)"
 msgstr "英語 (ナイジェリア)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:223
 msgid "English (South Africa)"
 msgstr "英語 (南アフリカ)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:224
 msgid "English (UK)"
 msgstr "英語 (UK)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:225
 msgid "English (UK, Colemak)"
 msgstr "英語 (UK, Colemak)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "英語 (UK, Dvorak with UK punctuation)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:227
 msgid "English (UK, Dvorak)"
 msgstr "英語 (UK, Dvorak)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:228
 msgid "English (UK, Macintosh international)"
-msgstr "英語 (UK, Macintosh international)"
+msgstr "英語 (UK, Macintosh 国際)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:229
 msgid "English (UK, Macintosh)"
 msgstr "英語 (UK, Macintosh)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:230
 msgid "English (UK, extended WinKeys)"
-msgstr "英語 (UK, extended WinKeys)"
+msgstr "英語 (UK、WinKey 拡張)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:231
 msgid "English (UK, international with dead keys)"
-msgstr "英語 (UK, international with dead keys)"
+msgstr "英語 (UK、国際、デッドキー付き)"
 
-#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:232 ../rules/base.extras.xml.in.h:8
 msgid "English (US)"
 msgstr "英語 (US)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:233
 msgid "English (US, alternative international)"
-msgstr "英語 (US, alternative international)"
+msgstr "英語 (US、代替、国際)"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:234
 msgid "English (US, international with dead keys)"
-msgstr "英語 (US, international with dead keys)"
+msgstr "英語 (US、国際、デッドキー付き)"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:235
 msgid "English (US, with euro on 5)"
-msgstr "英語 (US, with euro on 5)"
+msgstr "英語 (US、5キーにユーロ記号付き)"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:236
 msgid "English (classic Dvorak)"
-msgstr "英語 (classic Dvorak)"
+msgstr "英語 (古典的 Dvorak)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:237
 msgid "English (international AltGr dead keys)"
-msgstr "英語 (international AltGr dead keys)"
+msgstr "英語 (国際 AltGr デッドキー)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:238
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "英語 (layout toggle on multiply/divide key)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:239
 msgid "English (left handed Dvorak)"
 msgstr "英語 (左手 Dvorak)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:240
 msgid "English (programmer Dvorak)"
 msgstr "英語 (プログラマー Dvorak)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:241
 msgid "English (right handed Dvorak)"
 msgstr "英語 (右手 Dvorak)"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:242
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:243
 msgid "Enter on keypad"
-msgstr ""
+msgstr "テンキーの Enter"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:244
 msgid "Esperanto"
 msgstr "エスペラント語"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:245
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "エスペラント語 (ポルトガル、Nativo)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:246
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
-msgstr "エスペラント語 (displaced semicolon and quote, 廃止)"
+msgstr "エスペラント語 (セミコロンとクォート無し、廃止)"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:247
 msgid "Estonian"
 msgstr "エストニア語"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:248
 msgid "Estonian (Dvorak)"
 msgstr "エストニア語 (Dvorak)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:249
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "エストニア語 (エストニア文字付き US キーボード)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:250
 msgid "Estonian (eliminate dead keys)"
-msgstr "エストニア語 (eliminate dead keys)"
+msgstr "エストニア語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:251
 msgid "Euro on 2"
-msgstr ""
+msgstr "2 キーにユーロ記号を追加割り当てする"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:252
 msgid "Euro on 4"
-msgstr ""
+msgstr "4 キーにユーロ記号を追加割り当てする"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:253
 msgid "Euro on 5"
-msgstr ""
+msgstr "5 キーにユーロ記号を追加割り当てする"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:254
 msgid "Euro on E"
-msgstr ""
+msgstr "E キーにユーロ記号を追加割り当てする"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:255
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
 # ISO 639 より
 # ガーナの言語
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:256
 msgid "Ewe"
 msgstr "エウェ語"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:257
 msgid "FL90"
 msgstr "FL90"
 
 # フェロー諸島の言語
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:258
 msgid "Faroese"
 msgstr "フェロー語"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:259
 msgid "Faroese (eliminate dead keys)"
-msgstr "フェロー語 (eliminate dead keys)"
+msgstr "フェロー語 (デッドキー無し)"
 
 # ISO 639
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:260
 msgid "Filipino"
 msgstr "フィリピノ語"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "フィリピノ語 (Capewell-Dvorak Baybayin)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:262
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "フィリピノ語 (Capewell-Dvorak Latin)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "フィリピノ語 (Capewell-QWERF 2006 Baybayin)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "フィリピノ語 (Capewell-QWERF 2006 Latin)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:265
 msgid "Filipino (Colemak Baybayin)"
 msgstr "フィリピノ語 (Colemak Baybayin)"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:266
 msgid "Filipino (Colemak Latin)"
 msgstr "フィリピノ語 (Colemak Latin)"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:267
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "フィリピノ語 (Dvorak Baybayin)"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:268
 msgid "Filipino (Dvorak Latin)"
 msgstr "フィリピノ語 (Dvorak Latin)"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:269
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "フィリピノ語 (QWERTY Baybayin)"
 
 # フィン語とも言う
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:270
 msgid "Finnish"
 msgstr "フィンランド語"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:271
 msgid "Finnish (Macintosh)"
 msgstr "フィンランド語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:272
 msgid "Finnish (classic)"
-msgstr "フィンランド語 (classic)"
+msgstr "フィンランド語 (古典的)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:273
 msgid "Finnish (classic, eliminate dead keys)"
-msgstr "フィンランド語 (classic, eliminate dead keys)"
+msgstr "フィンランド語 (古典的、デッドキー無し)"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:276
 msgid "Four-level key with abstract separators"
 msgstr ""
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:277
 msgid "Four-level key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:278
 msgid "Four-level key with dot"
 msgstr ""
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:279
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr ""
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:280
 msgid "Four-level key with momayyez"
 msgstr ""
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:281
 msgid "French"
 msgstr "フランス語"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:282
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "フランス語 (Bepo, ergonomic, Dvorak way)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:283
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "フランス語 (Bepo, ergonomic, Dvorak way, latin-9 only)"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:284
 msgid "French (Breton)"
 msgstr "フランス語 (ブレトン)"
 
-#: ../rules/base.xml.in.h:280
-msgid "French (Cameroon azerty)"
-msgstr "フランス語 (カメルーン azerty)"
-
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:285
 msgid "French (Cameroon)"
 msgstr "フランス語 (カメルーン)"
 
-#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:286 ../rules/base.extras.xml.in.h:11
 msgid "French (Canada)"
 msgstr "フランス語 (カナダ)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:287
 msgid "French (Canada, Dvorak)"
 msgstr "フランス語 (カナダ、Dvorak)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:288
 msgid "French (Canada, legacy)"
 msgstr "フランス語 (カナダ、legacy)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:289
 msgid "French (Democratic Republic of the Congo)"
 msgstr "フランス語 (コンゴ民主共和国)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:290
 msgid "French (Dvorak)"
 msgstr "フランス語 (Dvorak)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:291
 msgid "French (Guinea)"
 msgstr "フランス語 (ギニア)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:292
 msgid "French (Macintosh)"
 msgstr "フランス語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:293
 msgid "French (Mali, alternative)"
-msgstr "フランス語 (マリ、alternative)"
+msgstr "フランス語 (マリ、代替)"
 
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:294
 msgid "French (Morocco)"
 msgstr "フランス語 (モロッコ)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:295
 msgid "French (Sun dead keys)"
-msgstr "フランス語 (Sun dead keys)"
+msgstr "フランス語 (Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:296
 msgid "French (Switzerland)"
 msgstr "フランス語 (スイス)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:297
 msgid "French (Switzerland, Macintosh)"
 msgstr "フランス語 (スイス、Macintosh)"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:298
 msgid "French (Switzerland, Sun dead keys)"
-msgstr "フランス語 (スイス、Sun dead keys)"
+msgstr "フランス語 (スイス、Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:299
 msgid "French (Switzerland, eliminate dead keys)"
-msgstr "フランス語 (スイス、eliminate dead keys)"
+msgstr "フランス語 (スイス、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:300
 msgid "French (alternative)"
-msgstr "フランス語 (alternative)"
+msgstr "フランス語 (代替)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:301
 msgid "French (alternative, Sun dead keys)"
-msgstr "フランス語 (alternative, Sun dead keys)"
+msgstr "フランス語 (代替、Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:302
 msgid "French (alternative, eliminate dead keys)"
-msgstr "フランス語 (alternative, eliminate dead keys)"
+msgstr "フランス語 (代替、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:303
 msgid "French (alternative, latin-9 only)"
-msgstr "フランス語 (alternative, latin-9 only)"
+msgstr "フランス語 (代替、latin-9 のみ)"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:304
 msgid "French (eliminate dead keys)"
-msgstr "フランス語 (eliminate dead keys)"
+msgstr "フランス語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:305
 msgid "French (legacy, alternative)"
-msgstr "フランス語 (legacy, alternative)"
+msgstr "フランス語 (legacy、代替)"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:306
 msgid "French (legacy, alternative, Sun dead keys)"
-msgstr "フランス語 (legacy, alternative, Sun dead keys)"
+msgstr "フランス語 (legacy、代替、Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:307
 msgid "French (legacy, alternative, eliminate dead keys)"
-msgstr "フランス語 (legacy, alternative, eliminate dead keys)"
+msgstr "フランス語 (legacy、代替、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:308
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO ラップトップ"
 
 # ISO 639 では Fulah
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:309
 msgid "Fula"
 msgstr "フラ語"
 
 # ISO 639
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:310
 msgid "Ga"
 msgstr "ガ語"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:311
 msgid "Generic 101-key PC"
 msgstr "標準 101 キー PC"
 
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:312
 msgid "Generic 102-key (Intl) PC"
-msgstr "標準 102 キー (Intl) PC"
+msgstr "標準 102 キー (国際) PC"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:313
 msgid "Generic 104-key PC"
 msgstr "標準 104 キー PC"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:314
 msgid "Generic 105-key (Intl) PC"
-msgstr "標準 105 キー (Intl) PC"
+msgstr "標準 105 キー (国際) PC"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:315
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:316
 msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 msgstr "Genius Comfy KB-16M / Genius MM キーボード KWD-910"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:317
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:318
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:319
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:320
 msgid "Georgian"
 msgstr "グルジア語"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:321
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "グルジア語 (フランス、AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:322
 msgid "Georgian (Italy)"
 msgstr "グルジア語 (イタリア)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:323
 msgid "Georgian (MESS)"
 msgstr "グルジア語 (MESS)"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:324
 msgid "Georgian (ergonomic)"
-msgstr "グルジア語 (ergonomic)"
+msgstr "グルジア語 (人間工学)"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:325 ../rules/base.extras.xml.in.h:12
 msgid "German"
 msgstr "ドイツ語"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:326
 msgid "German (Austria)"
 msgstr "ドイツ語 (オーストリア)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:327
 msgid "German (Austria, Macintosh)"
 msgstr "ドイツ語 (オーストリア、Macintosh)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:328
 msgid "German (Austria, Sun dead keys)"
-msgstr "ドイツ語 (オーストリア、Sun dead keys)"
+msgstr "ドイツ語 (オーストリア、Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:329
 msgid "German (Austria, eliminate dead keys)"
-msgstr "ドイツ語 (オーストリア、eliminate dead keys)"
+msgstr "ドイツ語 (オーストリア、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:330
 msgid "German (Dvorak)"
 msgstr "ドイツ語 (Dvorak)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:331
 msgid "German (Macintosh)"
 msgstr "ドイツ語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:332
 msgid "German (Macintosh, eliminate dead keys)"
-msgstr "ドイツ語 (Macintosh, eliminate dead keys)"
+msgstr "ドイツ語 (Macintosh、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:333
 msgid "German (Neo 2)"
 msgstr "ドイツ語 (Neo 2)"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:334
 msgid "German (Sun dead keys)"
-msgstr "ドイツ語 (Sun dead keys)"
+msgstr "ドイツ語 (Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:335
 msgid "German (Switzerland)"
 msgstr "ドイツ語 (スイス)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:336
 msgid "German (Switzerland, Macintosh)"
 msgstr "ドイツ語 (スイス、Macintosh)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:337
 msgid "German (Switzerland, Sun dead keys)"
-msgstr "ドイツ語 (スイス語、Sun dead keys)"
+msgstr "ドイツ語 (スイス語、Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:338
 msgid "German (Switzerland, eliminate dead keys)"
-msgstr "ドイツ語 (スイス、eliminate dead keys)"
+msgstr "ドイツ語 (スイス、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:339
 msgid "German (Switzerland, legacy)"
 msgstr "ドイツ語 (スイス、legacy)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:340
 msgid "German (dead acute)"
-msgstr "ドイツ語 (dead acute)"
+msgstr "ドイツ語 (デッド acute キー付き)"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:341
 msgid "German (dead grave acute)"
-msgstr "ドイツ語 (dead grave acute)"
+msgstr "ドイツ語 (デッド grave acute キー付き)"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:342
 msgid "German (eliminate dead keys)"
-msgstr "ドイツ語 (eliminate dead keys)"
-
-#: ../rules/base.xml.in.h:339
-msgid "German (qwerty)"
-msgstr "ドイツ語 (qwerty)"
+msgstr "ドイツ語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:343
 msgid "Greek"
 msgstr "ギリシャ語"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:344
 msgid "Greek (eliminate dead keys)"
-msgstr "ギリシャ語 (eliminate dead keys)"
+msgstr "ギリシャ語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:345
 msgid "Greek (extended)"
-msgstr "ギリシャ語 (extended)"
+msgstr "ギリシャ語 (拡張)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:346
 msgid "Greek (polytonic)"
-msgstr "ギリシャ語 (polytonic)"
+msgstr "ギリシャ語 (表音)"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:347
 msgid "Greek (simple)"
-msgstr "ギリシャ語 (simple)"
+msgstr "ギリシャ語 (標準)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:348
 msgid "Gujarati"
 msgstr "グジャラート語"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:349
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:350
 msgid "HTC Dream"
 msgstr "HTC Dream"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:351
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:352
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking Keyboard for Mac"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:353
 msgid "Hausa"
 msgstr "ハウサ語"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:354
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:355
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "ヘブライ語 (Biblical, Tiro)"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:356
 msgid "Hebrew (lyx)"
 msgstr "ヘブライ語 (lyx)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:357
 msgid "Hebrew (phonetic)"
-msgstr "ヘブライ語 (phonetic)"
+msgstr "ヘブライ語 (表音)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard インターネットキーボード"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard Mini 110 ノートブック"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:367
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:368
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x マルチメディアキーボード"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:369
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:370
 msgid "Hexadecimal"
-msgstr ""
+msgstr "十六進数"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:371
 msgid "Hindi (Bolnagri)"
 msgstr "ヒンディー語 (Bolnagri)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:372
 msgid "Hindi (Wx)"
 msgstr "ヒンディー語 (Wx)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:373
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:374
 msgid "Htc Dream phone"
 msgstr "Htc Dream phone"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/comma/dead keys)"
-msgstr "ハンガリー語 (101/qwerty/comma/dead keys)"
+msgstr "ハンガリー語 (101/qwerty/comma/デッドキー付き)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
-msgstr "ハンガリー語 (101/qwerty/comma/eliminate dead keys)"
+msgstr "ハンガリー語 (101/qwerty/comma/デッドキー無し)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwerty/dot/dead keys)"
-msgstr "ハンガリー語 (101/qwerty/dot/dead keys)"
+msgstr "ハンガリー語 (101/qwerty/dot/デッドキー付き)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
-msgstr "ハンガリー語 (101/qwerty/dot/eliminate dead keys)"
+msgstr "ハンガリー語 (101/qwerty/dot/デッドキー無し)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/comma/dead keys)"
-msgstr "ハンガリー語 (101/qwertz/comma/dead keys)"
+msgstr "ハンガリー語 (101/qwertz/comma/デッドキー付き)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
-msgstr "ハンガリー語 (101/qwertz/comma/eliminate dead keys)"
+msgstr "ハンガリー語 (101/qwertz/comma/デッドキー無し)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "ハンガリー語 (101/qwertz/dot/dead keys)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
-msgstr "ハンガリー語 (101/qwertz/dot/eliminate dead keys)"
+msgstr "ハンガリー語 (101/qwertz/dot/デッドキー無し)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/comma/dead keys)"
-msgstr "ハンガリー語 (102/qwerty/comma/dead keys)"
+msgstr "ハンガリー語 (102/qwerty/comma/デッドキー付き)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
-msgstr "ハンガリー語 (102/qwerty/comma/eliminate dead keys)"
+msgstr "ハンガリー語 (102/qwerty/comma/デッドキー無し)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwerty/dot/dead keys)"
-msgstr "ハンガリー語 (102/qwerty/dot/dead keys)"
+msgstr "ハンガリー語 (102/qwerty/dot/デッドキー付き)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
-msgstr "ハンガリー語 (102/qwerty/dot/eliminate dead keys)"
+msgstr "ハンガリー語 (102/qwerty/dot/デッドキー無し)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/comma/dead keys)"
-msgstr "ハンガリー語 (102/qwertz/comma/dead keys)"
+msgstr "ハンガリー語 (102/qwertz/comma/デッドキー付き)"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
-msgstr "ハンガリー語 (102/qwertz/comma/eliminate dead keys)"
+msgstr "ハンガリー語 (102/qwertz/comma/デッドキー無し)"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (102/qwertz/dot/dead keys)"
-msgstr "ハンガリー語 (102/qwertz/dot/dead keys)"
+msgstr "ハンガリー語 (102/qwertz/dot/デッドキー付き)"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
-msgstr "ハンガリー語 (102/qwertz/dot/eliminate dead keys)"
+msgstr "ハンガリー語 (102/qwertz/dot/デッドキー無し)"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:392
 msgid "Hungarian (eliminate dead keys)"
-msgstr "ハンガリー語 (eliminate dead keys)"
+msgstr "ハンガリー語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:393
 msgid "Hungarian (qwerty)"
 msgstr "ハンガリー語 (qwerty)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:394
 msgid "Hungarian (standard)"
 msgstr "ハンガリー語 (標準)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:395
 msgid "Hyper is mapped to Win-keys"
-msgstr ""
+msgstr "Hyper を Win キーに割り当てる"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:396
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:397
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:398
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:399
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:400
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:401
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic"
 msgstr "アイスランド語"
 
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (Dvorak)"
 msgstr "アイスランド語 (Dvorak)"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:404
 msgid "Icelandic (Macintosh)"
 msgstr "アイスランド語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:405
 msgid "Icelandic (Sun dead keys)"
-msgstr "アイスランド語 (Sun dead keys)"
+msgstr "アイスランド語 (Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:406
 msgid "Icelandic (eliminate dead keys)"
-msgstr "アイスランド語 (eliminate dead keys)"
+msgstr "アイスランド語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:407
 msgid "Igbo"
 msgstr "イボ語"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:408
 msgid "Indian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:406
+#  ISO 639、CLDRなどを要再調査
+#: ../rules/base.xml.in.h:409
 msgid "Inuktitut"
-msgstr ""
+msgstr "イヌクティトゥト語"
 
 # ISO 639 には Iraqi 自体項目が無い
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:410
 msgid "Iraqi"
 msgstr "イラク語"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:411
 msgid "Irish"
 msgstr "アイルランド語"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:412
 msgid "Irish (UnicodeExpert)"
 msgstr "アイルランド語 (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:413
 msgid "Italian"
 msgstr "イタリア語"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:414
 msgid "Italian (Macintosh)"
 msgstr "イタリア語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:415
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "イタリア語 (イタリア文字付き US キーボード)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:416
 msgid "Italian (eliminate dead keys)"
-msgstr "イタリア語 (eliminate dead keys)"
+msgstr "イタリア語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:417
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (Kana 86)"
 msgstr "日本語 (かな 86)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (Kana)"
 msgstr "日本語 (かな)"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:420
 msgid "Japanese (Macintosh)"
 msgstr "日本語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:421
 msgid "Japanese (OADG 109A)"
 msgstr "日本語 (OADG 109A)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:422
 msgid "Japanese (PC-98xx Series)"
 msgstr "日本語 (PC-98xx シリーズ)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:423
 msgid "Japanese keyboard options"
 msgstr "日本語キーボードオプション"
 
 # ISO 639 より
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:424
 msgid "Kalmyk"
 msgstr "カルミック語"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:425
 msgid "Kana Lock key is locking"
-msgstr ""
+msgstr "かなロックキーのロック動作を有効にする"
 
 # インドのカンナダ語
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:426
 msgid "Kannada"
 msgstr "カンナダ語"
 
 # ポーランド北部の言語
 # カシューブ方言ともいう (世界大百科事典)
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:427
 msgid "Kashubian"
 msgstr "カシューブ語"
 
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:428
 msgid "Kazakh"
 msgstr "カザフ語"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:429
 msgid "Kazakh (with Russian)"
 msgstr "カザフ語 (ロシア語付き)"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:430
 msgid "Key sequence to kill the X server"
 msgstr "X サーバーを終了するためのキーシーケンス"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:431
 msgid "Key to choose 3rd level"
-msgstr ""
+msgstr "第3層を選択するキー"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:432
 msgid "Key to choose 5th level"
-msgstr ""
+msgstr "第5層を選択するキー"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:433
 msgid "Key(s) to change layout"
-msgstr ""
+msgstr "配列を変更する時に使用するキー"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:434
 msgid "Keytronic FlexPro"
-msgstr ""
+msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:435
 msgid "Khmer (Cambodia)"
 msgstr "クメール語 (カンボジア)"
 
 # ケニアの言語
 # キクーユ語、キクーユ族
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:436
 msgid "Kikuyu"
 msgstr "キクユ語"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:437
 msgid "Kinesis"
-msgstr ""
+msgstr "Kinesis"
 
 # ISO 639より
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:438
 msgid "Komi"
 msgstr "コミ語"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:439
 msgid "Korean"
-msgstr "朝鮮語"
+msgstr "朝鮮語、韓国語"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:440
 msgid "Korean (101/104 key compatible)"
-msgstr "朝鮮語 (101/104 キー互換)"
+msgstr "朝鮮語、韓国語 (101/104 キー互換)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "クルド語 (イラン、アラビア語ラテン)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iran, F)"
 msgstr "クルド語 (イラン、F)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "クルド語 (イラン、ラテン Alt-Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "クルド語 (イラン、ラテン Q)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "クルド語 (イラク、アラビア語ラテン)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Iraq, F)"
 msgstr "クルド語 (イラク、F)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "クルド語 (イラク、ラテン Alt-Q)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "クルド語 (イラク、ラテン Q)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Syria, F)"
 msgstr "クルド語 (シリア、F)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "クルド語 (シリア、ラテン Alt-Q)"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "クルド語 (シリア、ラテン Q)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:452
 msgid "Kurdish (Turkey, F)"
 msgstr "クルド語 (トルコ、F)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:453
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "クルド語 (トルコ、ラテン Alt-Q)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:454
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "クルド語 (トルコ、ラテン Q)"
 
 # ISO 639 より
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:455
 msgid "Kyrgyz"
 msgstr "キルギス語"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:456
 msgid "Kyrgyz (phonetic)"
-msgstr "キルギス語 (phonetic)"
+msgstr "キルギス語 (表音)"
 
 # ISO 639 より
 # ラオスのラオ語
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:457
 msgid "Lao"
 msgstr "ラオ語"
 
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:458
 msgid "Lao (STEA proposed standard layout)"
 msgstr "ラオ語 (STEA 提案標準配列)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:459
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "ラップトップ/ノートブック Compaq (Armada等) ラップトップキーボード"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:460
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "ラップトップ/ノートブック Compaq (Presario等) インターネットキーボード"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:461
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "ラップトップ/ノートブック eMachines m68xx"
 
 # ISO 639 ではラトヴィア語となっているが、外務省の
 # 国表記、KDEなどではラトビア語となっている
-#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+#: ../rules/base.xml.in.h:462 ../rules/base.extras.xml.in.h:16
 msgid "Latvian"
 msgstr "ラトビア語"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:463
 msgid "Latvian (F variant)"
 msgstr "ラトビア語 (F variant)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:464
 msgid "Latvian (adapted)"
 msgstr "ラトビア語 (adapted)"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:465
 msgid "Latvian (apostrophe variant)"
 msgstr "ラトビア語 (apostrophe variant)"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:466
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "ラトビア語 (ergonomic, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:467
 msgid "Latvian (modern)"
 msgstr "ラトビア語 (modern)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:468
 msgid "Latvian (tilde variant)"
 msgstr "ラトビア語 (tilde variant)"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:469
 msgid "Left Alt"
 msgstr "左 Alt"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:470
 msgid "Left Alt (while pressed)"
 msgstr "左 Alt (押している間)"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:471
 msgid "Left Alt is swapped with Left Win"
-msgstr ""
+msgstr "左 Alt と左 Win を入れ替える"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:472
 msgid "Left Ctrl"
 msgstr "左 Ctrl"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:473
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
-msgstr ""
+msgstr "左 Ctrl (最初の配列に変更する)、右 Ctrl (最後の配列に変更する)"
 
-#: ../rules/base.xml.in.h:471
+#: ../rules/base.xml.in.h:474
+msgid "Left Ctrl as Meta"
+msgstr "左 Ctrl を Meta として扱う"
+
+#: ../rules/base.xml.in.h:475
 msgid "Left Ctrl+Left Shift"
 msgstr "左 Ctrl+左 Shift"
 
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:476
 msgid "Left Shift"
 msgstr "左 Shift"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:477
 msgid "Left Win"
 msgstr "左 Win"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:478
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
-msgstr ""
+msgstr "左 Win (最初の配列に変更する)、右 Win/Menu (最後の配列に変更する)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:479
 msgid "Left Win (while pressed)"
 msgstr "左 Win (押している間)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:480
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr ""
+msgstr "左 Win で第5層を選択する。他の第5層を選択するキーと同時に押した場合は第5層で固定する"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:481
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr ""
+msgstr "左 Win で第5層を選択する。他の第5層を選択するキーと同時に押した場合は第5層で固定する。固定を解除する場合は第5層を選択するキーのいずれかを押す"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:482
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
-msgstr ""
+msgstr "左 Ctrl+ 左tWin (最初の配列に変更する)、右 Ctrl+Menu (2番目の配列に変更する)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:483
 msgid "Legacy"
 msgstr ""
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:484
 msgid "Legacy Wang 724"
 msgstr ""
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:486
 msgid "Legacy key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:487
 msgid "Legacy key with dot"
 msgstr ""
 
-#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+#: ../rules/base.xml.in.h:488 ../rules/base.extras.xml.in.h:25
 msgid "Lithuanian"
 msgstr "リトアニア語"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "リトアニア語 (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:490
 msgid "Lithuanian (LEKP)"
 msgstr "リトアニア語 (LEKP)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:491
 msgid "Lithuanian (LEKPa)"
 msgstr "リトアニア語 (LEKPa)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:492
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "リトアニア語 (リトアニア文字付き US キーボード)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:493
 msgid "Lithuanian (standard)"
 msgstr "リトアニア語 (標準)"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Access キーボード"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech コードレスデスクトップ"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "Logitech コードレスデスクトップ (alternate option)"
+msgstr "Logitech コードレスデスクトップ (代替オプション)"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech コードレスデスクトップ EX110"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech コードレスデスクトップ LX-300"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech コードレスデスクトップナビゲーター"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:500
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech コードレスデスクトップ Optical"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
-msgstr "Logitech コードレスデスクトッププロ (alternate option 2)"
+msgstr "Logitech コードレスデスクトッププロ (代替オプション 2)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech コードレスデスクトップ iTouch"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr ""
+msgstr "Logitech コードレス・フリーダム/デスクトップ・ナビゲーター"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:504
 msgid "Logitech G15 extra keys via G15daemon"
-msgstr ""
+msgstr "Logitech G15、G15daemon による追加キー"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech 標準キーボード"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Logitech インターネット 350 キーボード"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech インターネットキーボード"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:508
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech インターネットナビゲーターキーボード"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:509
 msgid "Logitech Media Elite Keyboard"
 msgstr "Logitech Media Elite キーボード"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:510
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Logitech Ultra-X コードレスメディアデスクトップキーボード"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:511
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Logitech Ultra-X キーボード"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:512
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Logitech diNovo Edge キーボード"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:513
 msgid "Logitech diNovo Keyboard"
 msgstr "Logitech diNovo キーボード"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:514
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:515
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch コードレスキーボード (モデル Y-RB6)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:516
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech iTouch インターネットナビゲーターキーボード SE"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:517
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech iTouch インターネットナビゲーターキーボード SE (USB)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:518
 msgid "Lower Sorbian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:519
 msgid "Lower Sorbian (qwertz)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:520
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:521
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Intl)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:522
 msgid "Macedonian"
-msgstr ""
+msgstr "マケドニア語"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:523
 msgid "Macedonian (eliminate dead keys)"
-msgstr ""
+msgstr "マケドニア語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:524
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:525
 msgid "Macintosh Old"
-msgstr ""
+msgstr "Macintosh Old"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Backspace"
-msgstr ""
+msgstr "Caps Lock を追加の Backspace にする"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
-msgstr ""
+msgstr "Caps Lock を追加の Control にするが、Caps_Lock キーコードはそのままにする"
 
-#: ../rules/base.xml.in.h:524
-msgid "Make Caps Lock an additional Ctrl"
-msgstr ""
-
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional ESC"
-msgstr ""
+msgstr "Caps Lock を追加の ESC にする"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:529
 msgid "Make Caps Lock an additional Hyper"
-msgstr ""
+msgstr "Caps Lock を追加の Hyper にする"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:530
 msgid "Make Caps Lock an additional Num Lock"
-msgstr ""
+msgstr "Caps Lock を追加の Num Lock にする"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:531
 msgid "Make Caps Lock an additional Super"
-msgstr ""
+msgstr "Caps Lock を追加の Super にする"
 
 # ISO 639 より
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:532
 msgid "Malayalam"
 msgstr "マラヤーラム語"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:533
 msgid "Malayalam (Lalitha)"
 msgstr "マラヤーラム語 (Lalitha)"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:534
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
-msgstr "マラヤーラム語 (enhanced Inscript with Rupee Sign)"
+msgstr "マラヤーラム語 (ルピー記号付き拡張 Inscript)"
 
 # ISO 639 より
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:535
 msgid "Maltese"
 msgstr "マルタ語"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:536
 msgid "Maltese (with US layout)"
 msgstr "マルタ語 (US 配列付き)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:537
 msgid "Maori"
 msgstr "マオリ語"
 
 # ISO 639 より
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:538
 msgid "Mari"
 msgstr "マリ語"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:539
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:540
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access キーボード"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:541
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:542
 msgid "Menu"
-msgstr ""
+msgstr "Menu"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:543
+msgid "Menu as Right Ctrl"
+msgstr "Menu を右 Ctrl として扱う"
+
+#: ../rules/base.xml.in.h:544
 msgid "Meta is mapped to Left Win"
-msgstr ""
+msgstr "Meta を左 Win に割り当てる"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:545
 msgid "Meta is mapped to Win keys"
-msgstr ""
+msgstr "Meta を Win キーに割り当てる"
 
-#: ../rules/base.xml.in.h:542
-msgid "Meta on Left Ctrl"
-msgstr ""
-
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve キーボード 2000"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft インターネットキーボード"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft インターネットキーボードプロ (スウェーデン語)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:550
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural キーボード Elite"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural キーボードプロ/ Microsoft インターネットキーボードプロ"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural キーボードプロ OEM"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:553
 msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural キーボードプロ USB / Microsoft インターネットキーボードプロ"
 
-#: ../rules/base.xml.in.h:551
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Microsoft Natural ワイヤレスエルゴノミックキーボード 4000"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:555
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Microsoft Natural ワイヤレスエルゴノミックキーボード 7000"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:556
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft オフィスキーボード"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:557
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft ワイヤレスマルチメディアキーボード 1.0A"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:558
 msgid "Miscellaneous compatibility options"
 msgstr "その他の互換性に関するオプション"
 
 # ISO 639 では蒙古語になっているが外務省表記を採用する
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:559
 msgid "Mongolian"
 msgstr "モンゴル語"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin"
 msgstr "モンテネグロ語"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:561
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "モンテネグロ語 (Cyrillic with guillemets)"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:562
 msgid "Montenegrin (Cyrillic)"
 msgstr "モンテネグロ語 (Cyrillic)"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:563
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "モンテネグロ語 (Cyrillic, Z and ZHE swapped)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "モンテネグロ語 (ラテンユニコード qwerty)"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:565
 msgid "Montenegrin (Latin Unicode)"
 msgstr "モンテネグロ語 (ラテンユニコード)"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:566
 msgid "Montenegrin (Latin qwerty)"
 msgstr "モンテネグロ語 (ラテン qwerty)"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:567
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "モンテネグロ語 (Latin with guillemets)"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:568
 msgid "NICOLA-F style Backspace"
-msgstr ""
+msgstr "NICOLA-F スタイルの Backspace にする"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:569
 msgid "Nepali"
 msgstr "ネパール語"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at fourth level"
-msgstr ""
+msgstr "第4層で改行不可空白文字を入力する"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr ""
+msgstr "第4層で改行不可空白文字を入力し、第六層で細い改行不可空白文字を入力する"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:572
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
-msgstr ""
+msgstr "第4層で改行不可空白文字を入力し、第六層で細い改行不可空白文字を入力する (Ctrl+Shift 経由)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at second level"
-msgstr ""
+msgstr "第2層で改行不可空白文字を入力する"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:574
 msgid "Non-breakable space character at third level"
-msgstr ""
+msgstr "第3層で改行不可空白文字を入力する"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:575
 msgid "Non-breakable space character at third level, nothing at fourth level"
-msgstr ""
+msgstr "第3層で改行不可空白文字を入力し、第4層では何もしない"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:576
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr ""
+msgstr "第3層で改行不可空白文字を入力し、第4層で細い改行不可空白文字を入力する"
 
 # ISO 639 より
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:577
 msgid "Northern Saami (Finland)"
 msgstr "北サーミ語 (フィンランド)"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:578
 msgid "Northern Saami (Norway)"
 msgstr "北サーミ語 (ノルウェー)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:579
 msgid "Northern Saami (Norway, eliminate dead keys)"
-msgstr "北サーミ語 (ノルウェー、eliminate dead keys)"
+msgstr "北サーミ語 (ノルウェー、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:580
 msgid "Northern Saami (Sweden)"
 msgstr "北サーミ語 (スウェーデン)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:581
 msgid "Northgate OmniKey 101"
-msgstr ""
+msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:582
 msgid "Norwegian"
 msgstr "ノルウェー語"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (Dvorak)"
 msgstr "ノルウェー語 (Dvorak)"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:584
 msgid "Norwegian (Macintosh)"
 msgstr "ノルウェー語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:585
 msgid "Norwegian (Macintosh, eliminate dead keys)"
-msgstr "ノルウェー語 (Macintosh, eliminate dead keys)"
+msgstr "ノルウェー語 (Macintosh、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:586
 msgid "Norwegian (eliminate dead keys)"
-msgstr "ノルウェー語 (eliminate dead keys)"
+msgstr "ノルウェー語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:587
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:588
 msgid "Numeric keypad delete key behaviour"
-msgstr ""
+msgstr "テンキーにある delete キーの動作"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:589
 msgid "Numeric keypad keys work as with Macintosh"
-msgstr ""
+msgstr "テンキーを Macintosh と同じ動作にする"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:590
 msgid "Numeric keypad layout selection"
-msgstr ""
+msgstr "テンキー配列の選択"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:591
 msgid "OLPC"
 msgstr "OLPC"
 
 # ISO 639
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:592
 msgid "Occitan"
 msgstr "オック語"
 
 # 古代語
 # オガムまたはオーガム表記
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:593
 msgid "Ogham"
 msgstr "オガム語"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:594
 msgid "Ogham (IS434)"
 msgstr "オガム語 (IS434)"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:595
 msgid "Oriya"
 msgstr "オリヤー語"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:596
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Ortek MCK-800 MM/インターネットキーボード"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:597
 msgid "Ossetian (Georgia)"
 msgstr "オセット語 (Georgia)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:598
 msgid "Ossetian (WinKeys)"
 msgstr "オセット語 (WinKeys)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:599
 msgid "Ossetian (legacy)"
 msgstr "オセット語 (legacy)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:600
 msgid "PC-98xx Series"
 msgstr "PC-98xx シリーズ"
 
-#: ../rules/base.xml.in.h:598
+# スロバキアの地方語、要調査
+#: ../rules/base.xml.in.h:601
 msgid "Pannonian Rusyn (homophonic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:602
 msgid "Pashto"
 msgstr "パシュト語"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:603
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "パシュト語 (アフガニスタン、OLPC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:604
 msgid "Pause"
 msgstr "Pause"
 
 # ISO 639
-#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:27
 msgid "Persian"
 msgstr "ペルシア語"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:606
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "ペルシア語 (アフガニスタン、ダリー語 OLPC)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:607
 msgid "Persian (with Persian Keypad)"
 msgstr "ペルシア語 (ペルシア語キーパッド付き)"
 
-#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:28
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:609
 msgid "Polish (Dvorak)"
 msgstr "ポーランド語 (Dvorak)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:610
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "ポーランド語 (Dvorak, Polish quotes on key 1)"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:611
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "ポーランド語 (Dvorak, Polish quotes on quotemark key)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:612
 msgid "Polish (programmer Dvorak)"
 msgstr "ポーランド語 (プログラマー Dvorak)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:613
 msgid "Polish (qwertz)"
 msgstr "ポーランド語 (qwertz)"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil)"
 msgstr "ポルトガル語 (ブラジル)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "ポルトガル語 (ブラジル、Dvorak)"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, eliminate dead keys)"
-msgstr "ポルトガル語 (ブラジル、eliminate dead keys)"
+msgstr "ポルトガル語 (ブラジル、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:618
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "ポルトガル語 (ブラジル、nativo for Esperanto)"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:619
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "ポルトガル語 (ブラジル、nativo for USA keyboards)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:620
 msgid "Portuguese (Brazil, nativo)"
 msgstr "ポルトガル語 (ブラジル、nativo)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Macintosh)"
 msgstr "ポルトガル語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Macintosh, Sun dead keys)"
-msgstr "ポルトガル語 (Macintosh, Sun dead keys)"
+msgstr "ポルトガル語 (Macintosh, Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Macintosh, eliminate dead keys)"
-msgstr "ポルトガル語 (Macintosh, eliminate dead keys)"
+msgstr "ポルトガル語 (Macintosh、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "ポルトガル語 (Nativo for USA keyboards)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:625
 msgid "Portuguese (Nativo)"
 msgstr "ポルトガル語 (Nativo)"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:626
 msgid "Portuguese (Sun dead keys)"
-msgstr "ポルトガル語 (Sun dead keys)"
+msgstr "ポルトガル語 (Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:627
 msgid "Portuguese (eliminate dead keys)"
-msgstr "ポルトガル語 (eliminate dead keys)"
+msgstr "ポルトガル語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:628
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:629
 msgid "PrtSc"
 msgstr "PrtSc"
 
 # ISO 639
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:630
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "パンジャブ語 (Gurmukhi Jhelum)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:631
 msgid "Punjabi (Gurmukhi)"
 msgstr "パンジャブ語 (Gurmukhi)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:632
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt"
 msgstr "右 Alt"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt (while pressed)"
 msgstr "右 Alt (押している間)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:635
+msgid "Right Alt as Right Ctrl"
+msgstr "右 Alt を右 Ctrl として扱う"
+
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:637
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr ""
+msgstr "右t Alt で第5層を選択する。他の第5層を選択するキーと同時に押した場合は第5層で固定する"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:638
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr ""
+msgstr "右 Alt で第5層を選択する。他の第5層を選択するキーと同時に押した場合は第5層で固定する。固定を解除する場合は第5層を選択するキーのいずれかを押す"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:639
 msgid "Right Alt key never chooses 3rd level"
-msgstr ""
+msgstr "右 Alt キーでは第3層を選択しない"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:640
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr ""
+msgstr "右 Alt、 Shift+右 Alt キーを Multi_Key にする"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl"
 msgstr "右 Ctrl"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:642
 msgid "Right Ctrl (while pressed)"
 msgstr "右 Ctrl (押している間)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:643
 msgid "Right Ctrl as Right Alt"
-msgstr ""
+msgstr "右 Ctrl を右 Alt として扱う"
 
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl is mapped to Menu"
-msgstr ""
-
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:644
 msgid "Right Ctrl+Right Shift"
-msgstr ""
+msgstr "右 Ctrl + 右 Shift"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:645
 msgid "Right Shift"
 msgstr "右 Shift"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:646
 msgid "Right Win"
 msgstr "右 Win"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:647
 msgid "Right Win (while pressed)"
 msgstr "右 Win (押している間)"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:648
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr ""
+msgstr "右 Win で第5層を選択する。他の第5層を選択するキーと同時に押した場合は第5層で固定する"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:649
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr ""
+msgstr "右 Win で第5層を選択する。他の第5層を選択するキーと同時に押した場合は第5層で固定する。固定を解除する場合は第5層を選択するキーのいずれかを押す"
 
-#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+#: ../rules/base.xml.in.h:650 ../rules/base.extras.xml.in.h:30
 msgid "Romanian"
 msgstr "ルーマニア語"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (Germany)"
 msgstr "ルーマニア語 (ドイツ)"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (Germany, eliminate dead keys)"
-msgstr "ルーマニア語 (ドイツ、eliminate dead keys)"
+msgstr "ルーマニア語 (ドイツ、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (WinKeys)"
 msgstr "ルーマニア語 (WinKeys)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:654
 msgid "Romanian (cedilla)"
 msgstr "ルーマニア語 (cedilla)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (standard cedilla)"
 msgstr "ルーマニア語 (standard cedilla)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "ルーマニア語 (標準)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:657
 msgid "Rupee on 4"
-msgstr ""
+msgstr "4 キーにルピー記号を追加割り当てする"
 
-#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:658 ../rules/base.extras.xml.in.h:32
 msgid "Russian"
 msgstr "ロシア語"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:659
 msgid "Russian (DOS)"
 msgstr "ロシア語 (DOS)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Georgia)"
 msgstr "ロシア語 (Georgia)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Germany, phonetic)"
-msgstr "ロシア語 (ドイツ、phonetic)"
+msgstr "ロシア語 (ドイツ、表音)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "ロシア語 (カザフスタン、カザフ語付き)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:663
 msgid "Russian (Poland, phonetic Dvorak)"
-msgstr "ロシア語 (ポーランド、phonetic Dvorak)"
+msgstr "ロシア語 (ポーランド、表音 Dvorak)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:664
 msgid "Russian (Sweden, phonetic)"
-msgstr "ロシア語 (スウェーデン、phonetic)"
+msgstr "ロシア語 (スウェーデン、表音)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:665
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
-msgstr "ロシア語 (スウェーデン、phonetic, eliminate dead keys)"
+msgstr "ロシア語 (スウェーデン、表音、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:666
 msgid "Russian (US, phonetic)"
-msgstr "ロシア語 (US, phonetic)"
+msgstr "ロシア語 (US、表音)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:667
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "ロシア語 (ウクライナ、標準 RSTU)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:668
 msgid "Russian (legacy)"
 msgstr "ロシア語 (legacy)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:669
 msgid "Russian (phonetic WinKeys)"
-msgstr "ロシア語 (phonetic WinKeys)"
+msgstr "ロシア語 (表音、WinKeys)"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:670
 msgid "Russian (phonetic)"
 msgstr "ロシア語 (表音)"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:671
 msgid "Russian (typewriter)"
 msgstr "ロシア語 (タイプライター)"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:672
 msgid "Russian (typewriter, legacy)"
 msgstr "ロシア語 (タイプライター、legacy)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:673
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST マルチメディアワイヤレスキーボード"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:674
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:675
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:676
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:677
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:678
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:679
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:677
+# 台湾の地方語、サイシャット語?
+#: ../rules/base.xml.in.h:680
 msgid "Saisiyat (Taiwan)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:681
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:682
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:683
 msgid "Sanwa Supply SKB-KG3"
 msgstr "サンワサプライ SKB-KG3"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:684
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:685
 msgid "Semi-colon on third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:686 ../rules/base.extras.xml.in.h:35
 msgid "Serbian"
 msgstr "セルビア語"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "セルビア語 (ラテンユニコード qwerty)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin Unicode)"
 msgstr "セルビア語 (ラテンユニコード)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:689
 msgid "Serbian (Latin qwerty)"
 msgstr "セルビア語 (ラテン qwerty)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Latin with guillemets)"
 msgstr "セルビア語 (Latin with guillemets)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (Latin)"
 msgstr "セルビア語 (ラテン)"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:692
 msgid "Serbian (Russia)"
 msgstr "セルビア語 (ロシア)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:693
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "セルビア語 (Z and ZHE swapped)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:694
 msgid "Serbian (with guillemets)"
 msgstr "セルビア語 (with guillemets)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:695
 msgid "Serbo-Croatian (US)"
 msgstr "セルボクロアチア語 (US)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:696
 msgid "Shift cancels Caps Lock"
-msgstr ""
+msgstr "Shift を押すと Caps Lock をキャンセルする"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:697
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
-msgstr ""
+msgstr "Shift を押しても Num Lock を解除せず、代わりに第3層を選択する"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:698
 msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr ""
+msgstr "テンキーの Shift の動作を MS Windows と同様にする"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:699
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:700
 msgid "Sindhi"
 msgstr "シンディー語"
 
-# スリランカ シンハラ語
-#: ../rules/base.xml.in.h:698
-msgid "Sinhala"
-msgstr "シンハラ語"
+#: ../rules/base.xml.in.h:701
+msgid "Sinhala (phonetic)"
+msgstr "シンハラ語 (表音)"
 
 # ISO 639 ではスロヴァキアとしてあるが、
 # 外務省の国表記に従いスロバキアとする
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
 msgid "Slovak"
 msgstr "スロバキア語"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
 msgid "Slovak (extended Backslash)"
-msgstr "スロバキア語 (extended Backslash)"
+msgstr "スロバキア語 (Backslash 拡張)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
 msgid "Slovak (qwerty)"
 msgstr "スロバキア語 (qwerty)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
 msgid "Slovak (qwerty, extended Backslash)"
-msgstr "スロバキア語 (qwerty, extended Backslash)"
+msgstr "スロバキア語 (qwerty、Backslash 拡張)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
 msgid "Slovenian"
 msgstr "スロベニア語"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "スロベニア語 (スロベニア文字付き US キーボード)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "スロベニア語 (use guillemets for quotes)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Dvorak)"
 msgstr "スペイン語 (Dvorak)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American)"
 msgstr "スペイン語 (ラテンアメリカ)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
 msgid "Spanish (Latin American, Sun dead keys)"
-msgstr "スペイン語 (ラテンアメリカ、Sun dead keys)"
+msgstr "スペイン語 (ラテンアメリカ、Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Latin American, eliminate dead keys)"
-msgstr "スペイン語 (ラテンアメリカ、eliminate dead keys)"
+msgstr "スペイン語 (ラテンアメリカ、デッドキー無し)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (Latin American, include dead tilde)"
-msgstr "スペイン語 (ラテンアメリカ、include dead tilde)"
+msgstr "スペイン語 (ラテンアメリカ、デッドティルダ付き)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (Macintosh)"
 msgstr "スペイン語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Spanish (Sun dead keys)"
-msgstr "スペイン語 (Sun dead keys)"
+msgstr "スペイン語 (Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Spanish (eliminate dead keys)"
-msgstr "スペイン語 (eliminate dead keys)"
+msgstr "スペイン語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Spanish (include dead tilde)"
-msgstr "スペイン語 (include dead tilde)"
+msgstr "スペイン語 (デッドティルダ付き)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "サーバーで取り扱われる特殊キー (Ctrl+Alt+&lt;key&gt;)"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power マルチメディアキーボード"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swahili (Kenya)"
 msgstr "スワヒリ語 (ケニア)"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swahili (Tanzania)"
 msgstr "スワヒリ語 (タンザニア)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Ctrl と Caps Lock を入れ替える"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
 msgid "Swap ESC and Caps Lock"
 msgstr "ESC と Caps Lock を入れ替える"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (Dvorak)"
 msgstr "スウェーデン語 (Dvorak)"
 
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:728
 msgid "Swedish (Macintosh)"
 msgstr "スウェーデン語 (Macintosh)"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
 msgid "Swedish (Svdvorak)"
 msgstr "スウェーデン語 (Svdvorak)"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:730
 msgid "Swedish (eliminate dead keys)"
-msgstr "スウェーデン語 (eliminate dead keys)"
+msgstr "スウェーデン語 (デッドキー無し)"
 
-#: ../rules/base.xml.in.h:728
+#: ../rules/base.xml.in.h:731
 msgid "Swedish Sign Language"
 msgstr "スウェーデン手話"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:732
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (タブレット PC)"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
 msgid "Syriac"
 msgstr "シリア語"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
 msgid "Syriac (phonetic)"
 msgstr "シリア語 (表音)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
 msgid "Taiwanese"
 msgstr "台湾語"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
 msgid "Taiwanese (indigenous)"
 msgstr "台湾語 (現地語)"
 
 # ISO 639
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
 msgid "Tajik"
 msgstr "タジク語"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
 msgid "Tajik (legacy)"
 msgstr "タジク語 (legacy)"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
 msgid "Tamil"
 msgstr "タミル語"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "タミル語 (スリランカ、TAB タイプライター)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "タミル語 (スリランカ、ユニコード)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (TAB typewriter)"
 msgstr "タミル語 (TAB タイプライター)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
 msgid "Tamil (TSCII typewriter)"
 msgstr "タミル語 (TSCII タイプライター)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
 msgid "Tamil (Unicode)"
 msgstr "タミル語 (ユニコード)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
 msgid "Tamil (keyboard with numerals)"
 msgstr "タミル語 (数字付きキーボード)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
 msgid "Tatar"
 msgstr "タタール語"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
 msgid "Telugu"
 msgstr "テルグ語"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
 msgid "Thai"
 msgstr "タイ語"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
 msgid "Thai (Pattachote)"
 msgstr "タイ語 (Pattachote)"
 
 # ISO 639
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:751
 msgid "Thai (TIS-820.2538)"
 msgstr "タイ語 (TIS-820.2538)"
 
 # ISO 639
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
 msgid "Tibetan"
 msgstr "チベット語"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
 msgid "Tibetan (with ASCII numerals)"
 msgstr "チベット語 (ASCII 数字付き)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
 msgid "To the corresponding key in a Dvorak keyboard."
-msgstr ""
+msgstr "Dvorak キーボードと対応するキーに割り当てる"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
 msgid "To the corresponding key in a Qwerty keyboard."
-msgstr ""
+msgstr "Qwerty キーボードと対応するキーに割り当てる"
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
 msgid "Toggle PointerKeys with Shift + NumLock."
-msgstr ""
+msgstr "Shift + NumLock で PointerKeys をトグルする"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:758
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access キーボード"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust ワイヤレスキーボードクラシック"
 
 # ISO 639
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
 msgid "Tswana"
 msgstr "ツワナ語"
 
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:762
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (Alt-Q)"
 msgstr "トルコ語 (Alt-Q)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
 msgid "Turkish (F)"
 msgstr "トルコ語 (F)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
 msgid "Turkish (Sun dead keys)"
-msgstr "トルコ語 (Sun dead keys)"
+msgstr "トルコ語 (Sun デッドキー付き)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
 msgid "Turkish (international with dead keys)"
-msgstr "トルコ語 (international with dead keys)"
+msgstr "トルコ語 (国際化、デッドキー付き)"
 
 # ISO 639 ではトゥルクメン語とあるが、
 # 外務省の国名ではトルクメニスタン
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:767
 msgid "Turkmen"
 msgstr "トルクメン語"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
 msgid "Turkmen (Alt-Q)"
 msgstr "トルクメン語 (Alt-Q)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:772
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU モード)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:773
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP モード)"
 
 # ISO 639
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:774
 msgid "Udmurt"
 msgstr "ウドムルト語"
 
 # ISO 639
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian"
 msgstr "ウクライナ語"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (WinKeys)"
 msgstr "ウクライナ語 (WinKeys)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "ウクライナ語 (homophonic)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (legacy)"
 msgstr "ウクライナ語 (legacy)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
 msgid "Ukrainian (phonetic)"
 msgstr "ウクライナ語 (表音)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
 msgid "Ukrainian (standard RSTU)"
 msgstr "ウクライナ語 (標準 RSTU)"
 
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
 msgid "Ukrainian (typewriter)"
 msgstr "ウクライナ語 (タイプライター)"
 
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:782
 msgid "Unicode additions (arrows and math operators)"
-msgstr ""
+msgstr "ユニコード追加文字 (矢印および数学記号)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:783
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
-msgstr ""
+msgstr "ユニコード追加文字 (矢印および数学記号)。数学記号は標準の層に配置"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:784
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
 # ISO 639
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (Pakistan)"
 msgstr "ウルドゥー語 (パキスタン)"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "ウルドゥー語 (パキスタン、CRULP)"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (Pakistan, NLA)"
 msgstr "ウルドゥー語 (パキスタン、NLA)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
 msgid "Urdu (WinKeys)"
 msgstr "ウルドゥー語 (WinKeys)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:789
 msgid "Urdu (alternative phonetic)"
-msgstr "ウルドゥー語 (alternative phonetic)"
+msgstr "ウルドゥー語 (代替表音)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
 msgid "Urdu (phonetic)"
 msgstr "ウルドゥー語 (表音)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
 msgid "Use keyboard LED to show alternative layout"
 msgstr "キーボード LED を代替配列を表すために使用する"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:792
 msgid "Using space key to input non-breakable space character"
-msgstr ""
+msgstr "スペースキーを使用して改行不可空白文字を入力する時の動作"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:793
 msgid "Usual space at any level"
-msgstr ""
+msgstr "すべての層で通常のスペースを使用する"
 
 # ISO 639
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:794
 msgid "Uyghur"
 msgstr "ウイグル語"
 
 # ISO 639
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek"
 msgstr "ウズベク語"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
 msgid "Uzbek (Afghanistan)"
 msgstr "ウズベク語 (アフガニスタン)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "ウズベク語 (アフガニスタン、OLPC)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
 msgid "Uzbek (Latin)"
 msgstr "ウズベク語 (ラテン)"
 
 # ISO 639
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 インターネットキーボード"
 
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:802
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:803
 msgid "Winbook Model XP5"
 msgstr "Winbook モデル XP5"
 
 # ISO 639
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
 msgid "Wolof"
 msgstr "ウォロフ語"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! インターネットキーボード"
 
 # ISO 639
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
 msgid "Yakut"
 msgstr "ヤクート語"
 
 # ISO 639
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
 msgid "Yoruba"
 msgstr "ヨルバ語"
 
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level"
-msgstr ""
+msgstr "第2層で幅 0 の非結合文字を入力する"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:809
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
-msgstr ""
+msgstr "第2層で幅 0 の非結合文字を入力し、第3層で改行不可空白文字を入力する"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:810
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
-msgstr ""
+msgstr "第2層で幅 0 の非結合文字を入力し、第3層で改行不可空白文字を入力し、第4層では何もしない"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:811
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
-msgstr ""
+msgstr "第2層で幅 0 の非結合文字を入力し、第3層で改行不可空白文字を入力し、第4層で細い改行不可空白文字を入力する"
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:812
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
-msgstr ""
+msgstr "第2層で幅 0 の非結合文字を入力し、第3層で改行不可空白文字を入力し、第4層で幅 0 の結合文字を入力する"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:813
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
-msgstr ""
+msgstr "第2層で幅 0 の非結合文字を入力し、第3層で幅 0 の結合文字を入力する"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:814
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
-msgstr ""
+msgstr "第2層で幅 0 の非結合文字を入力し、第3層で幅 0 の結合文字を入力し、第4層で改行不可空白文字を入力する"
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:815
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
-msgstr ""
+msgstr "第3層で幅 0 の非結合文字を入力し、第4層で幅 0 の結合文字を入力する"
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:816
 msgid "ak"
-msgstr ""
+msgstr "ak"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:817
 msgid "am"
-msgstr ""
+msgstr "am"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
 msgid "ar"
-msgstr ""
+msgstr "ar"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
 msgid "avn"
-msgstr ""
+msgstr "avn"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:820
 msgid "az"
-msgstr ""
+msgstr "az"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
 msgid "be"
-msgstr ""
+msgstr "be"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
 msgid "ber"
-msgstr ""
+msgstr "ber"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
 msgid "bg"
-msgstr ""
+msgstr "bg"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
 msgid "bm"
-msgstr ""
+msgstr "bm"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
 msgid "bn"
-msgstr ""
+msgstr "bn"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
 msgid "brl"
-msgstr ""
+msgstr "brl"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
 msgid "bs"
-msgstr ""
+msgstr "bs"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
 msgid "ca"
-msgstr ""
+msgstr "ca"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
 msgid "chr"
-msgstr ""
+msgstr "chr"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
 msgid "cm"
-msgstr ""
+msgstr "cm"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:831 ../rules/base.extras.xml.in.h:38
 msgid "crh"
-msgstr ""
+msgstr "crh"
 
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
 msgid "cs"
-msgstr ""
+msgstr "cs"
 
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
 msgid "da"
-msgstr ""
+msgstr "da"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:39
 msgid "de"
-msgstr ""
+msgstr "de"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
 msgid "dv"
-msgstr ""
+msgstr "dv"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
 msgid "dz"
-msgstr ""
+msgstr "dz"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
 msgid "ee"
-msgstr ""
+msgstr "ee"
 
-#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:40
 msgid "en"
-msgstr ""
+msgstr "en"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
 msgid "eo"
-msgstr ""
+msgstr "eo"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
 msgid "es"
-msgstr ""
+msgstr "es"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
 msgid "et"
-msgstr ""
+msgstr "et"
 
-#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:41
 msgid "fa"
-msgstr ""
+msgstr "fa"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
 msgid "ff"
-msgstr ""
+msgstr "ff"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
 msgid "fi"
-msgstr ""
+msgstr "fi"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
 msgid "fo"
-msgstr ""
+msgstr "fo"
 
-#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:846 ../rules/base.extras.xml.in.h:42
 msgid "fr"
-msgstr ""
+msgstr "fr"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
 msgid "gaa"
-msgstr ""
+msgstr "gaa"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
 msgid "gr"
-msgstr ""
+msgstr "gr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:849
 msgid "gu"
-msgstr ""
+msgstr "gu"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
 msgid "ha"
-msgstr ""
+msgstr "ha"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
 msgid "he"
-msgstr ""
+msgstr "he"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:852
 msgid "hi"
-msgstr ""
+msgstr "hi"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
 msgid "hr"
-msgstr ""
+msgstr "hr"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
 msgid "hu"
-msgstr ""
+msgstr "hu"
 
-#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
+#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:43
 msgid "hy"
-msgstr ""
+msgstr "hy"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
 msgid "ie"
-msgstr ""
+msgstr "ie"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
 msgid "ig"
-msgstr ""
+msgstr "ig"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:858
 msgid "ike"
-msgstr ""
+msgstr "ike"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
 msgid "in"
-msgstr ""
+msgstr "in"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
 msgid "is"
-msgstr ""
+msgstr "is"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
 msgid "it"
-msgstr ""
+msgstr "it"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
 msgid "ja"
-msgstr ""
+msgstr "ja"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:863
 msgid "ka"
-msgstr ""
+msgstr "ka"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
 msgid "ki"
-msgstr ""
+msgstr "ki"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
 msgid "kk"
-msgstr ""
+msgstr "kk"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
 msgid "km"
-msgstr ""
+msgstr "km"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:867
 msgid "kn"
-msgstr ""
+msgstr "kn"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
 msgid "ko"
-msgstr ""
+msgstr "ko"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
 msgid "ku"
-msgstr ""
+msgstr "ku"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
 msgid "lo"
-msgstr ""
+msgstr "lo"
 
-#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:871 ../rules/base.extras.xml.in.h:45
 msgid "lt"
-msgstr ""
+msgstr "lt"
 
-#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:46
 msgid "lv"
-msgstr ""
+msgstr "lv"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:873
 msgid "mi"
-msgstr ""
+msgstr "mi"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
 msgid "mk"
-msgstr ""
+msgstr "mk"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
 msgid "ml"
-msgstr ""
+msgstr "ml"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
 msgid "mn"
-msgstr ""
+msgstr "mn"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
 msgid "mt"
-msgstr ""
+msgstr "mt"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:878
 msgid "my"
-msgstr ""
+msgstr "my"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
 msgid "ne"
-msgstr ""
+msgstr "ne"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
 msgid "nl"
-msgstr ""
+msgstr "nl"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:881
 msgid "no"
-msgstr ""
+msgstr "no"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
 msgid "or"
-msgstr ""
+msgstr "or"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
 msgid "pa"
-msgstr ""
+msgstr "pa"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
 msgid "ph"
-msgstr ""
+msgstr "ph"
 
-#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:47
 msgid "pl"
-msgstr ""
+msgstr "pl"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
 msgid "ps"
-msgstr ""
+msgstr "ps"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
 msgid "pt"
-msgstr ""
+msgstr "pt"
 
-#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
+#: ../rules/base.xml.in.h:888 ../rules/base.extras.xml.in.h:48
 msgid "ro"
-msgstr ""
+msgstr "ro"
 
-#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:889 ../rules/base.extras.xml.in.h:49
 msgid "ru"
-msgstr ""
+msgstr "ru"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
 msgid "sd"
-msgstr ""
+msgstr "sd"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
 msgid "si"
-msgstr ""
+msgstr "si"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
 msgid "sk"
-msgstr ""
+msgstr "sk"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
 msgid "sl"
-msgstr ""
+msgstr "sl"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
 msgid "sq"
-msgstr ""
+msgstr "sq"
 
-#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
+#: ../rules/base.xml.in.h:895 ../rules/base.extras.xml.in.h:51
 msgid "sr"
-msgstr ""
+msgstr "sr"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
 msgid "sv"
-msgstr ""
+msgstr "sv"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
 msgid "sw"
-msgstr ""
+msgstr "sw"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
 msgid "syc"
-msgstr ""
+msgstr "syc"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
 msgid "ta"
-msgstr ""
+msgstr "ta"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
 msgid "te"
-msgstr ""
+msgstr "te"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
 msgid "tg"
-msgstr ""
+msgstr "tg"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
 msgid "th"
-msgstr ""
+msgstr "th"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
 msgid "tk"
-msgstr ""
+msgstr "tk"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:904
 msgid "tn"
-msgstr ""
+msgstr "tn"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
 msgid "tr"
-msgstr ""
+msgstr "tr"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
 msgid "uk"
-msgstr ""
+msgstr "uk"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
 msgid "ur"
-msgstr ""
+msgstr "ur"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
 msgid "uz"
-msgstr ""
+msgstr "uz"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
 msgid "vi"
-msgstr ""
+msgstr "vi"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:910
 msgid "wo"
-msgstr ""
+msgstr "wo"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:911
 msgid "xsy"
-msgstr ""
+msgstr "xsy"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:912
 msgid "yo"
-msgstr ""
+msgstr "yo"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
 msgid "zh"
-msgstr ""
+msgstr "zh"
 
 #: ../rules/base.extras.xml.in.h:1
 msgid "APL Keyboard Symbols"
-msgstr ""
+msgstr "APL Keyboard Symbols"
+
+#: ../rules/base.extras.xml.in.h:3
+msgid "Armenian (OLPC phonetic)"
+msgstr "アルメニア語 (OLPC 表音)"
 
+# カナダサスカチワン州の地方言語、アトシーナ語?
 #: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
 msgstr ""
 
+# 古代イランゾロアスター教のアベスタ語?
 #: ../rules/base.extras.xml.in.h:5
 msgid "Avestan"
 msgstr ""
@@ -3727,82 +3746,108 @@ msgstr ""
 msgid "Couer D'alene Salish"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:8
+# ISO 639 より
+#: ../rules/base.extras.xml.in.h:7
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "クリミア・タタール語 (Dobruja Q)"
+
+#: ../rules/base.extras.xml.in.h:9
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "英語 (US, international AltGr Unicode combining)"
 
-#: ../rules/base.extras.xml.in.h:9
+#: ../rules/base.extras.xml.in.h:10
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "英語 (US, international AltGr Unicode combining, alternative)"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:13
+msgid "German (US keyboard with German letters)"
+msgstr "ドイツ語 (ドイツ語文字付き US キーボード)"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "ドイツ語 (ハンガリー語文字付き、デッドキー無し)"
+
+#: ../rules/base.extras.xml.in.h:15
 msgid "Kutenai"
 msgstr "クテナイ語"
 
-#: ../rules/base.extras.xml.in.h:13
+#: ../rules/base.extras.xml.in.h:17
 msgid "Latvian (US Colemak)"
 msgstr "ラトビア語 (US Colemak)"
 
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:18
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "ラトビア語 (US Colemak, apostrophe variant)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:19
 msgid "Latvian (US Dvorak)"
 msgstr "ラトビア語 (US Dvorak)"
 
-#: ../rules/base.extras.xml.in.h:16
+#: ../rules/base.extras.xml.in.h:20
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "ラトビア語 (US Dvorak, Y variant)"
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "ラトビア語 (US Dvorak, minus variant)"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (programmer US Dvorak)"
 msgstr "ラトビア語 (プログラマー US Dvorak)"
 
-#: ../rules/base.extras.xml.in.h:19
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "ラトビア語 (プログラマー US Dvorak, Y variant)"
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "ラトビア語 (プログラマー US Dvorak, minus variant)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:26
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
-msgstr ""
+msgstr "リトアニア語 (リトアニア語文字付き US Dvorak)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:29
 msgid "Polish (international with dead keys)"
-msgstr ""
+msgstr "ポーランド語 (国際、デッドキー付き)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:31
 msgid "Romanian (ergonomic Touchtype)"
-msgstr ""
+msgstr "ルーマニア語 (人間工学 Touchtype)"
 
-#: ../rules/base.extras.xml.in.h:29
-msgid "Russian (with UKR and BEL layout)"
-msgstr ""
+#: ../rules/base.extras.xml.in.h:33
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "ロシア語 (ウクライナ語・ベラルーシ語配列付き)"
 
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:34
 msgid "Secwepemctsin"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "Serbian (combining accents instead of dead keys)"
-msgstr ""
+msgstr "セルビア語 (合成アクセント付き、デッドキー無し)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "apl"
-msgstr ""
+msgstr "apl"
 
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:44
 msgid "kut"
-msgstr ""
+msgstr "kut"
 
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:50
 msgid "shs"
-msgstr ""
+msgstr "shs"
+
+#~ msgid "English (Cameroon qwerty)"
+#~ msgstr "英語 (カメルーン qwerty)"
+
+#~ msgid "French (Cameroon azerty)"
+#~ msgstr "フランス語 (カメルーン azerty)"
+
+#~ msgid "German (qwerty)"
+#~ msgstr "ドイツ語 (qwerty)"
+
+# スリランカ シンハラ語
+#~ msgid "Sinhala"
+#~ msgstr "シンハラ語"
diff --git a/dist/xkeyboard-config/po/nl.po b/dist/xkeyboard-config/po/nl.po
index b9dc3f25b..f8ede3006 100644
--- a/dist/xkeyboard-config/po/nl.po
+++ b/dist/xkeyboard-config/po/nl.po
@@ -23,10 +23,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.3\n"
+"Project-Id-Version: xkeyboard-config-2.3.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-17 21:08+0100\n"
-"PO-Revision-Date: 2011-05-31 09:35+0800\n"
+"POT-Creation-Date: 2011-09-15 21:25+0100\n"
+"PO-Revision-Date: 2011-09-20 00:27+0800\n"
 "Last-Translator: Tino Meinen <tino.meinen@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
@@ -240,7 +240,7 @@ msgstr "Armeens"
 msgid "Armenian (alternative eastern)"
 msgstr "Armeens (alternatief Oosters)"
 
-#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:50
 msgid "Armenian (alternative phonetic)"
 msgstr "Armeens (alternatief fonetisch)"
 
@@ -409,53 +409,69 @@ msgid "Bengali"
 msgstr "Bengaals"
 
 #: ../rules/base.xml.in.h:90
+msgid "Bengali (Baishakhi Inscript)"
+msgstr "Bengaals (Baishakhi Inscript)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bengali (Baishakhi)"
+msgstr "Bengaals (Baishakhi)"
+
+#: ../rules/base.xml.in.h:92
+msgid "Bengali (Bornona)"
+msgstr "Bengaals (Bornona)"
+
+#: ../rules/base.xml.in.h:93
 msgid "Bengali (Probhat)"
 msgstr "Bengaals (Probhat)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:94
+msgid "Bengali (Uni Gitanjali)"
+msgstr "Bengaals (Uni Gitanjali)"
+
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berbers (Marokko, Tifinagh alternatief fonetisch)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berbers (Marokko, Tifinagh alternatief)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:97
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berbers (Marokko, Tifinagh fonetisch uitgebreid)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:98
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berbers (Marokko, Tifinagh uitgebreid)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:99
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berbers (Marokko, Tifinagh fonetisch)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:100
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berbers (Marokko, Tifinagh)"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian"
 msgstr "Bosnisch"
 
 # digraaf - lettersamenstelling
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:102
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosnisch (US toetsenbord met Bosnische digrafen)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:103
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosnisch (US toetsenbord met Bosnische lettertekens)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:104
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosnisch (met Bosnische digrafen)"
 
 # Guillemets of ook quillemets zijn Franse aanhalingstekens.
 # Dit is de "Nederlandse" en dit is de «Franse manier» van aanhalen.
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:105
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosnisch (met Franse aanhalingstekens voor citaten)"
 
@@ -463,274 +479,284 @@ msgstr "Bosnisch (met Franse aanhalingstekens voor citaten)"
 # "Beide Alt-toetsen samen verandert de groep."
 #
 # tezamen/samen/tegelijk
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Beide Alt-toetsen samen"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Beide Ctrl-toetsen samen"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Beide Shift-toetsen samen"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:109
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Beide Shift-toetsen samen zet de Caps Lock aan, een Shift-toets deactiveert"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:110
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Beide Shift-toetsen samen zet de Caps Lock aan/uit"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:111
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Beide Shift-toetsen samen zet de Caps Lock aan/uit"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:112
 msgid "Braille"
 msgstr "Braille"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:113
 msgid "Braille (left hand)"
 msgstr "Braille (linker hand)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:114
 msgid "Braille (right hand)"
 msgstr "Braille (rechter hand)"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:115
 msgid "Brother Internet Keyboard"
 msgstr "Brother internettoetsenbord"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:116
 msgid "Bulgarian"
 msgstr "Bulgaars"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:117
 msgid "Bulgarian (new phonetic)"
 msgstr "Bulgaars (nieuw fonetisch)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:118
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bulgaars (traditioneel fonetisch)"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:119
 msgid "Burmese"
 msgstr "Burmees"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:120
+msgid "Cameroon Multilingual (azerty)"
+msgstr "Canadees Meertalig (azerty)"
+
+#: ../rules/base.xml.in.h:121
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "Canadees Meertalig  (qwerty)"
+
+#: ../rules/base.xml.in.h:122
 msgid "Canadian Multilingual"
 msgstr "Canadees Meertalig"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:123
 msgid "Canadian Multilingual (first part)"
 msgstr "Canadees Meertalig (eerste deel)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:124
 msgid "Canadian Multilingual (second part)"
 msgstr "Canadees Meertalig  (tweede deel)"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr "Caps Lock geeft het 3de niveau en vergrendelt wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer"
 
 # CapsLock wisselt naar de eerste indeling, Shift+CapsLock wisselt naar de laatste indeling
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Caps Lock (naar eerste indeling), Shift+Caps Lock (naar laatste indeling)"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Caps Lock (ingedrukt houden), Alt+Caps Lock geeft de oorspronkelijke caps lock actie"
 
-#: ../rules/base.xml.in.h:123
+# fungeert als/werkt als
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock werkt als Shift met blokkering, Shift heft Caps Lock tijdelijk op"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock werkt als Shift met blokkering. Shift heft Caps Lock niet op"
 
-#: ../rules/base.xml.in.h:125
+# werkt als/is
+# Ctrl-toets is hier duidelijker
+#: ../rules/base.xml.in.h:131
+msgid "Caps Lock as Ctrl"
+msgstr "Caps Lock is Ctrl-toets"
+
+# heeft geen functie/geen effect
+#: ../rules/base.xml.in.h:132
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock is uitgezet"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:133
 msgid "Caps Lock key behavior"
 msgstr "Caps Lock-toets gedrag"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:134
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Caps Lock wisselt Shift op alle toetsen"
 
 # heeft alleen effect op/werkt alleen op/beinvloedt alleen ~ 
 #  de alfabetische toetsen/
 # bepaalt hoofdletters/kleine letters bij alfabetische tekens.<
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:135
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock beïnvloedt alleen de alfabetische toetsen"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:136
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock gebruikt interne conversie naar hoofdletters. Shift heft Caps Lock tijdelijk op"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:137
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock gebruikt interne conversie naar hoofdletters. Shift heft Caps Lock niet op"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:138
 msgid "Catalan"
 msgstr "Catalaans"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:139
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Catalaans (Spanje, met midden-punt L)"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:140
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:141
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:142
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:143
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (alternatieve optie)"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:144
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:145
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Master Expert"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:146
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:147
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:148
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony internet toetsenbord"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:149
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:150
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:151
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:152
 msgid "Chinese"
 msgstr "Chinees"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:153
 msgid "Chuvash"
 msgstr "Tsjoevasjisch"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:154
 msgid "Chuvash (Latin)"
 msgstr "Tsjoevasjisch (Latijns)"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:155
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
 # Iers
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:156
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access toetsenbord"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq internet toetsenbord (13 toetsen)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq internet toetsenbord (18 toetsen)"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:160
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq internet toetsenbord (7 toetsen)"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:161
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq toetsenbord"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:162
 msgid "Compose key position"
 msgstr "Samensteltoets positie"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Ctrl + Alt + Backspace"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Ctrl zit op de Alt-toetsen, Alt zit op de Win-toetsen"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Ctrl zit op de Win-toetsen (en de gebruikelijke Ctrl-toetsen)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-# Krim-Tataars of Krim-Turks
-# http://nl.wikipedia.org/wiki/Krim-Tataars
-#: ../rules/base.xml.in.h:160
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "Krim-Tataars (Dobruca-1 Q)"
-
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Krim-Tataars (Turks Alt-Q)"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Krim-Tataars (Turks F)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Krim-Tataars (Turks Q)"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Kroatisch (US toetsenbord met Kroatische digrafen)"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:172
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Kroatisch (US toetsenbord met Kroatische lettertekens)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Kroatisch (met Kroatische digrafen)"
 
@@ -738,480 +764,472 @@ msgstr "Kroatisch (met Kroatische digrafen)"
 # Dit is de "Nederlandse" en dit is de «Franse manier» van aanhalen.
 #
 # ..voor citeren/voor citaten
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:174
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Kroatisch (met Franse aanhalingstekens voor citaten)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:175
 msgid "Ctrl key position"
 msgstr "Ctrl-toetspositie"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:176
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:177
 msgid "Czech"
 msgstr "Tsjechisch"
 
 # geaccentueerde lettertekens/lettertekens met accenten
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Tsjechisch (UCW-indeling, alleen lettertekens met accenten)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Tsjechisch (US Dvorak met CZ UCW ondersteuning)"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:180
 msgid "Czech (qwerty)"
 msgstr "Tsjechisch (qwerty)"
 
 # brede backslash/uitgebreide backslash
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:181
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Tsjechisch (qwerty, brede backslash)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Tsjechisch (met &lt;\\|&gt;-toets)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Danish"
 msgstr "Deens"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Danish (Dvorak)"
 msgstr "Deens (Dvorak)"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Danish (Macintosh)"
 msgstr "Deens (Macintosh)"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Deens (Macintosh, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Danish (eliminate dead keys)"
 msgstr "Deens (zonder dode toetsen)"
 
 # dubbelop numeriek/cijfer
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Default numeric keypad keys"
 msgstr "Standaard cijferblok-toetsen"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell 101-key PC"
 msgstr "Dell 101-toetsen PC"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell Laptop/notebook Precision M series"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dell Latitude series laptop"
 msgstr "Dell Latitude laptopserie"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:197
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB multimediatoetsenbord"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop toetsenbord"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dhivehi"
 msgstr "Dhivehi"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802 serie"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:203
 msgid "Dutch (Macintosh)"
 msgstr "Nederlands (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:204
 msgid "Dutch (Sun dead keys)"
 msgstr "Nederlands (Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:205
 msgid "Dutch (standard)"
 msgstr "Nederlands (standaard)"
 
 # Dzongkha is een taal die is afgeleid van het oud-Tibetaans
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:206
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:207
 msgid "Enable extra typographic characters"
 msgstr "Extra typografische tekens aanzetten"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:208
 msgid "English (Cameroon Dvorak)"
 msgstr "Engels (Kameroen Dvorak)"
 
-#: ../rules/base.xml.in.h:203
-msgid "English (Cameroon qwerty)"
-msgstr "Engels (Kameroen qwerty)"
-
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:209
 msgid "English (Cameroon)"
 msgstr "Engels (Kameroen)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:210
 msgid "English (Canada)"
 msgstr "Engels (Canada)"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:211
 msgid "English (Colemak)"
 msgstr "Engels (Colemak)"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:212
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Engels (Dvorak alternatief internationaal geen dode toetsen)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:213
 msgid "English (Dvorak international with dead keys)"
 msgstr "Engels (Dvorak internationaal met dode toetsen)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:214
 msgid "English (Dvorak)"
 msgstr "Engers (Dvorak)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:215
 msgid "English (Ghana)"
 msgstr "Engels (Ghana)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:216
 msgid "English (Ghana, GILLBT)"
 msgstr "Engels (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:217
 msgid "English (Ghana, multilingual)"
 msgstr "Engels (Ghana, meertalig)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:218
 msgid "English (India, with RupeeSign)"
 msgstr "Engels (India, met Roepie-teken)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:219
 msgid "English (Macintosh)"
 msgstr "Engels (Macintosh)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:220
 msgid "English (Mali, US Macintosh)"
 msgstr "Engels (Mali, US Macintosh)"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:221
 msgid "English (Mali, US international)"
 msgstr "Engels (Mali, US internationaal)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:222
 msgid "English (Nigeria)"
 msgstr "Engels (Nigeria)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:223
 msgid "English (South Africa)"
 msgstr "Engels (Zuid-Afrika)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:224
 msgid "English (UK)"
 msgstr "Engels (UK)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:225
 msgid "English (UK, Colemak)"
 msgstr "Engels (UK, Colemak)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Engels (UK, Dvorak met UK-leestekens)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:227
 msgid "English (UK, Dvorak)"
 msgstr "Engels (UK, Dvorak)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:228
 msgid "English (UK, Macintosh international)"
 msgstr "Engels (UK, Macintosh internationaal)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:229
 msgid "English (UK, Macintosh)"
 msgstr "Engels (UK, Macintosh)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:230
 msgid "English (UK, extended WinKeys)"
 msgstr "Engels (UK, uitgebreid, Windows-toetsen)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:231
 msgid "English (UK, international with dead keys)"
 msgstr "Engels (UK, internationaal met dode toetsen)"
 
-#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:232 ../rules/base.extras.xml.in.h:8
 msgid "English (US)"
 msgstr "Engels (US)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:233
 msgid "English (US, alternative international)"
 msgstr "Engels (US, alternatief internationaal)"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:234
 msgid "English (US, international with dead keys)"
 msgstr "Engels (US, internationaal met dode toetsen)"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:235
 msgid "English (US, with euro on 5)"
 msgstr "Engels (US, met de Euro op 5)"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:236
 msgid "English (classic Dvorak)"
 msgstr "Engels (Dvorak klassiek)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:237
 msgid "English (international AltGr dead keys)"
 msgstr "Engels (internationaal AltGr dode toetsen)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:238
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Engels (Indeling wisselen met de toetsen vermenigvuldigen/delen)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:239
 msgid "English (left handed Dvorak)"
 msgstr "Engels (Linkshandige Dvorak)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:240
 msgid "English (programmer Dvorak)"
 msgstr "Engels (Programmeer-Dvorak)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:241
 msgid "English (right handed Dvorak)"
 msgstr "Engels (Rechtshandige Dvorak("
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:242
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:243
 msgid "Enter on keypad"
 msgstr "Enter op cijferblok"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:244
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:245
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Esperanto (Portugal, Nativo)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:246
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (puntkomma en aanhalingsteken op afwijkende plek, historisch)"
 
 # Estisch, de taal, die ook Estlands of Ests wordt genoemd, 
 # heeft ongeveer 1 miljoen sprekers
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:247
 msgid "Estonian"
 msgstr "Estisch"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:248
 msgid "Estonian (Dvorak)"
 msgstr "Estisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:249
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estisch (US toetsenbord met Estische lettertekens)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:250
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estisch (zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:251
 msgid "Euro on 2"
 msgstr "Euro-teken op 2"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:252
 msgid "Euro on 4"
 msgstr "Euro-teken op 4"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:253
 msgid "Euro on 5"
 msgstr "Euro-teken op 5"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:254
 msgid "Euro on E"
 msgstr "Euro-teken op E"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:255
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:256
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:257
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:258
 msgid "Faroese"
 msgstr "Faeröers"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:259
 msgid "Faroese (eliminate dead keys)"
 msgstr "Faeröers (zonder dode toetsen)"
 
 # Het Filipijns (Filipino of Pilipino)
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:260
 msgid "Filipino"
 msgstr "Filipijns"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filipijns (Capewell-Dvorak Baybayin)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:262
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filipijns (Capewell-Dvorak Latijns)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filipijns (Capewell-QWERF 2006 Baybayin)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filipijns (Capewell-QWERF 2006 Latijns)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:265
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filipijns (Colemak Baybayin)"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:266
 msgid "Filipino (Colemak Latin)"
 msgstr "Filipijns (Colemak Latijns)"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:267
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Filipijns (Dvorak Baybayin)"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:268
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filipijns (Dvorak Latijns)"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:269
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filipijns (QWERTY Baybayin)"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:270
 msgid "Finnish"
 msgstr "Fins"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:271
 msgid "Finnish (Macintosh)"
 msgstr "Fins (Macintosh)"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:272
 msgid "Finnish (classic)"
 msgstr "Fins (klassiek)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:273
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Fins (klassiek, zonder dode toetsen)"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:276
 msgid "Four-level key with abstract separators"
 msgstr "Vier-niveaus toets met abstracte scheidingstekens"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:277
 msgid "Four-level key with comma"
 msgstr "Vier-niveaus toets met komma"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:278
 msgid "Four-level key with dot"
 msgstr "Vier-niveaus toets met punt"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:279
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Vier-niveaus toets met punt, latin-9 restrictie"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:280
 msgid "Four-level key with momayyez"
 msgstr "Vier-niveaus toets met momayyez"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:281
 msgid "French"
 msgstr "Frans"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:282
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Frans (Bepo, ergonomisch, Dvorak wijze)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:283
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Frans (Bepo, ergonomisch, Dvorak wijze, enkel latin-9)"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:284
 msgid "French (Breton)"
 msgstr "Frans (Bretons)"
 
-#: ../rules/base.xml.in.h:280
-msgid "French (Cameroon azerty)"
-msgstr "Frans (Kameroen azerty)"
-
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:285
 msgid "French (Cameroon)"
 msgstr "Frans (Kameroen)"
 
-#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:286 ../rules/base.extras.xml.in.h:11
 msgid "French (Canada)"
 msgstr "Frans (Canada)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:287
 msgid "French (Canada, Dvorak)"
 msgstr "Frans (Canada, Dvorak)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:288
 msgid "French (Canada, legacy)"
 msgstr "Frans (Canada, historisch)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:289
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Frans (Democratisch republiek van Congo)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:290
 msgid "French (Dvorak)"
 msgstr "Frans (Dvorak)"
 
@@ -1219,1279 +1237,1275 @@ msgstr "Frans (Dvorak)"
 # de Republiek Guinee, is grondwettelijk een presidentiële republiek in 
 # West-Afrika, gelegen aan de Atlantische Oceaan tussen Guinee-Bissau en
 # Sierra Leone. De hoofdstad is Conakry.
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:291
 msgid "French (Guinea)"
 msgstr "Frans (Guinee)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:292
 msgid "French (Macintosh)"
 msgstr "Frans (Macintosh)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:293
 msgid "French (Mali, alternative)"
 msgstr "Frans (Mali, alternatief)"
 
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:294
 msgid "French (Morocco)"
 msgstr "Frans (Marokko)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:295
 msgid "French (Sun dead keys)"
 msgstr "Frans (Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:296
 msgid "French (Switzerland)"
 msgstr "Frans (Zwitserland)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:297
 msgid "French (Switzerland, Macintosh)"
 msgstr "Frans (Zwitserland, Macintosh)"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:298
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Frans (Zwitserland, Sun-dode toetsen)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:299
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Frans (Zwitserland, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:300
 msgid "French (alternative)"
 msgstr "Frans (alternatief)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:301
 msgid "French (alternative, Sun dead keys)"
 msgstr "Frans (alternatief, Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:302
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Frans (alternatief, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:303
 msgid "French (alternative, latin-9 only)"
 msgstr "Fans (alternatief, enkel latin-9)"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:304
 msgid "French (eliminate dead keys)"
 msgstr "Frans (zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:305
 msgid "French (legacy, alternative)"
 msgstr "Frans (historisch, alternatief)"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:306
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Frans (historisch, alternatief, Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:307
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Frans (historisch, alternatief, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:308
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO laptop"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:309
 msgid "Fula"
 msgstr "Fula"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:310
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:311
 msgid "Generic 101-key PC"
 msgstr "Algemeen 101-toetsen PC"
 
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:312
 msgid "Generic 102-key (Intl) PC"
 msgstr "Algemeen 102-toetsen (internationaal) PC"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:313
 msgid "Generic 104-key PC"
 msgstr "Algemeen 104-toetsen PC"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:314
 msgid "Generic 105-key (Intl) PC"
 msgstr "Algemeen 105-toetsen (internationaal) PC"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:315
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:316
 msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 msgstr "Genius Comfy KB-16M / Genius MM toetsenbord KWD-910"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:317
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:318
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:319
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:320
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:321
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Georgisch (Frankrijk, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:322
 msgid "Georgian (Italy)"
 msgstr "Georgisch (Italië)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:323
 msgid "Georgian (MESS)"
 msgstr "Georgisch (MESS)"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:324
 msgid "Georgian (ergonomic)"
 msgstr "Georgisch (ergonomisch)"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:325 ../rules/base.extras.xml.in.h:12
 msgid "German"
 msgstr "Duits"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:326
 msgid "German (Austria)"
 msgstr "Duits (Oostenrijk)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:327
 msgid "German (Austria, Macintosh)"
 msgstr "Duits (Oostenrijk, Macintosh)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:328
 msgid "German (Austria, Sun dead keys)"
 msgstr "Duits (Oostenrijk, Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:329
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Duits (Oostenrijk, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:330
 msgid "German (Dvorak)"
 msgstr "Duits (Dvorak)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:331
 msgid "German (Macintosh)"
 msgstr "Duits (Macintosh)"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:332
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Duits (Macintosh, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:333
 msgid "German (Neo 2)"
 msgstr "Duits (Neo 2)"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:334
 msgid "German (Sun dead keys)"
 msgstr "Duits (Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:335
 msgid "German (Switzerland)"
 msgstr "Duits (Zwitserland)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:336
 msgid "German (Switzerland, Macintosh)"
 msgstr "Duits (Zwitserland, Macintosh)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:337
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Duits (Zwitserland, Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:338
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Duits (Zwitserland, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:339
 msgid "German (Switzerland, legacy)"
 msgstr "Duits (Zwitserland, historisch)"
 
 # acute - aigu  (bijv.  á)
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:340
 msgid "German (dead acute)"
 msgstr "Duits (dode aigu)"
 
 # grave (bijv: à)
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:341
 msgid "German (dead grave acute)"
 msgstr "Duits (dode grave en aigu)"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:342
 msgid "German (eliminate dead keys)"
 msgstr "Duits (zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:339
-msgid "German (qwerty)"
-msgstr "Duits (qwerty)"
-
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:343
 msgid "Greek"
 msgstr "Grieks"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:344
 msgid "Greek (eliminate dead keys)"
 msgstr "Grieks (zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:345
 msgid "Greek (extended)"
 msgstr "Grieks (uitgebreid)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:346
 msgid "Greek (polytonic)"
 msgstr "Grieks (meertonig)"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:347
 msgid "Greek (simple)"
 msgstr "Grieks (eenvoudig)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:348
 msgid "Gujarati"
 msgstr "Gujarati"
 
 # het zal wel een merk zijn
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:349
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:350
 msgid "HTC Dream"
 msgstr "HTC Dream"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:351
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking toetsenbord"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:352
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking toetsenbord voor Mac"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:353
 msgid "Hausa"
 msgstr "Hausa"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:354
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:355
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Hebreeuws (Bijbers, Tiro)"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:356
 msgid "Hebrew (lyx)"
 msgstr "Hebreeuws (lyx)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:357
 msgid "Hebrew (phonetic)"
 msgstr "Hebreeuws (fonetisch)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard internet toetsenbord"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard Mini 110 Notebook"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:367
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:368
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x multimedia toetsenbord"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:369
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:370
 msgid "Hexadecimal"
 msgstr "Hexadecimaal"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:371
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (Bolnagri)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:372
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:373
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:374
 msgid "Htc Dream phone"
 msgstr "Htc Dream phone"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Hongaars (101/qwerty/komma/dode toetsen)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Hongaars (101/qwerty/komma/zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Hongaars (101/qwerty/punt/dode toetsen)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Hongaars (101/qwerty/punt/zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Hongaars (101/qwertz/komma/dode toetsen)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Hongaars (101/qwertz/komma/zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Hongaars (101/qwertz/punt/dode toetsen)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Hongaars (101/qwertz/punt/zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Hongaars (102/qwerty/komma/dode toetsen)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Hongaars (102/qwerty/komma/zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Hongaars (102/qwerty/punt/dode toetsen)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Hongaars (102/qwerty/punt/zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Hongaars (102/qwertz/komma/dode toetsen)"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Hongaars (102/qwertz/komma/zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Hongaars (102/qwertz/punt/dode toetsen)"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Hongaars (102/qwertz/punt/zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:392
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Hongaars (zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:393
 msgid "Hungarian (qwerty)"
 msgstr "Hongaars (qwerty)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:394
 msgid "Hungarian (standard)"
 msgstr "Hongaars (standaard)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:395
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper zit op de Win-toetsen"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:396
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:397
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:398
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:399
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:400
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:401
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic"
 msgstr "IJslands"
 
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (Dvorak)"
 msgstr "IJslands (Dvorak)"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:404
 msgid "Icelandic (Macintosh)"
 msgstr "IJslands (Macintosh)"
 
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:405
 msgid "Icelandic (Sun dead keys)"
 msgstr "IJslands (Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:406
 msgid "Icelandic (eliminate dead keys)"
 msgstr "IJslands (zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:407
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:408
 msgid "Indian"
 msgstr "Indisch"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:409
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:410
 msgid "Iraqi"
 msgstr "Irakees"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:411
 msgid "Irish"
 msgstr "Iers"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:412
 msgid "Irish (UnicodeExpert)"
 msgstr "Iers (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:413
 msgid "Italian"
 msgstr "Italiaans"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:414
 msgid "Italian (Macintosh)"
 msgstr "Italiaans (Macintosh)"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:415
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Italiaans (US toetsenbord met Italiaanse lettertekens)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:416
 msgid "Italian (eliminate dead keys)"
 msgstr "Italiaans (zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:417
 msgid "Japanese"
 msgstr "Japans"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (Kana 86)"
 msgstr "Japans (Kana 86)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (Kana)"
 msgstr "Japans (Kana)"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:420
 msgid "Japanese (Macintosh)"
 msgstr "Japans (Macintosh)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:421
 msgid "Japanese (OADG 109A)"
 msgstr "Japans (OADG 109A)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:422
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japans (PC-98xx serie)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:423
 msgid "Japanese keyboard options"
 msgstr "Japanse toetsenbordopties"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:424
 msgid "Kalmyk"
 msgstr "Kalmyk"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:425
 msgid "Kana Lock key is locking"
 msgstr "Kana Lock-toets is blokkerend"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:426
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:427
 msgid "Kashubian"
 msgstr "Kasjoebisch"
 
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:428
 msgid "Kazakh"
 msgstr "Kazachstaans"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:429
 msgid "Kazakh (with Russian)"
 msgstr "Kazachstaans (met Russisch)"
 
 # om zeep te helpen/af te breken/te stoppen/
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:430
 msgid "Key sequence to kill the X server"
 msgstr "Toetscombinatie om de X-server af te breken"
 
 # aan te zetten/te kiezen/te selecteren/te krijgen/te bereiken
 # voor het derde niveau
 # 'to choose' is hier een slechte woordkeuze IMO
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:431
 msgid "Key to choose 3rd level"
 msgstr "De toets om het 3e niveau te krijgen"
 
 # aan te zetten/te kiezen/te selecteren/te krijgen
 #
 # 'to choose' is hier een slechte woordkeuze IMO
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:432
 msgid "Key to choose 5th level"
 msgstr "De toets om het 5e niveau te krijgen"
 
 # wijzigen/veranderen
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:433
 msgid "Key(s) to change layout"
 msgstr "De toets(en) om de indeling te veranderen"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:434
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:435
 msgid "Khmer (Cambodia)"
 msgstr "Khmer (Cambodja)"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:436
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:437
 msgid "Kinesis"
 msgstr "Kinesis"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:438
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:439
 msgid "Korean"
 msgstr "Koreaans"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:440
 msgid "Korean (101/104 key compatible)"
 msgstr "Koreaans (101/104-toetsen compatibel)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Koerdisch (Iran, Arabisch-Latijns)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iran, F)"
 msgstr "Koerdisch (Iran, F)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Koerdisch (Iran, Latijns Alt-Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Koerdisch (Iran, Latijns Q)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Koerdisch (Irak, Arabisch-Latijns)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Iraq, F)"
 msgstr "Koerdisch (Irak, F)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Koerdisch (Irak, Latijns Alt-Q)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Koerdisch (Irak, Latijns Q)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Syria, F)"
 msgstr "Koerdisch (Syrië, F)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Koerdisch (Syrië, Latijns Alt-Q)"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Koerdisch (Syrië, Latijns Q)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:452
 msgid "Kurdish (Turkey, F)"
 msgstr "Koerdisch (Turks, F)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:453
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Koerdisch (Turks, Latijns Alt-Q)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:454
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Koerdisch (Turks, Latijns Q)"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:455
 msgid "Kyrgyz"
 msgstr "Kirgizisch"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:456
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgizisch (fonetisch)"
 
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:457
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:458
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Lao (STEA voorgestelde standaard indeling)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:459
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop/notebook Compaq (bijv. Armada) laptop toetsenbord"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:460
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Laptop/notebook Compaq (bijv. Presario) internet toetsenbord"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:461
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Laptop/notebook eMachines m68xx"
 
-#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+#: ../rules/base.xml.in.h:462 ../rules/base.extras.xml.in.h:16
 msgid "Latvian"
 msgstr "Lets"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:463
 msgid "Latvian (F variant)"
 msgstr "Lets (F variant)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:464
 msgid "Latvian (adapted)"
 msgstr "Lets (aangepast)"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:465
 msgid "Latvian (apostrophe variant)"
 msgstr "Lets (apostrof variant)"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:466
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Lets (ergonomisch,  ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:467
 msgid "Latvian (modern)"
 msgstr "Lets (modern)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:468
 msgid "Latvian (tilde variant)"
 msgstr "Lets (tilde variant)"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:469
 msgid "Left Alt"
 msgstr "Linker Alt-toets"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:470
 msgid "Left Alt (while pressed)"
 msgstr "Linker Alt-toets (ingedrukt houden)"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:471
 msgid "Left Alt is swapped with Left Win"
 msgstr "De linker Alt-toets en Win-toets worden gewisseld"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:472
 msgid "Left Ctrl"
 msgstr "Linker Ctrl-toets"
 
 # Linker Win-toets wisselt naar de eerste indeling, rechter Win/Menu-toets wisselt naar de laatste indeling
 # vorige indeling/laatste indeling
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:473
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Linker Ctrl-toets (naar de eerste indeling), rechter Ctrl-toets (naar de laatste indeling)"
 
+# werkt als/fungeert als/is
+#: ../rules/base.xml.in.h:474
+msgid "Left Ctrl as Meta"
+msgstr "Linker Ctrl is Meta-toets"
+
 # Linker Ctrl + Shift-toets
-#: ../rules/base.xml.in.h:471
+#: ../rules/base.xml.in.h:475
 msgid "Left Ctrl+Left Shift"
 msgstr "Linker Ctrl + linker Shift-toets"
 
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:476
 msgid "Left Shift"
 msgstr "Linker Shift-toets"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:477
 msgid "Left Win"
 msgstr "Linker Win-toets"
 
 # Linker Win-toets wisselt naar de eerste indeling, rechter Win/Menu-toets wisselt naar de laatste indeling
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:478
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Linker Win-toets (naar de eerste indeling), rechter Win/Menu-toets (naar de laatste indeling)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:479
 msgid "Left Win (while pressed)"
 msgstr "Linker Win-toets (ingedrukt houden)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:480
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Linker Win-toets geeft het 5de niveau en vergrendelt wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:481
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Linker Win-toets geeft het 5de niveau en vergrendelt wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer, één toetsaanslag heft de vergrendeling op"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:482
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Linker Ctrl+ Linker Win-toets (naar de eerste indeling), rechter Ctrl+Menu-toets (naar de tweede indeling)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:483
 msgid "Legacy"
 msgstr "Historisch"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:484
 msgid "Legacy Wang 724"
 msgstr "Historisch Wang 724"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:486
 msgid "Legacy key with comma"
 msgstr "Historisch cijferblok met komma"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:487
 msgid "Legacy key with dot"
 msgstr "Historisch cijferblok met punt"
 
-#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+#: ../rules/base.xml.in.h:488 ../rules/base.extras.xml.in.h:25
 msgid "Lithuanian"
 msgstr "Litouws"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litouws (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:490
 msgid "Lithuanian (LEKP)"
 msgstr "Litouws (LEKP)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:491
 msgid "Lithuanian (LEKPa)"
 msgstr "Litouws (LEKPa)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:492
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litouws (US toetsenbord met Litouwse lettertekens)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:493
 msgid "Lithuanian (standard)"
 msgstr "Litouws (standaard)"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Access toetsenbord"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop (alternatieve optie)"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:500
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optisch"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro (alternatieve optie 2)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:504
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Logitech G15 extra toetsen via G15daemon"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech algemeen toetsenbord"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Logitech internet 350 toetsenbord"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech internet toetsenbord"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:508
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator toetsenbord"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:509
 msgid "Logitech Media Elite Keyboard"
 msgstr "Logitech Media Elite toetsenbord"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:510
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Logitech Ultra-X Cordless Media Desktop toetsenbord"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:511
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Logitech Ultra-X toetsenbord"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:512
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Logitech diNovo Edge toetsenbord"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:513
 msgid "Logitech diNovo Keyboard"
 msgstr "Logitech diNovo toetsenbord"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:514
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:515
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch draadloos toetsenbord (model Y-RB6)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:516
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech iTouch Internet Navigator toetsenbord SE"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:517
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech iTouch Internet Navigator toetsenbord SE (USB)"
 
 # Het Nedersorbisch is de noordelijke versie van de in Brandenburg
 # gesproken Sorbische taal.
 # http://nl.wikipedia.org/wiki/Nedersorbisch
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:518
 msgid "Lower Sorbian"
 msgstr "Nedersorbisch"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:519
 msgid "Lower Sorbian (qwertz)"
 msgstr "Nedersorbisch (qwertz)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:520
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:521
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Intl)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:522
 msgid "Macedonian"
 msgstr "Macedonisch"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:523
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macedonisch (zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:524
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:525
 msgid "Macintosh Old"
 msgstr "Macintosh oud"
 
 # Backspace-toets
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Van Caps Lock een extra Backspace maken"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Van Caps Lock een extra Ctrl maken, maar de Caps_Lock keysym behouden"
 
-# Ctrl-toets
-#: ../rules/base.xml.in.h:524
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Van Caps Lock een extra Ctrl maken"
-
 # ESC-toets
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional ESC"
 msgstr "Van Caps Lock een extra ESC maken"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:529
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Van Caps Lock een extra Hyper maken"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:530
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Van Caps Lock een extra Num Lock maken"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:531
 msgid "Make Caps Lock an additional Super"
 msgstr "Van Caps Lock een extra Super maken"
 
 # een van de 23 Indische talen
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:532
 msgid "Malayalam"
 msgstr "Malayalam"
 
 # een van de 23 Indische talen
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:533
 msgid "Malayalam (Lalitha)"
 msgstr "Malayalam (Lalitha)"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:534
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malayalam (verbeterd Inscript met Roepie-teken)"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:535
 msgid "Maltese"
 msgstr "Maltees"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:536
 msgid "Maltese (with US layout)"
 msgstr "Maltees (met US-indeling)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:537
 msgid "Maori"
 msgstr "Maori"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:538
 msgid "Mari"
 msgstr "Mari"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:539
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:540
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access toetsenbord"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:541
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:542
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:543
+msgid "Menu as Right Ctrl"
+msgstr "Menu is rechter Ctrl-toets"
+
+#: ../rules/base.xml.in.h:544
 msgid "Meta is mapped to Left Win"
 msgstr "Meta zit op de linker Win-toets"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:545
 msgid "Meta is mapped to Win keys"
 msgstr "Meta zit op de Win-toetsen"
 
-#: ../rules/base.xml.in.h:542
-msgid "Meta on Left Ctrl"
-msgstr "Meta op Linker Ctrl-toets"
-
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve toetsenbord 2000"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft internet toetsenbord"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Zweeds"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:550
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural Keyboard Elite"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:553
 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:551
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:555
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:556
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office toetsenbord"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:557
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft draadloos multimediatoetsenbord 1.0A"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:558
 msgid "Miscellaneous compatibility options"
 msgstr "Overige compatibiliteitsopties"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:559
 msgid "Mongolian"
 msgstr "Mongools"
 
 # Montenegrijns is het Servo-Kroatische (Štokavische) dialect 
 # dat in Montenegro wordt gesproken
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin"
 msgstr "Montenegrijns"
 
 # Guillemets of ook quillemets zijn Franse aanhalingstekens.
 # Dit is "Nederlands" en dit is de «Franse manier» van aanhalen.
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:561
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrijns (Cyrillisch met Franse aanhalingstekens)"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:562
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrijns (Cyrillisch)"
 
 # verwisseld/gewisseld/omgewisseld
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:563
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrijns (Cyrillisch, Z en ZHE omgewisseld)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Montenegrijns (Latijns Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:565
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Montenegrijns (Latijns Unicode)"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:566
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Montenegrijns (Latijns qwerty)"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:567
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrijns (Latijns met Franse aanhalingstekens)"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:568
 msgid "NICOLA-F style Backspace"
 msgstr "NICOLA-F stijl backspace"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:569
 msgid "Nepali"
 msgstr "Nepalees"
 
 # Spatiebalk geeft harde spatie op het vierde niveau.
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at fourth level"
 msgstr "Harde spatie op het vierde niveau"
 
 # sixth level? hoeveel levels zijn er wel niet?
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Harde spatie op het vierde niveau, smalle harde spatie op het zesde niveau"
 
 # sixth level? hoeveel levels zijn er wel niet?
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:572
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Harde spatie op het vierde niveau, smalle harde spatie op het zesde niveau (via Ctrl+Shift)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at second level"
 msgstr "Harde spatie op het tweede niveau"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:574
 msgid "Non-breakable space character at third level"
 msgstr "Harde spatie op het derde niveau"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:575
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Harde spatie op het derde niveau, niets op het vierde niveau"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:576
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Harde spatie op het derde niveau, smalle harde spatie op het vierde niveau"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:577
 msgid "Northern Saami (Finland)"
 msgstr "Noord-Samisch (Finland)"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:578
 msgid "Northern Saami (Norway)"
 msgstr "Noord-Samisch (Noorwegen)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:579
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Noord-Samisch (Noorwegen, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:580
 msgid "Northern Saami (Sweden)"
 msgstr "Noord-Samisch (Zweden)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:581
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:582
 msgid "Norwegian"
 msgstr "Noors"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (Dvorak)"
 msgstr "Noors (Dvorak)"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:584
 msgid "Norwegian (Macintosh)"
 msgstr "Noors (Macintosh)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:585
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Noors (Macintosh, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:586
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Noors (zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:587
 msgid "Num Lock"
 msgstr "Num Lock"
 
 # op het cijferblok is de delete toets aangegeven met del
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:588
 msgid "Numeric keypad delete key behaviour"
 msgstr "Cijferblok del-toetsgedrag"
 
 # Apple-computer/Macintosh
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:589
 msgid "Numeric keypad keys work as with Macintosh"
 msgstr "Cijferblok-toetsen werken net als bij een Macintosh"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:590
 msgid "Numeric keypad layout selection"
 msgstr "Cijferblok-indeling selecteren"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:591
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:592
 msgid "Occitan"
 msgstr "Occitaans"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:593
 msgid "Ogham"
 msgstr "Ogham"
 
 # Iers (Ogham IS434)
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:594
 msgid "Ogham (IS434)"
 msgstr "Ogham (IS434)"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:595
 msgid "Oriya"
 msgstr "Oriya"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:596
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Ortek MCK-800 MM/Internet toetsenbord"
 
 # Russisch (Georgisch)
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:597
 msgid "Ossetian (Georgia)"
 msgstr "Ossetisch (Georgië)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:598
 msgid "Ossetian (WinKeys)"
 msgstr "Ossetisch (Windows-toetsen)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:599
 msgid "Ossetian (legacy)"
 msgstr "Ossetisch (historisch)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:600
 msgid "PC-98xx Series"
 msgstr "PC-98xx serie"
 
@@ -2500,866 +2514,867 @@ msgstr "PC-98xx serie"
 # north-western Serbia (Bačka region) and eastern Croatia 
 # (therefore also called Yugoslavo-Ruthenian, Vojvodina-Ruthenian
 # or Bačka-Ruthenian).
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:601
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Pannonisch Rusyn (homophonisch)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:602
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:603
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Pashto (Afghanistan, OLPC)"
 
 # de text op de Pause-toets is meestal "Pause"
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:604
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:27
 msgid "Persian"
 msgstr "Persisch"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:606
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persisch (Afghanistan, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:607
 msgid "Persian (with Persian Keypad)"
 msgstr "Persisch (met Persisch cijferblok)"
 
-#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:28
 msgid "Polish"
 msgstr "Pools"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:609
 msgid "Polish (Dvorak)"
 msgstr "Pools (Dvorak)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:610
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Pools (Dvorak, Poolse aanhalingstekens op toets 1)"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:611
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Pools (Dvorak, Poolse aanhalingstekens op aanhalingstekentoets)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:612
 msgid "Polish (programmer Dvorak)"
 msgstr "Pools (Programmeer-Dvorak)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:613
 msgid "Polish (qwertz)"
 msgstr "Pools (qwertz)"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil)"
 msgstr "Portugees (Brazilië)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugees (Brazilië, Dvorak)"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugees (Brazilië, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:618
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugees (Brazilië, nativo voor Esperanto)"
 
 # BUG USA keyboards ipv US keyboards
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:619
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugees (Brazilië, Nativo voor US toetsenborden)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:620
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugees (Brazilië, nativo)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Macintosh)"
 msgstr "Portugees (Macintosh)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portugees (Macintosh, Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portugees (Macintosh, zonder dode toetsen)"
 
 # BUG USA keyboards in plaats van US keyboards
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugees (Nativo voor US toetsenborden)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:625
 msgid "Portuguese (Nativo)"
 msgstr "Portugees (Nativo)"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:626
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugees (Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:627
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugees (zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:628
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:629
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:630
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Punjabi (Gurmukhi Jhelum)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:631
 msgid "Punjabi (Gurmukhi)"
 msgstr "Punjabi (Gurmukhi)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:632
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt"
 msgstr "Rechter Alt-toets"
 
 # BUG Alt ipv Alt key
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt (while pressed)"
 msgstr "Rechter Alt-toets (ingedrukt houden)"
 
-#: ../rules/base.xml.in.h:632
+# Rechter Alt-toets fungeert als de rechter Ctrl-toets/
+# Rechter Ctrl-toets is de Rechter Alt-toets/werkt als
+#: ../rules/base.xml.in.h:635
+msgid "Right Alt as Right Ctrl"
+msgstr "Rechter Alt is rechter Ctrl-toets"
+
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Rechter Alt-toets geeft het 5de niveau en vergrendelt dit niveau wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer, één toetsaanslag heft de vergrendeling op"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:637
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Rechter Alt-toets geeft het 5de niveau en vergrendelt wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:638
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Rechter Alt-toets geeft het 5de niveau en vergrendelt wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer, één toetsaanslag heft de vergrendeling op"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:639
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Rechter Alt-toets geeft nooit het 3e niveau"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:640
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Rechter Alt-toets, Shift + rechter Alt-toets is Multi_Key"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl"
 msgstr "Rechter Ctrl-toets"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:642
 msgid "Right Ctrl (while pressed)"
 msgstr "Rechter Ctrl-toets (ingedrukt houden)"
 
-# Rechter Ctrl-toets doet hetzelfde als de rechter Alt-toets.
-#: ../rules/base.xml.in.h:639
+# fungeert als/werkt als/is
+#: ../rules/base.xml.in.h:643
 msgid "Right Ctrl as Right Alt"
-msgstr "Rechter Ctrl en Alt-toets doen hetzelfde"
-
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl is mapped to Menu"
-msgstr "Rechter Ctrl zit op de Menu-toets"
+msgstr "Rechter Ctrl is rechter Alt-toets"
 
 # Rechter Ctrl+Shift-toets
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:644
 msgid "Right Ctrl+Right Shift"
 msgstr "Rechter Ctrl-toets + Rechter Shift-toets"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:645
 msgid "Right Shift"
 msgstr "Rechter Shift-toets"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:646
 msgid "Right Win"
 msgstr "Rechter Win-toets"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:647
 msgid "Right Win (while pressed)"
 msgstr "Rechter Win-toets (ingedrukt houden)"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:648
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Rechter Win-toets geeft het 5de niveau en vergrendelt wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:649
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Rechter Win-toets geeft het 5de niveau en vergrendelt wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer, één toetsaanslag heft de vergrendeling op"
 
-#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+#: ../rules/base.xml.in.h:650 ../rules/base.extras.xml.in.h:30
 msgid "Romanian"
 msgstr "Roemeens"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (Germany)"
 msgstr "Roemeens (Duitsland)"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Roemeens (Duitsland, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (WinKeys)"
 msgstr "Roemeens (Windows-toetsen)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:654
 msgid "Romanian (cedilla)"
 msgstr "Roemeens (cedilla)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (standard cedilla)"
 msgstr "Roemeens (standaard cedilla)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Roemeens (standaard)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:657
 msgid "Rupee on 4"
 msgstr "Roepie op 4"
 
-#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:658 ../rules/base.extras.xml.in.h:32
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:659
 msgid "Russian (DOS)"
 msgstr "Russisch (DOS)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Georgia)"
 msgstr "Russisch (Georgisch)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Germany, phonetic)"
 msgstr "Russisch (Duitsland fonetisch)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Russisch (Kazachstans, met Kazachstaans)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:663
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Russisch (Polen, fonetisch Dvorak)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:664
 msgid "Russian (Sweden, phonetic)"
 msgstr "Russisch (Zweden, fonetisch)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:665
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Russisch (Zweden, fonetisch, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:666
 msgid "Russian (US, phonetic)"
 msgstr "Russisch (US, fonetisch)"
 
 # Oekraïens (standaard RSTU)<
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:667
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Russisch (Oekraïne, standaard RSTU)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:668
 msgid "Russian (legacy)"
 msgstr "Russisch (historisch)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:669
 msgid "Russian (phonetic WinKeys)"
 msgstr "Russisch (fonetisch Windows-toetsen)"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:670
 msgid "Russian (phonetic)"
 msgstr "Russisch (fonetisch)"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:671
 msgid "Russian (typewriter)"
 msgstr "Russisch (typmachine)"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:672
 msgid "Russian (typewriter, legacy)"
 msgstr "Russisch (typmachine, historisch)"
 
 # draadloos toetsenbord
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:673
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:674
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:675
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:676
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:677
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:678
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:679
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
 # Saisiyat, ook Saiset, Seisirat, Saisett, Saisiat, Saisiett, Saisirat, 
 # Saisyet, Saisyett, Amutoura of Bouiok
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:680
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Taiwan)"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:681
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:682
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:683
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:684
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:685
 msgid "Semi-colon on third level"
 msgstr "Punt-komma op derde niveau"
 
-#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:686 ../rules/base.extras.xml.in.h:35
 msgid "Serbian"
 msgstr "Servisch"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Servisch (Latijns Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin Unicode)"
 msgstr "Servisch (Latijns Unicode)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:689
 msgid "Serbian (Latin qwerty)"
 msgstr "Servisch (Latijns qwerty)"
 
 # Guillemets of ook quillemets zijn Franse aanhalingstekens.
 # Dit is "Nederlands" en dit is de «Franse manier» van aanhalen.
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Latin with guillemets)"
 msgstr "Servisch (Latijns met Franse aanhalingstekens)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (Latin)"
 msgstr "Servisch (Latijns)"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:692
 msgid "Serbian (Russia)"
 msgstr "Servisch (Rusland)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:693
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Servisch (Z en ZHE omgewisseld)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:694
 msgid "Serbian (with guillemets)"
 msgstr "Servisch (met Franse aanhalingstekens)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:695
 msgid "Serbo-Croatian (US)"
 msgstr "Servo-Kroatisch (US)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:696
 msgid "Shift cancels Caps Lock"
 msgstr "Shift heft Caps Lock op"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:697
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Shift heft Num Lock niet op, maar geeft juist het 3e niveau"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:698
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Shift met cijferblok-toetsen werkt zoals in MS Windows"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:699
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:700
 msgid "Sindhi"
 msgstr "Sindhi"
 
-# Het Singalees of Sinhala
-#: ../rules/base.xml.in.h:698
-msgid "Sinhala"
-msgstr "Singalees"
+#: ../rules/base.xml.in.h:701
+msgid "Sinhala (phonetic)"
+msgstr "Singalees (fonetisch)"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
 msgid "Slovak"
 msgstr "Slowaaks"
 
 # brede backslash/uitgebreide backslash
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
 msgid "Slovak (extended Backslash)"
 msgstr "Slovaaks (brede backslash)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
 msgid "Slovak (qwerty)"
 msgstr "Slovaaks (qwerty)"
 
 # brede backslash/uitgebreide backslash
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Slovaaks (qwerty, brede backslash)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
 msgid "Slovenian"
 msgstr "Sloveens"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Sloveens (US toetsenbord met Sloveense lettertekens)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Sloveens (met Franse aanhalingstekens voor citaten)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
 msgid "Spanish"
 msgstr "Spaans"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Dvorak)"
 msgstr "Spaans (Dvorak)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American)"
 msgstr "Spaans (Latijns-Amerika)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Spaans (Latijns-Amerika, Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Spaans (Latijns-Amerika, zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Spaans (Latijns-Amerika, met dode tilde)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (Macintosh)"
 msgstr "Spaans (Macintosh)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Spanish (Sun dead keys)"
 msgstr "Spaans (Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Spanish (eliminate dead keys)"
 msgstr "Spaans (zonder dode toetsen)"
 
 # met/bijvoegen
 # inactieve/dode/latente
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Spanish (include dead tilde)"
 msgstr "Spaans (met dode tilde)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Speciale toetsen (Ctrl+Alt+&lt;toets&gt;) afgehandeld in een server"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Sun Type 5/6"
 msgstr "Sun type 5/6"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power multimediatoetsenbord"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swahili (Kenya)"
 msgstr "Swahili (Kenia)"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swahili (Tanzania)"
 msgstr "Swahili (Tanzania)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Ctrl en Caps Lock omwisselen"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
 msgid "Swap ESC and Caps Lock"
 msgstr "Esc en Caps Lock omwisselen"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish"
 msgstr "Zweeds"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (Dvorak)"
 msgstr "Zweeds (Dvorak)"
 
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:728
 msgid "Swedish (Macintosh)"
 msgstr "Zweeds (Macintosh)"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
 msgid "Swedish (Svdvorak)"
 msgstr "Zweeds (Svdvorak)"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:730
 msgid "Swedish (eliminate dead keys)"
 msgstr "Zweeds (zonder dode toetsen)"
 
-#: ../rules/base.xml.in.h:728
+#: ../rules/base.xml.in.h:731
 msgid "Swedish Sign Language"
 msgstr "Zweedse gebarentaal"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:732
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
 msgid "Syriac"
 msgstr "Syrisch"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
 msgid "Syriac (phonetic)"
 msgstr "Syrisch (fonetisch)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
 msgid "Taiwanese"
 msgstr "Taiwanees"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
 msgid "Taiwanese (indigenous)"
 msgstr "Taiwanees (oorspronkelijk)"
 
 # Het Tadzjieks of Tajiki
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
 msgid "Tajik"
 msgstr "Tadzjieks"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
 msgid "Tajik (legacy)"
 msgstr "Tadzjieks (historisch)"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamil (Sri Lanka, TAB typmachine)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamil (Sri Lanka, Unicode)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamil (TAB typmachine)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamil (TSCII typmachine)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
 msgid "Tamil (Unicode)"
 msgstr "Tamil (Unicode)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamil (toetsenbord met cijfertekens)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
 msgid "Tatar"
 msgstr "Tatar"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
 msgid "Telugu"
 msgstr "Telugu"
 
 # Het Thai is de officiële taal van Thailand.
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
 msgid "Thai"
 msgstr "Thai"
 
 # Pattachote en Kedmanee zijn de twee toetsenbordindelingen voor Thai
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
 msgid "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:751
 msgid "Thai (TIS-820.2538)"
 msgstr "Thai (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
 msgid "Tibetan"
 msgstr "Tibetaans"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tibetaans (met ASCII-cijfers)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Naar de corresponderende toets op een Dvorak toetsenbord."
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Naar de corresponderende toets op een Qwerty toetsenbord."
 
 # XKB PointerKeys are the mouse emulation XKB provides on the hit of a key
 # press(Test with Shift+NumLock, then the keypad will move the mouse
 # around)
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Muistoetsen aan/uitzetten met Shift+NumLock."
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:758
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access toetsenbord"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
 # classic is hier onderdeel van merknaam?
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
 # Tswana of Setswana is een Bantoetaal die wordt gesproken in Botswana
 # Andere benamingen voor Tswana zijn onder meer Sechuana en Beetjuans.
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
 msgid "Tswana"
 msgstr "Tswana"
 
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:762
 msgid "Turkish"
 msgstr "Turks"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (Alt-Q)"
 msgstr "Turks (Alt-Q)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
 msgid "Turkish (F)"
 msgstr "Turks (F)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
 msgid "Turkish (Sun dead keys)"
 msgstr "Turks (Sun dode toetsen)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
 msgid "Turkish (international with dead keys)"
 msgstr "Turks (internationaal met dode toetsen)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:767
 msgid "Turkmen"
 msgstr "Turkmeens"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmeens (Alt-Q)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:772
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:773
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:774
 msgid "Udmurt"
 msgstr "Udmurts"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian"
 msgstr "Oekraïens"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (WinKeys)"
 msgstr "Oekraïens (Windows-toetsen)"
 
 # Pannonian Rusyn (руска бешеда) or simply Rusyn (or Ruthenian) is a Slavic language
 # or dialect spoken by Pannonian Rusyns in north-western Serbia (Bačka region) and eastern
 # Croatia (therefore also called Yugoslavo-Ruthenian, Vojvodina-Ruthenian or Bačka-Ruthenian).
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Oekraïens (homophonisch)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (legacy)"
 msgstr "Oekraïens (historisch)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
 msgid "Ukrainian (phonetic)"
 msgstr "Oekraïens (fonetisch)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
 msgid "Ukrainian (standard RSTU)"
 msgstr "Oekraïens (standaard RSTU)"
 
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
 msgid "Ukrainian (typewriter)"
 msgstr "Oekraïens (typmachine)"
 
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:782
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode-aanvullingen (pijlen en wiskundige operatoren)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:783
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Unicode-aanvullingen (pijlen en wiskundige operatoren). Wiskundige operatoren op het standaard niveau"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:784
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
 # Het Urdu, vroeger door Westerse taalkundigen vaak Hindoestani genoemd, 
 # is de officiële taal van Pakistan 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (Pakistan)"
 msgstr "Urdu (Pakistan)"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (Windows-toetsen)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:789
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (alternatief fonetisch)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
 msgid "Urdu (phonetic)"
 msgstr "Urdu (fonetisch)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Toetsenbord-LED gebruiken om alternatieve indeling te tonen"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:792
 msgid "Using space key to input non-breakable space character"
 msgstr "Spatiebalk gebruiken voor het invoeren van niet-afbrekende (harde) spaties"
 
 # Spatiebalk geeft de gebruikelijke spatie op elk niveau.
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:793
 msgid "Usual space at any level"
 msgstr "Gebruikelijke spatie op elk niveau"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:794
 msgid "Uyghur"
 msgstr "Oeigoers"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek"
 msgstr "Oezbeeks"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
 msgid "Uzbek (Afghanistan)"
 msgstr "Oezbeeks (Afghanistan)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Oezbeeks (Afghanistanm, OLPC)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
 msgid "Uzbek (Latin)"
 msgstr "Oezbeeks (Latijns)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
 msgid "Vietnamese"
 msgstr "Viëtnamees"
 
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 internet toetsenbord"
 
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Wang 724 cijferblok met Unicode-aanvullingen (pijlen en wiskundige operatoren)"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:802
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Wang 724 cijferblok met Unicode aanvullingen (pijlen en wiskundige operatoren). Wiskundige operatoren op het standaard niveau"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:803
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
 msgid "Wolof"
 msgstr "Wolof"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! internettoetsenbord"
 
 # Het Jakoets is een Turkse taal met ongeveer 363.000 sprekers
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
 msgid "Yakut"
 msgstr "Jakoets"
 
 # Het Yoruba is een Afrikaanse taal. Het is de taal van de Yoruba 
 # en wordt gesproken in Nigeria, Benin en Togo.
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
 msgid "Yoruba"
 msgstr "Yoruba"
 
@@ -3373,427 +3388,427 @@ msgstr "Yoruba"
 # Nulbreedte-losmaker/non-verbinder/non-verbindingsteken
 # losmaker is het duidelijkst, het maakt twee tekens los die anders verbonden zouden worden. 
 # (Tino)
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level"
 msgstr "Nulbreedte-losmaker op het tweede niveau"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:809
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Nulbreedte-losmaker op het tweede niveau, harde spatie op het derde niveau"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:810
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Nulbreedte-losmaker op het tweede niveau, harde spatie op het derde niveau, niets op het vierde niveau"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:811
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Nulbreedte-losmaker op het tweede niveau, harde spatie op het derde niveau, smalle harde spatie op het vierde niveau"
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:812
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Nulbreedte-losmaker op het tweede niveau, harde spatie op het derde niveau, nulbreedte-verbinder op het vierde niveau"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:813
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Nulbreedte-losmaker op het tweede niveau, nulbreedte-verbinder op het derde niveau"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:814
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Nulbreedte-losmaker op het tweede niveau, nulbreedte-verbinder op het derde niveau, harde spatie op het vierde niveau"
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:815
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Nulbreedte-losmaker op het derde niveau, nulbreedte-verbinder op het vierde niveau"
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:816
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:817
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:820
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
 msgid "ca"
 msgstr "ca"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:831 ../rules/base.extras.xml.in.h:38
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:39
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:40
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:41
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:846 ../rules/base.extras.xml.in.h:42
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:849
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:852
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
+#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:43
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:858
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:863
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:867
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:871 ../rules/base.extras.xml.in.h:45
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:46
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:873
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:878
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:881
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:47
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
+#: ../rules/base.xml.in.h:888 ../rules/base.extras.xml.in.h:48
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:889 ../rules/base.extras.xml.in.h:49
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
+#: ../rules/base.xml.in.h:895 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:904
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:910
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:911
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:912
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
 msgid "zh"
 msgstr "zh"
 
@@ -3801,6 +3816,10 @@ msgstr "zh"
 msgid "APL Keyboard Symbols"
 msgstr "APL toetsenbordsymbolen"
 
+#: ../rules/base.extras.xml.in.h:3
+msgid "Armenian (OLPC phonetic)"
+msgstr "Armeens (OLPC fonetisch)"
+
 #: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
 msgstr "Atsina"
@@ -3819,93 +3838,130 @@ msgstr "Avestisch"
 msgid "Couer D'alene Salish"
 msgstr "Coeur D'alene Salish"
 
-#: ../rules/base.extras.xml.in.h:8
+# Krim-Tataars of Krim-Turks
+# http://nl.wikipedia.org/wiki/Krim-Tataars
+#: ../rules/base.extras.xml.in.h:7
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Krim-Tataars (Dobruca-1 Q)"
+
+#: ../rules/base.extras.xml.in.h:9
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Engels (US, internationaal AltGr Unicode combineren)"
 
-#: ../rules/base.extras.xml.in.h:9
+#: ../rules/base.extras.xml.in.h:10
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Engels (US, internationaal AltGr Unicode combineren, alternatief)"
 
+#: ../rules/base.extras.xml.in.h:13
+msgid "German (US keyboard with German letters)"
+msgstr "Duits (US toetsenbord met Duitse lettertekens)"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "Duits (met Hongaarse lettertekens en zonder dode toetsen)"
+
 # Kutenai is a language isolate having no demonstrable relation
 # to any other language.
 # The Kutenai language (also Kootenai or Ktunaxa language) is named 
 # after and is spoken by some of the Kootenai Native American/First 
 # Nations people who are indigenous to the area of North America that
 # is now Montana, Idaho, and British Columbia.
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:15
 msgid "Kutenai"
 msgstr "Kutenai"
 
-#: ../rules/base.extras.xml.in.h:13
+#: ../rules/base.extras.xml.in.h:17
 msgid "Latvian (US Colemak)"
 msgstr "Lets (US, Colemak)"
 
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:18
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Lets (US Colemak, apostrof variant)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:19
 msgid "Latvian (US Dvorak)"
 msgstr "Lets (US Dvorak)"
 
-#: ../rules/base.extras.xml.in.h:16
+#: ../rules/base.extras.xml.in.h:20
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Lets (US Dvorak, Y variant)"
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Lets (US Dvorak, min variant)"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Lets (programmeer US Dvorak)"
 
-#: ../rules/base.extras.xml.in.h:19
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Lets (programmeer US Dvorak, Y variant)"
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Lets (programmeer US Dvorak, min variant)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:26
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Litouws (US Dvorak met Litouwse lettertekens)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:29
 msgid "Polish (international with dead keys)"
 msgstr "Pools (internationaal met dode toetsen)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:31
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Roemeens (ergonomisch Touchtype)"
 
-#: ../rules/base.extras.xml.in.h:29
-msgid "Russian (with UKR and BEL layout)"
-msgstr "Russisch (met UKR en BEL indeling)"
+#: ../rules/base.extras.xml.in.h:33
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "Russisch (met Oekraïens-Wit-Russische indeling)"
 
 # Canadees-Indiaanse taal (Shuswap)
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:34
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Servisch  (Combinerende accenten in plaats van dode toetsen)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "apl"
 msgstr "apl"
 
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:44
 msgid "kut"
 msgstr "kut"
 
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:50
 msgid "shs"
 msgstr "shs"
 
+#~ msgid "English (Cameroon qwerty)"
+#~ msgstr "Engels (Kameroen qwerty)"
+
+#~ msgid "French (Cameroon azerty)"
+#~ msgstr "Frans (Kameroen azerty)"
+
+#~ msgid "German (qwerty)"
+#~ msgstr "Duits (qwerty)"
+
+# Ctrl-toets
+#~ msgid "Make Caps Lock an additional Ctrl"
+#~ msgstr "Van Caps Lock een extra Ctrl maken"
+
+#~ msgid "Meta on Left Ctrl"
+#~ msgstr "Meta op Linker Ctrl-toets"
+
+#~ msgid "Right Ctrl is mapped to Menu"
+#~ msgstr "Rechter Ctrl zit op de Menu-toets"
+
+# Het Singalees of Sinhala
+#~ msgid "Sinhala"
+#~ msgstr "Singalees"
+
 #~ msgid "Afg"
 #~ msgstr "Afg"
 
diff --git a/dist/xkeyboard-config/po/pl.po b/dist/xkeyboard-config/po/pl.po
index e314c22b0..730b977d3 100644
--- a/dist/xkeyboard-config/po/pl.po
+++ b/dist/xkeyboard-config/po/pl.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.3\n"
+"Project-Id-Version: xkeyboard-config 2.3.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-17 21:08+0100\n"
-"PO-Revision-Date: 2011-05-19 16:45+0200\n"
+"POT-Creation-Date: 2011-09-15 21:25+0100\n"
+"PO-Revision-Date: 2011-09-17 13:55+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -211,7 +211,7 @@ msgstr "Armeński"
 msgid "Armenian (alternative eastern)"
 msgstr "Armeński (anternatywny wschodni)"
 
-#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:50
 msgid "Armenian (alternative phonetic)"
 msgstr "Armeński (alternatywny fonetyczny)"
 
@@ -372,3277 +372,3289 @@ msgid "Bengali"
 msgstr "Bengalski"
 
 #: ../rules/base.xml.in.h:90
+msgid "Bengali (Baishakhi Inscript)"
+msgstr "Bengalski (Baishakhi Inscript)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bengali (Baishakhi)"
+msgstr "Bengalski (Baishakhi)"
+
+#: ../rules/base.xml.in.h:92
+msgid "Bengali (Bornona)"
+msgstr "Bengalski (Bornona)"
+
+#: ../rules/base.xml.in.h:93
 msgid "Bengali (Probhat)"
 msgstr "Bengalski (Probhat)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:94
+msgid "Bengali (Uni Gitanjali)"
+msgstr "Bengalski (Uni Gitanjali)"
+
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berberyjski (Maroko, alternatywny fonetyczny tifinagh)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berberyjski (Maroko, alternatywny tifinagh)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:97
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berberyjski (Maroko, rozszerzony fonetyczny tifinagh)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:98
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berberyjski (Maroko, rozszerzony tifinagh)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:99
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berberyjski (Maroko, tifinagh fonetyczny"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:100
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berberyjski (Maroko, tifinagh)"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian"
 msgstr "Bośniacki"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:102
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bośniacki (klawiatura US z dwuznakami bośniackimi)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:103
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bośniacki (klawiatura US z literami bośniackimi)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:104
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bośniacki (z użyciem dwuznaków bośniackich)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:105
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bośniacki (z użyciem cudzysłowów do cytowania)"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Oba klawisze Alt naraz"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Oba klawisze Ctrl naraz"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Oba klawisze Shift naraz"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:109
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Oba klawisze Shift naraz włączają CapsLock, jeden Shift wyłącza"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:110
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Oba klawisze Shift naraz przełączają CapsLock"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:111
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Oba klawisze Shift naraz przełączają ShiftLock"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:112
 msgid "Braille"
 msgstr "Braille'a"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:113
 msgid "Braille (left hand)"
 msgstr "Braille (leworęczny)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:114
 msgid "Braille (right hand)"
 msgstr "Braille (praworęczny)"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:115
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:116
 msgid "Bulgarian"
 msgstr "Bułgarski"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:117
 msgid "Bulgarian (new phonetic)"
 msgstr "Bułgarski (nowy fonetyczny)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:118
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bułgarski (tradycyjny fonetyczny)"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:119
 msgid "Burmese"
 msgstr "Birmański"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:120
+msgid "Cameroon Multilingual (azerty)"
+msgstr "Kameruński wielojęzyczny (AZERTY)"
+
+#: ../rules/base.xml.in.h:121
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "Kameruński wielojęzyczny (QWERTYa)"
+
+#: ../rules/base.xml.in.h:122
 msgid "Canadian Multilingual"
 msgstr "Kanadyjski wielojęzyczny"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:123
 msgid "Canadian Multilingual (first part)"
 msgstr "Kanadyjski wielojęzyczny (część pierwsza)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:124
 msgid "Canadian Multilingual (second part)"
 msgstr "Kanadyjski wielojęzyczny (część druga)"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock"
 msgstr "CapsLock"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr "CapsLock (wybiera poziom 3., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 3.)"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "CapsLock (do pierwszego układu), Shift+CapsLock (do ostatniego układu)"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "CapsLock (wciśnięty), Alt+CapsLock działa jak zwykły CapsLock"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "CapsLock działa jako Shift z blokadą. Shift wstrzymuje CapsLock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "CapsLock działa jako Shift z blokadą. Shift nie wpływa na CapsLock"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:131
+msgid "Caps Lock as Ctrl"
+msgstr "CapsLock jako Ctrl"
+
+#: ../rules/base.xml.in.h:132
 msgid "Caps Lock is disabled"
 msgstr "CapsLock wyłączony"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:133
 msgid "Caps Lock key behavior"
 msgstr "Zachowanie klawisza CapsLock"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:134
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "CapsLock przełącza Shift wpływając na wszystkie klawisze"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:135
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "CapsLock przełącza wielkość znaków alfabetycznych"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:136
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "CapsLock używa wewnętrznej zmiany rozmiaru liter. Shift wstrzymuje CapsLock"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:137
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "CapsLock używa wewnętrznej zmiany rozmiaru liter. Shift nie wpływa na CapsLock"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:138
 msgid "Catalan"
 msgstr "Kataloński"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:139
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Kataloński (hiszpański, z L ze środkową kropką)"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:140
 msgid "Cherokee"
 msgstr "Czerokeski"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:141
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:142
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:143
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (opcja zmiany)"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:144
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:145
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:146
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:147
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:148
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:149
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:150
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:151
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:152
 msgid "Chinese"
 msgstr "Chiński"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:153
 msgid "Chuvash"
 msgstr "Czuwaski"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:154
 msgid "Chuvash (Latin)"
 msgstr "Czuwaski (łaciński)"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:155
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:156
 msgid "CloGaelach"
 msgstr "Irlandzki gaelicki"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 klawiszy)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 klawiszy)"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:160
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 klawiszy)"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:161
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:162
 msgid "Compose key position"
 msgstr "Położenie klawisza Compose"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:164
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Control pod klawiszami Alt, Alt pod klawiszami Win"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:165
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Control pod klawiszami Win (oraz zwykłymi klawiszami Ctrl)"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:160
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "Krymskotatarski (Dobruja Q)"
-
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Krymskotatarski (turecki Alt-Q)"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Krymskotatarski (turecki F)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Krymskotatarski (turecki Q)"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Croatian"
 msgstr "Chorwacki"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Chorwacki (klawiatura US z dwuznakami chorwackimi)"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:172
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Chorwacki (klawiatura US z literami chorwackimi)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Chorwacki (z użyciem dwuznaków chorwackich)"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:174
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Chorwacki (z użyciem cudzysłowów do cytowania)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:175
 msgid "Ctrl key position"
 msgstr "Położenie klawisza Ctrl"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:176
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:177
 msgid "Czech"
 msgstr "Czeski"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Czeski (układ UCW - tylko litery akcentowane)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Czeski (US Dvoraka z obsługą CZ UCW)"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:180
 msgid "Czech (qwerty)"
 msgstr "Czeski (QWERTY)"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:181
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Czeski (QWERTY, rozszerzony Backslash)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Czeski (z klawiszem &lt;\\|&gt;)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Danish"
 msgstr "Duński"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Danish (Dvorak)"
 msgstr "Duński (Dvoraka)"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Danish (Macintosh)"
 msgstr "Duński (Macintosh)"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Duński (Macintosh, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Danish (eliminate dead keys)"
 msgstr "Duński (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Default numeric keypad keys"
 msgstr "Domyślne klawisze klawiatury numerycznej"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell 101-key PC"
 msgstr "Dell 101-key PC"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Laptop/notebook Dell Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Laptop/notebook z serii Dell Precision M"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dell Latitude series laptop"
 msgstr "Laptop z serii Dell Latitude"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:197
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dhivehi"
 msgstr "Malediwski"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond z serii 9801 / 9802"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
 msgid "Dutch"
 msgstr "Holenderski"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:203
 msgid "Dutch (Macintosh)"
 msgstr "Holenderski (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:204
 msgid "Dutch (Sun dead keys)"
 msgstr "Holenderski (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:205
 msgid "Dutch (standard)"
 msgstr "Holenderski (standardowy)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:206
 msgid "Dzongkha"
 msgstr "Dzongka"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:207
 msgid "Enable extra typographic characters"
 msgstr "Włączenie dodatkowych znaków typograficznych"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:208
 msgid "English (Cameroon Dvorak)"
 msgstr "Angielski (kameruński Dvoraka)"
 
-#: ../rules/base.xml.in.h:203
-msgid "English (Cameroon qwerty)"
-msgstr "Angielski (kameruński QWERTY)"
-
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:209
 msgid "English (Cameroon)"
 msgstr "Angielski (Kamerun)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:210
 msgid "English (Canada)"
 msgstr "Angielski (Kanada)"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:211
 msgid "English (Colemak)"
 msgstr "Angielski (Colemak)"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:212
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Angielski (alternatywny międzynarodowy Dvoraka bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:213
 msgid "English (Dvorak international with dead keys)"
 msgstr "Angielski (międzynarodowy Dvoraka z klawiszami akcentów)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:214
 msgid "English (Dvorak)"
 msgstr "Angielski (Dvoraka)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:215
 msgid "English (Ghana)"
 msgstr "Angielski (Ghana)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:216
 msgid "English (Ghana, GILLBT)"
 msgstr "Angielski (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:217
 msgid "English (Ghana, multilingual)"
 msgstr "Angielski (Ghana, wielojęzyczny)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:218
 msgid "English (India, with RupeeSign)"
 msgstr "Angielski (Indie, ze znakiem rupii)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:219
 msgid "English (Macintosh)"
 msgstr "Angielski (Macintosh)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:220
 msgid "English (Mali, US Macintosh)"
 msgstr "Angielski (Mali, USA - Macintosh)"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:221
 msgid "English (Mali, US international)"
 msgstr "Angielski (Mali, międzynarodowy USA)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:222
 msgid "English (Nigeria)"
 msgstr "Angielski (Nigeria)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:223
 msgid "English (South Africa)"
 msgstr "Angielski (Afryka Południowa)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:224
 msgid "English (UK)"
 msgstr "Angielski (Wielka Brytania)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:225
 msgid "English (UK, Colemak)"
 msgstr "Angielski (Wielka Brytania, Colemak)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Angielski (Wielka Brytania, Dvoraka z brytyjskimi znakami przestankowymi)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:227
 msgid "English (UK, Dvorak)"
 msgstr "Angielski (Wielka Brytania, Dvoraka)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:228
 msgid "English (UK, Macintosh international)"
 msgstr "Angielski (Wielka Brytania, międzynarodowy Macintosh)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:229
 msgid "English (UK, Macintosh)"
 msgstr "Angielski (Wielka Brytania, Macintosh)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:230
 msgid "English (UK, extended WinKeys)"
 msgstr "Angielski (Wielka Brytania, rozszerzone klawisze Win)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:231
 msgid "English (UK, international with dead keys)"
 msgstr "Angielski (Wielka Brytania, międzynarodowy z klawiszami akcentów)"
 
-#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:232 ../rules/base.extras.xml.in.h:8
 msgid "English (US)"
 msgstr "Angielski (USA)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:233
 msgid "English (US, alternative international)"
 msgstr "Angielski (USA, alternatywny międzynarodowy)"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:234
 msgid "English (US, international with dead keys)"
 msgstr "Międzynarodowy (USA, międzynarodowy z klawiszami akcentów)"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:235
 msgid "English (US, with euro on 5)"
 msgstr "Angielski (USA, ze znakiem euro pod 5)"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:236
 msgid "English (classic Dvorak)"
 msgstr "Angielski (klasyczny Dvoraka)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:237
 msgid "English (international AltGr dead keys)"
 msgstr "Angielski (międzynarodowy, klawisze akcentów pod AltGr)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:238
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Angielski (przełączanie układu klawiszem mnożenia/dzielenia)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:239
 msgid "English (left handed Dvorak)"
 msgstr "Angielski (leworęczny Dvoraka)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:240
 msgid "English (programmer Dvorak)"
 msgstr "Angielski (Dvoraka programisty)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:241
 msgid "English (right handed Dvorak)"
 msgstr "Angielski (praworęczny Dvoraka)"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:242
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:243
 msgid "Enter on keypad"
 msgstr "Enter na klawiaturze numerycznej"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:244
 msgid "Esperanto"
 msgstr "Esperancki"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:245
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Esperanto (Portugalia, Nativo)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:246
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (zamieniony średnik i apostrof, przestarzałe)"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:247
 msgid "Estonian"
 msgstr "Estoński"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:248
 msgid "Estonian (Dvorak)"
 msgstr "Estoński (Dvoraka)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:249
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estoński (klawiatura US z literami estońskimi)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:250
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estoński (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:251
 msgid "Euro on 2"
 msgstr "Euro pod 2"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:252
 msgid "Euro on 4"
 msgstr "Euro pod 4"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:253
 msgid "Euro on 5"
 msgstr "Euro pod 5"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:254
 msgid "Euro on E"
 msgstr "Euro pod E"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:255
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:256
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:257
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:258
 msgid "Faroese"
 msgstr "Farerski"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:259
 msgid "Faroese (eliminate dead keys)"
 msgstr "Farerski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:260
 msgid "Filipino"
 msgstr "Filipiński"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filipiński (baybayin Capewella-Dvoraka)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:262
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filipiński (łaciński Capewella-Dvoraka)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filipiński (baybayin Capewella-QWERF 2006)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filipiński (łaciński Capewella-QWERF 2006)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:265
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filipiński (baybain Colemak)"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:266
 msgid "Filipino (Colemak Latin)"
 msgstr "Filipiński (łaciński Colemak)"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:267
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Filipiński (baybain Dvoraka)"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:268
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filipiński (łaciński Dvoraka)"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:269
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filipino (baybain QWERTY)"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:270
 msgid "Finnish"
 msgstr "Fiński"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:271
 msgid "Finnish (Macintosh)"
 msgstr "Fiński (Macintosh)"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:272
 msgid "Finnish (classic)"
 msgstr "Fiński (klasyczny)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:273
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Fiński (klasyczny, bez klawiszy akcentów)"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:276
 msgid "Four-level key with abstract separators"
 msgstr "Klawisz czterofunkcyjny z abstrakcyjnymi separatorami"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:277
 msgid "Four-level key with comma"
 msgstr "Klawisz czterofunkcyjny z przecinkiem"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:278
 msgid "Four-level key with dot"
 msgstr "Klawisz czterofunkcyjny z kropką"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:279
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Klawisz czterofunkcyjny z kropką, tylko latin-9"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:280
 msgid "Four-level key with momayyez"
 msgstr "Klawisz czterofunkcyjny ze znakiem momayyez"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:281
 msgid "French"
 msgstr "Francuski"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:282
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Francuski (Bepo, ergonomiczny, w stylu Dvoraka)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:283
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Francuski (Bepo, ergonomiczny, w stylu Dvoraka, tylko latin-9)"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:284
 msgid "French (Breton)"
 msgstr "Francuski (bretoński)"
 
-#: ../rules/base.xml.in.h:280
-msgid "French (Cameroon azerty)"
-msgstr "Francuski (kameruński AZERTY)"
-
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:285
 msgid "French (Cameroon)"
 msgstr "Francuski (Kamerun)"
 
-#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:286 ../rules/base.extras.xml.in.h:11
 msgid "French (Canada)"
 msgstr "Francuski (Kanada)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:287
 msgid "French (Canada, Dvorak)"
 msgstr "Francuski (kanadyjski, Dvoraka)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:288
 msgid "French (Canada, legacy)"
 msgstr "Francuski (kanadyjski, stary)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:289
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Francuski (Demokratyczna Republika Konga)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:290
 msgid "French (Dvorak)"
 msgstr "Francuski (Dvoraka)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:291
 msgid "French (Guinea)"
 msgstr "Francuski (Gwinea)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:292
 msgid "French (Macintosh)"
 msgstr "Francuski (Macintosh)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:293
 msgid "French (Mali, alternative)"
 msgstr "Francuski (Mali, alternatywny)"
 
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:294
 msgid "French (Morocco)"
 msgstr "Francuski (Maroko)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:295
 msgid "French (Sun dead keys)"
 msgstr "Francuski (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:296
 msgid "French (Switzerland)"
 msgstr "Francuski (Szwajcaria)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:297
 msgid "French (Switzerland, Macintosh)"
 msgstr "Francuski (Szwajcaria, Macintosh)"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:298
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Francuski (Szwajcaria, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:299
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Francuski (Szwajcaria, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:300
 msgid "French (alternative)"
 msgstr "Francuski (alternatywny)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:301
 msgid "French (alternative, Sun dead keys)"
 msgstr "Francuski (alternatywny, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:302
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Francuski (alternatywny, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:303
 msgid "French (alternative, latin-9 only)"
 msgstr "Francuski (alternatywny, tylko latin-9)"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:304
 msgid "French (eliminate dead keys)"
 msgstr "Francuski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:305
 msgid "French (legacy, alternative)"
 msgstr "Francuski (stary, alternatywny)"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:306
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Francuski (stary alternatywny, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:307
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Francuski (stary alternatywny, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:308
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Laptop Fujitsu-Siemens Computers AMILO"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:309
 msgid "Fula"
 msgstr "Fulani"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:310
 msgid "Ga"
 msgstr "Ga"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:311
 msgid "Generic 101-key PC"
 msgstr "Zwykła PC 101-klawiszowa"
 
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:312
 msgid "Generic 102-key (Intl) PC"
 msgstr "Zwykła PC 102-klawiszowa (Intl)"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:313
 msgid "Generic 104-key PC"
 msgstr "Zwykła PC 104-klawiszowa"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:314
 msgid "Generic 105-key (Intl) PC"
 msgstr "Zwykła PC 105-klawiszowa (Intl)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:315
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:316
 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:313
+#: ../rules/base.xml.in.h:317
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:318
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:319
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:320
 msgid "Georgian"
 msgstr "Gruziński"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:321
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Gruziński (Francja, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:322
 msgid "Georgian (Italy)"
 msgstr "Gruziński (Włochy)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:323
 msgid "Georgian (MESS)"
 msgstr "Gruziński (MESS)"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:324
 msgid "Georgian (ergonomic)"
 msgstr "Gruziński (ergonomiczny)"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:325 ../rules/base.extras.xml.in.h:12
 msgid "German"
 msgstr "Niemiecki"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:326
 msgid "German (Austria)"
 msgstr "Niemiecki (Austria)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:327
 msgid "German (Austria, Macintosh)"
 msgstr "Niemiecki (Austria, Macintosh)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:328
 msgid "German (Austria, Sun dead keys)"
 msgstr "Niemiecki (Austria, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:329
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Niemiecki (Austria, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:330
 msgid "German (Dvorak)"
 msgstr "Niemiecki (Dvoraka)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:331
 msgid "German (Macintosh)"
 msgstr "Niemiecki (Macintosh)"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:332
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Niemiecki (Macintosh, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:333
 msgid "German (Neo 2)"
 msgstr "Niemiecki (Neo 2)"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:334
 msgid "German (Sun dead keys)"
 msgstr "Niemiecki (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:335
 msgid "German (Switzerland)"
 msgstr "Niemiecki (Szwajcaria)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:336
 msgid "German (Switzerland, Macintosh)"
 msgstr "Niemiecki (Szwajcaria, Macintosh)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:337
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Niemiecki (Szwajcaria, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:338
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Niemiecki (Szwajcaria, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:339
 msgid "German (Switzerland, legacy)"
 msgstr "Niemiecki (Szwajcaria, stary)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:340
 msgid "German (dead acute)"
 msgstr "Niemiecki (akcent ostry)"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:341
 msgid "German (dead grave acute)"
 msgstr "Niemiecki (akcent gravis)"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:342
 msgid "German (eliminate dead keys)"
 msgstr "Niemiecki (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:339
-msgid "German (qwerty)"
-msgstr "Niemiecki (QWERTY)"
-
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:343
 msgid "Greek"
 msgstr "Grecki"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:344
 msgid "Greek (eliminate dead keys)"
 msgstr "Grecki (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:345
 msgid "Greek (extended)"
 msgstr "Grecki (rozszerzony)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:346
 msgid "Greek (polytonic)"
 msgstr "Grecki (politoniczny)"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:347
 msgid "Greek (simple)"
 msgstr "Grecki (prosty)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:348
 msgid "Gujarati"
 msgstr "Gudźarati"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:349
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:350
 msgid "HTC Dream"
 msgstr "HTC Dream"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:351
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:352
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking Keyboard for Mac"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:353
 msgid "Hausa"
 msgstr "Hausa"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:354
 msgid "Hebrew"
 msgstr "Hebrajski"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:355
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Hebrajski (biblijny, Tiro)"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:356
 msgid "Hebrew (lyx)"
 msgstr "Hebrajski (lyx)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:357
 msgid "Hebrew (phonetic)"
 msgstr "Hebrajski (fonetyczny)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard Mini 110 Notebook"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:367
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:368
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:369
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:370
 msgid "Hexadecimal"
 msgstr "Szesnastkowy"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:371
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (Bolnagri)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:372
 msgid "Hindi (Wx)"
 msgstr "Hindi (Wx)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:373
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:374
 msgid "Htc Dream phone"
 msgstr "Telefon HTC Dream"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian"
 msgstr "Węgierski"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Węgierski (101/QWERTY/przecinek/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Węgierski (101/QWERTY/przecinek/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Węgierski (101/QWERTY/kropka/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Węgierski (101/QWERTY/kropka/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Węgierski (101/QWERTZ/przecinek/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Węgierski (101/QWERTZ/przecinek/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Węgierski (101/QWERTZ/kropka/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Węgierski (101/QWERTZ/kropka/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Węgierski (102/QWERTY/przecinek/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Węgierski (102/QWERTY/przecinek/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Węgierski (102/QWERTY/kropka/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Węgierski (102/QWERTY/kropka/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Węgierski (102/QWERTZ/przecinek/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Węgierski (102/QWERTZ/przecinek/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Węgierski (102/QWERTZ/kropka/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Węgierski (102/QWERTZ/kropka/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:392
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Węgierski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:393
 msgid "Hungarian (qwerty)"
 msgstr "Węgierski (QWERTY)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:394
 msgid "Hungarian (standard)"
 msgstr "Węgierski (standardowy)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:395
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper pod klawiszami Win"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:396
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:397
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:398
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:399
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:400
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:401
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic"
 msgstr "Islandzki"
 
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (Dvorak)"
 msgstr "Islandzki (Dvoraka)"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:404
 msgid "Icelandic (Macintosh)"
 msgstr "Islandzki (Macintosh)"
 
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:405
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islandzki (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:406
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islandzki (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:407
 msgid "Igbo"
 msgstr "Ibo"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:408
 msgid "Indian"
 msgstr "Indyjski"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:409
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:410
 msgid "Iraqi"
 msgstr "Iracki"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:411
 msgid "Irish"
 msgstr "Irlandzki"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:412
 msgid "Irish (UnicodeExpert)"
 msgstr "Irlandzki (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:413
 msgid "Italian"
 msgstr "Włoski"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:414
 msgid "Italian (Macintosh)"
 msgstr "Włoski (Macintosh)"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:415
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Włoski (klawiatura US z literami włoskimi)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:416
 msgid "Italian (eliminate dead keys)"
 msgstr "Włoski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:417
 msgid "Japanese"
 msgstr "Japoński"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (Kana 86)"
 msgstr "Japoński (Kana 86)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (Kana)"
 msgstr "Japoński (Kana)"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:420
 msgid "Japanese (Macintosh)"
 msgstr "Japoński (Macintosh)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:421
 msgid "Japanese (OADG 109A)"
 msgstr "Japoński (OADG 109A)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:422
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japoński (serie PC-98xx)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:423
 msgid "Japanese keyboard options"
 msgstr "Opcje klawiatury japońskiej"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:424
 msgid "Kalmyk"
 msgstr "Kałmucki"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:425
 msgid "Kana Lock key is locking"
 msgstr "Blokujący klawisz Kana Lock"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:426
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:427
 msgid "Kashubian"
 msgstr "Kaszubski"
 
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:428
 msgid "Kazakh"
 msgstr "Kazaski"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:429
 msgid "Kazakh (with Russian)"
 msgstr "Kazaski (z rosyjskim)"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:430
 msgid "Key sequence to kill the X server"
 msgstr "Sekwencja klawiszy zabijająca serwer X"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:431
 msgid "Key to choose 3rd level"
 msgstr "Klawisz wybierający poziom 3."
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:432
 msgid "Key to choose 5th level"
 msgstr "Klawisz wybierający poziom 5."
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:433
 msgid "Key(s) to change layout"
 msgstr "Klawisze zmieniające układ"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:434
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:435
 msgid "Khmer (Cambodia)"
 msgstr "Khmerski (Kambodża)"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:436
 msgid "Kikuyu"
 msgstr "Kikiju"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:437
 msgid "Kinesis"
 msgstr "Kinesis"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:438
 msgid "Komi"
 msgstr "Komi"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:439
 msgid "Korean"
 msgstr "Koreański"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:440
 msgid "Korean (101/104 key compatible)"
 msgstr "Koreański (kompatybilny ze 101/104 klawiszami)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurdyjski (Iran, arabsko-łaciński)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iran, F)"
 msgstr "Kurdyjski (Iran, F)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Kurdyjski (Iran, łaciński Alt-Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurdyjski (Iran, łaciński Q)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurdyjski (Irak, arabsko-łaciński)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurdyjski (Irak, F)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurdyjski (Irak, łaciński Alt-Q)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurdyjski (Irak, łaciński Q)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Syria, F)"
 msgstr "Kurdyjski (Syria, F)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurdyjski (Syria, łaciński Alt-Q)"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurdyjski (Syria, łaciński Q)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:452
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurdyjski (Turcja, F)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:453
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurdyjski (Turcja, łaciński Alt-Q)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:454
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurdyjski (Turcja, łaciński Q)"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:455
 msgid "Kyrgyz"
 msgstr "Kirgiski"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:456
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgiski (fonetyczny)"
 
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:457
 msgid "Lao"
 msgstr "Laotański"
 
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:458
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Laotański (proponowany układ standardowy STEA)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:459
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Klawiatura laptopowa Compaq (np. Armada)"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:460
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Klawiatura internetowa laptopów/notebooków Compaq (np. Presario)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:461
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Laptop/notebook eMachines m68xx"
 
-#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+#: ../rules/base.xml.in.h:462 ../rules/base.extras.xml.in.h:16
 msgid "Latvian"
 msgstr "Łotewski"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:463
 msgid "Latvian (F variant)"
 msgstr "Łotewski (wariant F)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:464
 msgid "Latvian (adapted)"
 msgstr "Łotewski (zaadaptowany)"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:465
 msgid "Latvian (apostrophe variant)"
 msgstr "Łotewski (wariant z apostrofem)"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:466
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Łotewski (ergonomiczny ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:467
 msgid "Latvian (modern)"
 msgstr "Łotewski (współczesny)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:468
 msgid "Latvian (tilde variant)"
 msgstr "Łotewski (wariant z tyldą)"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:469
 msgid "Left Alt"
 msgstr "Lewy Alt"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:470
 msgid "Left Alt (while pressed)"
 msgstr "Lewy Alt (wciśnięty)"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:471
 msgid "Left Alt is swapped with Left Win"
 msgstr "Lewy Alt zamieniony z lewym Win"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:472
 msgid "Left Ctrl"
 msgstr "Lewy Ctrl"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:473
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Lewy Ctrl (do pierwszego układu), prawy Ctrl (do ostatniego układu)"
 
-#: ../rules/base.xml.in.h:471
+#: ../rules/base.xml.in.h:474
+msgid "Left Ctrl as Meta"
+msgstr "Lewy Ctrl jako Meta"
+
+#: ../rules/base.xml.in.h:475
 msgid "Left Ctrl+Left Shift"
 msgstr "Lewy Ctrl+lewy Shift"
 
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:476
 msgid "Left Shift"
 msgstr "Lewy Shift"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:477
 msgid "Left Win"
 msgstr "Lewy Win"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:478
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Lewy Win (do pierwszego układu), prawy Win/Menu (do ostatniego układu)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:479
 msgid "Left Win (while pressed)"
 msgstr "Lewy Win (wciśnięty)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:480
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Lewy Win wybiera poziom 5., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 5."
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:481
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Lewy Win wybiera poziom 5., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 5.; jedno naciśnięcie zwalnia blokadę"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:482
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Lewy Ctrl+lewy Win (do pierwszego układu), prawy Ctrl+Menu (do drugiego układu)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:483
 msgid "Legacy"
 msgstr "Stary"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:484
 msgid "Legacy Wang 724"
 msgstr "Legacy Wang 724"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:486
 msgid "Legacy key with comma"
 msgstr "Klawisz tradycyjny z przecinkiem"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:487
 msgid "Legacy key with dot"
 msgstr "Klawisz tradycyjny z kropką"
 
-#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+#: ../rules/base.xml.in.h:488 ../rules/base.extras.xml.in.h:25
 msgid "Lithuanian"
 msgstr "Litewski"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litewski (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:490
 msgid "Lithuanian (LEKP)"
 msgstr "Litewski (LEKP)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:491
 msgid "Lithuanian (LEKPa)"
 msgstr "Litewski (LEKPa)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:492
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litewski (klawiatura US z literami litewskimi)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:493
 msgid "Lithuanian (standard)"
 msgstr "Litewski (standardowy)"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Access Keyboard"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop (opcja zmiany)"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:500
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro (opcja zmiany 2)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:504
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Logitech G15 - dodatkowe glawisze poprzez G15daemon"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech Generic Keyboard"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Logitech Internet 350 Keyboard"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:508
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:509
 msgid "Logitech Media Elite Keyboard"
 msgstr "Logitech Media Elite Keyboard"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:510
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:511
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Logitech Ultra-X Keyboard"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:512
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Logitech diNovo Edge Keyboard"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:513
 msgid "Logitech diNovo Keyboard"
 msgstr "Logitech diNovo Keyboard"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:514
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:515
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:516
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:517
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:518
 msgid "Lower Sorbian"
 msgstr "Dolnołużycki"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:519
 msgid "Lower Sorbian (qwertz)"
 msgstr "Dolnołużycki (QWERTZ)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:520
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:521
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Intl)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:522
 msgid "Macedonian"
 msgstr "Macedoński"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:523
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macedoński (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:524
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:525
 msgid "Macintosh Old"
 msgstr "Macintosh - stary"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Backspace"
 msgstr "CapsLock jako dodatkowy Backspace"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "CapsLock jako dodatkowy Ctrl, ale z pozostawieniem symbolu Caps_Lock"
 
-#: ../rules/base.xml.in.h:524
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "CapsLock jako dodatkowy Ctrl"
-
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional ESC"
 msgstr "CapsLock jako dodatkowy Esc"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:529
 msgid "Make Caps Lock an additional Hyper"
 msgstr "CapsLock jako dodatkowy Hyper"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:530
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "CapsLock jako dodatkowy NumLock"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:531
 msgid "Make Caps Lock an additional Super"
 msgstr "CapsLock jako dodatkowy Super"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:532
 msgid "Malayalam"
 msgstr "Malajalam"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:533
 msgid "Malayalam (Lalitha)"
 msgstr "Malajalam (Lalitha)"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:534
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malajalam (rozszerzony Inscript ze znakiem rupii)"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:535
 msgid "Maltese"
 msgstr "Maltański"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:536
 msgid "Maltese (with US layout)"
 msgstr "Maltański (z układem US)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:537
 msgid "Maori"
 msgstr "Maoryski"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:538
 msgid "Mari"
 msgstr "Maryjski"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:539
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:540
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:541
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:542
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:543
+msgid "Menu as Right Ctrl"
+msgstr "Menu jako prawy Ctrl"
+
+#: ../rules/base.xml.in.h:544
 msgid "Meta is mapped to Left Win"
 msgstr "Meta pod lewym Win"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:545
 msgid "Meta is mapped to Win keys"
 msgstr "Meta pod klawiszami Win"
 
-#: ../rules/base.xml.in.h:542
-msgid "Meta on Left Ctrl"
-msgstr "Meta pod lewym Ctrl"
-
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve Keyboard 2000"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Swedish"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:550
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural Keyboard Elite"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:553
 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:551
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:555
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:556
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:557
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:558
 msgid "Miscellaneous compatibility options"
 msgstr "Różne opcje kompatybilności"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:559
 msgid "Mongolian"
 msgstr "Mongolski"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin"
 msgstr "Czarnogórski"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:561
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Czarnogórski (cyrylicki z cudzysłowami)"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:562
 msgid "Montenegrin (Cyrillic)"
 msgstr "Czarnogórski (cyrylicki)"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:563
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Czarnogórski (cyrylicki, zamienione Z i Ż"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Czarnogórski (łaciński unikodowy QWERTY)"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:565
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Czarnogórski (łaciński unikodowy)"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:566
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Czarnogórski (łaciński QWERTY)"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:567
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Czarnogórski (łaciński z cudzysłowami)"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:568
 msgid "NICOLA-F style Backspace"
 msgstr "Backspace w stylu NICOLA-F"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:569
 msgid "Nepali"
 msgstr "Nepalski"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at fourth level"
 msgstr "Znak niełamliwej spacji na poziomie 4."
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Znak niełamliwej spacji na poziomie 4., wąskiej niełamliwej spacji na poziomie 6."
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:572
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Znak niełamliwej spacji na poziomie 4., wąskiej niełamliwej spacji na poziomie 6. (z Ctrl+Shift)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at second level"
 msgstr "Znak niełamliwej spacji na poziomie 2."
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:574
 msgid "Non-breakable space character at third level"
 msgstr "Znak niełamliwej spacji na poziomie 3."
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:575
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Znak niełamliwej spacji na poziomie 3., nic na poziomie 4."
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:576
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Znak niełamliwej spacji na poziomie 3., wąskiej niełamliwej spacji na poziomie 4."
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:577
 msgid "Northern Saami (Finland)"
 msgstr "Północnolapoński (Finlandia)"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:578
 msgid "Northern Saami (Norway)"
 msgstr "Północnolapoński (Norwegia)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:579
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Północnolapoński (Norwegia, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:580
 msgid "Northern Saami (Sweden)"
 msgstr "Północnolapoński (Szwecja)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:581
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:582
 msgid "Norwegian"
 msgstr "Norweski"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (Dvorak)"
 msgstr "Norweski (Dvoraka)"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:584
 msgid "Norwegian (Macintosh)"
 msgstr "Norweski (Macintosh)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:585
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Norweski (Macintosh, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:586
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norweski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:587
 msgid "Num Lock"
 msgstr "NumLock"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:588
 msgid "Numeric keypad delete key behaviour"
 msgstr "Zachowanie klawisza Delete na klawiaturze numerycznej"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:589
 msgid "Numeric keypad keys work as with Macintosh"
 msgstr "Klawiatura numeryczna działająca jak w Macintoshu"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:590
 msgid "Numeric keypad layout selection"
 msgstr "Wybór układu klawiatury numerycznej"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:591
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:592
 msgid "Occitan"
 msgstr "Okcytański"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:593
 msgid "Ogham"
 msgstr "Ogamiczny"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:594
 msgid "Ogham (IS434)"
 msgstr "Ogamiczny (IS434)"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:595
 msgid "Oriya"
 msgstr "Orija"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:596
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Ortek MCK-800 MM/Internet keyboard"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:597
 msgid "Ossetian (Georgia)"
 msgstr "Osetyjski (Gruzja)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:598
 msgid "Ossetian (WinKeys)"
 msgstr "Osetyjski (klawisze Win)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:599
 msgid "Ossetian (legacy)"
 msgstr "Osetyjski (stary)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:600
 msgid "PC-98xx Series"
 msgstr "Serie PC-98xx"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:601
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Pannońskorusiński (homofoniczny)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:602
 msgid "Pashto"
 msgstr "Pasztuński"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:603
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Paszto (Afganistan, OLPC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:604
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:27
 msgid "Persian"
 msgstr "Perski"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:606
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Perski (Afganistan, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:607
 msgid "Persian (with Persian Keypad)"
 msgstr "Perski (z perską klawiaturą numeryczną)"
 
-#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:28
 msgid "Polish"
 msgstr "Polski"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:609
 msgid "Polish (Dvorak)"
 msgstr "Polski (Dvoraka)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:610
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Polski (Dvoraka, polskie cudzysłowy pod klawiszem 1)"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:611
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Polski (Dvoraka, polskie cudzysłowy pod klawiszem cudzysłowu)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:612
 msgid "Polish (programmer Dvorak)"
 msgstr "Polski (Dvoraka programisty)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:613
 msgid "Polish (qwertz)"
 msgstr "Polski (QWERTZ)"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil)"
 msgstr "Portugalski (Brazylia)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugalski (Brazylia, Dvoraka)"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugalski (Brazylia, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:618
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugalski (Brazylia, nativo dla esperanto)"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:619
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugalski (Brazylia, nativo dla klawiatur USA)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:620
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugalski (Brazylia, nativo)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Macintosh)"
 msgstr "Portugalski (Macintosh)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portugalski (Macintosh, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portugalski (Macintosh, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugalski (nativo dla klawiatur USA)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:625
 msgid "Portuguese (Nativo)"
 msgstr "Portugalski (nativo)"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:626
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugalski (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:627
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugalski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:628
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:629
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:630
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Pendżabski (Gurmukhi Jhelum)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:631
 msgid "Punjabi (Gurmukhi)"
 msgstr "Pendżabski (Gurmukhi)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:632
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt"
 msgstr "Prawy Alt"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt (while pressed)"
 msgstr "Prawy Alt (wciśnięty)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:635
+msgid "Right Alt as Right Ctrl"
+msgstr "Prawy Alt jako prawy Ctrl"
+
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Prawy Alt wybiera poziom 5. i włącza blokadę poziomu 5. przy naciśnięciu z innym klawiszem wybierającym poziom 5.; jedno naciśnięcie zwalnia blokadę"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:637
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Prawy Alt wybiera poziom 5., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 5."
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:638
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Prawy Alt wybiera poziom 5., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 5.; jedno naciśnięcie zwalnia blokadę"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:639
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Prawy Alt nigdy nie wybierający poziomu 3."
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:640
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Prawy Alt, Shift+prawy Alt jako Multi_Key"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl"
 msgstr "Prawy Ctrl"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:642
 msgid "Right Ctrl (while pressed)"
 msgstr "Prawy Ctrl (wciśnięty)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:643
 msgid "Right Ctrl as Right Alt"
 msgstr "Prawy Ctrl jako prawy Alt"
 
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl is mapped to Menu"
-msgstr "Prawy Ctrl pod Menu"
-
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:644
 msgid "Right Ctrl+Right Shift"
 msgstr "Prawy Ctrl+prawy Shift"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:645
 msgid "Right Shift"
 msgstr "Prawy Shift"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:646
 msgid "Right Win"
 msgstr "Prawy Win"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:647
 msgid "Right Win (while pressed)"
 msgstr "Prawy Win (wciśnięty)"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:648
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Prawy Win wybiera poziom 5., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 5."
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:649
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Prawy Win wybiera poziom 5., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 5.; jedno naciśnięcie zwalnia blokadę"
 
-#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+#: ../rules/base.xml.in.h:650 ../rules/base.extras.xml.in.h:30
 msgid "Romanian"
 msgstr "Rumuński"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (Germany)"
 msgstr "Rumuński (Niemcy)"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Rumuński (Niemcy, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (WinKeys)"
 msgstr "Rumuński (klawisze Win)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:654
 msgid "Romanian (cedilla)"
 msgstr "Rumuński (cedilla)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (standard cedilla)"
 msgstr "Rumuński (standardowy cedilla)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Rumuński (standardowy)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:657
 msgid "Rupee on 4"
 msgstr "Rupia pod 4"
 
-#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:658 ../rules/base.extras.xml.in.h:32
 msgid "Russian"
 msgstr "Rosyjski"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:659
 msgid "Russian (DOS)"
 msgstr "Rosyjski (DOS)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Georgia)"
 msgstr "Rosyjski (gruziński)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Germany, phonetic)"
 msgstr "Rosyjski (Niemcy, fonetyczny)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Rosyjski (Kazahstan, z kazaskim)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:663
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Rosyjski (Polska, fonetyczny Dvoraka)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:664
 msgid "Russian (Sweden, phonetic)"
 msgstr "Rosyjski (Szwecja, fonetyczny)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:665
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Rosyjski (Szwecja, fonetyczny, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:666
 msgid "Russian (US, phonetic)"
 msgstr "Rosyjski (USA, fonetyczny)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:667
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Rosyjski (Ukraina, standardowy RSTU)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:668
 msgid "Russian (legacy)"
 msgstr "Rosyjski (stary)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:669
 msgid "Russian (phonetic WinKeys)"
 msgstr "Rosyjski (fonetyczny, klawisze Win)"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:670
 msgid "Russian (phonetic)"
 msgstr "Rosyjski (fonetyczny)"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:671
 msgid "Russian (typewriter)"
 msgstr "Rosyjski (maszynistki)"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:672
 msgid "Russian (typewriter, legacy)"
 msgstr "Rosyjski (maszynistki, stary)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:673
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:674
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:675
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:676
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:677
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:678
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:679
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:680
 msgid "Saisiyat (Taiwan)"
 msgstr "Saisiyat (Tajwan)"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:681
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:682
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:683
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:684
 msgid "Scroll Lock"
 msgstr "ScrollLock"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:685
 msgid "Semi-colon on third level"
 msgstr "Średnik na poziomie 3."
 
-#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:686 ../rules/base.extras.xml.in.h:35
 msgid "Serbian"
 msgstr "Serbski"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbski (łaciński unikodowy QWERTY)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbski (łaciński unikodowy)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:689
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbski (łaciński QWERTY)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbski (łaciński z cudzysłowami)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (Latin)"
 msgstr "Serbski (łaciński)"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:692
 msgid "Serbian (Russia)"
 msgstr "Serbski (Rosja)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:693
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Serbski (zamienione Z i Ż)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:694
 msgid "Serbian (with guillemets)"
 msgstr "Serbski (z cudzysłowami)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:695
 msgid "Serbo-Croatian (US)"
 msgstr "Serbsko-chorwacki (USA)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:696
 msgid "Shift cancels Caps Lock"
 msgstr "Shift anuluje CapsLock"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:697
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Shift nie anuluje NumLocka, wybiera poziom 3."
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:698
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Shift z klawiaturą numeryczną działą jak pod MS Windows"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:699
 msgid "Shift+Caps Lock"
 msgstr "Shift+CapsLock"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:700
 msgid "Sindhi"
 msgstr "Sindhi"
 
-#: ../rules/base.xml.in.h:698
-msgid "Sinhala"
-msgstr "Syngaleski"
+#: ../rules/base.xml.in.h:701
+msgid "Sinhala (phonetic)"
+msgstr "Syngaleski (fonetyczny)"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
 msgid "Slovak"
 msgstr "Słowacki"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
 msgid "Slovak (extended Backslash)"
 msgstr "Słowacki (rozszerzony backslash)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
 msgid "Slovak (qwerty)"
 msgstr "Słowacki (QWERTY)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Słowacki (QWERTY, rozszerzony Backslash)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
 msgid "Slovenian"
 msgstr "Słoweński"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Słoweński (klawiatura US z literami słoweńskimi)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Słoweński (używanie cudzysłowów do cytowania)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Dvorak)"
 msgstr "Hiszpański (Dvoraka)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American)"
 msgstr "Hiszpański (Ameryka Łacińska)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Hiszpański (Ameryka Łacińska, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Hiszpański (Ameryka Łacińska, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Hiszpański (Ameryka Łacińska, ze znakiem tyldy)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (Macintosh)"
 msgstr "Hiszpański (Macintosh)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Spanish (Sun dead keys)"
 msgstr "Hiszpański (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Spanish (eliminate dead keys)"
 msgstr "Hiszpański (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Spanish (include dead tilde)"
 msgstr "Hiszpański (ze znakiem tyldy)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Klawisze specjalne (Ctrl+Alt+&lt;klawisz&gt;) obsługiwane przez serwer"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swahili (Kenya)"
 msgstr "Suahili (Kenia)"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swahili (Tanzania)"
 msgstr "Suahili (Tanzania)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Zamiana Ctrl i CapsLocka"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
 msgid "Swap ESC and Caps Lock"
 msgstr "Zamiana Esc i CapsLocka"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish"
 msgstr "Szwedzki"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (Dvorak)"
 msgstr "Szwedzki (Dvoraka)"
 
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:728
 msgid "Swedish (Macintosh)"
 msgstr "Szwedzki (Macintosh)"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
 msgid "Swedish (Svdvorak)"
 msgstr "Szwedzki (Svdvorak)"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:730
 msgid "Swedish (eliminate dead keys)"
 msgstr "Szwedzki (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:728
+#: ../rules/base.xml.in.h:731
 msgid "Swedish Sign Language"
 msgstr "Szwedzki migowy"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:732
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
 msgid "Syriac"
 msgstr "Syryjski"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
 msgid "Syriac (phonetic)"
 msgstr "Syryjski (fonetyczny)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
 msgid "Taiwanese"
 msgstr "Tajwański"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
 msgid "Taiwanese (indigenous)"
 msgstr "Tajwański (autochtoniczny)"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
 msgid "Tajik"
 msgstr "Tadżycki"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
 msgid "Tajik (legacy)"
 msgstr "Tadżycki (stary)"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
 msgid "Tamil"
 msgstr "Tamilski"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamilski (Sri Lanka, maszynistki TAB)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamilski (Sri Lanka, unikodowy)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamilski (maszynistki TAB)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamilski (maszynistki TSCII)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
 msgid "Tamil (Unicode)"
 msgstr "Tamilski (unikodowy)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamilski (klawiatura z cyframi)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
 msgid "Tatar"
 msgstr "Tatarski"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
 msgid "Thai"
 msgstr "Tajski"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
 msgid "Thai (Pattachote)"
 msgstr "Tajski (Pattachote)"
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:751
 msgid "Thai (TIS-820.2538)"
 msgstr "Tajski (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
 msgid "Tibetan"
 msgstr "Tybetański"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Tybetański (z liczbami ASCII)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Pod odpowiednimi klawiszami wg układu Dvoraka."
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Pod odpowiednimi klawiszami wg układu QWERTY."
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Przełączanie klawiszy kursorów przez Shift + NumLock."
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:758
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
 msgid "Tswana"
 msgstr "Tswana"
 
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:762
 msgid "Turkish"
 msgstr "Turecki"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (Alt-Q)"
 msgstr "Turecki (Alt-Q)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
 msgid "Turkish (F)"
 msgstr "Turecki (F)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
 msgid "Turkish (Sun dead keys)"
 msgstr "Turecki (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
 msgid "Turkish (international with dead keys)"
 msgstr "Turecki (międzynarodowy z klawiszami akcentów)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:767
 msgid "Turkmen"
 msgstr "Turkmeński"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmeński (Alt-Q)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:772
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (tryb 102/105:EU)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:773
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (tryb 106:JP)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:774
 msgid "Udmurt"
 msgstr "Udmurcki"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian"
 msgstr "Ukraiński"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukraiński (klawisze Win)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Ukraiński (homofoniczny)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (legacy)"
 msgstr "Ukraiński (stary)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
 msgid "Ukrainian (phonetic)"
 msgstr "Ukraiński (fonetyczny)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukraiński (standardowy RSTU)"
 
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
 msgid "Ukrainian (typewriter)"
 msgstr "Ukraiński (maszynistki)"
 
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:782
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Dodatki Unicode (strzałki i symbole matematyczne)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:783
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Dodatki Unicode (strzałki i symbole matematyczne). Symbole matematyczne na poziomie domyślnym"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:784
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (Pakistan)"
 msgstr "Urdu (Pakistan)"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (klawisze Win)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:789
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (alternatywny fonetyczny)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
 msgid "Urdu (phonetic)"
 msgstr "Urdu (fonetyczny)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Używanie diody na klawiaturze do sygnalizacji układu alternatywnego"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:792
 msgid "Using space key to input non-breakable space character"
 msgstr "Używanie klawisza spacji do wprowadzania znaku niełamliwej spacji"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:793
 msgid "Usual space at any level"
 msgstr "Zwykła spacja na dowolnym poziomie"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:794
 msgid "Uyghur"
 msgstr "Ujgurski"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek"
 msgstr "Uzbecki"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
 msgid "Uzbek (Afghanistan)"
 msgstr "Uzbecki (Afganistan)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Uzbecki (Afganistan, OLPC)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
 msgid "Uzbek (Latin)"
 msgstr "Uzbecki (łaciński)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
 msgid "Vietnamese"
 msgstr "Wietnamski"
 
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard"
 
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Klawiatura numeryczna Wang 724 z dodatkami Unicode (strzałki i symbole matematyczne)"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:802
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Klawiatura numeryczna Wang 724 z dodatkami Unicode (strzałki i symbole matematyczne). Symbole matematyczne na poziomie domyślnym"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:803
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
 msgid "Wolof"
 msgstr "Wolof"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
 msgid "Yakut"
 msgstr "Jakucki"
 
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
 msgid "Yoruba"
 msgstr "Joruba"
 
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2."
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:809
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2., znak niełamliwej spacji na poziomie 3."
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:810
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2., znak niełamliwej spacji na poziomie 3., nic na poziomie 4."
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:811
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2., znak niełamliwej spacji na poziomie 3., wąskiej niełamliwej spacji na poziomie 4."
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:812
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2., znak niełamliwej spacji na poziomie 3., znak łączący zerowej szerokości na poziomie 4."
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:813
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2., znak łączący zerowej szerokości na poziomie 3."
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:814
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 2., znak łączący zerowej szerokości na poziomie 3., znak niełamliwej spacji na poziomie 4."
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:815
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Znak rozdzielający zerowej szerokości na poziomie 3., znak łączący zerowej szerokości na poziomie 4."
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:816
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:817
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:820
 msgid "az"
 msgstr "AZ"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
 msgid "ca"
 msgstr "ca"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:831 ../rules/base.extras.xml.in.h:38
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:39
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:40
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:41
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:846 ../rules/base.extras.xml.in.h:42
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:849
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:852
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
+#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:43
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:858
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:863
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:867
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:871 ../rules/base.extras.xml.in.h:45
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:46
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:873
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:878
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:881
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:47
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
+#: ../rules/base.xml.in.h:888 ../rules/base.extras.xml.in.h:48
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:889 ../rules/base.extras.xml.in.h:49
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
+#: ../rules/base.xml.in.h:895 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:904
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:910
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:911
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:912
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
 msgid "zh"
 msgstr "zh"
 
@@ -3650,6 +3662,10 @@ msgstr "zh"
 msgid "APL Keyboard Symbols"
 msgstr "Symbole klawiatury APL"
 
+#: ../rules/base.extras.xml.in.h:3
+msgid "Armenian (OLPC phonetic)"
+msgstr "Armeński (fonetyczny OLPC)"
+
 #: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
 msgstr "Atsina"
@@ -3662,82 +3678,94 @@ msgstr "Awestyjski"
 msgid "Couer D'alene Salish"
 msgstr "Couer D'alene Salish"
 
-#: ../rules/base.extras.xml.in.h:8
+#: ../rules/base.extras.xml.in.h:7
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Krymskotatarski (Dobruja Q)"
+
+#: ../rules/base.extras.xml.in.h:9
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Angielski (USA, międzynarodowy, łączenie unikodu z AltGr)"
 
-#: ../rules/base.extras.xml.in.h:9
+#: ../rules/base.extras.xml.in.h:10
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Angielski (USA, międzynarodowy, łączenie unikodu z AltGr, alternatywny)"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:13
+msgid "German (US keyboard with German letters)"
+msgstr "Niemiecki (klawiatura US z literami niemieckimi)"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "Niemiecki (z literami węgierskimi, bez klawiszy akcentów)"
+
+#: ../rules/base.extras.xml.in.h:15
 msgid "Kutenai"
 msgstr "Kutenai"
 
-#: ../rules/base.extras.xml.in.h:13
+#: ../rules/base.extras.xml.in.h:17
 msgid "Latvian (US Colemak)"
 msgstr "Łotewski (USA, Colemak)"
 
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:18
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Łotewski (USA, Colemak, wariant z apostrofem)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:19
 msgid "Latvian (US Dvorak)"
 msgstr "Łotewski (USA, Dvoraka)"
 
-#: ../rules/base.extras.xml.in.h:16
+#: ../rules/base.extras.xml.in.h:20
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Łotewski (USA, Dvoraka, wariant Y)"
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Łotewski (USA, Dvoraka, wariant minus)"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Łotewski (USA, Dvoraka programisty)"
 
-#: ../rules/base.extras.xml.in.h:19
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Łotewski (USA, Dvoraka programisty, wariant Y)"
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Łotewski (USA, Dvoraka programisty, wariant minus)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:26
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Litewski (USA, Dvoraka z literami litewskimi)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:29
 msgid "Polish (international with dead keys)"
 msgstr "Polski (międzynarodowy z klawiszami akcentów)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:31
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Rumuński (ergonomiczny Touchtype)"
 
-#: ../rules/base.extras.xml.in.h:29
-msgid "Russian (with UKR and BEL layout)"
-msgstr "Rosyjski (z układem UKR i BEL)"
+#: ../rules/base.extras.xml.in.h:33
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "Rosyjski (z układem ukraińsko-białoruskim)"
 
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:34
 msgid "Secwepemctsin"
 msgstr "Shuswap"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Serbski (łączenie akcentów zamiast klawiszy akcentów)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "apl"
 msgstr "apl"
 
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:44
 msgid "kut"
 msgstr "kut"
 
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:50
 msgid "shs"
 msgstr "shs"
diff --git a/dist/xkeyboard-config/po/ru.po b/dist/xkeyboard-config/po/ru.po
index 969b8451e..357a67d6a 100644
--- a/dist/xkeyboard-config/po/ru.po
+++ b/dist/xkeyboard-config/po/ru.po
@@ -10,10 +10,10 @@
 # Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.3\n"
+"Project-Id-Version: xkeyboard-config 2.3.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-17 21:08+0100\n"
-"PO-Revision-Date: 2011-05-23 19:15+0400\n"
+"POT-Creation-Date: 2011-09-15 21:25+0100\n"
+"PO-Revision-Date: 2011-09-17 17:06+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"
@@ -219,7 +219,7 @@ msgstr "Армянская"
 msgid "Armenian (alternative eastern)"
 msgstr "Армянская (альтернативная восточная)"
 
-#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:50
 msgid "Armenian (alternative phonetic)"
 msgstr "Армянская (альтернативная фонетическая)"
 
@@ -380,3277 +380,3289 @@ msgid "Bengali"
 msgstr "Бенгальская"
 
 #: ../rules/base.xml.in.h:90
+msgid "Bengali (Baishakhi Inscript)"
+msgstr "Бенгальская (индийская письменность Baishakhi)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bengali (Baishakhi)"
+msgstr "Бенгальская (Baishakhi)"
+
+#: ../rules/base.xml.in.h:92
+msgid "Bengali (Bornona)"
+msgstr "Бенгальская (Bornona)"
+
+#: ../rules/base.xml.in.h:93
 msgid "Bengali (Probhat)"
 msgstr "Бенгальская (Probhat)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:94
+msgid "Bengali (Uni Gitanjali)"
+msgstr "Бенгальская (Uni Gitanjali)"
+
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Берберская (Марокко, тифинагская альтернативная фонетическая)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Берберская (Марокко, тифинагская альтернативная)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:97
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Берберская (Марокко, тифинагская расширенная фонетическая)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:98
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Берберская (Марокко, тифинагская расширенная)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:99
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Берберская (Марокко, тифинагская фонетическая)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:100
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Берберская (Марокко, тифинагская)"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian"
 msgstr "Боснийская"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:102
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Боснийская (клавиатура США с боснийскими диграфами)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:103
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Боснийская (клавиатура США с боснийскими буквами)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:104
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Боснийская (используются боснийские диграфы)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:105
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Боснийская (используются кавычки ёлочки как кавычки)"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Обе клавиши Alt, нажатые вместе"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Обе клавиши Ctrl, нажатые вместе"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Обе клавиши Shift, нажатые вместе"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:109
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Обе клавиши Shift, нажатые вместе, включают Caps Lock, одна клавиша Shift выключает"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:110
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Обе клавиши Shift, нажатые вместе, переключают Caps Lock"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:111
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Обе клавиши Shift, нажатые вместе, переключают ShiftLock"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:112
 msgid "Braille"
 msgstr "Брайля"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:113
 msgid "Braille (left hand)"
 msgstr "Брайля (под левую руку)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:114
 msgid "Braille (right hand)"
 msgstr "Брайля (под правую руку)"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:115
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:116
 msgid "Bulgarian"
 msgstr "Болгарская"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:117
 msgid "Bulgarian (new phonetic)"
 msgstr "Болгарская (новая фонетическая)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:118
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Болгарская (традиционная фонетическая)"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:119
 msgid "Burmese"
 msgstr "Бирманская"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:120
+msgid "Cameroon Multilingual (azerty)"
+msgstr "Камерунская многоязыковая (azerty)"
+
+#: ../rules/base.xml.in.h:121
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "Камерунская многоязыковая (qwerty)"
+
+#: ../rules/base.xml.in.h:122
 msgid "Canadian Multilingual"
 msgstr "Канадская многоязыковая"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:123
 msgid "Canadian Multilingual (first part)"
 msgstr "Канадская многоязыковая (первая часть)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:124
 msgid "Canadian Multilingual (second part)"
 msgstr "Канадская многоязыковая (вторая часть)"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr "Caps Lock (выбирается 3-й ряд, защёлкивается при нажатии вместе с другим выборщиком-3-го-ряда)"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Caps Lock (на первую раскладку), Shift+Caps Lock (на последнюю раскладку)"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Caps Lock (пока нажата), Alt+Caps Lock выполняет первоначальную функцию capslock"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock действует как Shift с блокировкой. Shift приостанавливает действие Caps Lock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock действует как Shift с блокировкой. Shift не влияет на Caps Lock"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:131
+msgid "Caps Lock as Ctrl"
+msgstr "Caps Lock как Ctrl"
+
+#: ../rules/base.xml.in.h:132
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock выключен"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:133
 msgid "Caps Lock key behavior"
 msgstr "Поведение клавиши Caps Lock"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:134
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Caps Lock переключает Shift, таким образом что, он действует сразу на все клавиши"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:135
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock переключает обычную капитализацию символов алфавита"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:136
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock включает внутреннюю капитализацию. Shift приостанавливает действие Caps Lock"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:137
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock включает внутреннюю капитализацию. Shift не влияет на Caps Lock"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:138
 msgid "Catalan"
 msgstr "Каталонская"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:139
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Каталонская (испанский вариант с точкой в L посередине)"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:140
 msgid "Cherokee"
 msgstr "Черокская"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:141
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:142
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:143
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (альтернативный вариант)"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:144
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:145
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:146
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:147
 msgid "Cherry CyMotion Master XPress"
 msgstr " Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:148
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:149
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:150
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:151
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:152
 msgid "Chinese"
 msgstr "Китайская"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:153
 msgid "Chuvash"
 msgstr "Чувашия"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:154
 msgid "Chuvash (Latin)"
 msgstr "Чувашская (латиница)"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:155
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:156
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 клавиш)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 клавиш)"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:160
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 клавиш)"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:161
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:162
 msgid "Compose key position"
 msgstr "Положение клавиши Compose"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
-#: ../rules/base.xml.in.h:157
+#: ../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:158
+#: ../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:159
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:160
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "Крымско-татарская (Dobruja Q)"
-
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Крымско-татарская (турецкая Alt-Q)"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Крымско-татарская (турецкая F)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Крымско-татарская (турецкая Q)"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Croatian"
 msgstr "Хорватская"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Хорватская (клавиатура США с хорватскими диграфами)"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:172
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Хорватская (клавиатура США с хорватскими буквами)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Хорватская (используются хорватские диграфы)"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:174
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Хорватская (используются кавычки ёлочки как кавычки)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:175
 msgid "Ctrl key position"
 msgstr "Положение клавиши Ctrl"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:176
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:177
 msgid "Czech"
 msgstr "Чешская"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Чешская (раскладка UCW, только символы акцентов)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Чешская (Дворак США с поддержкой CZ UCW)"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:180
 msgid "Czech (qwerty)"
 msgstr "Чешская (qwerty)"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:181
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Чешская (qwerty, расширенные функции Backslash)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Чешская (с клавишей &lt;\\|&gt;)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Danish"
 msgstr "Датская"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Danish (Dvorak)"
 msgstr "Датская (Дворак)"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Danish (Macintosh)"
 msgstr "Датская (Macintosh)"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Датская (Macintosh, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Danish (eliminate dead keys)"
 msgstr "Датская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Default numeric keypad keys"
 msgstr "Клавиши цифровой клавиатуры по умолчанию"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell 101-key PC"
 msgstr "Dell 101-клавишный PC"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Ноутбук Dell Inspiron из серий 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Ноутбук Dell Precision из серии M"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dell Latitude series laptop"
 msgstr "Ноутбук Dell из серии Latitude"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:197
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dhivehi"
 msgstr "Дивехи"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Diamond 9801 / 9802 series"
 msgstr "Модели Diamond 9801/9802"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
 msgid "Dutch"
 msgstr "Голландская"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:203
 msgid "Dutch (Macintosh)"
 msgstr "Голландская (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:204
 msgid "Dutch (Sun dead keys)"
 msgstr "Голландская (спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:205
 msgid "Dutch (standard)"
 msgstr "Голландская (стандартная)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:206
 msgid "Dzongkha"
 msgstr "Дзонг-кэ (dz"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:207
 msgid "Enable extra typographic characters"
 msgstr "Включить дополнительные типографские символы"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:208
 msgid "English (Cameroon Dvorak)"
 msgstr "Английская (камерунский Дворак)"
 
-#: ../rules/base.xml.in.h:203
-msgid "English (Cameroon qwerty)"
-msgstr "Английская (камерунская qwerty)"
-
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:209
 msgid "English (Cameroon)"
 msgstr "Английская (Камерун)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:210
 msgid "English (Canada)"
 msgstr "Английская (Канада)"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:211
 msgid "English (Colemak)"
 msgstr "Английская (Коулмак)"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:212
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Английская (Дворак альтернативная международная (без спец. клавиш))"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:213
 msgid "English (Dvorak international with dead keys)"
 msgstr "Английская (Дворак международная с спец. клавишами)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:214
 msgid "English (Dvorak)"
 msgstr "Английская (Дворак)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:215
 msgid "English (Ghana)"
 msgstr "Английская (Гана)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:216
 msgid "English (Ghana, GILLBT)"
 msgstr "Английская (Гана, GILLBT)"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:217
 msgid "English (Ghana, multilingual)"
 msgstr "Английская (Гана, международная)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:218
 msgid "English (India, with RupeeSign)"
 msgstr "Английская (Индия, с знаком индийской рупии)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:219
 msgid "English (Macintosh)"
 msgstr "Английская (Macintosh)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:220
 msgid "English (Mali, US Macintosh)"
 msgstr "Английская (Мали, Macintosh США)"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:221
 msgid "English (Mali, US international)"
 msgstr "Английская (Мали, международная США)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:222
 msgid "English (Nigeria)"
 msgstr "Английская (Нигерия)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:223
 msgid "English (South Africa)"
 msgstr "Английская (Южная Африка)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:224
 msgid "English (UK)"
 msgstr "Английская (Великобритания)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:225
 msgid "English (UK, Colemak)"
 msgstr "Английская (Великобритания, Коулмак)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Английская (Великобритания, Дворак с английской пунктуацией)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:227
 msgid "English (UK, Dvorak)"
 msgstr "Английская (Великобритания, Дворак)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:228
 msgid "English (UK, Macintosh international)"
 msgstr "Английская (Великобритания, Macintosh международная)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:229
 msgid "English (UK, Macintosh)"
 msgstr "Английская (Великобритания, Macintosh)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:230
 msgid "English (UK, extended WinKeys)"
 msgstr "Английская (Великобритания, расширенная клавишами Win)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:231
 msgid "English (UK, international with dead keys)"
 msgstr "Английская (Великобритания, международная с спец. клавишами (dead keys))"
 
-#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:232 ../rules/base.extras.xml.in.h:8
 msgid "English (US)"
 msgstr "Английская (США)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:233
 msgid "English (US, alternative international)"
 msgstr "Английская (США, альтернативная международная)"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:234
 msgid "English (US, international with dead keys)"
 msgstr "Английская (США, международная с спец. клавишами (dead keys))"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:235
 msgid "English (US, with euro on 5)"
 msgstr "Английская (США, международная с символом евро на клавише 5)"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:236
 msgid "English (classic Dvorak)"
 msgstr "Английская (классическая Дворак)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:237
 msgid "English (international AltGr dead keys)"
 msgstr "Английская (международная с AltGr и спец. клавишами (dead keys))"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:238
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Английская (переключение раскладки по клавише умножения/деления)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:239
 msgid "English (left handed Dvorak)"
 msgstr "Английская (Дворак под левую руку)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:240
 msgid "English (programmer Dvorak)"
 msgstr "Английская (Дворак для программистов)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:241
 msgid "English (right handed Dvorak)"
 msgstr "Английская (Дворак под правую руку)"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:242
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:243
 msgid "Enter on keypad"
 msgstr "Enter на цифровой клавиатуре"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:244
 msgid "Esperanto"
 msgstr "Эсперанто"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:245
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Эсперанто (Португалия, Nativo)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:246
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Эсперанто (смещённые точка с запятой и кавычка, устарела)"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:247
 msgid "Estonian"
 msgstr "Эстонская"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:248
 msgid "Estonian (Dvorak)"
 msgstr "Эстонская (Дворак)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:249
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Эстонская (клавиатура США с эстонскими буквами)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:250
 msgid "Estonian (eliminate dead keys)"
 msgstr "Эстонская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:251
 msgid "Euro on 2"
 msgstr "Символ евро на клавише 2"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:252
 msgid "Euro on 4"
 msgstr "Символ евро на клавише 4"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:253
 msgid "Euro on 5"
 msgstr "Символ евро на клавише 5"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:254
 msgid "Euro on E"
 msgstr "Символ евро на клавише E"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:255
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:256
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:257
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:258
 msgid "Faroese"
 msgstr "Фарерская"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:259
 msgid "Faroese (eliminate dead keys)"
 msgstr "Фарерская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:260
 msgid "Filipino"
 msgstr "Филиппинская"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Филиппинская (Кэйпвелл-Дворак байбайинcкая)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:262
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Филиппинская (Кэйпвелл-Дворак латиница)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Филиппинская (Кэйпвелл-QWERF 2006 байбайинская)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Филиппинская (Кэйпвелл-QWERF 2006 латиница)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:265
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Филиппинская (Коулмак байбайинская)"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:266
 msgid "Filipino (Colemak Latin)"
 msgstr "Филиппинская (Коулмак латиница)"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:267
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Филиппинская (Дворак байбайинcкая)"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:268
 msgid "Filipino (Dvorak Latin)"
 msgstr "Филиппинская (Дворак латиница)"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:269
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Филиппинская (QWERTY байбайинская)"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:270
 msgid "Finnish"
 msgstr "Финская"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:271
 msgid "Finnish (Macintosh)"
 msgstr "Финская (Macintosh)"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:272
 msgid "Finnish (classic)"
 msgstr "Финская (классическая)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:273
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Финская (классическая, без спец. клавиш (dead keys))"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:276
 msgid "Four-level key with abstract separators"
 msgstr "Четырёх-рядная клавиша с абстрактными разделителями"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:277
 msgid "Four-level key with comma"
 msgstr "Четырёх-рядная клавиша с запятой"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:278
 msgid "Four-level key with dot"
 msgstr "Четырёх-рядная клавиша с точкой"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:279
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Четырёх-рядная клавиша с точкой, ограничена latin-9"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:280
 msgid "Four-level key with momayyez"
 msgstr "Четырёх-рядная клавиша с momayyez"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:281
 msgid "French"
 msgstr "Французская"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:282
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Французская (Бепо, эргономичная, похожая на Дворак)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:283
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Французская (Бепо, эргономичная, похожая на Дворак, только latin-9)"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:284
 msgid "French (Breton)"
 msgstr "Французская (бретонская)"
 
-#: ../rules/base.xml.in.h:280
-msgid "French (Cameroon azerty)"
-msgstr "Французская (камерунская azerty)"
-
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:285
 msgid "French (Cameroon)"
 msgstr "Французская (Камерун)"
 
-#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:286 ../rules/base.extras.xml.in.h:11
 msgid "French (Canada)"
 msgstr "Французская (Канада)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:287
 msgid "French (Canada, Dvorak)"
 msgstr "Французская (Канада, Дворак)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:288
 msgid "French (Canada, legacy)"
 msgstr "Французская (Канада, устаревшая)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:289
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Французская (Демократическая республика Конго)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:290
 msgid "French (Dvorak)"
 msgstr "Французская (Дворак)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:291
 msgid "French (Guinea)"
 msgstr "Французская (Гвинея)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:292
 msgid "French (Macintosh)"
 msgstr "Французская (Macintosh)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:293
 msgid "French (Mali, alternative)"
 msgstr "Французская (Мали, альтернативная)"
 
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:294
 msgid "French (Morocco)"
 msgstr "Французская (Марокко)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:295
 msgid "French (Sun dead keys)"
 msgstr "Французская (со спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:296
 msgid "French (Switzerland)"
 msgstr "Французская (Швейцария)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:297
 msgid "French (Switzerland, Macintosh)"
 msgstr "Французская (Швейцария, Macintosh)"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:298
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Французская (Швейцария, спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:299
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Французская (Швейцария, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:300
 msgid "French (alternative)"
 msgstr "Французская (альтернативная)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:301
 msgid "French (alternative, Sun dead keys)"
 msgstr "Французская (альтернативная, спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:302
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Французская (альтернативная, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:303
 msgid "French (alternative, latin-9 only)"
 msgstr "Французская (альтернативная, только latin-9)"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:304
 msgid "French (eliminate dead keys)"
 msgstr "Французская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:305
 msgid "French (legacy, alternative)"
 msgstr "Французская (устаревшая, альтернативная)"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:306
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Французская (устаревшая, альтернативная, с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:307
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Французская (устаревшая, альтернативная, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:308
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Ноутбук Fujitsu-Siemens Computers AMILO"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:309
 msgid "Fula"
 msgstr "Фулайская"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:310
 msgid "Ga"
 msgstr "Гайская"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:311
 msgid "Generic 101-key PC"
 msgstr "Обычная 101-клавишная"
 
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:312
 msgid "Generic 102-key (Intl) PC"
 msgstr "Обычная 102-клавишная (межд)"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:313
 msgid "Generic 104-key PC"
 msgstr "Обычная 104-клавишная"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:314
 msgid "Generic 105-key (Intl) PC"
 msgstr "Обычная 105-клавишная (межд)"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:315
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:316
 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:313
+#: ../rules/base.xml.in.h:317
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:318
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:319
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:320
 msgid "Georgian"
 msgstr "Грузинская"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:321
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Грузинская (Франция, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:322
 msgid "Georgian (Italy)"
 msgstr "Грузинская (Италия)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:323
 msgid "Georgian (MESS)"
 msgstr "Грузинская (MESS)"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:324
 msgid "Georgian (ergonomic)"
 msgstr "Georgian (эргономичная)"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:325 ../rules/base.extras.xml.in.h:12
 msgid "German"
 msgstr "Немецкая"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:326
 msgid "German (Austria)"
 msgstr "Немецкая (Австрия)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:327
 msgid "German (Austria, Macintosh)"
 msgstr "Немецкая (Австрия, Macintosh)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:328
 msgid "German (Austria, Sun dead keys)"
 msgstr "Немецкая (Австрия, с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:329
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Немецкая (Австрия, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:330
 msgid "German (Dvorak)"
 msgstr "Немецкая (Дворак)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:331
 msgid "German (Macintosh)"
 msgstr "Немецкая (Macintosh)"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:332
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Немецкая (Macintosh, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:333
 msgid "German (Neo 2)"
 msgstr "Немецкая (Neo 2)"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:334
 msgid "German (Sun dead keys)"
 msgstr "Немецкая (со спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:335
 msgid "German (Switzerland)"
 msgstr "Немецкая (Швейцария)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:336
 msgid "German (Switzerland, Macintosh)"
 msgstr "Немецкая (Швейцария, Macintosh)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:337
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Немецкая (Швейцария, с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:338
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Немецкая (Швейцария, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:339
 msgid "German (Switzerland, legacy)"
 msgstr "Немецкая (Швейцария, устаревшая)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:340
 msgid "German (dead acute)"
 msgstr "Немецкая (с акутом (dead acute))"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:341
 msgid "German (dead grave acute)"
 msgstr "Немецкая (с dead grave acute)"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:342
 msgid "German (eliminate dead keys)"
 msgstr "Немецкая (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:339
-msgid "German (qwerty)"
-msgstr "Немецкая (qwerty)"
-
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:343
 msgid "Greek"
 msgstr "Греческая"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:344
 msgid "Greek (eliminate dead keys)"
 msgstr "Греческая (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:345
 msgid "Greek (extended)"
 msgstr "Греческая (расширенная)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:346
 msgid "Greek (polytonic)"
 msgstr "Греческая (полифоническая)"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:347
 msgid "Greek (simple)"
 msgstr "Греческая (простая)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:348
 msgid "Gujarati"
 msgstr "Гуджарати"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:349
 msgid "Gyration"
 msgstr "Гирашн"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:350
 msgid "HTC Dream"
 msgstr "HTC Dream"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:351
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:352
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking Keyboard для Mac"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:353
 msgid "Hausa"
 msgstr "Хауза"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:354
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:355
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Иврит (библейский, Tiro)"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:356
 msgid "Hebrew (lyx)"
 msgstr "Иврит (lyx)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:357
 msgid "Hebrew (phonetic)"
 msgstr "Иврит (фонетическая)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Ноутбук Hewlett-Packard Mini 110"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:367
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:368
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:369
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:370
 msgid "Hexadecimal"
 msgstr "Шестнадцатеричная"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:371
 msgid "Hindi (Bolnagri)"
 msgstr "Хинди (Bolnagri)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:372
 msgid "Hindi (Wx)"
 msgstr "Хинди (Wx)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:373
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:374
 msgid "Htc Dream phone"
 msgstr "телефон Htc Dream"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian"
 msgstr "Венгерская"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Венгерская (pc101/qwerty/запятая/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Венгерская (pc101/qwerty/запятая/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Венгерская (pc101/qwerty/точка/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Венгерская (pc101/qwerty/точка/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Венгерская (101/qwertz/запятая/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Венгерская (101/qwertz/запятая/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Венгерская (101/qwertz/точка/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Венгерская (101/qwertz/точка/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Венгерская (102/qwerty/запятая/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Венгерская (102/qwerty/запятая/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Венгерская (102/qwerty/точка/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Венгерская (102/qwerty/точка/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Венгерская (102/qwertz/запятая/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Венгерская (102/qwertz/запятая/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Венгерская (102/qwertz/точка/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Венгерская (102/qwertz/точка/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:392
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Венгерская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:393
 msgid "Hungarian (qwerty)"
 msgstr "Венгерская (qwerty)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:394
 msgid "Hungarian (standard)"
 msgstr "Венгерская (стандартная)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:395
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper соответствует клавишам Win"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:396
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:397
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:398
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:399
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:400
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:401
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic"
 msgstr "Исландская"
 
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (Dvorak)"
 msgstr "Исландская (Дворак)"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:404
 msgid "Icelandic (Macintosh)"
 msgstr "Исландская (Macintosh)"
 
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:405
 msgid "Icelandic (Sun dead keys)"
 msgstr "Исландская (спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:406
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Исландская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:407
 msgid "Igbo"
 msgstr "Игбо"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:408
 msgid "Indian"
 msgstr "Индийская"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:409
 msgid "Inuktitut"
 msgstr "Иннуитская"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:410
 msgid "Iraqi"
 msgstr "Иракская"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:411
 msgid "Irish"
 msgstr "Ирландская"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:412
 msgid "Irish (UnicodeExpert)"
 msgstr "Ирландская (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:413
 msgid "Italian"
 msgstr "Итальянская"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:414
 msgid "Italian (Macintosh)"
 msgstr "Итальянская (Macintosh)"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:415
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Итальянская (клавиатура США с итальянскими буквами)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:416
 msgid "Italian (eliminate dead keys)"
 msgstr "Итальянская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:417
 msgid "Japanese"
 msgstr "Японская"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (Kana 86)"
 msgstr "Японская (Кана 86)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (Kana)"
 msgstr "Японская (Кана)"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:420
 msgid "Japanese (Macintosh)"
 msgstr "Японская (Macintosh)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:421
 msgid "Japanese (OADG 109A)"
 msgstr "Японская (OADG 109A)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:422
 msgid "Japanese (PC-98xx Series)"
 msgstr "Японская (PC-98xx Series)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:423
 msgid "Japanese keyboard options"
 msgstr "Настройки японской клавиатуры"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:424
 msgid "Kalmyk"
 msgstr "Калмыкская"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:425
 msgid "Kana Lock key is locking"
 msgstr "Кана блокируется клавишей Lock"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:426
 msgid "Kannada"
 msgstr "Каннада"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:427
 msgid "Kashubian"
 msgstr "Кашубская"
 
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:428
 msgid "Kazakh"
 msgstr "Казахская"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:429
 msgid "Kazakh (with Russian)"
 msgstr "Казахская (с русским)"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:430
 msgid "Key sequence to kill the X server"
 msgstr "Комбинация клавиш для прерывания работы X-сервера"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:431
 msgid "Key to choose 3rd level"
 msgstr "Клавиша для выбора 3-го ряда"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:432
 msgid "Key to choose 5th level"
 msgstr "Клавиша для выбора 5-го ряда"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:433
 msgid "Key(s) to change layout"
 msgstr "Клавиша(и) для смены раскладки"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:434
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:435
 msgid "Khmer (Cambodia)"
 msgstr "Кхмерская (Камбоджа)"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:436
 msgid "Kikuyu"
 msgstr "Кикуйу"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:437
 msgid "Kinesis"
 msgstr "Kinesis"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:438
 msgid "Komi"
 msgstr "Комякская"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:439
 msgid "Korean"
 msgstr "Корейская"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:440
 msgid "Korean (101/104 key compatible)"
 msgstr "Корейская (совместимая c 101/104 кнопочной)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Курдская (Иран, арабо-латинская)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iran, F)"
 msgstr "Курдская (Иран, F)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Курдская (Иран, латинская Alt-Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Курдская (Иран, латинская Q)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Курдская (Ирак, арабо-латинская)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Iraq, F)"
 msgstr "Курдская (Ирак, F)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Курдская (Ирак, латинская alt-Q)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Курдская (Ирак, латинская Q)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Syria, F)"
 msgstr "Курдская (Сирия, F)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Курдская (Сирия, латинская Alt-Q)"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Курдская (Сирия, латинская Q)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:452
 msgid "Kurdish (Turkey, F)"
 msgstr "Курдская (Турция, F)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:453
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Курдская (Турция, латинская Alt-Q)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:454
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Курдская (Турция, латинская Q)"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:455
 msgid "Kyrgyz"
 msgstr "Киргизская"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:456
 msgid "Kyrgyz (phonetic)"
 msgstr "Киргизская (фонетическая)"
 
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:457
 msgid "Lao"
 msgstr "Лаосская"
 
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:458
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Лаосская (стандартная раскладка, предложенная STEA)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:459
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Клавиатура ноутбука Compaq (например, Armada)"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:460
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "«Интернет-клавиатура» ноутбука Compaq (например, Presario)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:461
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Ноутбук eMachines из серии m68xx"
 
-#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+#: ../rules/base.xml.in.h:462 ../rules/base.extras.xml.in.h:16
 msgid "Latvian"
 msgstr "Латышская"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:463
 msgid "Latvian (F variant)"
 msgstr "Латышская (вариант с F)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:464
 msgid "Latvian (adapted)"
 msgstr "Латышская (адаптированная)"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:465
 msgid "Latvian (apostrophe variant)"
 msgstr "Латышская (вариант с апострофом)"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:466
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Латышская (эргономичная, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:467
 msgid "Latvian (modern)"
 msgstr "Латышская (современная)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:468
 msgid "Latvian (tilde variant)"
 msgstr "Латышская (вариант с тильдой)"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:469
 msgid "Left Alt"
 msgstr "Левая клавиша Alt"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:470
 msgid "Left Alt (while pressed)"
 msgstr "Левая клавиша Alt (пока нажата)"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:471
 msgid "Left Alt is swapped with Left Win"
 msgstr "Левая клавиша Alt поменяна местами с левой клавишей Win"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:472
 msgid "Left Ctrl"
 msgstr "Левая клавиша Ctrl"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:473
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Левая Ctrl (на первую раскладку), Правая Ctrl (на последнюю раскладку)"
 
-#: ../rules/base.xml.in.h:471
+#: ../rules/base.xml.in.h:474
+msgid "Left Ctrl as Meta"
+msgstr "Левая клавиша Ctrl как Meta"
+
+#: ../rules/base.xml.in.h:475
 msgid "Left Ctrl+Left Shift"
 msgstr "Левая Ctrl+Левая Shift"
 
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:476
 msgid "Left Shift"
 msgstr "Левая клавиша Shift"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:477
 msgid "Left Win"
 msgstr "Левая клавиша Win"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:478
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Левая Win (на первую раскладку), Правая Win/Menu (на последнюю раскладку)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:479
 msgid "Left Win (while pressed)"
 msgstr "Левая клавиша Win (пока нажата)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:480
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "По левой клавише Win выбирается 5-й ряд, блокирует, блокирует при нажатии вместе с другим выборщиком-5-го-ряда"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:481
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "По левой клавише Win выбирается 5-й ряд, блокирует, блокирует при нажатии вместе с другим выборщиком-5-го-ряда, однократное нажатие снимает блокировку"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:482
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Левая-Ctrl+Левая-Win (на первую раскладку), Правая-Ctrl+Menu (на вторую раскладку)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:483
 msgid "Legacy"
 msgstr "Legacy"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:484
 msgid "Legacy Wang 724"
 msgstr "Старая Wang 724"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:486
 msgid "Legacy key with comma"
 msgstr "Клавиша Legacy с запятой"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:487
 msgid "Legacy key with dot"
 msgstr "Клавиша Legacy с точкой"
 
-#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+#: ../rules/base.xml.in.h:488 ../rules/base.extras.xml.in.h:25
 msgid "Lithuanian"
 msgstr "Литовская"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Литовская (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:490
 msgid "Lithuanian (LEKP)"
 msgstr "Литовская (LEKP)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:491
 msgid "Lithuanian (LEKPa)"
 msgstr "Литовская (LEKPa)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:492
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Литовская (клавиатура США с литовскими буквами)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:493
 msgid "Lithuanian (standard)"
 msgstr "Литовская (стандартная)"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Access Keyboard"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop (альтернативный вариант)"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:500
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro (альтернативный вариант 2)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:504
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Дополнительные клавиши Logitech G15 с помощью службы G15"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech Generic Keyboard"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Logitech Internet 350 Keyboard"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:508
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:509
 msgid "Logitech Media Elite Keyboard"
 msgstr "Logitech Media Elite Keyboard"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:510
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:511
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Logitech Ultra-X Keyboard"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:512
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Logitech diNovo Edge Keyboard"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:513
 msgid "Logitech diNovo Keyboard"
 msgstr "Logitech diNovo Keyboard"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:514
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:515
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (модель Y-RB6)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:516
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:517
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:518
 msgid "Lower Sorbian"
 msgstr "Нижнелужицкая"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:519
 msgid "Lower Sorbian (qwertz)"
 msgstr "Нижнелужицкая (qwertz)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:520
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:521
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (межд)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:522
 msgid "Macedonian"
 msgstr "Македонская"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:523
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Македонская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:524
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:525
 msgid "Macintosh Old"
 msgstr "Старый Macintosh"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Использовать Caps Lock как дополнительную клавишу Backspace"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Использовать Caps Lock как дополнительную клавишу Control, но сохранить символ клавиши Caps_Lock"
 
-#: ../rules/base.xml.in.h:524
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Использовать Caps Lock как дополнительную клавишу Ctrl"
-
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional ESC"
 msgstr "Использовать Caps Lock как дополнительную клавишу ESC"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:529
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Использовать Caps Lock как дополнительную клавишу Hyper"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:530
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Использовать Caps Lock как дополнительную клавишу Num Lock"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:531
 msgid "Make Caps Lock an additional Super"
 msgstr "Использовать Caps Lock как дополнительную клавишу Super"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:532
 msgid "Malayalam"
 msgstr "Малайaлам"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:533
 msgid "Malayalam (Lalitha)"
 msgstr "Малайaламская (лалита)"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:534
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Малайaламская (улучшенный Inscript со символом рупии)"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:535
 msgid "Maltese"
 msgstr "Мальтийская"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:536
 msgid "Maltese (with US layout)"
 msgstr "Мальтийская (с раскладкой США)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:537
 msgid "Maori"
 msgstr "Маори"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:538
 msgid "Mari"
 msgstr "Марийская"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:539
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:540
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:541
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:542
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:543
+msgid "Menu as Right Ctrl"
+msgstr "Menu как правая клавиша Ctrl"
+
+#: ../rules/base.xml.in.h:544
 msgid "Meta is mapped to Left Win"
 msgstr "Meta соответствует левой клавише Win"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:545
 msgid "Meta is mapped to Win keys"
 msgstr "Meta соответствует клавишам Win"
 
-#: ../rules/base.xml.in.h:542
-msgid "Meta on Left Ctrl"
-msgstr "Meta на левой клавише Ctrl"
-
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve Keyboard 2000"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, шведская"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:550
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural Keyboard Elite"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:553
 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:551
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:555
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:556
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:557
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:558
 msgid "Miscellaneous compatibility options"
 msgstr "Разные параметры совместимости"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:559
 msgid "Mongolian"
 msgstr "Монгольская"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin"
 msgstr "Черногорская"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:561
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Черногорская (кириллица с кавычками ёлочками)"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:562
 msgid "Montenegrin (Cyrillic)"
 msgstr "Черногорская (кириллица)"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:563
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Черногорская (кириллица, З и Ж переставлены местами)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Черногорская (латинская юникодная qwerty)"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:565
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Черногорская (латинская юникодная)"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:566
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Черногорская (латинская qwerty)"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:567
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Черногорская (латинская с кавычками ёлочками)"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:568
 msgid "NICOLA-F style Backspace"
 msgstr "Backspace в стиле NICOLA-F"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:569
 msgid "Nepali"
 msgstr "Непальская"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at fourth level"
 msgstr "Символ неразрывного пробела в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Символ неразрывного пробела в четвёртом ряду, символ тонкого неразрывного пробела в шестом ряду"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:572
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Символ неразрывного пробела в четвёртом ряду, символ тонкого неразрывного пробела в шестом ряду (с помощью Ctrl+Shift)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at second level"
 msgstr "Символ неразрывного пробела во втором ряду"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:574
 msgid "Non-breakable space character at third level"
 msgstr "Символ неразрывного пробела в третьем ряду"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:575
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Символ неразрывного пробела в третьем ряду, ничего на четвёртом"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:576
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Символ неразрывного пробела в третьем ряду, символ тонкого неразрывного пробела в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:577
 msgid "Northern Saami (Finland)"
 msgstr "Северная Саамская (Финляндия)"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:578
 msgid "Northern Saami (Norway)"
 msgstr "Северная Саамская (Норвегия)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:579
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Северная Саамская (Норвегия, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:580
 msgid "Northern Saami (Sweden)"
 msgstr "Северная Саамская (Швеция)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:581
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:582
 msgid "Norwegian"
 msgstr "Норвежская"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (Dvorak)"
 msgstr "Норвежская (Дворак)"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:584
 msgid "Norwegian (Macintosh)"
 msgstr "Норвежская (Macintosh)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:585
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Норвежская (Macintosh, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:586
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Норвежская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:587
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:588
 msgid "Numeric keypad delete key behaviour"
 msgstr "Функция клавиши Delete на цифровой клавиатуре"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:589
 msgid "Numeric keypad keys work as with Macintosh"
 msgstr "Клавиши цифровой клавиатуры работают как в Macintosh"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:590
 msgid "Numeric keypad layout selection"
 msgstr "Выбор раскладки цифровой клавиатуры"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:591
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:592
 msgid "Occitan"
 msgstr "Окситанский"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:593
 msgid "Ogham"
 msgstr "Огхам"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:594
 msgid "Ogham (IS434)"
 msgstr "Огхам (IS434)"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:595
 msgid "Oriya"
 msgstr "Орийя"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:596
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Клавиатура Ortek MCK-800 MM/Internet"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:597
 msgid "Ossetian (Georgia)"
 msgstr "Осетинская (Грузия)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:598
 msgid "Ossetian (WinKeys)"
 msgstr "Осетинская (с клавишами Win)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:599
 msgid "Ossetian (legacy)"
 msgstr "Осетинская (устаревшая)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:600
 msgid "PC-98xx Series"
 msgstr "PC-98xx Series"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:601
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Паннонская русинская (омофоническая)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:602
 msgid "Pashto"
 msgstr "Пуштунская"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:603
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Пуштунская (Афганистан, OLPC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:604
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:27
 msgid "Persian"
 msgstr "Персидская"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:606
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Персидская (Афганистан, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:607
 msgid "Persian (with Persian Keypad)"
 msgstr "Персидская (с персидской доп. панелью)"
 
-#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:28
 msgid "Polish"
 msgstr "Польская"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:609
 msgid "Polish (Dvorak)"
 msgstr "Польская (Дворак)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:610
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Польская (Дворак, польские кавычки на клавише 1)"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:611
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Польская (Дворак, польские кавычки на клавишах с кавычками)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:612
 msgid "Polish (programmer Dvorak)"
 msgstr "Польская (Дворак для программистов)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:613
 msgid "Polish (qwertz)"
 msgstr "Польская (qwertz)"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese"
 msgstr "Португальская"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil)"
 msgstr "Португальская (Бразилия)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Португальская (Бразилия, Дворак)"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Португальская (Бразилия, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:618
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Португальская (Бразилия, nativo для эсперанто)"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:619
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Португальская (Бразилия, nativo для клавиатур США)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:620
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Португальская (Бразилия, nativo)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Macintosh)"
 msgstr "Португальская (Macintosh)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Португальская (Macintosh, спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Португальская (Macintosh, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Португальская (Nativo для клавиатур США)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:625
 msgid "Portuguese (Nativo)"
 msgstr "Португальская (Nativo)"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:626
 msgid "Portuguese (Sun dead keys)"
 msgstr "Португальская (спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:627
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Португальская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:628
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:629
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:630
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Пенджабская (гурмукхи Jhelum)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:631
 msgid "Punjabi (Gurmukhi)"
 msgstr "Пенджабская (гурмукхи)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:632
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt"
 msgstr "Правая клавиша Alt"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt (while pressed)"
 msgstr "Правая клавиша Alt (пока нажата)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:635
+msgid "Right Alt as Right Ctrl"
+msgstr "Правая клавиша Alt как правая клавиша Ctrl"
+
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "По правой клавише Alt выбирается 5-й ряд и активируется level5-Lock при нажатии вместе с другим выборщиком-5-го-ряда, однократное нажатие снимает блокировку"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:637
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "По правой клавише Alt выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:638
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "По правой клавише Alt выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда, однократное нажатие снимает блокировку"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:639
 msgid "Right Alt key never chooses 3rd level"
 msgstr "По правой клавише Alt никогда не выбирается третий ряд"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:640
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Правая клавиша Alt, Shift и правая Alt вместе работают как Multi_Key"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl"
 msgstr "Правая клавиша Ctrl"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:642
 msgid "Right Ctrl (while pressed)"
 msgstr "Правая клавиша Ctrl (пока нажата)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:643
 msgid "Right Ctrl as Right Alt"
 msgstr "Правая клавиша Ctrl работает как правая клавиша Alt"
 
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl is mapped to Menu"
-msgstr "Правая клавиша Ctrl соответствует клавише Menu"
-
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:644
 msgid "Right Ctrl+Right Shift"
 msgstr "Правая Ctrl+Правая Shift"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:645
 msgid "Right Shift"
 msgstr "Правая клавиша Shift"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:646
 msgid "Right Win"
 msgstr "Правая клавиша Win"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:647
 msgid "Right Win (while pressed)"
 msgstr "Правая клавиша Win (пока нажата)"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:648
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "По правой клавише Win выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:649
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "По правой клавише Win выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда, однократное нажатие снимает блокировку"
 
-#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+#: ../rules/base.xml.in.h:650 ../rules/base.extras.xml.in.h:30
 msgid "Romanian"
 msgstr "Румынская"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (Germany)"
 msgstr "Румынская (Германия)"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Румынская (Германия, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (WinKeys)"
 msgstr "Румынская (клавиши Win)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:654
 msgid "Romanian (cedilla)"
 msgstr "Румынская (седиль)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (standard cedilla)"
 msgstr "Румынская (стандартная седиль)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Румынская (стандартная)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:657
 msgid "Rupee on 4"
 msgstr "Символ рупии на клавише 4"
 
-#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:658 ../rules/base.extras.xml.in.h:32
 msgid "Russian"
 msgstr "Русская"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:659
 msgid "Russian (DOS)"
 msgstr "Русская (DOS)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Georgia)"
 msgstr "Русская (Грузия)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Germany, phonetic)"
 msgstr "Русская (Германия, фонетическая)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Русская (Казахстан, с казахской)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:663
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Русский (Польша, фонетический Дворак)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:664
 msgid "Russian (Sweden, phonetic)"
 msgstr "Русская (Швеция, фонетическая)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:665
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Русская (Швеция, фонетическая, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:666
 msgid "Russian (US, phonetic)"
 msgstr "Русская (США, фонетическая)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:667
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Русская (Украина, стандартная RSTU)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:668
 msgid "Russian (legacy)"
 msgstr "Русская (устаревшая)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:669
 msgid "Russian (phonetic WinKeys)"
 msgstr "Русская (фонетическая с клавишами Win)"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:670
 msgid "Russian (phonetic)"
 msgstr "Русская (фонетическая)"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:671
 msgid "Russian (typewriter)"
 msgstr "Русская (печатная машинка)"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:672
 msgid "Russian (typewriter, legacy)"
 msgstr "Русская (печатная машинка, устаревшая)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:673
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:674
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:675
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:676
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:677
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:678
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:679
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:680
 msgid "Saisiyat (Taiwan)"
 msgstr "Сайсьят (Тайвань)"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:681
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:682
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:683
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:684
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:685
 msgid "Semi-colon on third level"
 msgstr "Точка с запятой в третьем ряду"
 
-#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:686 ../rules/base.extras.xml.in.h:35
 msgid "Serbian"
 msgstr "Сербская"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Сербская (латинская юникодная qwerty)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin Unicode)"
 msgstr "Сербская (латинская юникодная)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:689
 msgid "Serbian (Latin qwerty)"
 msgstr "Сербская (латинская qwerty)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Latin with guillemets)"
 msgstr "Сербская (латинская с кавычками ёлочками)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (Latin)"
 msgstr "Сербская (латинская)"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:692
 msgid "Serbian (Russia)"
 msgstr "Сербская (Россия)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:693
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Сербская (З и Ж переставлены местами)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:694
 msgid "Serbian (with guillemets)"
 msgstr "Сербская (латинская с кавычками ёлочками)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:695
 msgid "Serbo-Croatian (US)"
 msgstr "Сербо-Хорватская (США)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:696
 msgid "Shift cancels Caps Lock"
 msgstr "Shift отменяет Caps Lock"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:697
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Shift не отменяет Num Lock, а выбирает третий ряд"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:698
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Клавиша Shift с клавишами цифровой клавиатуры работают также как в MS Windows"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:699
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:700
 msgid "Sindhi"
 msgstr "Синдхи"
 
-#: ../rules/base.xml.in.h:698
-msgid "Sinhala"
-msgstr "Сингальская"
+#: ../rules/base.xml.in.h:701
+msgid "Sinhala (phonetic)"
+msgstr "Сингальская (фонетическая)"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
 msgid "Slovak"
 msgstr "Словацкая"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
 msgid "Slovak (extended Backslash)"
 msgstr "Словацкая (расширенные функции Backslash)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
 msgid "Slovak (qwerty)"
 msgstr "Словацкая (qwerty)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Словацкая (qwerty, расширенные функции Backslash)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
 msgid "Slovenian"
 msgstr "Словенская"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Словенская (клавиатура США с словенскими буквами)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Словенская (используются кавычки ёлочки как кавычки)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
 msgid "Spanish"
 msgstr "Испанская"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Dvorak)"
 msgstr "Испанская (Дворак)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American)"
 msgstr "Испанская (латиноамериканская)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Испанская (латиноамериканская, с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Испанская (латиноамериканская, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Испанская (латиноамериканская, с dead tilde)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (Macintosh)"
 msgstr "Испанская (Macintosh)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Spanish (Sun dead keys)"
 msgstr "Испанская (с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Spanish (eliminate dead keys)"
 msgstr "Испанская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Spanish (include dead tilde)"
 msgstr "Испанская (с dead tilde)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Специальные клавиши (Ctrl+Alt+&lt;клв&gt;) обрабатываются сервером"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swahili (Kenya)"
 msgstr "Суахильская (Кения)"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swahili (Tanzania)"
 msgstr "Суахильская (Танзания)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Поменять местами клавиши Ctrl и Caps Lock"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
 msgid "Swap ESC and Caps Lock"
 msgstr "Поменять местами клавиши ESC и Caps Lock"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish"
 msgstr "Шведская"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (Dvorak)"
 msgstr "Шведская (Дворак)"
 
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:728
 msgid "Swedish (Macintosh)"
 msgstr "Шведская (Macintosh)"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
 msgid "Swedish (Svdvorak)"
 msgstr "Шведская (Svdvorak)"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:730
 msgid "Swedish (eliminate dead keys)"
 msgstr "Шведская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:728
+#: ../rules/base.xml.in.h:731
 msgid "Swedish Sign Language"
 msgstr "Шведский язык жестов"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:732
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (карманный ПК)"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
 msgid "Syriac"
 msgstr "Сирийская"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
 msgid "Syriac (phonetic)"
 msgstr "Сирийская (фонетическая)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
 msgid "Taiwanese"
 msgstr "Тайваньская"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
 msgid "Taiwanese (indigenous)"
 msgstr "Тайваньская (туземная)"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
 msgid "Tajik"
 msgstr "Таджикская"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
 msgid "Tajik (legacy)"
 msgstr "Таджикская (устаревшая)"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
 msgid "Tamil"
 msgstr "Тамильская"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Тамильская (Шри-Ланка, печатная машинка TAB)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Тамильская (Шри-Ланка, юникодная)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (TAB typewriter)"
 msgstr "Тамильская (печатная машинка TAB)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
 msgid "Tamil (TSCII typewriter)"
 msgstr "Тамильская (печатная машинка TSCII)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
 msgid "Tamil (Unicode)"
 msgstr "Тамильская (юникодная)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
 msgid "Tamil (keyboard with numerals)"
 msgstr "Тамильская (клавиатура с цифрами)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
 msgid "Tatar"
 msgstr "Татарская"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
 msgid "Telugu"
 msgstr "Телугская"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
 msgid "Thai"
 msgstr "Тайская"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
 msgid "Thai (Pattachote)"
 msgstr "Тайская (паттачотская)"
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:751
 msgid "Thai (TIS-820.2538)"
 msgstr "Тайская (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
 msgid "Tibetan"
 msgstr "Тибетская"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Тибетская (с цифрами ASCII)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "На соответствующую клавишу на клавиатуре Дворак."
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "На соответствующую клавишу на клавиатуре Qwerty."
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Переключать PointerKeys с помощью Shift + NumLock."
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:758
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
 msgid "Tswana"
 msgstr "Тсванская"
 
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:762
 msgid "Turkish"
 msgstr "Турецкая"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (Alt-Q)"
 msgstr "Турецкая (Alt-Q)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
 msgid "Turkish (F)"
 msgstr "Турецкая (F)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
 msgid "Turkish (Sun dead keys)"
 msgstr "Турецкая (со спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
 msgid "Turkish (international with dead keys)"
 msgstr "Турецкая (международная со спец. клавишами)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:767
 msgid "Turkmen"
 msgstr "Туркменская"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
 msgid "Turkmen (Alt-Q)"
 msgstr "Туркменская (Alt-Q)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:772
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:режим EU)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:773
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (106:режим JP)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:774
 msgid "Udmurt"
 msgstr "Удмуртская"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian"
 msgstr "Украинская"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (WinKeys)"
 msgstr "Украинская (с клавишами Win)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Украинская (омофоническая)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (legacy)"
 msgstr "Украинская (устаревшая)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
 msgid "Ukrainian (phonetic)"
 msgstr "Украинская (фонетическая)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
 msgid "Ukrainian (standard RSTU)"
 msgstr "Украинская (стандартная RSTU)"
 
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
 msgid "Ukrainian (typewriter)"
 msgstr "Украинская (печатная машинка)"
 
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:782
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Дополнения юникода (стрелки и математические операторы)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:783
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Дополнения юникода (стрелки и математические операторы). Математические операторы в ряду по умолчанию"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:784
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (Pakistan)"
 msgstr "Урдская (Пакистан)"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Урдская (Пакистан, CRULP)"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Урдская (Пакистан, NLA)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
 msgid "Urdu (WinKeys)"
 msgstr "Урдcкая (с клавишами Win)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:789
 msgid "Urdu (alternative phonetic)"
 msgstr "Урдская (альтернативная фонетическая)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
 msgid "Urdu (phonetic)"
 msgstr "Урдская (фонетическая)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Использовать клавиатурные индикаторы для отображения дополнительных раскладок"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:792
 msgid "Using space key to input non-breakable space character"
 msgstr "Клавиша пробела используется для ввода символа неразрывного пробела"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:793
 msgid "Usual space at any level"
 msgstr "Обычный пробел в любом ряду"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:794
 msgid "Uyghur"
 msgstr "Уйгурская"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek"
 msgstr "Узбекская"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
 msgid "Uzbek (Afghanistan)"
 msgstr "Узбекская (Афганистан)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Узбекская (Афганистан, OLPC)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
 msgid "Uzbek (Latin)"
 msgstr "Узбекская (латинская)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
 msgid "Vietnamese"
 msgstr "Вьетнамская"
 
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard"
 
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Цифровая клавиатура Wang 724 с дополнениями юникода (стрелки и математические операторы)"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:802
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Цифровая клавиатура Wang 724 с дополнениями юникода (стрелки и математические операторы). Математические операторы в ряду по умолчанию"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:803
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
 msgid "Wolof"
 msgstr "Волофская"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
 msgid "Yakut"
 msgstr "Якутская"
 
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
 msgid "Yoruba"
 msgstr "Йорубская"
 
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:809
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:810
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду, ничего в четвёртом"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:811
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду, тонкий неразрывный пробел в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:812
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду, связывающий символ нулевой ширины в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:813
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду, связывающий символ нулевой ширины в третьем ряду"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:814
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду, связывающий символ нулевой ширины в третьем ряду, символ неразрывного пробела в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:815
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Несвязывающий символ нулевой ширины в третьем ряду, связывающий символ нулевой ширины в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:816
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:817
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:820
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
 msgid "ca"
 msgstr "ca"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:831 ../rules/base.extras.xml.in.h:38
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:39
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:40
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:41
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:846 ../rules/base.extras.xml.in.h:42
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:849
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:852
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
+#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:43
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:858
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:863
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:867
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:871 ../rules/base.extras.xml.in.h:45
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:46
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:873
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:878
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:881
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:47
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
+#: ../rules/base.xml.in.h:888 ../rules/base.extras.xml.in.h:48
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:889 ../rules/base.extras.xml.in.h:49
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
+#: ../rules/base.xml.in.h:895 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:904
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:910
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:911
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:912
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
 msgid "zh"
 msgstr "zh"
 
@@ -3658,6 +3670,10 @@ msgstr "zh"
 msgid "APL Keyboard Symbols"
 msgstr "APL Keyboard Symbols"
 
+#: ../rules/base.extras.xml.in.h:3
+msgid "Armenian (OLPC phonetic)"
+msgstr "Армянская (фонетическая на OLPC)"
+
 #: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
 msgstr "Атсинская"
@@ -3670,86 +3686,119 @@ msgstr "Авестийская"
 msgid "Couer D'alene Salish"
 msgstr "Салишская кёр-д’ален"
 
-#: ../rules/base.extras.xml.in.h:8
+#: ../rules/base.extras.xml.in.h:7
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Крымско-татарская (Dobruja Q)"
+
+#: ../rules/base.extras.xml.in.h:9
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Английская (США, международная, объединённая с юникодным AltGr)"
 
-#: ../rules/base.extras.xml.in.h:9
+#: ../rules/base.extras.xml.in.h:10
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Английская (США, международная, объединённая с юникодным AltGr, альтернативная)"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:13
+msgid "German (US keyboard with German letters)"
+msgstr "Немецкая (клавиатура США с немецкими буквами)"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "Немецкая (с венгерскими буквами и без спец. клавиш (dead keys))"
+
+#: ../rules/base.extras.xml.in.h:15
 msgid "Kutenai"
 msgstr "Кутенайская"
 
-#: ../rules/base.extras.xml.in.h:13
+#: ../rules/base.extras.xml.in.h:17
 msgid "Latvian (US Colemak)"
 msgstr "Латышская (Коулмак США)"
 
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:18
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Латышская (Коулмак США, вариант с апострофом)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:19
 msgid "Latvian (US Dvorak)"
 msgstr "Латышская (Дворак США)"
 
-#: ../rules/base.extras.xml.in.h:16
+#: ../rules/base.extras.xml.in.h:20
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Латышская (Дворак США, вариант с Y)"
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Латышская (Дворак США, вариант с минусом)"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Латышская (Дворак США для программистов)"
 
-#: ../rules/base.extras.xml.in.h:19
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Латышская (Дворак США для программистов, вариант с Y)"
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Латышская (Дворак США для программистов, вариант с минусом)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:26
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Литовская (Дворак США с литовскими буквами)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:29
 msgid "Polish (international with dead keys)"
 msgstr "Польская (международная со спец. клавишами)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:31
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Румынская (эргономичная для слепой печати)"
 
-#: ../rules/base.extras.xml.in.h:29
-msgid "Russian (with UKR and BEL layout)"
-msgstr "Русская (с укр. и белорус. буквами на 3-ем уровне)"
+#: ../rules/base.extras.xml.in.h:33
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "Русская (с украинско-белорусской раскладкой)"
 
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:34
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Сербская (объединённые надбуквенные знаки вместе спец. клавиш (dead keys))"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "apl"
 msgstr "apl"
 
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:44
 msgid "kut"
 msgstr "kut"
 
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:50
 msgid "shs"
 msgstr "shs"
 
+#~ msgid "English (Cameroon qwerty)"
+#~ msgstr "Английская (камерунская qwerty)"
+
+#~ msgid "French (Cameroon azerty)"
+#~ msgstr "Французская (камерунская azerty)"
+
+#~ msgid "German (qwerty)"
+#~ msgstr "Немецкая (qwerty)"
+
+#~ msgid "Make Caps Lock an additional Ctrl"
+#~ msgstr "Использовать Caps Lock как дополнительную клавишу Ctrl"
+
+#~ msgid "Meta on Left Ctrl"
+#~ msgstr "Meta на левой клавише Ctrl"
+
+#~ msgid "Right Ctrl is mapped to Menu"
+#~ msgstr "Правая клавиша Ctrl соответствует клавише Menu"
+
+#~ msgid "Sinhala"
+#~ msgstr "Сингальская"
+
 #~ msgid "Afg"
 #~ msgstr "Afg"
 
@@ -3777,9 +3826,6 @@ msgstr "shs"
 #~ msgid "GBr"
 #~ msgstr "GBr"
 
-#~ msgid "German (Romanian keyboard with German letters)"
-#~ msgstr "Немецкая (румынская клавиатура с немецкими буквами)"
-
 #~ msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
 #~ msgstr "Немецкая (румынская клавиатура с немецкими буквами, без спец. клавиш (dead keys))"
 
diff --git a/dist/xkeyboard-config/po/sl.po b/dist/xkeyboard-config/po/sl.po
index 1a5c4e018..a1db69978 100644
--- a/dist/xkeyboard-config/po/sl.po
+++ b/dist/xkeyboard-config/po/sl.po
@@ -1,2731 +1,3809 @@
-# Slovenian message catalogue for xkeyboard-config.
+# -*- mode:po; coding:utf-8; -*- Slovenian message catalogue for xkeyboard-config.
 # Copyright (C) 2005 Free Software Foundation, Inc.
-# Matej Urbančič <matej.urban@gmail.com>, 2006 - 2007.
+# This file is distributed under the same license as the xkeyboard-config package.
+#
+# Matej Urbančič <matej.urban@gmail.com>, 2006 - 2010.
+# Martin Srebotnjak  <miles@filmsi.net>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 1.1-pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-11 22:14+0100\n"
-"PO-Revision-Date: 2007-10-02 09:12+0100\n"
+"Project-Id-Version: xkeyboard-config 2.3\n"
+"Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-09-06 21:32+0100\n"
 "Last-Translator: Matej Urbančič <matej.urban@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: ../rules/base.xml.in.h:1
-msgid "(F)"
-msgstr "(F)"
+msgid "&lt;Less/Greater&gt;"
+msgstr "&lt;manjši/večji&gt;"
 
 #: ../rules/base.xml.in.h:2
-msgid "(Legacy) Alternative"
-msgstr "(Podedovano) Alternativna"
+msgid "&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "&lt;manjši/večji&gt; (izbere 3. raven, zaklene se, ko je pritisnjen skupaj z drugim izbirnikom 3. ravni)"
 
 #: ../rules/base.xml.in.h:3
-msgid "(Legacy) Alternative, Sun dead keys"
-msgstr "(Podedovano) Alternativna, Sun mrtve tipke"
+msgid "&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "&lt;manjši/večji&gt; (izbere 5. raven in aktivira zaklep 5. ravni, ko je pritisnjen skupaj z drugim izbirnikom 5. ravni, en pritisk sprosti zaklep)"
 
 #: ../rules/base.xml.in.h:4
-msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "(Podedovano) Alternativno, izloči mrtve tipke"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "&lt;manjši/večji&gt; (izbere 5. raven, zaklene se, če je pritisnjen skupaj z drugim izbirnikom 5. ravni)"
 
 #: ../rules/base.xml.in.h:5
-msgid "(Legacy) Dvorak"
-msgstr "Dvorak"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "&lt;manjši/večji&gt; (izbere 5. raven, zaklene se, če je pritisnjen skupaj z drugim izbirnikom 5. ravni, en pritisk sprosti zaklep)"
 
 #: ../rules/base.xml.in.h:6
-msgid "101/104 key Compatible"
-msgstr "Kompatibilna 101/104 tipke"
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
 
-#: ../rules/base.xml.in.h:7 ../rules/sun.xml.in.h:2
-msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/vejica/Mrtve tipke"
+#: ../rules/base.xml.in.h:7
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
 
-#: ../rules/base.xml.in.h:8 ../rules/sun.xml.in.h:3
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/vejica/Izloči mrtve tipke"
+#: ../rules/base.xml.in.h:8
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
 
-#: ../rules/base.xml.in.h:9 ../rules/sun.xml.in.h:4
-msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/pika/Mrtve tipke"
+#: ../rules/base.xml.in.h:9
+msgid "ATM/phone-style"
+msgstr "ATM/kot telefon"
 
-#: ../rules/base.xml.in.h:10 ../rules/sun.xml.in.h:5
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/pika/Izloči mrtve tipke"
+#: ../rules/base.xml.in.h:10
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
 
-#: ../rules/base.xml.in.h:11 ../rules/sun.xml.in.h:6
-msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/vejica/Mrtve tipke"
+#: ../rules/base.xml.in.h:11
+msgid "Acer C300"
+msgstr "Acer C300"
 
 #: ../rules/base.xml.in.h:12
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwertz/vejica/Izloči mrtve tipke"
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
 
-#: ../rules/base.xml.in.h:13 ../rules/sun.xml.in.h:7
-msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/pika/Mrtve tipke"
+#: ../rules/base.xml.in.h:13
+msgid "Acer Laptop"
+msgstr "Acer - prenosnik"
 
-#: ../rules/base.xml.in.h:14 ../rules/sun.xml.in.h:8
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/pika/Izloči mrtve tipke"
+#: ../rules/base.xml.in.h:14
+msgid "Add the standard behavior to Menu key"
+msgstr "Dodaj standardni odziv tipki Menu"
 
-#: ../rules/base.xml.in.h:15 ../rules/sun.xml.in.h:9
-msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/vejica/Mrtve tipke"
+#: ../rules/base.xml.in.h:15
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Dodajanje cirkumfleksov za Esperanto (supersigno)"
 
-#: ../rules/base.xml.in.h:16 ../rules/sun.xml.in.h:10
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/vejica/Izloči mrtve tipke"
+#: ../rules/base.xml.in.h:16
+msgid "Adding currency signs to certain keys"
+msgstr "Dodajanje valutnih simbolov določenim tipkam"
 
-#: ../rules/base.xml.in.h:17 ../rules/sun.xml.in.h:11
-msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/pika/Mrtve tipke"
+#: ../rules/base.xml.in.h:17
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
 
-#: ../rules/base.xml.in.h:18 ../rules/sun.xml.in.h:12
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/pika/Izloči mrtve tipke"
+#: ../rules/base.xml.in.h:18
+msgid "Afghani"
+msgstr "afghanska"
 
-#: ../rules/base.xml.in.h:19 ../rules/sun.xml.in.h:13
-msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/vejica/Mrtve tipke"
+#: ../rules/base.xml.in.h:19
+msgid "Akan"
+msgstr "akanska"
 
-#: ../rules/base.xml.in.h:20 ../rules/sun.xml.in.h:14
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/vejica/Izloči mrtve tipke"
+#: ../rules/base.xml.in.h:20
+msgid "Albanian"
+msgstr "albanska"
 
-#: ../rules/base.xml.in.h:21 ../rules/sun.xml.in.h:15
-msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/pika/Mrtve tipke"
+#: ../rules/base.xml.in.h:21
+msgid "Alt and Meta are on Alt keys"
+msgstr "Izmenjalka (Alt) in tipka Meta sta na izmenjalkah (Alt)."
 
-#: ../rules/base.xml.in.h:22 ../rules/sun.xml.in.h:16
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/pika/Izloči mrtve tipke"
+#: ../rules/base.xml.in.h:22
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Izmenjalka (Alt) je preslikana na desno tipko Win, Super na tipko Menu."
 
 #: ../rules/base.xml.in.h:23
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
+msgid "Alt+Caps Lock"
+msgstr "Izmenjalka (Alt)+Caps Lock"
 
 #: ../rules/base.xml.in.h:24
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
+msgid "Alt+Ctrl"
+msgstr "Izmenjalka (Alt)+krmilka (Ctrl)"
 
 #: ../rules/base.xml.in.h:25
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
+msgid "Alt+Shift"
+msgstr "Izmenjalka (Alt)+dvigalka (Shift)"
 
 #: ../rules/base.xml.in.h:26
-msgid "ACPI Standard"
-msgstr "ACPI Standard"
+msgid "Alt+Space"
+msgstr "Izmenjalka (Alt)+preslednica"
 
 #: ../rules/base.xml.in.h:27
-msgid "AZERTY Tskapo"
-msgstr "AZERTY Tskapo"
+msgid "Alt/Win key behavior"
+msgstr "Vedenje tipk Alt/Win"
 
 #: ../rules/base.xml.in.h:28
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
+msgid "Amharic"
+msgstr "amharska"
 
 #: ../rules/base.xml.in.h:29
-msgid "Acer C300"
-msgstr "Acer C300"
+msgid "Any Alt key"
+msgstr "Poljubna izmenjalka (Alt)"
 
 #: ../rules/base.xml.in.h:30
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
+msgid "Any Win key"
+msgstr "Poljubna tipka Win"
 
 #: ../rules/base.xml.in.h:31
-msgid "Acer Laptop"
-msgstr "Acer Laptop"
+msgid "Any Win key (while pressed)"
+msgstr "Poljubna tipka Win (ob pritisku)"
 
 #: ../rules/base.xml.in.h:32
-msgid "Add the EuroSign to the 2 key."
-msgstr "Znak za Evro dodaj na tipko 2."
+msgid "Apple"
+msgstr "Apple"
 
 #: ../rules/base.xml.in.h:33
-msgid "Add the EuroSign to the 5 key."
-msgstr "Znak za Evro dodaj na tipko 5."
+msgid "Apple Aluminium Keyboard (ANSI)"
+msgstr "Apple - aluminijasta tipkovnica (ANSI)"
 
 #: ../rules/base.xml.in.h:34
-msgid "Add the EuroSign to the E key."
-msgstr "Znak za Evro dodaj na tipko E."
+msgid "Apple Aluminium Keyboard (ISO)"
+msgstr "Apple - aluminijasta tipkovnica (ISO)"
 
 #: ../rules/base.xml.in.h:35
-msgid "Add the standard behavior to Menu key."
-msgstr "Dodaj standardni odziv Menu tipke"
+msgid "Apple Aluminium Keyboard (JIS)"
+msgstr "Apple - aluminijasta tipkovnica (JIS)"
 
 #: ../rules/base.xml.in.h:36
-msgid "Adding the EuroSign to certain keys"
-msgstr "Dodaj simbol za Evro določeni tipki"
+msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
+msgstr "Apple - aluminijasta tipkovnica: emuliraj tipke PC (Print, Scroll Lock, Pause, NumLock)"
 
 #: ../rules/base.xml.in.h:37
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
+msgid "Apple Laptop"
+msgstr "Apple - prenosnik"
 
 #: ../rules/base.xml.in.h:38
-msgid "Afg"
-msgstr "Afg"
+msgid "Arabic"
+msgstr "arabska"
 
 #: ../rules/base.xml.in.h:39
-msgid "Afghanistan"
-msgstr "Afghanistan"
+msgid "Arabic (Buckwalter)"
+msgstr "arabska (Buckwalter)"
 
 #: ../rules/base.xml.in.h:40
-msgid "Akan"
-msgstr "Akan"
+msgid "Arabic (Morocco)"
+msgstr "arabska (Maroko)"
 
 #: ../rules/base.xml.in.h:41
-msgid "Alb"
-msgstr "ALB"
+msgid "Arabic (Pakistan)"
+msgstr "arabska (Pakistan)"
 
 #: ../rules/base.xml.in.h:42
-msgid "Albania"
-msgstr "Albanija"
+msgid "Arabic (Syria)"
+msgstr "arabska (Sirija)"
 
 #: ../rules/base.xml.in.h:43
-msgid "Alt and Meta are on the Alt keys."
-msgstr "Alt in Meta tipki sta na Alt tipkah."
+msgid "Arabic (azerty)"
+msgstr "arabska (azerty)"
 
 #: ../rules/base.xml.in.h:44
-msgid "Alt is mapped to the right Win-key and Super to Menu."
-msgstr "Alt določi na desno Win tipko in Super na Menu tipko."
+msgid "Arabic (azerty/digits)"
+msgstr "arabska (azerty/števke)"
 
 #: ../rules/base.xml.in.h:45
-msgid "Alt+CapsLock changes layout."
-msgstr "Alt+CapsLock zamenjata skupino."
+msgid "Arabic (digits)"
+msgstr "arabska (števke)"
 
 #: ../rules/base.xml.in.h:46
-msgid "Alt+Ctrl change layout."
-msgstr "Alt+Ctrl zamenjata skupino."
+msgid "Arabic (qwerty)"
+msgstr "arabska (qwerty)"
 
 #: ../rules/base.xml.in.h:47
-msgid "Alt+Shift change layout."
-msgstr "Alt+Shift zamenja skupino."
+msgid "Arabic (qwerty/digits)"
+msgstr "arabska (qwerty/števke)"
 
-#: ../rules/base.xml.in.h:48
-msgid "Alt-Q"
-msgstr "Alt-Q"
+#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
+msgid "Armenian"
+msgstr "armenska"
 
 #: ../rules/base.xml.in.h:49
-msgid "Alt/Win key behavior"
-msgstr "Obnašanje Alt/Win tipk"
+msgid "Armenian (alternative eastern)"
+msgstr "armenska (alternativna vzhodno)"
 
-#: ../rules/base.xml.in.h:50
-msgid "Alternative"
-msgstr "Alternativna"
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+msgid "Armenian (alternative phonetic)"
+msgstr "armenska (alternativna fonetična)"
 
 #: ../rules/base.xml.in.h:51
-msgid "Alternative Eastern"
-msgstr "Alternativno vzhodno"
+msgid "Armenian (eastern)"
+msgstr "armenska (vzhodna)"
 
 #: ../rules/base.xml.in.h:52
-msgid "Alternative Phonetic"
-msgstr "Alternativna fonetika"
+msgid "Armenian (phonetic)"
+msgstr "armenska (fonetično)"
 
 #: ../rules/base.xml.in.h:53
-msgid "Alternative international (former us_intl)"
-msgstr "Alternativna Mednarodna"
+msgid "Armenian (western)"
+msgstr "armenska (zahodna)"
 
 #: ../rules/base.xml.in.h:54
-msgid "Alternative, Sun dead keys"
-msgstr "Alternativna, Sun mrtve tipke."
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "asturijska (Španija, H in L s spodnjo piko)"
 
 #: ../rules/base.xml.in.h:55
-msgid "Alternative, eliminate dead keys"
-msgstr "Alternativno, izloči mrtve tipke"
+msgid "Asus Laptop"
+msgstr "Asus - prenosnik"
 
 #: ../rules/base.xml.in.h:56
-msgid "Alternative, latin-9 only"
-msgstr "Alternativno, latinsko-9"
+msgid "At bottom left"
+msgstr "Levo spodaj"
 
 #: ../rules/base.xml.in.h:57
-msgid "And"
-msgstr "And"
+msgid "At left of 'A'"
+msgstr "Levo of tipke 'A'"
 
 #: ../rules/base.xml.in.h:58
-msgid "Andorra"
-msgstr "Andora"
+msgid "Avatime"
+msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:59
-msgid "Apostrophe (') variant"
-msgstr "Opuščaj (') možnost"
+msgid "Azerbaijani"
+msgstr "azerbajdžanska"
 
 #: ../rules/base.xml.in.h:60
-msgid "Apple"
-msgstr "Apple"
+msgid "Azerbaijani (Cyrillic)"
+msgstr "azerbajdžanska (cirilica)"
 
 #: ../rules/base.xml.in.h:61
-msgid "Apple Laptop"
-msgstr "Apple Laptop"
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 Internet - brezžična"
 
 #: ../rules/base.xml.in.h:62
-msgid "Ara"
-msgstr "ARA"
+msgid "BTC 5090"
+msgstr "BTC 5090"
 
 #: ../rules/base.xml.in.h:63
-msgid "Arabic"
-msgstr "Arabska"
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
 
 #: ../rules/base.xml.in.h:64
-msgid "Arm"
-msgstr "ARM"
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
 
 #: ../rules/base.xml.in.h:65
-msgid "Armenia"
-msgstr "Armenija"
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
 
 #: ../rules/base.xml.in.h:66
-msgid "Asus Laptop"
-msgstr "Asus Laptop"
+msgid "BTC 9000"
+msgstr "BTC 9000"
 
 #: ../rules/base.xml.in.h:67
-msgid "Aze"
-msgstr "AZE"
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
 
 #: ../rules/base.xml.in.h:68
-msgid "Azerbaijan"
-msgstr "Azerbajdžan"
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
 
 #: ../rules/base.xml.in.h:69
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 brezžična Internet Tipkovnica"
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
 
 #: ../rules/base.xml.in.h:70
-msgid "BTC 5090"
-msgstr "BTC 5090"
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U Mini Wireless Internet & Gaming"
 
 #: ../rules/base.xml.in.h:71
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
+msgid "Backslash"
+msgstr "Leva poševnica"
 
 #: ../rules/base.xml.in.h:72
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Leva poševnica (izbere tretjo raven, zapahne, ko je pritisnjena skupaj z drugim izbirnikom tretje ravni)"
 
 #: ../rules/base.xml.in.h:73
-msgid "BTC 9000"
-msgstr "BTC 9000"
+msgid "Bambara"
+msgstr "bambarska"
 
 #: ../rules/base.xml.in.h:74
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
+msgid "Bashkirian"
+msgstr "baškirska"
 
 #: ../rules/base.xml.in.h:75
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
+msgid "Belarusian"
+msgstr "beloruska"
 
 #: ../rules/base.xml.in.h:76
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
+msgid "Belarusian (Latin)"
+msgstr "beloruska (latinica)"
 
 #: ../rules/base.xml.in.h:77
-msgid "Ban"
-msgstr "BAN"
+msgid "Belarusian (legacy)"
+msgstr "beloruska (starinska)"
 
 #: ../rules/base.xml.in.h:78
-msgid "Bangladesh"
-msgstr "Bangladeš"
+msgid "Belgian"
+msgstr "belgijska"
 
-#: ../rules/base.xml.in.h:79 ../rules/sun.xml.in.h:22
-msgid "Bel"
-msgstr "BEL"
+#: ../rules/base.xml.in.h:79
+msgid "Belgian (ISO alternate)"
+msgstr "belgijska (alternativni ISO)"
 
 #: ../rules/base.xml.in.h:80
-msgid "Belarus"
-msgstr "Belorusija"
+msgid "Belgian (Sun dead keys)"
+msgstr "belgijska (Sun mrtve tipke)"
 
 #: ../rules/base.xml.in.h:81
-msgid "Belgium"
-msgstr "Belcija"
+msgid "Belgian (Wang model 724 azerty)"
+msgstr "belgijska (Wang model 724 azerty)"
 
 #: ../rules/base.xml.in.h:82
-msgid "BenQ X-Touch"
-msgstr "BenQ X-Touch"
+msgid "Belgian (alternative)"
+msgstr "belgijska (alternativna)"
 
 #: ../rules/base.xml.in.h:83
-msgid "Bengali"
-msgstr "Bengalsko"
+msgid "Belgian (alternative, Sun dead keys)"
+msgstr "belgijska (alternativna, Sun mrtve tipke)"
 
 #: ../rules/base.xml.in.h:84
-msgid "Bengali Probhat"
-msgstr "Bengalski Prohbat"
+msgid "Belgian (alternative, latin-9 only)"
+msgstr "belgijska (alternativna, latinsko-9)"
 
 #: ../rules/base.xml.in.h:85
-msgid "Bepo, ergonomic, Dvorak way"
-msgstr "Bepo, ergonomska, Dvorak"
+msgid "Belgian (eliminate dead keys)"
+msgstr "belgijska (izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:86
-msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
-msgstr "Bepo, ergonomska, Dvorak, latin-9"
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
 
-#: ../rules/base.xml.in.h:87 ../rules/sun.xml.in.h:24
-msgid "Bgr"
-msgstr "BGR"
+#: ../rules/base.xml.in.h:87
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
 
 #: ../rules/base.xml.in.h:88
-msgid "Bhu"
-msgstr "BHU"
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
 
 #: ../rules/base.xml.in.h:89
-msgid "Bhutan"
-msgstr "Butan"
+msgid "Bengali"
+msgstr "bengalska"
 
 #: ../rules/base.xml.in.h:90
-msgid "Biblical Hebrew (Tiro)"
-msgstr "Biblična hebrejska (Tiro)"
+msgid "Bengali (Probhat)"
+msgstr "bengalska (Prohbat)"
 
 #: ../rules/base.xml.in.h:91
-msgid "Bih"
-msgstr "BIH"
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgstr "berberska (Maroko, Tifinagh alternativna fonetična)"
 
 #: ../rules/base.xml.in.h:92
-msgid "Blr"
-msgstr "BLR"
+msgid "Berber (Morocco, Tifinagh alternative)"
+msgstr "berberska (Maroko, Tifinagh alternativna)"
 
 #: ../rules/base.xml.in.h:93
-msgid "Bosnia and Herzegovina"
-msgstr "Bosna in Hercegovina"
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgstr "berberska (Maroko, Tifinagh razširjeno fonetična)"
 
 #: ../rules/base.xml.in.h:94
-msgid "Both Alt keys together change layout."
-msgstr "Obe Alt tipki skupaj zamenjata razporeditev."
+msgid "Berber (Morocco, Tifinagh extended)"
+msgstr "berberska (Maroko, Tifinagh razširjena)"
 
 #: ../rules/base.xml.in.h:95
-msgid "Both Ctrl keys together change layout."
-msgstr "Obe Ctrl tipki skupaj zamenjata razporeditev."
+msgid "Berber (Morocco, Tifinagh phonetic)"
+msgstr "berberska (Maroko, Tifinagh fonetična)"
 
 #: ../rules/base.xml.in.h:96
-msgid "Both Shift keys together change layout."
-msgstr "Obe Shift tipki skupaj zamenjata razporeditev."
+msgid "Berber (Morocco, Tifinagh)"
+msgstr "berberska (Maroko, Tifinagh)"
 
 #: ../rules/base.xml.in.h:97
-msgid "Both Win-keys switch layout while pressed."
-msgstr "Obe Win tipki ob pritisku zamenjata razporeditev."
+msgid "Bosnian"
+msgstr "bosanska"
 
 #: ../rules/base.xml.in.h:98
-msgid "Bra"
-msgstr "BRA"
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
+msgstr "bosanska (am. tipkovnica z bosanskimi digrafi)"
 
 #: ../rules/base.xml.in.h:99
-msgid "Braille"
-msgstr "Braille"
+msgid "Bosnian (US keyboard with Bosnian letters)"
+msgstr "bosanska (am. tipkovnica z bosanskimi črkami)"
 
 #: ../rules/base.xml.in.h:100
-msgid "Brazil"
-msgstr "Brazilija"
+msgid "Bosnian (use Bosnian digraphs)"
+msgstr "bosanska (uporabi bosanske digrafe)"
 
 #: ../rules/base.xml.in.h:101
-msgid "Brazilian ABNT2"
-msgstr "Brazilska ABNT2"
+msgid "Bosnian (use guillemets for quotes)"
+msgstr "bosanska (francoski narekovaji za navedke)"
 
 #: ../rules/base.xml.in.h:102
-msgid "Brl"
-msgstr "Brl"
+msgid "Both Alt keys together"
+msgstr "Obe izmenjalki (Alt) hkrati"
 
 #: ../rules/base.xml.in.h:103
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internet Tipkovnica"
+msgid "Both Ctrl keys together"
+msgstr "Obeh krmilki (Ctrl) hkrati"
 
 #: ../rules/base.xml.in.h:104
-msgid "Buckwalter"
-msgstr "Buckwalter"
+msgid "Both Shift keys together"
+msgstr "Obe dvigalki (Shift) hkrati"
 
 #: ../rules/base.xml.in.h:105
-msgid "Bulgaria"
-msgstr "Bolgarija"
+msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
+msgstr "Obe tipki dvigalki (Shift) hkrati aktivirata Caps Lock, ena dvigalka (Shift) jo deaktivira"
 
 #: ../rules/base.xml.in.h:106
-msgid "Cambodia"
-msgstr "Kambodža"
+msgid "Both Shift-Keys together toggle Caps Lock"
+msgstr "Obe dvigalki (Shift) hkrati preklopita Caps Lock"
 
-#: ../rules/base.xml.in.h:107 ../rules/sun.xml.in.h:29
-msgid "Can"
-msgstr "CAN"
+#: ../rules/base.xml.in.h:107
+msgid "Both Shift-Keys together toggle ShiftLock"
+msgstr "Obe dvigalki (Shift) hkrati preklopita ShiftLock"
 
 #: ../rules/base.xml.in.h:108
-msgid "Canada"
-msgstr "Kanada"
+msgid "Braille"
+msgstr "brajlica"
 
 #: ../rules/base.xml.in.h:109
-msgid "Caps Lock is Compose."
-msgstr "CapsLock je pred-tipka (Compose)"
+msgid "Braille (left hand)"
+msgstr "brajlica (levoročno)"
 
 #: ../rules/base.xml.in.h:110
-msgid "CapsLock LED shows alternative layout."
-msgstr "CapsLock LED kaže alternativno razporeditev."
+msgid "Braille (right hand)"
+msgstr "brajlica (desnoročno)"
 
 #: ../rules/base.xml.in.h:111
-msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "CapsLock se obnaša kot zaklenjena Shift tipka. Shift prekine CapsLock."
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet"
 
 #: ../rules/base.xml.in.h:112
-msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "CapsLock se obnaša kot Shift z zaklepanjem. Shift ne prekliče CapsLock tipke."
+msgid "Bulgarian"
+msgstr "bolgarska"
 
 #: ../rules/base.xml.in.h:113
-msgid "CapsLock just locks the Shift modifier."
-msgstr "CapsLock samo zaklene Shift modifikator."
+msgid "Bulgarian (new phonetic)"
+msgstr "bolgarska (nova fonetika)"
 
-#: ../rules/base.xml.in.h:114 ../rules/sun.xml.in.h:33
-msgid "CapsLock key behavior"
-msgstr "Obnašanje CapsLock Tipke"
+#: ../rules/base.xml.in.h:114
+msgid "Bulgarian (traditional phonetic)"
+msgstr "bolgarska (tradicionalna fonetična)"
 
 #: ../rules/base.xml.in.h:115
-msgid "CapsLock key changes layout."
-msgstr "Tipka CapsLock zamenja razporeditev."
+msgid "Burmese"
+msgstr "burmanska"
 
 #: ../rules/base.xml.in.h:116
-msgid "CapsLock toggles Shift so all keys are affected."
-msgstr "CapsLock izmenjuje modifikator za vse Shift tipke."
+msgid "Canadian Multilingual"
+msgstr "kanadska večjezična"
 
 #: ../rules/base.xml.in.h:117
-msgid "CapsLock toggles normal capitalization of alphabetic characters."
-msgstr "CapsLock izmenjuje velikost črk (velike in male črke)."
+msgid "Canadian Multilingual (first part)"
+msgstr "kanadska večjezična (prvi del)"
 
 #: ../rules/base.xml.in.h:118
-msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "CapsLock uporablja notranjo kapitalizacijo. Shift prekliče CapsLock."
+msgid "Canadian Multilingual (second part)"
+msgstr "kanadska večjezična (drugi del)"
 
 #: ../rules/base.xml.in.h:119
-msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "CapsLock uporablja notranjo kapitalizacijo. Shift ne prekliče CapsLock."
+msgid "Caps Lock"
+msgstr "Caps Lock"
 
 #: ../rules/base.xml.in.h:120
-msgid "Catalan variant with middle-dot L"
-msgstr "Katalanska varianta z L s srednjo piko"
+msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Caps Lock (izbere tretjo raven, zapahne, ko je pritisnjena skupaj z drugim izbirnikom tretje ravni)"
 
 #: ../rules/base.xml.in.h:121
-msgid "Che"
-msgstr "CHE"
+msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
+msgstr "Caps Lock (na prvo postavitev), dvigalka (Shift)+Caps Lock (na zadnjo postavitev)"
 
 #: ../rules/base.xml.in.h:122
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
+msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
+msgstr "Caps Lock (ko je pritisnjena), izmenjalka (Alt)+Caps Lock opravi izvorno dejanje zaklepa velikih črk."
 
 #: ../rules/base.xml.in.h:123
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (druga izbira)"
+msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
+msgstr "Caps Lock velja kot dvigalka (Shift) z zaklepanjem. Dvigalka (Shift) \"prekine\" tipko Caps Lock."
 
 #: ../rules/base.xml.in.h:124
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
+msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
+msgstr "Caps Lock velja kot dvigalka (Shift) z zaklepanjem. Dvigalka (Shift) ne vpliva na tipko Caps Lock"
 
 #: ../rules/base.xml.in.h:125
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
+msgid "Caps Lock is disabled"
+msgstr "Caps Lock je onemogočena"
 
 #: ../rules/base.xml.in.h:126
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
+msgid "Caps Lock key behavior"
+msgstr "Vedenje tipke Caps Lock"
 
 #: ../rules/base.xml.in.h:127
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internet Tipkovnica"
+msgid "Caps Lock toggles Shift so all keys are affected"
+msgstr "Caps Lock preklaplja dvigalko (Shift), tako da so prizadete vse tipke"
 
 #: ../rules/base.xml.in.h:128
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
+msgid "Caps Lock toggles normal capitalization of alphabetic characters"
+msgstr "Caps Lock preklaplja navadno kapitalizacijo črk abecede (velike in male črke)."
 
 #: ../rules/base.xml.in.h:129
-msgid "China"
-msgstr "Kitajska"
+msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
+msgstr "Caps Lock uporablja notranjo kapitalizacijo. Dvigalka (Shift) \"prekine\" Caps Lock."
 
 #: ../rules/base.xml.in.h:130
-msgid "Chuvash"
-msgstr "Chuvash"
+msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
+msgstr "Caps Lock uporablja notranjo kapitalizacijo. Dvigalka (Shift) ne vpliva na Caps Lock."
 
 #: ../rules/base.xml.in.h:131
-msgid "Chuvash Latin"
-msgstr "Chuvash Latinsko"
+msgid "Catalan"
+msgstr "katalonska"
 
 #: ../rules/base.xml.in.h:132
-msgid "Classic Dvorak"
-msgstr "Dvorak nabor"
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "katalonska (Španija, z L s srednjo piko)"
 
 #: ../rules/base.xml.in.h:133
-msgid "Classmate PC"
-msgstr "Classmate PC"
+msgid "Cherokee"
+msgstr "čerokeška"
 
 #: ../rules/base.xml.in.h:134
-msgid "CloGaelach"
-msgstr "CloGaelach"
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
 
 #: ../rules/base.xml.in.h:135
-msgid "Colemak"
-msgstr "Colemak"
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
 
 #: ../rules/base.xml.in.h:136
-msgid "Commabelow"
-msgstr "Commabelow"
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (druga izbira)"
 
 #: ../rules/base.xml.in.h:137
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access Tipkovnica"
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
 
 #: ../rules/base.xml.in.h:138
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet Tipkovnica (13 tipk)"
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
 
 #: ../rules/base.xml.in.h:139
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet Tipkovnica (18 tipk)"
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
 
 #: ../rules/base.xml.in.h:140
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet Tipkovnica (7 tipk)"
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
 
 #: ../rules/base.xml.in.h:141
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Tipkovnica"
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet"
 
 #: ../rules/base.xml.in.h:142
-msgid "Compose key position"
-msgstr "Položaj pred-tipke (Compose)"
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
 
 #: ../rules/base.xml.in.h:143
-msgid "Congo, Democratic Republic of the"
-msgstr "Kongo, Demokratična Republika"
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
 
 #: ../rules/base.xml.in.h:144
-msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Ctrl tipko določata Win tipki (privzeto)."
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
 
 #: ../rules/base.xml.in.h:145
-msgid "Croatia"
-msgstr "Hrvaška"
+msgid "Chinese"
+msgstr "kitajska"
 
 #: ../rules/base.xml.in.h:146
-msgid "Ctrl key at bottom left"
-msgstr "Ctrl tipka leži levo spodaj"
+msgid "Chuvash"
+msgstr "čuvaška"
 
 #: ../rules/base.xml.in.h:147
-msgid "Ctrl key at left of 'A'"
-msgstr "Tipka Ctrl je levo of tipke 'A'"
+msgid "Chuvash (Latin)"
+msgstr "čuvaška (latinica)"
 
 #: ../rules/base.xml.in.h:148
-msgid "Ctrl key position"
-msgstr "Položaj Ctrl Tipke"
+msgid "Classmate PC"
+msgstr "Classmate PC"
 
 #: ../rules/base.xml.in.h:149
-msgid "Ctrl+Shift change layout."
-msgstr "Ctrl+Shift zamenjata nabor."
+msgid "CloGaelach"
+msgstr "CloGaelach"
 
 #: ../rules/base.xml.in.h:150
-msgid "Cyrillic"
-msgstr "Cirilica"
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access"
 
-#: ../rules/base.xml.in.h:151 ../rules/sun.xml.in.h:39
-msgid "Cze"
-msgstr "CZE"
+#: ../rules/base.xml.in.h:151
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet (13 tipk)"
 
 #: ../rules/base.xml.in.h:152
-msgid "Czechia"
-msgstr "Češka"
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet (18 tipk)"
 
 #: ../rules/base.xml.in.h:153
-msgid "DRC"
-msgstr "DRC"
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet (7 tipk)"
 
 #: ../rules/base.xml.in.h:154
-msgid "DTK2000"
-msgstr "DTK2000"
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq"
 
-#: ../rules/base.xml.in.h:155 ../rules/sun.xml.in.h:42
-msgid "Dead acute"
-msgstr "Mrtvi ostrivec"
+#: ../rules/base.xml.in.h:155
+msgid "Compose key position"
+msgstr "Položaj pred-tipke (Compose)"
 
-#: ../rules/base.xml.in.h:156 ../rules/sun.xml.in.h:43
-msgid "Dead grave acute"
-msgstr "Mrtvi krativec"
+#: ../rules/base.xml.in.h:156
+msgid "Control + Alt + Backspace"
+msgstr "Krmilka (Control) + izmenjalka (Alt) + vračalka"
 
 #: ../rules/base.xml.in.h:157
-msgid "Default numeric keypad keys."
-msgstr "Privzete tipke številčnice."
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Krmilka (Control) je preslikana na izmenjalki (Alt), izmenjalka (Alt) je preslikana na tipki Win"
 
 #: ../rules/base.xml.in.h:158
-msgid "Dell"
-msgstr "Dell"
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Krmilka (Control) je preslikana na tipki Win (in običajni krmilki - Ctrl)"
 
 #: ../rules/base.xml.in.h:159
-msgid "Dell 101-key PC"
-msgstr "Dell tipkovnica s 101 tipko PC"
+msgid "Creative Desktop Wireless 7000"
+msgstr "Creative Desktop Wireless 7000"
 
 #: ../rules/base.xml.in.h:160
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "krimsko tatarska (Dobruja Q)"
 
 #: ../rules/base.xml.in.h:161
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Dell Laptop/notebook Precision M series"
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "krimsko tatarska (turški Alt-Q)"
 
 #: ../rules/base.xml.in.h:162
-msgid "Dell Latitude series laptop"
-msgstr "Dell Latitude serijski laptop"
+msgid "Crimean Tatar (Turkish F)"
+msgstr "krimsko tatarska (turški F)"
 
 #: ../rules/base.xml.in.h:163
-msgid "Dell Precision M65"
-msgstr "Dell Precision M65"
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "krimsko tatarska (turški Q)"
 
 #: ../rules/base.xml.in.h:164
-msgid "Dell USB Multimedia Keybard"
-msgstr "Dell USB Multimedia tipkovnica"
+msgid "Croatian"
+msgstr "hrvaška"
 
 #: ../rules/base.xml.in.h:165
-msgid "Denmark"
-msgstr "Danska"
+msgid "Croatian (US keyboard with Croatian digraphs)"
+msgstr "hrvaška (am. tipkovnica s hrvaškimi digrafi)"
 
-#: ../rules/base.xml.in.h:166 ../rules/sun.xml.in.h:44
-msgid "Deu"
-msgstr "DEU"
+#: ../rules/base.xml.in.h:166
+msgid "Croatian (US keyboard with Croatian letters)"
+msgstr "hrvaška (am. tipkovnica s hrvaškimi črkami)"
 
 #: ../rules/base.xml.in.h:167
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop Tipkovnica"
+msgid "Croatian (use Croatian digraphs)"
+msgstr "hrvaška (uporabi hrvaške digrafe)"
 
 #: ../rules/base.xml.in.h:168
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802 serija"
+msgid "Croatian (use guillemets for quotes)"
+msgstr "hrvaška (francoski narekovaji za navedke)"
 
-#: ../rules/base.xml.in.h:169 ../rules/sun.xml.in.h:46
-msgid "Dnk"
-msgstr "DNK"
+#: ../rules/base.xml.in.h:169
+msgid "Ctrl key position"
+msgstr "Položaj tipke Ctrl"
 
-#: ../rules/base.xml.in.h:170 ../rules/sun.xml.in.h:48
-msgid "Dvorak"
-msgstr "Dvorak nabor"
+#: ../rules/base.xml.in.h:170
+msgid "Ctrl+Shift"
+msgstr "krmilka (Ctrl)+dvigalka (Shift)"
 
 #: ../rules/base.xml.in.h:171
-msgid "Dvorak, Polish quotes on key \"1/!\""
-msgstr "Dvorak, Poljska - narekovaj na tipki \"1/!\""
+msgid "Czech"
+msgstr "češka"
 
 #: ../rules/base.xml.in.h:172
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "Dvorak, Poljska - narekovaj na quotemark tipki"
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "češka (razporeditev UCW, samo posebni znaki)"
 
 #: ../rules/base.xml.in.h:173
-msgid "Eastern"
-msgstr "Vzhodni"
+msgid "Czech (US Dvorak with CZ UCW support)"
+msgstr "češka (am. Dvorak s podporo za češki UCW)"
 
-#: ../rules/base.xml.in.h:174 ../rules/sun.xml.in.h:49
-msgid "Eliminate dead keys"
-msgstr "Izloči mrtve tipke"
+#: ../rules/base.xml.in.h:174
+msgid "Czech (qwerty)"
+msgstr "češka (qwerty)"
 
 #: ../rules/base.xml.in.h:175
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
+msgid "Czech (qwerty, extended Backslash)"
+msgstr "češka (qwerty, razširjena leva poševnica)"
 
 #: ../rules/base.xml.in.h:176
-msgid "Epo"
-msgstr "Epo"
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "češka (s tipkami &lt;\\|&gt;)"
 
 #: ../rules/base.xml.in.h:177
-msgid "Ergonomic"
-msgstr "Ergonomsko"
+msgid "DTK2000"
+msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:178 ../rules/sun.xml.in.h:50
-msgid "Esp"
-msgstr "ESP"
+#: ../rules/base.xml.in.h:178
+msgid "Danish"
+msgstr "danska"
 
 #: ../rules/base.xml.in.h:179
-msgid "Esperanto"
-msgstr "Esperanto"
+msgid "Danish (Dvorak)"
+msgstr "danska (Dvorak)"
 
 #: ../rules/base.xml.in.h:180
-msgid "Est"
-msgstr "EST"
+msgid "Danish (Macintosh)"
+msgstr "danska (Macintosh)"
 
 #: ../rules/base.xml.in.h:181
-msgid "Estonia"
-msgstr "Estonija"
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "danska (Macintosh, izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:182
-msgid "Eth"
-msgstr "Eth"
+msgid "Danish (eliminate dead keys)"
+msgstr "danska (izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:183
-msgid "Ethiopia"
-msgstr "Etiopija"
+msgid "Default numeric keypad keys"
+msgstr "Privzete tipke številčnice"
 
 #: ../rules/base.xml.in.h:184
-msgid "Evdev-managed keyboard"
-msgstr "Evdev tipkovnica"
+msgid "Dell"
+msgstr "Dell"
 
 #: ../rules/base.xml.in.h:185
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
+msgid "Dell 101-key PC"
+msgstr "Tipkovnica Dell s 101 tipko PC"
 
 #: ../rules/base.xml.in.h:186
-msgid "Ewe"
-msgstr "Ewe"
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Inspiron 6xxx/8xxx - prenosniki"
 
 #: ../rules/base.xml.in.h:187
-msgid "Extended"
-msgstr "Razširjena"
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Precision M - prenosniki"
 
 #: ../rules/base.xml.in.h:188
-msgid "Extended Backslash"
-msgstr "Razširjena Backslash tipka"
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude - prenosniki"
 
 #: ../rules/base.xml.in.h:189
-msgid "F-letter (F) variant"
-msgstr "F-črka (F) varianta"
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
 
 #: ../rules/base.xml.in.h:190
-msgid "Fao"
-msgstr "FAO"
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
 
 #: ../rules/base.xml.in.h:191
-msgid "Faroe Islands"
-msgstr "Farski otoki"
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:192 ../rules/sun.xml.in.h:51
-msgid "Fin"
-msgstr "FIN"
+#: ../rules/base.xml.in.h:192
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia"
 
 #: ../rules/base.xml.in.h:193
-msgid "Finland"
-msgstr "Finska"
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop"
+
+#: ../rules/base.xml.in.h:194
+msgid "Dhivehi"
+msgstr "diveška"
+
+#: ../rules/base.xml.in.h:195
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802"
 
-#. This assumes the KP_ abstract symbols are actually useful for some apps
-#. The description needs to be rewritten
 #: ../rules/base.xml.in.h:196
-msgid "Four-level key with abstract separators"
-msgstr "Tipka četrte ravni z abstraktnimi ločilniki"
+msgid "Dutch"
+msgstr "nizozemska"
 
 #: ../rules/base.xml.in.h:197
-msgid "Four-level key with comma"
-msgstr "Tipka četrte ravni z vejico"
+msgid "Dutch (Macintosh)"
+msgstr "nizozemska (Macintosh)"
 
 #: ../rules/base.xml.in.h:198
-msgid "Four-level key with dot"
-msgstr "Tipka četrte ravni s piko"
+msgid "Dutch (Sun dead keys)"
+msgstr "nizozemska (Sun mrtve tipke)"
 
 #: ../rules/base.xml.in.h:199
-msgid "Four-level key with momayyez"
-msgstr "Tipka četrte ravni z arabskim decimalnim ločilnikom"
+msgid "Dutch (standard)"
+msgstr "nizozemska (standardna)"
 
-#: ../rules/base.xml.in.h:200 ../rules/sun.xml.in.h:53
-msgid "Fra"
-msgstr "FRA"
+#: ../rules/base.xml.in.h:200
+msgid "Dzongkha"
+msgstr "džonkška"
 
 #: ../rules/base.xml.in.h:201
-msgid "France"
-msgstr "Francija"
+msgid "Enable extra typographic characters"
+msgstr "Omogoči dodatne tipografske znake"
 
-#: ../rules/base.xml.in.h:202 ../rules/sun.xml.in.h:55
-msgid "French"
-msgstr "Francoska"
+#: ../rules/base.xml.in.h:202
+msgid "English (Cameroon Dvorak)"
+msgstr "angleška (Kamerun, Dvorak)"
 
 #: ../rules/base.xml.in.h:203
-msgid "French (Macintosh)"
-msgstr "Francosko (Macintosh)"
+#, fuzzy
+msgid "English (Cameroon qwerty)"
+msgstr "angleška (Kamerun)"
 
-#: ../rules/base.xml.in.h:204 ../rules/sun.xml.in.h:56
-msgid "French (legacy)"
-msgstr "Francoska (zapuščina)"
+#: ../rules/base.xml.in.h:204
+msgid "English (Cameroon)"
+msgstr "angleška (Kamerun)"
 
 #: ../rules/base.xml.in.h:205
-msgid "French Dvorak"
-msgstr "Francoski Dvorak"
+msgid "English (Canada)"
+msgstr "angleška (Kanada)"
 
 #: ../rules/base.xml.in.h:206
-msgid "French, Sun dead keys"
-msgstr "Francoska, Sun mrtve tipke"
+msgid "English (Colemak)"
+msgstr "angleška (Colemak)"
 
 #: ../rules/base.xml.in.h:207
-msgid "French, eliminate dead keys"
-msgstr "Francoska, izloči mrtve tipke"
+msgid "English (Dvorak alternative international no dead keys)"
+msgstr "angleška (Dvorak, alternativna mednarodna brez mrtvih tipk)"
 
 #: ../rules/base.xml.in.h:208
-msgid "Fula"
-msgstr "Fula"
+msgid "English (Dvorak international with dead keys)"
+msgstr "angleška (mednarodna Dvorak z mrtvimi tipkami)"
 
 #: ../rules/base.xml.in.h:209
-msgid "GBr"
-msgstr "GBR"
+msgid "English (Dvorak)"
+msgstr "angleška (Dvorak)"
 
 #: ../rules/base.xml.in.h:210
-msgid "Ga"
-msgstr "Ga"
+msgid "English (Ghana)"
+msgstr "angleška (Gana)"
 
 #: ../rules/base.xml.in.h:211
-msgid "Generic 101-key PC"
-msgstr "Splošna tipkovnica s 101 tipko PC"
+msgid "English (Ghana, GILLBT)"
+msgstr "angleška (Gana, GILLBT)"
 
 #: ../rules/base.xml.in.h:212
-msgid "Generic 102-key (Intl) PC"
-msgstr "Splošna tipkovnica s 102 tipkama (Intl) PC"
+msgid "English (Ghana, multilingual)"
+msgstr "angleška (Gana, večjezično)"
 
 #: ../rules/base.xml.in.h:213
-msgid "Generic 104-key PC"
-msgstr "Splošna tipkovnica s 104 tipkami PC"
+msgid "English (India, with RupeeSign)"
+msgstr "angleška (Indija, z znakom za rupijo)"
 
 #: ../rules/base.xml.in.h:214
-msgid "Generic 105-key (Intl) PC"
-msgstr "Splošna tipkovnica s 105 tipkami (Intl) PC"
+msgid "English (Macintosh)"
+msgstr "angleška (Macintosh)"
 
 #: ../rules/base.xml.in.h:215
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+msgid "English (Mali, US Macintosh)"
+msgstr "angleška (Mali, am. Macintosh)"
 
 #: ../rules/base.xml.in.h:216
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Tipkovnica KWD-910"
+msgid "English (Mali, US international)"
+msgstr "angleška (Mali, am. mednarodna)"
 
 #: ../rules/base.xml.in.h:217
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
+msgid "English (Nigeria)"
+msgstr "angleška (Nigerija)"
 
 #: ../rules/base.xml.in.h:218
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
+msgid "English (South Africa)"
+msgstr "angleška (Južna Afrika)"
 
 #: ../rules/base.xml.in.h:219
-msgid "Geo"
-msgstr "GEO"
+msgid "English (UK)"
+msgstr "angleška (Združeno kraljestvo)"
 
 #: ../rules/base.xml.in.h:220
-msgid "Georgia"
-msgstr "Gruzija"
+msgid "English (UK, Colemak)"
+msgstr "angleška (ZK, Colemak)"
 
 #: ../rules/base.xml.in.h:221
-msgid "Georgian"
-msgstr "Gruzijsko"
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "angleška (ZK, Dvorak z angl. ločili)"
 
 #: ../rules/base.xml.in.h:222
-msgid "German (Macintosh)"
-msgstr "Nemško (Macintosh)"
+msgid "English (UK, Dvorak)"
+msgstr "angleška (ZK, Dvorak)"
 
 #: ../rules/base.xml.in.h:223
-msgid "German, Sun dead keys"
-msgstr "Nemška, Sun mrtve tipke"
+msgid "English (UK, Macintosh international)"
+msgstr "angleška (ZK, Macintosh, mednarodna)"
 
 #: ../rules/base.xml.in.h:224
-msgid "German, eliminate dead keys"
-msgstr "Nemška, izloči mrtve tipke"
+msgid "English (UK, Macintosh)"
+msgstr "angleška (ZK, Macintosh)"
 
 #: ../rules/base.xml.in.h:225
-msgid "Germany"
-msgstr "Nemčija"
+msgid "English (UK, extended WinKeys)"
+msgstr "angleška (ZK, razširjena WinKeys)"
 
 #: ../rules/base.xml.in.h:226
-msgid "Gha"
-msgstr "Gha"
+msgid "English (UK, international with dead keys)"
+msgstr "angleška (ZDA, mednarodna z mrtvimi tipkami)"
 
-#: ../rules/base.xml.in.h:227
-msgid "Ghana"
-msgstr "Gana"
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+msgid "English (US)"
+msgstr "angleška (ZDA)"
 
 #: ../rules/base.xml.in.h:228
-msgid "Gre"
-msgstr "GRE"
+msgid "English (US, alternative international)"
+msgstr "angleška (ZDA, alternativna mednarodna)"
 
 #: ../rules/base.xml.in.h:229
-msgid "Greece"
-msgstr "Grčija"
+msgid "English (US, international with dead keys)"
+msgstr "angleška (ZDA, mednarodna z mrtvimi tipkami)"
 
 #: ../rules/base.xml.in.h:230
-msgid "Gui"
-msgstr "Gui"
+msgid "English (US, with euro on 5)"
+msgstr "angleška (ZDA, z znakom za evro na tipki 5)"
 
 #: ../rules/base.xml.in.h:231
-msgid "Guinea"
-msgstr "Gvineja"
+msgid "English (classic Dvorak)"
+msgstr "angleška (klasični Dvorak)"
 
 #: ../rules/base.xml.in.h:232
-msgid "Gujarati"
-msgstr "Gujarati (Indija)"
+msgid "English (international AltGr dead keys)"
+msgstr "angleška (mednarodna z mrtvimi tipkami AltGr)"
 
 #: ../rules/base.xml.in.h:233
-msgid "Gurmukhi"
-msgstr "Gurmukhi (Indija)"
+msgid "English (layout toggle on multiply/divide key)"
+msgstr "angleška (preklop postavitve s tipko za množenje/deljenje)"
 
 #: ../rules/base.xml.in.h:234
-msgid "Gyration"
-msgstr "Gyration tipkovnica"
+msgid "English (left handed Dvorak)"
+msgstr "angleška (levoročni Dvorak)"
 
 #: ../rules/base.xml.in.h:235
-msgid "Happy Hacking Keyboard"
-msgstr "Happy Hacking tipkovnica"
+msgid "English (programmer Dvorak)"
+msgstr "angleška (programerska, Dvorak)"
 
 #: ../rules/base.xml.in.h:236
-msgid "Happy Hacking Keyboard for Mac"
-msgstr "Happy Hacking tipkovnica za Mac"
+msgid "English (right handed Dvorak)"
+msgstr "angleška (desnoročni Dvorak)"
 
 #: ../rules/base.xml.in.h:237
-msgid "Hausa"
-msgstr "Hausa"
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
 
 #: ../rules/base.xml.in.h:238
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet Tipkovnica"
+msgid "Enter on keypad"
+msgstr "Vnašalka (Enter) na številčnici"
 
 #: ../rules/base.xml.in.h:239
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
+msgid "Esperanto"
+msgstr "Esperanto"
 
 #: ../rules/base.xml.in.h:240
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Esperanto (Portugalska, nativo)"
 
 #: ../rules/base.xml.in.h:241
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr "Esperanto (premeščena podpičje in narekovaj, zastarelo)"
 
 #: ../rules/base.xml.in.h:242
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
+msgid "Estonian"
+msgstr "estonska"
 
 #: ../rules/base.xml.in.h:243
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
+msgid "Estonian (Dvorak)"
+msgstr "estonska (Dvorak)"
 
 #: ../rules/base.xml.in.h:244
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr "estonska (am. tipkovnica z estonskimi črkami)"
 
 #: ../rules/base.xml.in.h:245
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
+msgid "Estonian (eliminate dead keys)"
+msgstr "estonska (izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:246
-msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-2501 Multimedijska Tipkovnica"
+msgid "Euro on 2"
+msgstr "Z evro-znakom na tipki 2"
 
 #: ../rules/base.xml.in.h:247
-msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-msgstr "Hewlett-Packard SK-2505 Internet Tipkovnica"
+msgid "Euro on 4"
+msgstr "Z evro-znakom na tipki 4"
 
 #: ../rules/base.xml.in.h:248
-msgid "Hindi Bolnagri"
-msgstr "Hindi Bolnagri"
+msgid "Euro on 5"
+msgstr "Z evro-znakom na tipki 5"
 
 #: ../rules/base.xml.in.h:249
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
+msgid "Euro on E"
+msgstr "Z evro-znakom na tipki E"
 
 #: ../rules/base.xml.in.h:250
-msgid "Hrv"
-msgstr "HRV"
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:251 ../rules/sun.xml.in.h:59
-msgid "Hun"
-msgstr "HUN"
+#: ../rules/base.xml.in.h:251
+msgid "Ewe"
+msgstr "ewejska"
 
 #: ../rules/base.xml.in.h:252
-msgid "Hungary"
-msgstr "Madžarska"
+msgid "FL90"
+msgstr "FL90"
 
 #: ../rules/base.xml.in.h:253
-msgid "Hyper is mapped to the Win-keys."
-msgstr "Hiper tipko prevzameta Win tipki."
+msgid "Faroese"
+msgstr "farojska"
 
 #: ../rules/base.xml.in.h:254
-msgid "IBM (LST 1205-92)"
-msgstr "IBM (LST 1205-92)"
+msgid "Faroese (eliminate dead keys)"
+msgstr "farojska (izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:255
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
+msgid "Filipino"
+msgstr "filipinska"
 
 #: ../rules/base.xml.in.h:256
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr "filipinska (Capewell-Dvorak, bajbajinska)"
 
 #: ../rules/base.xml.in.h:257
-msgid "IBM Rapid Access II (alternate option)"
-msgstr "IBM Rapid Access II (druga izbira)"
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr "filipinska (Capewell-Dvorak, latinična)"
 
 #: ../rules/base.xml.in.h:258
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr "filipinska (Capewell-QWERF 2006, bajbajinska)"
 
 #: ../rules/base.xml.in.h:259
-msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr "filipinska (Capewell-QWERF 2006, latinična)"
 
-#: ../rules/base.xml.in.h:260 ../rules/sun.xml.in.h:61
-msgid "ISO Alternate"
-msgstr "ISO Alternirajoče"
+#: ../rules/base.xml.in.h:260
+msgid "Filipino (Colemak Baybayin)"
+msgstr "filipinska (Colemak, bajbajinska)"
 
 #: ../rules/base.xml.in.h:261
-msgid "Iceland"
-msgstr "Islandija"
+msgid "Filipino (Colemak Latin)"
+msgstr "filipinska (Colemak, latinična)"
 
 #: ../rules/base.xml.in.h:262
-msgid "Igbo"
-msgstr "Igbo"
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "filipinska (Dvorak, bajbajinska)"
 
 #: ../rules/base.xml.in.h:263
-msgid "Ind"
-msgstr "IND"
+msgid "Filipino (Dvorak Latin)"
+msgstr "filipinska (Dvorak, latinica)"
 
 #: ../rules/base.xml.in.h:264
-msgid "India"
-msgstr "Indija"
+msgid "Filipino (QWERTY Baybayin)"
+msgstr "filipinska (QWERTY, bajbajinska)"
 
 #: ../rules/base.xml.in.h:265
-msgid "International (AltGr dead keys)"
-msgstr "Mednarodna (z mrtvimi AltGr tipkami)"
+msgid "Finnish"
+msgstr "finska"
 
-#: ../rules/base.xml.in.h:266 ../rules/sun.xml.in.h:62
-msgid "International (with dead keys)"
-msgstr "Mednarodna (z mrtvimi tipkami)"
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
+msgstr "finska (Macintosh)"
 
 #: ../rules/base.xml.in.h:267
-msgid "Inuktitut"
-msgstr "Inuktitut (Inuiti)"
+msgid "Finnish (classic)"
+msgstr "finska (klasična)"
 
 #: ../rules/base.xml.in.h:268
-msgid "Iran"
-msgstr "Iran"
-
-#: ../rules/base.xml.in.h:269
-msgid "Iraq"
-msgstr "Iraq"
-
-#: ../rules/base.xml.in.h:270
-msgid "Ireland"
-msgstr "Irska"
+msgid "Finnish (classic, eliminate dead keys)"
+msgstr "finska (klasična, izloči mrtve tipke)"
 
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
 #: ../rules/base.xml.in.h:271
-msgid "Irl"
-msgstr "IRL"
+msgid "Four-level key with abstract separators"
+msgstr "Tipka četrte ravni z abstraktnimi ločilniki"
 
 #: ../rules/base.xml.in.h:272
-msgid "Irn"
-msgstr "IRN"
+msgid "Four-level key with comma"
+msgstr "Tipka četrte ravni z vejico"
 
 #: ../rules/base.xml.in.h:273
-msgid "Irq"
-msgstr "Irq"
+msgid "Four-level key with dot"
+msgstr "Tipka četrte ravni s piko"
 
 #: ../rules/base.xml.in.h:274
-msgid "Isl"
-msgstr "ISL"
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Tipka četrte ravni s piko, omejitev latin-9"
 
 #: ../rules/base.xml.in.h:275
-msgid "Isr"
-msgstr "ISR"
+msgid "Four-level key with momayyez"
+msgstr "Tipka četrte ravni z arabskim decimalnim ločilnikom"
 
 #: ../rules/base.xml.in.h:276
-msgid "Israel"
-msgstr "Izrael"
+msgid "French"
+msgstr "francoska"
 
-#: ../rules/base.xml.in.h:277 ../rules/sun.xml.in.h:63
-msgid "Ita"
-msgstr "ITA"
+#: ../rules/base.xml.in.h:277
+msgid "French (Bepo, ergonomic, Dvorak way)"
+msgstr "francoska (Bepo, ergonomska, Dvorak)"
 
 #: ../rules/base.xml.in.h:278
-msgid "Italy"
-msgstr "Italija"
+msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
+msgstr "francoska (Bepo, ergonomska, Dvorak, latin-9)"
 
 #: ../rules/base.xml.in.h:279
-msgid "Japan"
-msgstr "Japonska"
+msgid "French (Breton)"
+msgstr "francoska (Bretonska)"
 
 #: ../rules/base.xml.in.h:280
-msgid "Japan (PC-98xx Series)"
-msgstr "Japonska (PC-98xx Serija)"
+#, fuzzy
+msgid "French (Cameroon azerty)"
+msgstr "francoska (Kamerun)"
 
 #: ../rules/base.xml.in.h:281
-msgid "Japanese 106-key"
-msgstr "Japonska tipkovnica s 106 tipkami"
+msgid "French (Cameroon)"
+msgstr "francoska (Kamerun)"
 
-#: ../rules/base.xml.in.h:282
-msgid "Japanese keyboard options"
-msgstr "Japonske možnosti tipkovnice"
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "francoska (Kanada)"
 
-#: ../rules/base.xml.in.h:283 ../rules/sun.xml.in.h:66
-msgid "Jpn"
-msgstr "JPN"
+#: ../rules/base.xml.in.h:283
+msgid "French (Canada, Dvorak)"
+msgstr "francoska (Kanada, Dvorak)"
 
 #: ../rules/base.xml.in.h:284
-msgid "Kana"
-msgstr "Kana"
+msgid "French (Canada, legacy)"
+msgstr "francoska (Kanada, starinska)"
 
 #: ../rules/base.xml.in.h:285
-msgid "Kana Lock key is locking"
-msgstr "Kana Lock tipka zaklepa"
+msgid "French (Democratic Republic of the Congo)"
+msgstr "francoska (Demokratična republika Kongo)"
 
 #: ../rules/base.xml.in.h:286
-msgid "Kannada"
-msgstr "Kannada (Indija)"
+msgid "French (Dvorak)"
+msgstr "francoska (Dvorak)"
 
 #: ../rules/base.xml.in.h:287
-msgid "Kashubian"
-msgstr "Kasubija"
+msgid "French (Guinea)"
+msgstr "francoska (Gvineja)"
 
 #: ../rules/base.xml.in.h:288
-msgid "Kaz"
-msgstr "Kaz"
+msgid "French (Macintosh)"
+msgstr "francoska (Macintosh)"
 
 #: ../rules/base.xml.in.h:289
-msgid "Kazakh with Russian"
-msgstr "Kazahstanščina z Rusščino"
+msgid "French (Mali, alternative)"
+msgstr "francoska (Mali, alternativna)"
 
 #: ../rules/base.xml.in.h:290
-msgid "Kazakhstan"
-msgstr "Kazakhstan"
+msgid "French (Morocco)"
+msgstr "francoska (Maroko)"
 
 #: ../rules/base.xml.in.h:291
-msgid "Keypad"
-msgstr "Tipkovna plošča"
+msgid "French (Sun dead keys)"
+msgstr "francoska (mrtve tipke Sun)"
 
 #: ../rules/base.xml.in.h:292
-msgid "Keypad with unicode additions (arrows and math operators)"
-msgstr "Tipkovnica z unicode dodatki (puščice in matematični opratorji)"
+msgid "French (Switzerland)"
+msgstr "francoska (Švica)"
 
 #: ../rules/base.xml.in.h:293
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Tipkovnica zt unicode dodatki (puščice in matematični opratorji). Matematični operatorji so na prvi ravni."
+msgid "French (Switzerland, Macintosh)"
+msgstr "francoska (Švica, Macintosh)"
 
 #: ../rules/base.xml.in.h:294
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
+msgid "French (Switzerland, Sun dead keys)"
+msgstr "francoska (Švica, Sun mrtve tipke)"
 
 #: ../rules/base.xml.in.h:295
-msgid "Khm"
-msgstr "Khm"
+msgid "French (Switzerland, eliminate dead keys)"
+msgstr "francoska (Švica, izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:296
-msgid "Kor"
-msgstr "Kor"
+msgid "French (alternative)"
+msgstr "francoska (alternativna)"
 
 #: ../rules/base.xml.in.h:297
-msgid "Korea, Republic of"
-msgstr "Koreja, Republika"
+msgid "French (alternative, Sun dead keys)"
+msgstr "francoska (alternativna, Sun mrtve tipke)"
 
 #: ../rules/base.xml.in.h:298
-msgid "Korean 106-key"
-msgstr "Korejska tipkovnica s 106 tipkami"
+msgid "French (alternative, eliminate dead keys)"
+msgstr "francoska (alternativna, izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:299
-msgid "Kotoistus"
-msgstr "Kotoistus"
+msgid "French (alternative, latin-9 only)"
+msgstr "francoska (alternativna, le latinsko-9)"
 
 #: ../rules/base.xml.in.h:300
-msgid "Kurdish, (F)"
-msgstr "Kurdščina, (F)"
+msgid "French (eliminate dead keys)"
+msgstr "francoska (izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:301
-msgid "Kurdish, Arabic-Latin"
-msgstr "Kurdščina, Arabska-Latinska"
+msgid "French (legacy, alternative)"
+msgstr "francoska (starinska, alternativna)"
 
 #: ../rules/base.xml.in.h:302
-msgid "Kurdish, Latin Alt-Q"
-msgstr "Kurdska, Latinska Alt-Q"
+msgid "French (legacy, alternative, Sun dead keys)"
+msgstr "francoska (starinska, alternativna, Sun mrtve tipke)"
 
 #: ../rules/base.xml.in.h:303
-msgid "Kurdish, Latin Q"
-msgstr "Kurdščina, Latinsko Q"
+msgid "French (legacy, alternative, eliminate dead keys)"
+msgstr "francoska (starinska, alternativna, izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:304
-msgid "Kyr"
-msgstr "KYR"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO - prenosnik"
 
 #: ../rules/base.xml.in.h:305
-msgid "Kyrgyzstan"
-msgstr "Kirgizistan"
+msgid "Fula"
+msgstr "fulska"
 
 #: ../rules/base.xml.in.h:306
-msgid "LAm"
-msgstr "LAM"
+msgid "Ga"
+msgstr "Ga"
 
 #: ../rules/base.xml.in.h:307
-msgid "LCtrl+LShift change layout."
-msgstr "Ctrl+Shift zamenjata razporeditev."
+msgid "Generic 101-key PC"
+msgstr "Splošna tipkovnica s 101 tipko PC"
 
 #: ../rules/base.xml.in.h:308
-msgid "Lao"
-msgstr "LAO"
+msgid "Generic 102-key (Intl) PC"
+msgstr "Splošna tipkovnica s 102 tipkama (medn.) PC"
 
 #: ../rules/base.xml.in.h:309
-msgid "Laos"
-msgstr "Laos"
+msgid "Generic 104-key PC"
+msgstr "Splošna tipkovnica s 104 tipkami PC"
 
 #: ../rules/base.xml.in.h:310
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Tipkovnica"
+msgid "Generic 105-key (Intl) PC"
+msgstr "Splošna tipkovnica s 105 tipkami (medn.) PC"
 
 #: ../rules/base.xml.in.h:311
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Laptop/notebook Compaq (eg. Presario) Internet Tipkovnica"
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
 
 #: ../rules/base.xml.in.h:312
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "Laptop/notebook eMachines m68xx"
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM KWD-910"
 
 #: ../rules/base.xml.in.h:313
-msgid "Latin"
-msgstr "Latinsko"
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
 
 #: ../rules/base.xml.in.h:314
-msgid "Latin American"
-msgstr "Latinsko Ameriško"
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
 
 #: ../rules/base.xml.in.h:315
-msgid "Latin Unicode"
-msgstr "Latinsko Unicode"
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
 
 #: ../rules/base.xml.in.h:316
-msgid "Latin Unicode qwerty"
-msgstr "Latinski Unicode Dvorak"
+msgid "Georgian"
+msgstr "gruzijska"
 
 #: ../rules/base.xml.in.h:317
-msgid "Latin qwerty"
-msgstr "Latinski qwerty"
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "gruzijska (Francija, AZERTY Tskapo)"
 
 #: ../rules/base.xml.in.h:318
-msgid "Latin with guillemets"
-msgstr "Latinsko s francoskimi narekovaji (guillemets)"
+msgid "Georgian (Italy)"
+msgstr "gruzijska (Italija)"
 
 #: ../rules/base.xml.in.h:319
-msgid "Latvia"
-msgstr "Latvija"
+msgid "Georgian (MESS)"
+msgstr "gruzijska (MESS)"
 
 #: ../rules/base.xml.in.h:320
-msgid "Layout switching"
-msgstr "Zamenjava razporeditve"
+msgid "Georgian (ergonomic)"
+msgstr "gruzijska (ergonomska)"
 
 #: ../rules/base.xml.in.h:321
-msgid "Left Alt is swapped with left Win-key."
-msgstr "Levi Alt zamenja leva Win tipka."
+msgid "German"
+msgstr "nemška"
 
 #: ../rules/base.xml.in.h:322
-msgid "Left Alt key changes layout."
-msgstr "Leva Alt tipka zamenja razporeditev."
+msgid "German (Austria)"
+msgstr "nemška (Avstrija)"
 
 #: ../rules/base.xml.in.h:323
-msgid "Left Alt key switches layout while pressed."
-msgstr "Leva Alt tipka zamenja razporeditev ob stisku."
+msgid "German (Austria, Macintosh)"
+msgstr "nemška (Avstrija, Macintosh)"
 
 #: ../rules/base.xml.in.h:324
-msgid "Left Ctrl key changes layout."
-msgstr "Leva Ctrl tipka zamenja razporeditev."
+msgid "German (Austria, Sun dead keys)"
+msgstr "nemška (Avstrija, Sun mrtve tipke)"
 
 #: ../rules/base.xml.in.h:325
-msgid "Left Shift key changes layout."
-msgstr "Leva Shift tipka zamenja razporeditev."
+msgid "German (Austria, eliminate dead keys)"
+msgstr "nemška (Avstrija, izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:326
-msgid "Left Win-key changes layout."
-msgstr "Leva Win tipka zamenja razporeditev."
+msgid "German (Dvorak)"
+msgstr "nemška (Dvorak)"
 
 #: ../rules/base.xml.in.h:327
-msgid "Left Win-key is Compose."
-msgstr "Leva Win tipka je pred-tipka (Compose)"
+msgid "German (Macintosh)"
+msgstr "nemška (Macintosh)"
 
 #: ../rules/base.xml.in.h:328
-msgid "Left Win-key switches layout while pressed."
-msgstr "Leva Win tipka zamenja razporeditev ob stisku."
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "nemška (Macintosh, izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:329
-msgid "Left hand"
-msgstr "Levoročna"
+msgid "German (Neo 2)"
+msgstr "nemška (Neo 2)"
 
 #: ../rules/base.xml.in.h:330
-msgid "Left handed Dvorak"
-msgstr "Levoročni Dvorak"
+msgid "German (Sun dead keys)"
+msgstr "nemška (Sun mrtve tipke)"
 
 #: ../rules/base.xml.in.h:331
-msgid "Legacy Wang 724 keypad"
-msgstr "Zapuščena tipka Wang 724 tipkovnica"
+msgid "German (Switzerland)"
+msgstr "nemška (Švica)"
+
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
+msgstr "nemška (Švica, Macintosh)"
 
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:333
-msgid "Legacy key with comma"
-msgstr "Zapuščena tipka z vejico"
+msgid "German (Switzerland, Sun dead keys)"
+msgstr "nemška (Švica, Sun mrtve tipke)"
 
 #: ../rules/base.xml.in.h:334
-msgid "Legacy key with dot"
-msgstr "Zapuščena tipka s piko "
+msgid "German (Switzerland, eliminate dead keys)"
+msgstr "nemška (Švica, izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:335
-msgid "Legacy keypad"
-msgstr "Zapuščena tipkovnica "
+msgid "German (Switzerland, legacy)"
+msgstr "nemška (Švica, starinska)"
 
 #: ../rules/base.xml.in.h:336
-msgid "Lithuania"
-msgstr "Litva"
+msgid "German (dead acute)"
+msgstr "nemška (mrtvi ostrivec)"
 
 #: ../rules/base.xml.in.h:337
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Tipkovnica"
+msgid "German (dead grave acute)"
+msgstr "nemška (mrtvi krativec)"
 
 #: ../rules/base.xml.in.h:338
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
+msgid "German (eliminate dead keys)"
+msgstr "nemška (izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:339
-msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "Logitech Cordless Desktop"
+#, fuzzy
+msgid "German (qwerty)"
+msgstr "arabska (qwerty)"
 
 #: ../rules/base.xml.in.h:340
-msgid "Logitech Cordless Desktop EX110"
-msgstr "Logitech Cordless Desktop EX110"
+msgid "Greek"
+msgstr "grška"
 
 #: ../rules/base.xml.in.h:341
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300"
+msgid "Greek (eliminate dead keys)"
+msgstr "grška (izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:342
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
+msgid "Greek (extended)"
+msgstr "grška (razširjena)"
 
 #: ../rules/base.xml.in.h:343
-msgid "Logitech Cordless Desktop Pro (alternate option2)"
-msgstr "Logitech Cordless Desktop Pro (alternate option2)"
+msgid "Greek (polytonic)"
+msgstr "grška (politonična)"
 
 #: ../rules/base.xml.in.h:344
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
+msgid "Greek (simple)"
+msgstr "grška (enostavna)"
 
 #: ../rules/base.xml.in.h:345
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15 z dodatnimi tipkami preko G15daemon"
+msgid "Gujarati"
+msgstr "gujaratska"
 
 #: ../rules/base.xml.in.h:346
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Tipkovnica"
+msgid "Gyration"
+msgstr "Gyration"
 
 #: ../rules/base.xml.in.h:347
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet NavigatorTipkovnica"
+msgid "HTC Dream"
+msgstr "HTC Dream"
 
 #: ../rules/base.xml.in.h:348
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X Tipkovnica"
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking"
 
 #: ../rules/base.xml.in.h:349
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech diNovo Tipkovnica"
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking za Mac"
 
 #: ../rules/base.xml.in.h:350
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
+msgid "Hausa"
+msgstr "Hausa"
 
 #: ../rules/base.xml.in.h:351
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Brezžična Tipkovnica (model Y-RB6)"
+msgid "Hebrew"
+msgstr "hebrejska"
 
 #: ../rules/base.xml.in.h:352
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech Internet NavigatorTipkovnica SE"
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "hebrejska (biblična, Tiro)"
 
 #: ../rules/base.xml.in.h:353
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech Internet NavigatorTipkovnica SE (USB)"
+msgid "Hebrew (lyx)"
+msgstr "hebrejska (lyx)"
 
 #: ../rules/base.xml.in.h:354
-msgid "Ltu"
-msgstr "LTU"
+msgid "Hebrew (phonetic)"
+msgstr "hebrejska (fonetična)"
 
 #: ../rules/base.xml.in.h:355
-msgid "Lva"
-msgstr "LVA"
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet"
 
 #: ../rules/base.xml.in.h:356
-msgid "MESS"
-msgstr "MESS"
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 - notesnik"
 
 #: ../rules/base.xml.in.h:357
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
 
 #: ../rules/base.xml.in.h:358
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (Intl)"
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
 
 #: ../rules/base.xml.in.h:359
-msgid "Macedonia"
-msgstr "Makedonija"
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
 
 #: ../rules/base.xml.in.h:360
-msgid "Macintosh"
-msgstr "Macintosh"
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
 
 #: ../rules/base.xml.in.h:361
-msgid "Macintosh Old"
-msgstr "Macintosh Old"
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
 
 #: ../rules/base.xml.in.h:362
-msgid "Macintosh, Sun dead keys"
-msgstr "Macintosh, Sun mrtve tipke"
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
 
 #: ../rules/base.xml.in.h:363
-msgid "Macintosh, eliminate dead keys"
-msgstr "Macintosh, izloči mrtve tipke"
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
 
 #: ../rules/base.xml.in.h:364
-msgid "Make CapsLock an additional Ctrl."
-msgstr "CapsLock je dodatna Ctrl tipka."
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
 
 #: ../rules/base.xml.in.h:365
-msgid "Mal"
-msgstr "Mal"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia"
 
 #: ../rules/base.xml.in.h:366
-msgid "Malayalam"
-msgstr "Malajalam"
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
 
 #: ../rules/base.xml.in.h:367
-msgid "Maldives"
-msgstr "Maldivi"
+msgid "Hexadecimal"
+msgstr "šestnajstiška"
 
 #: ../rules/base.xml.in.h:368
-msgid "Malta"
-msgstr "Malta"
+msgid "Hindi (Bolnagri)"
+msgstr "Hindi (Bolnagri)"
 
 #: ../rules/base.xml.in.h:369
-msgid "Maltese keyboard with US layout"
-msgstr "Malteška tipkovnica z US naborom"
+msgid "Hindi (Wx)"
+msgstr "Hindi (Wx)"
 
 #: ../rules/base.xml.in.h:370
-msgid "Mao"
-msgstr "MAO"
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
 
 #: ../rules/base.xml.in.h:371
-msgid "Maori"
-msgstr "Maori"
+msgid "Htc Dream phone"
+msgstr "Htc Dream - telefon"
 
 #: ../rules/base.xml.in.h:372
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
+msgid "Hungarian"
+msgstr "madžarska"
 
 #: ../rules/base.xml.in.h:373
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access Tipkovnica"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr "madžarska (101/qwerty/vejica/mrtve tipke)"
 
 #: ../rules/base.xml.in.h:374
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr "madžarska (101/qwerty/vejica/izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:375
-msgid "Menu is Compose."
-msgstr "Menu deluje kot "
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr "madžarska (101/qwerty/pika/mrtve tipke)"
 
 #: ../rules/base.xml.in.h:376
-msgid "Menu key changes layout."
-msgstr "Menu tipka zamenja razporeditev."
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr "madžarska (101/qwerty/pika/izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:377
-msgid "Meta is mapped to the Win-keys."
-msgstr "Meta funkcionalnost prevzameta Win tipki."
+msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgstr "madžarska (101/qwertz/vejica/mrtve tipke)"
 
 #: ../rules/base.xml.in.h:378
-msgid "Meta is mapped to the left Win-key."
-msgstr "Meta funkcionalnost prevzame leva Win tipka."
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr "madžarska (101/qwertz/vejica/izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:379
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoftova Internetna Tipkovnica"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgstr "madžarska (101/qwertz/pika/mrtve tipke)"
 
 #: ../rules/base.xml.in.h:380
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Tipkovnica Pro, Švedska"
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr "madžarska (101/qwertz/pika/izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:381
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgstr "madžarska (102/qwerty/vejica/mrtve tipke)"
 
 #: ../rules/base.xml.in.h:382
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Tipkovnica Pro / Microsoft Internet Tipkovnica Pro"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgstr "madžarska (102/qwerty/vejica/izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:383
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Tipkovnica Pro OEM"
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr "madžarska (102/qwerty/pika/mrtve tipke)"
 
 #: ../rules/base.xml.in.h:384
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Tipkovnica Pro USB / Microsoft Internet Tipkovnica Pro"
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgstr "madžarska (102/qwerty/pika/izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:385
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office Tipkovnica"
+msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgstr "madžarska (102/qwertz/vejica/mrtve tipke)"
 
 #: ../rules/base.xml.in.h:386
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Brezžična Multimedijska Tipkovnica 1.0A"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgstr "madžarska (102/qwertz/vejica/izloči mrtve tipke)"
 
-#: ../rules/base.xml.in.h:387 ../rules/sun.xml.in.h:72
-msgid "Miscellaneous compatibility options"
-msgstr "Možnosti ostalih združljivosti"
+#: ../rules/base.xml.in.h:387
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr "madžarska (102/qwertz/pika/mrtve tipke)"
 
 #: ../rules/base.xml.in.h:388
-msgid "Mkd"
-msgstr "MKD"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr "madžarska (102/qwertz/pika/izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:389
-msgid "Mlt"
-msgstr "MLT"
+msgid "Hungarian (eliminate dead keys)"
+msgstr "madžarska (izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:390
-msgid "Mmr"
-msgstr "MMR"
+msgid "Hungarian (qwerty)"
+msgstr "madžarska (qwerty)"
 
 #: ../rules/base.xml.in.h:391
-msgid "Mng"
-msgstr "MNG"
+msgid "Hungarian (standard)"
+msgstr "madžarska (standardna)"
 
 #: ../rules/base.xml.in.h:392
-msgid "Mongolia"
-msgstr "Mongolija"
+msgid "Hyper is mapped to Win-keys"
+msgstr "Tipka Hiper je preslikana na tipki Win"
 
 #: ../rules/base.xml.in.h:393
-msgid "Morocco"
-msgstr "Maroko"
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:394 ../rules/sun.xml.in.h:73
-msgid "Multilingual"
-msgstr "Večjezično"
+#: ../rules/base.xml.in.h:394
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
 
 #: ../rules/base.xml.in.h:395
-msgid "Multilingual, first part"
-msgstr "Večjezično, prvi del"
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:396 ../rules/sun.xml.in.h:74
-msgid "Multilingual, second part"
-msgstr "Večjezično, drugi del"
+#: ../rules/base.xml.in.h:396
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:397
-msgid "Myanmar"
-msgstr "Myanmar (Burma)"
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
 
 #: ../rules/base.xml.in.h:398
-msgid "NICOLA-F style Backspace"
-msgstr "NICOLA-F style Backspace"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
 #: ../rules/base.xml.in.h:399
-msgid "Neostyle"
-msgstr "Neostil"
+msgid "Icelandic"
+msgstr "islandska"
 
 #: ../rules/base.xml.in.h:400
-msgid "Nep"
-msgstr "Nep"
+msgid "Icelandic (Dvorak)"
+msgstr "islandska (Dvorak)"
 
 #: ../rules/base.xml.in.h:401
-msgid "Nepal"
-msgstr "Nepal"
+msgid "Icelandic (Macintosh)"
+msgstr "islandska (Macintosh)"
 
 #: ../rules/base.xml.in.h:402
-msgid "Netherlands"
-msgstr "Nizozemska"
+msgid "Icelandic (Sun dead keys)"
+msgstr "islandska (Sun mrtve tipke)"
 
 #: ../rules/base.xml.in.h:403
-msgid "Nig"
-msgstr "Nig"
+msgid "Icelandic (eliminate dead keys)"
+msgstr "islandska (izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:404
-msgid "Nigeria"
-msgstr "Nigerija"
+msgid "Igbo"
+msgstr "igbojska"
 
 #: ../rules/base.xml.in.h:405
-msgid "Nld"
-msgstr "NLD"
+msgid "Indian"
+msgstr "indijska"
 
-#: ../rules/base.xml.in.h:406 ../rules/sun.xml.in.h:75
-msgid "Nor"
-msgstr "NOR"
+#: ../rules/base.xml.in.h:406
+msgid "Inuktitut"
+msgstr "inuktitutska (inuitska)"
 
 #: ../rules/base.xml.in.h:407
-msgid "Northern Saami"
-msgstr "Severni Saami (Laponci)"
+msgid "Iraqi"
+msgstr "iraška"
 
 #: ../rules/base.xml.in.h:408
-msgid "Northern Saami, eliminate dead keys"
-msgstr "Severni Saami, Izloči mrtve tipke"
+msgid "Irish"
+msgstr "irska"
 
 #: ../rules/base.xml.in.h:409
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
+msgid "Irish (UnicodeExpert)"
+msgstr "irska (UnicodeExpert)"
 
 #: ../rules/base.xml.in.h:410
-msgid "Norway"
-msgstr "Norveška"
+msgid "Italian"
+msgstr "italijanska"
 
 #: ../rules/base.xml.in.h:411
-msgid "NumLock LED shows alternative layout."
-msgstr "NumLock LED kaže alternativno razporeditev."
+msgid "Italian (Macintosh)"
+msgstr "italijanska (Macintosh)"
 
 #: ../rules/base.xml.in.h:412
-msgid "Numeric keypad delete key behaviour"
-msgstr "Obnašanje tipke delete na numerični tipkovnici"
+msgid "Italian (US keyboard with Italian letters)"
+msgstr "italijanska (am. tipkovnica z italijanskimi črkami)"
 
 #: ../rules/base.xml.in.h:413
-msgid "Numeric keypad keys work as with Mac."
-msgstr "Številčnica deluje kot pod MacOS."
+msgid "Italian (eliminate dead keys)"
+msgstr "italijanska (izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:414
-msgid "Numeric keypad layout selection"
-msgstr "Numerična tipkovnica izbira razporeditev"
+msgid "Japanese"
+msgstr "japonska"
 
 #: ../rules/base.xml.in.h:415
-msgid "OADG 109A"
-msgstr "OADG 109A"
+msgid "Japanese (Kana 86)"
+msgstr "japonska (Kana 86)"
 
 #: ../rules/base.xml.in.h:416
-msgid "Ogham"
-msgstr "Ogham (Kelti)"
+msgid "Japanese (Kana)"
+msgstr "japonska (Kana)"
 
 #: ../rules/base.xml.in.h:417
-msgid "Ogham IS434"
-msgstr "Ogham IS434 (Kelti)"
+msgid "Japanese (Macintosh)"
+msgstr "japonska (Macintosh)"
 
 #: ../rules/base.xml.in.h:418
-msgid "Oriya"
-msgstr "Oriya (Indija)"
+msgid "Japanese (OADG 109A)"
+msgstr "japonska (OADG 109A)"
 
 #: ../rules/base.xml.in.h:419
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Ortek MCK-800 MM"
+msgid "Japanese (PC-98xx Series)"
+msgstr "japonska (PC-98xx)"
 
 #: ../rules/base.xml.in.h:420
-msgid "Ossetian"
-msgstr "Osetija"
+msgid "Japanese keyboard options"
+msgstr "Japonske možnosti tipkovnice"
 
 #: ../rules/base.xml.in.h:421
-msgid "Ossetian, Winkeys"
-msgstr "Osetijščina, Wintipke"
+msgid "Kalmyk"
+msgstr "kalmiška"
 
 #: ../rules/base.xml.in.h:422
-msgid "PC-98xx Series"
-msgstr "PC-98xx Serije"
+msgid "Kana Lock key is locking"
+msgstr "Tipka za zaklep Kana lahko zaklepa"
 
 #: ../rules/base.xml.in.h:423
-msgid "Pak"
-msgstr "PAK"
+msgid "Kannada"
+msgstr "kannadska (Indija)"
 
 #: ../rules/base.xml.in.h:424
-msgid "Pakistan"
-msgstr "Pakistan"
+msgid "Kashubian"
+msgstr "kašubska"
 
 #: ../rules/base.xml.in.h:425
-msgid "Pashto"
-msgstr "Pašto"
+msgid "Kazakh"
+msgstr "kazaška"
 
 #: ../rules/base.xml.in.h:426
-msgid "Pattachote"
-msgstr "Pattachote (Tajska)"
+msgid "Kazakh (with Russian)"
+msgstr "kazaška (z ruščino)"
 
-#: ../rules/base.xml.in.h:427 ../rules/sun.xml.in.h:78
-msgid "Phonetic"
-msgstr "Fonetična"
+#: ../rules/base.xml.in.h:427
+msgid "Key sequence to kill the X server"
+msgstr "Zaporedje tipk, ki ubijejo strežnik X"
 
-#: ../rules/base.xml.in.h:428 ../rules/sun.xml.in.h:79
-msgid "Pol"
-msgstr "POL"
+#: ../rules/base.xml.in.h:428
+msgid "Key to choose 3rd level"
+msgstr "Tipka za izbor tretje ravni"
 
 #: ../rules/base.xml.in.h:429
-msgid "Poland"
-msgstr "Poljska"
+msgid "Key to choose 5th level"
+msgstr "Tipka za izbor pete ravni"
 
 #: ../rules/base.xml.in.h:430
-msgid "Polytonic"
-msgstr "Politonična"
+msgid "Key(s) to change layout"
+msgstr "Tipke za spreminjanje razporeditve"
 
 #: ../rules/base.xml.in.h:431
-msgid "Portugal"
-msgstr "Portugalska"
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
 
 #: ../rules/base.xml.in.h:432
-msgid "Press Left Alt key to choose 3rd level."
-msgstr "Pritisni levo Alt tipko za izbiro tretjega nivoja."
+msgid "Khmer (Cambodia)"
+msgstr "kmerska (Kambodža)"
 
 #: ../rules/base.xml.in.h:433
-msgid "Press Left Win-key to choose 3rd level."
-msgstr "Pritisni levo Win tipko za izbiro tretjega nivoja."
+msgid "Kikuyu"
+msgstr "kikujska"
 
 #: ../rules/base.xml.in.h:434
-msgid "Press Menu key to choose 3rd level."
-msgstr "Pritisni menu tipko za izbiro tretjega nivoja."
+msgid "Kinesis"
+msgstr "Kinesis"
 
 #: ../rules/base.xml.in.h:435
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Pritisni desno Alt tipko za izbiro tretjega nivoja, Shift+Desni Alt predstavlja kombinacijo."
+msgid "Komi"
+msgstr "komijska"
 
 #: ../rules/base.xml.in.h:436
-msgid "Press Right Alt key to choose 3rd level."
-msgstr "Pritisni desno Alt tipko za izbiro tretjega nivoja."
+msgid "Korean"
+msgstr "korejska"
 
 #: ../rules/base.xml.in.h:437
-msgid "Press Right Ctrl to choose 3rd level."
-msgstr "Pritisni desno Ctrl tipko za izbiro tretjega nivoja."
+msgid "Korean (101/104 key compatible)"
+msgstr "korejska (združljiva s 101/104 tipkami)"
 
 #: ../rules/base.xml.in.h:438
-msgid "Press Right Win-key to choose 3rd level."
-msgstr "Pritisni desno Win tipko za izbiro tretjega nivoja."
+msgid "Kurdish (Iran, Arabic-Latin)"
+msgstr "kurdska (Iran, arabsko-latinična)"
 
 #: ../rules/base.xml.in.h:439
-msgid "Press any of Alt keys to choose 3rd level."
-msgstr "Pritisni katerokoli Alt tipko za izbiro tretjega nivoja."
+msgid "Kurdish (Iran, F)"
+msgstr "kurdska (Iran, F)"
 
 #: ../rules/base.xml.in.h:440
-msgid "Press any of Win-keys to choose 3rd level."
-msgstr "Pritisni katerokoli Win tipko za izbiro tretjega nivoja."
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "kurdska (Iran, latinični Alt-Q)"
 
 #: ../rules/base.xml.in.h:441
-msgid "Pro"
-msgstr "Pro"
+msgid "Kurdish (Iran, Latin Q)"
+msgstr "kurdska (Iran, latinični Q)"
 
 #: ../rules/base.xml.in.h:442
-msgid "Pro Keypad"
-msgstr "Pro Tipkovnica"
+msgid "Kurdish (Iraq, Arabic-Latin)"
+msgstr "kurdska (Irak, arabsko-latinična)"
 
 #: ../rules/base.xml.in.h:443
-msgid "Probhat"
-msgstr "Probhat (Bengal)"
+msgid "Kurdish (Iraq, F)"
+msgstr "kurdska (Irak, F)"
 
 #: ../rules/base.xml.in.h:444
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr "kurdska (Irak, latinični Alt-Q)"
 
-#: ../rules/base.xml.in.h:445 ../rules/sun.xml.in.h:88
-msgid "Prt"
-msgstr "PRT"
+#: ../rules/base.xml.in.h:445
+msgid "Kurdish (Iraq, Latin Q)"
+msgstr "kurdska (Irak, latinični Q)"
 
 #: ../rules/base.xml.in.h:446
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+msgid "Kurdish (Syria, F)"
+msgstr "kurdska (Sirija, F)"
 
 #: ../rules/base.xml.in.h:447
-msgid "R-Alt switches layout while pressed."
-msgstr "Desna Alt tipka zamenja razporeditev med stiskom."
+msgid "Kurdish (Syria, Latin Alt-Q)"
+msgstr "kurdska (Sirija, latinični Alt-Q)"
 
 #: ../rules/base.xml.in.h:448
-msgid "Right Alt is Compose."
-msgstr "Desni Alt je pred-tipka (Compose)"
+msgid "Kurdish (Syria, Latin Q)"
+msgstr "kurdska (Sirija, latinični Q)"
 
 #: ../rules/base.xml.in.h:449
-msgid "Right Alt key changes layout."
-msgstr "Desna Alt tipka zamenja razporeditev."
+msgid "Kurdish (Turkey, F)"
+msgstr "kurdska (Turčija, F)"
 
-#: ../rules/base.xml.in.h:450 ../rules/sun.xml.in.h:90
-msgid "Right Alt key never chooses 3rd level."
-msgstr "Desna tipka Alt nikoli ne izbere tretje ravni."
+#: ../rules/base.xml.in.h:450
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr "kurdska (Turčija, latinični Alt-Q)"
 
 #: ../rules/base.xml.in.h:451
-msgid "Right Ctrl is Compose."
-msgstr "Desni Ctrl je pred-tipka (Compose)"
+msgid "Kurdish (Turkey, Latin Q)"
+msgstr "kurdska (Turčija, latinični Q)"
 
 #: ../rules/base.xml.in.h:452
-msgid "Right Ctrl key changes layout."
-msgstr "Desna Ctrl tipka zamenja razporeditev."
+msgid "Kyrgyz"
+msgstr "kirgiška"
 
 #: ../rules/base.xml.in.h:453
-msgid "Right Ctrl key switches layout while pressed."
-msgstr "Desni Ctrl zamenja razporeditev ob stisku."
+msgid "Kyrgyz (phonetic)"
+msgstr "kirgiška (fonetična)"
 
 #: ../rules/base.xml.in.h:454
-msgid "Right Ctrl key works as Right Alt."
-msgstr "Desna Ctrl tipka deluje kot desni Alt."
+msgid "Lao"
+msgstr "laoška"
 
 #: ../rules/base.xml.in.h:455
-msgid "Right Shift key changes layout."
-msgstr "Desna Shift tipka zamenja razporeditev."
+msgid "Lao (STEA proposed standard layout)"
+msgstr "laoška (standardna postavitev, predlagala STEA)"
 
 #: ../rules/base.xml.in.h:456
-msgid "Right Win-key changes layout."
-msgstr "Desna Win tipka zamenja razporeditev."
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Tipkovnica prenosnika Compaq (npr. Armada)"
 
 #: ../rules/base.xml.in.h:457
-msgid "Right Win-key is Compose."
-msgstr "Desna Win tipka je pred-tipka (Compose)"
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Internetna tipkovnica prenosnika Compaq (npr. Presario)"
 
 #: ../rules/base.xml.in.h:458
-msgid "Right Win-key switches layout while pressed."
-msgstr "Desna Win tipka zamenja razporeditev ob pritisku."
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Prenosnik eMachines m68xx"
 
-#: ../rules/base.xml.in.h:459
-msgid "Right hand"
-msgstr "Desnoročno"
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+msgid "Latvian"
+msgstr "latvijska"
 
 #: ../rules/base.xml.in.h:460
-msgid "Right handed Dvorak"
-msgstr "Desnoročni Dvorak"
+msgid "Latvian (F variant)"
+msgstr "latvijska (varianta F)"
 
 #: ../rules/base.xml.in.h:461
-msgid "Romania"
-msgstr "Romunija"
+msgid "Latvian (adapted)"
+msgstr "latvijska (prilagojena)"
 
 #: ../rules/base.xml.in.h:462
-msgid "Romanian keyboard with German letters"
-msgstr "Romunska Tipkovnica z Nemškimi črkami"
+msgid "Latvian (apostrophe variant)"
+msgstr "latvijska (varianta z opuščajem)"
 
 #: ../rules/base.xml.in.h:463
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Romunska tipkovnica z Nemškimi črkami, Izloči mrtve tipke"
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "latvijska (ergonomska, ŪGJRMV)"
 
 #: ../rules/base.xml.in.h:464
-msgid "Rou"
-msgstr "ROU"
+msgid "Latvian (modern)"
+msgstr "latvijska (sodobna)"
 
-#: ../rules/base.xml.in.h:465 ../rules/sun.xml.in.h:95
-msgid "Rus"
-msgstr "RUS"
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "latvijska (varianta s tildo)"
 
 #: ../rules/base.xml.in.h:466
-msgid "Russia"
-msgstr "Rusija"
+msgid "Left Alt"
+msgstr "Leva izmenjalka (Alt)"
 
-#: ../rules/base.xml.in.h:467 ../rules/sun.xml.in.h:96
-msgid "Russian"
-msgstr "Rusija"
+#: ../rules/base.xml.in.h:467
+msgid "Left Alt (while pressed)"
+msgstr "Leva izmenjalka (Alt) (ko je pritisnjena)"
 
 #: ../rules/base.xml.in.h:468
-msgid "Russian phonetic"
-msgstr "Ruska fonetična"
+msgid "Left Alt is swapped with Left Win"
+msgstr "Leva izmenjalka (Alt) se zamenja z levo tipko Win"
 
 #: ../rules/base.xml.in.h:469
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "Ruska fonetična, Izloči mrtve tipke"
+msgid "Left Ctrl"
+msgstr "Leva krmilka (Ctrl)"
 
 #: ../rules/base.xml.in.h:470
-msgid "Russian with Kazakh"
-msgstr "Ruščina s Kazahstanščino"
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Leva krmilka (Ctrl) (na prvo postavitev), desna krmilka (Ctrl) (na drugo postavitev)"
 
 #: ../rules/base.xml.in.h:471
-msgid "SCG"
-msgstr "SCG"
+msgid "Left Ctrl+Left Shift"
+msgstr "Leva krmilka (Ctrl)+leva dvigalka (Shift)"
 
 #: ../rules/base.xml.in.h:472
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless tipkovnica"
+msgid "Left Shift"
+msgstr "Leva dvigalka (Shift)"
 
 #: ../rules/base.xml.in.h:473
-msgid "SK-1300"
-msgstr "SK-1300"
+msgid "Left Win"
+msgstr "Leva tipka Win"
 
 #: ../rules/base.xml.in.h:474
-msgid "SK-2500"
-msgstr "SK-2500"
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Leva tipka Win (na prvo postavitev), desna tipka Win/Menu (na drugo postavitev)"
 
 #: ../rules/base.xml.in.h:475
-msgid "SK-6200"
-msgstr "SK-6200"
+msgid "Left Win (while pressed)"
+msgstr "Leva tipka Win (ko je pritisnjena)"
 
 #: ../rules/base.xml.in.h:476
-msgid "SK-7100"
-msgstr "SK-7100"
+msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Leva tipka Win izbere peto raven, zaklene raven, če je pritisnjen hkrati z drugim izbirnikom pete ravni"
 
 #: ../rules/base.xml.in.h:477
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
+msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "Leva tipka Win izbere peto raven, zaklene raven, če je pritisnjen hkrati z drugim izbirnikom pete ravni, z enim pritiskom sprosti zaklep"
 
 #: ../rules/base.xml.in.h:478
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
+msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
+msgstr "Leva krmilka (Ctrl)+levi Win (na prvo postavitev), desna krmilka (Ctrl)+Menu (na drugo postavitev)"
 
 #: ../rules/base.xml.in.h:479
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
+msgid "Legacy"
+msgstr "Opuščena tipkovnica "
 
 #: ../rules/base.xml.in.h:480
-msgid "ScrollLock LED shows alternative layout."
-msgstr "ScrollLock LED kaže alternativno razporeditev."
-
-#: ../rules/base.xml.in.h:481
-msgid "Serbia and Montenegro"
-msgstr "Srbija in Črna gora"
+msgid "Legacy Wang 724"
+msgstr "Opuščena Wang 724"
 
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:482
-msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "Shift in številčnica delujeta kot pod MS Okni."
+msgid "Legacy key with comma"
+msgstr "Opuščena tipka z vejico"
 
 #: ../rules/base.xml.in.h:483
-msgid "Shift+CapsLock changes layout."
-msgstr "Shift+CapsLock zamenjata razporeditev."
+msgid "Legacy key with dot"
+msgstr "Opuščena tipka s piko "
 
-#: ../rules/base.xml.in.h:484
-msgid "Slovakia"
-msgstr "Slovaška"
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian"
+msgstr "litovska"
 
 #: ../rules/base.xml.in.h:485
-msgid "Slovenia"
-msgstr "Slovenija"
+msgid "Lithuanian (IBM LST 1205-92)"
+msgstr "litovska (IBM LST 1205-92)"
 
 #: ../rules/base.xml.in.h:486
-msgid "South Africa"
-msgstr "Južna Afrika"
+msgid "Lithuanian (LEKP)"
+msgstr "litovska (LEKP)"
 
 #: ../rules/base.xml.in.h:487
-msgid "Southern Uzbek"
-msgstr "Južno uzbeško"
+msgid "Lithuanian (LEKPa)"
+msgstr "litovska (LEKPa)"
 
 #: ../rules/base.xml.in.h:488
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Preslednica izpiše neprelomni presledek na četrti ravnil, tanek neprelomni presledek na šesti ravni"
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgstr "litovska (am. tipkovnica z litovskimi črkami)"
 
 #: ../rules/base.xml.in.h:489
-msgid "Space key outputs non-breakable space character at fourth level."
-msgstr "Preslednica izpiše neprelomni presledek na četrti ravni."
+msgid "Lithuanian (standard)"
+msgstr "litovska (standardna)"
 
 #: ../rules/base.xml.in.h:490
-msgid "Space key outputs non-breakable space character at second level."
-msgstr "Preslednica izpiše neprelomni presledek na drugi ravni."
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access"
 
 #: ../rules/base.xml.in.h:491
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Preslednica izpiše neprelomni presledek na tretji ravni in nič na četrti ravni."
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
 
 #: ../rules/base.xml.in.h:492
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Preslednica izpiše neprelomni presledek na tretji ravnil, tanek neprelomni presledek na četrti ravni"
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (druga možnost)"
 
 #: ../rules/base.xml.in.h:493
-msgid "Space key outputs non-breakable space character at third level."
-msgstr "Preslednica izpiše neprelomni presledek na tretji ravni."
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
 
 #: ../rules/base.xml.in.h:494
-msgid "Space key outputs usual space at any level."
-msgstr "Preslednica izpiše običajni presledek na vseh ravneh."
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
 
 #: ../rules/base.xml.in.h:495
-msgid "Spain"
-msgstr "Španija"
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:496 ../rules/sun.xml.in.h:103
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Posebne tipke (Ctrl+Alt+&lt;key&gt;) določa strežnik."
+#: ../rules/base.xml.in.h:496
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
 
 #: ../rules/base.xml.in.h:497
-msgid "SrL"
-msgstr "SRL"
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (alt. option2)"
 
 #: ../rules/base.xml.in.h:498
-msgid "Sri Lanka"
-msgstr "Šrilanka"
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:499 ../rules/sun.xml.in.h:104
-msgid "Standard"
-msgstr "Standardna"
+#: ../rules/base.xml.in.h:499
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
 #: ../rules/base.xml.in.h:500
-msgid "Standard (Commabelow)"
-msgstr "Standard (Commabelow)"
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 z dodatnimi tipkami preko G15daemon"
+
+#: ../rules/base.xml.in.h:501
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech - splošna tipkovnica"
 
-#. RSTU 2019-91
 #: ../rules/base.xml.in.h:502
-msgid "Standard RSTU"
-msgstr "Standard RSTU"
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350"
+
+#: ../rules/base.xml.in.h:503
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet"
 
-#. RSTU 2019-91
 #: ../rules/base.xml.in.h:504
-msgid "Standard RSTU on Russian layout"
-msgstr "Standard RSTU na Ruski ureditvi"
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator"
 
-#: ../rules/base.xml.in.h:505 ../rules/sun.xml.in.h:112
-msgid "Sun dead keys"
-msgstr "Sun mrtve tipke"
+#: ../rules/base.xml.in.h:505
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite"
 
 #: ../rules/base.xml.in.h:506
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedijska tipkovnica"
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop"
 
 #: ../rules/base.xml.in.h:507
-msgid "Super is mapped to the Win-keys."
-msgstr "Super tipko prevzameta Win tipki."
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X"
 
 #: ../rules/base.xml.in.h:508
-msgid "Svdvorak"
-msgstr "Svdvorak"
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge"
 
-#: ../rules/base.xml.in.h:509 ../rules/sun.xml.in.h:113
-msgid "Svk"
-msgstr "SVK"
+#: ../rules/base.xml.in.h:509
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo"
 
 #: ../rules/base.xml.in.h:510
-msgid "Svn"
-msgstr "SVN"
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
 
 #: ../rules/base.xml.in.h:511
-msgid "Swap Ctrl and CapsLock."
-msgstr "Zamenjaj Ctrl in CapsLock tipki."
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless (model Y-RB6)"
 
 #: ../rules/base.xml.in.h:512
-msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Zamenjaj tipkovne kode dveh tipk ob napačni zaznavi Mac tipkovnic."
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator SE"
 
-#: ../rules/base.xml.in.h:513 ../rules/sun.xml.in.h:115
-msgid "Swe"
-msgstr "SWE"
+#: ../rules/base.xml.in.h:513
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator SE (USB)"
 
 #: ../rules/base.xml.in.h:514
-msgid "Sweden"
-msgstr "Švedska"
+msgid "Lower Sorbian"
+msgstr "spodnje lužiško-srbska"
 
 #: ../rules/base.xml.in.h:515
-msgid "Switzerland"
-msgstr "Švica"
+msgid "Lower Sorbian (qwertz)"
+msgstr "spodnje lužiško-srbska (qwertz)"
 
 #: ../rules/base.xml.in.h:516
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
 
 #: ../rules/base.xml.in.h:517
-msgid "Syr"
-msgstr "SYR"
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (medn.)"
 
 #: ../rules/base.xml.in.h:518
-msgid "Syria"
-msgstr "Sirija"
+msgid "Macedonian"
+msgstr "makedonska"
 
 #: ../rules/base.xml.in.h:519
-msgid "Syriac"
-msgstr "Starosirski"
+msgid "Macedonian (eliminate dead keys)"
+msgstr "makedonska (izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:520
-msgid "Syriac phonetic"
-msgstr "Starosirski fonetično"
+msgid "Macintosh"
+msgstr "Macintosh"
 
 #: ../rules/base.xml.in.h:521
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
+msgid "Macintosh Old"
+msgstr "Macintosh - stara"
 
 #: ../rules/base.xml.in.h:522
-msgid "Tajikistan"
-msgstr "Tadžikistan"
+msgid "Make Caps Lock an additional Backspace"
+msgstr "Caps Lock naj bo dodatna vračalka"
 
 #: ../rules/base.xml.in.h:523
-msgid "Tamil"
-msgstr "Tamilska"
+msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
+msgstr "Caps Lock naj bo dodatna krmilka (Ctrl), vendar ohrani simulacijo tipke Caps_Lock"
 
 #: ../rules/base.xml.in.h:524
-msgid "Tamil TAB Typewriter"
-msgstr "Tamilski TAB Typewriter"
+#, fuzzy
+msgid "Make Caps Lock an additional Ctrl"
+msgstr "Caps Lock naj bo dodatna ubežnica (Esc)"
 
 #: ../rules/base.xml.in.h:525
-msgid "Tamil TSCII Typewriter"
-msgstr "Tamilski TSCII Typewriter"
+msgid "Make Caps Lock an additional ESC"
+msgstr "Caps Lock naj bo dodatna ubežnica (Esc)"
 
 #: ../rules/base.xml.in.h:526
-msgid "Tamil Unicode"
-msgstr "Tamilski Unicode"
+msgid "Make Caps Lock an additional Hyper"
+msgstr "Caps Lock naj bo dodatna tipka Hyper"
 
 #: ../rules/base.xml.in.h:527
-msgid "Tatar"
-msgstr "Tatar"
+msgid "Make Caps Lock an additional Num Lock"
+msgstr "Caps Lock naj bo dodatna tipka Num Lock"
 
 #: ../rules/base.xml.in.h:528
-msgid "Telugu"
-msgstr "Telugu (Indija)"
+msgid "Make Caps Lock an additional Super"
+msgstr "Caps Lock naj bo dodatna tipka Super"
 
 #: ../rules/base.xml.in.h:529
-msgid "Tha"
-msgstr "THA"
+msgid "Malayalam"
+msgstr "malajalamska"
 
 #: ../rules/base.xml.in.h:530
-msgid "Thailand"
-msgstr "Tajska"
+msgid "Malayalam (Lalitha)"
+msgstr "malajalamska (Lalita)"
 
-#: ../rules/base.xml.in.h:531 ../rules/sun.xml.in.h:119
-msgid "Third level choosers"
-msgstr "Tretje stopenjski izbor"
+#: ../rules/base.xml.in.h:531
+msgid "Malayalam (enhanced Inscript with Rupee Sign)"
+msgstr "malajalamska (razširjena, z znakom za rupijo)"
 
 #: ../rules/base.xml.in.h:532
-msgid "Tibetan"
-msgstr "Tibetansko"
+msgid "Maltese"
+msgstr "malteška"
 
 #: ../rules/base.xml.in.h:533
-msgid "Tibetan (with ASCII numerals)"
-msgstr "Tibetansko (z ASCII številkami)"
+msgid "Maltese (with US layout)"
+msgstr "malteška (z am. postavitvijo)"
 
 #: ../rules/base.xml.in.h:534
-msgid "Tifinagh"
-msgstr "Tifinagh"
+msgid "Maori"
+msgstr "maorska"
 
 #: ../rules/base.xml.in.h:535
-msgid "Tifinagh Alternative"
-msgstr "Tifinagh alternativna"
+msgid "Mari"
+msgstr "marijska"
 
 #: ../rules/base.xml.in.h:536
-msgid "Tifinagh Alternative Phonetic"
-msgstr "Tifinagh alternativno fonetična"
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
 
 #: ../rules/base.xml.in.h:537
-msgid "Tifinagh Extended"
-msgstr "Tifinagh razširjena"
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access"
 
 #: ../rules/base.xml.in.h:538
-msgid "Tifinagh Extended Phonetic"
-msgstr "Tifinagh razširjeno fonetična"
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
 
 #: ../rules/base.xml.in.h:539
-msgid "Tifinagh Phonetic"
-msgstr "Tifinagh fonetična"
+msgid "Menu"
+msgstr "Meni"
 
 #: ../rules/base.xml.in.h:540
-msgid "Tilde (~) variant"
-msgstr "Tilda (~) varianta"
+msgid "Meta is mapped to Left Win"
+msgstr "Meta je preslikana na levo tipko Win"
 
 #: ../rules/base.xml.in.h:541
-msgid "Tjk"
-msgstr "TJK"
+msgid "Meta is mapped to Win keys"
+msgstr "Meta je preslikana na tipki Win"
 
 #: ../rules/base.xml.in.h:542
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
+#, fuzzy
+msgid "Meta on Left Ctrl"
+msgstr "Leva krmilka (Ctrl)"
 
 #: ../rules/base.xml.in.h:543
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access Tipkovnica"
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
 
 #: ../rules/base.xml.in.h:544
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust klasična brezžična tipkovnica"
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
 
-#: ../rules/base.xml.in.h:545 ../rules/sun.xml.in.h:120
-msgid "Tur"
-msgstr "TUR"
+#: ../rules/base.xml.in.h:545
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, švedska"
 
 #: ../rules/base.xml.in.h:546
-msgid "Turkey"
-msgstr "Turčija"
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
 
 #: ../rules/base.xml.in.h:547
-msgid "Typewriter"
-msgstr "Pisalni Stroj"
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
 
-#: ../rules/base.xml.in.h:548 ../rules/sun.xml.in.h:124
-msgid "U.S. English"
-msgstr "U.S. Angleška"
+#: ../rules/base.xml.in.h:548
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
 #: ../rules/base.xml.in.h:549
-msgid "US keyboard with Bosnian digraphs"
-msgstr "US tipkovnica s Bosanskimi digrafi"
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
 
 #: ../rules/base.xml.in.h:550
-msgid "US keyboard with Bosnian letters"
-msgstr "US tipkovnica s Bosanskimi črkami"
+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:551
-msgid "US keyboard with Croatian digraphs"
-msgstr "US tipkovnica s Hrvaškimi digrafi"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
 #: ../rules/base.xml.in.h:552
-msgid "US keyboard with Croatian letters"
-msgstr "US tipkovnica s Hrvaškimi črkami "
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
 #: ../rules/base.xml.in.h:553
-msgid "US keyboard with Lithuanian letters"
-msgstr "US tipkovnica s Latvijskimi črkami"
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
 
 #: ../rules/base.xml.in.h:554
-msgid "US keyboard with Slovenian digraphs"
-msgstr "US tipkovnica s Slovenskimi digrafi"
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
 #: ../rules/base.xml.in.h:555
-msgid "US keyboard with Slovenian letters"
-msgstr "US tipkovnica s Slovenskimi črkami"
+msgid "Miscellaneous compatibility options"
+msgstr "Razne možnosti združljivosti"
 
-#: ../rules/base.xml.in.h:556 ../rules/sun.xml.in.h:126
-msgid "USA"
-msgstr "USA"
+#: ../rules/base.xml.in.h:556
+msgid "Mongolian"
+msgstr "mongolska"
 
 #: ../rules/base.xml.in.h:557
-msgid "Udmurt"
-msgstr "Udmurt"
+msgid "Montenegrin"
+msgstr "črnogorska"
 
 #: ../rules/base.xml.in.h:558
-msgid "Ukr"
-msgstr "UKR"
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr "črnogorska (cirilična s francoskimi narekovaji)"
 
 #: ../rules/base.xml.in.h:559
-msgid "Ukraine"
-msgstr "Ukraina"
+msgid "Montenegrin (Cyrillic)"
+msgstr "črnogorska (cirilica)"
 
 #: ../rules/base.xml.in.h:560
-msgid "UnicodeExpert"
-msgstr "UnicodeExpert"
+msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
+msgstr "črnogorska (cirilica, Z in Ž zamenjana)"
 
-#: ../rules/base.xml.in.h:561 ../rules/sun.xml.in.h:127
-msgid "United Kingdom"
-msgstr "Združeno Kraljestvo"
+#: ../rules/base.xml.in.h:561
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "črnogorska (latinična, Unicode, qwerty)"
 
 #: ../rules/base.xml.in.h:562
-msgid "Urdu"
-msgstr "Urdu (Indija)"
+msgid "Montenegrin (Latin Unicode)"
+msgstr "črnogorska (latinična, Unicode)"
 
 #: ../rules/base.xml.in.h:563
-msgid "Use Bosnian digraphs"
-msgstr "Uporabi bosanske digrafe"
+msgid "Montenegrin (Latin qwerty)"
+msgstr "črnogorska (latinična, qwerty)"
 
 #: ../rules/base.xml.in.h:564
-msgid "Use Croatian digraphs"
-msgstr "Uporabi hrvaške digrafe"
+msgid "Montenegrin (Latin with guillemets)"
+msgstr "črnogorska (latinična s francoskimi narekovaji)"
 
 #: ../rules/base.xml.in.h:565
-msgid "Use Slovenian digraphs"
-msgstr "Uporabi slovenske digrafe"
+msgid "NICOLA-F style Backspace"
+msgstr "Vračalka v slogu NICOLA-F"
 
 #: ../rules/base.xml.in.h:566
-msgid "Use guillemets for quotes"
-msgstr "Francoski narekovaji (guillemets) namesto navednic"
+msgid "Nepali"
+msgstr "nepalska"
 
 #: ../rules/base.xml.in.h:567
-msgid "Use keyboard LED to show alternative layout."
-msgstr "Uporabi tipkovnično LED za prikaz alternativne razporeditve."
+msgid "Non-breakable space character at fourth level"
+msgstr "Neprelomni presledek na četrti ravni"
 
 #: ../rules/base.xml.in.h:568
-msgid "Using space key to input non-breakable space character"
-msgstr "Preslednica izpiše neprelomni presledek"
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Neprelomni presledek na četrti ravnil, tanek neprelomni presledek na šesti ravni"
 
 #: ../rules/base.xml.in.h:569
-msgid "Uzb"
-msgstr "UZB"
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Neprelomni presledek na četrti ravni, tanek neprelomni presledek na šesti ravni (prek krmilke+dvigalke/Ctrl+Shift)"
 
 #: ../rules/base.xml.in.h:570
-msgid "Uzbekistan"
-msgstr "Uzbekistan"
+msgid "Non-breakable space character at second level"
+msgstr "Neprelomni presledek na drugi ravni"
 
 #: ../rules/base.xml.in.h:571
-msgid "Vietnam"
-msgstr "Vietnam"
+msgid "Non-breakable space character at third level"
+msgstr "Neprelomni presledek na tretji ravni"
 
 #: ../rules/base.xml.in.h:572
-msgid "Vnm"
-msgstr "VNM"
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Neprelomni presledek na tretji ravni, nič na četrti ravni"
 
 #: ../rules/base.xml.in.h:573
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Wang 724 u unicode dodatki (puščice in matematični operatorji)"
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Neprelomni presledek na tretji ravni, tanek neprelomni presledek na četrti ravni"
 
 #: ../rules/base.xml.in.h:574
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Wang 724 u unicode dodatki (puščice in matematični operatorji). Matematični opratorji na privzeti ravni."
+msgid "Northern Saami (Finland)"
+msgstr "severno saamska (Finska)"
 
 #: ../rules/base.xml.in.h:575
-msgid "Wang model 724 azerty"
-msgstr "Wang model 724 azerty"
+msgid "Northern Saami (Norway)"
+msgstr "severno saamska (Norveška)"
 
 #: ../rules/base.xml.in.h:576
-msgid "Western"
-msgstr "Zahodni"
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "severno saamska (Norveška, izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:577
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
+msgid "Northern Saami (Sweden)"
+msgstr "severno saamska (Švedska)"
 
 #: ../rules/base.xml.in.h:578
-msgid "Winkeys"
-msgstr "Win tipki"
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
 
 #: ../rules/base.xml.in.h:579
-msgid "With &lt;\\|&gt; key"
-msgstr "Z &lt;\\|&gt; tipkami"
+msgid "Norwegian"
+msgstr "norveška"
 
 #: ../rules/base.xml.in.h:580
-msgid "With EuroSign on 5"
-msgstr "Z evro znakom na tipki 5"
+msgid "Norwegian (Dvorak)"
+msgstr "norveška (Dvorak)"
 
 #: ../rules/base.xml.in.h:581
-msgid "With guillemets"
-msgstr "S francoskimi narekovaji (guillemets)"
+msgid "Norwegian (Macintosh)"
+msgstr "norveška (Macintosh)"
 
 #: ../rules/base.xml.in.h:582
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet Tipkovnica"
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "norveška (Macintosh, izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:583
-msgid "Yoruba"
-msgstr "Joruba"
+msgid "Norwegian (eliminate dead keys)"
+msgstr "norveška (izloči mrtve tipke)"
 
 #: ../rules/base.xml.in.h:584
-msgid "Z and ZHE swapped"
-msgstr "Z in ZHE zamenjani"
+msgid "Num Lock"
+msgstr "Num Lock"
 
 #: ../rules/base.xml.in.h:585
-msgid "Zar"
-msgstr "Zar"
+msgid "Numeric keypad delete key behaviour"
+msgstr "Vedenje tipke za brisanje na numerični tipkovnici"
 
 #: ../rules/base.xml.in.h:586
-msgid "azerty"
-msgstr "azerty"
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "Številčnica deluje kot v Mac OS X"
 
 #: ../rules/base.xml.in.h:587
-msgid "azerty/digits"
-msgstr "azerty/cifre"
+msgid "Numeric keypad layout selection"
+msgstr "Izbor razporeditve na numerični tipkovnici"
 
 #: ../rules/base.xml.in.h:588
-msgid "digits"
-msgstr "cifre"
+msgid "OLPC"
+msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:589
-msgid "displaced semicolon and quote (obsolete)"
-msgstr "premeščena podpičje in narekovaj (zastarelo)"
+msgid "Occitan"
+msgstr "oksitanska"
 
 #: ../rules/base.xml.in.h:590
-msgid "lyx"
-msgstr "LYX"
+msgid "Ogham"
+msgstr "oghamska"
 
-#: ../rules/base.xml.in.h:591 ../rules/sun.xml.in.h:132
-msgid "qwerty"
-msgstr "qwerty"
+#: ../rules/base.xml.in.h:591
+msgid "Ogham (IS434)"
+msgstr "ogamska (IS434)"
 
 #: ../rules/base.xml.in.h:592
-msgid "qwerty, extended Backslash"
-msgstr "qwerty, razširjena Backslash tipka"
+msgid "Oriya"
+msgstr "orijska"
 
 #: ../rules/base.xml.in.h:593
-msgid "qwerty/digits"
-msgstr "qwerty/cifre"
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet"
 
 #: ../rules/base.xml.in.h:594
-msgid "qwertz"
-msgstr "qwertz"
+msgid "Ossetian (Georgia)"
+msgstr "osetijska (Gruzija)"
 
-#: ../rules/sun.xml.in.h:1
-msgid "\"Typewriter\""
-msgstr "\"Pisalni Stroj\""
+#: ../rules/base.xml.in.h:595
+msgid "Ossetian (WinKeys)"
+msgstr "osetijska (WinKeys)"
 
-#: ../rules/sun.xml.in.h:17
-msgid "Acts as Shift with locking. Shift cancels Caps."
-msgstr "CapsLock se obnaša kot tipka Shift z zaklepanjem. Shift prekine CapsLock."
+#: ../rules/base.xml.in.h:596
+msgid "Ossetian (legacy)"
+msgstr "osetijska (starinska)"
 
-#: ../rules/sun.xml.in.h:18
-msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
-msgstr "CapsLock se obnaša kot Shift z zaklepanjem. Shift ne prekliče CapsLock tipke."
+#: ../rules/base.xml.in.h:597
+msgid "PC-98xx Series"
+msgstr "PC-98xx - več modelov"
 
-#: ../rules/sun.xml.in.h:19
-msgid "Alt+Control changes group"
-msgstr "Alt+Ctrl zamenjata skupino"
+#: ../rules/base.xml.in.h:598
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "panonska rusinska (homofonična)"
 
-#: ../rules/sun.xml.in.h:20
-msgid "Alt+Shift changes group"
-msgstr "Alt+Shift zamenjata skupino"
+#: ../rules/base.xml.in.h:599
+msgid "Pashto"
+msgstr "paštunska"
 
-#: ../rules/sun.xml.in.h:21
-msgid "Basic"
-msgstr "Osnovno"
+#: ../rules/base.xml.in.h:600
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr "paštunska (Afganistan, OLPC)"
 
-#: ../rules/sun.xml.in.h:23
-msgid "Belgian"
-msgstr "Belgija"
+# pavška?
+# “Pause” se prevede v “Premor”, tipka pa je tipka za *premor* ali *čakalka ??*
+#: ../rules/base.xml.in.h:601
+msgid "Pause"
+msgstr "Premor"
 
-#: ../rules/sun.xml.in.h:25
-msgid "Both Alt keys together change group"
-msgstr "Skupni pritisk obeh tipk ALT zamenja skupino"
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+msgid "Persian"
+msgstr "farsi"
 
-#: ../rules/sun.xml.in.h:26
-msgid "Both Ctrl keys together change group"
-msgstr "Skupni pritisk obeh tipk CTRL tipk zamenja skupino"
+#: ../rules/base.xml.in.h:603
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr "farsi (Afganistan, Dari OLPC)"
 
-#: ../rules/sun.xml.in.h:27
-msgid "Both Shift keys together change group"
-msgstr "Skupni pritisk obeh tipk SHIFT zamenja skupino"
+#: ../rules/base.xml.in.h:604
+msgid "Persian (with Persian Keypad)"
+msgstr "farsi (s tipkovnico farsi)"
 
-#: ../rules/sun.xml.in.h:28
-msgid "Bulgarian"
-msgstr "Bolgarsko"
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+msgid "Polish"
+msgstr "poljska"
 
-#: ../rules/sun.xml.in.h:30
-msgid "Canadian"
-msgstr "Kanadsko"
+#: ../rules/base.xml.in.h:606
+msgid "Polish (Dvorak)"
+msgstr "poljska (Dvorak)"
 
-#: ../rules/sun.xml.in.h:31
-msgid "Caps Lock is Compose"
-msgstr "CapsLock je pred-tipka (Compose)"
+#: ../rules/base.xml.in.h:607
+msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgstr "poljska (Dvorak, poljski narekovaj na tipki 1)"
 
-#: ../rules/sun.xml.in.h:32
-msgid "Caps Lock key changes group"
-msgstr "Tipka CapsLock zamenja skupino"
+#: ../rules/base.xml.in.h:608
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr "poljska (Dvorak, poljski narekovaj na tipki narekovaja)"
 
-#: ../rules/sun.xml.in.h:34
-msgid "Caps_Lock LED shows alternative group"
-msgstr "CapsLock LED kaže alternativno skupino"
+#: ../rules/base.xml.in.h:609
+msgid "Polish (programmer Dvorak)"
+msgstr "poljska (programerski Dvorak)"
 
-#: ../rules/sun.xml.in.h:35
-msgid "Control Key Position"
-msgstr "Položaj Ctrl Tipke"
+#: ../rules/base.xml.in.h:610
+msgid "Polish (qwertz)"
+msgstr "poljska (qwertz)"
 
-#: ../rules/sun.xml.in.h:36
-msgid "Control key at bottom left"
-msgstr "Ctrl tipka leži levo spodaj"
+#: ../rules/base.xml.in.h:611
+msgid "Portuguese"
+msgstr "portugalska"
 
-#: ../rules/sun.xml.in.h:37
-msgid "Control key at left of 'A'"
-msgstr "Tipka Ctrl je levo of tipke 'A'"
+#: ../rules/base.xml.in.h:612
+msgid "Portuguese (Brazil)"
+msgstr "portugalska (Brazilija)"
 
-#: ../rules/sun.xml.in.h:38
-msgid "Control+Shift changes group"
-msgstr "Ctrl+Shift zamenjata skupino"
+#: ../rules/base.xml.in.h:613
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr "portugalska (Brazilija, Dvorak)"
 
-#: ../rules/sun.xml.in.h:40
-msgid "Czech"
-msgstr "Češka"
+#: ../rules/base.xml.in.h:614
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr "portugalska (Brazilija, izloči mrtve tipke)"
 
-#: ../rules/sun.xml.in.h:41
-msgid "Danish"
-msgstr "Dansko"
+#: ../rules/base.xml.in.h:615
+msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgstr "portugalska (Brazilija, nativo za Esperanto)"
 
-#: ../rules/sun.xml.in.h:45
-msgid "DeuCH"
-msgstr "DeuCH"
+#: ../rules/base.xml.in.h:616
+msgid "Portuguese (Brazil, nativo for USA keyboards)"
+msgstr "portugalska (Brazilija, nativo za am. tipkovnice)"
 
-#: ../rules/sun.xml.in.h:47
-msgid "Dvo"
-msgstr "Dvo"
+#: ../rules/base.xml.in.h:617
+msgid "Portuguese (Brazil, nativo)"
+msgstr "portugalska (Brazilija, nativo)"
 
-#: ../rules/sun.xml.in.h:52
-msgid "Finnish"
-msgstr "Finska"
+#: ../rules/base.xml.in.h:618
+msgid "Portuguese (Macintosh)"
+msgstr "portugalska (Macintosh)"
 
-#: ../rules/sun.xml.in.h:54
-msgid "FraCH"
-msgstr "FraCH"
+#: ../rules/base.xml.in.h:619
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "portugalska (Macintosh, Sun mrtve tipke)"
 
-#: ../rules/sun.xml.in.h:57
-msgid "German"
-msgstr "Nemčija"
+#: ../rules/base.xml.in.h:620
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "portugalska (Macintosh, izloči mrtve tipke)"
 
-#: ../rules/sun.xml.in.h:58
-msgid "Group Shift/Lock behavior"
-msgstr "Obnašanje Shift/lock skupine"
+#: ../rules/base.xml.in.h:621
+msgid "Portuguese (Nativo for USA keyboards)"
+msgstr "portugalska (nativo za am. tipkovnice)"
 
-#: ../rules/sun.xml.in.h:60
-msgid "Hungarian"
-msgstr "Madžarska"
+#: ../rules/base.xml.in.h:622
+msgid "Portuguese (Nativo)"
+msgstr "portugalska (nativo)"
 
-#: ../rules/sun.xml.in.h:64
-msgid "Italian"
-msgstr "Italijanska"
+#: ../rules/base.xml.in.h:623
+msgid "Portuguese (Sun dead keys)"
+msgstr "portugalska (Sun mrtve tipke)"
 
-#: ../rules/sun.xml.in.h:65
-msgid "Japanese"
-msgstr "Japonsko"
+#: ../rules/base.xml.in.h:624
+msgid "Portuguese (eliminate dead keys)"
+msgstr "portugalska (izloči mrtve tipke)"
+
+#: ../rules/base.xml.in.h:625
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/sun.xml.in.h:67
-msgid "Left Alt key changes group"
-msgstr "Leva Alt tipka zamenja skupino"
+#: ../rules/base.xml.in.h:626
+msgid "PrtSc"
+msgstr "Tiskalka (PrtSc)"
 
-#: ../rules/sun.xml.in.h:68
-msgid "Left Alt key switches group while pressed"
-msgstr "Leva Alt tipka zamenja skupino ob stisku"
+#: ../rules/base.xml.in.h:627
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "pundžabska (Gumurki dželam)"
 
-#: ../rules/sun.xml.in.h:69
-msgid "Left Ctrl key changes group"
-msgstr "Leva Ctrl tipka zamenja skupino"
+#: ../rules/base.xml.in.h:628
+msgid "Punjabi (Gurmukhi)"
+msgstr "pundžabska (Gurmukhi)"
 
-#: ../rules/sun.xml.in.h:70
-msgid "Left Shift key changes group"
-msgstr "Leva Shift tipka zamenja skupino"
+#: ../rules/base.xml.in.h:629
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/sun.xml.in.h:71
-msgid "Make CapsLock an additional Control"
-msgstr "CapsLock je dodatna Ctrl tipka"
+#: ../rules/base.xml.in.h:630
+msgid "Right Alt"
+msgstr "Desna izmenjalka (Alt)"
 
-#: ../rules/sun.xml.in.h:76
-msgid "Norwegian"
-msgstr "Norveška"
+#: ../rules/base.xml.in.h:631
+msgid "Right Alt (while pressed)"
+msgstr "Desna izmenjalka (Alt) (ko je pritisnjena)"
 
-#: ../rules/sun.xml.in.h:77
-msgid "Num_Lock LED shows alternative group"
-msgstr "NumLock LED kaže alternativno skupino"
+#: ../rules/base.xml.in.h:632
+msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "Desna izmenjalka (Alt) izbere peto raven in aktivira zaklep pete ravni, če je pritisnjen hkrati z drugim izbirnikom pete ravni, en pritisk sprosti zaklep"
 
-#: ../rules/sun.xml.in.h:80
-msgid "Polish"
-msgstr "Poljska"
+#: ../rules/base.xml.in.h:633
+msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Desna izmenjalka (Alt) izbere peto raven, zaklene raven, če je pritisnjen hkrati z drugim izbirnikom pete ravni"
 
-#: ../rules/sun.xml.in.h:81
-msgid "Polish with Polish quotes on key \"1/!\""
-msgstr "Poljsko - narekovaj na tipki \"1/!\""
+#: ../rules/base.xml.in.h:634
+msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "Desna izmenjalka (Alt) izbere peto raven, zaklene raven, če je pritisnjen hkrati z drugim izbirnikom pete ravni, en pritisk sprosti zaklep"
 
-#: ../rules/sun.xml.in.h:82
-msgid "Portuguese"
-msgstr "Portugalska"
+#: ../rules/base.xml.in.h:635
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Desna izmenjalka (Alt) nikoli ne izbere tretje ravni"
+
+#: ../rules/base.xml.in.h:636
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Desna izmenjalka (Alt), dvigalka (Shift)+desna izmenjalka (Alt) predstavlja večtipkovno kombinacijo"
+
+#: ../rules/base.xml.in.h:637
+msgid "Right Ctrl"
+msgstr "Desna krmilka (Ctrl)"
+
+#: ../rules/base.xml.in.h:638
+msgid "Right Ctrl (while pressed)"
+msgstr "Desna krmilka (Ctrl) (ko je pritisnjena)"
+
+#: ../rules/base.xml.in.h:639
+msgid "Right Ctrl as Right Alt"
+msgstr "Desna krmilka (Ctrl) deluje kot desna izmenjalka (Alt)."
+
+#: ../rules/base.xml.in.h:640
+#, fuzzy
+msgid "Right Ctrl is mapped to Menu"
+msgstr "Meta je preslikana na levo tipko Win"
+
+#: ../rules/base.xml.in.h:641
+msgid "Right Ctrl+Right Shift"
+msgstr "Desna krmilka (Ctrl) + desna dvigalka (Shift)"
+
+#: ../rules/base.xml.in.h:642
+msgid "Right Shift"
+msgstr "Desna dvigalka (Shift)"
+
+#: ../rules/base.xml.in.h:643
+msgid "Right Win"
+msgstr "Desna tipka Win"
+
+#: ../rules/base.xml.in.h:644
+msgid "Right Win (while pressed)"
+msgstr "Desna tipka Win (ko je pritisnjena)"
+
+#: ../rules/base.xml.in.h:645
+msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Desna tipka Win izbere peto raven, zaklene raven, če je pritisnjen hkrati z drugim izbirnikom pete ravni."
+
+#: ../rules/base.xml.in.h:646
+msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "Desna tipka Win izbere peto raven, zaklene raven, če je pritisnjen hkrati z drugim izbirnikom pete ravni, z enim pritiskom sprosti zaklep"
+
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+msgid "Romanian"
+msgstr "romunska"
+
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (Germany)"
+msgstr "romunska (Nemčija)"
+
+#: ../rules/base.xml.in.h:649
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "romunska (Nemčija, izloči mrtve tipke)"
+
+#: ../rules/base.xml.in.h:650
+msgid "Romanian (WinKeys)"
+msgstr "romunska (WinKeys)"
+
+#: ../rules/base.xml.in.h:651
+msgid "Romanian (cedilla)"
+msgstr "romunska (sedij)"
+
+#: ../rules/base.xml.in.h:652
+msgid "Romanian (standard cedilla)"
+msgstr "romunska (standardni sedij)"
+
+#: ../rules/base.xml.in.h:653
+msgid "Romanian (standard)"
+msgstr "romunska (standardna)"
+
+#: ../rules/base.xml.in.h:654
+msgid "Rupee on 4"
+msgstr "Z znakom za rupijo na tipki 4"
+
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+msgid "Russian"
+msgstr "ruska"
+
+#: ../rules/base.xml.in.h:656
+msgid "Russian (DOS)"
+msgstr "ruska (DOS)"
+
+#: ../rules/base.xml.in.h:657
+msgid "Russian (Georgia)"
+msgstr "ruska (Gruzija)"
+
+#: ../rules/base.xml.in.h:658
+msgid "Russian (Germany, phonetic)"
+msgstr "ruska (Nemčija, fonetična)"
+
+#: ../rules/base.xml.in.h:659
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr "ruska (Kazahstan, s kazahstanščino)"
+
+#: ../rules/base.xml.in.h:660
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr "ruska (Poljska, fonetična, Dvorak)"
+
+#: ../rules/base.xml.in.h:661
+msgid "Russian (Sweden, phonetic)"
+msgstr "ruska (Švedska, fonetična)"
+
+#: ../rules/base.xml.in.h:662
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgstr "ruska (Švedska, fonetična, izloči mrtve tipke)"
+
+#: ../rules/base.xml.in.h:663
+msgid "Russian (US, phonetic)"
+msgstr "ruska (ameriška, fonetična)"
+
+#: ../rules/base.xml.in.h:664
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "ruska (Ukrajina, standard RSTU)"
+
+#: ../rules/base.xml.in.h:665
+msgid "Russian (legacy)"
+msgstr "ruska (starinska)"
+
+#: ../rules/base.xml.in.h:666
+msgid "Russian (phonetic WinKeys)"
+msgstr "ruska (fonetična, WinKeys)"
+
+#: ../rules/base.xml.in.h:667
+msgid "Russian (phonetic)"
+msgstr "ruska (fonetična)"
+
+#: ../rules/base.xml.in.h:668
+msgid "Russian (typewriter)"
+msgstr "ruska (pisalni stroj)"
+
+#: ../rules/base.xml.in.h:669
+msgid "Russian (typewriter, legacy)"
+msgstr "ruska (pisalni stroj, starinska)"
+
+#: ../rules/base.xml.in.h:670
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless tipkovnica"
+
+#: ../rules/base.xml.in.h:671
+msgid "SK-1300"
+msgstr "SK-1300"
+
+#: ../rules/base.xml.in.h:672
+msgid "SK-2500"
+msgstr "SK-2500"
+
+#: ../rules/base.xml.in.h:673
+msgid "SK-6200"
+msgstr "SK-6200"
+
+#: ../rules/base.xml.in.h:674
+msgid "SK-7100"
+msgstr "SK-7100"
+
+#: ../rules/base.xml.in.h:675
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
+
+#: ../rules/base.xml.in.h:676
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
+
+#: ../rules/base.xml.in.h:677
+msgid "Saisiyat (Taiwan)"
+msgstr "sajsijatska (Tajvan)"
+
+#: ../rules/base.xml.in.h:678
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
 
-#: ../rules/sun.xml.in.h:83
-msgid "Press Left Alt key to choose 3rd level"
-msgstr "Pritisni levo Alt tipko za izbiro tretje ravni"
+#: ../rules/base.xml.in.h:679
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
+
+#: ../rules/base.xml.in.h:680
+msgid "Sanwa Supply SKB-KG3"
+msgstr "Sanwa Supply SKB-KG3"
+
+#: ../rules/base.xml.in.h:681
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
+
+#: ../rules/base.xml.in.h:682
+msgid "Semi-colon on third level"
+msgstr "Podpičje na tretji ravni"
+
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+msgid "Serbian"
+msgstr "srbska"
+
+#: ../rules/base.xml.in.h:684
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr "srbska (latinica, Unicode qwerty)"
 
-#: ../rules/sun.xml.in.h:84
-msgid "Press Right Alt key to choose 3rd level"
-msgstr "Pritisni desno Alt tipko za izbiro tretje ravni"
+#: ../rules/base.xml.in.h:685
+msgid "Serbian (Latin Unicode)"
+msgstr "srbska (latinica, Unicode)"
 
-#: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "Pritisni desno Alt tipko za izbiro tretje ravni, Shift+desni Alt predstavlja kombinacijo"
+#: ../rules/base.xml.in.h:686
+msgid "Serbian (Latin qwerty)"
+msgstr "srbska (latinica, qwerty)"
 
-#: ../rules/sun.xml.in.h:86
-msgid "Press Right Control to choose 3rd level"
-msgstr "Pritisni desno Ctrl tipko za izbiro tretje ravni"
+#: ../rules/base.xml.in.h:687
+msgid "Serbian (Latin with guillemets)"
+msgstr "srbska (latinična s francoskimi narekovaji)"
 
-#: ../rules/sun.xml.in.h:87
-msgid "Press any of Alt keys to choose 3rd level"
-msgstr "Pritisni katerokoli Alt tipko za izbiro tretje ravni"
+#: ../rules/base.xml.in.h:688
+msgid "Serbian (Latin)"
+msgstr "srbska (latinica)"
 
-#: ../rules/sun.xml.in.h:89
-msgid "Right Alt key changes group"
-msgstr "Desna Alt tipka zamenja skupino"
+#: ../rules/base.xml.in.h:689
+msgid "Serbian (Russia)"
+msgstr "srbska (cirilica)"
 
-#: ../rules/sun.xml.in.h:91
-msgid "Right Alt switches group while pressed"
-msgstr "Desna Alt tipka zamenja skupino med stiskom"
+#: ../rules/base.xml.in.h:690
+msgid "Serbian (Z and ZHE swapped)"
+msgstr "srbska (tipki Z in Ž zamenjani)"
 
-#: ../rules/sun.xml.in.h:92
-msgid "Right Control key works as Right Alt"
-msgstr "Desna Ctrl tipka deluje kot desni Alt"
+#: ../rules/base.xml.in.h:691
+msgid "Serbian (with guillemets)"
+msgstr "srbska (s francoskimi narekovaji)"
 
-#: ../rules/sun.xml.in.h:93
-msgid "Right Ctrl key changes group"
-msgstr "Desna Ctrl tipka zamenja skupino"
+#: ../rules/base.xml.in.h:692
+msgid "Serbo-Croatian (US)"
+msgstr "srbohrvaška (ZDA)"
 
-#: ../rules/sun.xml.in.h:94
-msgid "Right Shift key changes group"
-msgstr "Desna Shift tipka zamenja skupino"
+#: ../rules/base.xml.in.h:693
+msgid "Shift cancels Caps Lock"
+msgstr "Dvigalka (Shift) prekliče Caps Lock"
 
-#: ../rules/sun.xml.in.h:97
-msgid "Scroll Lock changes group"
-msgstr "Scroll Lock zamenja skupino"
+#: ../rules/base.xml.in.h:694
+msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
+msgstr "Dvigalka (Shift) ne prekliče številčne Num Lock, namesto tega izbere tretjo raven"
 
-#: ../rules/sun.xml.in.h:98
-msgid "Scroll_Lock LED shows alternative group"
-msgstr "ScrollLock LED kaže alternativno skupino"
+#: ../rules/base.xml.in.h:695
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Dvigalka (Shift) in številčnica delujejo kot v sistemu MS Windows"
 
-#: ../rules/sun.xml.in.h:99
-msgid "Shift with numpad keys works as in MS Windows"
-msgstr "Shift in številčnica delujeta kot pod MS Okni"
+#: ../rules/base.xml.in.h:696
+msgid "Shift+Caps Lock"
+msgstr "Dvigalka (Shift)+Caps Lock"
 
-#: ../rules/sun.xml.in.h:100
-msgid "Shift+CapsLock changes group"
-msgstr "Shift+CapsLock zamenjata skupino"
+#: ../rules/base.xml.in.h:697
+msgid "Sindhi"
+msgstr "sindijska"
 
-#: ../rules/sun.xml.in.h:101
+#: ../rules/base.xml.in.h:698
+msgid "Sinhala"
+msgstr ""
+
+#: ../rules/base.xml.in.h:699
 msgid "Slovak"
-msgstr "Slovaška"
+msgstr "slovaška"
+
+#: ../rules/base.xml.in.h:700
+msgid "Slovak (extended Backslash)"
+msgstr "slovaška (razširjena leva poševnica)"
+
+#: ../rules/base.xml.in.h:701
+msgid "Slovak (qwerty)"
+msgstr "slovaška (qwerty)"
+
+#: ../rules/base.xml.in.h:702
+msgid "Slovak (qwerty, extended Backslash)"
+msgstr "slovaška (qwerty, razširjena leva poševnica)"
+
+#: ../rules/base.xml.in.h:703
+msgid "Slovenian"
+msgstr "slovenska"
 
-#: ../rules/sun.xml.in.h:102
+#: ../rules/base.xml.in.h:704
+msgid "Slovenian (US keyboard with Slovenian letters)"
+msgstr "slovenska (am. tipkovnica s slovenskimi črkami)"
+
+#: ../rules/base.xml.in.h:705
+msgid "Slovenian (use guillemets for quotes)"
+msgstr "slovenska (francoski narekovaji za navedke)"
+
+#: ../rules/base.xml.in.h:706
 msgid "Spanish"
-msgstr "Španija"
+msgstr "španska"
+
+#: ../rules/base.xml.in.h:707
+msgid "Spanish (Dvorak)"
+msgstr "španska (Dvorak)"
+
+#: ../rules/base.xml.in.h:708
+msgid "Spanish (Latin American)"
+msgstr "španska (Latinska Amerika)"
 
-#: ../rules/sun.xml.in.h:105
-msgid "Sun Type 4"
-msgstr "Sun Type 4"
+#: ../rules/base.xml.in.h:709
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "španska (Latinska amerika, mrtve tipke Sun)"
 
-#: ../rules/sun.xml.in.h:106
-msgid "Sun Type 5"
-msgstr "Sun Type 5"
+#: ../rules/base.xml.in.h:710
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr "španska (Latinska Amerika, izloči mrtve tipke)"
 
-#: ../rules/sun.xml.in.h:107
-msgid "Sun Type 5 European"
-msgstr "Sun Type 5 Evropski"
+#: ../rules/base.xml.in.h:711
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr "španska (Latinska Amerika, vključi mrtvo tildo)"
 
-#: ../rules/sun.xml.in.h:108
-msgid "Sun Type 5 Unix"
-msgstr "Sun Type 5 Unix"
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Macintosh)"
+msgstr "španska (Macintosh)"
 
-#: ../rules/sun.xml.in.h:109
-msgid "Sun Type 6"
-msgstr "Sun Type 6"
+#: ../rules/base.xml.in.h:713
+msgid "Spanish (Sun dead keys)"
+msgstr "španska (mrtve tipke Sun)"
 
-#: ../rules/sun.xml.in.h:110
-msgid "Sun Type 6 Unix"
-msgstr "Sun Type 6 Unix"
+#: ../rules/base.xml.in.h:714
+msgid "Spanish (eliminate dead keys)"
+msgstr "španska (izloči mrtve tipke)"
 
-#: ../rules/sun.xml.in.h:111
-msgid "Sun Type 6 with Euro key"
-msgstr "Sun Type 6 z evro tipko"
+#: ../rules/base.xml.in.h:715
+msgid "Spanish (include dead tilde)"
+msgstr "španska (vključi mrtvo tildo)"
 
-#: ../rules/sun.xml.in.h:114
-msgid "Swap Control and Caps Lock"
-msgstr "Zamenjaj tipki Ctrl in CapsLock"
+#: ../rules/base.xml.in.h:716
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Posebne tipke (krmilka+izmenjalka+&lt;tipka&gt; / Ctrl+Alt+&lt;tipka&gt;), ki jih obravnava strežnik"
 
-#: ../rules/sun.xml.in.h:116
+#: ../rules/base.xml.in.h:717
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
+
+#: ../rules/base.xml.in.h:718
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedijska tipkovnica"
+
+#: ../rules/base.xml.in.h:719
+msgid "Swahili (Kenya)"
+msgstr "svahilska (Kenija)"
+
+#: ../rules/base.xml.in.h:720
+msgid "Swahili (Tanzania)"
+msgstr "svahilska (Tanzanija)"
+
+#: ../rules/base.xml.in.h:721
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Zamenjaj krmilko (Esc) in CapsLock"
+
+#: ../rules/base.xml.in.h:722
+msgid "Swap ESC and Caps Lock"
+msgstr "Zamenjaj ubežnico (Esc) in Caps Lock"
+
+#: ../rules/base.xml.in.h:723
 msgid "Swedish"
-msgstr "Švedska"
+msgstr "švedska"
+
+#: ../rules/base.xml.in.h:724
+msgid "Swedish (Dvorak)"
+msgstr "švedska (Dvorak)"
 
-#: ../rules/sun.xml.in.h:117
-msgid "Swiss French"
-msgstr "Švicarska francoščina"
+#: ../rules/base.xml.in.h:725
+msgid "Swedish (Macintosh)"
+msgstr "švedska (Macintosh)"
 
-#: ../rules/sun.xml.in.h:118
-msgid "Swiss German"
-msgstr "Švicarska nemščina"
+#: ../rules/base.xml.in.h:726
+msgid "Swedish (Svdvorak)"
+msgstr "švedska (Svdvorak)"
 
-#: ../rules/sun.xml.in.h:121
+#: ../rules/base.xml.in.h:727
+msgid "Swedish (eliminate dead keys)"
+msgstr "švedska (izloči mrtve tipke)"
+
+#: ../rules/base.xml.in.h:728
+msgid "Swedish Sign Language"
+msgstr "švedski znakovni jezik"
+
+#: ../rules/base.xml.in.h:729
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablični PC)"
+
+#: ../rules/base.xml.in.h:730
+msgid "Syriac"
+msgstr "starosirska"
+
+#: ../rules/base.xml.in.h:731
+msgid "Syriac (phonetic)"
+msgstr "sirska (fonetična)"
+
+#: ../rules/base.xml.in.h:732
+msgid "Taiwanese"
+msgstr "tajvanska"
+
+#: ../rules/base.xml.in.h:733
+msgid "Taiwanese (indigenous)"
+msgstr "tajvanska (domorodna)"
+
+#: ../rules/base.xml.in.h:734
+msgid "Tajik"
+msgstr "tadžiška"
+
+#: ../rules/base.xml.in.h:735
+msgid "Tajik (legacy)"
+msgstr "tadžiška (starinska)"
+
+#: ../rules/base.xml.in.h:736
+msgid "Tamil"
+msgstr "tamilska"
+
+#: ../rules/base.xml.in.h:737
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgstr "tamilska (Sri Lanka, pisalni stroj TAB)"
+
+#: ../rules/base.xml.in.h:738
+msgid "Tamil (Sri Lanka, Unicode)"
+msgstr "tamilska (Sri Lanka, Unicode)"
+
+#: ../rules/base.xml.in.h:739
+msgid "Tamil (TAB typewriter)"
+msgstr "tamilska (pisalni stroj TAB)"
+
+#: ../rules/base.xml.in.h:740
+msgid "Tamil (TSCII typewriter)"
+msgstr "tamilska (pisalni stroj TSCII)"
+
+#: ../rules/base.xml.in.h:741
+msgid "Tamil (Unicode)"
+msgstr "tamilska (Unicode)"
+
+#: ../rules/base.xml.in.h:742
+msgid "Tamil (keyboard with numerals)"
+msgstr "tamilska (tipkovnica s številkami)"
+
+#: ../rules/base.xml.in.h:743
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
+
+#: ../rules/base.xml.in.h:744
+msgid "Tatar"
+msgstr "tatarska"
+
+#: ../rules/base.xml.in.h:745
+msgid "Telugu"
+msgstr "teluška"
+
+#: ../rules/base.xml.in.h:746
+msgid "Thai"
+msgstr "tajska"
+
+#: ../rules/base.xml.in.h:747
+msgid "Thai (Pattachote)"
+msgstr "tajska (Pattachote)"
+
+#: ../rules/base.xml.in.h:748
+msgid "Thai (TIS-820.2538)"
+msgstr "tajska (TIS-820.2538)"
+
+#: ../rules/base.xml.in.h:749
+msgid "Tibetan"
+msgstr "tibetanska"
+
+#: ../rules/base.xml.in.h:750
+msgid "Tibetan (with ASCII numerals)"
+msgstr "tibetanska (s številkami ASCII)"
+
+#: ../rules/base.xml.in.h:751
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Na ustrezno tipko tipkovnice Dvorak."
+
+#: ../rules/base.xml.in.h:752
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Na ustrezno tipko tipkovnice Qwerty."
+
+#: ../rules/base.xml.in.h:753
+msgid "Toggle PointerKeys with Shift + NumLock."
+msgstr "Preklopi puščične tipke z dvigalka (Shift) + NumLock."
+
+#: ../rules/base.xml.in.h:754
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
+#: ../rules/base.xml.in.h:755
+msgid "Trust Direct Access Keyboard"
+msgstr "Tipkovnica Trust Direct Access"
+
+#: ../rules/base.xml.in.h:756
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+#: ../rules/base.xml.in.h:757
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Klasična brezžična tipkovnica Trust"
+
+#: ../rules/base.xml.in.h:758
+msgid "Tswana"
+msgstr "tswanska"
+
+#: ../rules/base.xml.in.h:759
 msgid "Turkish"
-msgstr "Turško"
+msgstr "turška"
+
+#: ../rules/base.xml.in.h:760
+msgid "Turkish (Alt-Q)"
+msgstr "turška (Alt-Q)"
 
-#: ../rules/sun.xml.in.h:122
+#: ../rules/base.xml.in.h:761
 msgid "Turkish (F)"
-msgstr "Turško (F)"
+msgstr "turška (F)"
+
+#: ../rules/base.xml.in.h:762
+msgid "Turkish (Sun dead keys)"
+msgstr "turška (mrtve tipke, Sun)"
+
+#: ../rules/base.xml.in.h:763
+msgid "Turkish (international with dead keys)"
+msgstr "turška (mednarodna z mrtvimi tipkami)"
+
+#: ../rules/base.xml.in.h:764
+msgid "Turkmen"
+msgstr "turkmenska"
+
+#: ../rules/base.xml.in.h:765
+msgid "Turkmen (Alt-Q)"
+msgstr "turkmenska (Alt-Q)"
+
+#: ../rules/base.xml.in.h:766
+msgid "TypeMatrix EZ-Reach 2020"
+msgstr "TypeMatrix EZ-Reach 2020"
+
+#: ../rules/base.xml.in.h:767
+msgid "TypeMatrix EZ-Reach 2030 PS2"
+msgstr "TypeMatrix EZ-Reach 2030 PS2"
+
+#: ../rules/base.xml.in.h:768
+msgid "TypeMatrix EZ-Reach 2030 USB"
+msgstr "TypeMatrix EZ-Reach 2030 USB"
+
+#: ../rules/base.xml.in.h:769
+msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (način 102/105:EU)"
+
+#: ../rules/base.xml.in.h:770
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (način 106:JP)"
+
+#: ../rules/base.xml.in.h:771
+msgid "Udmurt"
+msgstr "udmurtska"
+
+#: ../rules/base.xml.in.h:772
+msgid "Ukrainian"
+msgstr "ukrajinska"
+
+#: ../rules/base.xml.in.h:773
+msgid "Ukrainian (WinKeys)"
+msgstr "ukrajinska (WinKeys)"
+
+#: ../rules/base.xml.in.h:774
+msgid "Ukrainian (homophonic)"
+msgstr "ukrajinska (homofonična)"
+
+#: ../rules/base.xml.in.h:775
+msgid "Ukrainian (legacy)"
+msgstr "ukrajinska (starinska)"
+
+#: ../rules/base.xml.in.h:776
+msgid "Ukrainian (phonetic)"
+msgstr "ukrajinska (fonetično)"
+
+#: ../rules/base.xml.in.h:777
+msgid "Ukrainian (standard RSTU)"
+msgstr "ukrajinska (standard RSTU)"
+
+#: ../rules/base.xml.in.h:778
+msgid "Ukrainian (typewriter)"
+msgstr "ukrajinska (pisalni stroj)"
+
+#: ../rules/base.xml.in.h:779
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Dodatki Unicode (puščice in matematični opratorji)"
+
+#: ../rules/base.xml.in.h:780
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Dodatki Unicode (puščice in matematični opratorji). Matematični operatorji so na prvi ravni."
+
+#: ../rules/base.xml.in.h:781
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:782
+msgid "Urdu (Pakistan)"
+msgstr "urdujska (Pakistan)"
+
+#: ../rules/base.xml.in.h:783
+msgid "Urdu (Pakistan, CRULP)"
+msgstr "urdujska (Pakistan, CRULP)"
+
+#: ../rules/base.xml.in.h:784
+msgid "Urdu (Pakistan, NLA)"
+msgstr "urdujska (Pakistan, NLA)"
+
+#: ../rules/base.xml.in.h:785
+msgid "Urdu (WinKeys)"
+msgstr "urdujska (WinKeys)"
+
+#: ../rules/base.xml.in.h:786
+msgid "Urdu (alternative phonetic)"
+msgstr "urdujska (alternativna fonetika)"
+
+#: ../rules/base.xml.in.h:787
+msgid "Urdu (phonetic)"
+msgstr "urdujska (fonetično)"
+
+#: ../rules/base.xml.in.h:788
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Uporabi tipkovnični LED za prikaz alternativne razporeditve"
+
+#: ../rules/base.xml.in.h:789
+msgid "Using space key to input non-breakable space character"
+msgstr "Preslednica izpiše neprelomni presledek"
+
+#: ../rules/base.xml.in.h:790
+msgid "Usual space at any level"
+msgstr "Običajni presledek na vseh ravneh"
+
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "ujgurska"
+
+#: ../rules/base.xml.in.h:792
+msgid "Uzbek"
+msgstr "uzbeška"
+
+#: ../rules/base.xml.in.h:793
+msgid "Uzbek (Afghanistan)"
+msgstr "uzbeška (Afganistan)"
+
+#: ../rules/base.xml.in.h:794
+msgid "Uzbek (Afghanistan, OLPC)"
+msgstr "uzbeška (Afganistan, OLPC)"
+
+#: ../rules/base.xml.in.h:795
+msgid "Uzbek (Latin)"
+msgstr "uzbeška (latinica)"
+
+#: ../rules/base.xml.in.h:796
+msgid "Vietnamese"
+msgstr "vietnamska"
+
+#: ../rules/base.xml.in.h:797
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet"
+
+#: ../rules/base.xml.in.h:798
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+msgstr "Wang 724 z unicode dodatki (puščice in matematični operatorji)"
+
+#: ../rules/base.xml.in.h:799
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Wang 724 z unicode dodatki (puščice in matematični operatorji). Matematični opratorji na privzeti ravni."
+
+#: ../rules/base.xml.in.h:800
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:801
+msgid "Wolof"
+msgstr "volofska"
+
+#: ../rules/base.xml.in.h:802
+msgid "Yahoo! Internet Keyboard"
+msgstr "Tipkovnica Yahoo! Internet"
+
+#: ../rules/base.xml.in.h:803
+msgid "Yakut"
+msgstr "jakutska"
+
+#: ../rules/base.xml.in.h:804
+msgid "Yoruba"
+msgstr "jorubska"
+
+#: ../rules/base.xml.in.h:805
+msgid "Zero-width non-joiner character at second level"
+msgstr "Prelomni znak ničte širine na drugi ravni"
+
+#: ../rules/base.xml.in.h:806
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
+msgstr "Prelomni znak ničte širine na drugi ravni, neprelomni presledek na tretji ravni."
+
+#: ../rules/base.xml.in.h:807
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
+msgstr "Prelomni znak ničte širine na drugi ravni, neprelomni presledek na tretji ravni, nič na četrti ravni."
+
+#: ../rules/base.xml.in.h:808
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
+msgstr "Prelomni znak ničte širine na drugi ravni, neprelomni presledek na tretji ravni, tanek neprelomni presledek na četrti ravni"
+
+#: ../rules/base.xml.in.h:809
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
+msgstr "Prelomni znak ničte širine na drugi ravni, neprelomni presledek na tretji ravni, neprelomni znak ničelne širine na četrti ravni"
+
+#: ../rules/base.xml.in.h:810
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
+msgstr "Prelomni znak ničte širine na drugi ravni, spojni znak ničte širine na tretji ravni"
+
+#: ../rules/base.xml.in.h:811
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
+msgstr "Prelomni znak ničte širine na drugi ravni, spojni znak ničte širine na tretji ravni, neprelomni presledek na četrti ravni"
+
+#: ../rules/base.xml.in.h:812
+msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
+msgstr "Prelomni znak ničte širine na tretji ravni, spojni znak ničte širine na četrti ravni."
+
+#: ../rules/base.xml.in.h:813
+msgid "ak"
+msgstr "ak"
+
+#: ../rules/base.xml.in.h:814
+msgid "am"
+msgstr "am"
+
+#: ../rules/base.xml.in.h:815
+msgid "ar"
+msgstr "ar"
+
+#: ../rules/base.xml.in.h:816
+msgid "avn"
+msgstr "avn"
+
+#: ../rules/base.xml.in.h:817
+msgid "az"
+msgstr "az"
+
+#: ../rules/base.xml.in.h:818
+msgid "be"
+msgstr "be"
+
+#: ../rules/base.xml.in.h:819
+msgid "ber"
+msgstr "ber"
+
+#: ../rules/base.xml.in.h:820
+msgid "bg"
+msgstr "bg"
+
+#: ../rules/base.xml.in.h:821
+msgid "bm"
+msgstr "bm"
+
+#: ../rules/base.xml.in.h:822
+msgid "bn"
+msgstr "bn"
+
+#: ../rules/base.xml.in.h:823
+msgid "brl"
+msgstr "brl"
+
+#: ../rules/base.xml.in.h:824
+msgid "bs"
+msgstr "bs"
+
+#: ../rules/base.xml.in.h:825
+msgid "ca"
+msgstr "ca"
+
+#: ../rules/base.xml.in.h:826
+msgid "chr"
+msgstr "chr"
+
+#: ../rules/base.xml.in.h:827
+msgid "cm"
+msgstr "cm"
+
+#: ../rules/base.xml.in.h:828
+msgid "crh"
+msgstr "crh"
+
+#: ../rules/base.xml.in.h:829
+msgid "cs"
+msgstr "cs"
+
+#: ../rules/base.xml.in.h:830
+msgid "da"
+msgstr "da"
+
+#: ../rules/base.xml.in.h:831
+msgid "de"
+msgstr "de"
+
+#: ../rules/base.xml.in.h:832
+msgid "dv"
+msgstr "dv"
+
+#: ../rules/base.xml.in.h:833
+msgid "dz"
+msgstr "dz"
+
+#: ../rules/base.xml.in.h:834
+msgid "ee"
+msgstr "ee"
+
+#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
+msgid "en"
+msgstr "en"
+
+#: ../rules/base.xml.in.h:836
+msgid "eo"
+msgstr "eo"
+
+#: ../rules/base.xml.in.h:837
+msgid "es"
+msgstr "es"
+
+#: ../rules/base.xml.in.h:838
+msgid "et"
+msgstr "et"
+
+#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
+msgid "fa"
+msgstr "fa"
+
+#: ../rules/base.xml.in.h:840
+msgid "ff"
+msgstr "ff"
+
+#: ../rules/base.xml.in.h:841
+msgid "fi"
+msgstr "fi"
+
+#: ../rules/base.xml.in.h:842
+msgid "fo"
+msgstr "fo"
+
+#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
+msgid "fr"
+msgstr "fr"
+
+#: ../rules/base.xml.in.h:844
+msgid "gaa"
+msgstr "gaa"
+
+#: ../rules/base.xml.in.h:845
+msgid "gr"
+msgstr "gr"
+
+#: ../rules/base.xml.in.h:846
+msgid "gu"
+msgstr "gu"
+
+#: ../rules/base.xml.in.h:847
+msgid "ha"
+msgstr "ha"
+
+#: ../rules/base.xml.in.h:848
+msgid "he"
+msgstr "he"
+
+#: ../rules/base.xml.in.h:849
+msgid "hi"
+msgstr "hi"
+
+#: ../rules/base.xml.in.h:850
+msgid "hr"
+msgstr "hr"
+
+#: ../rules/base.xml.in.h:851
+msgid "hu"
+msgstr "hu"
+
+#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
+msgid "hy"
+msgstr "hy"
+
+#: ../rules/base.xml.in.h:853
+msgid "ie"
+msgstr "ie"
+
+#: ../rules/base.xml.in.h:854
+msgid "ig"
+msgstr "ig"
+
+#: ../rules/base.xml.in.h:855
+msgid "ike"
+msgstr "ike"
+
+#: ../rules/base.xml.in.h:856
+msgid "in"
+msgstr "in"
+
+#: ../rules/base.xml.in.h:857
+msgid "is"
+msgstr "is"
+
+#: ../rules/base.xml.in.h:858
+msgid "it"
+msgstr "it"
+
+#: ../rules/base.xml.in.h:859
+msgid "ja"
+msgstr "ja"
+
+#: ../rules/base.xml.in.h:860
+msgid "ka"
+msgstr "ka"
+
+#: ../rules/base.xml.in.h:861
+msgid "ki"
+msgstr "ki"
+
+#: ../rules/base.xml.in.h:862
+msgid "kk"
+msgstr "kk"
+
+#: ../rules/base.xml.in.h:863
+msgid "km"
+msgstr "km"
+
+#: ../rules/base.xml.in.h:864
+msgid "kn"
+msgstr "kn"
+
+#: ../rules/base.xml.in.h:865
+msgid "ko"
+msgstr "ko"
+
+#: ../rules/base.xml.in.h:866
+msgid "ku"
+msgstr "ku"
+
+#: ../rules/base.xml.in.h:867
+msgid "lo"
+msgstr "lo"
+
+#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
+msgid "lt"
+msgstr "lt"
+
+#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
+msgid "lv"
+msgstr "lv"
+
+#: ../rules/base.xml.in.h:870
+msgid "mi"
+msgstr "mi"
+
+#: ../rules/base.xml.in.h:871
+msgid "mk"
+msgstr "mk"
+
+#: ../rules/base.xml.in.h:872
+msgid "ml"
+msgstr "ml"
+
+#: ../rules/base.xml.in.h:873
+msgid "mn"
+msgstr "mn"
+
+#: ../rules/base.xml.in.h:874
+msgid "mt"
+msgstr "mt"
+
+#: ../rules/base.xml.in.h:875
+msgid "my"
+msgstr "my"
+
+#: ../rules/base.xml.in.h:876
+msgid "ne"
+msgstr "ne"
+
+#: ../rules/base.xml.in.h:877
+msgid "nl"
+msgstr "nl"
+
+#: ../rules/base.xml.in.h:878
+msgid "no"
+msgstr "no"
+
+#: ../rules/base.xml.in.h:879
+msgid "or"
+msgstr "or"
+
+#: ../rules/base.xml.in.h:880
+msgid "pa"
+msgstr "pa"
+
+#: ../rules/base.xml.in.h:881
+msgid "ph"
+msgstr "ph"
+
+#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
+msgid "pl"
+msgstr "pl"
+
+#: ../rules/base.xml.in.h:883
+msgid "ps"
+msgstr "ps"
+
+#: ../rules/base.xml.in.h:884
+msgid "pt"
+msgstr "pt"
+
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
+msgid "ro"
+msgstr "ro"
+
+#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
+msgid "ru"
+msgstr "ru"
+
+#: ../rules/base.xml.in.h:887
+msgid "sd"
+msgstr "sd"
+
+#: ../rules/base.xml.in.h:888
+msgid "si"
+msgstr "si"
+
+#: ../rules/base.xml.in.h:889
+msgid "sk"
+msgstr "sk"
+
+#: ../rules/base.xml.in.h:890
+msgid "sl"
+msgstr "sl"
+
+#: ../rules/base.xml.in.h:891
+msgid "sq"
+msgstr "sq"
+
+#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
+msgid "sr"
+msgstr "sr"
+
+#: ../rules/base.xml.in.h:893
+msgid "sv"
+msgstr "sv"
+
+#: ../rules/base.xml.in.h:894
+msgid "sw"
+msgstr "sw"
+
+#: ../rules/base.xml.in.h:895
+msgid "syc"
+msgstr "syc"
+
+#: ../rules/base.xml.in.h:896
+msgid "ta"
+msgstr "ta"
+
+#: ../rules/base.xml.in.h:897
+msgid "te"
+msgstr "te"
+
+#: ../rules/base.xml.in.h:898
+msgid "tg"
+msgstr "tg"
+
+#: ../rules/base.xml.in.h:899
+msgid "th"
+msgstr "th"
+
+#: ../rules/base.xml.in.h:900
+msgid "tk"
+msgstr "tk"
+
+#: ../rules/base.xml.in.h:901
+msgid "tn"
+msgstr "tn"
+
+#: ../rules/base.xml.in.h:902
+msgid "tr"
+msgstr "tr"
+
+#: ../rules/base.xml.in.h:903
+msgid "uk"
+msgstr "uk"
+
+#: ../rules/base.xml.in.h:904
+msgid "ur"
+msgstr "ur"
+
+#: ../rules/base.xml.in.h:905
+msgid "uz"
+msgstr "uz"
+
+#: ../rules/base.xml.in.h:906
+msgid "vi"
+msgstr "vi"
+
+#: ../rules/base.xml.in.h:907
+msgid "wo"
+msgstr "wo"
+
+#: ../rules/base.xml.in.h:908
+msgid "xsy"
+msgstr "xsy"
+
+#: ../rules/base.xml.in.h:909
+msgid "yo"
+msgstr "yo"
+
+#: ../rules/base.xml.in.h:910
+msgid "zh"
+msgstr "zh"
+
+#: ../rules/base.extras.xml.in.h:1
+msgid "APL Keyboard Symbols"
+msgstr "Simboli tipkovnic APL"
+
+#: ../rules/base.extras.xml.in.h:4
+msgid "Atsina"
+msgstr "atsinska"
+
+#: ../rules/base.extras.xml.in.h:5
+msgid "Avestan"
+msgstr "avestanska"
+
+#: ../rules/base.extras.xml.in.h:6
+msgid "Couer D'alene Salish"
+msgstr "sališanska (Couer D'alene)"
+
+#: ../rules/base.extras.xml.in.h:8
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "angleška (kombinirana am. in mednarodna, Unicode, znak. izmenjalka)"
+
+#: ../rules/base.extras.xml.in.h:9
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "angleška (kombirnirana am. in mednarodna, Unicode, znak. izmenjalka, alternativna)"
+
+#: ../rules/base.extras.xml.in.h:11
+msgid "Kutenai"
+msgstr "kutenajska"
+
+#: ../rules/base.extras.xml.in.h:13
+msgid "Latvian (US Colemak)"
+msgstr "latvijska (am. Colemak)"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "latvijska (am. Colemak, različica z apostrofi)"
+
+#: ../rules/base.extras.xml.in.h:15
+msgid "Latvian (US Dvorak)"
+msgstr "latvijska (am. Dvorak)"
+
+#: ../rules/base.extras.xml.in.h:16
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "latvijska (am. Dvorak, različica Y)"
+
+#: ../rules/base.extras.xml.in.h:17
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr "latvisjka (am. Dvorak, različica minus)"
+
+#: ../rules/base.extras.xml.in.h:18
+msgid "Latvian (programmer US Dvorak)"
+msgstr "latvijska (programerska, am. Dvorak)"
+
+#: ../rules/base.extras.xml.in.h:19
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "latvijska (programerska, am. Dvorak, različica Y)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "latvijska (programerska, am. Dvorak, različica minus)"
 
-#: ../rules/sun.xml.in.h:123
-msgid "Turkish Alt-Q Layout"
-msgstr "Turški Alt-Q nabor"
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "litovska (am. tipkovnica z litovskimi črkami)"
 
-#: ../rules/sun.xml.in.h:125
-msgid "U.S. English w/ ISO9995-3"
-msgstr "U.S. Angleška w/ ISO9995-3"
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "poljska (z mednarodnimi mrtvimi tipkami)"
 
-#: ../rules/sun.xml.in.h:128
-msgid "Use keyboard LED to show alternative group"
-msgstr "Uporabi LED tipkovnice za prikaz alternativne skupine"
+#: ../rules/base.extras.xml.in.h:27
+msgid "Romanian (ergonomic Touchtype)"
+msgstr "romunska (ergonomski Touchtype)"
 
-#: ../rules/sun.xml.in.h:129
-msgid "Uses internal capitalization. Shift cancels Caps."
-msgstr "Uporaba notranje kapitalizacije. Shift prekliče CapsLock."
+#: ../rules/base.extras.xml.in.h:29
+#, fuzzy
+msgid "Russian (with UKR and BEL layout)"
+msgstr "ruska (z ukrajinsko-belorusko postavitvijo)"
 
-#: ../rules/sun.xml.in.h:130
-msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "Uporaba notranje kapitalizacije. Shift ne prekliče CapsLock."
+#: ../rules/base.extras.xml.in.h:30
+msgid "Secwepemctsin"
+msgstr "šusvapska"
 
-#: ../rules/sun.xml.in.h:131
-msgid "bksl"
-msgstr "bksl"
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "srbska (kombiniranje naglasov namesto mrtvih tipk)"
 
-#: ../rules/sun.xml.in.h:133
-msgid "type4"
-msgstr "type4"
+#: ../rules/base.extras.xml.in.h:33
+msgid "apl"
+msgstr "apl"
 
-#~ msgid "Acer TravelMate 800"
-#~ msgstr "Acer TravelMate 800"
+#: ../rules/base.extras.xml.in.h:38
+msgid "kut"
+msgstr "kut"
 
-#~ msgid "Adding the nobreakspace keysym to space key"
-#~ msgstr "Dodajanje brezpresledni znak preslednici"
+#: ../rules/base.extras.xml.in.h:44
+msgid "shs"
+msgstr "shs"
 
-#~ msgid "Logitech Cordless Desktop Optical"
-#~ msgstr "Logitech Cordless Desktop Optical"
+#~ msgid "Bengali (Baishakhi Inscript)"
+#~ msgstr "bengalska (bajšakhi)"
 
-#~ msgid "Logitech Cordless Desktop Pro"
-#~ msgstr "Logitech Cordless Desktop Pro"
+#~ msgid "Bengali (Baishakhi)"
+#~ msgstr "bengalska (Baišaki)"
 
-#~ msgid "Logitech Cordless Desktop iTouch"
-#~ msgstr "Logitech Cordless Desktop iTouch"
+#~| msgid "Bengali Probhat"
+#~ msgid "Bengali (Bornona)"
+#~ msgstr "bengalska (Bornona)"
 
-#~ msgid "PowerPC PS/2"
-#~ msgstr "PowerPC PS/2"
+#~ msgid "Bengali (Uni Gitanjali)"
+#~ msgstr "bengalska (Uni Gitandžali)"
 
-#~ msgid "\"Standard\""
-#~ msgstr "\"Standard\""
+#~ msgid "Cameroon Multilingual (azerty)"
+#~ msgstr "kamerunska večjezična (azerty)"
 
-#~ msgid "Dhivehi"
-#~ msgstr "Dhivehi (Maldivi)"
+#~ msgid "Cameroon Multilingual (qwerty)"
+#~ msgstr "kamerunska večjezična (qwerty)"
 
-#~ msgid "Div"
-#~ msgstr "DIV"
+#~| msgid "Caps Lock is Compose"
+#~ msgid "Caps Lock as Ctrl"
+#~ msgstr "Caps Lock kot krmilka (Ctrl)"
 
-#~ msgid "Logitech Deluxe Access Keyboard"
-#~ msgstr "Logitech Deluxe Access Tipkovnica"
+#~| msgid "Left Ctrl key changes layout."
+#~ msgid "Left Ctrl as Meta"
+#~ msgstr "Leva krmilka (Ctrl) kot tipka Meta"
 
-#~ msgid "Logitech iTouch keyboard Internet Navigator"
-#~ msgstr "Logitech iTouch tipkovnica Internet Navigator"
+#~ msgid "Menu as Right Ctrl"
+#~ msgstr "Menu kot desna krmilka (Ctrl)"
 
-#~ msgid "Serbian"
-#~ msgstr "Srbsko"
+#~| msgid "Right Ctrl key works as Right Alt."
+#~ msgid "Right Alt as Right Ctrl"
+#~ msgstr "Desna izmenjalka (Alt) deluje kot desna krmilka (Ctrl)"
 
-#~ msgid "Srp"
-#~ msgstr "SRP"
+#~| msgid "Syriac phonetic"
+#~ msgid "Sinhala (phonetic)"
+#~ msgstr "sinhalska (fonetično)"
 
-#~ msgid "Tamil INSCRIPT"
-#~ msgstr "Tamilski Inskript"
+#~| msgid "Syriac phonetic"
+#~ msgid "Armenian (OLPC phonetic)"
+#~ msgstr "armenska (fonetična, OLPC)"
 
-#~ msgid "US keyboard with Maltian letters"
-#~ msgstr "US tipkovnica s Malteškimi črkami"
+#~| msgid "Romanian keyboard with German letters"
+#~ msgid "German (US keyboard with German letters)"
+#~ msgstr "nemška (am. tipkovnica z nemškimi črkami)"
 
-#~ msgid "si1452"
-#~ msgstr "si1452"
+#~| msgid "Romanian keyboard with German letters, eliminate dead keys"
+#~ msgid "German (with Hungarian letters and no dead keys)"
+#~ msgstr "nemška tipkovnica (z madžarskimi črkami, izloči mrtve tipke)"
diff --git a/dist/xkeyboard-config/po/uk.po b/dist/xkeyboard-config/po/uk.po
index e096c382c..a2bae4b56 100644
--- a/dist/xkeyboard-config/po/uk.po
+++ b/dist/xkeyboard-config/po/uk.po
@@ -10,10 +10,10 @@
 # Yuri Chornoivan <yurchor@ukr.net>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.3\n"
+"Project-Id-Version: xkeyboard-config-2.3.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-17 21:08+0100\n"
-"PO-Revision-Date: 2011-05-19 14:56+0300\n"
+"POT-Creation-Date: 2011-09-15 21:25+0100\n"
+"PO-Revision-Date: 2011-09-17 12:48+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
@@ -219,7 +219,7 @@ msgstr "Вірменська"
 msgid "Armenian (alternative eastern)"
 msgstr "Вірменська (альтернативна східна)"
 
-#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+#: ../rules/base.xml.in.h:50
 msgid "Armenian (alternative phonetic)"
 msgstr "Вірменська (альтернативна фонетична)"
 
@@ -380,3277 +380,3289 @@ msgid "Bengali"
 msgstr "Бенгальська"
 
 #: ../rules/base.xml.in.h:90
+msgid "Bengali (Baishakhi Inscript)"
+msgstr "Бенгальська (байшахі, індійські символи)"
+
+#: ../rules/base.xml.in.h:91
+msgid "Bengali (Baishakhi)"
+msgstr "Бенгальська (байшахі)"
+
+#: ../rules/base.xml.in.h:92
+msgid "Bengali (Bornona)"
+msgstr "Бенгальська (борнона)"
+
+#: ../rules/base.xml.in.h:93
 msgid "Bengali (Probhat)"
 msgstr "Бенгальська (пробхат)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:94
+msgid "Bengali (Uni Gitanjali)"
+msgstr "Бенгальська (уні гітанджалі)"
+
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Берберська (Марокко, тифінаг, альтернативна фонетична)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Берберська (Марокко, тифінаг, альтернативна)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:97
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Берберська (Марокко, тифінаг, розширена фонетична)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:98
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Берберська (Марокко, тифінаг, розширена)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:99
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Берберська (Марокко, тифінаг, фонетична)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:100
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Берберська (Марокко, давньолівійська)"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian"
 msgstr "Боснійська"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:102
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Боснійська (клавіатура США з боснійськими диграфами)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:103
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Боснійська (клавіатура США з боснійськими літерами)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:104
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Боснійська (з боснійськими диграфами)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:105
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Боснійська (кутові лапки)"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "Обидві клавіші Alt разом"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "Обидві клавіші Ctrl разом"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "Обидві клавіші Shift разом"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:109
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "Натискання обох клавіш Shift вмикають Caps Lock, одна клавіша Shift — вимикає"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:110
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Обидві клавіші Shift разом перемикають стан Caps Lock"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:111
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Обидві клавіші Shift разом перемикають стан Shift"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:112
 msgid "Braille"
 msgstr "Брайля"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:113
 msgid "Braille (left hand)"
 msgstr "Брайля (для шульги)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:114
 msgid "Braille (right hand)"
 msgstr "Брайль (для правші)"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:115
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:116
 msgid "Bulgarian"
 msgstr "Болгарська"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:117
 msgid "Bulgarian (new phonetic)"
 msgstr "Болгарська (нова фонетична)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:118
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Болгарська (традиційна фонетична)"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:119
 msgid "Burmese"
 msgstr "Бірманська"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:120
+msgid "Cameroon Multilingual (azerty)"
+msgstr "Камерунська (багатомовна, azerty)"
+
+#: ../rules/base.xml.in.h:121
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "Камерунська (багатомовна, qwerty)"
+
+#: ../rules/base.xml.in.h:122
 msgid "Canadian Multilingual"
 msgstr "Канадська (багатомовна)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:123
 msgid "Canadian Multilingual (first part)"
 msgstr "Канадська (багатомовна, перша частина)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:124
 msgid "Canadian Multilingual (second part)"
 msgstr "Канадська (багатомовна, друга частина)"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock"
 msgstr "Caps Lock"
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr "Caps Lock (вибирає 3-ій рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 3-го рівня)"
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr "Caps Lock (на першу розкладку), Shift+Caps Lock (на останню розкладку)"
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr "Caps Lock (поки натиснена), Alt+Caps Lock виконує оригінальну функцію capslock"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock дія як Shift з блокуванням. Shift призупиняє дію Caps Lock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:130
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock діє як Shift з блокуванням. Shift не впливає на Caps Lock"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:131
+msgid "Caps Lock as Ctrl"
+msgstr "Caps Lock працює як Ctrl"
+
+#: ../rules/base.xml.in.h:132
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock вимкнено"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:133
 msgid "Caps Lock key behavior"
 msgstr "Поведінка клавіші Caps Lock"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:134
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "Caps Lock вмикає Shift, таким чином, він діє одразу на всі клавіші"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:135
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock вмикає звичайну капіталізацію символів алфавіту"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:136
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Caps Lock вмикає внутрішню капіталізацію. Shift призупиняє дію Caps Lock"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:137
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "Caps Lock вмикає внутрішню капіталізацію. Shift не впливає на Caps Lock"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:138
 msgid "Catalan"
 msgstr "Каталонська"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:139
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr "Іспанська (Іспанія, варіант з L із середньою точкою)"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:140
 msgid "Cherokee"
 msgstr "Cherokee"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:141
 msgid "Cherry B.UNLIMITED"
 msgstr "Cherry B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:142
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:143
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (альтернативний варіант)"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:144
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:145
 msgid "Cherry CyMotion Expert"
 msgstr "Cherry CyMotion Expert"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:146
 msgid "Cherry CyMotion Master Linux"
 msgstr "Cherry CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:147
 msgid "Cherry CyMotion Master XPress"
 msgstr "Cherry CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:148
 msgid "Chicony Internet Keyboard"
 msgstr "Інтернет-клавіатура Chicony"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:149
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:150
 msgid "Chicony KU-0108"
 msgstr "Chicony KU-0108"
 
-#: ../rules/base.xml.in.h:144
+#: ../rules/base.xml.in.h:151
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:145
+#: ../rules/base.xml.in.h:152
 msgid "Chinese"
 msgstr "Китайська"
 
-#: ../rules/base.xml.in.h:146
+#: ../rules/base.xml.in.h:153
 msgid "Chuvash"
 msgstr "Чуваська"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:154
 msgid "Chuvash (Latin)"
 msgstr "Чуваська (латиниця)"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:155
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:156
 msgid "CloGaelach"
 msgstr "Гаельський шрифт"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 клавіш)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 клавіш)"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:160
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 клавіш)"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:161
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:162
 msgid "Compose key position"
 msgstr "Розташування клавіші Compose"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
-#: ../rules/base.xml.in.h:157
+#: ../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:158
+#: ../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:159
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
-#: ../rules/base.xml.in.h:160
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "Кримськотатарська (Dobruja Q)"
-
-#: ../rules/base.xml.in.h:161
+#: ../rules/base.xml.in.h:167
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr "Кримськотатарська (турецька Alt-Q)"
 
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:168
 msgid "Crimean Tatar (Turkish F)"
 msgstr "Кримськотатарська (турецька F)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Crimean Tatar (Turkish Q)"
 msgstr "Кримськотатарська (турецька Q)"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Croatian"
 msgstr "Хорватська"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Хорватська (клавіатура США з хорватськими диграфами)"
 
-#: ../rules/base.xml.in.h:166
+#: ../rules/base.xml.in.h:172
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Хорватська (клавіатура США з хорватськими літерами)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Croatian (use Croatian digraphs)"
 msgstr "Хорватська (з хорватськими диграфами)"
 
-#: ../rules/base.xml.in.h:168
+#: ../rules/base.xml.in.h:174
 msgid "Croatian (use guillemets for quotes)"
 msgstr "Хорватська (кутові лапки)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:175
 msgid "Ctrl key position"
 msgstr "Розташування клавіші Ctrl"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:176
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:177
 msgid "Czech"
 msgstr "Чеська"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:178
 msgid "Czech (UCW layout, accented letters only)"
 msgstr "Чеська (UCW-розкладка, лише літери з акцентами)"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Чеська (Дворак-США з підтримкою CZ UCW)"
 
-#: ../rules/base.xml.in.h:174
+#: ../rules/base.xml.in.h:180
 msgid "Czech (qwerty)"
 msgstr "Чеська (qwerty)"
 
-#: ../rules/base.xml.in.h:175
+#: ../rules/base.xml.in.h:181
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Чеська (qwerty, розширені функції Backslash)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "Чеська (з клавішею &lt;\\|&gt;)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Danish"
 msgstr "Данська"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Danish (Dvorak)"
 msgstr "Данська (Дворака)"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Danish (Macintosh)"
 msgstr "Данська (Macintosh)"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Данська (Macintosh, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Danish (eliminate dead keys)"
 msgstr "Данська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Default numeric keypad keys"
 msgstr "Типові клавіші цифрової клавіатури"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell"
 msgstr "Dell"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell 101-key PC"
 msgstr "Dell 101-клавішна для ПК"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell, ноутбуки Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell, ноутбуки Precision M"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dell Latitude series laptop"
 msgstr "Dell, ноутбук Latitude"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Dell Precision M65"
 msgstr "Dell Precision M65"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:197
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dell USB Multimedia Keyboard"
 msgstr "Dell USB Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dhivehi"
 msgstr "Мальдивська"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Diamond 9801 / 9802 series"
 msgstr "Моделі Diamond 9801/9802"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
 msgid "Dutch"
 msgstr "Голландська"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:203
 msgid "Dutch (Macintosh)"
 msgstr "Голландська (Macintosh)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:204
 msgid "Dutch (Sun dead keys)"
 msgstr "Голландська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:205
 msgid "Dutch (standard)"
 msgstr "Голландська (стандартна)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:206
 msgid "Dzongkha"
 msgstr "Дзонг-ке"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:207
 msgid "Enable extra typographic characters"
 msgstr "Увімкнути додаткові типографські символи"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:208
 msgid "English (Cameroon Dvorak)"
 msgstr "Англійська (камерунський Дворак)"
 
-#: ../rules/base.xml.in.h:203
-msgid "English (Cameroon qwerty)"
-msgstr "Англійська (камерунський qwerty)"
-
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:209
 msgid "English (Cameroon)"
 msgstr "Англійська (Камерун)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:210
 msgid "English (Canada)"
 msgstr "Англійська (Канада)"
 
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:211
 msgid "English (Colemak)"
 msgstr "Англійська (Коулмак)"
 
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:212
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Англійська (альтернативна інтернаціональна Дворака без сліпих клавіш)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:213
 msgid "English (Dvorak international with dead keys)"
 msgstr "Англійська (інтернаціональна Дворака зі сліпими клавішами)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:214
 msgid "English (Dvorak)"
 msgstr "Англійська (Дворак)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:215
 msgid "English (Ghana)"
 msgstr "Англійська (Гана)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:216
 msgid "English (Ghana, GILLBT)"
 msgstr "Англійська (Гана, GILLBT)"
 
-#: ../rules/base.xml.in.h:212
+#: ../rules/base.xml.in.h:217
 msgid "English (Ghana, multilingual)"
 msgstr "Англійська (Гана, інтернаціональна)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:218
 msgid "English (India, with RupeeSign)"
 msgstr "Англійська (Індія, з підтримкою символу рупії)"
 
-#: ../rules/base.xml.in.h:214
+#: ../rules/base.xml.in.h:219
 msgid "English (Macintosh)"
 msgstr "Англійська (Macintosh)"
 
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:220
 msgid "English (Mali, US Macintosh)"
 msgstr "Англійська (Малі, Macintosh США)"
 
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:221
 msgid "English (Mali, US international)"
 msgstr "Англійська (Малі, інтернаціональна США)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:222
 msgid "English (Nigeria)"
 msgstr "Англійська (Нігерія)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:223
 msgid "English (South Africa)"
 msgstr "Англійська (ПАР)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:224
 msgid "English (UK)"
 msgstr "Англійська (Великобританія)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:225
 msgid "English (UK, Colemak)"
 msgstr "Англійська (США, Коулмак)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Англійська (Великобританія, Дворак з британською пунктуацією)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:227
 msgid "English (UK, Dvorak)"
 msgstr "Англійська (Великобританія, Дворак)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:228
 msgid "English (UK, Macintosh international)"
 msgstr "Англійська (Великобританія, інтернаціональна Macintosh)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:229
 msgid "English (UK, Macintosh)"
 msgstr "Англійська (Великобританія, Macintosh)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:230
 msgid "English (UK, extended WinKeys)"
 msgstr "Англійська (Великобританія, розширена, з клавішами Win)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:231
 msgid "English (UK, international with dead keys)"
 msgstr "Англійська (Великобританія, інтернаціональна зі сліпими клавішами)"
 
-#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+#: ../rules/base.xml.in.h:232 ../rules/base.extras.xml.in.h:8
 msgid "English (US)"
 msgstr "Англійська (США)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:233
 msgid "English (US, alternative international)"
 msgstr "Англійська (США, альтернативна інтернаціональна)"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:234
 msgid "English (US, international with dead keys)"
 msgstr "Англійська (США, інтернаціональна зі сліпими клавішами)"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:235
 msgid "English (US, with euro on 5)"
 msgstr "Англійська (США, з символом євро на клавіші 5)"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:236
 msgid "English (classic Dvorak)"
 msgstr "Англійська (класична Дворака)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:237
 msgid "English (international AltGr dead keys)"
 msgstr "Англійська (інтернаціональна зі сліпими клавішами AltGr)"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:238
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Англійська (перемикання розкладки клавішею «помножити/ділити»)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:239
 msgid "English (left handed Dvorak)"
 msgstr "Англійська (Дворака для шульги)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:240
 msgid "English (programmer Dvorak)"
 msgstr "Англійська (програмістський Дворак)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:241
 msgid "English (right handed Dvorak)"
 msgstr "Англійська (Дворак для правші)"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:242
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:243
 msgid "Enter on keypad"
 msgstr "Enter на цифровій клавіатурі"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:244
 msgid "Esperanto"
 msgstr "Есперанто"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:245
 msgid "Esperanto (Portugal, Nativo)"
 msgstr "Есперанто (португальська, Nativo)"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:246
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Есперанто (посунута крапка з комою та лапки, застаріла)"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:247
 msgid "Estonian"
 msgstr "Естонська"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:248
 msgid "Estonian (Dvorak)"
 msgstr "Естонська (Дворака)"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:249
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Естонська (клавіатура США з естонськими літерами)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:250
 msgid "Estonian (eliminate dead keys)"
 msgstr "Естонська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:251
 msgid "Euro on 2"
 msgstr "Євро на 2"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:252
 msgid "Euro on 4"
 msgstr "Євро на 4"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:253
 msgid "Euro on 5"
 msgstr "Євро на 5"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:254
 msgid "Euro on E"
 msgstr "Євро на E"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:255
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:256
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:257
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:258
 msgid "Faroese"
 msgstr "Фарерська"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:259
 msgid "Faroese (eliminate dead keys)"
 msgstr "Фарерська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:260
 msgid "Filipino"
 msgstr "Філіппінська"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Філіппінська (Кейпвелл-Дворак, байбаїн)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:262
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Філіппінська (Кейпвелл-Дворак, латиниця)"
 
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Філіппінська (Кейпвелл-QWERF 2006, байбаїн)"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Філіппінська (Кейпвелл-QWERF 2006, латиниця)"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:265
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Філіппінська (Коулмак, байбаїн)"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:266
 msgid "Filipino (Colemak Latin)"
 msgstr "Філіппінська (Коулмак, латиниця)"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:267
 msgid "Filipino (Dvorak Baybayin)"
 msgstr "Філіппінська (Дворат, байбаїн)"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:268
 msgid "Filipino (Dvorak Latin)"
 msgstr "Філіппінська (Дворак, латиниця)"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:269
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Філіппінська (QWERTY, байбаїн)"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:270
 msgid "Finnish"
 msgstr "Фінська"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:271
 msgid "Finnish (Macintosh)"
 msgstr "Фінська (Macintosh)"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:272
 msgid "Finnish (classic)"
 msgstr "Фінська (класична)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:273
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Фінська (класична, вимкнути сліпі клавіші)"
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:276
 msgid "Four-level key with abstract separators"
 msgstr "Клавіша четвертого рівня з абстрактним розділювачем "
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:277
 msgid "Four-level key with comma"
 msgstr "Клавіша четвертого рівня з комою"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:278
 msgid "Four-level key with dot"
 msgstr "Клавіша четвертого рівня з крапкою"
 
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:279
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Клавіша четвертого рівня з крапкою, обмежена latin-9"
 
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:280
 msgid "Four-level key with momayyez"
 msgstr "Клавіша четвертого рівня з momayyez"
 
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:281
 msgid "French"
 msgstr "Французька"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:282
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Французька (Bepo, ергономічна, варіант Дворак)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:283
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Французька (Bepo, ергономічна, варіант Дворак, лише latin-9)"
 
-#: ../rules/base.xml.in.h:279
+#: ../rules/base.xml.in.h:284
 msgid "French (Breton)"
 msgstr "Французька (бретонська)"
 
-#: ../rules/base.xml.in.h:280
-msgid "French (Cameroon azerty)"
-msgstr "Французька (камерунська azerty)"
-
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:285
 msgid "French (Cameroon)"
 msgstr "Французька (Камерун)"
 
-#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+#: ../rules/base.xml.in.h:286 ../rules/base.extras.xml.in.h:11
 msgid "French (Canada)"
 msgstr "Французька (Канада)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:287
 msgid "French (Canada, Dvorak)"
 msgstr "Французька (Канада, Дворак)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:288
 msgid "French (Canada, legacy)"
 msgstr "Французька (Канада, застаріла)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:289
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Французька (Демократична республіка Конго)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:290
 msgid "French (Dvorak)"
 msgstr "Французька (Дворак)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:291
 msgid "French (Guinea)"
 msgstr "Французька (Гвінея)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:292
 msgid "French (Macintosh)"
 msgstr "Французька (Macintosh)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:293
 msgid "French (Mali, alternative)"
 msgstr "Французька (Малі, альтернативна)"
 
-#: ../rules/base.xml.in.h:290
+#: ../rules/base.xml.in.h:294
 msgid "French (Morocco)"
 msgstr "Французька (Марокко)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:295
 msgid "French (Sun dead keys)"
 msgstr "Французька (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:296
 msgid "French (Switzerland)"
 msgstr "Французька (Швейцарія)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:297
 msgid "French (Switzerland, Macintosh)"
 msgstr "Французька (Швейцарія, Macintosh)"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:298
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Французька (Швейцарія, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:295
+#: ../rules/base.xml.in.h:299
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Французька (Швейцарія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:300
 msgid "French (alternative)"
 msgstr "Французька (альтернативна)"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:301
 msgid "French (alternative, Sun dead keys)"
 msgstr "Французька (альтернативна, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:302
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Французька (альтернативна, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:303
 msgid "French (alternative, latin-9 only)"
 msgstr "Французька (альтернативна, лише latin-9)"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:304
 msgid "French (eliminate dead keys)"
 msgstr "Французька (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:305
 msgid "French (legacy, alternative)"
 msgstr "Французька (застаріла, альтернативна)"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:306
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Французька (застаріла, альтернативна, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:307
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Французька (застаріла, альтернативна, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:308
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Ноутбук Fujitsu-Siemens Computers AMILO"
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:309
 msgid "Fula"
 msgstr "Фула"
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:310
 msgid "Ga"
 msgstr "Га"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:311
 msgid "Generic 101-key PC"
 msgstr "Звичайна 101-клавішна для ПК"
 
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:312
 msgid "Generic 102-key (Intl) PC"
 msgstr "Звичайна 102-клавішна для ПК"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:313
 msgid "Generic 104-key PC"
 msgstr "Звичайна 104-клавішна для ПК"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:314
 msgid "Generic 105-key (Intl) PC"
 msgstr "Звичайна 105-клавішна для ПК"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:315
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-21e"
 
-#: ../rules/base.xml.in.h:312
+#: ../rules/base.xml.in.h:316
 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:313
+#: ../rules/base.xml.in.h:317
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr "Genius Comfy KB-21e-Scroll"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:318
 msgid "Genius KB-19e NB"
 msgstr "Genius KB-19e NB"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:319
 msgid "Genius KKB-2050HS"
 msgstr "Genius KKB-2050HS"
 
-#: ../rules/base.xml.in.h:316
+#: ../rules/base.xml.in.h:320
 msgid "Georgian"
 msgstr "Грузинська"
 
-#: ../rules/base.xml.in.h:317
+#: ../rules/base.xml.in.h:321
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr "Грузинська (Франція, AZERTY Tskapo)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:322
 msgid "Georgian (Italy)"
 msgstr "Грузинська (Італія)"
 
-#: ../rules/base.xml.in.h:319
+#: ../rules/base.xml.in.h:323
 msgid "Georgian (MESS)"
 msgstr "Грузинська (MESS)"
 
-#: ../rules/base.xml.in.h:320
+#: ../rules/base.xml.in.h:324
 msgid "Georgian (ergonomic)"
 msgstr "Грузинська (ергономічна)"
 
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:325 ../rules/base.extras.xml.in.h:12
 msgid "German"
 msgstr "Німецька"
 
-#: ../rules/base.xml.in.h:322
+#: ../rules/base.xml.in.h:326
 msgid "German (Austria)"
 msgstr "Німецька (Австрія)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:327
 msgid "German (Austria, Macintosh)"
 msgstr "Німецька (Австрія, Macintosh)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:328
 msgid "German (Austria, Sun dead keys)"
 msgstr "Німецька (Австрія, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:329
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Німецька (Австрія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:330
 msgid "German (Dvorak)"
 msgstr "Німецька (Дворак)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:331
 msgid "German (Macintosh)"
 msgstr "Німецька (Macintosh)"
 
-#: ../rules/base.xml.in.h:328
+#: ../rules/base.xml.in.h:332
 msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Німецька (Macintosh, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:329
+#: ../rules/base.xml.in.h:333
 msgid "German (Neo 2)"
 msgstr "Німецька (Neo 2)"
 
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:334
 msgid "German (Sun dead keys)"
 msgstr "Німецька (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:335
 msgid "German (Switzerland)"
 msgstr "Німецька (Швейцарія)"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:336
 msgid "German (Switzerland, Macintosh)"
 msgstr "Німецька (Швейцарія, Macintosh)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:337
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Німецька (Швейцарія, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:338
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Німецька (Швейцарія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:339
 msgid "German (Switzerland, legacy)"
 msgstr "Німецька (Швейцарія, застаріла)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:340
 msgid "German (dead acute)"
 msgstr "Німецька (сліпий акут)"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:341
 msgid "German (dead grave acute)"
 msgstr "Німецька (сліпий наголос-акут)"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:342
 msgid "German (eliminate dead keys)"
 msgstr "Німецька (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:339
-msgid "German (qwerty)"
-msgstr "Німецька (qwerty)"
-
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:343
 msgid "Greek"
 msgstr "Грецька"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:344
 msgid "Greek (eliminate dead keys)"
 msgstr "Грецька (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:345
 msgid "Greek (extended)"
 msgstr "Грецька (розширена)"
 
-#: ../rules/base.xml.in.h:343
+#: ../rules/base.xml.in.h:346
 msgid "Greek (polytonic)"
 msgstr "Грецька (поліфонічна)"
 
-#: ../rules/base.xml.in.h:344
+#: ../rules/base.xml.in.h:347
 msgid "Greek (simple)"
 msgstr "Грецька (проста)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:348
 msgid "Gujarati"
 msgstr "Гуджараті"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:349
 msgid "Gyration"
 msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:350
 msgid "HTC Dream"
 msgstr "HTC Dream"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:351
 msgid "Happy Hacking Keyboard"
 msgstr "Happy Hacking Keyboard"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:352
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Happy Hacking Keyboard для Mac"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:353
 msgid "Hausa"
 msgstr "Hausa"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:354
 msgid "Hebrew"
 msgstr "Іврит"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:355
 msgid "Hebrew (Biblical, Tiro)"
 msgstr "Іврит (Біблейська, Tiro)"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:356
 msgid "Hebrew (lyx)"
 msgstr "Іврит (lyx)"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:357
 msgid "Hebrew (phonetic)"
 msgstr "Іврит (фонетична)"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard Mini 110 Notebook"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:367
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavilion dv5"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:368
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:369
 msgid "Hewlett-Packard nx9020"
 msgstr "Hewlett-Packard nx9020"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:370
 msgid "Hexadecimal"
 msgstr "Шістнадцяткова"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:371
 msgid "Hindi (Bolnagri)"
 msgstr "Хінді (болнагрі)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:372
 msgid "Hindi (Wx)"
 msgstr "Хінді (Wx)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:373
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:374
 msgid "Htc Dream phone"
 msgstr "Телефон HTC Dream"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian"
 msgstr "Угорська"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Угорська (101/qwerty/кома/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Угорська (101/qwerty/кома/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Угорська (101/qwerty/крапка/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Угорська (101/qwerty/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Угорська (101/qwertz/кома/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Угорська (101/qwertz/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Угорська (101/qwertz/крапка/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Угорська (101/qwertz/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Угорська (102/qwerty/кома/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Угорська (102/qwerty/кома/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Угорська (102/qwerty/крапка/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Угорська (102/qwerty/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Угорська (102/qwertz/кома/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Угорська (102/qwertz/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Угорська (102/qwertz/крапка/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Угорська (102/qwertz/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:392
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Угорська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:393
 msgid "Hungarian (qwerty)"
 msgstr "Угорська (qwerty)"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:394
 msgid "Hungarian (standard)"
 msgstr "Угорська (стандартна)"
 
-#: ../rules/base.xml.in.h:392
+#: ../rules/base.xml.in.h:395
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper відповідає клавішам Win"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:396
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:397
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:398
 msgid "IBM Space Saver"
 msgstr "IBM Space Saver"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:399
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:400
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:401
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic"
 msgstr "Ісландська"
 
-#: ../rules/base.xml.in.h:400
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (Dvorak)"
 msgstr "Ісландська (Дворак)"
 
-#: ../rules/base.xml.in.h:401
+#: ../rules/base.xml.in.h:404
 msgid "Icelandic (Macintosh)"
 msgstr "Ісландська (Macintosh)"
 
-#: ../rules/base.xml.in.h:402
+#: ../rules/base.xml.in.h:405
 msgid "Icelandic (Sun dead keys)"
 msgstr "Ісландська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:406
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Ісландська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:407
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:405
+#: ../rules/base.xml.in.h:408
 msgid "Indian"
 msgstr "Індійська"
 
-#: ../rules/base.xml.in.h:406
+#: ../rules/base.xml.in.h:409
 msgid "Inuktitut"
 msgstr "Інуктитут"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:410
 msgid "Iraqi"
 msgstr "Іракська"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:411
 msgid "Irish"
 msgstr "Ірландська"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:412
 msgid "Irish (UnicodeExpert)"
 msgstr "Ірландська (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:413
 msgid "Italian"
 msgstr "Італійська"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:414
 msgid "Italian (Macintosh)"
 msgstr "Італійська (Macintosh)"
 
-#: ../rules/base.xml.in.h:412
+#: ../rules/base.xml.in.h:415
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Італійська (клавіатура США з італійськими літерами)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:416
 msgid "Italian (eliminate dead keys)"
 msgstr "Італійська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:417
 msgid "Japanese"
 msgstr "Японська"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (Kana 86)"
 msgstr "Японська (кана 86)"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (Kana)"
 msgstr "Японська (кана)"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:420
 msgid "Japanese (Macintosh)"
 msgstr "Японська (Macintosh)"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:421
 msgid "Japanese (OADG 109A)"
 msgstr "Японська (OADG 109A)"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:422
 msgid "Japanese (PC-98xx Series)"
 msgstr "Японська (родина PC-98xx)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:423
 msgid "Japanese keyboard options"
 msgstr "Параметри японської клавіатури"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:424
 msgid "Kalmyk"
 msgstr "Калмицька"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:425
 msgid "Kana Lock key is locking"
 msgstr "Клавіша Kana Lock фіксується"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:426
 msgid "Kannada"
 msgstr "Канадська"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:427
 msgid "Kashubian"
 msgstr "Кашубська"
 
-#: ../rules/base.xml.in.h:425
+#: ../rules/base.xml.in.h:428
 msgid "Kazakh"
 msgstr "Казахська"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:429
 msgid "Kazakh (with Russian)"
 msgstr "Казахська (з російськими)"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:430
 msgid "Key sequence to kill the X server"
 msgstr "Комбінація клавіш для переривання роботи X-сервера"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:431
 msgid "Key to choose 3rd level"
 msgstr "Клавіша для вибору 3-го ряду"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:432
 msgid "Key to choose 5th level"
 msgstr "Клавіша для вибору 5-го ряду"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:433
 msgid "Key(s) to change layout"
 msgstr "Клавіші для зміни розкладки"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:434
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:435
 msgid "Khmer (Cambodia)"
 msgstr "Кхмерська (Камбоджа)"
 
-#: ../rules/base.xml.in.h:433
+#: ../rules/base.xml.in.h:436
 msgid "Kikuyu"
 msgstr "Кікуйю"
 
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:437
 msgid "Kinesis"
 msgstr "Kinesis"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:438
 msgid "Komi"
 msgstr "Комі"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:439
 msgid "Korean"
 msgstr "Корейська"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:440
 msgid "Korean (101/104 key compatible)"
 msgstr "Корейська (сумісна з 101/104 клавішною)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Курдська (Іран, арабсько-латинська)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iran, F)"
 msgstr "Курдська (Іран, F)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "Курдська (Іран, латиниця Alt-Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Курдська (Іран, латиниця Q)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Курдська (Ірак, арабсько-латинська)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Iraq, F)"
 msgstr "Курдська (Ірак, F)"
 
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Курдська (Ірак, латиниця Alt-Q)"
 
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Курдська (Ірак, латиниця Q)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Syria, F)"
 msgstr "Курдська (Сирія, F)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Курдська (Сирія, латиниця Alt-Q)"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Курдська (Сирія, латиниця Q)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:452
 msgid "Kurdish (Turkey, F)"
 msgstr "Курдська (Туреччина, F)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:453
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Курдська (Туреччина, латиниця Alt-Q)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:454
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Курдська (Туреччина, латиниця Q)"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:455
 msgid "Kyrgyz"
 msgstr "Киргизька"
 
-#: ../rules/base.xml.in.h:453
+#: ../rules/base.xml.in.h:456
 msgid "Kyrgyz (phonetic)"
 msgstr "Киргизька (фонетична)"
 
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:457
 msgid "Lao"
 msgstr "Лаоська"
 
-#: ../rules/base.xml.in.h:455
+#: ../rules/base.xml.in.h:458
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Лаоська (стандартна розкладка, запропонована STEA)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:459
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Клавіатура для ноутбуків Compaq (напр., Armada)"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:460
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Інтернет-клавіатура для ноутбуків Compaq (напр., Presario)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:461
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Ноутбуки eMachines m68xx"
 
-#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+#: ../rules/base.xml.in.h:462 ../rules/base.extras.xml.in.h:16
 msgid "Latvian"
 msgstr "Латвійська"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:463
 msgid "Latvian (F variant)"
 msgstr "Латвійська (варіант з літерою F)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:464
 msgid "Latvian (adapted)"
 msgstr "Латвійська (адаптована)"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:465
 msgid "Latvian (apostrophe variant)"
 msgstr "Латвійська (варіант з апострофом)"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:466
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr "Латвійська (ергономічна, ŪGJRMV)"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:467
 msgid "Latvian (modern)"
 msgstr "Латвійська (сучасна)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:468
 msgid "Latvian (tilde variant)"
 msgstr "Латвійська (варіант з тильдою)"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:469
 msgid "Left Alt"
 msgstr "Ліва клавіша Alt"
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:470
 msgid "Left Alt (while pressed)"
 msgstr "Ліва клавіша Alt (поки натиснена)"
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:471
 msgid "Left Alt is swapped with Left Win"
 msgstr "Ліва Alt міняється з лівою клавішею Win"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:472
 msgid "Left Ctrl"
 msgstr "Ліва клавіша Ctrl"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:473
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr "Ліва Ctrl (на першу розкладку), Правий Ctrl (на останню розкладку)"
 
-#: ../rules/base.xml.in.h:471
+#: ../rules/base.xml.in.h:474
+msgid "Left Ctrl as Meta"
+msgstr "Ліва клавіша Ctrl як Meta"
+
+#: ../rules/base.xml.in.h:475
 msgid "Left Ctrl+Left Shift"
 msgstr "Лівий Ctrl+Лівий Shift"
 
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:476
 msgid "Left Shift"
 msgstr "Ліва клавіша Shift"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:477
 msgid "Left Win"
 msgstr "Ліва клавіша Win"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:478
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr "Ліва Win (на першу розкладку), Права Win/Menu (на останню розкладку)"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:479
 msgid "Left Win (while pressed)"
 msgstr "Ліва клавіша Win (поки натиснута)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:480
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Ліва клавіша Win вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:481
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Ліва клавіша Win вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:482
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr "Ліва Ctrl+ліва Win (на першу розкладку), правий Ctrl+Menu (на другу розкладку)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:483
 msgid "Legacy"
 msgstr "Застаріла"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:484
 msgid "Legacy Wang 724"
 msgstr "Стара Wang 724"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:486
 msgid "Legacy key with comma"
 msgstr "Застаріла клавіша з комою"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:487
 msgid "Legacy key with dot"
 msgstr "Застаріла клавіша з крапкою"
 
-#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+#: ../rules/base.xml.in.h:488 ../rules/base.extras.xml.in.h:25
 msgid "Lithuanian"
 msgstr "Литовська"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Литовська (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:490
 msgid "Lithuanian (LEKP)"
 msgstr "Литовська (LEKP)"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:491
 msgid "Lithuanian (LEKPa)"
 msgstr "Литовська (LEKPa)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:492
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Литовська (клавіатура США, з литовськими літерами)"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:493
 msgid "Lithuanian (standard)"
 msgstr "Литовська (стандартна)"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Access Keyboard"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "Logitech Cordless Desktop (альтернативний варіант)"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop EX110"
 msgstr "Logitech Cordless Desktop EX110"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "Logitech Cordless Desktop LX-300"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:500
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "Logitech Cordless Desktop Pro (альтернативний варіант 2)"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:504
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "Logitech G15 з додатковими клавішами через G15daemon"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech Generic Keyboard"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Logitech Internet 350 Keyboard"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:508
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:509
 msgid "Logitech Media Elite Keyboard"
 msgstr "Logitech Media Elite Keyboard"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:510
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:511
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Logitech Ultra-X Keyboard"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:512
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Logitech diNovo Edge Keyboard"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:513
 msgid "Logitech diNovo Keyboard"
 msgstr "Logitech diNovo Keyboard"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:514
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:515
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (модель Y-RB6)"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:516
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:517
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:518
 msgid "Lower Sorbian"
 msgstr "Нижньолужицька"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:519
 msgid "Lower Sorbian (qwertz)"
 msgstr "Нижньолужицька (qwertz)"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:520
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:521
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Intl)"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:522
 msgid "Macedonian"
 msgstr "Македонська"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:523
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Македонська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:524
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:525
 msgid "Macintosh Old"
 msgstr "Старий Macintosh"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Caps Lock — додаткова клавіша Backspace"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "Caps Lock — додаткова клавіша Ctrl, але зі збереженням символу клавіші Caps_Lock"
 
-#: ../rules/base.xml.in.h:524
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Caps Lock — додаткова клавіша Ctrl"
-
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional ESC"
 msgstr "Caps Lock — додаткова клавіша ESC"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:529
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Caps Lock — додаткова клавіша Hyper"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:530
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Caps Lock — додаткова клавіша Num Lock"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:531
 msgid "Make Caps Lock an additional Super"
 msgstr "Caps Lock — додаткова клавіша Super"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:532
 msgid "Malayalam"
 msgstr "Малаяламська"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:533
 msgid "Malayalam (Lalitha)"
 msgstr "Малаяламська (лаліта)"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:534
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Малаяламська (покращений запис індійських мов з символом рупії)"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:535
 msgid "Maltese"
 msgstr "Мальтійська"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:536
 msgid "Maltese (with US layout)"
 msgstr "Мальтійська (клавіатура з розкладкою США)"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:537
 msgid "Maori"
 msgstr "Маорійська"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:538
 msgid "Mari"
 msgstr "Марійська"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:539
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:540
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:541
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:542
 msgid "Menu"
 msgstr "Menu"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:543
+msgid "Menu as Right Ctrl"
+msgstr "Menu працює як права клавіша Ctrl"
+
+#: ../rules/base.xml.in.h:544
 msgid "Meta is mapped to Left Win"
 msgstr "Meta відповідає лівій клавіші Win"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:545
 msgid "Meta is mapped to Win keys"
 msgstr "Meta відповідає клавішам Win"
 
-#: ../rules/base.xml.in.h:542
-msgid "Meta on Left Ctrl"
-msgstr "Meta на лівій клавіші Ctrl"
-
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "Microsoft Comfort Curve Keyboard 2000"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, шведська"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: ../rules/base.xml.in.h:547
+#: ../rules/base.xml.in.h:550
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "Microsoft Natural Keyboard Elite"
 
-#: ../rules/base.xml.in.h:548
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: ../rules/base.xml.in.h:549
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:553
 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:551
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:555
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:556
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:557
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:558
 msgid "Miscellaneous compatibility options"
 msgstr "Різні параметри сумісності"
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:559
 msgid "Mongolian"
 msgstr "Монгольська"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin"
 msgstr "Чорногорська"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:561
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Чорногорська (кирилиця з кутовими лапками)"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:562
 msgid "Montenegrin (Cyrillic)"
 msgstr "Чорногорська (кирилиця)"
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:563
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Чорногорська (кирилиця, З та Ж поміняні місцями)"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Чорногорська (латиниця, Unicode, qwerty)"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:565
 msgid "Montenegrin (Latin Unicode)"
 msgstr "Чорногорська (латиниця, Unicode)"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:566
 msgid "Montenegrin (Latin qwerty)"
 msgstr "Чорногорська (латиниця, qwerty)"
 
-#: ../rules/base.xml.in.h:564
+#: ../rules/base.xml.in.h:567
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Чорногорська (латиниця з кутовими лапками)"
 
-#: ../rules/base.xml.in.h:565
+#: ../rules/base.xml.in.h:568
 msgid "NICOLA-F style Backspace"
 msgstr "NICOLA-F style Backspace"
 
-#: ../rules/base.xml.in.h:566
+#: ../rules/base.xml.in.h:569
 msgid "Nepali"
 msgstr "Непальська"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at fourth level"
 msgstr "Символ нерозривного пробілу на четвертому рівні"
 
-#: ../rules/base.xml.in.h:568
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr "Клавіша пробіл видає нерозривний пробіл на 4-му рівні, вузький нерозривний пробіл на 6-му рівні"
 
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:572
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
 msgstr "Клавіша пробіл видає нерозривний пробіл на 4-му рівні, вузький нерозривний пробіл на 6-му рівні (через Ctrl+Shift)"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at second level"
 msgstr "Символ нерозривного пробілу на другому рівні"
 
-#: ../rules/base.xml.in.h:571
+#: ../rules/base.xml.in.h:574
 msgid "Non-breakable space character at third level"
 msgstr "Символ нерозривного пробілу на третьому рівні"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:575
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr "Символ нерозривного пробілу на третьому рівні, нічого на четвертому"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:576
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr "Символ нерозривного пробілу на третьому рівні, символ тонкого нерозривного пробілу на четвертому рівні"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:577
 msgid "Northern Saami (Finland)"
 msgstr "Північно-саамська (Фінляндія)"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:578
 msgid "Northern Saami (Norway)"
 msgstr "Північно-саамська (Норвегія)"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:579
 msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr "Північно-саамська (Норвегія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:580
 msgid "Northern Saami (Sweden)"
 msgstr "Північно-саамська (Швеція)"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:581
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:582
 msgid "Norwegian"
 msgstr "Норвезька"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (Dvorak)"
 msgstr "Норвезька (Дворак)"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:584
 msgid "Norwegian (Macintosh)"
 msgstr "Норвезька (Macintosh)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:585
 msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Норвезька (Macintosh, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:583
+#: ../rules/base.xml.in.h:586
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Норвезька (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:587
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:588
 msgid "Numeric keypad delete key behaviour"
 msgstr "Вибір поведінки клавіші del на цифровій клавіатурі"
 
-#: ../rules/base.xml.in.h:586
+#: ../rules/base.xml.in.h:589
 msgid "Numeric keypad keys work as with Macintosh"
 msgstr "Цифрова клавіатура працює як у Macintosh"
 
-#: ../rules/base.xml.in.h:587
+#: ../rules/base.xml.in.h:590
 msgid "Numeric keypad layout selection"
 msgstr "Вибір розкладки цифрової клавіатури"
 
-#: ../rules/base.xml.in.h:588
+#: ../rules/base.xml.in.h:591
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:592
 msgid "Occitan"
 msgstr "Окситанська"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:593
 msgid "Ogham"
 msgstr "Огам"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:594
 msgid "Ogham (IS434)"
 msgstr "Огам (IS434)"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:595
 msgid "Oriya"
 msgstr "Орія"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:596
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Ortek MCK-800 MM/Internet keyboard"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:597
 msgid "Ossetian (Georgia)"
 msgstr "Осетинська (Грузія)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:598
 msgid "Ossetian (WinKeys)"
 msgstr "Осетинська (з клавішами Win)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:599
 msgid "Ossetian (legacy)"
 msgstr "Осетинська (застаріла)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:600
 msgid "PC-98xx Series"
 msgstr "Моделі PC-98xx"
 
-#: ../rules/base.xml.in.h:598
+#: ../rules/base.xml.in.h:601
 msgid "Pannonian Rusyn (homophonic)"
 msgstr "Паннонська русинська (гомофонна)"
 
-#: ../rules/base.xml.in.h:599
+#: ../rules/base.xml.in.h:602
 msgid "Pashto"
 msgstr "Пушту"
 
-#: ../rules/base.xml.in.h:600
+#: ../rules/base.xml.in.h:603
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Пушту (Афганістан, OLPC)"
 
-#: ../rules/base.xml.in.h:601
+#: ../rules/base.xml.in.h:604
 msgid "Pause"
 msgstr "Pause"
 
-#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:27
 msgid "Persian"
 msgstr "Перська"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:606
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Перська (Афганістан, дарі OLPC)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:607
 msgid "Persian (with Persian Keypad)"
 msgstr "Перська (з перською дод. панеллю)"
 
-#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:28
 msgid "Polish"
 msgstr "Польська"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:609
 msgid "Polish (Dvorak)"
 msgstr "Польська (Дворак)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:610
 msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr "Польська (Дворак, польські лапки на клавіші 1)"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:611
 msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr "Польська (Дворак, польські лапки на знаку лапки)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:612
 msgid "Polish (programmer Dvorak)"
 msgstr "Польська (програмістський Дворак)"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:613
 msgid "Polish (qwertz)"
 msgstr "Польська (qwertz)"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese"
 msgstr "Португальська"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil)"
 msgstr "Португальська (Бразилія)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Португальська (Бразилія, Дворак)"
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Португальська (Бразилія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:618
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Португальська (Бразилія, nativo для есперанто)"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:619
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Португальська (Бразилія, nativo для клавіатур США)"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:620
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Португальська (Бразилія, nativo)"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Macintosh)"
 msgstr "Португальська (Macintosh)"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Португальська (Macintosh, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Португальська (Macintosh, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Португальська (nativo для клавіатур у США)"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:625
 msgid "Portuguese (Nativo)"
 msgstr "Португальська (Nativo)"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:626
 msgid "Portuguese (Sun dead keys)"
 msgstr "Португальська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:627
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Португальська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:628
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:629
 msgid "PrtSc"
 msgstr "PrtSc"
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:630
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Пенджабська (гурмухі, джелум)"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:631
 msgid "Punjabi (Gurmukhi)"
 msgstr "Пенджабська (гурмухі)"
 
-#: ../rules/base.xml.in.h:629
+#: ../rules/base.xml.in.h:632
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:630
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt"
 msgstr "Права клавіша Alt"
 
-#: ../rules/base.xml.in.h:631
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt (while pressed)"
 msgstr "Права клавіша Alt (поки натиснена)"
 
-#: ../rules/base.xml.in.h:632
+#: ../rules/base.xml.in.h:635
+msgid "Right Alt as Right Ctrl"
+msgstr "Права клавіша Alt працює як права клавіша Ctrl"
+
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Права клавіша Alt вибирає 5-ий рівень і активує блокування рівня 5, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:637
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Права клавіша Alt вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:638
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Права клавіша Alt вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:639
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Права клавіша Alt ніколи не обирає 3-й рівень"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:640
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Вибір 3-го рівня натисненням правої клавіші Alt, Shift+права клавіша Alt діє як Multi_Key"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl"
 msgstr "Права клавіша Ctrl"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:642
 msgid "Right Ctrl (while pressed)"
 msgstr "Права клавіша Ctrl (поки натиснута)"
 
-#: ../rules/base.xml.in.h:639
+#: ../rules/base.xml.in.h:643
 msgid "Right Ctrl as Right Alt"
 msgstr "Права клавіша Ctrl працює як права клавіша Alt"
 
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl is mapped to Menu"
-msgstr "Права Ctrl відповідає клавіші Menu"
-
-#: ../rules/base.xml.in.h:641
+#: ../rules/base.xml.in.h:644
 msgid "Right Ctrl+Right Shift"
 msgstr "Права Ctrl+Права Shift"
 
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:645
 msgid "Right Shift"
 msgstr "Права клавіша Shift"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:646
 msgid "Right Win"
 msgstr "Права клавіша Win"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:647
 msgid "Right Win (while pressed)"
 msgstr "Права клавіша Win (поки натиснена)"
 
-#: ../rules/base.xml.in.h:645
+#: ../rules/base.xml.in.h:648
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr "Права клавіша Win вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:649
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr "Права клавіша Win вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+#: ../rules/base.xml.in.h:650 ../rules/base.extras.xml.in.h:30
 msgid "Romanian"
 msgstr "Румунська"
 
-#: ../rules/base.xml.in.h:648
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (Germany)"
 msgstr "Румунська (Німеччина)"
 
-#: ../rules/base.xml.in.h:649
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (Germany, eliminate dead keys)"
 msgstr "Німецька (Німеччина, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:650
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (WinKeys)"
 msgstr "Румунська (з клавішами Win)"
 
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:654
 msgid "Romanian (cedilla)"
 msgstr "Румунська (седиль)"
 
-#: ../rules/base.xml.in.h:652
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (standard cedilla)"
 msgstr "Румунська (стандартна седиль)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
 msgstr "Румунська (стандартна)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:657
 msgid "Rupee on 4"
 msgstr "Символ рупії на 4"
 
-#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:658 ../rules/base.extras.xml.in.h:32
 msgid "Russian"
 msgstr "Російська"
 
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:659
 msgid "Russian (DOS)"
 msgstr "Російська (DOS)"
 
-#: ../rules/base.xml.in.h:657
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Georgia)"
 msgstr "Російська (Грузія)"
 
-#: ../rules/base.xml.in.h:658
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Germany, phonetic)"
 msgstr "Російська (Німеччина, фонетична)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Російська (Казахстан, з казахською)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:663
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Російська (Польща, фонетична Дворака)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:664
 msgid "Russian (Sweden, phonetic)"
 msgstr "Російська (шведська, фонетична)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:665
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Російська (шведська, фонетична, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:666
 msgid "Russian (US, phonetic)"
 msgstr "Російська (США, фонетична)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:667
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr "Російська (Україна, стандартна RSTU)"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:668
 msgid "Russian (legacy)"
 msgstr "Російська (застаріла)"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:669
 msgid "Russian (phonetic WinKeys)"
 msgstr "Російська (фонетична з клавішами Win)"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:670
 msgid "Russian (phonetic)"
 msgstr "Російська (фонетична)"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:671
 msgid "Russian (typewriter)"
 msgstr "Російська (машинопис)"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:672
 msgid "Russian (typewriter, legacy)"
 msgstr "Російська (машинопис, застаріла)"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:673
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:674
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:675
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:676
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:677
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:678
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:676
+#: ../rules/base.xml.in.h:679
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:680
 msgid "Saisiyat (Taiwan)"
 msgstr "Сайсіят (Тайвань)"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:681
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:682
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:683
 msgid "Sanwa Supply SKB-KG3"
 msgstr "Sanwa Supply SKB-KG3"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:684
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:685
 msgid "Semi-colon on third level"
 msgstr "Крапка з комою на третьому рівні"
 
-#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+#: ../rules/base.xml.in.h:686 ../rules/base.extras.xml.in.h:35
 msgid "Serbian"
 msgstr "Сербська"
 
-#: ../rules/base.xml.in.h:684
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Сербська (латиниця, Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin Unicode)"
 msgstr "Сербська (латиниця Unicode)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:689
 msgid "Serbian (Latin qwerty)"
 msgstr "Сербська (латиниця, qwerty)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Latin with guillemets)"
 msgstr "Сербська (латиниця з кутовими лапками)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (Latin)"
 msgstr "Сербська (латиниця)"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:692
 msgid "Serbian (Russia)"
 msgstr "Сербська (Росія)"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:693
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Сербська (З та Ж поміняні місцями)"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:694
 msgid "Serbian (with guillemets)"
 msgstr "Сербська (з кутовими лапками)"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:695
 msgid "Serbo-Croatian (US)"
 msgstr "Сербо-хорватська (США)"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:696
 msgid "Shift cancels Caps Lock"
 msgstr "Shift скасовує Caps Lock"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:697
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Shift не скасовує Num Lock, а вибирає третій рівень"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:698
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Shift з цифровою клавіатурою працює як у Microsoft Windows"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:699
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:700
 msgid "Sindhi"
 msgstr "Синдхі"
 
-#: ../rules/base.xml.in.h:698
-msgid "Sinhala"
-msgstr "Сингальська"
+#: ../rules/base.xml.in.h:701
+msgid "Sinhala (phonetic)"
+msgstr "Сингальська (фонетична)"
 
-#: ../rules/base.xml.in.h:699
+#: ../rules/base.xml.in.h:702
 msgid "Slovak"
 msgstr "Словацька"
 
-#: ../rules/base.xml.in.h:700
+#: ../rules/base.xml.in.h:703
 msgid "Slovak (extended Backslash)"
 msgstr "Словацька (розширені функції Backslash)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:704
 msgid "Slovak (qwerty)"
 msgstr "Словацька (qwerty)"
 
-#: ../rules/base.xml.in.h:702
+#: ../rules/base.xml.in.h:705
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Словацька (qwerty, розширені функції Backslash)"
 
-#: ../rules/base.xml.in.h:703
+#: ../rules/base.xml.in.h:706
 msgid "Slovenian"
 msgstr "Словенська"
 
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "Словенська (клавіатура США із словенськими літерами)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Slovenian (use guillemets for quotes)"
 msgstr "Словенська (кутові лапки)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
 msgid "Spanish"
 msgstr "Іспанська"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Dvorak)"
 msgstr "Іспанська (Дворак)"
 
-#: ../rules/base.xml.in.h:708
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American)"
 msgstr "Іспанська (латиноамериканська)"
 
-#: ../rules/base.xml.in.h:709
+#: ../rules/base.xml.in.h:712
 msgid "Spanish (Latin American, Sun dead keys)"
 msgstr "Іспанська (латиноамериканська, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Іспанська (латиноамериканська, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Іспанська (латиноамериканська зі «спеціальною» тильдою)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (Macintosh)"
 msgstr "Іспанська (Macintosh)"
 
-#: ../rules/base.xml.in.h:713
+#: ../rules/base.xml.in.h:716
 msgid "Spanish (Sun dead keys)"
 msgstr "Іспанська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Spanish (eliminate dead keys)"
 msgstr "Іспанська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Spanish (include dead tilde)"
 msgstr "Іспанська (зі «спеціальною» тильдою)"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "Сліпі клавіші (Ctrl+Alt+&lt;key&gt;) обробляються на сервері"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power Multimedia Keyboard"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swahili (Kenya)"
 msgstr "Суахілі (Кенія)"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swahili (Tanzania)"
 msgstr "Суахілі (Танзанія)"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Поміняти місцями клавіші Ctrl та Caps Lock"
 
-#: ../rules/base.xml.in.h:722
+#: ../rules/base.xml.in.h:725
 msgid "Swap ESC and Caps Lock"
 msgstr "Поміняти місцями клавіші ESC та Caps Lock"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish"
 msgstr "Шведська"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (Dvorak)"
 msgstr "Шведська (Дворак)"
 
-#: ../rules/base.xml.in.h:725
+#: ../rules/base.xml.in.h:728
 msgid "Swedish (Macintosh)"
 msgstr "Шведська (Macintosh)"
 
-#: ../rules/base.xml.in.h:726
+#: ../rules/base.xml.in.h:729
 msgid "Swedish (Svdvorak)"
 msgstr "Шведська (Svdvorak)"
 
-#: ../rules/base.xml.in.h:727
+#: ../rules/base.xml.in.h:730
 msgid "Swedish (eliminate dead keys)"
 msgstr "Шведська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:728
+#: ../rules/base.xml.in.h:731
 msgid "Swedish Sign Language"
 msgstr "Шведська мова жестів"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:732
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (планшетний ПК)"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:733
 msgid "Syriac"
 msgstr "Сирійська"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:734
 msgid "Syriac (phonetic)"
 msgstr "Сирійська (фонетична)"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:735
 msgid "Taiwanese"
 msgstr "Тайванська"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:736
 msgid "Taiwanese (indigenous)"
 msgstr "Тайванська (місцева)"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:737
 msgid "Tajik"
 msgstr "Таджицька"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:738
 msgid "Tajik (legacy)"
 msgstr "Таджицька (застаріла)"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:739
 msgid "Tamil"
 msgstr "Тамільська"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Тамільська (Шрі-Ланка, TAB, машинопис)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Тамільська (Шрі-Ланка, Unicode)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (TAB typewriter)"
 msgstr "Тамільська (TAB, машинопис)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:743
 msgid "Tamil (TSCII typewriter)"
 msgstr "Тамільська (TSCII, машинопис)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:744
 msgid "Tamil (Unicode)"
 msgstr "Тамільська (Unicode)"
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:745
 msgid "Tamil (keyboard with numerals)"
 msgstr "Тамільська (клавіатура з цифрами)"
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:746
 msgid "Targa Visionary 811"
 msgstr "Targa Visionary 811"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:747
 msgid "Tatar"
 msgstr "Татарська"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:748
 msgid "Telugu"
 msgstr "Телугу"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:749
 msgid "Thai"
 msgstr "Тайська"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:750
 msgid "Thai (Pattachote)"
 msgstr "Тайська (паттачот)"
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:751
 msgid "Thai (TIS-820.2538)"
 msgstr "Тайська (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:752
 msgid "Tibetan"
 msgstr "Тибетська"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:753
 msgid "Tibetan (with ASCII numerals)"
 msgstr "Тибетська (з ASCII числами)"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:754
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "На відповідну клавішу на клавіатурі Дворак."
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:755
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "На відповідну клавішу на клавіатурі Qwerty."
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:756
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Вмикати або вимикати PointerKeys за допомогою Shift + NumLock."
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:757
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:758
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:759
 msgid "Trust Slimline"
 msgstr "Trust Slimline"
 
-#: ../rules/base.xml.in.h:757
+#: ../rules/base.xml.in.h:760
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:761
 msgid "Tswana"
 msgstr "Тсвана"
 
-#: ../rules/base.xml.in.h:759
+#: ../rules/base.xml.in.h:762
 msgid "Turkish"
 msgstr "Турецька"
 
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (Alt-Q)"
 msgstr "Турецька (Alt-Q)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:764
 msgid "Turkish (F)"
 msgstr "Турецька (F)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:765
 msgid "Turkish (Sun dead keys)"
 msgstr "Турецька (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:766
 msgid "Turkish (international with dead keys)"
 msgstr "Турецька (інтернаціональна зі сліпими клавішами)"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:767
 msgid "Turkmen"
 msgstr "Туркменська"
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:768
 msgid "Turkmen (Alt-Q)"
 msgstr "Туркменська (Alt-Q)"
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr "TypeMatrix EZ-Reach 2020"
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:771
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr "TypeMatrix EZ-Reach 2030 USB"
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:772
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:режим ЄС)"
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:773
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr "TypeMatrix EZ-Reach 2030 USB (106:режим Японії)"
 
-#: ../rules/base.xml.in.h:771
+#: ../rules/base.xml.in.h:774
 msgid "Udmurt"
 msgstr "Удмуртська"
 
-#: ../rules/base.xml.in.h:772
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: ../rules/base.xml.in.h:773
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (WinKeys)"
 msgstr "Українська (з клавішами Win)"
 
-#: ../rules/base.xml.in.h:774
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr "Українська (гомофонна)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (legacy)"
 msgstr "Українська (застаріла)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:779
 msgid "Ukrainian (phonetic)"
 msgstr "Українська (фонетична)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:780
 msgid "Ukrainian (standard RSTU)"
 msgstr "Українська (стандартна RSTU)"
 
-#: ../rules/base.xml.in.h:778
+#: ../rules/base.xml.in.h:781
 msgid "Ukrainian (typewriter)"
 msgstr "Українська (друкарська машинка)"
 
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:782
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Доповнення Unicode (стрілки та математичні оператори)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:783
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Доповнення Unicode (стрілки та математичні оператори). Математичні оператори на типовому рівні."
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:784
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (Pakistan)"
 msgstr "Урду (Пакистан)"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Урду (Пакистан, CRULP)"
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Урду (Пакистан, NLA)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:788
 msgid "Urdu (WinKeys)"
 msgstr "Урду (з клавішами Win)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:789
 msgid "Urdu (alternative phonetic)"
 msgstr "Урду (альтернативна фонетична)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:790
 msgid "Urdu (phonetic)"
 msgstr "Урду (фонетична)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:791
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Використовувати клавіатурні індикатори для індикації альтернативних розкладок"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:792
 msgid "Using space key to input non-breakable space character"
 msgstr "Клавіша пробіл генерує символ нерозривного пробілу"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:793
 msgid "Usual space at any level"
 msgstr "Звичайний пробіл на будь-якому рівні"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:794
 msgid "Uyghur"
 msgstr "Уйгурська"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek"
 msgstr "Узбецька"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:796
 msgid "Uzbek (Afghanistan)"
 msgstr "Узбецька (Афганістан)"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:797
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Узбецька (Афганістан, OLPC)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:798
 msgid "Uzbek (Latin)"
 msgstr "Узбецька (латиниця)"
 
-#: ../rules/base.xml.in.h:796
+#: ../rules/base.xml.in.h:799
 msgid "Vietnamese"
 msgstr "В'єтнамська"
 
-#: ../rules/base.xml.in.h:797
+#: ../rules/base.xml.in.h:800
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "ViewSonic KU-306 Internet Keyboard"
 
-#: ../rules/base.xml.in.h:798
+#: ../rules/base.xml.in.h:801
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Клавіатура Wang 724 з доповненнями Unicode (стрілки та математичні оператори)"
 
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:802
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Клавіатура Wang 724 з доповненнями Unicode (стрілки та математичні оператори). Математичні операції на типовому рівні"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:803
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:804
 msgid "Wolof"
 msgstr "Волоф"
 
-#: ../rules/base.xml.in.h:802
+#: ../rules/base.xml.in.h:805
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: ../rules/base.xml.in.h:803
+#: ../rules/base.xml.in.h:806
 msgid "Yakut"
 msgstr "Якутська"
 
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:807
 msgid "Yoruba"
 msgstr "Йоруба"
 
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:808
 msgid "Zero-width non-joiner character at second level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:809
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні, нерозривний пробіл на третьому рівні"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:810
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні, нерозривний пробіл на третьому рівні, нічого на четвертому рівні"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:811
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні, нерозривний пробіл на третьому рівні, вузький нерозривний пробіл на четвертому рівні"
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:812
 msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні, символ нерозривного пробілу на третьому рівні, зв’язувальний символ нульової ширини на четвертому"
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:813
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні, зв’язувальний символ нульової ширини на третьому рівні"
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:814
 msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні, зв’язувальний символ нульової ширини на третьому рівні, символ нерозривного пробілу на четвертому рівні"
 
-#: ../rules/base.xml.in.h:812
+#: ../rules/base.xml.in.h:815
 msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
 msgstr "Незв’язувальний символ нульової ширини на третьому рівні, зв’язувальний символ нульової ширини на четвертому"
 
-#: ../rules/base.xml.in.h:813
+#: ../rules/base.xml.in.h:816
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:814
+#: ../rules/base.xml.in.h:817
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:815
+#: ../rules/base.xml.in.h:818
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:816
+#: ../rules/base.xml.in.h:819
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:817
+#: ../rules/base.xml.in.h:820
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:818
+#: ../rules/base.xml.in.h:821
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:819
+#: ../rules/base.xml.in.h:822
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:820
+#: ../rules/base.xml.in.h:823
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:821
+#: ../rules/base.xml.in.h:824
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:822
+#: ../rules/base.xml.in.h:825
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:823
+#: ../rules/base.xml.in.h:826
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:824
+#: ../rules/base.xml.in.h:827
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:825
+#: ../rules/base.xml.in.h:828
 msgid "ca"
 msgstr "ca"
 
-#: ../rules/base.xml.in.h:826
+#: ../rules/base.xml.in.h:829
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:827
+#: ../rules/base.xml.in.h:830
 msgid "cm"
 msgstr "cm"
 
-#: ../rules/base.xml.in.h:828
+#: ../rules/base.xml.in.h:831 ../rules/base.extras.xml.in.h:38
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:829
+#: ../rules/base.xml.in.h:832
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:830
+#: ../rules/base.xml.in.h:833
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:39
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:835
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:836
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:837
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
+#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:40
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:839
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:840
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:841
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
+#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:41
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:843
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:844
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:845
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
+#: ../rules/base.xml.in.h:846 ../rules/base.extras.xml.in.h:42
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:847
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:848
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:849
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:850
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:851
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:852
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:853
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:854
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
+#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:43
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:856
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:857
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:858
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:859
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:860
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:861
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:859
+#: ../rules/base.xml.in.h:862
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:863
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:864
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:865
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:863
+#: ../rules/base.xml.in.h:866
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:867
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:868
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:869
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:867
+#: ../rules/base.xml.in.h:870
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
+#: ../rules/base.xml.in.h:871 ../rules/base.extras.xml.in.h:45
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
+#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:46
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:870
+#: ../rules/base.xml.in.h:873
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:874
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:875
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:876
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:877
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:878
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:879
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:880
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:881
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:882
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:883
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:884
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:47
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:886
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:887
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
+#: ../rules/base.xml.in.h:888 ../rules/base.extras.xml.in.h:48
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
+#: ../rules/base.xml.in.h:889 ../rules/base.extras.xml.in.h:49
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:890
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:891
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:892
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:893
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:894
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
+#: ../rules/base.xml.in.h:895 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:896
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:897
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:898
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:899
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:900
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:898
+#: ../rules/base.xml.in.h:901
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:902
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:903
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:904
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:905
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:906
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:907
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:908
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:909
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:910
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:911
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:909
+#: ../rules/base.xml.in.h:912
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:913
 msgid "zh"
 msgstr "zh"
 
@@ -3658,6 +3670,10 @@ msgstr "zh"
 msgid "APL Keyboard Symbols"
 msgstr "Клавіатурні символи APL"
 
+#: ../rules/base.extras.xml.in.h:3
+msgid "Armenian (OLPC phonetic)"
+msgstr "Вірменська (OLPC, фонетична)"
+
 #: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
 msgstr "Атсінська"
@@ -3670,86 +3686,119 @@ msgstr "Авестанська"
 msgid "Couer D'alene Salish"
 msgstr "Салішська кер-д’ален"
 
-#: ../rules/base.extras.xml.in.h:8
+#: ../rules/base.extras.xml.in.h:7
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Кримськотатарська (Dobruja Q)"
+
+#: ../rules/base.extras.xml.in.h:9
 msgid "English (US, international AltGr Unicode combining)"
 msgstr "Англійська (США, інтернаціональна, введення Unicode за допомогою AltGr)"
 
-#: ../rules/base.extras.xml.in.h:9
+#: ../rules/base.extras.xml.in.h:10
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Англійська (США, інтернаціональна, введення Unicode за допомогою AltGr, альтернативна)"
 
-#: ../rules/base.extras.xml.in.h:11
+#: ../rules/base.extras.xml.in.h:13
+msgid "German (US keyboard with German letters)"
+msgstr "Німецька (американська клавіатура з німецькими літерами)"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "Німецька (з літерами угорської без сліпих клавіш)"
+
+#: ../rules/base.extras.xml.in.h:15
 msgid "Kutenai"
 msgstr "Кутенай"
 
-#: ../rules/base.extras.xml.in.h:13
+#: ../rules/base.extras.xml.in.h:17
 msgid "Latvian (US Colemak)"
 msgstr "Латвійська (США, Коулмак)"
 
-#: ../rules/base.extras.xml.in.h:14
+#: ../rules/base.extras.xml.in.h:18
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr "Латвійська (Коулмак, США, варіант з апострофом)"
 
-#: ../rules/base.extras.xml.in.h:15
+#: ../rules/base.extras.xml.in.h:19
 msgid "Latvian (US Dvorak)"
 msgstr "Латвійська (Дворак, США)"
 
-#: ../rules/base.extras.xml.in.h:16
+#: ../rules/base.extras.xml.in.h:20
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Латвійська (Дворак, США, варіант з літерою Y)"
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Латвійська (Дворак, США, варіант з мінусом)"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Латвійська (програмістський Дворак)"
 
-#: ../rules/base.extras.xml.in.h:19
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Латвійська (програмістський Дворак, варіант з літерою Y)"
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Латвійська (програмістський Дворак, варіант з мінусом)"
 
-#: ../rules/base.extras.xml.in.h:22
+#: ../rules/base.extras.xml.in.h:26
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr "Литовська (Дворак, США, з литовськими літерами)"
 
-#: ../rules/base.extras.xml.in.h:25
+#: ../rules/base.extras.xml.in.h:29
 msgid "Polish (international with dead keys)"
 msgstr "Польська (інтернаціональна зі сліпими клавішами)"
 
-#: ../rules/base.extras.xml.in.h:27
+#: ../rules/base.extras.xml.in.h:31
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Румунська (ергономічна для друку наосліп)"
 
-#: ../rules/base.extras.xml.in.h:29
-msgid "Russian (with UKR and BEL layout)"
-msgstr "Російська (з українськими літерами на 3-му рівні)"
+#: ../rules/base.extras.xml.in.h:33
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "Російська (з українсько-білоруською розкладкою)"
 
-#: ../rules/base.extras.xml.in.h:30
+#: ../rules/base.extras.xml.in.h:34
 msgid "Secwepemctsin"
 msgstr "Secwepemctsin"
 
-#: ../rules/base.extras.xml.in.h:32
+#: ../rules/base.extras.xml.in.h:36
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Сербська (комбінації з акцентами замість сліпих клавіш)"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:37
 msgid "apl"
 msgstr "apl"
 
-#: ../rules/base.extras.xml.in.h:38
+#: ../rules/base.extras.xml.in.h:44
 msgid "kut"
 msgstr "kut"
 
-#: ../rules/base.extras.xml.in.h:44
+#: ../rules/base.extras.xml.in.h:50
 msgid "shs"
 msgstr "shs"
 
+#~ msgid "English (Cameroon qwerty)"
+#~ msgstr "Англійська (камерунський qwerty)"
+
+#~ msgid "French (Cameroon azerty)"
+#~ msgstr "Французька (камерунська azerty)"
+
+#~ msgid "German (qwerty)"
+#~ msgstr "Німецька (qwerty)"
+
+#~ msgid "Make Caps Lock an additional Ctrl"
+#~ msgstr "Caps Lock — додаткова клавіша Ctrl"
+
+#~ msgid "Meta on Left Ctrl"
+#~ msgstr "Meta на лівій клавіші Ctrl"
+
+#~ msgid "Right Ctrl is mapped to Menu"
+#~ msgstr "Права Ctrl відповідає клавіші Menu"
+
+#~ msgid "Sinhala"
+#~ msgstr "Сингальська"
+
 #~ msgid "Afg"
 #~ msgstr "Афг"
 
@@ -3774,9 +3823,6 @@ msgstr "shs"
 #~ msgid "GBr"
 #~ msgstr "Брит"
 
-#~ msgid "German (Romanian keyboard with German letters)"
-#~ msgstr "Німецька (румунська клавіатура з німецькими літерами)"
-
 #~ msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
 #~ msgstr "Німецька (румунська клавіатура з німецькими літерами, вимкнути сліпі клавіші)"
 
diff --git a/dist/xkeyboard-config/po/zh_CN.po b/dist/xkeyboard-config/po/zh_CN.po
index d269e1676..31226a134 100644
--- a/dist/xkeyboard-config/po/zh_CN.po
+++ b/dist/xkeyboard-config/po/zh_CN.po
@@ -1,15 +1,17 @@
 # Chinese (simplified) translations of xkeyboard-config
 # Copyright (C) 2003 xfree86_xkb_xml maintainers.
+# Copyright (C) Free Software Foundation, Inc.
 # This file is distributed under the same license as the xkeyboard-config package.
 # Funda Wang <fundawang@linux.net.cn>, 2003.
 # YunQiang Su <wzssyqa@gmail.com>, 2011.
+# Aron Xu <happyaron.xu@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.1.99\n"
+"Project-Id-Version: xkeyboard-config 2.3.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-03-25 22:27+0000\n"
-"PO-Revision-Date: 2011-03-30 00:35+0800\n"
+"POT-Creation-Date: 2011-09-15 21:25+0100\n"
+"PO-Revision-Date: 2011-09-19 11:20+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -88,157 +90,156 @@ msgid "Advance Scorpius KI"
 msgstr "高级 Scorpius KI"
 
 #: ../rules/base.xml.in.h:18
-msgid "Afg"
-msgstr "阿富汗"
-
-#: ../rules/base.xml.in.h:19
 msgid "Afghani"
 msgstr "阿富汗"
 
-#: ../rules/base.xml.in.h:20
+#: ../rules/base.xml.in.h:19
 msgid "Akan"
 msgstr "阿肯"
 
-#: ../rules/base.xml.in.h:21
+#: ../rules/base.xml.in.h:20
 msgid "Albanian"
 msgstr "阿尔巴尼亚"
 
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:21
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt 和 Meta 都是 Alt 键"
 
-#: ../rules/base.xml.in.h:23
+#: ../rules/base.xml.in.h:22
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Alt 键映射到右 Win，Super 映射到菜单键"
 
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:23
 msgid "Alt+Caps Lock"
 msgstr "Alt+Caps Lock"
 
-#: ../rules/base.xml.in.h:25
+#: ../rules/base.xml.in.h:24
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:26
+#: ../rules/base.xml.in.h:25
 msgid "Alt+Shift"
 msgstr "Alt+Shift"
 
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:26
 msgid "Alt+Space"
 msgstr "Alt+Space"
 
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:27
 msgid "Alt/Win key behavior"
 msgstr "Alt/Win 键行为"
 
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:28
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:29
 msgid "Any Alt key"
-msgstr "任何 Alt 键"
+msgstr "任意Alt 键"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
-msgstr "任何 Win 键"
+msgstr "任意Win 键"
 
-#: ../rules/base.xml.in.h:32
-#, fuzzy
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
-msgstr "按下两个 Windows 键可切换组"
+msgstr "任意Win 键(按下时)"
 
-#: ../rules/base.xml.in.h:33
+#: ../rules/base.xml.in.h:32
 msgid "Apple"
 msgstr "苹果"
 
-#: ../rules/base.xml.in.h:34
+#: ../rules/base.xml.in.h:33
 msgid "Apple Aluminium Keyboard (ANSI)"
 msgstr "苹果铝键盘(ANSI)"
 
-#: ../rules/base.xml.in.h:35
+#: ../rules/base.xml.in.h:34
 msgid "Apple Aluminium Keyboard (ISO)"
 msgstr "苹果铝键盘(ISO)"
 
-#: ../rules/base.xml.in.h:36
+#: ../rules/base.xml.in.h:35
 msgid "Apple Aluminium Keyboard (JIS)"
 msgstr "苹果铝键盘(JIS)"
 
-#: ../rules/base.xml.in.h:37
+#: ../rules/base.xml.in.h:36
 msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
 msgstr "苹果铝键盘：模拟 PC 键(截屏、滚动锁定、暂停、数字锁定)"
 
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
 msgstr "苹果笔记本电脑"
 
-#: ../rules/base.xml.in.h:39
+#: ../rules/base.xml.in.h:38
 msgid "Arabic"
 msgstr "阿拉伯语"
 
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:39
 msgid "Arabic (Buckwalter)"
 msgstr "阿拉伯语(Buckwalter)"
 
-#: ../rules/base.xml.in.h:41
+#: ../rules/base.xml.in.h:40
 msgid "Arabic (Morocco)"
 msgstr "阿拉伯语(摩洛哥)"
 
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:41
 msgid "Arabic (Pakistan)"
 msgstr "阿拉伯语(巴基斯坦)"
 
-#: ../rules/base.xml.in.h:43
+#: ../rules/base.xml.in.h:42
 msgid "Arabic (Syria)"
 msgstr "阿拉伯语(叙利亚)"
 
-#: ../rules/base.xml.in.h:44
+#: ../rules/base.xml.in.h:43
 msgid "Arabic (azerty)"
 msgstr "阿拉伯语(azerty)"
 
-#: ../rules/base.xml.in.h:45
+#: ../rules/base.xml.in.h:44
 msgid "Arabic (azerty/digits)"
 msgstr "阿拉伯语(azerty/数字)"
 
-#: ../rules/base.xml.in.h:46
+#: ../rules/base.xml.in.h:45
 msgid "Arabic (digits)"
 msgstr "阿拉伯语(数字)"
 
-#: ../rules/base.xml.in.h:47
+#: ../rules/base.xml.in.h:46
 msgid "Arabic (qwerty)"
 msgstr "阿拉伯语(qwerty)"
 
-#: ../rules/base.xml.in.h:48
+#: ../rules/base.xml.in.h:47
 msgid "Arabic (qwerty/digits)"
 msgstr "阿拉伯语(qwerty/数字)"
 
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
 msgid "Armenian"
 msgstr "亚美尼亚语"
 
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:49
 #, fuzzy
 msgid "Armenian (alternative eastern)"
 msgstr "法语(替代)"
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50
 msgid "Armenian (alternative phonetic)"
 msgstr "亚美尼亚语(替代音标)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 #, fuzzy
 msgid "Armenian (eastern)"
 msgstr "亚美尼亚"
 
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:52
 msgid "Armenian (phonetic)"
 msgstr "亚美尼亚语(音标)"
 
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:53
 #, fuzzy
 msgid "Armenian (western)"
 msgstr "亚美尼亚"
 
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr ""
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "华硕笔记本电脑"
@@ -256,13 +257,13 @@ msgid "Avatime"
 msgstr ""
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijan (Cyrillic)"
-msgstr "阿塞拜疆语(西里尔)"
-
-#: ../rules/base.xml.in.h:60
 msgid "Azerbaijani"
 msgstr "阿塞拜疆语"
 
+#: ../rules/base.xml.in.h:60
+msgid "Azerbaijani (Cyrillic)"
+msgstr "阿塞拜疆语(西里尔)"
+
 #: ../rules/base.xml.in.h:61
 #, fuzzy
 msgid "Azona RF2300 wireless Internet Keyboard"
@@ -309,7 +310,7 @@ msgid "Backslash"
 msgstr "反斜杠"
 
 #: ../rules/base.xml.in.h:72
-msgid "Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:73
@@ -317,2998 +318,3034 @@ msgid "Bambara"
 msgstr "班巴拉语"
 
 #: ../rules/base.xml.in.h:74
+msgid "Bashkirian"
+msgstr "巴什基尔期"
+
+#: ../rules/base.xml.in.h:75
 msgid "Belarusian"
 msgstr "白俄罗斯语"
 
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:76
 msgid "Belarusian (Latin)"
 msgstr "白俄罗斯语(拉丁)"
 
-#: ../rules/base.xml.in.h:76
-#, fuzzy
+#: ../rules/base.xml.in.h:77
 msgid "Belarusian (legacy)"
-msgstr "白俄罗斯语()"
+msgstr "白俄罗斯语(的)"
 
-#: ../rules/base.xml.in.h:77
+#: ../rules/base.xml.in.h:78
 msgid "Belgian"
 msgstr "比利时语"
 
-#: ../rules/base.xml.in.h:78
+#: ../rules/base.xml.in.h:79
 msgid "Belgian (ISO alternate)"
 msgstr "比利时语(ISO 替代)"
 
-#: ../rules/base.xml.in.h:79
+#: ../rules/base.xml.in.h:80
 msgid "Belgian (Sun dead keys)"
 msgstr "比利时语(Sun 死键)"
 
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "比利时语(王安 724 型 azerty)"
 
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:82
 msgid "Belgian (alternative)"
 msgstr "比利时语(替代)"
 
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:83
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "比利时语(替代，Sun 死键)"
 
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "比利时语(替代，只包含拉丁-9 字符)"
 
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:85
 msgid "Belgian (eliminate dead keys)"
 msgstr "比利时语(除去死键)"
 
-#: ../rules/base.xml.in.h:85
+#: ../rules/base.xml.in.h:86
 msgid "BenQ X-Touch"
 msgstr "明基 X-Touch"
 
-#: ../rules/base.xml.in.h:86
+#: ../rules/base.xml.in.h:87
 msgid "BenQ X-Touch 730"
 msgstr "明基 X-Touch 730"
 
-#: ../rules/base.xml.in.h:87
+#: ../rules/base.xml.in.h:88
 msgid "BenQ X-Touch 800"
 msgstr "明基 X-Touch 800"
 
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:89
 msgid "Bengali"
 msgstr "孟加拉"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:90
+msgid "Bengali (Baishakhi Inscript)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:91
+msgid "Bengali (Baishakhi)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:92
+msgid "Bengali (Bornona)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:93
 msgid "Bengali (Probhat)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:94
+msgid "Bengali (Uni Gitanjali)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:97
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:98
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:99
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:100
 msgid "Berber (Morocco, Tifinagh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian"
 msgstr "波斯尼亚语"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:102
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "波斯尼亚语(带罗马尼亚二重字的美国键盘)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:103
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "波斯尼亚语(带波斯尼亚字母的美国键盘)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:104
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "波斯尼亚语(使用波斯尼亚二重字)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:105
 msgid "Bosnian (use guillemets for quotes)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:106
 msgid "Both Alt keys together"
 msgstr "同时按两个 Alt 键"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:107
 msgid "Both Ctrl keys together"
 msgstr "同时按两个 Ctrl 键"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:108
 msgid "Both Shift keys together"
 msgstr "同时按两个 Shift 键"
 
-#: ../rules/base.xml.in.h:104
+#: ../rules/base.xml.in.h:109
 msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr "同时按两个 Shift 键激活大写锁定，只按一个 Shift 键解锁"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:110
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "同时按两个 Shift 键切换大写锁定"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:111
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "同时按两个 Shift 键切换 Shift 锁"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:112
 msgid "Braille"
 msgstr ""
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:113
 msgid "Braille (left hand)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:114
 msgid "Braille (right hand)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:115
 msgid "Brother Internet Keyboard"
 msgstr "兄弟网际键盘"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:116
 msgid "Bulgarian"
 msgstr "保加利亚"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:117
 msgid "Bulgarian (new phonetic)"
 msgstr "保加利亚(新音标)"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:118
 msgid "Bulgarian (traditional phonetic)"
 msgstr "保加利亚(传统音标)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:119
 msgid "Burmese"
 msgstr "缅甸"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:120
+msgid "Cameroon Multilingual (azerty)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:121
+msgid "Cameroon Multilingual (qwerty)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:122
 msgid "Canadian Multilingual"
 msgstr ""
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:123
 msgid "Canadian Multilingual (first part)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:124
 msgid "Canadian Multilingual (second part)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock"
 msgstr "大写锁定"
 
-#: ../rules/base.xml.in.h:119
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:120
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:121
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
 msgstr ""
 
-#: ../rules/base.xml.in.h:122
+#: ../rules/base.xml.in.h:129
 #, fuzzy
 msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr "锁定时和 Shift 功能相同。Shift 取消大写。"
 
-#: ../rules/base.xml.in.h:123
+#: ../rules/base.xml.in.h:130
 #, fuzzy
 msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr "锁定时和 Shift 功能相同。Shift 不取消大写。"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:131
+#, fuzzy
+msgid "Caps Lock as Ctrl"
+msgstr "大写锁定"
+
+#: ../rules/base.xml.in.h:132
 msgid "Caps Lock is disabled"
 msgstr "大写锁定被禁用"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:133
 msgid "Caps Lock key behavior"
 msgstr "大写锁定键行为"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:134
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr ""
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:135
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:136
 #, fuzzy
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "使用内部大写。Shift 取消大写。"
 
-#: ../rules/base.xml.in.h:129
+#: ../rules/base.xml.in.h:137
 #, fuzzy
 msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr "使用内部大写。Shift 不取消大写。"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:138
 msgid "Catalan"
+msgstr "加泰罗尼亚语"
+
+#: ../rules/base.xml.in.h:139
+msgid "Catalan (Spain, with middle-dot L)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:140
 msgid "Cherokee"
 msgstr ""
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:141
 msgid "Cherry B.UNLIMITED"
 msgstr ""
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:142
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:134
+#: ../rules/base.xml.in.h:143
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (替代选项)"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:144
 #, fuzzy
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:145
 msgid "Cherry CyMotion Expert"
 msgstr ""
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:146
 msgid "Cherry CyMotion Master Linux"
 msgstr ""
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:147
 msgid "Cherry CyMotion Master XPress"
 msgstr ""
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:148
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet 键盘"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:149
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:150
 #, fuzzy
 msgid "Chicony KU-0108"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:142
-#, fuzzy
+#: ../rules/base.xml.in.h:151
 msgid "Chicony KU-0420"
-msgstr "Chicony KB-9885"
+msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:152
 msgid "Chinese"
-msgstr "中国"
-
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "中国(带有 ASCII 数字的藏语键盘)"
+msgstr "汉语"
 
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "中国(藏语)"
+#: ../rules/base.xml.in.h:153
+msgid "Chuvash"
+msgstr ""
 
-#: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "中国(维吾尔语)"
+#: ../rules/base.xml.in.h:154
+#, fuzzy
+msgid "Chuvash (Latin)"
+msgstr "白俄罗斯语(拉丁)"
 
-#: ../rules/base.xml.in.h:147
+#: ../rules/base.xml.in.h:155
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:148
+#: ../rules/base.xml.in.h:156
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:157
 msgid "Compaq Easy Access Keyboard"
 msgstr "康柏 Easy Access 键盘"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:158
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "康柏网际键盘(13键)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:159
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "康柏网际键盘(18键)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:160
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "康柏网际键盘(7键)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:161
 msgid "Compaq iPaq Keyboard"
 msgstr "康柏 iPaq 键盘"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:162
 msgid "Compose key position"
 msgstr "Compose 键位置"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:163
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Backspace"
 
-#: ../rules/base.xml.in.h:155
+#: ../rules/base.xml.in.h:164
 #, fuzzy
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr "Meta 被映射到左 Windows 键。"
 
-#: ../rules/base.xml.in.h:156
+#: ../rules/base.xml.in.h:165
 #, fuzzy
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr "Super 被映射到 Windows 键(默认)。"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:166
 msgid "Creative Desktop Wireless 7000"
 msgstr "创新台式机无限键盘 7000"
 
-#: ../rules/base.xml.in.h:158
+#: ../rules/base.xml.in.h:167
+#, fuzzy
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "乌兹别克语(克里米亚鞑靼土耳其 Alt-Q)"
+
+#: ../rules/base.xml.in.h:168
+#, fuzzy
+msgid "Crimean Tatar (Turkish F)"
+msgstr "乌兹别克语(克里米亚鞑靼土耳其 F)"
+
+#: ../rules/base.xml.in.h:169
+#, fuzzy
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "乌兹别克语(克里米亚鞑靼土耳其 Q)"
+
+#: ../rules/base.xml.in.h:170
 msgid "Croatian"
 msgstr "克罗地亚"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:171
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "克罗地亚(带克罗地亚语二重字的美国键盘)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:172
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "克罗地亚(带罗马尼亚字母的美国键盘)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
+#: ../rules/base.xml.in.h:173
+#, fuzzy
+msgid "Croatian (use Croatian digraphs)"
 msgstr "克罗地亚(使用克罗地亚二重字)"
 
-#: ../rules/base.xml.in.h:162
-msgid "Croatian (Use guillemets for quotes)"
+#: ../rules/base.xml.in.h:174
+msgid "Croatian (use guillemets for quotes)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:175
 msgid "Ctrl key position"
 msgstr "Ctrl 键位置"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:176
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:177
 msgid "Czech"
 msgstr "捷克"
 
-#: ../rules/base.xml.in.h:166
-msgid "Czech (UCW layout accented letters only)"
+#: ../rules/base.xml.in.h:178
+msgid "Czech (UCW layout, accented letters only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:179
 msgid "Czech (US Dvorak with CZ UCW support)"
-msgstr "捷克(带 CZ UCW 支持的美国德沃夏克布局键盘)"
+msgstr "捷克(带 CZ UCW 支持的美国Dvorak布局键盘)"
 
-#: ../rules/base.xml.in.h:168
-msgid "Czech (With &lt;\\|&gt; key)"
-msgstr "捷克(带 &lt;\\|&gt; 键)"
-
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:180
 msgid "Czech (qwerty)"
 msgstr "捷克(qwerty)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:181
 msgid "Czech (qwerty, extended Backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:182
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "捷克(带 &lt;\\|&gt; 键)"
+
+#: ../rules/base.xml.in.h:183
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:172
+#: ../rules/base.xml.in.h:184
 msgid "Danish"
 msgstr "丹麦语"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:185
 msgid "Danish (Dvorak)"
-msgstr "丹麦语(德沃夏克)"
+msgstr "丹麦语(Dvorak)"
 
-#: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
+#: ../rules/base.xml.in.h:186
+msgid "Danish (Macintosh)"
 msgstr "丹麦语(Mac)"
 
-#: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
+#: ../rules/base.xml.in.h:187
+#, fuzzy
+msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "丹麦语(Mac，除去死键)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:188
 msgid "Danish (eliminate dead keys)"
 msgstr "丹麦语(除去死键)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:189
 msgid "Default numeric keypad keys"
 msgstr "默认数字小键盘键"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:190
 msgid "Dell"
 msgstr "戴尔"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:191
 msgid "Dell 101-key PC"
 msgstr "Dell 101 键电脑"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:192
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "戴尔笔记本电脑灵越 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:193
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "戴尔笔记本电脑 Precision M 系列"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:194
 msgid "Dell Latitude series laptop"
 msgstr "戴尔 Latitude 系列笔记本电脑"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:195
 msgid "Dell Precision M65"
 msgstr "戴尔 Precision M65"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:196
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:197
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:198
 msgid "Dell USB Multimedia Keyboard"
 msgstr "戴尔 USB 多媒体键盘"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:199
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa 无线桌面键盘"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:200
 msgid "Dhivehi"
 msgstr "迪维希语"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:201
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802 系列"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:202
 msgid "Dutch"
-msgstr "荷兰"
+msgstr "荷兰语"
 
-#: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
-msgstr "荷兰(Mac)"
+#: ../rules/base.xml.in.h:203
+msgid "Dutch (Macintosh)"
+msgstr "荷兰语(Mac)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:204
 msgid "Dutch (Sun dead keys)"
 msgstr "荷兰(Sun 死键)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:205
 msgid "Dutch (standard)"
 msgstr "荷兰(标准)"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:206
 msgid "Dzongkha"
-msgstr "宗喀语"
+msgstr ""
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:207
 msgid "Enable extra typographic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:208
+#, fuzzy
+msgid "English (Cameroon Dvorak)"
+msgstr "英语(适合程序员的Dvorak布局)"
+
+#: ../rules/base.xml.in.h:209
+#, fuzzy
+msgid "English (Cameroon)"
+msgstr "英语(加拿大)"
+
+#: ../rules/base.xml.in.h:210
 msgid "English (Canada)"
 msgstr "英语(加拿大)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:211
 msgid "English (Colemak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:212
 msgid "English (Dvorak alternative international no dead keys)"
-msgstr "英语(德沃夏克，替代，国际，无死键)"
+msgstr "英语(Dvorak，替代，国际，无死键)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:213
 msgid "English (Dvorak international with dead keys)"
-msgstr "英语(德沃夏克，国际，有死键)"
+msgstr "英语(Dvorak，国际，有死键)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:214
 msgid "English (Dvorak)"
-msgstr "英语(德沃夏克布局)"
+msgstr "英语(Dvorak布局)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:215
 msgid "English (Ghana)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:216
 msgid "English (Ghana, GILLBT)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:217
 msgid "English (Ghana, multilingual)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:218
 msgid "English (India, with RupeeSign)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:219
 msgid "English (Macintosh)"
 msgstr "英语(Macintosh)"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
+#: ../rules/base.xml.in.h:220
+#, fuzzy
+msgid "English (Mali, US Macintosh)"
 msgstr "英语(马里，美国 Mac)"
 
-#: ../rules/base.xml.in.h:207
-msgid "English (Mali, USA international)"
+#: ../rules/base.xml.in.h:221
+#, fuzzy
+msgid "English (Mali, US international)"
 msgstr "英语(马里，美国国际键盘)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:222
 msgid "English (Nigeria)"
 msgstr "英语(尼日利亚)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:223
 msgid "English (South Africa)"
 msgstr "英语(南非)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:224
 msgid "English (UK)"
 msgstr "英语(英国)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:225
 msgid "English (UK, Colemak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
-msgstr ""
+#: ../rules/base.xml.in.h:226
+#, fuzzy
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "英语(英国，Mac 国际布局)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:227
 msgid "English (UK, Dvorak)"
-msgstr "英语(英国，德沃夏克布局)"
+msgstr "英语(英国，Dvorak 布局)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
+#: ../rules/base.xml.in.h:228
+msgid "English (UK, Macintosh international)"
 msgstr "英语(英国，Mac 国际布局)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
-msgstr "英语(应该，Mac)"
+#: ../rules/base.xml.in.h:229
+msgid "English (UK, Macintosh)"
+msgstr "英语(英国，Mac)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
-msgstr ""
+#: ../rules/base.xml.in.h:230
+msgid "English (UK, extended WinKeys)"
+msgstr "英语(英国，扩展 Win 键)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:231
 msgid "English (UK, international with dead keys)"
 msgstr "英语(英国，带死键的国际布局)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:232 ../rules/base.extras.xml.in.h:8
 msgid "English (US)"
 msgstr "英语(美国)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:233
 msgid "English (US, alternative international)"
 msgstr "英语(美国，替代，国际)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:234
 msgid "English (US, international with dead keys)"
 msgstr "英语(美国，国际，有死键)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:235
 msgid "English (US, with euro on 5)"
 msgstr "英语(美国，5 键上是欧元符号)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:236
 msgid "English (classic Dvorak)"
-msgstr "英语(经典德沃夏克布局)"
+msgstr "英语(经典Dvorak布局)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:237
 msgid "English (international AltGr dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:238
 msgid "English (layout toggle on multiply/divide key)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:239
 msgid "English (left handed Dvorak)"
-msgstr "英语(左手德沃夏克布局)"
+msgstr "英语(左手 Dvorak 布局)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:240
 msgid "English (programmer Dvorak)"
-msgstr "英语(适合程序员的德沃夏克布局)"
+msgstr "英语(适合程序员的 Dvorak 布局)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:241
 msgid "English (right handed Dvorak)"
-msgstr "英语(右手德沃夏克布局)"
+msgstr "英语(右手 Dvorak 布局)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:242
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:243
 msgid "Enter on keypad"
 msgstr "小键盘上的回车"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:244
 msgid "Esperanto"
 msgstr "世界语"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:245
+msgid "Esperanto (Portugal, Nativo)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:246
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:247
 msgid "Estonian"
 msgstr "爱沙尼亚"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:248
 msgid "Estonian (Dvorak)"
-msgstr "爱沙尼亚(德沃夏克)"
+msgstr "爱沙尼亚(Dvorak)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:249
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "爱沙尼亚语(带爱沙尼亚字母的美国键盘)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:250
 msgid "Estonian (eliminate dead keys)"
 msgstr "爱沙尼亚语(除去死键)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:251
 msgid "Euro on 2"
 msgstr "欧元符号在 2 键上"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:252
 msgid "Euro on 4"
 msgstr "欧元符号在 4 键上"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:253
 msgid "Euro on 5"
 msgstr "欧元符号在 5 键上"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:254
 msgid "Euro on E"
 msgstr "欧元符号在 E 键上"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:255
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:256
 msgid "Ewe"
 msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:257
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:258
 msgid "Faroese"
 msgstr "法罗"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:259
 msgid "Faroese (eliminate dead keys)"
 msgstr "法罗(除去死键)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:260
 msgid "Filipino"
 msgstr "菲律宾语"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:262
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:265
 msgid "Filipino (Colemak Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:266
 msgid "Filipino (Colemak Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:267
+#, fuzzy
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "菲律宾语(Dvorak拉丁)"
+
+#: ../rules/base.xml.in.h:268
 msgid "Filipino (Dvorak Latin)"
-msgstr "菲律宾语(德沃夏克拉丁)"
+msgstr "菲律宾语(Dvorak拉丁)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:269
 msgid "Filipino (QWERTY Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:270
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
+#: ../rules/base.xml.in.h:271
+msgid "Finnish (Macintosh)"
 msgstr "芬兰语(Mac)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:272
 msgid "Finnish (classic)"
 msgstr "芬兰语(经典)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:273
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "芬兰语(经典，除去死键)"
 
-#: ../rules/base.xml.in.h:258
-msgid "Finnish (northern Saami)"
-msgstr ""
-
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:276
 msgid "Four-level key with abstract separators"
 msgstr ""
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:277
 msgid "Four-level key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:278
 msgid "Four-level key with dot"
 msgstr ""
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:279
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr ""
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:280
 msgid "Four-level key with momayyez"
 msgstr ""
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:281
 msgid "French"
 msgstr "法语"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:282
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:283
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:284
 #, fuzzy
 msgid "French (Breton)"
 msgstr "法语(替代)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:285
+#, fuzzy
+msgid "French (Cameroon)"
+msgstr "法语(替代)"
+
+#: ../rules/base.xml.in.h:286 ../rules/base.extras.xml.in.h:11
+msgid "French (Canada)"
+msgstr "法语(加拿大)"
+
+#: ../rules/base.xml.in.h:287
 msgid "French (Canada, Dvorak)"
-msgstr "法语(加拿大，德沃夏克)"
+msgstr "法语(加拿大，Dvorak)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:288
 msgid "French (Canada, legacy)"
 msgstr "法语(加拿大，传统)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:289
 msgid "French (Democratic Republic of the Congo)"
 msgstr "法语(刚果民主共和国，刚果(金))"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:290
 msgid "French (Dvorak)"
-msgstr "法语(德沃夏克)"
+msgstr "法语(Dvorak)"
 
-#: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:291
 #, fuzzy
 msgid "French (Guinea)"
 msgstr "法语(替代)"
 
-#: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
+#: ../rules/base.xml.in.h:292
+#, fuzzy
+msgid "French (Macintosh)"
 msgstr "法语(Mac)"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:293
 msgid "French (Mali, alternative)"
 msgstr "法语(马里，替代)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:294
 msgid "French (Morocco)"
 msgstr "法语(摩洛哥)"
 
-#: ../rules/base.xml.in.h:279
-#, fuzzy
-msgid "French (Occitan)"
-msgstr "法裔加拿大"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:295
 msgid "French (Sun dead keys)"
 msgstr "法语(Sun 死键)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:296
 msgid "French (Switzerland)"
 msgstr "法语(瑞士)"
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
+#: ../rules/base.xml.in.h:297
+#, fuzzy
+msgid "French (Switzerland, Macintosh)"
 msgstr "法语(瑞士，Mac)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:298
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "法语(瑞士，Sun 死键)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:299
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "法语(瑞士，除去死键)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:300
 msgid "French (alternative)"
 msgstr "法语(替代)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:301
 msgid "French (alternative, Sun dead keys)"
 msgstr "法语(替代，Sun 死键)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:302
 msgid "French (alternative, eliminate dead keys)"
 msgstr "法语(替代，除去死键)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:303
 msgid "French (alternative, latin-9 only)"
 msgstr "法语(替代，只有拉丁-9)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:304
 msgid "French (eliminate dead keys)"
 msgstr "法语(除去死键)"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
+#: ../rules/base.xml.in.h:305
+#, fuzzy
+msgid "French (legacy, alternative)"
 msgstr "法语(传统，替代)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:306
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "法语(传统，替代，Sun 死键)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:307
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "法语(传统，替代，除去死键)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:308
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "富士通西门子计算机 AMILO 笔记本电脑"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:309
 msgid "Fula"
 msgstr ""
 
-#: ../rules/base.xml.in.h:295
-msgid "GBr"
-msgstr "GBr"
-
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:310
 msgid "Ga"
 msgstr ""
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:311
 msgid "Generic 101-key PC"
 msgstr "通用 101 键电脑"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:312
 msgid "Generic 102-key (Intl) PC"
 msgstr "通用 102 键(国际)电脑"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:313
 msgid "Generic 104-key PC"
 msgstr "通用 104 键电脑"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:314
 msgid "Generic 105-key (Intl) PC"
 msgstr "通用 105 键(国际)电脑"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:315
 msgid "Genius Comfy KB-12e"
 msgstr "通用 Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:302
+#: ../rules/base.xml.in.h:316
 msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 msgstr "通用 Comfy KB-16M / Genius MM 键盘 KWD-910"
 
-#: ../rules/base.xml.in.h:303
+#: ../rules/base.xml.in.h:317
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr ""
 
-#: ../rules/base.xml.in.h:304
+#: ../rules/base.xml.in.h:318
 msgid "Genius KB-19e NB"
 msgstr ""
 
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:319
 msgid "Genius KKB-2050HS"
 msgstr ""
 
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:320
 #, fuzzy
 msgid "Georgian"
 msgstr "挪威"
 
-#: ../rules/base.xml.in.h:307
-#, fuzzy
-msgid "Georgian (MESS)"
-msgstr "乔治亚(拉丁)"
+#: ../rules/base.xml.in.h:321
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr ""
 
-#: ../rules/base.xml.in.h:308
+#: ../rules/base.xml.in.h:322
 #, fuzzy
-msgid "Georgian (Ossetian)"
+msgid "Georgian (Italy)"
 msgstr "乔治亚(俄语)"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:323
+#, fuzzy
+msgid "Georgian (MESS)"
+msgstr "乔治亚(拉丁)"
+
+#: ../rules/base.xml.in.h:324
 #, fuzzy
 msgid "Georgian (ergonomic)"
 msgstr "乔治亚(俄语)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:325 ../rules/base.extras.xml.in.h:12
 msgid "German"
 msgstr "德语"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:326
 msgid "German (Austria)"
 msgstr "德语(奥地利)"
 
-#: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
+#: ../rules/base.xml.in.h:327
+#, fuzzy
+msgid "German (Austria, Macintosh)"
 msgstr "德语(奥地利，Mac)"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:328
 msgid "German (Austria, Sun dead keys)"
 msgstr "德语(奥地利，Sun 死键)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:329
 msgid "German (Austria, eliminate dead keys)"
 msgstr "德语(奥地利，除去死键)"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:330
 msgid "German (Dvorak)"
-msgstr "德语(德沃夏克)"
+msgstr "德语(Dvorak)"
 
-#: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
+#: ../rules/base.xml.in.h:331
+#, fuzzy
+msgid "German (Macintosh)"
 msgstr "德语(Mac)"
 
-#: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
+#: ../rules/base.xml.in.h:332
+#, fuzzy
+msgid "German (Macintosh, eliminate dead keys)"
 msgstr "德语(Mac，除去死键)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:333
 #, fuzzy
 msgid "German (Neo 2)"
 msgstr "德语"
 
-#: ../rules/base.xml.in.h:319
-msgid "German (Romanian keyboard with German letters)"
-msgstr "德语(带德语字母的罗马尼亚键盘)"
-
-#: ../rules/base.xml.in.h:320
-msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
-msgstr "德语(带德语字母的罗马尼亚键盘，除去死键)"
-
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:334
 msgid "German (Sun dead keys)"
 msgstr "德语(Sun 死键)"
 
-#: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
+#: ../rules/base.xml.in.h:335
+#, fuzzy
+msgid "German (Switzerland)"
 msgstr "德语(瑞士，Mac)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:336
+#, fuzzy
+msgid "German (Switzerland, Macintosh)"
+msgstr "德语(瑞士，Mac)"
+
+#: ../rules/base.xml.in.h:337
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "德语(瑞士，Sun 死键)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:338
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "德语(瑞士，除去死键)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:339
+#, fuzzy
+msgid "German (Switzerland, legacy)"
+msgstr "德语(瑞士，Mac)"
+
+#: ../rules/base.xml.in.h:340
 #, fuzzy
 msgid "German (dead acute)"
 msgstr "Dead acute"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:341
 #, fuzzy
 msgid "German (dead grave acute)"
 msgstr "Dead grave acute"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:342
 #, fuzzy
 msgid "German (eliminate dead keys)"
 msgstr "除去死键"
 
-#: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:329
-#, fuzzy
-msgid "German (lower Sorbian)"
-msgstr "乔治亚(俄语)"
-
-#: ../rules/base.xml.in.h:330
-msgid "German (qwerty)"
-msgstr "德语(qwerty)"
-
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:343
 msgid "Greek"
 msgstr "希腊语"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:344
 msgid "Greek (eliminate dead keys)"
 msgstr "希腊语(除去死键)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:345
 msgid "Greek (extended)"
 msgstr "希腊语(扩展)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:346
 #, fuzzy
 msgid "Greek (polytonic)"
 msgstr "Polytonic"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:347
 msgid "Greek (simple)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:348
 msgid "Gujarati"
 msgstr "古吉拉特"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:349
 #, fuzzy
 msgid "Gyration"
 msgstr "古吉拉特"
 
-#: ../rules/base.xml.in.h:338
+#: ../rules/base.xml.in.h:350
 msgid "HTC Dream"
 msgstr "HTC Dream(Google G1)"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:351
 msgid "Happy Hacking Keyboard"
 msgstr ""
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:352
 msgid "Happy Hacking Keyboard for Mac"
 msgstr ""
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:353
 msgid "Hausa"
 msgstr ""
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:354
 msgid "Hebrew"
 msgstr ""
 
-#: ../rules/base.xml.in.h:343
-#, fuzzy
-msgid "Hebrew (Phonetic)"
-msgstr "Phonetic"
-
-#: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
+#: ../rules/base.xml.in.h:355
+msgid "Hebrew (Biblical, Tiro)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:356
 msgid "Hebrew (lyx)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:357
+#, fuzzy
+msgid "Hebrew (phonetic)"
+msgstr "Phonetic"
+
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "惠普网际键盘"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "惠普 Mini 110 笔记本电脑"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "惠普 Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "惠普 Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "惠普 Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "惠普 Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "惠普 Omnibook XE3 CF"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "惠普 Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "惠普 Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:367
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "惠普 Pavilion dv5"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:368
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "惠普 SK-250x 多媒体键盘"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:369
 msgid "Hewlett-Packard nx9020"
 msgstr "惠普 nx9020"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:370
 msgid "Hexadecimal"
 msgstr ""
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:371
 msgid "Hindi (Bolnagri)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:372
 #, fuzzy
 msgid "Hindi (Wx)"
 msgstr "印地"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:373
 msgid "Honeywell Euroboard"
 msgstr "Honeywell 欧洲键盘"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:374
 msgid "Htc Dream phone"
 msgstr "Htc Dream 电话(Google G1)"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian"
 msgstr "匈牙利"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "匈牙利语(101/qwerty/逗号/死键)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "匈牙利语(101/qwerty/逗号/除去死键)"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "匈牙利语(101/qwerty/点/死键)"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "匈牙利语(101/qwerty/点/除去死键)"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "匈牙利语(101/qwertz/逗号/死键)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "匈牙利语(101/qwertz/逗号/除去死键)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "匈牙利语(101/qwertz/点/死键)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "匈牙利语(101/qwertz/点/除去死键)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "匈牙利语(102/qwerty/逗号/死键)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "匈牙利语(102/qwerty/逗号/除去死键)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "匈牙利语(102/qwerty/点/死键)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "匈牙利语(102/qwerty/点/除去死键)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "匈牙利语(102/qwertz/逗号/死键)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "匈牙利语(102/qwertz/逗号/除去死键)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "匈牙利语(102/qwertz/点/死键)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "匈牙利语(102/qwertz/点/除去死键)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:392
 msgid "Hungarian (eliminate dead keys)"
 msgstr "匈牙利语(除去死键)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:393
 msgid "Hungarian (qwerty)"
 msgstr "匈牙利(qwerty)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:394
 msgid "Hungarian (standard)"
 msgstr "匈牙利(标准)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:395
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper 被映射到 Win 键。"
 
-#: ../rules/base.xml.in.h:384
+#: ../rules/base.xml.in.h:396
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:385
+#: ../rules/base.xml.in.h:397
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:386
+#: ../rules/base.xml.in.h:398
 msgid "IBM Space Saver"
 msgstr ""
 
-#: ../rules/base.xml.in.h:387
+#: ../rules/base.xml.in.h:399
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:388
+#: ../rules/base.xml.in.h:400
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:389
+#: ../rules/base.xml.in.h:401
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic"
 msgstr "冰岛"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (Dvorak)"
-msgstr "冰岛(德沃夏克)"
+msgstr "冰岛(Dvorak)"
 
-#: ../rules/base.xml.in.h:392
-msgid "Icelandic (Mac)"
+#: ../rules/base.xml.in.h:404
+#, fuzzy
+msgid "Icelandic (Macintosh)"
 msgstr "冰岛(Mac)"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:405
 msgid "Icelandic (Sun dead keys)"
 msgstr "冰岛(Sun 死键)"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:406
 msgid "Icelandic (eliminate dead keys)"
 msgstr "冰岛(除去死键)"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:407
 msgid "Igbo"
 msgstr "伊博语"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:408
 msgid "Indian"
 msgstr "印地语"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:409
 msgid "Inuktitut"
 msgstr "因纽特语"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:410
 msgid "Iraqi"
 msgstr "伊拉克"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:411
 msgid "Irish"
 msgstr "爱尔兰"
 
-#: ../rules/base.xml.in.h:400
-#, fuzzy
-msgid "Irish (CloGaelach)"
-msgstr "CloGaelach"
-
-#: ../rules/base.xml.in.h:401
-msgid "Irish (Ogham IS434)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:412
 #, fuzzy
 msgid "Irish (UnicodeExpert)"
 msgstr "UnicodeExpert"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:413
 msgid "Italian"
 msgstr "意大利语"
 
-#: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
+#: ../rules/base.xml.in.h:414
+#, fuzzy
+msgid "Italian (Macintosh)"
 msgstr "意大利语(Mac)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:415
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "意大利语(带意大利语字母的美国键盘)"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:416
 msgid "Italian (eliminate dead keys)"
 msgstr "意大利语(除去死键)"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:417
 msgid "Japanese"
 msgstr "日语"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:418
 #, fuzzy
 msgid "Japanese (Kana 86)"
 msgstr "日语"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:419
 #, fuzzy
 msgid "Japanese (Kana)"
 msgstr "日语"
 
-#: ../rules/base.xml.in.h:412
-msgid "Japanese (Mac)"
+#: ../rules/base.xml.in.h:420
+#, fuzzy
+msgid "Japanese (Macintosh)"
 msgstr "日语(Mac)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:421
 #, fuzzy
 msgid "Japanese (OADG 109A)"
 msgstr "日语 106 键"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:422
 msgid "Japanese (PC-98xx Series)"
 msgstr "日语(PC-98xx 系列)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:423
 msgid "Japanese keyboard options"
 msgstr "日语键盘选项"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:424
+msgid "Kalmyk"
+msgstr ""
+
+#: ../rules/base.xml.in.h:425
 msgid "Kana Lock key is locking"
 msgstr ""
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:426
 msgid "Kannada"
 msgstr "埃纳德"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:427
+#, fuzzy
+msgid "Kashubian"
+msgstr "波兰语(卡舒比方言)"
+
+#: ../rules/base.xml.in.h:428
 msgid "Kazakh"
 msgstr "哈萨克语"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:429
 msgid "Kazakh (with Russian)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:430
 msgid "Key sequence to kill the X server"
 msgstr "杀死 X 服务器的按键序列"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:431
 #, fuzzy
 msgid "Key to choose 3rd level"
 msgstr "按菜单键选择第三级"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:432
 #, fuzzy
 msgid "Key to choose 5th level"
 msgstr "按菜单键选择第三级"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:433
 msgid "Key(s) to change layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:434
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:425
-msgid "Khmer (Cambodian)"
+#: ../rules/base.xml.in.h:435
+msgid "Khmer (Cambodia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:436
 msgid "Kikuyu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:437
 msgid "Kinesis"
 msgstr ""
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:438
+msgid "Komi"
+msgstr ""
+
+#: ../rules/base.xml.in.h:439
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:440
 msgid "Korean (101/104 key compatible)"
 msgstr "朝鲜语(兼容 101/104 键)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "库尔德语(伊朗，阿拉伯-拉丁)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iran, F)"
 msgstr "库尔德语(伊朗，F)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:443
+#, fuzzy
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "库尔德语(伊拉克，拉丁 Alt-Q)"
+
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "库尔德语(伊朗，拉丁 Q)"
 
-#: ../rules/base.xml.in.h:433
-msgid "Kurdish (Iran, latin alt-Q)"
-msgstr "库尔德语(伊朗，拉丁 alt-Q)"
-
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "库尔德语(伊拉克，阿拉伯-拉丁)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Iraq, F)"
 msgstr "库尔德语(伊拉克，F)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "库尔德语(伊拉克，拉丁 Alt-Q)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "库尔德语(伊拉克，拉丁 Q)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Syria, F)"
 msgstr "库尔德语(叙利亚，F)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "库尔德语(叙利亚，拉丁 Alt-Q)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "库尔德语(叙利亚，拉丁 Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:452
 msgid "Kurdish (Turkey, F)"
 msgstr "库尔德语(土耳其，F)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:453
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "库尔德语(土耳其，拉丁 Alt-Q)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:454
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "库尔德语(土耳其，拉丁 Q)"
 
-#: ../rules/base.xml.in.h:444
-msgid "Kutenai"
-msgstr ""
-
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:455
 msgid "Kyrgyz"
 msgstr "柯尔克孜语(吉尔吉斯语)"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:456
 msgid "Kyrgyz (phonetic)"
 msgstr "柯尔克孜语(吉尔吉斯语，音标)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:457
 msgid "Lao"
 msgstr "老挝语(寮语)"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:458
 #, fuzzy
 msgid "Lao (STEA proposed standard layout)"
 msgstr "老挝语()"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:459
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "便携/笔记本 Compaq(如 Armada)便携键盘"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:460
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "便携/笔记本 Compaq(如自由人)网际键盘"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:461
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "笔记本电脑 eMachines m68xx"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:462 ../rules/base.extras.xml.in.h:16
 msgid "Latvian"
 msgstr "拉脱维亚"
 
-#: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (F variant)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:454
-msgid "Latvian (F variant)"
+#: ../rules/base.xml.in.h:464
+#, fuzzy
+msgid "Latvian (adapted)"
+msgstr "立陶宛语(标准)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (apostrophe variant)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
+#: ../rules/base.xml.in.h:466
+#, fuzzy
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "乔治亚(俄语)"
+
+#: ../rules/base.xml.in.h:467
+#, fuzzy
+msgid "Latvian (modern)"
+msgstr "拉脱维亚"
+
+#: ../rules/base.xml.in.h:468
+msgid "Latvian (tilde variant)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:469
 msgid "Left Alt"
 msgstr "左 Alt"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:470
 #, fuzzy
 msgid "Left Alt (while pressed)"
 msgstr "按下左 Windows 键切换组"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:471
 msgid "Left Alt is swapped with Left Win"
 msgstr "左 Alt 和左 Win 对换"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:472
 msgid "Left Ctrl"
 msgstr "左 Ctrl"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:473
 msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:474
+#, fuzzy
+msgid "Left Ctrl as Meta"
+msgstr "左 Ctrl"
+
+#: ../rules/base.xml.in.h:475
 msgid "Left Ctrl+Left Shift"
 msgstr "左 Ctrl+左 Shift"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:476
 msgid "Left Shift"
 msgstr "左 Shift"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:477
 msgid "Left Win"
 msgstr "左 Win"
 
-#: ../rules/base.xml.in.h:464
+#: ../rules/base.xml.in.h:478
 msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:479
 #, fuzzy
 msgid "Left Win (while pressed)"
 msgstr "按下左 Windows 键切换组"
 
-#: ../rules/base.xml.in.h:466
+#: ../rules/base.xml.in.h:480
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:467
+#: ../rules/base.xml.in.h:481
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:468
+#: ../rules/base.xml.in.h:482
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:483
 msgid "Legacy"
 msgstr "传统"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:484
 msgid "Legacy Wang 724"
 msgstr "传统王安 724"
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:472
+#: ../rules/base.xml.in.h:486
 msgid "Legacy key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:487
 msgid "Legacy key with dot"
 msgstr ""
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:488 ../rules/base.extras.xml.in.h:25
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "立陶宛语 (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:490
 msgid "Lithuanian (LEKP)"
 msgstr "立陶宛语 (LEKP)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:491
 msgid "Lithuanian (LEKPa)"
 msgstr "立陶宛语 (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:492
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "立陶宛语(带立陶宛字母的美国键盘)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:493
 msgid "Lithuanian (standard)"
 msgstr "立陶宛语(标准)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:494
 #, fuzzy
 msgid "Logitech Access Keyboard"
 msgstr "罗技强手键盘"
 
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop"
 msgstr "罗技无影手"
 
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "罗技无影手(替代选项)"
 
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop EX110"
 msgstr "罗技无影手 EX110"
 
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "罗技无影手 LX-300"
 
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "罗技无影手桌面导航器"
 
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:500
 msgid "Logitech Cordless Desktop Optical"
 msgstr "罗技无影手光学组合"
 
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "罗技无影手专业版(替代选项 2)"
 
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "罗技网际无影手 iTouch"
 
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:503
 #, fuzzy
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "罗技极光无影手组合/桌面导航器"
 
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:504
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr ""
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Generic Keyboard"
 msgstr "罗技通用键盘"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Internet 350 Keyboard"
 msgstr "罗技网际 350 键盘"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Internet Keyboard"
 msgstr "罗技网际键盘"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:508
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "罗技网际导航键盘"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:509
 msgid "Logitech Media Elite Keyboard"
 msgstr "罗技媒体增强键盘"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:510
 #, fuzzy
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "罗技无影手高级版"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:511
 msgid "Logitech Ultra-X Keyboard"
 msgstr "罗技 Ultra-X 键盘"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:512
 #, fuzzy
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "罗技网际键盘"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:513
 #, fuzzy
 msgid "Logitech diNovo Keyboard"
 msgstr "罗技网际键盘"
 
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:514
 msgid "Logitech iTouch"
 msgstr "罗技 iTouch"
 
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:515
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "罗技 iTouch 无影手键盘(型号 Y-RB6)"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:516
 #, fuzzy
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "罗技网际导航键盘"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:517
 #, fuzzy
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "罗技网际导航键盘"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:518
+#, fuzzy
+msgid "Lower Sorbian"
+msgstr "乔治亚(俄语)"
+
+#: ../rules/base.xml.in.h:519
+#, fuzzy
+msgid "Lower Sorbian (qwertz)"
+msgstr "德语(qwerty)"
+
+#: ../rules/base.xml.in.h:520
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:505
+#: ../rules/base.xml.in.h:521
 msgid "MacBook/MacBook Pro (Intl)"
 msgstr "MacBook/MacBook Pro (Intl)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:522
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:523
 msgid "Macedonian (eliminate dead keys)"
 msgstr "马其顿语(除去死键)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:524
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:525
 msgid "Macintosh Old"
-msgstr "Macintosh 旧款"
+msgstr "传统 Macintosh"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Backspace"
 msgstr "将 CapsLock 作为额外的 Backspace"
 
-#: ../rules/base.xml.in.h:511
+#: ../rules/base.xml.in.h:527
 #, fuzzy
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr "将 CapsLock 作为额外的 Ctrl"
 
-#: ../rules/base.xml.in.h:512
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "将 CapsLock 作为额外的 Ctrl"
-
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional ESC"
 msgstr "将 CapsLock 作为额外的 ESC"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:529
 #, fuzzy
 msgid "Make Caps Lock an additional Hyper"
 msgstr "将 CapsLock 作为额外的 Ctrl"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:530
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "将 CapsLock 作为额外的 Num Lock"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:531
 msgid "Make Caps Lock an additional Super"
 msgstr "将 CapsLock 作为额外的 Super"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:532
 msgid "Malayalam"
 msgstr "马来西亚"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:533
 #, fuzzy
 msgid "Malayalam (Lalitha)"
 msgstr "马拉雅拉姆语()"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:534
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:535
 msgid "Maltese"
 msgstr "马耳他语"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:536
 msgid "Maltese (with US layout)"
 msgstr "马耳他语(美国布局)"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:537
+msgid "Maori"
+msgstr ""
+
+#: ../rules/base.xml.in.h:538
+msgid "Mari"
+msgstr ""
+
+#: ../rules/base.xml.in.h:539
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:523
+#: ../rules/base.xml.in.h:540
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access 键盘"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:541
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:525
+#: ../rules/base.xml.in.h:542
 msgid "Menu"
 msgstr "菜单"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:543
+#, fuzzy
+msgid "Menu as Right Ctrl"
+msgstr "右 Ctrl"
+
+#: ../rules/base.xml.in.h:544
 msgid "Meta is mapped to Left Win"
 msgstr "Meta 被映射到左 Win 键。"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:545
 msgid "Meta is mapped to Win keys"
 msgstr "Meta 被映射到 Win 键。"
 
-#: ../rules/base.xml.in.h:528
-msgid "Meta on Left Ctrl"
-msgstr "Meat 映射到左 Ctrl"
-
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "微软舒适曲线键盘 2000"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Internet Keyboard"
 msgstr "微软网际键盘"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "微软网际键盘增强版，瑞典"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural"
 msgstr "微软自然键盘"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:550
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "微软自然键盘增强版"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "微软自然键盘增强版/微软网际键盘专业版"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "微软自然键盘增强版 OEM"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:553
 msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
 msgstr "微软自然键盘专业版 USB/微软网际键盘专业版"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:554
 #, fuzzy
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "微软自然键盘增强版 OEM"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:555
 #, fuzzy
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "微软自然键盘增强版 OEM"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:556
 msgid "Microsoft Office Keyboard"
 msgstr "微软 Office 键盘"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:557
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "微软无线多媒体键盘 1.0A"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:558
 msgid "Miscellaneous compatibility options"
 msgstr "其它兼容选项"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:559
 msgid "Mongolian"
 msgstr "蒙古"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin"
 msgstr "黑山语"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:561
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:562
 msgid "Montenegrin (Cyrillic)"
 msgstr "黑山语(西里尔)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:563
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:547
-msgid "Montenegrin (Latin qwerty)"
-msgstr "黑山语(拉丁 qwerty)"
-
-#: ../rules/base.xml.in.h:548
-msgid "Montenegrin (Latin unicode qwerty)"
+#: ../rules/base.xml.in.h:564
+#, fuzzy
+msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "黑山语(拉丁 unicode qwerty)"
 
-#: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
+#: ../rules/base.xml.in.h:565
+#, fuzzy
+msgid "Montenegrin (Latin Unicode)"
 msgstr "黑山语(拉丁 unicode)"
 
-#: ../rules/base.xml.in.h:550
-msgid "Montenegrin (Latin with guillemets)"
-msgstr ""
+#: ../rules/base.xml.in.h:566
+msgid "Montenegrin (Latin qwerty)"
+msgstr "黑山语(拉丁 qwerty)"
 
-#: ../rules/base.xml.in.h:551
-msgid "Māori"
+#: ../rules/base.xml.in.h:567
+msgid "Montenegrin (Latin with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:568
 msgid "NICOLA-F style Backspace"
 msgstr ""
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:569
 msgid "Nepali"
 msgstr "尼泊尔语"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at fourth level"
 msgstr "第四层的不可打断空白字符"
 
-#: ../rules/base.xml.in.h:555
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:556
+#: ../rules/base.xml.in.h:572
 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:557
+#: ../rules/base.xml.in.h:573
 msgid "Non-breakable space character at second level"
 msgstr "第二层的不可打断空白字符"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:574
 msgid "Non-breakable space character at third level"
 msgstr "第三层的不可打断空白字符"
 
-#: ../rules/base.xml.in.h:559
+#: ../rules/base.xml.in.h:575
 msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:560
+#: ../rules/base.xml.in.h:576
 msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:577
+msgid "Northern Saami (Finland)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:578
+msgid "Northern Saami (Norway)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:579
+#, fuzzy
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "挪威语(Mac，除去死键)"
+
+#: ../rules/base.xml.in.h:580
+msgid "Northern Saami (Sweden)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:581
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:582
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (Dvorak)"
-msgstr "挪威语(德沃夏克)"
+msgstr "挪威语(Dvorak)"
 
-#: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
-msgstr "挪威(Mac)"
+#: ../rules/base.xml.in.h:584
+msgid "Norwegian (Macintosh)"
+msgstr "挪威语(Mac)"
 
-#: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
+#: ../rules/base.xml.in.h:585
+msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "挪威语(Mac，除去死键)"
 
-#: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
-msgstr ""
-
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:586
 msgid "Norwegian (eliminate dead keys)"
 msgstr "挪威语(除去死键)"
 
-#: ../rules/base.xml.in.h:568
-msgid "Norwegian (northern Saami, eliminate dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:587
 msgid "Num Lock"
 msgstr "数字锁定"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:588
 msgid "Numeric keypad delete key behaviour"
 msgstr "数字小键盘上删除键的行为"
 
-#: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
+#: ../rules/base.xml.in.h:589
+#, fuzzy
+msgid "Numeric keypad keys work as with Macintosh"
 msgstr "数字小键盘的行为跟 Mac 一样"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:590
 msgid "Numeric keypad layout selection"
 msgstr "数字小键盘布局选择"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:591
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:592
+#, fuzzy
+msgid "Occitan"
+msgstr "法裔加拿大"
+
+#: ../rules/base.xml.in.h:593
+msgid "Ogham"
+msgstr ""
+
+#: ../rules/base.xml.in.h:594
+msgid "Ogham (IS434)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:595
 msgid "Oriya"
 msgstr "Oriya"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:596
 #, fuzzy
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/网际键盘"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:597
+#, fuzzy
+msgid "Ossetian (Georgia)"
+msgstr "俄语(传统)"
+
+#: ../rules/base.xml.in.h:598
+#, fuzzy
+msgid "Ossetian (WinKeys)"
+msgstr "罗马尼亚"
+
+#: ../rules/base.xml.in.h:599
+#, fuzzy
+msgid "Ossetian (legacy)"
+msgstr "俄语(传统)"
+
+#: ../rules/base.xml.in.h:600
 msgid "PC-98xx Series"
 msgstr "PC-98xx 系列"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:601
+msgid "Pannonian Rusyn (homophonic)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:602
 msgid "Pashto"
 msgstr ""
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:603
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:604
 msgid "Pause"
 msgstr "暂停"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:27
 msgid "Persian"
 msgstr "波斯语"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:606
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:607
 msgid "Persian (with Persian Keypad)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:583
-msgid "Philippines - Dvorak (Baybayin)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:608 ../rules/base.extras.xml.in.h:28
 msgid "Polish"
-msgstr "波兰"
+msgstr "波兰语"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:609
 msgid "Polish (Dvorak)"
-msgstr "波兰(德沃夏克)"
-
-#: ../rules/base.xml.in.h:586
-msgid "Polish (Dvorak, polish quotes on key 1)"
-msgstr "波兰语(德沃夏克，波兰语引号在 1 键上)"
+msgstr "波兰语(Dvorak)"
 
-#: ../rules/base.xml.in.h:587
-msgid "Polish (Dvorak, polish quotes on quotemark key)"
-msgstr "波兰语(德沃夏克，波兰语引号在标记为引号的键上)"
+#: ../rules/base.xml.in.h:610
+#, fuzzy
+msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgstr "波兰语(Dvorak，波兰语引号在 1 键上)"
 
-#: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
-msgstr "波兰语(卡舒比方言)"
+#: ../rules/base.xml.in.h:611
+#, fuzzy
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr "波兰语(Dvorak，波兰语引号在标记为引号的键上)"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:612
 msgid "Polish (programmer Dvorak)"
-msgstr "波兰语(适合程序员的德沃夏克)"
+msgstr "波兰语(适合程序员的Dvorak)"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:613
 msgid "Polish (qwertz)"
 msgstr "波兰(qwertz)"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil)"
 msgstr "葡萄牙(巴西)"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, Dvorak)"
-msgstr "葡萄牙语(巴西，德沃夏克)"
+msgstr "葡萄牙语(巴西，Dvorak)"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "葡萄牙语(巴西，除去死键)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:618
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:619
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:620
 msgid "Portuguese (Brazil, nativo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
+#: ../rules/base.xml.in.h:621
+msgid "Portuguese (Macintosh)"
 msgstr "葡萄牙语(Mac)"
 
-#: ../rules/base.xml.in.h:599
-msgid "Portuguese (Mac, Sun dead keys)"
+#: ../rules/base.xml.in.h:622
+msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "葡萄牙语(Mac，Sun 死键)"
 
-#: ../rules/base.xml.in.h:600
-msgid "Portuguese (Mac, eliminate dead keys)"
+#: ../rules/base.xml.in.h:623
+msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "葡萄牙语(Mac，除去死键)"
 
-#: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:625
 #, fuzzy
 msgid "Portuguese (Nativo)"
 msgstr "葡萄牙"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:626
 msgid "Portuguese (Sun dead keys)"
 msgstr "葡萄牙语(Sun 死键)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:627
 msgid "Portuguese (eliminate dead keys)"
 msgstr "葡萄牙语(除去死键)"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:628
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:629
 msgid "PrtSc"
 msgstr "截屏"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:630
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:631
 #, fuzzy
 msgid "Punjabi (Gurmukhi)"
 msgstr "旁遮普"
 
-#: ../rules/base.xml.in.h:610
+#: ../rules/base.xml.in.h:632
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:611
+#: ../rules/base.xml.in.h:633
 msgid "Right Alt"
 msgstr "右 Alt"
 
-#: ../rules/base.xml.in.h:612
-#, fuzzy
+#: ../rules/base.xml.in.h:634
 msgid "Right Alt (while pressed)"
-msgstr "右 Alt 已编排"
+msgstr "右 Alt (按下时)"
 
-#: ../rules/base.xml.in.h:613
+#: ../rules/base.xml.in.h:635
+#, fuzzy
+msgid "Right Alt as Right Ctrl"
+msgstr "右 Ctrl 作为 Alt"
+
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:614
+#: ../rules/base.xml.in.h:637
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:615
+#: ../rules/base.xml.in.h:638
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:639
 #, fuzzy
 msgid "Right Alt key never chooses 3rd level"
 msgstr "按右 Windows 键选择第三级"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:640
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl"
 msgstr "右 Ctrl"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:642
 #, fuzzy
 msgid "Right Ctrl (while pressed)"
 msgstr "按下右 Windows 键切换组"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:643
 msgid "Right Ctrl as Right Alt"
 msgstr "右 Ctrl 作为 Alt"
 
-#: ../rules/base.xml.in.h:621
-msgid "Right Ctrl is mapped to Menu"
-msgstr "右 Alt 映射为菜单"
-
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:644
 msgid "Right Ctrl+Right Shift"
 msgstr "右 Ctrl+右 Shift"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:645
 msgid "Right Shift"
 msgstr "右 Shift"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:646
 msgid "Right Win"
 msgstr "右 Win"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:647
 #, fuzzy
 msgid "Right Win (while pressed)"
 msgstr "按下右 Windows 键切换组"
 
-#: ../rules/base.xml.in.h:626
+#: ../rules/base.xml.in.h:648
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:627
+#: ../rules/base.xml.in.h:649
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:650 ../rules/base.extras.xml.in.h:30
 msgid "Romanian"
-msgstr "罗马尼亚"
-
-#: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr ""
+msgstr "罗马尼亚语"
 
-#: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
+#: ../rules/base.xml.in.h:651
+msgid "Romanian (Germany)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
+#: ../rules/base.xml.in.h:652
+msgid "Romanian (Germany, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:633
-#, fuzzy
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (WinKeys)"
-msgstr "罗马尼亚"
+msgstr "罗马尼亚语(Win 键)"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:654
 #, fuzzy
 msgid "Romanian (cedilla)"
 msgstr "罗马尼亚"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:655
 msgid "Romanian (standard cedilla)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:656
 msgid "Romanian (standard)"
-msgstr "罗马尼亚(标准)"
+msgstr "罗马尼亚语(标准)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:657
 msgid "Rupee on 4"
 msgstr ""
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:658 ../rules/base.extras.xml.in.h:32
 msgid "Russian"
 msgstr "俄语"
 
-#: ../rules/base.xml.in.h:639
-msgid "Russian (Bashkirian)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:640
-msgid "Russian (Chuvash Latin)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:641
-msgid "Russian (Chuvash)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:659
 msgid "Russian (DOS)"
 msgstr "俄语(DOS)"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Georgia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Germany, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:645
-#, fuzzy
-msgid "Russian (Kalmyk)"
-msgstr "俄语"
-
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:647
-#, fuzzy
-msgid "Russian (Komi)"
-msgstr "俄语"
-
-#: ../rules/base.xml.in.h:648
-#, fuzzy
-msgid "Russian (Mari)"
-msgstr "俄语"
-
-#: ../rules/base.xml.in.h:649
-msgid "Russian (Ossetian, WinKeys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:650
-msgid "Russian (Ossetian, legacy)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:663
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:652
-msgid "Russian (Serbian)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:664
 msgid "Russian (Sweden, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:665
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:655
-#, fuzzy
-msgid "Russian (Tatar)"
-msgstr "俄语"
-
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:666
 msgid "Russian (US, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:657
-#, fuzzy
-msgid "Russian (Udmurt)"
-msgstr "俄语"
-
-#: ../rules/base.xml.in.h:658
-#, fuzzy
-msgid "Russian (Yakut)"
-msgstr "俄语"
+#: ../rules/base.xml.in.h:667
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr ""
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:668
 msgid "Russian (legacy)"
 msgstr "俄语(传统)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:669
 msgid "Russian (phonetic WinKeys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:670
 msgid "Russian (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:671
 msgid "Russian (typewriter)"
-msgstr ""
+msgstr "俄语(打字机)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:672
 msgid "Russian (typewriter, legacy)"
-msgstr ""
+msgstr "俄语(打字机，传统)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:673
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST 多媒体无线键盘"
 
-#: ../rules/base.xml.in.h:665
+#: ../rules/base.xml.in.h:674
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: ../rules/base.xml.in.h:666
+#: ../rules/base.xml.in.h:675
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: ../rules/base.xml.in.h:667
+#: ../rules/base.xml.in.h:676
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: ../rules/base.xml.in.h:668
+#: ../rules/base.xml.in.h:677
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: ../rules/base.xml.in.h:669
+#: ../rules/base.xml.in.h:678
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:670
+#: ../rules/base.xml.in.h:679
 msgid "SVEN Slim 303"
-msgstr ""
+msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:671
+#: ../rules/base.xml.in.h:680
 msgid "Saisiyat (Taiwan)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:681
 msgid "Samsung SDM 4500P"
 msgstr "三星 SDM 4500P"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:682
 msgid "Samsung SDM 4510P"
 msgstr "三星 SDM 4510P"
 
-#: ../rules/base.xml.in.h:674
+#: ../rules/base.xml.in.h:683
 msgid "Sanwa Supply SKB-KG3"
 msgstr ""
 
-#: ../rules/base.xml.in.h:675
+#: ../rules/base.xml.in.h:684
 msgid "Scroll Lock"
 msgstr "滚动锁定"
 
-#: ../rules/base.xml.in.h:676
-msgid "Secwepemctsin"
-msgstr ""
-
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:685
 msgid "Semi-colon on third level"
 msgstr "第三层上的分号"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:686 ../rules/base.extras.xml.in.h:35
 msgid "Serbian"
 msgstr "塞尔维亚"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "塞尔维亚(拉丁 Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin Unicode)"
 msgstr "塞尔维亚(拉丁 Unicode)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:689
 msgid "Serbian (Latin qwerty)"
 msgstr "塞尔维亚(拉丁 qwerty)"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Latin with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (Latin)"
 msgstr "塞尔维亚(拉丁)"
 
-#: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr ""
+#: ../rules/base.xml.in.h:692
+#, fuzzy
+msgid "Serbian (Russia)"
+msgstr "塞尔维亚(拉丁)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:693
 msgid "Serbian (Z and ZHE swapped)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:694
 msgid "Serbian (with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:695
 msgid "Serbo-Croatian (US)"
 msgstr "塞尔维亚-克罗地亚语(美国键盘)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:696
 msgid "Shift cancels Caps Lock"
 msgstr "Shift 取消大写锁定"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:697
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr ""
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:698
 #, fuzzy
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Shift+数字键盘的功能等同于 MS Windows"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:699
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:692
+#: ../rules/base.xml.in.h:700
 msgid "Sindhi"
 msgstr "信德语"
 
-#: ../rules/base.xml.in.h:693
-msgid "Sinhala"
-msgstr "僧伽罗语"
+#: ../rules/base.xml.in.h:701
+#, fuzzy
+msgid "Sinhala (phonetic)"
+msgstr "叙利亚(音标)"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:702
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:703
 msgid "Slovak (extended Backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:704
 msgid "Slovak (qwerty)"
 msgstr "斯洛伐克语(qwerty)"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:705
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "斯洛伐克语(qwerty)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Slovene"
+#: ../rules/base.xml.in.h:706
+#, fuzzy
+msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: ../rules/base.xml.in.h:699
-msgid "Slovene (US keyboard with Slovenian letters)"
+#: ../rules/base.xml.in.h:707
+#, fuzzy
+msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr "斯洛文尼亚语(带斯洛文尼亚字母的美国键盘)"
 
-#: ../rules/base.xml.in.h:700
-msgid "Slovene (use guillemets for quotes)"
+#: ../rules/base.xml.in.h:708
+msgid "Slovenian (use guillemets for quotes)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:709
 msgid "Spanish"
 msgstr "西班牙"
 
-#: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Dvorak)"
-msgstr "西班牙语(德沃夏克)"
+msgstr "西班牙语(Dvorak)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American)"
 msgstr "西班牙语(拉丁美洲)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "西班牙语(拉丁美洲，Sun 死键)"
+
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "西班牙语(拉丁美洲，除去死键)"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, sun dead keys)"
-msgstr "西班牙语(拉丁美洲，Sun 死键)"
-
-#: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
+#: ../rules/base.xml.in.h:715
+msgid "Spanish (Macintosh)"
 msgstr "西班牙语(Mac)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:716
 msgid "Spanish (Sun dead keys)"
 msgstr "西班牙语(Sun 死键)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:717
 msgid "Spanish (eliminate dead keys)"
 msgstr "西班牙语(除去死键)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:718
 msgid "Spanish (include dead tilde)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:713
-#, fuzzy
+#: ../rules/base.xml.in.h:719
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr "服务器处理的特殊键 (Ctrl+Alt+&lt;key&gt;)。"
+msgstr "服务器处理的特殊键(Ctrl+Alt+&lt;key&gt;)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:720
 msgid "Sun Type 5/6"
 msgstr "Sun Type 5/6"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:721
 #, fuzzy
 msgid "Super Power Multimedia Keyboard"
 msgstr "惠普 SK-2501 多媒体键盘"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:722
 msgid "Swahili (Kenya)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:723
 msgid "Swahili (Tanzania)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:724
 msgid "Swap Ctrl and Caps Lock"
 msgstr "交换 Ctrl 和大写锁定"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:725
 msgid "Swap ESC and Caps Lock"
 msgstr "交换 ESC 和大写锁定"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:726
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (Dvorak)"
-msgstr "瑞典语(德沃夏克)"
+msgstr "瑞典语(Dvorak)"
 
-#: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
+#: ../rules/base.xml.in.h:728
+msgid "Swedish (Macintosh)"
 msgstr "瑞典语(Mac)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:729
 msgid "Swedish (Svdvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:730
 msgid "Swedish (eliminate dead keys)"
 msgstr "瑞典语(除去死键)"
 
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
+#: ../rules/base.xml.in.h:731
+msgid "Swedish Sign Language"
 msgstr ""
 
-#: ../rules/base.xml.in.h:726
-msgid "Swiss"
-msgstr "瑞士语"
-
-#: ../rules/base.xml.in.h:727
-msgid "Swiss (legacy)"
-msgstr "瑞士语(传统)"
-
-#: ../rules/base.xml.in.h:728
+#: ../rules/base.xml.in.h:732
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook(平板电脑)"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:733
 msgid "Syriac"
-msgstr "叙利亚"
+msgstr "叙利亚语"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:734
 msgid "Syriac (phonetic)"
-msgstr "叙利亚(音标)"
+msgstr "叙利亚语(音标)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:735
 msgid "Taiwanese"
-msgstr "台言"
+msgstr ""
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:736
 msgid "Taiwanese (indigenous)"
 msgstr "台湾原住民语言"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:737
 msgid "Tajik"
 msgstr "塔吉克"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:738
 msgid "Tajik (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:739
 msgid "Tamil"
-msgstr "泰米尔"
+msgstr "泰米尔语"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "泰米尔语(斯里兰卡，Unicode)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (TAB typewriter)"
-msgstr ""
+msgstr "泰米尔语(TAB 打字机)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:743
 msgid "Tamil (TSCII typewriter)"
-msgstr ""
+msgstr "泰米尔语(TSCII 打字机)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:744
 msgid "Tamil (Unicode)"
 msgstr "泰米尔语(Unicode)"
 
-#: ../rules/base.xml.in.h:741
-#, fuzzy
+#: ../rules/base.xml.in.h:745
 msgid "Tamil (keyboard with numerals)"
-msgstr "美国键盘，带罗马尼亚字符"
+msgstr ""
 
-#: ../rules/base.xml.in.h:742
+#: ../rules/base.xml.in.h:746
 msgid "Targa Visionary 811"
 msgstr ""
 
-#: ../rules/base.xml.in.h:743
+#: ../rules/base.xml.in.h:747
+msgid "Tatar"
+msgstr ""
+
+#: ../rules/base.xml.in.h:748
 msgid "Telugu"
 msgstr "泰卢固"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:749
 msgid "Thai"
 msgstr "泰语"
 
-#: ../rules/base.xml.in.h:745
-#, fuzzy
+#: ../rules/base.xml.in.h:750
 msgid "Thai (Pattachote)"
 msgstr "泰语(Pattachote)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:751
 msgid "Thai (TIS-820.2538)"
 msgstr "泰语(TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:752
+msgid "Tibetan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:753
+#, fuzzy
+msgid "Tibetan (with ASCII numerals)"
+msgstr "中国(带有 ASCII 数字的藏语键盘)"
+
+#: ../rules/base.xml.in.h:754
 msgid "To the corresponding key in a Dvorak keyboard."
-msgstr "德沃夏克键盘上的相应键"
+msgstr "Dvorak 键盘上相应的键"
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:755
 msgid "To the corresponding key in a Qwerty keyboard."
-msgstr ""
+msgstr "Qwerty 键盘上相应的键。"
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:756
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr ""
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:757
 msgid "Toshiba Satellite S3000"
 msgstr "东芝 Satellite S3000"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:758
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access 键盘"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:759
 msgid "Trust Slimline"
 msgstr ""
 
-#: ../rules/base.xml.in.h:753
+#: ../rules/base.xml.in.h:760
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust 无线经典键盘"
 
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:761
 msgid "Tswana"
 msgstr ""
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:762
 msgid "Turkish"
 msgstr "土耳其"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (Alt-Q)"
 msgstr "土耳其(Alt-Q)"
 
-#: ../rules/base.xml.in.h:757
-msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
-msgstr "土耳其(克里米亚鞑靼语土耳其键盘 Alt-Q)"
-
-#: ../rules/base.xml.in.h:758
-msgid "Turkish (Crimean Tatar Turkish F)"
-msgstr "土耳其(克里米亚鞑靼语土耳其键盘 F)"
-
-#: ../rules/base.xml.in.h:759
-msgid "Turkish (Crimean Tatar Turkish Q)"
-msgstr "土耳其(克里米亚鞑靼语土耳其键盘 Q)"
-
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:764
 msgid "Turkish (F)"
 msgstr "土耳其(F)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:765
 msgid "Turkish (Sun dead keys)"
 msgstr "土耳其语(Sun 死键)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:766
 msgid "Turkish (international with dead keys)"
 msgstr "土耳其语(国际，带死键)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:767
 msgid "Turkmen"
 msgstr ""
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:768
 msgid "Turkmen (Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:765
+#: ../rules/base.xml.in.h:769
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr ""
 
-#: ../rules/base.xml.in.h:766
+#: ../rules/base.xml.in.h:770
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr ""
 
-#: ../rules/base.xml.in.h:767
+#: ../rules/base.xml.in.h:771
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr ""
 
-#: ../rules/base.xml.in.h:768
+#: ../rules/base.xml.in.h:772
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:769
+#: ../rules/base.xml.in.h:773
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:770
+#: ../rules/base.xml.in.h:774
+msgid "Udmurt"
+msgstr ""
+
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian"
 msgstr "乌克兰语"
 
-#: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "乌克兰语(克里米亚鞑靼土耳其 Alt-Q)"
-
-#: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "乌克兰语(克里米亚鞑靼土耳其 F)"
-
-#: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "乌克兰语(克里米亚鞑靼土耳其 Q)"
-
-#: ../rules/base.xml.in.h:774
-#, fuzzy
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (WinKeys)"
-msgstr "乌克兰"
+msgstr "乌克兰语(Win 键)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (homophonic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (legacy)"
 msgstr "乌克兰语(传统)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:779
 msgid "Ukrainian (phonetic)"
 msgstr "乌克兰语(音标)"
 
-#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:780
 msgid "Ukrainian (standard RSTU)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:781
 msgid "Ukrainian (typewriter)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:782
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode 扩展(箭头和数学操作符)"
 
-#: ../rules/base.xml.in.h:782
+#: ../rules/base.xml.in.h:783
 #, fuzzy
 msgid "Unicode additions (arrows and math operators). Math operators on default level"
 msgstr "Unicode 扩展(箭头和数学操作符)。"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:784
 msgid "Unitek KB-1925"
 msgstr ""
 
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (Pakistan)"
 msgstr "乌尔都语(巴基斯坦)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (Pakistan, CRULP)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (Pakistan, NLA)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:788
 msgid "Urdu (WinKeys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:789
 msgid "Urdu (alternative phonetic)"
 msgstr "乌尔都语(替代音标)"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:790
 msgid "Urdu (phonetic)"
 msgstr "乌尔都语(音标)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:791
 msgid "Use keyboard LED to show alternative layout"
 msgstr "使用键盘灯显示替代布局"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:792
 msgid "Using space key to input non-breakable space character"
 msgstr "使用空格键输入不可打断空白字符"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:793
 msgid "Usual space at any level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:794
+msgid "Uyghur"
+msgstr ""
+
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek"
 msgstr "乌兹别克语"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:796
 msgid "Uzbek (Afghanistan)"
 msgstr "乌兹别克语(阿富汗)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:797
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "乌兹别克语(阿富汗，OLPC)"
 
-#: ../rules/base.xml.in.h:796
-msgid "Uzbek (Crimean Tatar Turkish Alt-Q)"
-msgstr "乌兹别克语(克里米亚鞑靼土耳其 Alt-Q)"
-
-#: ../rules/base.xml.in.h:797
-msgid "Uzbek (Crimean Tatar Turkish F)"
-msgstr "乌兹别克语(克里米亚鞑靼土耳其 F)"
-
 #: ../rules/base.xml.in.h:798
-msgid "Uzbek (Crimean Tatar Turkish Q)"
-msgstr "乌兹别克语(克里米亚鞑靼土耳其 Q)"
-
-#: ../rules/base.xml.in.h:799
 msgid "Uzbek (Latin)"
 msgstr "乌兹别克语(拉丁)"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:799
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:800
 msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr "优派 KU-306 互联网键盘"
 
-#: ../rules/base.xml.in.h:802
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
+#: ../rules/base.xml.in.h:801
+#, fuzzy
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "带 Unicode 扩展的王安 724 型小键盘(箭头和数学操作符)"
 
-#: ../rules/base.xml.in.h:803
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
-msgstr ""
+#: ../rules/base.xml.in.h:802
+#, fuzzy
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Unicode 扩展(箭头和数学操作符)。"
 
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:803
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:805
+#: ../rules/base.xml.in.h:804
 msgid "Wolof"
 msgstr ""
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:805
 msgid "Yahoo! Internet Keyboard"
 msgstr "雅虎网际键盘"
 
+#: ../rules/base.xml.in.h:806
+msgid "Yakut"
+msgstr ""
+
 #: ../rules/base.xml.in.h:807
 msgid "Yoruba"
 msgstr ""
@@ -3398,129 +3435,129 @@ msgid "ca"
 msgstr "ca"
 
 #: ../rules/base.xml.in.h:829
-msgid "che"
-msgstr "che"
-
-#: ../rules/base.xml.in.h:830
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:831
+#: ../rules/base.xml.in.h:830
+msgid "cm"
+msgstr ""
+
+#: ../rules/base.xml.in.h:831 ../rules/base.extras.xml.in.h:38
+msgid "crh"
+msgstr "crh"
+
+#: ../rules/base.xml.in.h:832
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:833
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:39
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:835
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:836
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:837
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:837
+#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:40
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:838
+#: ../rules/base.xml.in.h:839
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:840
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:841
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:41
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:843
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:844
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:845
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:846 ../rules/base.extras.xml.in.h:42
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:847
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:847
+#: ../rules/base.xml.in.h:848
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:849
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:850
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:850
+#: ../rules/base.xml.in.h:851
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:852
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:853
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:853
+#: ../rules/base.xml.in.h:854
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:43
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:856
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:856
+#: ../rules/base.xml.in.h:857
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:857
+#: ../rules/base.xml.in.h:858
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:858
+#: ../rules/base.xml.in.h:859
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:859
-msgid "irq"
-msgstr "irq"
-
 #: ../rules/base.xml.in.h:860
 msgid "is"
 msgstr "is"
@@ -3562,269 +3599,434 @@ msgid "ku"
 msgstr "ku"
 
 #: ../rules/base.xml.in.h:870
-msgid "kut"
-msgstr "kut"
-
-#: ../rules/base.xml.in.h:871
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:872
+#: ../rules/base.xml.in.h:871 ../rules/base.extras.xml.in.h:45
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:872 ../rules/base.extras.xml.in.h:46
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:874
+#: ../rules/base.xml.in.h:873
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:874
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:875
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:876
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:877
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:878
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:879
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:880
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:881
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:883
+#: ../rules/base.xml.in.h:882
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:883
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:884
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:47
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:886
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:887
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:889
+#: ../rules/base.xml.in.h:888 ../rules/base.extras.xml.in.h:48
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:890
+#: ../rules/base.xml.in.h:889 ../rules/base.extras.xml.in.h:49
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:890
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:892
-msgid "shs"
-msgstr "shs"
-
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:891
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:892
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:895
+#: ../rules/base.xml.in.h:893
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:894
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:895 ../rules/base.extras.xml.in.h:51
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:898
-msgid "srp"
-msgstr "srp"
-
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:896
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:897
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:898
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:902
+#: ../rules/base.xml.in.h:899
 msgid "ta"
 msgstr "ta"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:900
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:901
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:905
+#: ../rules/base.xml.in.h:902
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:903
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:904
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:905
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:909
-msgid "twn"
-msgstr "twn"
-
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:906
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:911
+#: ../rules/base.xml.in.h:907
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:908
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:909
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:910
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:911
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:912
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:913
 msgid "zh"
 msgstr "zh"
 
 #: ../rules/base.extras.xml.in.h:1
-msgid "APL"
+msgid "APL Keyboard Symbols"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:2
-msgid "Iran"
-msgstr "伊朗"
-
 #: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr "伊朗 - 阿维斯陀语"
+#, fuzzy
+msgid "Armenian (OLPC phonetic)"
+msgstr "亚美尼亚语(音标)"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "立陶宛"
+msgid "Atsina"
+msgstr ""
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
-msgstr "立陶宛 - 德沃夏克"
+#, fuzzy
+msgid "Avestan"
+msgstr "伊朗 - 阿维斯陀语"
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "Ltu"
+msgid "Couer D'alene Salish"
+msgstr ""
 
 #: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "罗马尼亚"
-
-#: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr ""
+#, fuzzy
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "乌兹别克语(克里米亚鞑靼土耳其 Q)"
 
 #: ../rules/base.extras.xml.in.h:9
-msgid "Rou"
-msgstr "Rou"
+#, fuzzy
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "英语(美国，国际，有死键)"
 
 #: ../rules/base.extras.xml.in.h:10
-msgid "Rus"
-msgstr "Rus"
-
-#: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "俄罗斯"
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
-msgstr "塞尔维亚"
+#, fuzzy
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "英语(美国，国际，有死键)"
 
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
-msgstr ""
+msgid "German (US keyboard with German letters)"
+msgstr "德语(带德语字母的美式键盘)"
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
-msgstr "Srb"
+#, fuzzy
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "德语(瑞士，Sun 死键)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "美国"
-
-#: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
+msgid "Kutenai"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:17
-msgid "USA - Couer D'alene Salish"
+msgid "Latvian (US Colemak)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
+msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
+#, fuzzy
+msgid "Latvian (US Dvorak)"
+msgstr "爱沙尼亚(Dvorak)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (US Dvorak, Y variant)"
 msgstr ""
+
+#: ../rules/base.extras.xml.in.h:21
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:22
+#, fuzzy
+msgid "Latvian (programmer US Dvorak)"
+msgstr "波兰语(适合程序员的Dvorak)"
+
+#: ../rules/base.extras.xml.in.h:23
+#, fuzzy
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "波兰语(适合程序员的Dvorak)"
+
+#: ../rules/base.extras.xml.in.h:24
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:26
+#, fuzzy
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "立陶宛语(带立陶宛字母的美国键盘)"
+
+#: ../rules/base.extras.xml.in.h:29
+#, fuzzy
+msgid "Polish (international with dead keys)"
+msgstr "土耳其语(国际，带死键)"
+
+#: ../rules/base.extras.xml.in.h:31
+#, fuzzy
+msgid "Romanian (ergonomic Touchtype)"
+msgstr "乔治亚(俄语)"
+
+#: ../rules/base.extras.xml.in.h:33
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:34
+msgid "Secwepemctsin"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:36
+#, fuzzy
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "除去死键"
+
+#: ../rules/base.extras.xml.in.h:37
+msgid "apl"
+msgstr "apl"
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "kut"
+msgstr "kut"
+
+#: ../rules/base.extras.xml.in.h:50
+msgid "shs"
+msgstr "shs"
+
+#~ msgid "Afg"
+#~ msgstr "阿富汗"
+
+#~ msgid "Chinese (Tibetan)"
+#~ msgstr "中国(藏语)"
+
+#~ msgid "Chinese (Uyghur)"
+#~ msgstr "中国(维吾尔语)"
+
+#~ msgid "Danish (Mac)"
+#~ msgstr "丹麦语(Mac)"
+
+#~ msgid "English (UK, Mac)"
+#~ msgstr "英语(应该，Mac)"
+
+#~ msgid "Finnish (Mac)"
+#~ msgstr "芬兰语(Mac)"
+
+#~ msgid "GBr"
+#~ msgstr "GBr"
+
+#~ msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
+#~ msgstr "德语(带德语字母的罗马尼亚键盘，除去死键)"
+
+#~ msgid "Kurdish (Iran, latin alt-Q)"
+#~ msgstr "库尔德语(伊朗，拉丁 alt-Q)"
+
+#~ msgid "Make Caps Lock an additional Ctrl"
+#~ msgstr "将 CapsLock 作为额外的 Ctrl"
+
+#~ msgid "Meta on Left Ctrl"
+#~ msgstr "Meat 映射到左 Ctrl"
+
+#~ msgid "Right Ctrl is mapped to Menu"
+#~ msgstr "右 Alt 映射为菜单"
+
+#, fuzzy
+#~ msgid "Russian (Kalmyk)"
+#~ msgstr "俄语"
+
+#, fuzzy
+#~ msgid "Russian (Komi)"
+#~ msgstr "俄语"
+
+#, fuzzy
+#~ msgid "Russian (Mari)"
+#~ msgstr "俄语"
+
+#, fuzzy
+#~ msgid "Russian (Tatar)"
+#~ msgstr "俄语"
+
+#, fuzzy
+#~ msgid "Russian (Udmurt)"
+#~ msgstr "俄语"
+
+#, fuzzy
+#~ msgid "Russian (Yakut)"
+#~ msgstr "俄语"
+
+#~ msgid "Sinhala"
+#~ msgstr "僧伽罗语"
+
+#~ msgid "Spanish (Mac)"
+#~ msgstr "西班牙语(Mac)"
+
+#~ msgid "Swiss"
+#~ msgstr "瑞士语"
+
+#~ msgid "Swiss (legacy)"
+#~ msgstr "瑞士语(传统)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "土耳其(克里米亚鞑靼语土耳其键盘 Alt-Q)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish F)"
+#~ msgstr "土耳其(克里米亚鞑靼语土耳其键盘 F)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish Q)"
+#~ msgstr "土耳其(克里米亚鞑靼语土耳其键盘 Q)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "乌克兰语(克里米亚鞑靼土耳其 Alt-Q)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish F)"
+#~ msgstr "乌克兰语(克里米亚鞑靼土耳其 F)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish Q)"
+#~ msgstr "乌克兰语(克里米亚鞑靼土耳其 Q)"
+
+#~ msgid "irq"
+#~ msgstr "irq"
+
+#~ msgid "srp"
+#~ msgstr "srp"
+
+#~ msgid "twn"
+#~ msgstr "twn"
+
+#~ msgid "Iran"
+#~ msgstr "伊朗"
+
+#~ msgid "Lithuania"
+#~ msgstr "立陶宛"
+
+#~ msgid "Lithuania - Dvorak"
+#~ msgstr "立陶宛 - Dvorak"
+
+#~ msgid "Ltu"
+#~ msgstr "Ltu"
+
+#~ msgid "Romania"
+#~ msgstr "罗马尼亚"
+
+#~ msgid "Rou"
+#~ msgstr "Rou"
+
+#~ msgid "Rus"
+#~ msgstr "Rus"
+
+#~ msgid "Russia"
+#~ msgstr "俄罗斯"
+
+#~ msgid "Serbia"
+#~ msgstr "塞尔维亚"
+
+#~ msgid "Srb"
+#~ msgstr "Srb"
+
+#~ msgid "USA"
+#~ msgstr "美国"
diff --git a/dist/xkeyboard-config/rules/Makefile.in b/dist/xkeyboard-config/rules/Makefile.in
index 493470619..2c59b5ad9 100644
--- a/dist/xkeyboard-config/rules/Makefile.in
+++ b/dist/xkeyboard-config/rules/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = rules
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,8 +110,12 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -127,11 +133,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -150,9 +160,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -174,6 +189,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -181,6 +197,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -192,14 +210,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/rules/base.extras.xml.in b/dist/xkeyboard-config/rules/base.extras.xml.in
index a6b52f0ed..4f8e3800b 100644
--- a/dist/xkeyboard-config/rules/base.extras.xml.in
+++ b/dist/xkeyboard-config/rules/base.extras.xml.in
@@ -38,6 +38,37 @@
     </layout>
     <layout>
       <configItem>
+        <name>de</name>
+        <_shortDescription>de</_shortDescription>
+        <_description>German</_description>
+        <languageList>
+          <iso639Id>ger</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>German (US keyboard with German letters)</_description>
+            <languageList>
+              <iso639Id>eng</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hu</name>
+            <_description>German (with Hungarian letters and no dead keys)</_description>
+            <languageList>
+              <iso639Id>ger</iso639Id>
+              <iso639Id>hun</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
         <name>ir</name>
         <_shortDescription>fa</_shortDescription>
         <_description>Persian</_description>
@@ -241,7 +272,7 @@
           <configItem>
             <name>ruu</name>
             <_shortDescription>ru</_shortDescription>
-            <_description>Russian (with UKR and BEL layout)</_description>
+            <_description>Russian (with Ukrainian-Belorussian layout)</_description>
             <languageList><iso639Id>rus</iso639Id>
                           <iso639Id>ukr</iso639Id>
                           <iso639Id>bel</iso639Id></languageList>
diff --git a/dist/xkeyboard-config/rules/base.o_s.part b/dist/xkeyboard-config/rules/base.o_s.part
index 3e23396da..6cf9f1406 100644
--- a/dist/xkeyboard-config/rules/base.o_s.part
+++ b/dist/xkeyboard-config/rules/base.o_s.part
@@ -64,10 +64,11 @@
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:lctrl_meta	=	+ctrl(lctrl_meta)
   ctrl:swapcaps		=	+ctrl(swapcaps)
-  ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
-  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)
-  ctrl:ctrl_ra		=	+ctrl(ctrl_ra)
-  ctrl:ctrl_menu	=	+ctrl(ctrl_menu)
+  ctrl:ac_ctrl		=	+ctrl(ac_ctrl)
+  ctrl:aa_ctrl		=	+ctrl(aa_ctrl)
+  ctrl:rctrl_ralt	=	+ctrl(rctrl_ralt)
+  ctrl:menu_rctrl	=	+ctrl(menu_rctrl)
+  ctrl:ralt_rctrl	=	+ctrl(ralt_rctrl)
   compose:ralt		=	+compose(ralt)
   compose:lwin		=	+compose(lwin)
   compose:rwin		=	+compose(rwin)
diff --git a/dist/xkeyboard-config/rules/base.xml.in b/dist/xkeyboard-config/rules/base.xml.in
index 9f117cf34..4ee879bb5 100644
--- a/dist/xkeyboard-config/rules/base.xml.in
+++ b/dist/xkeyboard-config/rules/base.xml.in
@@ -627,6 +627,7 @@
         <name>logii350</name>
         <_description>Logitech Internet 350 Keyboard</_description>
         <vendor>Logitech</vendor>
+        <hwList> <hwId>046d:c313</hwId></hwList>
       </configItem>
     </model>
     <model>
@@ -1714,7 +1715,7 @@
           <configItem>
             <name>ben</name>
             <_shortDescription>bn</_shortDescription>
-            <_description>Bengali</_description>
+            <_description>Bengali (India)</_description>
             <languageList>
               <iso639Id>ben</iso639Id>
             </languageList>
@@ -1724,12 +1725,40 @@
           <configItem>
             <name>ben_probhat</name>
             <_shortDescription>bn</_shortDescription>
-            <_description>Bengali (Probhat)</_description>
+            <_description>Bengali (India, Probhat)</_description>
             <languageList>
               <iso639Id>ben</iso639Id>
             </languageList>
           </configItem>
         </variant>
+	<variant>
+          <configItem>
+            <name>ben_baishakhi</name>
+            <_description>Bengali (India, Baishakhi)</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>	
+          </configItem>
+        </variant>
+	 <variant>
+          <configItem>
+            <name>ben_bornona</name>
+            <_description>Bengali (India, Bornona)</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>	
+          </configItem>
+        </variant>
+	 <variant>
+          <configItem>
+            <name>ben_gitanjali</name>
+            <_description>Bengali (India, Uni Gitanjali)</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>	
+          </configItem>
+        </variant>
+	 <variant>
+          <configItem>
+            <name>ben_inscript</name>
+            <_description>Bengali (India, Baishakhi Inscript)</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>	
+          </configItem>
+        </variant>
         <variant>
           <configItem>
             <name>guj</name>
@@ -2132,7 +2161,7 @@
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>English (Cameroon qwerty)</_description>
+            <_description>Cameroon Multilingual (qwerty)</_description>
             <languageList>
               <iso639Id>eng</iso639Id>
               <iso639Id>bas</iso639Id>
@@ -2169,7 +2198,7 @@
         <variant>
           <configItem>
             <name>azerty</name>
-            <_description>French (Cameroon azerty)</_description>
+            <_description>Cameroon Multilingual (azerty)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
               <iso639Id>bas</iso639Id>
@@ -2206,7 +2235,7 @@
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>English (Cameroon Dvorak)</_description>
+            <_description>Cameroon Multilingual (Dvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3028,12 +3057,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>qwerty</name>
-            <_description>German (qwerty)</_description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>ru</name>
             <_description>Russian (Germany, phonetic)</_description>
             <languageList>
@@ -4453,7 +4476,7 @@
       <configItem>
         <name>lk</name>
         <_shortDescription>si</_shortDescription>
-        <_description>Sinhala</_description>
+        <_description>Sinhala (phonetic)</_description>
         <languageList>
           <iso639Id>sin</iso639Id>
         </languageList>
@@ -5579,13 +5602,13 @@
       <option>
         <configItem>
           <name>ctrl:nocaps</name>
-          <_description>Make Caps Lock an additional Ctrl</_description>
+          <_description>Caps Lock as Ctrl</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>ctrl:lctrl_meta</name>
-          <_description>Meta on Left Ctrl</_description>
+          <_description>Left Ctrl as Meta</_description>
         </configItem>
       </option>
       <option>
@@ -5596,26 +5619,32 @@
       </option>
       <option>
         <configItem>
-          <name>ctrl:ctrl_ac</name>
+          <name>ctrl:ac_ctrl</name>
           <_description>At left of 'A'</_description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>ctrl:ctrl_aa</name>
+          <name>ctrl:aa_ctrl</name>
           <_description>At bottom left</_description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>ctrl:ctrl_ra</name>
+          <name>ctrl:rctrl_ralt</name>
           <_description>Right Ctrl as Right Alt</_description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>ctrl:ctrl_menu</name>
-          <_description>Right Ctrl is mapped to Menu</_description>
+          <name>ctrl:menu_rctrl</name>
+          <_description>Menu as Right Ctrl</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_ralt</name>
+          <_description>Right Alt as Right Ctrl</_description>
         </configItem>
       </option>
     </group>
diff --git a/dist/xkeyboard-config/rules/bin/Makefile.in b/dist/xkeyboard-config/rules/bin/Makefile.in
index f562d5b5b..ab8b9410d 100644
--- a/dist/xkeyboard-config/rules/bin/Makefile.in
+++ b/dist/xkeyboard-config/rules/bin/Makefile.in
@@ -31,6 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = rules/bin
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -44,8 +46,12 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -63,11 +69,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -86,9 +96,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -110,6 +125,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -117,6 +133,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -128,14 +146,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/rules/compat/Makefile.in b/dist/xkeyboard-config/rules/compat/Makefile.in
index 0cf36abfb..34b2b94cf 100644
--- a/dist/xkeyboard-config/rules/compat/Makefile.in
+++ b/dist/xkeyboard-config/rules/compat/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = rules/compat
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -46,8 +48,12 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -65,11 +71,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -88,9 +98,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -112,6 +127,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -119,6 +135,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -130,14 +148,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/rules/compat/variantsMapping.lst b/dist/xkeyboard-config/rules/compat/variantsMapping.lst
index d88336fce..80745519d 100644
--- a/dist/xkeyboard-config/rules/compat/variantsMapping.lst
+++ b/dist/xkeyboard-config/rules/compat/variantsMapping.lst
@@ -1,5 +1,5 @@
 ben	basic		in	ben
-ben	probhat		in	ben_probhat	
+ben	probhat		in	ben_probhat
 dev	basic		in	deva
 dvorak	$dvoraklayouts	%v	dvorak
 dvorak	basic		us	dvorak
diff --git a/dist/xkeyboard-config/rules/evdev.extras.xml.in b/dist/xkeyboard-config/rules/evdev.extras.xml.in
index a6b52f0ed..4f8e3800b 100644
--- a/dist/xkeyboard-config/rules/evdev.extras.xml.in
+++ b/dist/xkeyboard-config/rules/evdev.extras.xml.in
@@ -38,6 +38,37 @@
     </layout>
     <layout>
       <configItem>
+        <name>de</name>
+        <_shortDescription>de</_shortDescription>
+        <_description>German</_description>
+        <languageList>
+          <iso639Id>ger</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>German (US keyboard with German letters)</_description>
+            <languageList>
+              <iso639Id>eng</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hu</name>
+            <_description>German (with Hungarian letters and no dead keys)</_description>
+            <languageList>
+              <iso639Id>ger</iso639Id>
+              <iso639Id>hun</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
         <name>ir</name>
         <_shortDescription>fa</_shortDescription>
         <_description>Persian</_description>
@@ -241,7 +272,7 @@
           <configItem>
             <name>ruu</name>
             <_shortDescription>ru</_shortDescription>
-            <_description>Russian (with UKR and BEL layout)</_description>
+            <_description>Russian (with Ukrainian-Belorussian layout)</_description>
             <languageList><iso639Id>rus</iso639Id>
                           <iso639Id>ukr</iso639Id>
                           <iso639Id>bel</iso639Id></languageList>
diff --git a/dist/xkeyboard-config/rules/evdev.xml.in b/dist/xkeyboard-config/rules/evdev.xml.in
index 9f117cf34..4ee879bb5 100644
--- a/dist/xkeyboard-config/rules/evdev.xml.in
+++ b/dist/xkeyboard-config/rules/evdev.xml.in
@@ -627,6 +627,7 @@
         <name>logii350</name>
         <_description>Logitech Internet 350 Keyboard</_description>
         <vendor>Logitech</vendor>
+        <hwList> <hwId>046d:c313</hwId></hwList>
       </configItem>
     </model>
     <model>
@@ -1714,7 +1715,7 @@
           <configItem>
             <name>ben</name>
             <_shortDescription>bn</_shortDescription>
-            <_description>Bengali</_description>
+            <_description>Bengali (India)</_description>
             <languageList>
               <iso639Id>ben</iso639Id>
             </languageList>
@@ -1724,12 +1725,40 @@
           <configItem>
             <name>ben_probhat</name>
             <_shortDescription>bn</_shortDescription>
-            <_description>Bengali (Probhat)</_description>
+            <_description>Bengali (India, Probhat)</_description>
             <languageList>
               <iso639Id>ben</iso639Id>
             </languageList>
           </configItem>
         </variant>
+	<variant>
+          <configItem>
+            <name>ben_baishakhi</name>
+            <_description>Bengali (India, Baishakhi)</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>	
+          </configItem>
+        </variant>
+	 <variant>
+          <configItem>
+            <name>ben_bornona</name>
+            <_description>Bengali (India, Bornona)</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>	
+          </configItem>
+        </variant>
+	 <variant>
+          <configItem>
+            <name>ben_gitanjali</name>
+            <_description>Bengali (India, Uni Gitanjali)</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>	
+          </configItem>
+        </variant>
+	 <variant>
+          <configItem>
+            <name>ben_inscript</name>
+            <_description>Bengali (India, Baishakhi Inscript)</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>	
+          </configItem>
+        </variant>
         <variant>
           <configItem>
             <name>guj</name>
@@ -2132,7 +2161,7 @@
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>English (Cameroon qwerty)</_description>
+            <_description>Cameroon Multilingual (qwerty)</_description>
             <languageList>
               <iso639Id>eng</iso639Id>
               <iso639Id>bas</iso639Id>
@@ -2169,7 +2198,7 @@
         <variant>
           <configItem>
             <name>azerty</name>
-            <_description>French (Cameroon azerty)</_description>
+            <_description>Cameroon Multilingual (azerty)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
               <iso639Id>bas</iso639Id>
@@ -2206,7 +2235,7 @@
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>English (Cameroon Dvorak)</_description>
+            <_description>Cameroon Multilingual (Dvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3028,12 +3057,6 @@
         </variant>
         <variant>
           <configItem>
-            <name>qwerty</name>
-            <_description>German (qwerty)</_description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>ru</name>
             <_description>Russian (Germany, phonetic)</_description>
             <languageList>
@@ -4453,7 +4476,7 @@
       <configItem>
         <name>lk</name>
         <_shortDescription>si</_shortDescription>
-        <_description>Sinhala</_description>
+        <_description>Sinhala (phonetic)</_description>
         <languageList>
           <iso639Id>sin</iso639Id>
         </languageList>
@@ -5579,13 +5602,13 @@
       <option>
         <configItem>
           <name>ctrl:nocaps</name>
-          <_description>Make Caps Lock an additional Ctrl</_description>
+          <_description>Caps Lock as Ctrl</_description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>ctrl:lctrl_meta</name>
-          <_description>Meta on Left Ctrl</_description>
+          <_description>Left Ctrl as Meta</_description>
         </configItem>
       </option>
       <option>
@@ -5596,26 +5619,32 @@
       </option>
       <option>
         <configItem>
-          <name>ctrl:ctrl_ac</name>
+          <name>ctrl:ac_ctrl</name>
           <_description>At left of 'A'</_description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>ctrl:ctrl_aa</name>
+          <name>ctrl:aa_ctrl</name>
           <_description>At bottom left</_description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>ctrl:ctrl_ra</name>
+          <name>ctrl:rctrl_ralt</name>
           <_description>Right Ctrl as Right Alt</_description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>ctrl:ctrl_menu</name>
-          <_description>Right Ctrl is mapped to Menu</_description>
+          <name>ctrl:menu_rctrl</name>
+          <_description>Menu as Right Ctrl</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_ralt</name>
+          <_description>Right Alt as Right Ctrl</_description>
         </configItem>
       </option>
     </group>
diff --git a/dist/xkeyboard-config/rules/xkb.dtd b/dist/xkeyboard-config/rules/xkb.dtd
index 0afa0df12..0a37b1188 100644
--- a/dist/xkeyboard-config/rules/xkb.dtd
+++ b/dist/xkeyboard-config/rules/xkb.dtd
@@ -32,7 +32,7 @@
 
 <!ELEMENT option (configItem)>
 
-<!ELEMENT configItem (name,shortDescription*,description*,vendor?,countryList?,languageList?)>
+<!ELEMENT configItem (name,shortDescription*,description*,vendor?,countryList?,languageList?,hwList?)>
 
 <!ATTLIST configItem
           popularity (standard|exotic) "standard">
@@ -53,3 +53,6 @@
 
 <!ELEMENT iso639Id (#PCDATA)>
 
+<!ELEMENT hwList (hwId+)>
+
+<!ELEMENT hwId (#PCDATA)>
diff --git a/dist/xkeyboard-config/semantics/Makefile.in b/dist/xkeyboard-config/semantics/Makefile.in
index 983a83b05..63e7c1cce 100644
--- a/dist/xkeyboard-config/semantics/Makefile.in
+++ b/dist/xkeyboard-config/semantics/Makefile.in
@@ -36,6 +36,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 DIST_COMMON = $(dist_dir_DATA) $(dist_semantics_DATA) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/xkbrules.am
@@ -74,8 +76,12 @@ am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(semanticsdir)"
 DATA = $(dist_dir_DATA) $(dist_semantics_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -93,11 +99,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -116,9 +126,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -140,6 +155,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -147,6 +163,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -158,14 +176,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/symbols/Makefile.in b/dist/xkeyboard-config/symbols/Makefile.in
index a0bf593e3..8dbc748b6 100644
--- a/dist/xkeyboard-config/symbols/Makefile.in
+++ b/dist/xkeyboard-config/symbols/Makefile.in
@@ -36,6 +36,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 DIST_COMMON = $(dist_dir_DATA) $(dist_symbols_DATA) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/xkbrules.am
@@ -114,8 +116,12 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -133,11 +139,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -156,9 +166,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -180,6 +195,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -187,6 +203,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -198,14 +216,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/symbols/cm b/dist/xkeyboard-config/symbols/cm
index 926614021..622d62d8b 100644
--- a/dist/xkeyboard-config/symbols/cm
+++ b/dist/xkeyboard-config/symbols/cm
@@ -140,13 +140,13 @@ xkb_symbols "french"
 partial alphanumeric_keys
 xkb_symbols "azerty"
 {
-	name[Group1] = "French (Cameroon azerty)";
+	name[Group1] = "Cameroon Multilingual (azerty)";
 	include "level3(ralt_switch)"
 	include "cm(basic)"
 	key <AB01> { [ w, W, U1E85, U1E84 ] };	//  SMALL LETTER W,  CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS
 	key <AB02> { [ x, X, U2039, U203A ] };	// SMALL LETTER X, CAPITAL LETTER X, SINGLE LEFT-POINTING ANGLE QUOTATION MARK, SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
 	key <AB03> { [ c, C, U0327, copyright ] };	// SMALL LETTER C, CAPITAL LETTER C, COMBINING CEDILLA, COPYRIGHT SIGN
-	key <AB04> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER
+	key <AB04> { [ v, V, UA78C, UA78B ] };	// SMALL LETTER V, CAPITAL LETTER V, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)
 	key <AB05> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK
 	key <AB06> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG
 	key <AB07> { [ U002C, U003F, NoSymbol, U00D7 ] };	// COMMA, QUESTION MARK, , MULTIPLY
@@ -157,8 +157,8 @@ xkb_symbols "azerty"
 	key <AC02> { [ s, S, U201C, U201D ] };	// SMALL LETTER S, CAPITAL LETTER S, LEFT DOUBLE QUOTES, RIGHT DOUBLE QUOTES 
 	key <AC03> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK
 	key <AC04> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE
-	key <AC05> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)
-	key <AC06> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA
+	key <AC05> { [ g, G, U02BC, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, CURVED GLOTTAL, CAPITAL LETTER GLOTTAL (SALTILLO)
+	key <AC06> { [ h, H, U03B1, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA
 	key <AC07> { [ j, J, leftarrow, U2122 ] };	//SMALL LETTER J, CAPITAL LETTER J, LEFT ARROW, TRADE MARK SIGN
 	key <AC08> { [ k, K, downarrow, uparrow ] };	// SMALL LETTER K, CAPITAL LETTER K, DOWN ARROW, UP ARROW
 	key <AC09> { [ l, L, rightarrow, U00A3 ] };	// SMALL LETTER L, CAPITAL LETTER L, RIGHT ARROW, POUND STERLING
@@ -167,7 +167,7 @@ xkb_symbols "azerty"
 	key <AD01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E
 	key <AD02> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER
 	key <AD03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA
-	key <AD04> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN
+	key <AD04> { [ r, R, U25CC, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, PLACEHOLDER SYMBOL, REGISTERED SIGN
 	key <AD05> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE
 	key <AD06> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK
 	key <AD07> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR
@@ -197,13 +197,13 @@ xkb_symbols "azerty"
 partial alphanumeric_keys
 xkb_symbols "qwerty"
 {
-	name[Group1] = "English (Cameroon qwerty)";
+	name[Group1] = "Cameroon Multilingual (qwerty)";
 	include "level3(ralt_switch)"
 	include "cm(basic)"
 	key <AB01> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER
 	key <AB02> { [ x, X ] };	// SMALL LETTER X, CAPITAL LETTER X
-	key <AB03> { [ c, C, NoSymbol, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, , COPYRIGHT
-	key <AB04> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER
+	key <AB03> { [ c, C, U0327, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, CEDILLA, COPYRIGHT
+	key <AB04> { [ v, V, UA78C, UA78B ] };	// SMALL LETTER V, CAPITAL LETTER V, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)
 	key <AB05> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK
 	key <AB06> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG
 	key <AB07> { [ m, M, NoSymbol, U2122 ] };	// SMALL LETTER M, CAPITAL LETTER M, , TRADEMARK SIGN
@@ -214,8 +214,8 @@ xkb_symbols "qwerty"
 	key <AC02> { [ s, S ] };	// SMALL LETTER S, CAPITAL LETTER S
 	key <AC03> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK
 	key <AC04> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE
-	key <AC05> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)
-	key <AC06> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA
+	key <AC05> { [ g, G, U02BC, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, CURVED GLOTTAL, CAPITAL LETTER GLOTTAL (SALTILLO)
+	key <AC06> { [ h, H, U03B1, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA
 	key <AC07> { [ j, J, U0330, U0323 ] };	// SMALL LETTER J, CAPITAL LETTER J, COMBINING TILDE (NASAL) BELOW, COMBINING DOT BELOW
 	key <AC08> { [ k, K, U1DC5, U1DC7 ] };	// SMALL LETTER K, CAPITAL LETTER K, COMBINING LOW-MID TONE, COMBINING HIGH-MID
 	key <AC09> { [ l, L, U1DC6, U1DC4 ] };	// SMALL LETTER L, CAPITAL LETTER L, COMBINING MID-LOW, COMBINING MID-HIGH TONE
@@ -224,7 +224,7 @@ xkb_symbols "qwerty"
 	key <AD01> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH
 	key <AD02> { [ w, W, U1E85, U1E84 ] };	// SMALL LETTER W, CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS
 	key <AD03> { [ e, E, U0259, U018F ] };	// SMALL LETTER E, CAPITAL LETTER E, SMALL LETTER SCHWA, CAPITAL LETTER SCHWA
-	key <AD04> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN
+	key <AD04> { [ r, R, U25CC, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, PLACEHOLDER SYMBOL, REGISTERED SIGN
 	key <AD05> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE
 	key <AD06> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK
 	key <AD07> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR
@@ -251,7 +251,7 @@ xkb_symbols "qwerty"
 partial alphanumeric_keys
 xkb_symbols "dvorak"
 {
-	name[Group1] = "English (Cameroon Dvorak)";
+	name[Group1] = "Cameroon Multilingual (Dvorak)";
 	include "level3(ralt_switch)"
 	include "us(dvorak)"
 	key <AB01> { [ semicolon, colon ] };	// SEMICOLON, COLON
@@ -262,7 +262,7 @@ xkb_symbols "dvorak"
 	key <AB06> { [ b, B, U0253, U0181 ] };	// SMALL LETTER B, CAPITAL LETTER B, SMALL LETTER B WITH HOOK, CAPITAL LETTER B WITH HOOK
 	key <AB07> { [ m, M, NoSymbol, U2122 ] };	// SMALL LETTER M, CAPITAL LETTER M, , TRADEMARK SIGN
 	key <AB08> { [ w, W, U1E85, U1E84 ] };	// SMALL LETTER W, CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS
-	key <AB09> { [ v, V, U25CC, NoSymbol ] };	// SMALL LETTER V, CAPITAL LETTER V, PLACEHOLDER CHARACTER
+	key <AB09> { [ v, V, UA78C, UA78B ] };	// SMALL LETTER V, CAPITAL LETTER V, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)
 	key <AB10> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER
 	key <AC01> { [ a, A, U025B, U0190 ] };	// SMALL LETTER A, CAPITAL LETTER A, SMALL LETTER OPEN E, CAPITAL LETTER OPEN E
 	key <AC02> { [ o, O, U0254, U0186 ] };	// SMALL LETTER O, CAPITAL LETTER O, SMALL LETTER OPEN O, CAPITAL LETTER OPEN O
@@ -270,7 +270,7 @@ xkb_symbols "dvorak"
 	key <AC04> { [ u, U, U0289, U0244 ] };	// SMALL LETTER U, CAPITAL LETTER U, SMALL LETTER U BAR, CAPITAL LETTER U BAR
 	key <AC05> { [ i, I, U0268, U0197 ] };	// SMALL LETTER I, CAPITAL LETTER I, SMALL LETTER I BAR, CAPITAL LETTER I BAR
 	key <AC06> { [ d, D, U0257, U018A ] };	// SMALL LETTER D, CAPITAL LETTER D, SMALL LETTER D WITH HOOK, CAPITAL LETTER D WITH HOOK
-	key <AC07> { [ h, H, U0251, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA
+	key <AC07> { [ h, H, U03B1, U2C6D ] };	// SMALL LETTER H, CAPITAL LETTER H, SMALL LETTER ALPHA, CAPITAL LETTER ALPHA
 	key <AC08> { [ t, T, U0153, U0152 ] };	// SMALL LETTER T, CAPITAL LETTER T, SMALL LIGATURE OE, CAPITAL LIGATURE OE
 	key <AC09> { [ n, N, U014B, U014A ] };	// SMALL LETTER N, CAPITAL LETTER N, SMALL LETTER ENG, CAPITAL LETTER ENG
 	key <AC10> { [ s, S ] };	// SMALL LETTER S, CAPITAL LETTER S
@@ -281,9 +281,9 @@ xkb_symbols "dvorak"
 	key <AD04> { [ p, P, U00F8, U00D8 ] };	// SMALL LETTER P, CAPITAL LETTER P, SMALL LETTER O BAR, CAPITAL LETTER O BAR
 	key <AD05> { [ y, Y, U01B4, U01B3 ] };	// SMALL LETTER Y, CAPITAL LETTER Y, SMALL LETTER Y WITH HOOK, CAPITAL LETTER Y WITH HOOK
 	key <AD06> { [ f, F, U00E6, U00C6 ] };	// SMALL LETTER F, CAPITAL LETTER F, SMALL LIGATURE AE, CAPITAL LIGATURE AE
-	key <AD07> { [ g, G, UA78C, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, SMALL LETTER GLOTTAL (SALTILLO), CAPITAL LETTER GLOTTAL (SALTILLO)
-	key <AD08> { [ c, C, NoSymbol, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, , COPYRIGHT
-	key <AD09> { [ r, R, NoSymbol, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, , REGISTERED SIGN
+	key <AD07> { [ g, G, U02BC, UA78B ] };	// SMALL LETTER G, CAPITAL LETTER G, CURVED GLOTTAL, CAPITAL LETTER GLOTTAL (SALTILLO)
+	key <AD08> { [ c, C, U0327, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, CEDILLA, COPYRIGHT
+	key <AD09> { [ r, R, U25CC, U00AE ] };	// SMALL LETTER R, CAPITAL LETTER R, PLACEHOLDER SYMBOL, REGISTERED SIGN
 	key <AD10> { [ l, L, U1DC6, U1DC4 ] };	// SMALL LETTER L, CAPITAL LETTER L, COMBINING MID-LOW, COMBINING MID-HIGH TONE
 	key <AD11> { [ slash, U003F, U00F7, U0294 ] };	// SLASH, QUESTION MARK, DIVISION SIGN, GLOTTAL STOP
 	key <AD12> { [ equal, plus, NoSymbol, plusminus ] };	// EQUAL, PLUS, , PLUS-MINUS
diff --git a/dist/xkeyboard-config/symbols/ctrl b/dist/xkeyboard-config/symbols/ctrl
index 96a1cbcb9..09d76b551 100644
--- a/dist/xkeyboard-config/symbols/ctrl
+++ b/dist/xkeyboard-config/symbols/ctrl
@@ -21,7 +21,7 @@ xkb_symbols "swapcaps" {
 // to the bottom row.  Only works if the geometry or keycodes
 // file has defined appropriate aliases for the keys in question.
 partial modifier_keys 
-xkb_symbols "ctrl_ac" {
+xkb_symbols "ac_ctrl" {
     replace key <AC00>	{  [ Control_L ] };
     replace key <AA00>	{  [ Caps_Lock ] };
 };
@@ -30,20 +30,28 @@ xkb_symbols "ctrl_ac" {
 // to the middle row.  Only works if the geometry or keycodes
 // file has defined appropriate aliases for the keys in question.
 partial modifier_keys 
-xkb_symbols "ctrl_aa" {
+xkb_symbols "aa_ctrl" {
     replace key <AA00>	{  [ Control_L ] };
     replace key <AC00>	{  [ Caps_Lock ] };
 };
 
 // Right Ctrl works as Right Alt
 partial modifier_keys 
-xkb_symbols "ctrl_ra" {
+xkb_symbols "rctrl_ralt" {
     key <RCTL>	{  symbols[Group1]= [ Alt_R ] };
 };
 
 // Menu works as Right Ctrl
 partial modifier_keys
-xkb_symbols "ctrl_menu" {
+xkb_symbols "menu_rctrl" {
   replace key <MENU> { [ Control_R, Control_R ] };
   modifier_map Control { Control_L, <MENU> };
 };
+
+// right alt functions as another ctrl key
+partial modifier_keys 
+xkb_symbols "ralt_rctrl" {
+    replace key <RALT> { type[Group1]    = "TWO_LEVEL",
+                         symbols[Group1] = [ Control_R, Control_R ] };
+    modifier_map Control { <RALT> }; 
+};
diff --git a/dist/xkeyboard-config/symbols/cz b/dist/xkeyboard-config/symbols/cz
index 2d8680ca9..31352efed 100644
--- a/dist/xkeyboard-config/symbols/cz
+++ b/dist/xkeyboard-config/symbols/cz
@@ -80,15 +80,21 @@ xkb_symbols "bksl" {
 partial alphanumeric_keys 
 xkb_symbols "qwerty" {
  
-    // This layout should work exactly as a cz with the exception 
-    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
-    // 2001 by Kamil Toman <ktoman@email.cz>
+    // This layout represent actual keyboard layout. It complies with symbols
+    // printed on keys.
+    // -----------------------------------------------------------------------
+    // This layout was created in 2011 by Lukáš Mojžíš <lmojzis@grenames.cz>
     
     include "cz(basic)"
     name[Group1]= "Czech (qwerty)";
 
-    key <AB01>	{ [         z,          Z,       degree,     NoSymbol ]	};
-    key <AD06>	{ [         y,          Y,     NoSymbol,     NoSymbol ]	};
+    key <AB01>	{ [         z,          Z,       degree,         NoSymbol ] };
+    key <AC10>	{ [     uring,   quotedbl,    semicolon,         NoSymbol ] };
+    key <AD06>	{ [         y,          Y,     NoSymbol,         NoSymbol ] };
+    key <AD11>	{ [    uacute,      slash,  bracketleft,        braceleft ] };
+    key <AD12>	{ [parenright,  parenleft, bracketright,       braceright ] };
+    key <AE09>	{ [    iacute,          9,    parenleft,       dead_acute ] };
+    key <AE10>	{ [    eacute,          0,   parenright, dead_doubleacute ] };
 };
 
 // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
diff --git a/dist/xkeyboard-config/symbols/de b/dist/xkeyboard-config/symbols/de
index e7f8f3257..3ed01b68f 100644
--- a/dist/xkeyboard-config/symbols/de
+++ b/dist/xkeyboard-config/symbols/de
@@ -64,7 +64,6 @@ xkb_symbols "nodeadkeys" {
     key <AC10>	{ [odiaeresis, Odiaeresis,  doubleacute,  doubleacute ]	};
     key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,  asciicircum ]	};
     key <BKSL>	{ [numbersign, apostrophe,        grave,        grave ]	};
-    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
 };
 
 partial alphanumeric_keys
@@ -221,7 +220,6 @@ xkb_symbols "sundeadkeys" {
 //
 //      http://www.neo-layout.org
 //
-// $Revision: 1.5 $, $Date: 2011/07/01 14:25:25 $
 
 partial alphanumeric_keys modifier_keys keypad_keys
 xkb_symbols "neo_base" {
@@ -485,21 +483,6 @@ xkb_symbols "dsb_qwertz"
 	key <AD09> { [              o,              O,         oacute,         Oacute ] };
 };
 
-partial alphanumeric_keys 
-xkb_symbols "qwerty" {
- 
-    // This layout should work exactly as a de with the exception 
-    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
-    // 2008 by Matej Košík <kosik@fiit.stuba.sk>
-    
-    include "de(basic)"
-
-    name[Group1] = "German (qwerty)";
-
-    key <AB01>	{ [         z,          Z,     leftarrow,         yen ]	};
-    key <AD06>	{ [         y,          Y, guillemotleft,        less ]	};
-};
-
 // layout for Russian letters on an german keyboard
 // based on US-RU layout by Ivan Popov <pin@konvalo.org> 2005-07-17
 // adopted for german layout by Alexey Fisher <bug-track@fisher-privat.net> 2010-08-19
@@ -594,3 +577,50 @@ xkb_symbols "htcdream" {
 
         include "level3(alt_switch)"
 };
+
+// EXTRAS:
+
+partial alphanumeric_keys
+xkb_symbols "us" {
+    include "us"
+
+    name[Group1]="German (US keyboard with German letters)";
+
+    key <AC01> { [           a,          A, adiaeresis, Adiaeresis ] };
+    key <AC02> { [           s,          S,     ssharp,     ssharp ] };
+    key <AC10> { [   semicolon,      colon, odiaeresis, Odiaeresis ] };
+    key <AC11> { [  apostrophe,   quotedbl, adiaeresis, Adiaeresis ] };
+    key <AD03> { [           e,          E,   EuroSign,   EuroSign ] };
+    key <AD07> { [           u,          U, udiaeresis, Udiaeresis ] };
+    key <AD09> { [           o,          O, odiaeresis, Odiaeresis ] };
+    key <AD11> { [ bracketleft,  braceleft, udiaeresis, Udiaeresis ] };
+    key <AE03> { [           3, numbersign,    section,    section ] };
+    key <AE11> { [       minus, underscore,     ssharp,   question ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "hu" {
+
+    // modify the basic German layout to not have any dead keys and add Hungarian letters
+
+    include "de(basic)"
+    name[Group1]="German (with Hungarian letters and no dead keys)";
+
+    key <AB01> { [         y,          Y, guillemotleft,        less ] };
+    key <AC10> { [odiaeresis, Odiaeresis,        eacute,      Eacute ] };
+    key <AC11> { [adiaeresis, Adiaeresis,        aacute,       Aacute] };
+    key <AD03> { [         e,          E,      EuroSign,    EuroSign ] };
+    key <AD06> { [         z,          Z,     leftarrow,         yen ] };
+    key <AD07> { [         u,          U,        uacute,      Uacute ] };
+    key <AD08> { [         i,          I,        iacute,      Iacute ] };
+    key <AD09> { [         o,          O,  odoubleacute,Odoubleacute ] };
+    key <AD11> { [udiaeresis, Udiaeresis,  udoubleacute,Udoubleacute ] };
+    key <AD12> { [      plus,   asterisk,    asciitilde,      macron ] };
+    key <AE12> { [     acute,      grave,        oacute,      Oacute ] };
+    key <BKSL> { [numbersign, apostrophe,         grave,       grave ] };
+    key <TLDE> { [asciicircum,    degree,       notsign,     notsign ] };
+    
+    
+};
diff --git a/dist/xkeyboard-config/symbols/digital_vndr/Makefile.in b/dist/xkeyboard-config/symbols/digital_vndr/Makefile.in
index f814af811..57f37587e 100644
--- a/dist/xkeyboard-config/symbols/digital_vndr/Makefile.in
+++ b/dist/xkeyboard-config/symbols/digital_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = symbols/digital_vndr
 DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(symbolsdir)"
 DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/symbols/ee b/dist/xkeyboard-config/symbols/ee
index fe1092eab..e171b78ad 100644
--- a/dist/xkeyboard-config/symbols/ee
+++ b/dist/xkeyboard-config/symbols/ee
@@ -30,6 +30,7 @@ xkb_symbols "basic" {
     key <AB01>	{ [         z,          Z,       zcaron,       Zcaron ]	};
     key <AB08>	{ [     comma,  semicolon,         less,     multiply ]	};
     key <AB09>	{ [    period,      colon,      greater,     division ]	};
+    key <AB10>	{ [     minus, underscore,          bar,     abovedot ] };
 
     include "level3(ralt_switch)"
     include "eurosign(e)"
diff --git a/dist/xkeyboard-config/symbols/fujitsu_vndr/Makefile.in b/dist/xkeyboard-config/symbols/fujitsu_vndr/Makefile.in
index 1fa440196..19bed391b 100644
--- a/dist/xkeyboard-config/symbols/fujitsu_vndr/Makefile.in
+++ b/dist/xkeyboard-config/symbols/fujitsu_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = symbols/fujitsu_vndr
 DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(symbolsdir)"
 DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/symbols/hp_vndr/Makefile.in b/dist/xkeyboard-config/symbols/hp_vndr/Makefile.in
index 55cc7b946..3fe216391 100644
--- a/dist/xkeyboard-config/symbols/hp_vndr/Makefile.in
+++ b/dist/xkeyboard-config/symbols/hp_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = symbols/hp_vndr
 DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(symbolsdir)"
 DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/symbols/in b/dist/xkeyboard-config/symbols/in
index 822c12a21..84d9b06f8 100644
--- a/dist/xkeyboard-config/symbols/in
+++ b/dist/xkeyboard-config/symbols/in
@@ -11,6 +11,11 @@
 // Links:
 // - Indic INSCRIPT keyboard layout diagrams:
 //     http://java.sun.com/products/jfc/tsc/articles/InputMethod/indiclayout.html
+// - Bengali Baishakhi (Bengali layouts):
+// - Bengali Baishakhi Inscript (Bengali layouts):
+// - Bengali Bornona (Bengali layouts):
+// - Uni Gitanjali (Bengali layouts):
+//     http://nltr.org
 // - Ekusheyr Shadhinota (Bengali layouts):
 //     http://ekushey.org/projects/shadhinota/index.html
 // - Microsoft Windows XP SP2: Indic Language Standards - an Introduction:
@@ -167,7 +172,7 @@ xkb_symbols "bolnagri" {
 
 partial alphanumeric_keys
 xkb_symbols "ben" {
-    name[Group1]= "Bengali";
+    name[Group1]= "Bengali (India)";
 
       // Mainly numbers.
       key <AE01> { [      U09E7 		]	};
@@ -232,7 +237,7 @@ xkb_symbols "ben" {
 };
 
 xkb_symbols "ben_probhat" {
- name[Group1]= "Bengali (Probhat)";
+ name[Group1]= "Bengali (India, Probhat)";
    key <ESC>  { [ Escape ] };
 
 // numbers
@@ -304,6 +309,304 @@ xkb_symbols "ben_probhat" {
 
 };
 
+// Bengali Baishakhi, Bengali Baishakhi Inscript, Bengali Bornona, Uni Gitanjali Layouts are added by Promathesh Mandal <promathesh812004@gmail.com>
+
+xkb_symbols "ben_baishakhi" {
+ name[Group1]= "Bengali (India, Baishakhi)";
+   key <ESC>   { [ Escape 					] };
+
+// numbers
+   key <TLDE> { [ 0x100200D, 0x100200C	] };
+   key <AE01> { [ 0x10009E7, exclam		] };
+   key <AE02> { [ 0x10009E8, at		] };
+   key <AE03> { [ 0x10009E9, numbersign	] };
+   key <AE04> { [ 0x10009EA, dollar, 0x10009F2	] };
+   key <AE05> { [ 0x10009EB, percent		] };
+   key <AE06> { [ 0x10009EC, asciicircum, 0x10009D7    ] };
+   key <AE07> { [ 0x10009ED, ampersand ] };
+   key <AE08> { [ 0x10009EE,   asterisk,0x10009FA       		] };
+   key <AE09> { [ 0x10009EF, parenleft    	] };
+   key <AE10> { [ 0x10009E6, parenright   	] };
+   key <AE11> { [ minus, underscore   	] };
+   key <AE12> { [ equal,     plus 	] };
+   key <BKSP> { [ BackSpace               		] };
+
+// tab, q to ] 
+   key <TAB>   { [   Tab,  ISO_Left_Tab		] };
+   key <AD01> { [   0x10009A1,  0x10009A2  ] };
+   key <AD02> { [  0x10009C0 ,  0x10009C2  ] };
+   key <AD03> { [   0x10009C7,  0x100098F, 0x1000990 ] };
+   key <AD04> { [   0x10009B0 , 0x10009C3, 0x100098B             		] };
+   key <AD05> { [   0x100099F,  0x10009A0	] };
+   key <AD06> { [   0x10009AF,  0x10009DF	] };
+   key <AD07> { [   0x10009C1,  0x1000989, 0x100098A  ] };
+   key <AD08> { [   0x10009BF,  0x1000987, 0x1000988  ] };
+   key <AD09> { [   0x10009CB,  0x1000993, 0x1000994	] };
+   key <AD10> { [   0x10009AA,  0x10009AB	] };
+   key <AD11> { [   bracketleft,  braceleft] };
+   key <AD12> { [   bracketright,	braceright	] };
+   key <RTRN> { [   Return                 		] };
+
+// caps, a to ' 
+// key <CAPS> { [   Caps_Lock            		] };
+   key <AC01> { [   0x10009BE,  0x1000985, 0x1000986  ] };
+   key <AC02> { [   0x10009B8,  0x10009B6,  0x10009B7  ] };
+   key <AC03> { [   0x10009A6,  0x10009A7  ] };
+   key <AC04> { [   0x10009A4,   0x10009A5, 0x10009CE  ] };
+   key <AC05> { [   0x1000997,  0x1000998	] };
+   key <AC06> { [   0x10009CD,  0x10009B9, 0x1000983  ] };
+   key <AC07> { [   0x100099C,  0x100099D	] };
+   key <AC08> { [   0x1000995,  0x1000996  	] };
+  key <AC09> { [   0x10009B2,  0x1000964, 0x100098C  ] };
+   key <AC10> { [   semicolon,  colon  	] };
+   key <AC11> { [   quoteright, quotedbl   	] };
+
+// shift, z to /
+// key <LFSH> { [   Shift_L              			] };
+   key <AB01> { [   0x10009C8, 0x10009CC              		] };
+   key <AB02> { [   0x10009DC, 0x10009DD              		] };
+   key <AB03> { [   0x100099A,  0x100099B  ] };
+   key <AB04> { [   0x10009F1,  0x10009F0	] };
+   key <AB05> { [   0x10009AC,  0x10009AD  ] };
+   key <AB06> { [   0x10009A8,  0x10009A3, 0x100099E  ] };
+   key <AB07> { [   0x10009AE,  0x1000999, 0x1000981  ] };
+   key <AB08> { [   comma,      less	] };
+   key <AB09> { [    period,	greater,0x10009BC 		] };
+   key <AB10> { [   slash,  question, 0x1000982   	] };
+   key <BKSL> { [   backslash,        bar	] };
+
+// third level with right-alt
+    include "level3(ralt_switch)"
+
+//   key <LCTL> { [   Control_L              ] };
+//   key <SPCE> { [   space                  ] };
+
+//   modifier_map Shift  { Shift_L };
+//   modifier_map Lock   { Caps_Lock };
+//   modifier_map Control{ Control_L };
+
+
+};
+
+xkb_symbols "ben_inscript" {
+    name[Group1]= "Bengali (India, Baishakhi Inscript)";
+
+      // Mainly numbers.
+      key <TLDE> { [      0x100200D, 0x100200C	] 	};
+      key <AE01> { [      0x10009E7  		]	};
+      key <AE02> { [      0x10009E8 		]	};
+      key <AE03> { [      0x10009E9 		]	};
+      key <AE04> { [      0x10009EA 		]	};
+      key <AE05> { [      0x10009EB		]	};
+      key <AE06> { [      0x10009EC 		]	};
+      key <AE07> { [      0x10009ED	        ]	};
+      key <AE08> { [      0x10009EE 		]	};
+      key <AE09> { [      0x10009EF, parenleft	]	};
+      key <AE10> { [      0x10009E6, parenright	]	};
+      key <AE11> { [      minus, 0x1000983 	]	};
+      key <AE12> { [      0x10009C3, 0x100098B 	]	};
+
+// Mainly long vowels
+
+      key <AD01> { [      0x10009CC,  0x1000994	]	};
+      key <AD02> { [      0x10009C8,  0x1000990	]	};
+      key <AD03> { [      0x10009BE,  0x1000986	]	};
+      key <AD04> { [      0x10009C0,  0x1000988	]	};
+      key <AD05> { [      0x10009C2,  0x100098A	]	};
+
+// Mainly voiced consonants
+
+      key <AD06> { [      0x10009AC,  0x10009AD	]	};
+      key <AD07> { [      0x10009B9,  0x1000999 ]	};
+      key <AD08> { [      0x1000997,  0x1000998 ]	};
+      key <AD09> { [      0x10009A6,  0x10009A7 ]	};
+      key <AD10> { [      0x100099C,  0x100099D ]	};
+      key <AD11> { [      0x10009A1,  0x10009A2 ]	};
+      key <AD12> { [      0x10009BC,  0x100099E ]	};
+
+// Mainly short vowels
+      key <AC01> { [      0x10009CB,  0x1000993 ]	};
+      key <AC02> { [      0x10009C7,  0x100098F ]	};
+      key <AC03> { [      0x10009CD,  0x1000985 ]	};
+      key <AC04> { [      0x10009BF,  0x1000987 ]	};
+      key <AC05> { [      0x10009C1,  0x1000989 ]	};
+
+
+// Mainly unvoiced consonants
+
+      key <AC06> { [      0x10009AA,  0x10009AB ]	};
+      key <AC07> { [      0x10009B0,  0x10009DD ]	};
+      key <AC08> { [      0x1000995,  0x1000996 ]	};
+      key <AC09> { [      0x10009A4,  0x10009A5 ]	};
+      key <AC10> { [      0x100099A,  0x100099B ]	};
+      key <AC11> { [      0x100099F, 0x10009A0 	]	};
+      key <BKSL> { [      backslash, bar 	]	};
+
+      key <AB01> { [      0x10009CE  		]       };
+      key <AB02> { [      0x1000982,  0x1000981 ]       };
+      key <AB03> { [      0x10009AE,  0x10009A3 ]       };
+      key <AB04> { [      0x10009A8,  0x10009A8 ]       };
+      key <AB05> { [      0x10009AC,  0x10009AC ]       };
+      key <AB06> { [      0x10009B2,  0x10009B2 ]       };
+      key <AB07> { [      0x10009B8,  0x10009B6 ]       };
+      key <AB08> { [      comma,      0x10009B7 ]       };
+      key <AB09> { [      period,     0x1000964 ]       };
+      key <AB10> { [      0x10009DF,  0x10009AF	]       };
+};
+
+xkb_symbols "ben_gitanjali" {
+ name[Group1]= "Bengali (India, Uni Gitanjali)";
+   key <ESC>   { [ Escape			] };
+
+// numbers
+   key <TLDE> { [ colon, question	] };
+   key <AE01> { [ 0x10009E7, 0x10009CE	] };
+   key <AE02> { [ 0x10009E8, quoteright	] };
+   key <AE03> { [ 0x10009E9, numbersign	] };
+   key <AE04> { [ 0x10009EA, 0x10009F3	] };
+   key <AE05> { [ 0x10009EB, slash	] };
+   key <AE06> { [ 0x10009EC, period	] };
+   key <AE07> { [ 0x10009ED, ampersand 	] };
+   key <AE08> { [ 0x10009EE, asterisk 	] };
+   key <AE09> { [ 0x10009EF, parenleft  ] };
+   key <AE10> { [ 0x10009E6, parenright	] };
+   key <AE11> { [ minus, 0x1000983   	] };
+   key <AE12> { [ 0x10009C3, 0x100098B 	] };
+   key <BKSP> { [ BackSpace		] };
+
+// tab, q to ] 
+   key <TAB>   { [   Tab,  ISO_Left_Tab	] };
+   key <AD01> { [   0x10009D7,  0x1000994 ] };
+   key <AD02> { [   0x10009C8,  0x1000990 ] };
+   key <AD03> { [   0x10009BE,  0x1000985 ] };
+   key <AD04> { [   0x10009C0,  0x1000988 ] };
+   key <AD05> { [   0x10009C2,  0x100098A ] };
+   key <AD06> { [   0x10009AC,  0x10009AD ] };
+   key <AD07> { [   0x10009B9,  0x1000999 ] };
+   key <AD08> { [   0x1000997,  0x1000998 ] };
+   key <AD09> { [   0x10009A6,  0x10009A7 ] };
+   key <AD10> { [   0x100099C,  0x100099D ] };
+   key <AD11> { [   0x10009A1,  0x10009A2 ] };
+   key <AD12> { [   0x100200C,  0x100099E ] };
+   key <RTRN> { [   Return		  ] };
+
+// caps, a to ' 
+// key <CAPS> { [   Caps_Lock            		] };
+   key <AC01> { [   0x100200D,  0x1000993 ] };
+   key <AC02> { [   0x10009C7,  0x100098F ] };
+   key <AC03> { [   0x10009CD		  ] };
+   key <AC04> { [   0x10009BF,  0x1000987 ] };
+   key <AC05> { [   0x10009C1,  0x1000989 ] };
+   key <AC06> { [   0x10009AA,  0x10009AB ] };
+   key <AC07> { [   0x10009B0,  0x10009F0 ] };
+   key <AC08> { [   0x1000995,  0x1000996 ] };
+   key <AC09> { [   0x10009A4,  0x10009A5 ] };
+   key <AC10> { [   0x100099A,  0x100099B ] };
+   key <AC11> { [   0x100099F,  0x10009A0 ] };
+
+// shift, z to /
+// key <LFSH> { [   Shift_L              			] };
+   key <AB01> { [   0x10009C7, 0x100098F ] };
+   key <AB02> { [   0x1000982, 0x1000981 ] };
+   key <AB03> { [   0x10009AE, 0x10009A3 ] };
+   key <AB04> { [   0x10009A8, 0x10009DC ] };
+   key <AB05> { [   0x10009F1, 0x10009DD ] };
+   key <AB06> { [   0x10009B2		 ] };
+   key <AB07> { [   0x10009B8, 0x10009B6 ] };
+   key <AB08> { [   comma,     0x10009B7 ] };
+   key <AB09> { [   0x1000964, 0x10009FA ] };
+   key <AB10> { [   0x10009AF, 0x10009DF ] };
+   key <BKSL> { [   backslash, bar	 ] };
+
+// third level with right-win
+//    include "level3(lwin_switch)"
+
+//   key <LCTL> { [   Control_L              ] };
+//   key <SPCE> { [   space                  ] };
+
+//   modifier_map Shift  { Shift_L };
+//   modifier_map Lock   { Caps_Lock };
+//   modifier_map Control{ Control_L };
+
+
+};
+
+
+xkb_symbols "ben_bornona" {
+ name[Group1]= "Bengali (India, Bornona)";
+   key <ESC>  { [ Escape 					] };
+
+// numbers
+   key <TLDE> { [ 0x100200D, 0x100200C   	] };
+   key <AE01> { [ 0x10009E7, exclam         	] };
+   key <AE02> { [ 0x10009E8, 0x1000981 	] };
+   key <AE03> { [ 0x10009E9, numbersign   	] };
+   key <AE04> { [ 0x10009EA, 0x10009F3    	] };
+   key <AE05> { [ 0x10009EB, percent      	] };
+   key <AE06> { [ 0x10009EC, 0x1000983    	] };
+   key <AE07> { [ 0x10009ED, 0x10009CE	] };
+   key <AE08> { [ 0x10009EE, asterisk		] };
+   key <AE09> { [ 0x10009EF, parenleft    	] };
+   key <AE10> { [ 0x10009E6, parenright	] };
+   key <AE11> { [ minus,	   underscore	] };
+   key <AE12> { [ equal,          plus			] };
+   key <BKSP> { [ BackSpace               		] };
+
+// tab, q to ] 
+   key <TAB>   { [   Tab,  	ISO_Left_Tab	] };
+   key <AD01> { [   0x1000982,  0x1000999, 0x10009D7	] };
+   key <AD02> { [   0x10009A2,  0x10009A0, 0x100098A ] };
+   key <AD03> { [   0x10009C7,  0x10009C8, 0x1000988	] };
+   key <AD04> { [   0x10009B0,  0x10009C3, 0x100098B	] };
+   key <AD05> { [   0x10009A4,  0x100099F	] };
+   key <AD06> { [   0x10009A7,  0x10009A5, 0x100098F  ] };
+   key <AD07> { [   0x10009C1,  0x10009C2, 0x1000989	] };
+   key <AD08> { [   0x10009BF,  0x10009C0, 0x1000987	] };
+   key <AD09> { [   0x10009CB,  0x10009CC, 0x1000993	] };
+   key <AD10> { [   0x10009AA, 0x1000990, 0x1000994		] };
+   key <AD11> { [   0x100005B,  0x100007B, 0x10009DC  ] };
+   key <AD12> { [   0x100005D,  0x100007D  ] };
+   key <RTRN> { [   Return					] };
+
+// caps, a to ' 
+// key <CAPS> { [   Caps_Lock            		] };
+   key <AC01> { [   0x10009BE,  0x1000985, 0x10009F4  ] };
+   key <AC02> { [   0x10009B8,  0x10009B6, 0x10009F5  ] };
+   key <AC03> { [   0x10009A6,  0x10009A1, 0x10009F8  ] };
+   key <AC04> { [   0x10009AB				] };
+   key <AC05> { [   0x1000997,  0x1000998	] };
+   key <AC06> { [   0x10009CD, 0x10009B9	] };
+   key <AC07> { [   0x100099C,  0x100099D	] };
+   key <AC08> { [   0x1000995,  0x1000996	] };
+   key <AC09> { [   0x10009B2,  0x1000964  ] };
+   key <AC10> { [   semicolon,  0x100003A	] };
+   key <AC11> { [   quoteright, quotedbl   	] };
+
+// shift, z to /
+// key <LFSH> { [   Shift_L              			] };
+   key <AB01> { [   0x10009AF, 0x10009DC	] };
+   key <AB02> { [   0x10009B7, 0x10009DD, 0x10009FA	] };
+   key <AB03> { [   0x100099A,  0x100099B  ] };
+   key <AB04> { [   0x10009AD				] };
+   key <AB05> { [   0x10009AC,  0x10009DF	] };
+   key <AB06> { [   0x10009A8,  0x10009A3	] };
+   key <AB07> { [   0x10009AE,  0x100099E	] };
+   key <AB08> { [   comma,      0x100003C	] };
+   key <AB09> { [   0x100002E,  0x100003E  ] };
+   key <AB10> { [   0x100002F,  question   	] };
+   key <BKSL> { [   0x10009F1,  0x10009F0	] };
+
+//   key <LCTL> { [   Control_L              ] };
+//   key <SPCE> { [   space                  ] };
+
+//   modifier_map Shift  { Shift_L };
+//   modifier_map Lock   { Caps_Lock };
+//   modifier_map Control{ Control_L };
+// third level with right-alt
+    include "level3(ralt_switch)"
+
+};
+
 partial alphanumeric_keys 
 xkb_symbols "guj" {
       name[Group1]= "Gujarati";
diff --git a/dist/xkeyboard-config/symbols/jp b/dist/xkeyboard-config/symbols/jp
index 5b5db626c..30658834f 100644
--- a/dist/xkeyboard-config/symbols/jp
+++ b/dist/xkeyboard-config/symbols/jp
@@ -118,7 +118,7 @@ xkb_symbols "OADG109A" {
 partial alphanumeric_keys
 xkb_symbols "kana86" {
 
-    include "pc(function)"
+    include "srvr_ctrl(fkey2vt)"
     include "pc(editing)"
     include "keypad(numoperdecsep)"
     include "altwin(menu)"
diff --git a/dist/xkeyboard-config/symbols/keypad b/dist/xkeyboard-config/symbols/keypad
index 40afe4f16..e85aaacbd 100644
--- a/dist/xkeyboard-config/symbols/keypad
+++ b/dist/xkeyboard-config/symbols/keypad
@@ -84,19 +84,19 @@ xkb_symbols "x11" {
 // Ungrab cancels server/keyboard/pointer grabs
     key <KPDV> {
         type="CTRL+ALT",
-        symbols[Group1]= [ KP_Divide,	XF86_Ungrab ]
+        symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
     };
 
 // ClsGrb kills whichever client has a grab in effect
     key <KPMU> {
         type="CTRL+ALT",
-        symbols[Group1]= [ KP_Multiply,	XF86_ClearGrab ]
+        symbols[Group1]= [ KP_Multiply,	VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
     };
 
 // -VMode switches to the previous video mode
     key <KPSU> {
         type="CTRL+ALT",
-        symbols[Group1]= [ KP_Subtract,	XF86_Prev_VMode ]
+        symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
     };
 
     key  <KP7> {	[  KP_Home,	KP_7	]	};
@@ -106,7 +106,7 @@ xkb_symbols "x11" {
 // +VMode switches to the next video mode
     key <KPAD> {
         type="CTRL+ALT",
-        symbols[Group1]= [ KP_Add,	XF86_Next_VMode ]
+        symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ]
     };
 
     key  <KP4> {	[  KP_Left,	KP_4	]	};
@@ -242,11 +242,11 @@ xkb_symbols "legacymath" {
 
     key.type[Group1]="CTRL+ALT" ;
 
-    key <KPDV> { [   KP_Divide,     XF86_Ungrab ] }; // / <XF86_Ungrab>
-    key <KPMU> { [ KP_Multiply,  XF86_ClearGrab ] }; // * <XF86_ClearGrab>
-    key <KPSU> { [ KP_Subtract, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
+    key <KPDV> { [   KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] }; // / <XF86_Ungrab>
+    key <KPMU> { [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] }; // * <XF86_ClearGrab>
+    key <KPSU> { [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
 
-    key <KPAD> { [      KP_Add, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
+    key <KPAD> { [      KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
 
 };
 
@@ -602,7 +602,7 @@ xkb_symbols "numoperdecsep" {
 // ClsGrb kills whichever client has a grab in effect
     key <KOMU> {
         type="CTRL+ALT",
-        symbols[Group1]= [ KP_Multiply,	XF86_ClearGrab ]
+        symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
     };
 
     key  <KO4> {	[  KP_4	]	};
@@ -611,7 +611,7 @@ xkb_symbols "numoperdecsep" {
 // -VMode switches to the previous video mode
     key <KOSU> {
         type="CTRL+ALT",
-        symbols[Group1]= [ KP_Subtract,	XF86_Prev_VMode ]
+        symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
     };
 
     key  <KO1> {	[  KP_1	]	};
@@ -620,7 +620,7 @@ xkb_symbols "numoperdecsep" {
 // +VMode switches to the next video mode
     key <KOAD> {
         type="CTRL+ALT",
-        symbols[Group1]= [ KP_Add,	XF86_Next_VMode ]
+        symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ]
     };
 
     key  <KO0> {	[  KP_0	]	};
@@ -628,6 +628,6 @@ xkb_symbols "numoperdecsep" {
 // Ungrab cancels server/keyboard/pointer grabs
     key <KODV> {
         type="CTRL+ALT",
-        symbols[Group1]= [ KP_Divide,	XF86_Ungrab ]
+        symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
     };
 };
diff --git a/dist/xkeyboard-config/symbols/lk b/dist/xkeyboard-config/symbols/lk
index c1a16abdd..356e060fe 100644
--- a/dist/xkeyboard-config/symbols/lk
+++ b/dist/xkeyboard-config/symbols/lk
@@ -1,6 +1,6 @@
 // X Keyboard Extension file for Sinhala (Sri Lanka) (2004-04-22)
 // Maintainer  : Harshula Jayasuriya <harshula@gmail.com>
-// Last Updated: 2011-03-20
+// Last Updated: 2011-05-25
 // This is a phonetic static mapping for a standard US-English keyboard
 // (qwerty)
 // http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html
@@ -32,8 +32,7 @@ partial default alphanumeric_keys
 xkb_symbols "sin_phonetic" {
 
   include "us"
-// it is default - no details in the name
-  name[Group1] = "Sinhala";
+  name[Group1] = "Sinhala (phonetic)";
   key.type[Group1] = "FOUR_LEVEL";
 
   // q - p
diff --git a/dist/xkeyboard-config/symbols/lv b/dist/xkeyboard-config/symbols/lv
index 77a9458b0..6bd15e60d 100644
--- a/dist/xkeyboard-config/symbols/lv
+++ b/dist/xkeyboard-config/symbols/lv
@@ -299,18 +299,18 @@ xkb_symbols "modern" {
 	key <AC08> {[ i,		I,		i,		I			]};
 	key <AC09> {[ t,		T,		t,		T			]};
 	key <AC10> {[ r,		R,		rcedilla,	Rcedilla		]};
-	key <AC11> {[ m,		M,		bar,		M			]};
-	key <AC12> {[ slash,		question,	backslash,	U263A			]};
+	key <AC11> {[ m,		M,		m,		M			]};
+	key <BKSL> {[ slash,		question,	backslash,	bar			]};
 
 	key <LSGT> {[ q,		Q,		q,		Q			]};
 	key <AB01> {[ x,		X,		q,		Q			]};
 	key <AB02> {[ z,		Z,		zcaron,		Zcaron			]};
 	key <AB03> {[ c,		C,		ccaron,		Ccaron			]};
-	key <AB04> {[ v,		V,		v,		V			]};
-	key <AB05> {[ w,		W,		w,		W			]};
-	key <AB06> {[ f,		F,		f,		F			]};
-	key <AB07> {[ y,		Y,		y,		Y			]};
-	key <AB08> {[ h,		H,		h,		H			]};
+	key <AB04> {[ v,		V,		period,		V			]};
+	key <AB05> {[ w,		W,		slash,		W			]};
+	key <AB06> {[ f,		F,		bar,		F			]};
+	key <AB07> {[ y,		Y,		backslash,	Y			]};
+	key <AB08> {[ h,		H,		U263A,		U2639			]};
 	key <AB09> {[ comma,		semicolon,	less,		multiply		]};
 	key <AB10> {[ period,		colon,		greater,	division		]};
 	key <SPCE> {[ space,		space,		apostrophe				]};
diff --git a/dist/xkeyboard-config/symbols/ma b/dist/xkeyboard-config/symbols/ma
index f7985ea89..ad3064f3f 100644
--- a/dist/xkeyboard-config/symbols/ma
+++ b/dist/xkeyboard-config/symbols/ma
@@ -26,23 +26,23 @@ xkb_symbols "tifinagh" {
 
     name[Group1]="Berber (Morocco, Tifinagh)";
 
-    key <TLDE>	{ [ twosuperior, NoAction ]	};
+    key <TLDE>	{ [ twosuperior, NoSymbol ]	};
     key <AE01>	{ [ ampersand,          1 ]	};
-    key <AE02>	{ [ NoAction,          2, asciitilde	]	};
+    key <AE02>	{ [ NoSymbol,          2, asciitilde	]	};
     key <AE03>	{ [  quotedbl,          3, numbersign	]	};
     key <AE04>	{ [apostrophe,          4, braceleft	]	};
     key <AE05>	{ [ parenleft,          5, bracketleft	]	};
     key <AE06>	{ [     minus,          6, bar	]	};
-    key <AE07>	{ [         NoAction ,  7 ]	};
+    key <AE07>	{ [         NoSymbol ,  7 ]	};
     key <AE08>	{ [underscore,          8, backslash	]	};
-    key <AE09>	{ [NoAction,         9, asciicircum	]	};
-    key <AE10>	{ [       NoAction ,          0, at		]	};
+    key <AE09>	{ [NoSymbol,         9, asciicircum	]	};
+    key <AE10>	{ [       NoSymbol ,          0, at		]	};
     key <AE11>	{ [parenright,     degree, bracketright	]	};
     key <AE12>	{ [     equal,       plus, braceright	]	};
 
     key <AD01>	{ [ 0x1002d30 ]	};
     key <AD02>	{ [ 0x1002d63, 0x1002d65 ]	};
-    key <AD03>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};
+    key <AD03>	{ [ 0x1002d3b, NoSymbol,0x10020ac ]	};
     key <AD04>	{ [ 0x1002d54, 0x1002d55 ]	};
     key <AD05>	{ [ 0x1002d5c, 0x1002d5f ]	};
     key <AD06>	{ [ 0x1002d62 ]	};
@@ -63,7 +63,7 @@ xkb_symbols "tifinagh" {
     key <AC08>	{ [ 0x1002d3d,  0x1002d3d  ]	};
     key <AC09>	{ [ 0x1002d4d ]	};
     key <AC10>	{ [ 0x1002d4e ]	};
-    key <AC11>	{ [    NoAction ,   percent ]	};
+    key <AC11>	{ [    NoSymbol ,   percent ]	};
     key <BKSL>	{ [  asterisk,         mu ]	};
 
     key <AB01>	{ [ 0x1002d61 ]	};
@@ -88,7 +88,7 @@ xkb_symbols "tifinagh-phonetic" {
 
     key <LatA>	{ [ 0x1002d30 ]	};
     key <LatZ>	{ [ 0x1002d63, 0x1002d65 ]	};
-    key <LatE>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};
+    key <LatE>	{ [ 0x1002d3b, NoSymbol,0x10020ac ]	};
     key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};
     key <LatT>	{ [ 0x1002d5c, 0x1002d5f ]	};
     key <LatY>	{ [ 0x1002d62 ]	};
@@ -192,7 +192,7 @@ xkb_symbols "tifinagh-extended-phonetic" {
 
     key <LatA>	{ [ 0x1002d30 ]	};
     key <LatZ>	{ [ 0x1002d63, 0x1002d65 ]	};
-    key <LatE>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};
+    key <LatE>	{ [ 0x1002d3b, NoSymbol,0x10020ac ]	};
     key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};
     key <LatT>	{ [ 0x1002d5c, 0x1002d5f ]	};
     key <LatY>	{ [ 0x1002d62 ]	};
diff --git a/dist/xkeyboard-config/symbols/macintosh_vndr/Makefile.in b/dist/xkeyboard-config/symbols/macintosh_vndr/Makefile.in
index 7545038ad..62a50f419 100644
--- a/dist/xkeyboard-config/symbols/macintosh_vndr/Makefile.in
+++ b/dist/xkeyboard-config/symbols/macintosh_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = symbols/macintosh_vndr
 DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(symbolsdir)"
 DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/symbols/nec_vndr/Makefile.in b/dist/xkeyboard-config/symbols/nec_vndr/Makefile.in
index 184bffa02..ffe9f8df9 100644
--- a/dist/xkeyboard-config/symbols/nec_vndr/Makefile.in
+++ b/dist/xkeyboard-config/symbols/nec_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = symbols/nec_vndr
 DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(symbolsdir)"
 DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/symbols/nokia_vndr/Makefile.in b/dist/xkeyboard-config/symbols/nokia_vndr/Makefile.in
index 4aec50c76..7ab53e19f 100644
--- a/dist/xkeyboard-config/symbols/nokia_vndr/Makefile.in
+++ b/dist/xkeyboard-config/symbols/nokia_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = symbols/nokia_vndr
 DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(symbolsdir)"
 DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/symbols/pc b/dist/xkeyboard-config/symbols/pc
index 5850c6d8b..7cfef49a5 100644
--- a/dist/xkeyboard-config/symbols/pc
+++ b/dist/xkeyboard-config/symbols/pc
@@ -10,7 +10,7 @@ xkb_symbols "pc105" {
     key <BKSL> {	[ backslash,	bar		]	};
     key <SPCE> {	[ 	 space			]	};
 
-    include "pc(function)"
+    include "srvr_ctrl(fkey2vt)"
     include "pc(editing)"
     include "keypad(x11)"
 
@@ -69,58 +69,6 @@ xkb_symbols "pc105" {
 };
 
 partial hidden alphanumeric_keys
-xkb_symbols "function" {
-    key <FK01> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F1,	XF86_Switch_VT_1 ]
-    };
-    key <FK02> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F2,	XF86_Switch_VT_2 ]
-    };
-    key <FK03> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F3,	XF86_Switch_VT_3 ]
-    };
-    key <FK04> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F4,	XF86_Switch_VT_4 ]
-    };
-    key <FK05> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F5,	XF86_Switch_VT_5 ]
-    };
-    key <FK06> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F6,	XF86_Switch_VT_6 ]
-    };
-    key <FK07> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F7,	XF86_Switch_VT_7 ]
-    };
-    key <FK08> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F8,	XF86_Switch_VT_8 ]
-    };
-    key <FK09> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F9,	XF86_Switch_VT_9 ]
-    };
-    key <FK10> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F10,	XF86_Switch_VT_10 ]
-    };
-    key <FK11> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F11,	XF86_Switch_VT_11 ]
-    };
-    key <FK12> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F12,	XF86_Switch_VT_12 ]
-    };
-};
-
-partial hidden alphanumeric_keys
 xkb_symbols "editing" {
     key <PRSC> {
 	type= "PC_ALT_LEVEL2",
diff --git a/dist/xkeyboard-config/symbols/ru b/dist/xkeyboard-config/symbols/ru
index fdf82539d..408e40806 100644
--- a/dist/xkeyboard-config/symbols/ru
+++ b/dist/xkeyboard-config/symbols/ru
@@ -589,8 +589,8 @@ xkb_symbols "chu"
 
 
 // RUU (Russian-Ukrainian United keyboard layout).
-// Modified Russian standart keyboard with third level contains ukrainian
-// and belorusian alphabetic letters and commonly used Unicode symbols.
+// Modified Russian standart keyboard with third level contains Ukrainian
+// and Belorusian alphabetic letters and commonly used Unicode symbols.
 // Description http://wiki.opennet.ru/RUU [russian]
 // Vasyĺ V. Vercynśkyj <fuckel@ukr.net>
 // Last Changes 2011/05/11
@@ -618,7 +618,7 @@ partial alphanumeric_keys
 xkb_symbols "ruu" {
     include "ru(common)"
 
-    name[Group1]= "Russian (with UKR and BEL layout)";
+    name[Group1]= "Russian (with Ukrainian-Belorussian layout)";
 
     key <TLDE> {    [	U2019,		apostrophe,	U0301,		asciitilde	]	};	// Apostrophe and Stress symbol
     key <AE01> {    [	1,		exclam,		U00F7,		U2248		]	};	// Division Sign and Almost Equal To
diff --git a/dist/xkeyboard-config/symbols/sgi_vndr/Makefile.in b/dist/xkeyboard-config/symbols/sgi_vndr/Makefile.in
index 3052a5a16..134686dba 100644
--- a/dist/xkeyboard-config/symbols/sgi_vndr/Makefile.in
+++ b/dist/xkeyboard-config/symbols/sgi_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = symbols/sgi_vndr
 DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(symbolsdir)"
 DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/symbols/sony_vndr/Makefile.in b/dist/xkeyboard-config/symbols/sony_vndr/Makefile.in
index 40a053e42..6a90105a7 100644
--- a/dist/xkeyboard-config/symbols/sony_vndr/Makefile.in
+++ b/dist/xkeyboard-config/symbols/sony_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = symbols/sony_vndr
 DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(symbolsdir)"
 DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/symbols/srvr_ctrl b/dist/xkeyboard-config/symbols/srvr_ctrl
index 7743bb15a..7d47d66a3 100644
--- a/dist/xkeyboard-config/symbols/srvr_ctrl
+++ b/dist/xkeyboard-config/symbols/srvr_ctrl
@@ -12,25 +12,25 @@ xkb_symbols "stdkeypad" {
 // Ungrab cancels server/keyboard/pointer grabs
     key <KPDV> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ KP_Divide,	XF86_Ungrab ]
+	symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
     };
 
 // ClsGrb kills whichever client has a grab in effect
     key <KPMU> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ KP_Multiply,	XF86_ClearGrab ]
+	symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
     };
 
 // -VMode switches to the previous video mode
     key <KPSU> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ KP_Subtract, XF86_Prev_VMode ]
+	symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
     };
 
 // +VMode switches to the next video mode
     key <KPAD> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ KP_Add,	XF86_Next_VMode]
+	symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode]
     };
 
 };
@@ -40,62 +40,62 @@ xkb_symbols "fkey2vt" {
 
     key <FK01> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F1,	XF86_Switch_VT_1 ]
+	symbols[Group1]= [ F1, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_1 ]
     };
 
     key <FK02> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F2,	XF86_Switch_VT_2 ]
+	symbols[Group1]= [ F2, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_2 ]
     };
 
     key <FK03> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F3,	XF86_Switch_VT_3 ]
+	symbols[Group1]= [ F3, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_3 ]
     };
 
     key <FK04> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F4,	XF86_Switch_VT_4 ]
+	symbols[Group1]= [ F4, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_4 ]
     };
 
     key <FK05> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F5,	XF86_Switch_VT_5 ]
+	symbols[Group1]= [ F5, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_5 ]
     };
 
     key <FK06> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F6,	XF86_Switch_VT_6 ]
+	symbols[Group1]= [ F6, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_6 ]
     };
 
     key <FK07> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F7,	XF86_Switch_VT_7 ]
+	symbols[Group1]= [ F7, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_7 ]
     };
 
     key <FK08> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F8,	XF86_Switch_VT_8 ]
+	symbols[Group1]= [ F8, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_8 ]
     };
 
     key <FK09> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F9,	XF86_Switch_VT_9 ]
+	symbols[Group1]= [ F9, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_9 ]
     };
 
     key <FK10> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F10,	XF86_Switch_VT_10 ]
+	symbols[Group1]= [ F10, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_10 ]
     };
 
     key <FK11> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F11,	XF86_Switch_VT_11 ]
+	symbols[Group1]= [ F11, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_11 ]
     };
 
     key <FK12> {
 	type="CTRL+ALT",
-	symbols[Group1]= [ F12,	XF86_Switch_VT_12 ]
+	symbols[Group1]= [ F12, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_12 ]
     };
 
 };
diff --git a/dist/xkeyboard-config/symbols/sun_vndr/Makefile.in b/dist/xkeyboard-config/symbols/sun_vndr/Makefile.in
index 80d9737a9..3a843e4b1 100644
--- a/dist/xkeyboard-config/symbols/sun_vndr/Makefile.in
+++ b/dist/xkeyboard-config/symbols/sun_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = symbols/sun_vndr
 DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(symbolsdir)"
 DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/symbols/sun_vndr/us b/dist/xkeyboard-config/symbols/sun_vndr/us
index 5ac695d99..1bdf01597 100644
--- a/dist/xkeyboard-config/symbols/sun_vndr/us
+++ b/dist/xkeyboard-config/symbols/sun_vndr/us
@@ -79,7 +79,7 @@ xkb_symbols "sunbasic" {
     include "inet(evdev)"
 
     include "us(basic)"
-    include "pc(function)"
+    include "srvr_ctrl(fkey2vt)"
     include "pc(editing)"
     include "keypad(x11)"
 
diff --git a/dist/xkeyboard-config/symbols/symbols.dir b/dist/xkeyboard-config/symbols/symbols.dir
index 4ea62ed38..65b489794 100644
--- a/dist/xkeyboard-config/symbols/symbols.dir
+++ b/dist/xkeyboard-config/symbols/symbols.dir
@@ -26,9 +26,10 @@
 --p----- a------- de(mac_nodeadkeys)
 --p----- a------- de(dsb)
 --p----- a------- de(dsb_qwertz)
---p----- a------- de(qwerty)
 --p----- a------- de(ru)
 --p----- a------- de(htcdream)
+--p----- a------- de(us)
+--p----- a------- de(hu)
 -dp----- a------- il(basic)
 --p----- a------- il(lyx)
 --p----- a------- il(phonetic)
diff --git a/dist/xkeyboard-config/symbols/terminate b/dist/xkeyboard-config/symbols/terminate
index 343d24f4c..96dd6e8f2 100644
--- a/dist/xkeyboard-config/symbols/terminate
+++ b/dist/xkeyboard-config/symbols/terminate
@@ -2,6 +2,6 @@ partial default modifier_keys
 xkb_symbols "ctrl_alt_bksp" {
     key <BKSP> {
         type="CTRL+ALT",
-        symbols[Group1] = [ NoSymbol,        Terminate_Server ]
+        symbols[Group1] = [ NoSymbol, VoidSymbol, VoidSymbol, VoidSymbol, Terminate_Server ]
     };
 };
diff --git a/dist/xkeyboard-config/symbols/xfree68_vndr/Makefile.in b/dist/xkeyboard-config/symbols/xfree68_vndr/Makefile.in
index f48271d90..e95bbea33 100644
--- a/dist/xkeyboard-config/symbols/xfree68_vndr/Makefile.in
+++ b/dist/xkeyboard-config/symbols/xfree68_vndr/Makefile.in
@@ -32,6 +32,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 subdir = symbols/xfree68_vndr
 DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -69,8 +71,12 @@ am__installdirs = "$(DESTDIR)$(symbolsdir)"
 DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -88,11 +94,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -111,9 +121,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -135,6 +150,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -142,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -153,14 +171,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/types/Makefile.in b/dist/xkeyboard-config/types/Makefile.in
index 2b80ec0f0..a3632439a 100644
--- a/dist/xkeyboard-config/types/Makefile.in
+++ b/dist/xkeyboard-config/types/Makefile.in
@@ -36,6 +36,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
 DIST_COMMON = README $(dist_dir_DATA) $(dist_types_DATA) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/xkbrules.am
@@ -74,8 +76,12 @@ am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(typesdir)"
 DATA = $(dist_dir_DATA) $(dist_types_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -93,11 +99,15 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPS_CFLAGS = @DEPS_CFLAGS@
 DEPS_LIBS = @DEPS_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -116,9 +126,14 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -140,6 +155,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -147,6 +163,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -158,14 +176,22 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+host = @host@
 host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
diff --git a/dist/xkeyboard-config/types/pc b/dist/xkeyboard-config/types/pc
index a123f5891..01a5634ad 100644
--- a/dist/xkeyboard-config/types/pc
+++ b/dist/xkeyboard-config/types/pc
@@ -59,10 +59,17 @@ partial default xkb_types "default" {
     };
 
     type "CTRL+ALT" {
-	modifiers = Control+Alt;
-	map[Control+Alt] = Level2;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Ctrl+Alt";
+	modifiers = Control+Alt+Shift+LevelThree;
+        map[None] = Level1;
+        map[Shift] = Level2;
+        map[LevelThree] = Level3;
+        map[Shift+LevelThree] = Level4;
+	map[Control+Alt] = Level5;
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Shift";
+        level_name[Level3] = "Alt Base";
+        level_name[Level4] = "Shift Alt";
+	level_name[Level5] = "Ctrl+Alt";
     };
 
    // Local eight level
diff --git a/dist/xkeyboard-config/xkeyboard-config.spec b/dist/xkeyboard-config/xkeyboard-config.spec
index 0b23c04af..23dcf6657 100644
--- a/dist/xkeyboard-config/xkeyboard-config.spec
+++ b/dist/xkeyboard-config/xkeyboard-config.spec
@@ -1,6 +1,6 @@
 Name:		xkeyboard-config
 Summary:	XML-based XKB configuration registry
-Version:	2.3
+Version:	2.4.1
 Release:	1
 License:	X11/MIT
 Group:		User Interface/X