mesa pixman xkeyboard-config git update 1 Jun 2011

33 files changed, 35026 insertions, 30363 deletions

diff --git a/mesalib/Makefile b/mesalib/Makefile
index 4b12dba40..7a5dae762 100644
--- a/mesalib/Makefile
+++ b/mesalib/Makefile
@@ -1,519 +1,521 @@
-# Top-level Mesa makefile

-

-TOP = .

-

-SUBDIRS = src

-

-

-# The git command below generates an empty string when we're not

-# building in a GIT tree (i.e., building from a release tarball).

-default: $(TOP)/configs/current

-	@$(TOP)/bin/extract_git_sha1

-	@for dir in $(SUBDIRS) ; do \

-		if [ -d $$dir ] ; then \

-			(cd $$dir && $(MAKE)) || exit 1 ; \

-		fi \

-	done

-

-all: default

-

-

-doxygen:

-	cd doxygen && $(MAKE)

-

-clean:

-	-@touch $(TOP)/configs/current

-	-@for dir in $(SUBDIRS) ; do \

-		if [ -d $$dir ] ; then \

-			(cd $$dir && $(MAKE) clean) ; \

-		fi \

-	done

-	-@test -s $(TOP)/configs/current || rm -f $(TOP)/configs/current

-

-

-realclean: clean

-	-rm -rf lib*

-	-rm -f $(TOP)/configs/current

-	-rm -f $(TOP)/configs/autoconf

-	-rm -rf autom4te.cache

-	-find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \

-	  -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'

-

-

-distclean: realclean

-

-

-install:

-	@for dir in $(SUBDIRS) ; do \

-		if [ -d $$dir ] ; then \

-			(cd $$dir && $(MAKE) install) || exit 1 ; \

-		fi \

-	done

-

-

-.PHONY: default doxygen clean realclean distclean install

-

-# If there's no current configuration file

-$(TOP)/configs/current:

-	@echo

-	@echo

-	@echo "Please choose a configuration from the following list:"

-	@ls -1 $(TOP)/configs | grep -v "current\|default\|CVS\|autoconf.*"

-	@echo

-	@echo "Then type 'make <config>' (ex: 'make linux-x86')"

-	@echo

-	@echo "Or, run './configure' then 'make'"

-	@echo "See './configure --help' for details"

-	@echo

-	@echo "(ignore the following error message)"

-	@exit 1

-

-

-# Rules to set/install a specific build configuration

-aix \

-aix-64 \

-aix-64-static \

-aix-gcc \

-aix-static \

-autoconf \

-bluegene-osmesa \

-bluegene-xlc-osmesa \

-beos \

-catamount-osmesa-pgi \

-darwin \

-darwin-fat-32bit \

-darwin-fat-all \

-freebsd \

-freebsd-dri \

-freebsd-dri-amd64 \

-freebsd-dri-x86 \

-hpux10 \

-hpux10-gcc \

-hpux10-static \

-hpux11-32 \

-hpux11-32-static \

-hpux11-32-static-nothreads \

-hpux11-64 \

-hpux11-64-static \

-hpux11-ia64 \

-hpux11-ia64-static \

-hpux9 \

-hpux9-gcc \

-irix6-64 \

-irix6-64-static \

-irix6-n32 \

-irix6-n32-static \

-irix6-o32 \

-irix6-o32-static \

-linux \

-linux-i965 \

-linux-alpha \

-linux-alpha-static \

-linux-cell \

-linux-cell-debug \

-linux-debug \

-linux-dri \

-linux-dri-debug \

-linux-dri-x86 \

-linux-dri-x86-64 \

-linux-dri-ppc \

-linux-dri-xcb \

-linux-egl \

-linux-indirect \

-linux-fbdev \

-linux-ia64-icc \

-linux-ia64-icc-static \

-linux-icc \

-linux-icc-static \

-linux-llvm \

-linux-llvm-debug \

-linux-opengl-es \

-linux-osmesa \

-linux-osmesa-static \

-linux-osmesa16 \

-linux-osmesa16-static \

-linux-osmesa32 \

-linux-ppc \

-linux-ppc-static \

-linux-profile \

-linux-sparc \

-linux-sparc5 \

-linux-static \

-linux-ultrasparc \

-linux-tcc \

-linux-x86 \

-linux-x86-debug \

-linux-x86-32 \

-linux-x86-64 \

-linux-x86-64-debug \

-linux-x86-64-profile \

-linux-x86-64-static \

-linux-x86-profile \

-linux-x86-static \

-netbsd \

-openbsd \

-osf1 \

-osf1-static \

-solaris-x86 \

-solaris-x86-gcc \

-solaris-x86-gcc-static \

-sunos4 \

-sunos4-gcc \

-sunos4-static \

-sunos5 \

-sunos5-gcc \

-sunos5-64-gcc \

-sunos5-smp \

-sunos5-v8 \

-sunos5-v8-static \

-sunos5-v9 \

-sunos5-v9-static \

-sunos5-v9-cc-g++ \

-ultrix-gcc:

-	@ if test -f configs/current -o -L configs/current; then \

-		if ! cmp configs/$@ configs/current > /dev/null; then \

-			echo "Please run 'make realclean' before changing configs" ; \

-			exit 1 ; \

-		fi ; \

-	else \

-		cd configs && rm -f current && ln -s $@ current ; \

-	fi

-	$(MAKE) default

-

-

-# Rules for making release tarballs

-

-VERSION=7.11-devel

-DIRECTORY = Mesa-$(VERSION)

-LIB_NAME = MesaLib-$(VERSION)

-GLUT_NAME = MesaGLUT-$(VERSION)

-

-# This is part of MAIN_FILES

-MAIN_ES_FILES = \

-	$(DIRECTORY)/src/mesa/main/*.xml				\

-	$(DIRECTORY)/src/mesa/main/*.py					\

-	$(DIRECTORY)/src/mesa/main/*.dtd

-

-MAIN_FILES = \

-	$(DIRECTORY)/Makefile*						\

-	$(DIRECTORY)/configure						\

-	$(DIRECTORY)/configure.ac					\

-	$(DIRECTORY)/acinclude.m4					\

-	$(DIRECTORY)/aclocal.m4						\

-	$(DIRECTORY)/SConstruct						\

-	$(DIRECTORY)/common.py						\

-	$(DIRECTORY)/scons/*py						\

-	$(DIRECTORY)/bin/config.guess					\

-	$(DIRECTORY)/bin/config.sub					\

-	$(DIRECTORY)/bin/extract_git_sha1				\

-	$(DIRECTORY)/bin/install-sh					\

-	$(DIRECTORY)/bin/mklib						\

-	$(DIRECTORY)/bin/minstall					\

-	$(DIRECTORY)/bin/version.mk					\

-	$(DIRECTORY)/configs/[a-z]*					\

-	$(DIRECTORY)/docs/*.html					\

-	$(DIRECTORY)/docs/COPYING					\

-	$(DIRECTORY)/docs/README.*					\

-	$(DIRECTORY)/docs/RELNOTES*					\

-	$(DIRECTORY)/docs/*.spec					\

-	$(DIRECTORY)/include/GL/gl.h					\

-	$(DIRECTORY)/include/GL/glext.h					\

-	$(DIRECTORY)/include/GL/gl_mangle.h				\

-	$(DIRECTORY)/include/GL/glu.h					\

-	$(DIRECTORY)/include/GL/glu_mangle.h				\

-	$(DIRECTORY)/include/GL/glx.h					\

-	$(DIRECTORY)/include/GL/glxext.h				\

-	$(DIRECTORY)/include/GL/glx_mangle.h				\

-	$(DIRECTORY)/include/GL/glfbdev.h				\

-	$(DIRECTORY)/include/GL/mesa_wgl.h				\

-	$(DIRECTORY)/include/GL/osmesa.h				\

-	$(DIRECTORY)/include/GL/vms_x_fix.h				\

-	$(DIRECTORY)/include/GL/wglext.h				\

-	$(DIRECTORY)/include/GL/wmesa.h					\

-	$(DIRECTORY)/src/getopt/SConscript				\

-	$(DIRECTORY)/src/getopt/getopt*.[ch]				\

-	$(DIRECTORY)/src/glsl/Makefile					\

-	$(DIRECTORY)/src/glsl/Makefile.template				\

-	$(DIRECTORY)/src/glsl/SConscript				\

-	$(DIRECTORY)/src/glsl/*.[ch]					\

-	$(DIRECTORY)/src/glsl/*.ll					\

-	$(DIRECTORY)/src/glsl/*.yy					\

-	$(DIRECTORY)/src/glsl/*.[cly]pp					\

-	$(DIRECTORY)/src/glsl/README					\

-	$(DIRECTORY)/src/glsl/glcpp/*.[chly]				\

-	$(DIRECTORY)/src/glsl/glcpp/README				\

-	$(DIRECTORY)/src/glsl/builtins					\

-	$(DIRECTORY)/src/Makefile					\

-	$(DIRECTORY)/src/SConscript					\

-	$(DIRECTORY)/src/mesa/Makefile*					\

-	$(DIRECTORY)/src/mesa/SConscript				\

-	$(DIRECTORY)/src/mesa/sources.mak				\

-	$(DIRECTORY)/src/mesa/descrip.mms				\

-	$(DIRECTORY)/src/mesa/gl.pc.in					\

-	$(DIRECTORY)/src/mesa/osmesa.pc.in				\

-	$(DIRECTORY)/src/mesa/depend					\

-	$(MAIN_ES_FILES)						\

-	$(DIRECTORY)/src/mesa/main/*.[chS]				\

-	$(DIRECTORY)/src/mesa/main/*.cpp				\

-	$(DIRECTORY)/src/mesa/main/descrip.mms				\

-	$(DIRECTORY)/src/mesa/math/*.[ch]				\

-	$(DIRECTORY)/src/mesa/math/descrip.mms				\

-	$(DIRECTORY)/src/mesa/program/*.[chly]				\

-	$(DIRECTORY)/src/mesa/program/*.cpp				\

-	$(DIRECTORY)/src/mesa/program/descrip.mms			\

-	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\

-	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\

-	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\

-	$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms			\

-	$(DIRECTORY)/src/mesa/vbo/*.[chS]				\

-	$(DIRECTORY)/src/mesa/vbo/descrip.mms				\

-	$(DIRECTORY)/src/mesa/tnl/*.[chS]				\

-	$(DIRECTORY)/src/mesa/tnl/descrip.mms				\

-	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\

-	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\

-	$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm			\

-	$(DIRECTORY)/src/mesa/drivers/Makefile				\

-	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\

-	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\

-	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\

-	$(DIRECTORY)/src/mesa/drivers/fbdev/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\

-	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win		\

-	$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms		\

-	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def			\

-	$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]			\

-	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/*.[ch]		\

-	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/Makefile	\

-	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/SConscript	\

-	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\

-	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\

-	$(DIRECTORY)/src/mesa/drivers/x11/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms			\

-	$(DIRECTORY)/src/mesa/drivers/x11/*.[ch]			\

-	$(DIRECTORY)/src/mesa/ppc/*.[ch]				\

-	$(DIRECTORY)/src/mesa/sparc/*.[chS]				\

-	$(DIRECTORY)/src/mesa/x86/Makefile				\

-	$(DIRECTORY)/src/mesa/x86/*.[ch]				\

-	$(DIRECTORY)/src/mesa/x86/*.S					\

-	$(DIRECTORY)/src/mesa/x86/rtasm/*.[ch]				\

-	$(DIRECTORY)/src/mesa/x86-64/*.[chS]				\

-	$(DIRECTORY)/src/mesa/x86-64/Makefile

-

-MAPI_FILES = \

-	$(DIRECTORY)/include/GLES/*.h					\

-	$(DIRECTORY)/include/GLES2/*.h					\

-	$(DIRECTORY)/include/VG/*.h					\

-	$(DIRECTORY)/src/mapi/es?api/Makefile				\

-	$(DIRECTORY)/src/mapi/es?api/*.pc.in				\

-	$(DIRECTORY)/src/mapi/glapi/gen/Makefile			\

-	$(DIRECTORY)/src/mapi/glapi/gen/*.xml				\

-	$(DIRECTORY)/src/mapi/glapi/gen/*.py				\

-	$(DIRECTORY)/src/mapi/glapi/gen/*.dtd				\

-	$(DIRECTORY)/src/mapi/glapi/gen-es/Makefile			\

-	$(DIRECTORY)/src/mapi/glapi/gen-es/*.xml			\

-	$(DIRECTORY)/src/mapi/glapi/gen-es/*.py				\

-	$(DIRECTORY)/src/mapi/glapi/Makefile				\

-	$(DIRECTORY)/src/mapi/glapi/SConscript				\

-	$(DIRECTORY)/src/mapi/glapi/sources.mak				\

-	$(DIRECTORY)/src/mapi/glapi/*.[chS]				\

-	$(DIRECTORY)/src/mapi/mapi/mapi_abi.py				\

-	$(DIRECTORY)/src/mapi/mapi/sources.mak				\

-	$(DIRECTORY)/src/mapi/mapi/*.[ch]				\

-	$(DIRECTORY)/src/mapi/shared-glapi/SConscript			\

-	$(DIRECTORY)/src/mapi/shared-glapi/Makefile			\

-	$(DIRECTORY)/src/mapi/vgapi/Makefile				\

-	$(DIRECTORY)/src/mapi/vgapi/SConscript				\

-	$(DIRECTORY)/src/mapi/vgapi/vgapi.csv				\

-	$(DIRECTORY)/src/mapi/vgapi/vg.pc.in

-

-EGL_FILES = \

-	$(DIRECTORY)/include/KHR/*.h					\

-	$(DIRECTORY)/include/EGL/*.h					\

-	$(DIRECTORY)/src/egl/Makefile					\

-	$(DIRECTORY)/src/egl/*/Makefile					\

-	$(DIRECTORY)/src/egl/*/Makefile.template			\

-	$(DIRECTORY)/src/egl/*/*.[ch]					\

-	$(DIRECTORY)/src/egl/*/*/Makefile				\

-	$(DIRECTORY)/src/egl/*/*/*.[ch]					\

-	$(DIRECTORY)/src/egl/main/SConscript				\

-	$(DIRECTORY)/src/egl/main/*.pc.in				\

-	$(DIRECTORY)/src/egl/main/*.def

-

-GALLIUM_FILES = \

-	$(DIRECTORY)/src/mesa/state_tracker/*[ch]			\

-	$(DIRECTORY)/src/gallium/Makefile				\

-	$(DIRECTORY)/src/gallium/Makefile.template			\

-	$(DIRECTORY)/src/gallium/SConscript				\

-	$(DIRECTORY)/src/gallium/targets/Makefile.dri			\

-	$(DIRECTORY)/src/gallium/targets/Makefile.xorg			\

-	$(DIRECTORY)/src/gallium/targets/SConscript.dri			\

-	$(DIRECTORY)/src/gallium/*/Makefile				\

-	$(DIRECTORY)/src/gallium/*/SConscript				\

-	$(DIRECTORY)/src/gallium/*/*/Makefile				\

-	$(DIRECTORY)/src/gallium/*/*/SConscript				\

-	$(DIRECTORY)/src/gallium/*/*/*.[ch]				\

-	$(DIRECTORY)/src/gallium/auxiliary/gallivm/*.cpp		\

-	$(DIRECTORY)/src/gallium/*/*/*.py				\

-	$(DIRECTORY)/src/gallium/*/*/*.csv				\

-	$(DIRECTORY)/src/gallium/*/*/*/Makefile				\

-	$(DIRECTORY)/src/gallium/*/*/*/SConscript			\

-	$(DIRECTORY)/src/gallium/*/*/*/*.[ch]				\

-	$(DIRECTORY)/src/gallium/*/*/*/*.py

-

-

-DRI_FILES = \

-	$(DIRECTORY)/include/GL/internal/dri_interface.h		\

-	$(DIRECTORY)/include/GL/internal/sarea.h			\

-	$(DIRECTORY)/src/glx/Makefile					\

-	$(DIRECTORY)/src/glx/*.[ch]					\

-	$(DIRECTORY)/src/mesa/drivers/dri/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template		\

-	$(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in			\

-	$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po		\

-	$(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS]			\

-	$(DIRECTORY)/src/mesa/drivers/dri/*/*.cpp			\

-	$(DIRECTORY)/src/mesa/drivers/dri/*/*/*.[chS]			\

-	$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/dri/*/*/Makefile			\

-	$(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile

-

-SGI_GLU_FILES = \

-	$(DIRECTORY)/src/glu/Makefile					\

-	$(DIRECTORY)/src/glu/glu.pc.in					\

-	$(DIRECTORY)/src/glu/sgi/Makefile				\

-	$(DIRECTORY)/src/glu/sgi/Makefile.mgw				\

-	$(DIRECTORY)/src/glu/sgi/Makefile.win				\

-	$(DIRECTORY)/src/glu/sgi/glu.def				\

-	$(DIRECTORY)/src/glu/sgi/dummy.cc				\

-	$(DIRECTORY)/src/glu/sgi/glu.exports				\

-	$(DIRECTORY)/src/glu/sgi/glu.exports.darwin			\

-	$(DIRECTORY)/src/glu/sgi/mesaglu.opt				\

-	$(DIRECTORY)/src/glu/sgi/include/gluos.h			\

-	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h			\

-	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc		\

-	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h			\

-	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc		\

-	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h			\

-	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc			\

-	$(DIRECTORY)/src/glu/sgi/libtess/README				\

-	$(DIRECTORY)/src/glu/sgi/libtess/alg-outline			\

-	$(DIRECTORY)/src/glu/sgi/libtess/*.[ch]				\

-	$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]

-

-GLW_FILES = \

-	$(DIRECTORY)/src/glw/*.[ch]			\

-	$(DIRECTORY)/src/glw/Makefile*			\

-	$(DIRECTORY)/src/glw/README			\

-	$(DIRECTORY)/src/glw/glw.pc.in			\

-	$(DIRECTORY)/src/glw/depend

-

-GLUT_FILES = \

-	$(DIRECTORY)/include/GL/glut.h			\

-	$(DIRECTORY)/include/GL/glutf90.h		\

-	$(DIRECTORY)/src/glut/glx/Makefile*		\

-	$(DIRECTORY)/src/glut/glx/SConscript		\

-	$(DIRECTORY)/src/glut/glx/depend		\

-	$(DIRECTORY)/src/glut/glx/glut.pc.in		\

-	$(DIRECTORY)/src/glut/glx/*def			\

-	$(DIRECTORY)/src/glut/glx/*.[ch]		\

-	$(DIRECTORY)/src/glut/beos/*.[ch]		\

-	$(DIRECTORY)/src/glut/beos/*.cpp		\

-	$(DIRECTORY)/src/glut/beos/Makefile

-

-DEPEND_FILES = \

-	$(TOP)/src/mesa/depend		\

-	$(TOP)/src/glx/depend		\

-	$(TOP)/src/glw/depend		\

-	$(TOP)/src/glut/glx/depend	\

-	$(TOP)/src/glu/sgi/depend

-

-

-LIB_FILES = \

-	$(MAIN_FILES)		\

-	$(MAPI_FILES)		\

-	$(ES_FILES)		\

-	$(EGL_FILES)		\

-	$(GALLIUM_FILES)	\

-	$(DRI_FILES)		\

-	$(SGI_GLU_FILES)	\

-	$(GLW_FILES)

-

-

-parsers: configure

-	-@touch $(TOP)/configs/current

-	$(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp

-	$(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h

-	$(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h

-

-# Everything for new a Mesa release:

-ARCHIVES = $(LIB_NAME).tar.gz \

-	$(LIB_NAME).tar.bz2 \

-	$(LIB_NAME).zip \

-	$(GLUT_NAME).tar.gz \

-	$(GLUT_NAME).tar.bz2 \

-	$(GLUT_NAME).zip

-

-tarballs: md5

-	rm -f ../$(LIB_NAME).tar

-

-# Helper for autoconf builds

-ACLOCAL = aclocal

-ACLOCAL_FLAGS =

-AUTOCONF = autoconf

-AC_FLAGS =

-aclocal.m4: configure.ac acinclude.m4

-	$(ACLOCAL) $(ACLOCAL_FLAGS)

-configure: rm_depend configure.ac aclocal.m4 acinclude.m4

-	$(AUTOCONF) $(AC_FLAGS)

-

-rm_depend:

-	@for dep in $(DEPEND_FILES) ; do \

-		rm -f $$dep ; \

-		touch $$dep ; \

-	done

-

-rm_config: parsers

-	rm -f configs/current

-	rm -f configs/autoconf

-

-$(LIB_NAME).tar: rm_config

-	cd .. ; tar -cf $(DIRECTORY)/$(LIB_NAME).tar $(LIB_FILES)

-

-$(LIB_NAME).tar.gz: $(LIB_NAME).tar

-	gzip --stdout --best $(LIB_NAME).tar > $(LIB_NAME).tar.gz

-

-$(GLUT_NAME).tar: rm_depend

-	cd .. ; tar -cf $(DIRECTORY)/$(GLUT_NAME).tar $(GLUT_FILES)

-

-$(GLUT_NAME).tar.gz: $(GLUT_NAME).tar

-	gzip --stdout --best $(GLUT_NAME).tar > $(GLUT_NAME).tar.gz

-

-$(LIB_NAME).tar.bz2: $(LIB_NAME).tar

-	bzip2 --stdout --best $(LIB_NAME).tar > $(LIB_NAME).tar.bz2

-

-$(GLUT_NAME).tar.bz2: $(GLUT_NAME).tar

-	bzip2 --stdout --best $(GLUT_NAME).tar > $(GLUT_NAME).tar.bz2

-

-$(LIB_NAME).zip: rm_config

-	rm -f $(LIB_NAME).zip ; \

-	cd .. ; \

-	zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \

-	mv $(LIB_NAME).zip $(DIRECTORY)

-

-$(GLUT_NAME).zip:

-	rm -f $(GLUT_NAME).zip ; \

-	cd .. ; \

-	zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \

-	mv $(GLUT_NAME).zip $(DIRECTORY)

-

-md5: $(ARCHIVES)

-	@-md5sum $(LIB_NAME).tar.gz

-	@-md5sum $(LIB_NAME).tar.bz2

-	@-md5sum $(LIB_NAME).zip

-	@-md5sum $(GLUT_NAME).tar.gz

-	@-md5sum $(GLUT_NAME).tar.bz2

-	@-md5sum $(GLUT_NAME).zip

-

-.PHONY: tarballs rm_depend rm_config md5

+# Top-level Mesa makefile
+
+TOP = .
+
+SUBDIRS = src
+
+
+# The git command below generates an empty string when we're not
+# building in a GIT tree (i.e., building from a release tarball).
+default: $(TOP)/configs/current
+	@$(TOP)/bin/extract_git_sha1
+	@for dir in $(SUBDIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE)) || exit 1 ; \
+		fi \
+	done
+
+all: default
+
+
+doxygen:
+	cd doxygen && $(MAKE)
+
+clean:
+	-@touch $(TOP)/configs/current
+	-@for dir in $(SUBDIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE) clean) ; \
+		fi \
+	done
+	-@test -s $(TOP)/configs/current || rm -f $(TOP)/configs/current
+
+
+realclean: clean
+	-rm -rf lib*
+	-rm -f $(TOP)/configs/current
+	-rm -f $(TOP)/configs/autoconf
+	-rm -rf autom4te.cache
+	-find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
+	  -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
+
+
+distclean: realclean
+
+
+install:
+	@for dir in $(SUBDIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE) install) || exit 1 ; \
+		fi \
+	done
+
+
+.PHONY: default doxygen clean realclean distclean install
+
+# If there's no current configuration file
+$(TOP)/configs/current:
+	@echo
+	@echo
+	@echo "Please choose a configuration from the following list:"
+	@ls -1 $(TOP)/configs | grep -v "current\|default\|CVS\|autoconf.*"
+	@echo
+	@echo "Then type 'make <config>' (ex: 'make linux-x86')"
+	@echo
+	@echo "Or, run './configure' then 'make'"
+	@echo "See './configure --help' for details"
+	@echo
+	@echo "(ignore the following error message)"
+	@exit 1
+
+
+# Rules to set/install a specific build configuration
+aix \
+aix-64 \
+aix-64-static \
+aix-gcc \
+aix-static \
+autoconf \
+bluegene-osmesa \
+bluegene-xlc-osmesa \
+beos \
+catamount-osmesa-pgi \
+darwin \
+darwin-fat-32bit \
+darwin-fat-all \
+freebsd \
+freebsd-dri \
+freebsd-dri-amd64 \
+freebsd-dri-x86 \
+hpux10 \
+hpux10-gcc \
+hpux10-static \
+hpux11-32 \
+hpux11-32-static \
+hpux11-32-static-nothreads \
+hpux11-64 \
+hpux11-64-static \
+hpux11-ia64 \
+hpux11-ia64-static \
+hpux9 \
+hpux9-gcc \
+irix6-64 \
+irix6-64-static \
+irix6-n32 \
+irix6-n32-static \
+irix6-o32 \
+irix6-o32-static \
+linux \
+linux-i965 \
+linux-alpha \
+linux-alpha-static \
+linux-cell \
+linux-cell-debug \
+linux-debug \
+linux-dri \
+linux-dri-debug \
+linux-dri-x86 \
+linux-dri-x86-64 \
+linux-dri-ppc \
+linux-dri-xcb \
+linux-egl \
+linux-indirect \
+linux-fbdev \
+linux-ia64-icc \
+linux-ia64-icc-static \
+linux-icc \
+linux-icc-static \
+linux-llvm \
+linux-llvm-debug \
+linux-opengl-es \
+linux-osmesa \
+linux-osmesa-static \
+linux-osmesa16 \
+linux-osmesa16-static \
+linux-osmesa32 \
+linux-ppc \
+linux-ppc-static \
+linux-profile \
+linux-sparc \
+linux-sparc5 \
+linux-static \
+linux-ultrasparc \
+linux-tcc \
+linux-x86 \
+linux-x86-debug \
+linux-x86-32 \
+linux-x86-64 \
+linux-x86-64-debug \
+linux-x86-64-profile \
+linux-x86-64-static \
+linux-x86-profile \
+linux-x86-static \
+netbsd \
+openbsd \
+osf1 \
+osf1-static \
+solaris-x86 \
+solaris-x86-gcc \
+solaris-x86-gcc-static \
+sunos4 \
+sunos4-gcc \
+sunos4-static \
+sunos5 \
+sunos5-gcc \
+sunos5-64-gcc \
+sunos5-smp \
+sunos5-v8 \
+sunos5-v8-static \
+sunos5-v9 \
+sunos5-v9-static \
+sunos5-v9-cc-g++ \
+ultrix-gcc:
+	@ if test -f configs/current -o -L configs/current; then \
+		if ! cmp configs/$@ configs/current > /dev/null; then \
+			echo "Please run 'make realclean' before changing configs" ; \
+			exit 1 ; \
+		fi ; \
+	else \
+		cd configs && rm -f current && ln -s $@ current ; \
+	fi
+	$(MAKE) default
+
+
+# Rules for making release tarballs
+
+VERSION=7.11-devel
+DIRECTORY = Mesa-$(VERSION)
+LIB_NAME = MesaLib-$(VERSION)
+GLUT_NAME = MesaGLUT-$(VERSION)
+
+# This is part of MAIN_FILES
+MAIN_ES_FILES = \
+	$(DIRECTORY)/src/mesa/main/*.xml				\
+	$(DIRECTORY)/src/mesa/main/*.py					\
+	$(DIRECTORY)/src/mesa/main/*.dtd
+
+MAIN_FILES = \
+	$(DIRECTORY)/Makefile*						\
+	$(DIRECTORY)/configure						\
+	$(DIRECTORY)/configure.ac					\
+	$(DIRECTORY)/acinclude.m4					\
+	$(DIRECTORY)/aclocal.m4						\
+	$(DIRECTORY)/SConstruct						\
+	$(DIRECTORY)/common.py						\
+	$(DIRECTORY)/scons/*py						\
+	$(DIRECTORY)/bin/config.guess					\
+	$(DIRECTORY)/bin/config.sub					\
+	$(DIRECTORY)/bin/extract_git_sha1				\
+	$(DIRECTORY)/bin/install-sh					\
+	$(DIRECTORY)/bin/mklib						\
+	$(DIRECTORY)/bin/minstall					\
+	$(DIRECTORY)/bin/version.mk					\
+	$(DIRECTORY)/configs/[a-z]*					\
+	$(DIRECTORY)/docs/*.html					\
+	$(DIRECTORY)/docs/COPYING					\
+	$(DIRECTORY)/docs/README.*					\
+	$(DIRECTORY)/docs/RELNOTES*					\
+	$(DIRECTORY)/docs/*.spec					\
+	$(DIRECTORY)/include/GL/gl.h					\
+	$(DIRECTORY)/include/GL/glext.h					\
+	$(DIRECTORY)/include/GL/gl_mangle.h				\
+	$(DIRECTORY)/include/GL/glu.h					\
+	$(DIRECTORY)/include/GL/glu_mangle.h				\
+	$(DIRECTORY)/include/GL/glx.h					\
+	$(DIRECTORY)/include/GL/glxext.h				\
+	$(DIRECTORY)/include/GL/glx_mangle.h				\
+	$(DIRECTORY)/include/GL/glfbdev.h				\
+	$(DIRECTORY)/include/GL/mesa_wgl.h				\
+	$(DIRECTORY)/include/GL/osmesa.h				\
+	$(DIRECTORY)/include/GL/vms_x_fix.h				\
+	$(DIRECTORY)/include/GL/wglext.h				\
+	$(DIRECTORY)/include/GL/wmesa.h					\
+	$(DIRECTORY)/src/getopt/SConscript				\
+	$(DIRECTORY)/src/getopt/getopt*.[ch]				\
+	$(DIRECTORY)/src/glsl/Makefile					\
+	$(DIRECTORY)/src/glsl/Makefile.template				\
+	$(DIRECTORY)/src/glsl/SConscript				\
+	$(DIRECTORY)/src/glsl/*.[ch]					\
+	$(DIRECTORY)/src/glsl/*.ll					\
+	$(DIRECTORY)/src/glsl/*.yy					\
+	$(DIRECTORY)/src/glsl/*.[cly]pp					\
+	$(DIRECTORY)/src/glsl/README					\
+	$(DIRECTORY)/src/glsl/glcpp/*.[chly]				\
+	$(DIRECTORY)/src/glsl/glcpp/README				\
+	$(DIRECTORY)/src/glsl/builtins					\
+	$(DIRECTORY)/src/Makefile					\
+	$(DIRECTORY)/src/SConscript					\
+	$(DIRECTORY)/src/mesa/Makefile*					\
+	$(DIRECTORY)/src/mesa/SConscript				\
+	$(DIRECTORY)/src/mesa/sources.mak				\
+	$(DIRECTORY)/src/mesa/descrip.mms				\
+	$(DIRECTORY)/src/mesa/gl.pc.in					\
+	$(DIRECTORY)/src/mesa/osmesa.pc.in				\
+	$(DIRECTORY)/src/mesa/depend					\
+	$(MAIN_ES_FILES)						\
+	$(DIRECTORY)/src/mesa/main/*.[chS]				\
+	$(DIRECTORY)/src/mesa/main/*.cpp				\
+	$(DIRECTORY)/src/mesa/main/descrip.mms				\
+	$(DIRECTORY)/src/mesa/math/*.[ch]				\
+	$(DIRECTORY)/src/mesa/math/descrip.mms				\
+	$(DIRECTORY)/src/mesa/program/*.[chly]				\
+	$(DIRECTORY)/src/mesa/program/*.cpp				\
+	$(DIRECTORY)/src/mesa/program/descrip.mms			\
+	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\
+	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\
+	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\
+	$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms			\
+	$(DIRECTORY)/src/mesa/vbo/*.[chS]				\
+	$(DIRECTORY)/src/mesa/vbo/descrip.mms				\
+	$(DIRECTORY)/src/mesa/tnl/*.[chS]				\
+	$(DIRECTORY)/src/mesa/tnl/descrip.mms				\
+	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\
+	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\
+	$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm			\
+	$(DIRECTORY)/src/mesa/drivers/Makefile				\
+	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\
+	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
+	$(DIRECTORY)/src/mesa/drivers/fbdev/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win		\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms		\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def			\
+	$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/*.[ch]		\
+	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/Makefile	\
+	$(DIRECTORY)/src/mesa/drivers/dri/r300/compiler/SConscript	\
+	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\
+	$(DIRECTORY)/src/mesa/drivers/x11/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms			\
+	$(DIRECTORY)/src/mesa/drivers/x11/*.[ch]			\
+	$(DIRECTORY)/src/mesa/ppc/*.[ch]				\
+	$(DIRECTORY)/src/mesa/sparc/*.[chS]				\
+	$(DIRECTORY)/src/mesa/x86/Makefile				\
+	$(DIRECTORY)/src/mesa/x86/*.[ch]				\
+	$(DIRECTORY)/src/mesa/x86/*.S					\
+	$(DIRECTORY)/src/mesa/x86/rtasm/*.[ch]				\
+	$(DIRECTORY)/src/mesa/x86-64/*.[chS]				\
+	$(DIRECTORY)/src/mesa/x86-64/Makefile
+
+MAPI_FILES = \
+	$(DIRECTORY)/include/GLES/*.h					\
+	$(DIRECTORY)/include/GLES2/*.h					\
+	$(DIRECTORY)/include/VG/*.h					\
+	$(DIRECTORY)/src/mapi/es?api/Makefile				\
+	$(DIRECTORY)/src/mapi/es?api/*.pc.in				\
+	$(DIRECTORY)/src/mapi/glapi/gen/Makefile			\
+	$(DIRECTORY)/src/mapi/glapi/gen/*.xml				\
+	$(DIRECTORY)/src/mapi/glapi/gen/*.py				\
+	$(DIRECTORY)/src/mapi/glapi/gen/*.dtd				\
+	$(DIRECTORY)/src/mapi/glapi/gen-es/Makefile			\
+	$(DIRECTORY)/src/mapi/glapi/gen-es/*.xml			\
+	$(DIRECTORY)/src/mapi/glapi/gen-es/*.py				\
+	$(DIRECTORY)/src/mapi/glapi/Makefile				\
+	$(DIRECTORY)/src/mapi/glapi/SConscript				\
+	$(DIRECTORY)/src/mapi/glapi/sources.mak				\
+	$(DIRECTORY)/src/mapi/glapi/*.[chS]				\
+	$(DIRECTORY)/src/mapi/mapi/mapi_abi.py				\
+	$(DIRECTORY)/src/mapi/mapi/sources.mak				\
+	$(DIRECTORY)/src/mapi/mapi/*.[ch]				\
+	$(DIRECTORY)/src/mapi/shared-glapi/SConscript			\
+	$(DIRECTORY)/src/mapi/shared-glapi/Makefile			\
+	$(DIRECTORY)/src/mapi/vgapi/Makefile				\
+	$(DIRECTORY)/src/mapi/vgapi/SConscript				\
+	$(DIRECTORY)/src/mapi/vgapi/vgapi.csv				\
+	$(DIRECTORY)/src/mapi/vgapi/vg.pc.in
+
+EGL_FILES = \
+	$(DIRECTORY)/include/KHR/*.h					\
+	$(DIRECTORY)/include/EGL/*.h					\
+	$(DIRECTORY)/src/egl/Makefile					\
+	$(DIRECTORY)/src/egl/*/Makefile					\
+	$(DIRECTORY)/src/egl/*/Makefile.template			\
+	$(DIRECTORY)/src/egl/*/*.[ch]					\
+	$(DIRECTORY)/src/egl/*/*/Makefile				\
+	$(DIRECTORY)/src/egl/*/*/*.[ch]					\
+	$(DIRECTORY)/src/egl/wayland/wayland-drm/protocol/*.xml		\
+	$(DIRECTORY)/src/egl/wayland/wayland-egl/*.pc.in		\
+	$(DIRECTORY)/src/egl/main/SConscript				\
+	$(DIRECTORY)/src/egl/main/*.pc.in				\
+	$(DIRECTORY)/src/egl/main/*.def
+
+GALLIUM_FILES = \
+	$(DIRECTORY)/src/mesa/state_tracker/*[ch]			\
+	$(DIRECTORY)/src/gallium/Makefile				\
+	$(DIRECTORY)/src/gallium/Makefile.template			\
+	$(DIRECTORY)/src/gallium/SConscript				\
+	$(DIRECTORY)/src/gallium/targets/Makefile.dri			\
+	$(DIRECTORY)/src/gallium/targets/Makefile.xorg			\
+	$(DIRECTORY)/src/gallium/targets/SConscript.dri			\
+	$(DIRECTORY)/src/gallium/*/Makefile				\
+	$(DIRECTORY)/src/gallium/*/SConscript				\
+	$(DIRECTORY)/src/gallium/*/*/Makefile				\
+	$(DIRECTORY)/src/gallium/*/*/SConscript				\
+	$(DIRECTORY)/src/gallium/*/*/*.[ch]				\
+	$(DIRECTORY)/src/gallium/auxiliary/gallivm/*.cpp		\
+	$(DIRECTORY)/src/gallium/*/*/*.py				\
+	$(DIRECTORY)/src/gallium/*/*/*.csv				\
+	$(DIRECTORY)/src/gallium/*/*/*/Makefile				\
+	$(DIRECTORY)/src/gallium/*/*/*/SConscript			\
+	$(DIRECTORY)/src/gallium/*/*/*/*.[ch]				\
+	$(DIRECTORY)/src/gallium/*/*/*/*.py
+
+
+DRI_FILES = \
+	$(DIRECTORY)/include/GL/internal/dri_interface.h		\
+	$(DIRECTORY)/include/GL/internal/sarea.h			\
+	$(DIRECTORY)/src/glx/Makefile					\
+	$(DIRECTORY)/src/glx/*.[ch]					\
+	$(DIRECTORY)/src/mesa/drivers/dri/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template		\
+	$(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in			\
+	$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po		\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS]			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/*.cpp			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/*/*.[chS]			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/*/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile
+
+SGI_GLU_FILES = \
+	$(DIRECTORY)/src/glu/Makefile					\
+	$(DIRECTORY)/src/glu/glu.pc.in					\
+	$(DIRECTORY)/src/glu/sgi/Makefile				\
+	$(DIRECTORY)/src/glu/sgi/Makefile.mgw				\
+	$(DIRECTORY)/src/glu/sgi/Makefile.win				\
+	$(DIRECTORY)/src/glu/sgi/glu.def				\
+	$(DIRECTORY)/src/glu/sgi/dummy.cc				\
+	$(DIRECTORY)/src/glu/sgi/glu.exports				\
+	$(DIRECTORY)/src/glu/sgi/glu.exports.darwin			\
+	$(DIRECTORY)/src/glu/sgi/mesaglu.opt				\
+	$(DIRECTORY)/src/glu/sgi/include/gluos.h			\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h			\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc		\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h			\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc		\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h			\
+	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc			\
+	$(DIRECTORY)/src/glu/sgi/libtess/README				\
+	$(DIRECTORY)/src/glu/sgi/libtess/alg-outline			\
+	$(DIRECTORY)/src/glu/sgi/libtess/*.[ch]				\
+	$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
+
+GLW_FILES = \
+	$(DIRECTORY)/src/glw/*.[ch]			\
+	$(DIRECTORY)/src/glw/Makefile*			\
+	$(DIRECTORY)/src/glw/README			\
+	$(DIRECTORY)/src/glw/glw.pc.in			\
+	$(DIRECTORY)/src/glw/depend
+
+GLUT_FILES = \
+	$(DIRECTORY)/include/GL/glut.h			\
+	$(DIRECTORY)/include/GL/glutf90.h		\
+	$(DIRECTORY)/src/glut/glx/Makefile*		\
+	$(DIRECTORY)/src/glut/glx/SConscript		\
+	$(DIRECTORY)/src/glut/glx/depend		\
+	$(DIRECTORY)/src/glut/glx/glut.pc.in		\
+	$(DIRECTORY)/src/glut/glx/*def			\
+	$(DIRECTORY)/src/glut/glx/*.[ch]		\
+	$(DIRECTORY)/src/glut/beos/*.[ch]		\
+	$(DIRECTORY)/src/glut/beos/*.cpp		\
+	$(DIRECTORY)/src/glut/beos/Makefile
+
+DEPEND_FILES = \
+	$(TOP)/src/mesa/depend		\
+	$(TOP)/src/glx/depend		\
+	$(TOP)/src/glw/depend		\
+	$(TOP)/src/glut/glx/depend	\
+	$(TOP)/src/glu/sgi/depend
+
+
+LIB_FILES = \
+	$(MAIN_FILES)		\
+	$(MAPI_FILES)		\
+	$(ES_FILES)		\
+	$(EGL_FILES)		\
+	$(GALLIUM_FILES)	\
+	$(DRI_FILES)		\
+	$(SGI_GLU_FILES)	\
+	$(GLW_FILES)
+
+
+parsers: configure
+	-@touch $(TOP)/configs/current
+	$(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp
+	$(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h
+	$(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h
+
+# Everything for new a Mesa release:
+ARCHIVES = $(LIB_NAME).tar.gz \
+	$(LIB_NAME).tar.bz2 \
+	$(LIB_NAME).zip \
+	$(GLUT_NAME).tar.gz \
+	$(GLUT_NAME).tar.bz2 \
+	$(GLUT_NAME).zip
+
+tarballs: md5
+	rm -f ../$(LIB_NAME).tar
+
+# Helper for autoconf builds
+ACLOCAL = aclocal
+ACLOCAL_FLAGS =
+AUTOCONF = autoconf
+AC_FLAGS =
+aclocal.m4: configure.ac acinclude.m4
+	$(ACLOCAL) $(ACLOCAL_FLAGS)
+configure: rm_depend configure.ac aclocal.m4 acinclude.m4
+	$(AUTOCONF) $(AC_FLAGS)
+
+rm_depend:
+	@for dep in $(DEPEND_FILES) ; do \
+		rm -f $$dep ; \
+		touch $$dep ; \
+	done
+
+rm_config: parsers
+	rm -f configs/current
+	rm -f configs/autoconf
+
+$(LIB_NAME).tar: rm_config
+	cd .. ; tar -cf $(DIRECTORY)/$(LIB_NAME).tar $(LIB_FILES)
+
+$(LIB_NAME).tar.gz: $(LIB_NAME).tar
+	gzip --stdout --best $(LIB_NAME).tar > $(LIB_NAME).tar.gz
+
+$(GLUT_NAME).tar: rm_depend
+	cd .. ; tar -cf $(DIRECTORY)/$(GLUT_NAME).tar $(GLUT_FILES)
+
+$(GLUT_NAME).tar.gz: $(GLUT_NAME).tar
+	gzip --stdout --best $(GLUT_NAME).tar > $(GLUT_NAME).tar.gz
+
+$(LIB_NAME).tar.bz2: $(LIB_NAME).tar
+	bzip2 --stdout --best $(LIB_NAME).tar > $(LIB_NAME).tar.bz2
+
+$(GLUT_NAME).tar.bz2: $(GLUT_NAME).tar
+	bzip2 --stdout --best $(GLUT_NAME).tar > $(GLUT_NAME).tar.bz2
+
+$(LIB_NAME).zip: rm_config
+	rm -f $(LIB_NAME).zip ; \
+	cd .. ; \
+	zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \
+	mv $(LIB_NAME).zip $(DIRECTORY)
+
+$(GLUT_NAME).zip:
+	rm -f $(GLUT_NAME).zip ; \
+	cd .. ; \
+	zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \
+	mv $(GLUT_NAME).zip $(DIRECTORY)
+
+md5: $(ARCHIVES)
+	@-md5sum $(LIB_NAME).tar.gz
+	@-md5sum $(LIB_NAME).tar.bz2
+	@-md5sum $(LIB_NAME).zip
+	@-md5sum $(GLUT_NAME).tar.gz
+	@-md5sum $(GLUT_NAME).tar.bz2
+	@-md5sum $(GLUT_NAME).zip
+
+.PHONY: tarballs rm_depend rm_config md5
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index a201c31ae..510d23f41 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -1,1977 +1,1977 @@
-dnl Process this file with autoconf to create configure.

-

-AC_PREREQ([2.59])

-

-dnl Versioning - scrape the version from configs/default

-m4_define([mesa_version],

-    [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n' | tr -d '\r'])])

-m4_ifval(mesa_version,,

-    [m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])])

-

-dnl Tell the user about autoconf.html in the --help output

-m4_divert_once([HELP_END], [

-See docs/autoconf.html for more details on the options for Mesa.])

-

-AC_INIT([Mesa],[mesa_version],

-    [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])

-AC_CONFIG_AUX_DIR([bin])

-AC_CANONICAL_HOST

-

-dnl Versions for external dependencies

-LIBDRM_REQUIRED=2.4.24

-LIBDRM_RADEON_REQUIRED=2.4.24

-LIBDRM_INTEL_REQUIRED=2.4.24

-DRI2PROTO_REQUIRED=2.1

-GLPROTO_REQUIRED=1.4.11

-LIBDRM_XORG_REQUIRED=2.4.24

-LIBKMS_XORG_REQUIRED=1.0.0

-

-dnl Check for progs

-AC_PROG_CPP

-AC_PROG_CC

-AC_PROG_CXX

-AC_CHECK_PROGS([MAKE], [gmake make])

-AC_CHECK_PROGS([PYTHON2], [python2 python])

-AC_PATH_PROG([MKDEP], [makedepend])

-AC_PATH_PROG([SED], [sed])

-

-if test "x$MKDEP" = "x"; then

-    AC_MSG_ERROR([makedepend is required to build Mesa])

-fi

-

-AC_PATH_PROG([FLEX], [flex])

-test "x$FLEX" = "x" && AC_MSG_ERROR([flex is needed to build Mesa])

-

-AC_PATH_PROG([BISON], [bison])

-test "x$BISON" = "x" && AC_MSG_ERROR([bison is needed to build Mesa])

-

-dnl Our fallback install-sh is a symlink to minstall. Use the existing

-dnl configuration in that case.

-AC_PROG_INSTALL

-test "x$INSTALL" = "x$ac_install_sh" && INSTALL='$(MINSTALL)'

-

-dnl We need a POSIX shell for parts of the build. Assume we have one

-dnl in most cases.

-case "$host_os" in

-solaris*)

-    # Solaris /bin/sh is too old/non-POSIX compliant

-    AC_PATH_PROGS(POSIX_SHELL, [ksh93 ksh sh])

-    SHELL="$POSIX_SHELL"

-    ;;

-esac

-

-dnl clang is mostly GCC-compatible, but its version is much lower,

-dnl so we have to check for it.

-AC_MSG_CHECKING([if compiling with clang])

-

-AC_COMPILE_IFELSE(

-[AC_LANG_PROGRAM([], [[

-#ifndef __clang__

-       not clang

-#endif

-]])],

-[CLANG=yes], [CLANG=no])

-

-AC_MSG_RESULT([$CLANG])

-

-dnl If we're using GCC, make sure that it is at least version 3.3.0.  Older

-dnl versions are explictly not supported.

-if test "x$GCC" = xyes -a "x$CLANG" = xno; then

-    AC_MSG_CHECKING([whether gcc version is sufficient])

-    major=0

-    minor=0

-

-    GCC_VERSION=`$CC -dumpversion`

-    if test $? -eq 0; then

-        major=`echo $GCC_VERSION | cut -d. -f1`

-        minor=`echo $GCC_VERSION | cut -d. -f1`

-    fi

-

-    if test $major -lt 3 -o $major -eq 3 -a $minor -lt 3 ; then

-        AC_MSG_RESULT([no])

-        AC_MSG_ERROR([If using GCC, version 3.3.0 or later is required.])

-    else

-        AC_MSG_RESULT([yes])

-    fi

-fi

-

-

-MKDEP_OPTIONS=-fdepend

-dnl Ask gcc where it's keeping its secret headers

-if test "x$GCC" = xyes; then

-    for dir in include include-fixed; do

-        GCC_INCLUDES=`$CC -print-file-name=$dir`

-        if test "x$GCC_INCLUDES" != x && \

-           test "$GCC_INCLUDES" != "$dir" && \

-           test -d "$GCC_INCLUDES"; then

-            MKDEP_OPTIONS="$MKDEP_OPTIONS -I$GCC_INCLUDES"

-        fi

-    done

-fi

-AC_SUBST([MKDEP_OPTIONS])

-

-dnl Make sure the pkg-config macros are defined

-m4_ifndef([PKG_PROG_PKG_CONFIG],

-    [m4_fatal([Could not locate the pkg-config autoconf macros.

-  These are usually located in /usr/share/aclocal/pkg.m4. If your macros

-  are in a different location, try setting the environment variable

-  ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])])

-PKG_PROG_PKG_CONFIG()

-

-dnl LIB_DIR - library basename

-LIB_DIR=`echo $libdir | $SED 's%.*/%%'`

-AC_SUBST([LIB_DIR])

-

-dnl Cache LDFLAGS so we can add EXTRA_LIB_PATH and restore it later

-_SAVE_LDFLAGS="$LDFLAGS"

-AC_ARG_VAR([EXTRA_LIB_PATH],[Extra -L paths for the linker])

-AC_SUBST([EXTRA_LIB_PATH])

-

-dnl Cache CPPFLAGS so we can add *_INCLUDES and restore it later

-_SAVE_CPPFLAGS="$CPPFLAGS"

-AC_ARG_VAR([X11_INCLUDES],[Extra -I paths for X11 headers])

-AC_SUBST([X11_INCLUDES])

-

-dnl Compiler macros

-DEFINES=""

-AC_SUBST([DEFINES])

-case "$host_os" in

-linux*|*-gnu*|gnu*)

-    DEFINES="$DEFINES -D_GNU_SOURCE -DPTHREADS"

-    ;;

-solaris*)

-    DEFINES="$DEFINES -DPTHREADS -DSVR4"

-    ;;

-cygwin*)

-    DEFINES="$DEFINES -DPTHREADS"

-    ;;

-esac

-

-dnl Add flags for gcc and g++

-if test "x$GCC" = xyes; then

-    CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -std=c99"

-    if test "x$CLANG" = "xno"; then

-       CFLAGS="$CFLAGS -ffast-math"

-    fi

-

-    # Enable -fvisibility=hidden if using a gcc that supports it

-    save_CFLAGS="$CFLAGS"

-    AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])

-    VISIBILITY_CFLAGS="-fvisibility=hidden"

-    CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"

-    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),

-		   [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);

-

-    # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.

-    CFLAGS=$save_CFLAGS

-

-    # Work around aliasing bugs - developers should comment this out

-    CFLAGS="$CFLAGS -fno-strict-aliasing"

-fi

-if test "x$GXX" = xyes; then

-    CXXFLAGS="$CXXFLAGS -Wall"

-

-    # Enable -fvisibility=hidden if using a gcc that supports it

-    save_CXXFLAGS="$CXXFLAGS"

-    AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])

-    VISIBILITY_CXXFLAGS="-fvisibility=hidden"

-    CXXFLAGS="$CXXFLAGS $VISIBILITY_CXXFLAGS"

-    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),

-		   [VISIBILITY_CXXFLAGS="" ; AC_MSG_RESULT([no])]);

-

-    # Restore CXXFLAGS; VISIBILITY_CXXFLAGS are added to it where needed.

-    CXXFLAGS=$save_CXXFLAGS

-

-    # Work around aliasing bugs - developers should comment this out

-    CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"

-fi

-

-AC_SUBST([VISIBILITY_CFLAGS])

-AC_SUBST([VISIBILITY_CXXFLAGS])

-

-dnl These should be unnecessary, but let the user set them if they want

-AC_ARG_VAR([OPT_FLAGS], [Additional optimization flags for the compiler.

-    Default is to use CFLAGS.])

-AC_ARG_VAR([ARCH_FLAGS], [Additional architecture specific flags for the

-    compiler. Default is to use CFLAGS.])

-AC_SUBST([OPT_FLAGS])

-AC_SUBST([ARCH_FLAGS])

-

-dnl

-dnl Hacks to enable 32 or 64 bit build

-dnl

-AC_ARG_ENABLE([32-bit],

-    [AS_HELP_STRING([--enable-32-bit],

-        [build 32-bit libraries @<:@default=auto@:>@])],

-    [enable_32bit="$enableval"],

-    [enable_32bit=auto]

-)

-if test "x$enable_32bit" = xyes; then

-    if test "x$GCC" = xyes; then

-        CFLAGS="$CFLAGS -m32"

-        ARCH_FLAGS="$ARCH_FLAGS -m32"

-    fi

-    if test "x$GXX" = xyes; then

-        CXXFLAGS="$CXXFLAGS -m32"

-    fi

-fi

-AC_ARG_ENABLE([64-bit],

-    [AS_HELP_STRING([--enable-64-bit],

-        [build 64-bit libraries @<:@default=auto@:>@])],

-    [enable_64bit="$enableval"],

-    [enable_64bit=auto]

-)

-if test "x$enable_64bit" = xyes; then

-    if test "x$GCC" = xyes; then

-        CFLAGS="$CFLAGS -m64"

-    fi

-    if test "x$GXX" = xyes; then

-        CXXFLAGS="$CXXFLAGS -m64"

-    fi

-fi

-

-dnl

-dnl shared/static libraries, mimic libtool options

-dnl

-AC_ARG_ENABLE([static],

-    [AS_HELP_STRING([--enable-static],

-        [build static libraries @<:@default=disabled@:>@])],

-    [enable_static="$enableval"],

-    [enable_static=no]

-)

-case "x$enable_static" in

-xyes|xno ) ;;

-x ) enable_static=no ;;

-* )

-    AC_MSG_ERROR([Static library option '$enable_static' is not a valid])

-    ;;

-esac

-AC_ARG_ENABLE([shared],

-    [AS_HELP_STRING([--disable-shared],

-        [build shared libraries @<:@default=enabled@:>@])],

-    [enable_shared="$enableval"],

-    [enable_shared=yes]

-)

-case "x$enable_shared" in

-xyes|xno ) ;;

-x ) enable_shared=yes ;;

-* )

-    AC_MSG_ERROR([Shared library option '$enable_shared' is not a valid])

-    ;;

-esac

-

-dnl Can't have static and shared libraries, default to static if user

-dnl explicitly requested. If both disabled, set to static since shared

-dnl was explicitly requirested.

-case "x$enable_static$enable_shared" in

-xyesyes )

-    AC_MSG_WARN([Can't build static and shared libraries, disabling shared])

-    enable_shared=no

-    ;;

-xnono )

-    AC_MSG_WARN([Can't disable both static and shared libraries, enabling static])

-    enable_static=yes

-    ;;

-esac

-

-dnl

-dnl mklib options

-dnl

-AC_ARG_VAR([MKLIB_OPTIONS],[Options for the Mesa library script, mklib])

-if test "$enable_static" = yes; then

-    MKLIB_OPTIONS="$MKLIB_OPTIONS -static"

-fi

-AC_SUBST([MKLIB_OPTIONS])

-

-dnl

-dnl other compiler options

-dnl

-AC_ARG_ENABLE([debug],

-    [AS_HELP_STRING([--enable-debug],

-        [use debug compiler flags and macros @<:@default=disabled@:>@])],

-    [enable_debug="$enableval"],

-    [enable_debug=no]

-)

-if test "x$enable_debug" = xyes; then

-    DEFINES="$DEFINES -DDEBUG"

-    if test "x$GCC" = xyes; then

-        CFLAGS="$CFLAGS -g"

-    fi

-    if test "x$GXX" = xyes; then

-        CXXFLAGS="$CXXFLAGS -g"

-    fi

-fi

-

-dnl

-dnl library names

-dnl

-LIB_PREFIX_GLOB='lib'

-LIB_VERSION_SEPARATOR='.'

-if test "$enable_static" = yes; then

-    LIB_EXTENSION='a'

-else

-    case "$host_os" in

-    darwin* )

-        LIB_EXTENSION='dylib' ;;

-    cygwin* )

-        dnl prefix can be 'cyg' or 'lib'

-        LIB_PREFIX_GLOB='???'

-        LIB_VERSION_SEPARATOR='-'

-        LIB_EXTENSION='dll' ;;

-    aix* )

-        LIB_EXTENSION='a' ;;

-    * )

-        LIB_EXTENSION='so' ;;

-    esac

-fi

-

-dnl

-dnl potentially-infringing-but-nobody-knows-for-sure stuff

-dnl

-AC_ARG_ENABLE([texture-float],

-    [AS_HELP_STRING([--enable-texture-float],

-        [enable floating-point textures and renderbuffers @<:@default=disabled@:>@])],

-    [enable_texture_float="$enableval"],

-    [enable_texture_float=no]

-)

-if test "x$enable_texture_float" = xyes; then

-    AC_MSG_WARN([Floating-point textures enabled.])

-    AC_MSG_WARN([Please consult docs/patents.txt with your lawyer before building Mesa.])

-    DEFINES="$DEFINES -DTEXTURE_FLOAT_ENABLED"

-fi

-

-GL_LIB_NAME='lib$(GL_LIB).'${LIB_EXTENSION}

-GLU_LIB_NAME='lib$(GLU_LIB).'${LIB_EXTENSION}

-GLUT_LIB_NAME='lib$(GLUT_LIB).'${LIB_EXTENSION}

-GLW_LIB_NAME='lib$(GLW_LIB).'${LIB_EXTENSION}

-OSMESA_LIB_NAME='lib$(OSMESA_LIB).'${LIB_EXTENSION}

-EGL_LIB_NAME='lib$(EGL_LIB).'${LIB_EXTENSION}

-GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION}

-GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION}

-VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION}

-GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION}

-WAYLAND_EGL_LIB_NAME='lib$(WAYLAND_EGL_LIB).'${LIB_EXTENSION}

-

-GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-GLUT_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLUT_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-GLW_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLW_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-OSMESA_LIB_GLOB=${LIB_PREFIX_GLOB}'$(OSMESA_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-GLESv1_CM_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv1_CM_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-GLESv2_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv2_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-VG_LIB_GLOB=${LIB_PREFIX_GLOB}'$(VG_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-GLAPI_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLAPI_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-WAYLAND_EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(WAYLAND_EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-

-AC_SUBST([GL_LIB_NAME])

-AC_SUBST([GLU_LIB_NAME])

-AC_SUBST([GLUT_LIB_NAME])

-AC_SUBST([GLW_LIB_NAME])

-AC_SUBST([OSMESA_LIB_NAME])

-AC_SUBST([EGL_LIB_NAME])

-AC_SUBST([GLESv1_CM_LIB_NAME])

-AC_SUBST([GLESv2_LIB_NAME])

-AC_SUBST([VG_LIB_NAME])

-AC_SUBST([GLAPI_LIB_NAME])

-AC_SUBST([WAYLAND_EGL_LIB_NAME])

-

-AC_SUBST([GL_LIB_GLOB])

-AC_SUBST([GLU_LIB_GLOB])

-AC_SUBST([GLUT_LIB_GLOB])

-AC_SUBST([GLW_LIB_GLOB])

-AC_SUBST([OSMESA_LIB_GLOB])

-AC_SUBST([EGL_LIB_GLOB])

-AC_SUBST([GLESv1_CM_LIB_GLOB])

-AC_SUBST([GLESv2_LIB_GLOB])

-AC_SUBST([VG_LIB_GLOB])

-AC_SUBST([GLAPI_LIB_GLOB])

-AC_SUBST([WAYLAND_EGL_LIB_GLOB])

-

-dnl

-dnl Arch/platform-specific settings

-dnl

-AC_ARG_ENABLE([asm],

-    [AS_HELP_STRING([--disable-asm],

-        [disable assembly usage @<:@default=enabled on supported plaforms@:>@])],

-    [enable_asm="$enableval"],

-    [enable_asm=yes]

-)

-asm_arch=""

-ASM_FLAGS=""

-MESA_ASM_SOURCES=""

-GLAPI_ASM_SOURCES=""

-AC_MSG_CHECKING([whether to enable assembly])

-test "x$enable_asm" = xno && AC_MSG_RESULT([no])

-# disable if cross compiling on x86/x86_64 since we must run gen_matypes

-if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then

-    case "$host_cpu" in

-    i?86 | x86_64)

-        enable_asm=no

-        AC_MSG_RESULT([no, cross compiling])

-        ;;

-    esac

-fi

-# check for supported arches

-if test "x$enable_asm" = xyes; then

-    case "$host_cpu" in

-    i?86)

-        case "$host_os" in

-        linux* | *freebsd* | dragonfly* | *netbsd*)

-            test "x$enable_64bit" = xyes && asm_arch=x86_64 || asm_arch=x86

-            ;;

-        esac

-        ;;

-    x86_64)

-        case "$host_os" in

-        linux* | *freebsd* | dragonfly* | *netbsd*)

-            test "x$enable_32bit" = xyes && asm_arch=x86 || asm_arch=x86_64

-            ;;

-        esac

-        ;;

-    powerpc)

-        case "$host_os" in

-        linux*)

-            asm_arch=ppc

-            ;;

-        esac

-        ;;

-    sparc*)

-        case "$host_os" in

-        linux*)

-            asm_arch=sparc

-            ;;

-        esac

-        ;;

-    esac

-

-    case "$asm_arch" in

-    x86)

-        ASM_FLAGS="-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM"

-        MESA_ASM_SOURCES='$(X86_SOURCES)'

-        GLAPI_ASM_SOURCES='$(X86_API)'

-        AC_MSG_RESULT([yes, x86])

-        ;;

-    x86_64)

-        ASM_FLAGS="-DUSE_X86_64_ASM"

-        MESA_ASM_SOURCES='$(X86-64_SOURCES)'

-        GLAPI_ASM_SOURCES='$(X86-64_API)'

-        AC_MSG_RESULT([yes, x86_64])

-        ;;

-    ppc)

-        ASM_FLAGS="-DUSE_PPC_ASM -DUSE_VMX_ASM"

-        MESA_ASM_SOURCES='$(PPC_SOURCES)'

-        AC_MSG_RESULT([yes, ppc])

-        ;;

-    sparc)

-        ASM_FLAGS="-DUSE_SPARC_ASM"

-        MESA_ASM_SOURCES='$(SPARC_SOURCES)'

-        GLAPI_ASM_SOURCES='$(SPARC_API)'

-        AC_MSG_RESULT([yes, sparc])

-        ;;

-    *)

-        AC_MSG_RESULT([no, platform not supported])

-        ;;

-    esac

-fi

-AC_SUBST([ASM_FLAGS])

-AC_SUBST([MESA_ASM_SOURCES])

-AC_SUBST([GLAPI_ASM_SOURCES])

-

-dnl PIC code macro

-MESA_PIC_FLAGS

-

-dnl Check to see if dlopen is in default libraries (like Solaris, which

-dnl has it in libc), or if libdl is needed to get it.

-AC_CHECK_FUNC([dlopen], [],

-    [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])

-AC_SUBST([DLOPEN_LIBS])

-

-dnl See if posix_memalign is available

-AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])

-

-dnl SELinux awareness.

-AC_ARG_ENABLE([selinux],

-    [AS_HELP_STRING([--enable-selinux],

-        [Build SELinux-aware Mesa @<:@default=disabled@:>@])],

-    [MESA_SELINUX="$enableval"],

-    [MESA_SELINUX=no])

-if test "x$enable_selinux" = "xyes"; then

-    AC_CHECK_HEADER([selinux/selinux.h],[],

-                    [AC_MSG_ERROR([SELinux headers not found])])

-    AC_CHECK_LIB([selinux],[is_selinux_enabled],[],

-                 [AC_MSG_ERROR([SELinux library not found])])

-    SELINUX_LIBS="-lselinux"

-    DEFINES="$DEFINES -DMESA_SELINUX"

-fi

-

-dnl Determine which APIs to support

-AC_ARG_ENABLE([opengl],

-    [AS_HELP_STRING([--disable-opengl],

-        [disable support for standard OpenGL API @<:@default=no@:>@])],

-    [enable_opengl="$enableval"],

-    [enable_opengl=yes])

-AC_ARG_ENABLE([gles1],

-    [AS_HELP_STRING([--enable-gles1],

-        [enable support for OpenGL ES 1.x API @<:@default=no@:>@])],

-    [enable_gles1="$enableval"],

-    [enable_gles1=no])

-AC_ARG_ENABLE([gles2],

-    [AS_HELP_STRING([--enable-gles2],

-        [enable support for OpenGL ES 2.x API @<:@default=no@:>@])],

-    [enable_gles2="$enableval"],

-    [enable_gles2=no])

-AC_ARG_ENABLE([gles-overlay],

-    [AS_HELP_STRING([--enable-gles-overlay],

-        [DEPRECATED.  Same as --enable-gles1 and --enable-gles2])],

-    [enable_gles1="$enableval"; enable_gles2="$enableval"],

-    [])

-

-AC_ARG_ENABLE([openvg],

-    [AS_HELP_STRING([--enable-openvg],

-        [enable support for OpenVG API @<:@default=no@:>@])],

-    [enable_openvg="$enableval"],

-    [enable_openvg=no])

-

-dnl smooth the transition; should be removed eventually

-if test "x$enable_openvg" = xno; then

-    case "x$with_state_trackers" in

-    x*vega*)

-        AC_MSG_WARN([vega state tracker is enabled without --enable-openvg])

-        enable_openvg=yes

-        ;;

-    esac

-fi

-

-if test "x$enable_opengl" = xno -a \

-        "x$enable_gles1" = xno -a \

-        "x$enable_gles2" = xno -a \

-        "x$enable_openvg" = xno; then

-    AC_MSG_ERROR([at least one API should be enabled])

-fi

-

-API_DEFINES=""

-if test "x$enable_opengl" = xno; then

-    API_DEFINES="$API_DEFINES -DFEATURE_GL=0"

-else

-    API_DEFINES="$API_DEFINES -DFEATURE_GL=1"

-fi

-if test "x$enable_gles1" = xyes; then

-    API_DEFINES="$API_DEFINES -DFEATURE_ES1=1"

-fi

-if test "x$enable_gles2" = xyes; then

-    API_DEFINES="$API_DEFINES -DFEATURE_ES2=1"

-fi

-AC_SUBST([API_DEFINES])

-

-AC_ARG_ENABLE([shared-glapi],

-    [AS_HELP_STRING([--enable-shared-glapi],

-        [EXPERIMENTAL.  Enable shared glapi for OpenGL @<:@default=no@:>@])],

-    [enable_shared_glapi="$enableval"],

-    [enable_shared_glapi=no])

-

-SHARED_GLAPI="0"

-if test "x$enable_shared_glapi" = xyes; then

-    SHARED_GLAPI="1"

-fi

-AC_SUBST([SHARED_GLAPI])

-

-dnl

-dnl Driver configuration. Options are xlib, dri and osmesa right now.

-dnl More later: fbdev, ...

-dnl

-default_driver="xlib"

-

-case "$host_os" in

-linux*)

-    case "$host_cpu" in

-    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;

-    esac

-    ;;

-*freebsd* | dragonfly* | *netbsd*)

-    case "$host_cpu" in

-    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;

-    esac

-    ;;

-esac

-

-if test "x$enable_opengl" = xno; then

-    default_driver="no"

-fi

-

-AC_ARG_WITH([driver],

-    [AS_HELP_STRING([--with-driver=DRIVER],

-        [driver for Mesa: xlib,dri,osmesa @<:@default=dri when available, or xlib@:>@])],

-    [mesa_driver="$withval"],

-    [mesa_driver="$default_driver"])

-dnl Check for valid option

-case "x$mesa_driver" in

-xxlib|xdri|xosmesa)

-    if test "x$enable_opengl" = xno; then

-        AC_MSG_ERROR([Driver '$mesa_driver' requires OpenGL enabled])

-    fi

-    ;;

-xno)

-    ;;

-*)

-    AC_MSG_ERROR([Driver '$mesa_driver' is not a valid option])

-    ;;

-esac

-

-dnl

-dnl Driver specific build directories

-dnl

-

-dnl this variable will be prepended to SRC_DIRS and is not exported

-CORE_DIRS=""

-

-SRC_DIRS=""

-GLU_DIRS="sgi"

-GALLIUM_DIRS="auxiliary drivers state_trackers"

-GALLIUM_TARGET_DIRS=""

-GALLIUM_WINSYS_DIRS="sw"

-GALLIUM_DRIVERS_DIRS="softpipe failover galahad trace rbug noop identity"

-GALLIUM_STATE_TRACKERS_DIRS=""

-

-# build shared-glapi if enabled for OpenGL or if OpenGL ES is enabled

-case "x$enable_shared_glapi$enable_gles1$enable_gles2" in

-x*yes*)

-    CORE_DIRS="$CORE_DIRS mapi/shared-glapi"

-    ;;

-esac

-

-# build glapi if OpenGL is enabled

-if test "x$enable_opengl" = xyes; then

-    CORE_DIRS="$CORE_DIRS mapi/glapi"

-fi

-

-# build es1api if OpenGL ES 1.x is enabled

-if test "x$enable_gles1" = xyes; then

-    CORE_DIRS="$CORE_DIRS mapi/es1api"

-fi

-

-# build es2api if OpenGL ES 2.x is enabled

-if test "x$enable_gles2" = xyes; then

-    CORE_DIRS="$CORE_DIRS mapi/es2api"

-fi

-

-# build vgapi if OpenVG is enabled

-if test "x$enable_openvg" = xyes; then

-    CORE_DIRS="$CORE_DIRS mapi/vgapi"

-fi

-

-# build glsl and mesa if OpenGL or OpenGL ES is enabled

-case "x$enable_opengl$enable_gles1$enable_gles2" in

-x*yes*)

-    CORE_DIRS="$CORE_DIRS glsl mesa"

-    ;;

-esac

-

-case "$mesa_driver" in

-xlib)

-    DRIVER_DIRS="x11"

-    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib"

-    GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib"

-    ;;

-dri)

-    SRC_DIRS="$SRC_DIRS glx"

-    DRIVER_DIRS="dri"

-    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib sw/dri"

-    ;;

-osmesa)

-    DRIVER_DIRS="osmesa"

-    ;;

-no)

-    DRIVER_DRIS=""

-    ;;

-esac

-AC_SUBST([SRC_DIRS])

-AC_SUBST([GLU_DIRS])

-AC_SUBST([DRIVER_DIRS])

-AC_SUBST([GALLIUM_DIRS])

-AC_SUBST([GALLIUM_TARGET_DIRS])

-AC_SUBST([GALLIUM_WINSYS_DIRS])

-AC_SUBST([GALLIUM_DRIVERS_DIRS])

-AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])

-AC_SUBST([MESA_LLVM])

-

-dnl

-dnl Find out if X is available. The variable have_x is set if libX11 is

-dnl found to mimic AC_PATH_XTRA.

-dnl

-if test -n "$PKG_CONFIG"; then

-    AC_MSG_CHECKING([pkg-config files for X11 are available])

-    PKG_CHECK_EXISTS([x11],[

-        x11_pkgconfig=yes

-        have_x=yes

-        ],[

-        x11_pkgconfig=no

-    ])

-    AC_MSG_RESULT([$x11_pkgconfig])

-else

-    x11_pkgconfig=no

-fi

-dnl Use the autoconf macro if no pkg-config files

-if test "$x11_pkgconfig" = yes; then

-    PKG_CHECK_MODULES([X11], [x11])

-else

-    AC_PATH_XTRA

-    test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS"

-    test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11"

-    AC_SUBST([X11_CFLAGS])

-    AC_SUBST([X11_LIBS])

-fi

-

-dnl Try to tell the user that the --x-* options are only used when

-dnl pkg-config is not available. This must be right after AC_PATH_XTRA.

-m4_divert_once([HELP_BEGIN],

-[These options are only used when the X libraries cannot be found by the

-pkg-config utility.])

-

-dnl We need X for xlib and dri, so bomb now if it's not found

-case "$mesa_driver" in

-xlib|dri)

-    if test "$no_x" = yes; then

-        AC_MSG_ERROR([X11 development libraries needed for $mesa_driver driver])

-    fi

-    ;;

-esac

-

-dnl XCB - this is only used for GLX right now

-AC_ARG_ENABLE([xcb],

-    [AS_HELP_STRING([--enable-xcb],

-        [use XCB for GLX @<:@default=disabled@:>@])],

-    [enable_xcb="$enableval"],

-    [enable_xcb=no])

-if test "x$enable_xcb" = xyes; then

-    DEFINES="$DEFINES -DUSE_XCB"

-else

-    enable_xcb=no

-fi

-

-dnl Direct rendering or just indirect rendering

-case "$host_os" in

-gnu*)

-    dnl Disable by default on GNU/Hurd

-    driglx_direct_default="no"

-    ;;

-cygwin*)

-    dnl Disable by default on cygwin

-    driglx_direct_default="no"

-    ;;

-*)

-    driglx_direct_default="yes"

-    ;;

-esac

-AC_ARG_ENABLE([driglx-direct],

-    [AS_HELP_STRING([--disable-driglx-direct],

-        [enable direct rendering in GLX and EGL for DRI \

-            @<:@default=auto@:>@])],

-    [driglx_direct="$enableval"],

-    [driglx_direct="$driglx_direct_default"])

-

-dnl

-dnl libGL configuration per driver

-dnl

-case "$mesa_driver" in

-xlib)

-    if test "$x11_pkgconfig" = yes; then

-        PKG_CHECK_MODULES([XLIBGL], [x11 xext])

-        GL_PC_REQ_PRIV="x11 xext"

-        X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS"

-        GL_LIB_DEPS="$XLIBGL_LIBS"

-    else

-        # should check these...

-        X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"

-        GL_LIB_DEPS="$X_LIBS -lX11 -lXext"

-        GL_PC_LIB_PRIV="$GL_LIB_DEPS"

-        GL_PC_CFLAGS="$X11_INCLUDES"

-    fi

-    GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread"

-    GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread"

-

-    # if static, move the external libraries to the programs

-    # and empty the libraries for libGL

-    if test "$enable_static" = yes; then

-        APP_LIB_DEPS="$APP_LIB_DEPS $GL_LIB_DEPS"

-        GL_LIB_DEPS=""

-    fi

-    ;;

-dri|no) # these checks are still desired when there is no mesa_driver

-    # DRI must be shared, I think

-    if test "$enable_static" = yes; then

-        AC_MSG_ERROR([Can't use static libraries for DRI drivers])

-    fi

-

-    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])

-    GL_PC_REQ_PRIV="glproto >= $GLPROTO_REQUIRED"

-    DRI_PC_REQ_PRIV=""

-

-    if test x"$driglx_direct" = xyes; then

-        # Check for libdrm

-        PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])

-        PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])

-        GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED"

-        DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"

-    fi

-

-    # find the DRI deps for libGL

-    if test "$x11_pkgconfig" = yes; then

-        dri_modules="x11 xext xdamage xfixes"

-

-        # add xf86vidmode if available

-        PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no)

-        if test "$HAVE_XF86VIDMODE" = yes ; then

-            dri_modules="$dri_modules xxf86vm"

-        fi

-

-        # add xcb modules if necessary

-        if test "$enable_xcb" = yes; then

-            dri_modules="$dri_modules x11-xcb xcb-glx"

-        fi

-

-        PKG_CHECK_MODULES([DRIGL], [$dri_modules])

-        GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"

-        X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS"

-        GL_LIB_DEPS="$DRIGL_LIBS"

-    else

-        # should check these...

-        X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"

-        GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes"

-        GL_PC_LIB_PRIV="$GL_LIB_DEPS"

-        GL_PC_CFLAGS="$X11_INCLUDES"

-

-        # XCB can only be used from pkg-config

-        if test "$enable_xcb" = yes; then

-            PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx])

-            GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV x11-xcb xcb-glx"

-            X11_INCLUDES="$X11_INCLUDES $XCB_CFLAGS"

-            GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS"

-        fi

-    fi

-

-    # need DRM libs, -lpthread, etc.

-    GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"

-    GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"

-    GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"

-    GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"

-    GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"

-    GLESv2_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"

-    ;;

-osmesa)

-    # No libGL for osmesa

-    GL_LIB_DEPS=""

-    ;;

-esac

-AC_SUBST([GL_LIB_DEPS])

-AC_SUBST([GL_PC_REQ_PRIV])

-AC_SUBST([GL_PC_LIB_PRIV])

-AC_SUBST([GL_PC_CFLAGS])

-AC_SUBST([DRI_PC_REQ_PRIV])

-AC_SUBST([GLESv1_CM_LIB_DEPS])

-AC_SUBST([GLESv1_CM_PC_LIB_PRIV])

-AC_SUBST([GLESv2_LIB_DEPS])

-AC_SUBST([GLESv2_PC_LIB_PRIV])

-

-GLAPI_LIB_DEPS="-lpthread"

-AC_SUBST([GLAPI_LIB_DEPS])

-

-

-dnl Setup default DRI CFLAGS

-DRI_CFLAGS='$(CFLAGS)'

-DRI_CXXFLAGS='$(CXXFLAGS)'

-DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'

-MESA_MODULES='$(TOP)/src/mesa/libmesa.a'

-

-AC_ARG_ENABLE([shared-dricore],

-    [AS_HELP_STRING([--enable-shared-dricore],

-        [link DRI modules with shared core DRI routines @<:@default=disabled@:>@])],

-    [enable_dricore="$enableval"],

-    [enable_dricore=no])

-if test "$mesa_driver" = dri ; then

-   if test "$enable_dricore" = yes ; then

-      if test "$GCC$GXX" != yesyes ; then

-      	 AC_MSG_WARN([Shared dricore requires GCC-compatible rpath handling.  Disabling shared dricore])

-	 enable_dricore=no

-      else

-	 DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'

-	 DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'

-	 DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl'

-      	 DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore -lglsl'

-      	 DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE'

-      	 DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE'

-      	 MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'

-      fi

-   fi

-fi

-AC_SUBST([DRICORE_LIBS])

-AC_SUBST([DRICORE_GLSL_LIBS])

-AC_SUBST([DRICORE_LIB_DEPS])

-AC_SUBST([DRI_CXXFLAGS])

-AC_SUBST([DRI_CFLAGS])

-AC_SUBST([MESA_MODULES])

-

-AC_SUBST([HAVE_XF86VIDMODE])

-

-PKG_CHECK_MODULES([LIBDRM_RADEON],

-		  [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED],

-		  HAVE_LIBDRM_RADEON=yes,

-		  HAVE_LIBDRM_RADEON=no)

-

-dnl

-dnl More X11 setup

-dnl

-if test "$mesa_driver" = xlib; then

-    DEFINES="$DEFINES -DUSE_XSHM"

-fi

-

-dnl

-dnl TLS detection

-dnl

-

-AC_ARG_ENABLE([glx-tls],

-    [AS_HELP_STRING([--enable-glx-tls],

-        [enable TLS support in GLX @<:@default=disabled@:>@])],

-    [GLX_USE_TLS="$enableval"],

-    [GLX_USE_TLS=no])

-AC_SUBST(GLX_TLS, ${GLX_USE_TLS})

-

-AS_IF([test "x$GLX_USE_TLS" = xyes],

-      [DEFINES="${DEFINES} -DGLX_USE_TLS -DPTHREADS"])

-

-dnl

-dnl More DRI setup

-dnl

-dnl Directory for DRI drivers

-AC_ARG_WITH([dri-driverdir],

-    [AS_HELP_STRING([--with-dri-driverdir=DIR],

-        [directory for the DRI drivers @<:@${libdir}/dri@:>@])],

-    [DRI_DRIVER_INSTALL_DIR="$withval"],

-    [DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])

-AC_SUBST([DRI_DRIVER_INSTALL_DIR])

-dnl Extra search path for DRI drivers

-AC_ARG_WITH([dri-searchpath],

-    [AS_HELP_STRING([--with-dri-searchpath=DIRS...],

-        [semicolon delimited DRI driver search directories @<:@${libdir}/dri@:>@])],

-    [DRI_DRIVER_SEARCH_DIR="$withval"],

-    [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])

-AC_SUBST([DRI_DRIVER_SEARCH_DIR])

-dnl Which drivers to build - default is chosen by platform

-AC_ARG_WITH([dri-drivers],

-    [AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@],

-        [comma delimited DRI drivers list, e.g.

-        "swrast,i965,radeon" @<:@default=auto@:>@])],

-    [with_dri_drivers="$withval"],

-    [with_dri_drivers=yes])

-if test "x$with_dri_drivers" = x; then

-    with_dri_drivers=no

-fi

-

-dnl If $with_dri_drivers is yes, directories will be added through

-dnl platform checks

-DRI_DIRS=""

-case "$with_dri_drivers" in

-no) ;;

-yes)

-    DRI_DIRS="yes"

-    ;;

-*)

-    # verify the requested driver directories exist

-    dri_drivers=`IFS=', '; echo $with_dri_drivers`

-    for driver in $dri_drivers; do

-        test -d "$srcdir/src/mesa/drivers/dri/$driver" || \

-            AC_MSG_ERROR([DRI driver directory '$driver' doesn't exist])

-    done

-    DRI_DIRS="$dri_drivers"

-    ;;

-esac

-

-dnl Set DRI_DIRS, DEFINES and LIB_DEPS

-if test "$mesa_driver" = dri -o "$mesa_driver" = no; then

-    # Platform specific settings and drivers to build

-    case "$host_os" in

-    linux*)

-        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

-        if test "x$driglx_direct" = xyes; then

-            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

-        fi

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"

-

-        case "$host_cpu" in

-        x86_64)

-            # sis is missing because they have not be converted to use

-            # the new interface.  i810 are missing because there is no

-            # x86-64 system where they could *ever* be used.

-            if test "x$DRI_DIRS" = "xyes"; then

-                DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon \

-                    savage tdfx unichrome swrast"

-            fi

-            ;;

-        powerpc*)

-            # Build only the drivers for cards that exist on PowerPC.

-            # At some point MGA will be added, but not yet.

-            if test "x$DRI_DIRS" = "xyes"; then

-                DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"

-            fi

-            ;;

-        sparc*)

-            # Build only the drivers for cards that exist on sparc`

-            if test "x$DRI_DIRS" = "xyes"; then

-                DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"

-            fi

-            ;;

-        esac

-        ;;

-    freebsd* | dragonfly* | *netbsd*)

-        DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"

-        DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"

-        if test "x$driglx_direct" = xyes; then

-            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

-        fi

-

-        if test "x$DRI_DIRS" = "xyes"; then

-            DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \

-                unichrome savage sis swrast"

-        fi

-        ;;

-    gnu*)

-        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"

-	;;

-    solaris*)

-        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"

-        if test "x$driglx_direct" = xyes; then

-            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

-        fi

-        ;;

-    cygwin*)

-        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"

-        if test "x$driglx_direct" = xyes; then

-            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

-        fi

-        if test "x$DRI_DIRS" = "xyes"; then

-            DRI_DIRS="swrast"

-        fi

-        ;;

-    esac

-

-    # default drivers

-    if test "x$DRI_DIRS" = "xyes"; then

-        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \

-            savage sis tdfx unichrome swrast"

-    fi

-

-    DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`

-

-    # Check for expat

-    if test "$mesa_driver" = dri; then

-        EXPAT_INCLUDES=""

-        EXPAT_LIB=-lexpat

-        AC_ARG_WITH([expat],

-            [AS_HELP_STRING([--with-expat=DIR],

-                [expat install directory])],[

-            EXPAT_INCLUDES="-I$withval/include"

-            CPPFLAGS="$CPPFLAGS $EXPAT_INCLUDES"

-            LDFLAGS="$LDFLAGS -L$withval/$LIB_DIR"

-            EXPAT_LIB="-L$withval/$LIB_DIR -lexpat"

-            ])

-        AC_CHECK_HEADER([expat.h],[],[AC_MSG_ERROR([Expat required for DRI.])])

-        AC_CHECK_LIB([expat],[XML_ParserCreate],[],

-            [AC_MSG_ERROR([Expat required for DRI.])])

-    fi

-

-    # put all the necessary libs together, including possibly libdricore

-    DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"

-fi

-AC_SUBST([DRI_DIRS])

-AC_SUBST([EXPAT_INCLUDES])

-AC_SUBST([DRI_LIB_DEPS])

-

-case $DRI_DIRS in

-*i915*|*i965*)

-    PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])

-    ;;

-esac

-

-case $DRI_DIRS in

-*radeon*|*r200*|*r300*|*r600*)

-    if test "x$HAVE_LIBDRM_RADEON" = xyes; then

-	RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"

-	RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS

-    fi

-    ;;

-esac

-AC_SUBST([RADEON_CFLAGS])

-AC_SUBST([RADEON_LDFLAGS])

-

-

-dnl

-dnl OSMesa configuration

-dnl

-if test "$mesa_driver" = xlib; then

-    default_gl_osmesa=yes

-else

-    default_gl_osmesa=no

-fi

-AC_ARG_ENABLE([gl-osmesa],

-    [AS_HELP_STRING([--enable-gl-osmesa],

-        [enable OSMesa with libGL @<:@default=enabled for xlib driver@:>@])],

-    [gl_osmesa="$enableval"],

-    [gl_osmesa="$default_gl_osmesa"])

-if test "x$gl_osmesa" = xyes; then

-    if test "x$enable_opengl" = xno; then

-        AC_MSG_ERROR([OpenGL is not available for OSMesa driver])

-    fi

-    if test "$mesa_driver" = osmesa; then

-        AC_MSG_ERROR([libGL is not available for OSMesa driver])

-    else

-        DRIVER_DIRS="$DRIVER_DIRS osmesa"

-    fi

-fi

-

-dnl Configure the channel bits for OSMesa (libOSMesa, libOSMesa16, ...)

-AC_ARG_WITH([osmesa-bits],

-    [AS_HELP_STRING([--with-osmesa-bits=BITS],

-        [OSMesa channel bits and library name: 8, 16, 32 @<:@default=8@:>@])],

-    [osmesa_bits="$withval"],

-    [osmesa_bits=8])

-if test "$mesa_driver" != osmesa && test "x$osmesa_bits" != x8; then

-    AC_MSG_WARN([Ignoring OSMesa channel bits for non-OSMesa driver])

-    osmesa_bits=8

-fi

-case "x$osmesa_bits" in

-x8)

-    OSMESA_LIB=OSMesa

-    ;;

-x16|x32)

-    OSMESA_LIB="OSMesa$osmesa_bits"

-    DEFINES="$DEFINES -DCHAN_BITS=$osmesa_bits -DDEFAULT_SOFTWARE_DEPTH_BITS=31"

-    ;;

-*)

-    AC_MSG_ERROR([OSMesa bits '$osmesa_bits' is not a valid option])

-    ;;

-esac

-AC_SUBST([OSMESA_LIB])

-

-case "$DRIVER_DIRS" in

-*osmesa*)

-    # only link libraries with osmesa if shared

-    if test "$enable_static" = no; then

-        OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"

-    else

-        OSMESA_LIB_DEPS=""

-    fi

-    OSMESA_MESA_DEPS=""

-    OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"

-    ;;

-esac

-AC_SUBST([OSMESA_LIB_DEPS])

-AC_SUBST([OSMESA_MESA_DEPS])

-AC_SUBST([OSMESA_PC_REQ])

-AC_SUBST([OSMESA_PC_LIB_PRIV])

-

-dnl

-dnl EGL configuration

-dnl

-AC_ARG_ENABLE([egl],

-    [AS_HELP_STRING([--disable-egl],

-        [disable EGL library @<:@default=enabled@:>@])],

-    [enable_egl="$enableval"],

-    [enable_egl=yes])

-if test "x$enable_egl" = xno; then

-    if test "x$mesa_driver" = xno; then

-        AC_MSG_ERROR([cannot disable EGL when there is no mesa driver])

-    fi

-    if test "x$enable_openvg" = xyes; then

-        AC_MSG_ERROR([cannot enable OpenVG without EGL])

-    fi

-fi

-if test "x$enable_egl" = xyes; then

-    SRC_DIRS="$SRC_DIRS egl"

-    EGL_LIB_DEPS="$DLOPEN_LIBS $SELINUX_LIBS -lpthread"

-    EGL_DRIVERS_DIRS=""

-    if test "$enable_static" != yes; then

-        # build egl_glx when libGL is built

-        if test "$mesa_driver" = xlib -o "$mesa_driver" = dri; then

-            EGL_DRIVERS_DIRS="glx"

-        fi

-

-        PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],

-                          [have_libudev=yes],[have_libudev=no])

-        if test "$mesa_driver" = dri; then

-            # build egl_dri2 when xcb-dri2 is available

-            PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes],

-            		  [have_xcb_dri2=yes],[have_xcb_dri2=no])

-            

-            if test "$have_xcb_dri2" = yes; then

-                EGL_DRIVER_DRI2=dri2

-                DEFINES="$DEFINES -DHAVE_XCB_DRI2"

-                if test "$have_libudev" = yes; then

-                    DEFINES="$DEFINES -DHAVE_LIBUDEV"

-                fi

-                # workaround a bug in xcb-dri2 generated by xcb-proto 1.6

-                AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [],

-                          [DEFINES="$DEFINES -DXCB_DRI2_CONNECT_DEVICE_NAME_BROKEN"])

-            fi

-	fi

-

-        EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS $EGL_DRIVER_DRI2"

-    fi

-fi

-AC_SUBST([EGL_LIB_DEPS])

-AC_SUBST([EGL_DRIVERS_DIRS])

-

-dnl

-dnl GLU configuration

-dnl

-AC_ARG_ENABLE([glu],

-    [AS_HELP_STRING([--disable-glu],

-        [enable OpenGL Utility library @<:@default=enabled@:>@])],

-    [enable_glu="$enableval"],

-    [enable_glu=yes])

-

-if test "x$enable_glu" = xyes -a "x$mesa_driver" = xno; then

-    AC_MSG_NOTICE([Disabling GLU since there is no OpenGL driver])

-    enable_glu=no

-fi

-

-if test "x$enable_glu" = xyes; then

-    SRC_DIRS="$SRC_DIRS glu"

-

-    case "$mesa_driver" in

-    osmesa)

-        # Link libGLU to libOSMesa instead of libGL

-        GLU_LIB_DEPS=""

-        GLU_PC_REQ="osmesa"

-        if test "$enable_static" = no; then

-            GLU_MESA_DEPS='-l$(OSMESA_LIB)'

-        else

-            GLU_MESA_DEPS=""

-        fi

-        ;;

-    *)

-        # If static, empty GLU_LIB_DEPS and add libs for programs to link

-        GLU_PC_REQ="gl"

-        GLU_PC_LIB_PRIV="-lm"

-        if test "$enable_static" = no; then

-            GLU_LIB_DEPS="-lm"

-            GLU_MESA_DEPS='-l$(GL_LIB)'

-        else

-            GLU_LIB_DEPS=""

-            GLU_MESA_DEPS=""

-            APP_LIB_DEPS="$APP_LIB_DEPS -lstdc++"

-        fi

-        ;;

-    esac

-fi

-if test "$enable_static" = no; then

-    GLU_LIB_DEPS="$GLU_LIB_DEPS $OS_CPLUSPLUS_LIBS"

-fi

-GLU_PC_LIB_PRIV="$GLU_PC_LIB_PRIV $OS_CPLUSPLUS_LIBS"

-AC_SUBST([GLU_LIB_DEPS])

-AC_SUBST([GLU_MESA_DEPS])

-AC_SUBST([GLU_PC_REQ])

-AC_SUBST([GLU_PC_REQ_PRIV])

-AC_SUBST([GLU_PC_LIB_PRIV])

-AC_SUBST([GLU_PC_CFLAGS])

-

-dnl

-dnl GLw configuration

-dnl

-AC_ARG_ENABLE([glw],

-    [AS_HELP_STRING([--disable-glw],

-        [enable Xt/Motif widget library @<:@default=enabled@:>@])],

-    [enable_glw="$enableval"],

-    [enable_glw=yes])

-dnl Don't build GLw on osmesa

-if test "x$enable_glw" = xyes; then

-    case "$mesa_driver" in

-    osmesa|no)

-        AC_MSG_NOTICE([Disabling GLw since there is no OpenGL driver])

-        enable_glw=no

-        ;;

-    esac

-fi

-AC_ARG_ENABLE([motif],

-    [AS_HELP_STRING([--enable-motif],

-        [use Motif widgets in GLw @<:@default=disabled@:>@])],

-    [enable_motif="$enableval"],

-    [enable_motif=no])

-

-if test "x$enable_glw" = xyes; then

-    SRC_DIRS="$SRC_DIRS glw"

-    if test "$x11_pkgconfig" = yes; then

-        PKG_CHECK_MODULES([GLW],[x11 xt])

-        GLW_PC_REQ_PRIV="x11 xt"

-        GLW_LIB_DEPS="$GLW_LIBS"

-    else

-        # should check these...

-        GLW_LIB_DEPS="$X_LIBS -lXt -lX11"

-        GLW_PC_LIB_PRIV="$GLW_LIB_DEPS"

-        GLW_PC_CFLAGS="$X11_INCLUDES"

-    fi

-

-    GLW_SOURCES="GLwDrawA.c"

-    MOTIF_CFLAGS=

-    if test "x$enable_motif" = xyes; then

-        GLW_SOURCES="$GLW_SOURCES GLwMDrawA.c"

-        AC_PATH_PROG([MOTIF_CONFIG], [motif-config], [no])

-        if test "x$MOTIF_CONFIG" != xno; then

-            MOTIF_CFLAGS=`$MOTIF_CONFIG --cflags`

-            MOTIF_LIBS=`$MOTIF_CONFIG --libs`

-        else

-            AC_CHECK_HEADER([Xm/PrimitiveP.h], [],

-                [AC_MSG_ERROR([Can't locate Motif headers])])

-            AC_CHECK_LIB([Xm], [XmGetPixmap], [MOTIF_LIBS="-lXm"],

-                [AC_MSG_ERROR([Can't locate Motif Xm library])])

-        fi

-        # MOTIF_LIBS is prepended to GLW_LIB_DEPS since Xm needs Xt/X11

-        GLW_LIB_DEPS="$MOTIF_LIBS $GLW_LIB_DEPS"

-        GLW_PC_LIB_PRIV="$MOTIF_LIBS $GLW_PC_LIB_PRIV"

-        GLW_PC_CFLAGS="$MOTIF_CFLAGS $GLW_PC_CFLAGS"

-    fi

-

-    # If static, empty GLW_LIB_DEPS and add libs for programs to link

-    GLW_PC_LIB_PRIV="$GLW_PC_LIB_PRIV"

-    if test "$enable_static" = no; then

-        GLW_MESA_DEPS='-l$(GL_LIB)'

-        GLW_LIB_DEPS="$GLW_LIB_DEPS"

-    else

-        APP_LIB_DEPS="$APP_LIB_DEPS $GLW_LIB_DEPS"

-        GLW_LIB_DEPS=""

-        GLW_MESA_DEPS=""

-    fi

-fi

-AC_SUBST([GLW_LIB_DEPS])

-AC_SUBST([GLW_MESA_DEPS])

-AC_SUBST([GLW_SOURCES])

-AC_SUBST([MOTIF_CFLAGS])

-AC_SUBST([GLW_PC_REQ_PRIV])

-AC_SUBST([GLW_PC_LIB_PRIV])

-AC_SUBST([GLW_PC_CFLAGS])

-

-dnl

-dnl GLUT configuration

-dnl

-if test -f "$srcdir/include/GL/glut.h"; then

-    default_glut=yes

-else

-    default_glut=no

-fi

-AC_ARG_ENABLE([glut],

-    [AS_HELP_STRING([--disable-glut],

-        [enable GLUT library @<:@default=enabled if source available@:>@])],

-    [enable_glut="$enableval"],

-    [enable_glut="$default_glut"])

-

-dnl Don't build glut on osmesa

-if test "x$enable_glut" = xyes; then

-    case "$mesa_driver" in

-    osmesa|no)

-        AC_MSG_NOTICE([Disabling glut since there is no OpenGL driver])

-        enable_glut=no

-        ;;

-    esac

-fi

-dnl Can't build glut if GLU not available

-if test "x$enable_glu$enable_glut" = xnoyes; then

-    AC_MSG_WARN([Disabling glut since GLU is disabled])

-    enable_glut=no

-fi

-

-if test "x$enable_glut" = xyes; then

-    SRC_DIRS="$SRC_DIRS glut/glx"

-    if test "$x11_pkgconfig" = yes; then

-        PKG_CHECK_MODULES([GLUT],[x11 xmu xi])

-        GLUT_PC_REQ_PRIV="x11 xmu xi"

-        GLUT_LIB_DEPS="$GLUT_LIBS"

-    else

-        # should check these...

-        GLUT_LIB_DEPS="$X_LIBS -lX11 -lXmu -lXi"

-        GLUT_PC_LIB_PRIV="$GLUT_LIB_DEPS"

-        GLUT_PC_CFLAGS="$X11_INCLUDES"

-    fi

-    if test "x$GCC" = xyes; then

-        GLUT_CFLAGS="$GLUT_CFLAGS -fexceptions"

-    fi

-    GLUT_LIB_DEPS="$GLUT_LIB_DEPS -lm"

-    GLUT_PC_LIB_PRIV="$GLUT_PC_LIB_PRIV -lm"

-

-    # If static, empty GLUT_LIB_DEPS and add libs for programs to link

-    if test "$enable_static" = no; then

-        GLUT_MESA_DEPS='-l$(GLU_LIB) -l$(GL_LIB)'

-    else

-        APP_LIB_DEPS="$APP_LIB_DEPS $GLUT_LIB_DEPS"

-        GLUT_LIB_DEPS=""

-        GLUT_MESA_DEPS=""

-    fi

-fi

-AC_SUBST([GLUT_LIB_DEPS])

-AC_SUBST([GLUT_MESA_DEPS])

-AC_SUBST([GLUT_CFLAGS])

-AC_SUBST([GLUT_PC_REQ_PRIV])

-AC_SUBST([GLUT_PC_LIB_PRIV])

-AC_SUBST([GLUT_PC_CFLAGS])

-

-dnl

-dnl Program library dependencies

-dnl    Only libm is added here if necessary as the libraries should

-dnl    be pulled in by the linker

-dnl

-if test "x$APP_LIB_DEPS" = x; then

-    case "$host_os" in

-    solaris*)

-        APP_LIB_DEPS="-lX11 -lsocket -lnsl -lm"

-        ;;

-    cygwin*)

-        APP_LIB_DEPS="-lX11"

-        ;;

-    *)

-        APP_LIB_DEPS="-lm"

-        ;;

-    esac

-fi

-AC_SUBST([APP_LIB_DEPS])

-AC_SUBST([PROGRAM_DIRS])

-

-dnl

-dnl Gallium configuration

-dnl

-AC_ARG_ENABLE([gallium],

-    [AS_HELP_STRING([--disable-gallium],

-        [build gallium @<:@default=enabled@:>@])],

-    [enable_gallium="$enableval"],

-    [enable_gallium=yes])

-if test "x$enable_gallium" = xno -a "x$enable_openvg" = xyes; then

-    AC_MSG_ERROR([cannot enable OpenVG without Gallium])

-fi

-if test "x$enable_gallium" = xyes; then

-    SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"

-    AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])

-fi

-

-AC_SUBST([LLVM_CFLAGS])

-AC_SUBST([LLVM_LIBS])

-AC_SUBST([LLVM_LDFLAGS])

-AC_SUBST([LLVM_VERSION])

-

-dnl

-dnl Gallium state trackers configuration

-dnl

-

-AC_ARG_ENABLE([gallium-egl],

-    [AS_HELP_STRING([--enable-gallium-egl],

-        [enable gallium EGL state tracker @<:@default=auto@:>@])],

-    [enable_gallium_egl="$enableval"],

-    [enable_gallium_egl=auto])

-if test "x$enable_gallium_egl" = xauto; then

-    case "$mesa_driver" in

-    dri|no)

-        enable_gallium_egl=$enable_egl

-        ;;

-    *)

-        enable_gallium_egl=$enable_openvg

-        ;;

-    esac

-fi

-case "x$enable_egl$enable_gallium_egl" in

-xnoyes)

-    AC_MSG_ERROR([cannot build Gallium EGL state tracker without EGL])

-esac

-

-AC_ARG_WITH([state-trackers],

-    [AS_HELP_STRING([--with-state-trackers@<:@=DIRS...@:>@],

-        [comma delimited state_trackers list, e.g.

-        "egl,glx" @<:@default=auto@:>@])],

-    [with_state_trackers="$withval"],

-    [with_state_trackers=yes])

-

-case "$with_state_trackers" in

-no)

-    GALLIUM_STATE_TRACKERS_DIRS=""

-    ;;

-yes)

-    # look at what else is built

-    case "$mesa_driver" in

-    xlib)

-        GALLIUM_STATE_TRACKERS_DIRS=glx

-        ;;

-    dri)

-        GALLIUM_STATE_TRACKERS_DIRS="dri"

-        HAVE_ST_DRI="yes"

-        # Have only tested st/xorg on 1.6.0 servers

-        PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0 libdrm >= $LIBDRM_XORG_REQUIRED libkms >= $LIBKMS_XORG_REQUIRED],

-            HAVE_ST_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg",

-            HAVE_ST_XORG="no")

-        ;;

-    esac

-

-    if test "x$enable_egl" = xyes; then

-        if test "$enable_openvg" = yes; then

-            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vega"

-            st_egl="yes"

-        fi

-

-        if test "$enable_gallium_egl" = yes; then

-            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"

-            HAVE_ST_EGL="yes"

-        fi

-    fi

-    ;;

-*)

-    # verify the requested state tracker exist

-    state_trackers=""

-    _state_trackers=`IFS=', '; echo $with_state_trackers`

-    for tracker in $_state_trackers; do

-        case "$tracker" in

-        dri)

-            if test "x$mesa_driver" != xdri; then

-                AC_MSG_ERROR([cannot build dri state tracker without mesa driver set to dri])

-            fi

-            HAVE_ST_DRI="yes"

-            ;;

-        egl)

-            if test "x$enable_egl" != xyes; then

-                AC_MSG_ERROR([cannot build egl state tracker without EGL library])

-            fi

-            HAVE_ST_EGL="yes"

-            ;;

-        xorg)

-            PKG_CHECK_MODULES([XORG], [xorg-server >= 1.6.0])

-            PKG_CHECK_MODULES([LIBDRM_XORG], [libdrm >= $LIBDRM_XORG_REQUIRED])

-            PKG_CHECK_MODULES([LIBKMS_XORG], [libkms >= $LIBKMS_XORG_REQUIRED])

-            HAVE_ST_XORG="yes"

-            ;;

-        vega)

-            if test "x$enable_openvg" != xyes; then

-                AC_MSG_ERROR([cannot build vega state tracker without --enable-openvg])

-            fi

-            have_st_vega="yes"

-            ;;

-        esac

-

-	if test -n "$tracker"; then

-            test -d "$srcdir/src/gallium/state_trackers/$tracker" || \

-                AC_MSG_ERROR([state tracker '$tracker' doesn't exist])

-            if test -n "$state_trackers"; then

-                state_trackers="$state_trackers $tracker"

-            else

-                state_trackers="$tracker"

-            fi

-        fi

-    done

-    GALLIUM_STATE_TRACKERS_DIRS="$state_trackers"

-

-    # append --enable-openvg/--enable-gallium-egl to --with-state-trackers

-    if test "x$have_st_vega" != xyes -a "x$enable_openvg" = xyes; then

-        AC_MSG_ERROR([--with-state-trackers specified but vega is missing])

-    fi

-    if test "x$HAVE_ST_EGL" != xyes -a "x$enable_gallium_egl" = xyes; then

-        AC_MSG_ERROR([--with-state-trackers specified but egl is missing])

-    fi

-    ;;

-esac

-

-

-EGL_CLIENT_APIS=""

-VG_LIB_DEPS=""

-

-case "x$enable_opengl$enable_gles1$enable_gles2" in

-x*yes*)

-    EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GL_LIB)'

-    ;;

-esac

-if test "x$enable_openvg" = xyes; then

-    EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)'

-    VG_LIB_DEPS="$VG_LIB_DEPS $SELINUX_LIBS -lpthread"

-fi

-

-AC_SUBST([VG_LIB_DEPS])

-AC_SUBST([EGL_CLIENT_APIS])

-

-if test "x$HAVE_ST_EGL" = xyes; then

-	GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl"

-fi

-

-if test "x$HAVE_ST_XORG" = xyes; then

-    PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],

-        HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71",

-        HAVE_XEXTPROTO_71="no")

-fi

-

-AC_ARG_WITH([egl-platforms],

-    [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],

-        [comma delimited native platforms libEGL supports, e.g.

-        "x11,drm" @<:@default=auto@:>@])],

-    [with_egl_platforms="$withval"],

-    [with_egl_platforms=yes])

-AC_ARG_WITH([egl-displays],

-    [AS_HELP_STRING([--with-egl-displays@<:@=DIRS...@:>@],

-        [DEPRECATED.  Use --with-egl-platforms instead])],

-    [with_egl_platforms="$withval"])

-

-EGL_PLATFORMS=""

-WAYLAND_EGL_LIB_DEPS=""

-

-case "$with_egl_platforms" in

-yes)

-    if test "x$enable_egl" = xyes && test "x$mesa_driver" != xosmesa; then

-        EGL_PLATFORMS="x11"

-        if test "$mesa_driver" = dri; then

-            EGL_PLATFORMS="$EGL_PLATFORMS drm"

-        fi

-    fi

-    ;;

-*)

-    if test "x$enable_egl" != xyes; then

-        AC_MSG_ERROR([cannot build egl state tracker without EGL library])

-    fi

-    # verify the requested driver directories exist

-    egl_platforms=`IFS=', '; echo $with_egl_platforms`

-    for plat in $egl_platforms; do

-        test -d "$srcdir/src/gallium/state_trackers/egl/$plat" || \

-            AC_MSG_ERROR([EGL platform '$plat' doesn't exist])

-        if test "$plat" = "fbdev"; then

-                GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/fbdev"

-        fi

-	if test "$plat" = "wayland"; then

-		PKG_CHECK_MODULES([WAYLAND], [wayland-client wayland-server],, \

-				  [AC_MSG_ERROR([cannot find libwayland-client])])

-		WAYLAND_EGL_LIB_DEPS="$WAYLAND_LIBS $LIBDRM_LIBS"

-                GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/wayland"

-	fi

-    done

-    EGL_PLATFORMS="$egl_platforms"

-    ;;

-esac

-AC_SUBST([EGL_PLATFORMS])

-

-AC_SUBST([WAYLAND_EGL_LIB_DEPS])

-WAYLAND_EGL_PC_REQ_PRIV="wayland-client libdrm"

-WAYLAND_EGL_PC_LIB_PRIV=

-WAYLAND_EGL_PC_CFLAGS=

-

-AC_SUBST([WAYLAND_EGL_PC_REQ_PRIV])

-AC_SUBST([WAYLAND_EGL_PC_LIB_PRIV])

-AC_SUBST([WAYLAND_EGL_PC_CFLAGS])

-

-

-AC_ARG_WITH([egl-driver-dir],

-    [AS_HELP_STRING([--with-egl-driver-dir=DIR],

-                    [directory for EGL drivers [[default=${libdir}/egl]]])],

-    [EGL_DRIVER_INSTALL_DIR="$withval"],

-    [EGL_DRIVER_INSTALL_DIR='${libdir}/egl'])

-AC_SUBST([EGL_DRIVER_INSTALL_DIR])

-

-AC_ARG_WITH([xorg-driver-dir],

-    [AS_HELP_STRING([--with-xorg-driver-dir=DIR],

-                    [Default xorg driver directory[[default=${libdir}/xorg/modules/drivers]]])],

-    [XORG_DRIVER_INSTALL_DIR="$withval"],

-    [XORG_DRIVER_INSTALL_DIR="${libdir}/xorg/modules/drivers"])

-AC_SUBST([XORG_DRIVER_INSTALL_DIR])

-

-AC_ARG_WITH([max-width],

-    [AS_HELP_STRING([--with-max-width=N],

-                    [Maximum framebuffer width (4096)])],

-    [DEFINES="${DEFINES} -DMAX_WIDTH=${withval}";

-     AS_IF([test "${withval}" -gt "4096"],

-           [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]

-)

-AC_ARG_WITH([max-height],

-    [AS_HELP_STRING([--with-max-height=N],

-                    [Maximum framebuffer height (4096)])],

-    [DEFINES="${DEFINES} -DMAX_HEIGHT=${withval}";

-     AS_IF([test "${withval}" -gt "4096"],

-           [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]

-)

-

-dnl

-dnl Gallium LLVM

-dnl

-AC_ARG_ENABLE([gallium-llvm],

-    [AS_HELP_STRING([--enable-gallium-llvm],

-        [build gallium LLVM support @<:@default=enabled on x86/x86_64@:>@])],

-    [enable_gallium_llvm="$enableval"],

-    [enable_gallium_llvm=auto])

-if test "x$enable_gallium_llvm" = xauto; then

-    case "$host_cpu" in

-    i*86|x86_64) enable_gallium_llvm=yes;;

-    esac

-fi

-if test "x$enable_gallium_llvm" = xyes; then

-    if test "x$LLVM_CONFIG" != xno; then

-	LLVM_VERSION=`$LLVM_CONFIG --version`

-	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`

-	LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++"

-

-	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`

-	GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"

-	DEFINES="$DEFINES -DGALLIUM_LLVMPIPE -D__STDC_CONSTANT_MACROS"

-	MESA_LLVM=1

-    else

-	MESA_LLVM=0

-    fi

-else

-    MESA_LLVM=0

-fi

-

-dnl

-dnl Gallium helper functions

-dnl

-gallium_check_st() {

-    if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes; then

-         GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1"

-    fi

-    if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then

-         GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $2"

-    fi

-    if test "x$HAVE_ST_XORG" = xyes && test "x$3" != x; then

-         GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3"

-    fi

-}

-

-

-dnl

-dnl Gallium SVGA configuration

-dnl

-AC_ARG_ENABLE([gallium-svga],

-    [AS_HELP_STRING([--enable-gallium-svga],

-        [build gallium SVGA @<:@default=disabled@:>@])],

-    [enable_gallium_svga="$enableval"],

-    [enable_gallium_svga=auto])

-if test "x$enable_gallium_svga" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"

-    gallium_check_st "svga/drm" "dri-vmwgfx" "xorg-vmwgfx"

-elif test "x$enable_gallium_svga" = xauto; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"

-fi

-

-dnl

-dnl Gallium i915 configuration

-dnl

-AC_ARG_ENABLE([gallium-i915],

-    [AS_HELP_STRING([--enable-gallium-i915],

-        [build gallium i915 @<:@default=disabled@:>@])],

-    [enable_gallium_i915="$enableval"],

-    [enable_gallium_i915=auto])

-if test "x$enable_gallium_i915" = xyes; then

-    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"

-    gallium_check_st "i915/drm" "dri-i915" "xorg-i915"

-elif test "x$enable_gallium_i915" = xauto; then

-    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"

-fi

-

-dnl

-dnl Gallium i965 configuration

-dnl

-AC_ARG_ENABLE([gallium-i965],

-    [AS_HELP_STRING([--enable-gallium-i965],

-        [build gallium i965 @<:@default=disabled@:>@])],

-    [enable_gallium_i965="$enableval"],

-    [enable_gallium_i965=auto])

-if test "x$enable_gallium_i965" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"

-    gallium_check_st "i965/drm" "dri-i965" "xorg-i965"

-elif test "x$enable_gallium_i965" = xauto; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"

-fi

-

-dnl

-dnl Gallium Radeon r300g configuration

-dnl

-AC_ARG_ENABLE([gallium-r300],

-    [AS_HELP_STRING([--enable-gallium-r300],

-        [build gallium r300 @<:@default=build DRI driver only@:>@])],

-    [enable_gallium_r300="$enableval"],

-    [enable_gallium_r300=auto])

-

-if test "$mesa_driver" != dri ; then

-    if test "x$enable_gallium_r300" = xauto; then

-      enable_gallium_r300=no

-    fi

-fi

-

-if test "x$enable_gallium_r300" != xno; then

-    if test "x$MESA_LLVM" = x0; then

-        case "$host_cpu" in

-        i*86|x86_64) AC_MSG_ERROR([LLVM is required to build Gallium R300 on x86 and x86_64]);;

-        esac

-    fi

-fi

-if test "x$enable_gallium_r300" = xauto; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"

-    gallium_check_st "radeon/drm" "dri-r300"

-elif test "x$enable_gallium_r300" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"

-    gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"

-fi

-

-dnl

-dnl Gallium Radeon r600g configuration

-dnl

-AC_ARG_ENABLE([gallium-r600],

-    [AS_HELP_STRING([--enable-gallium-r600],

-        [build gallium r600 @<:@default=disabled@:>@])],

-    [enable_gallium_r600="$enableval"],

-    [enable_gallium_r600=auto])

-if test "x$enable_gallium_r600" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"

-    gallium_check_st "r600/drm" "dri-r600"

-fi

-

-dnl

-dnl Gallium Nouveau configuration

-dnl

-AC_ARG_ENABLE([gallium-nouveau],

-    [AS_HELP_STRING([--enable-gallium-nouveau],

-        [build gallium nouveau @<:@default=disabled@:>@])],

-    [enable_gallium_nouveau="$enableval"],

-    [enable_gallium_nouveau=no])

-if test "x$enable_gallium_nouveau" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50 nvc0"

-    gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau"

-fi

-

-dnl

-dnl Gallium swrast configuration

-dnl

-AC_ARG_ENABLE([gallium-swrast],

-    [AS_HELP_STRING([--enable-gallium-swrast],

-        [build gallium swrast @<:@default=auto@:>@])],

-    [enable_gallium_swrast="$enableval"],

-    [enable_gallium_swrast=auto])

-if test "x$enable_gallium_swrast" = xyes || test "x$enable_gallium_swrast" = xauto; then

-    if test "x$HAVE_ST_DRI" = xyes; then

-        GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast"

-    fi

-fi

-

-dnl prepend CORE_DIRS to SRC_DIRS

-SRC_DIRS="$CORE_DIRS $SRC_DIRS"

-

-dnl Restore LDFLAGS and CPPFLAGS

-LDFLAGS="$_SAVE_LDFLAGS"

-CPPFLAGS="$_SAVE_CPPFLAGS"

-

-dnl Substitute the config

-AC_CONFIG_FILES([configs/autoconf])

-

-dnl Replace the configs/current symlink

-AC_CONFIG_COMMANDS([configs],[

-if test -f configs/current || test -L configs/current; then

-    rm -f configs/current

-fi

-ln -s autoconf configs/current

-])

-

-AC_OUTPUT

-

-dnl

-dnl Output some configuration info for the user

-dnl

-echo ""

-echo "        prefix:          $prefix"

-echo "        exec_prefix:     $exec_prefix"

-echo "        libdir:          $libdir"

-echo "        includedir:      $includedir"

-

-dnl API info

-echo ""

-echo "        OpenGL:          $enable_opengl (ES1: $enable_gles1 ES2: $enable_gles2)"

-echo "        OpenVG:          $enable_openvg"

-

-dnl Driver info

-echo ""

-echo "        Driver:          $mesa_driver"

-if test "$mesa_driver" != no; then

-    if echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1; then

-        echo "        OSMesa:          lib$OSMESA_LIB"

-    else

-        echo "        OSMesa:          no"

-    fi

-    if test "$mesa_driver" = dri; then

-        # cleanup the drivers var

-        dri_dirs=`echo $DRI_DIRS | $SED 's/^ *//;s/  */ /;s/ *$//'`

-        if test "x$DRI_DIRS" = x; then

-            echo "        DRI drivers:     no"

-        else

-            echo "        DRI drivers:     $dri_dirs"

-        fi

-        echo "        DRI driver dir:  $DRI_DRIVER_INSTALL_DIR"

-        echo "        Use XCB:         $enable_xcb"

-        echo "        Shared dricore:  $enable_dricore"

-    fi

-fi

-echo ""

-echo "        GLU:             $enable_glu"

-echo "        GLw:             $enable_glw (Motif: $enable_motif)"

-echo "        glut:            $enable_glut"

-

-dnl EGL

-echo ""

-echo "        EGL:             $enable_egl"

-if test "$enable_egl" = yes; then

-    echo "        EGL platforms:   $EGL_PLATFORMS"

-

-    egl_drivers=""

-    for d in $EGL_DRIVERS_DIRS; do

-        egl_drivers="$egl_drivers builtin:egl_$d"

-    done

-

-    if test "$enable_gallium" = yes -a "$HAVE_ST_EGL" = yes; then

-        echo "        EGL drivers:    ${egl_drivers} egl_gallium"

-        echo "        EGL Gallium STs:$EGL_CLIENT_APIS"

-    else

-        echo "        EGL drivers:    $egl_drivers"

-    fi

-fi

-

-echo ""

-if test "x$MESA_LLVM" = x1; then

-    echo "        llvm:            yes"

-    echo "        llvm-config:     $LLVM_CONFIG"

-    echo "        llvm-version:    $LLVM_VERSION"

-else

-    echo "        llvm:            no"

-fi

-

-echo ""

-if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then

-    echo "        Gallium:         yes"

-    echo "        Gallium dirs:    $GALLIUM_DIRS"

-    echo "        Target dirs:     $GALLIUM_TARGET_DIRS"

-    echo "        Winsys dirs:     $GALLIUM_WINSYS_DIRS"

-    echo "        Driver dirs:     $GALLIUM_DRIVERS_DIRS"

-    echo "        Trackers dirs:   $GALLIUM_STATE_TRACKERS_DIRS"

-else

-    echo "        Gallium:         no"

-fi

-

-dnl Libraries

-echo ""

-echo "        Shared libs:     $enable_shared"

-echo "        Static libs:     $enable_static"

-

-dnl Compiler options

-# cleanup the CFLAGS/CXXFLAGS/DEFINES vars

-cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \

-    $SED 's/^ *//;s/  */ /;s/ *$//'`

-cxxflags=`echo $CXXFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \

-    $SED 's/^ *//;s/  */ /;s/ *$//'`

-defines=`echo $DEFINES $ASM_FLAGS | $SED 's/^ *//;s/  */ /;s/ *$//'`

-echo ""

-echo "        CFLAGS:          $cflags"

-echo "        CXXFLAGS:        $cxxflags"

-echo "        Macros:          $defines"

-echo ""

-echo "        PYTHON2:         $PYTHON2"

-

-echo ""

-echo "        Run '${MAKE-make}' to build Mesa"

-echo ""

+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.59])
+
+dnl Versioning - scrape the version from configs/default
+m4_define([mesa_version],
+    [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n' | tr -d '\r'])])
+m4_ifval(mesa_version,,
+    [m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])])
+
+dnl Tell the user about autoconf.html in the --help output
+m4_divert_once([HELP_END], [
+See docs/autoconf.html for more details on the options for Mesa.])
+
+AC_INIT([Mesa],[mesa_version],
+    [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
+AC_CONFIG_AUX_DIR([bin])
+AC_CANONICAL_HOST
+
+dnl Versions for external dependencies
+LIBDRM_REQUIRED=2.4.24
+LIBDRM_RADEON_REQUIRED=2.4.24
+LIBDRM_INTEL_REQUIRED=2.4.24
+DRI2PROTO_REQUIRED=2.1
+GLPROTO_REQUIRED=1.4.11
+LIBDRM_XORG_REQUIRED=2.4.24
+LIBKMS_XORG_REQUIRED=1.0.0
+
+dnl Check for progs
+AC_PROG_CPP
+AC_PROG_CC
+AC_PROG_CXX
+AC_CHECK_PROGS([MAKE], [gmake make])
+AC_CHECK_PROGS([PYTHON2], [python2 python])
+AC_PATH_PROG([MKDEP], [makedepend])
+AC_PATH_PROG([SED], [sed])
+
+if test "x$MKDEP" = "x"; then
+    AC_MSG_ERROR([makedepend is required to build Mesa])
+fi
+
+AC_PATH_PROG([FLEX], [flex])
+test "x$FLEX" = "x" && AC_MSG_ERROR([flex is needed to build Mesa])
+
+AC_PATH_PROG([BISON], [bison])
+test "x$BISON" = "x" && AC_MSG_ERROR([bison is needed to build Mesa])
+
+dnl Our fallback install-sh is a symlink to minstall. Use the existing
+dnl configuration in that case.
+AC_PROG_INSTALL
+test "x$INSTALL" = "x$ac_install_sh" && INSTALL='$(MINSTALL)'
+
+dnl We need a POSIX shell for parts of the build. Assume we have one
+dnl in most cases.
+case "$host_os" in
+solaris*)
+    # Solaris /bin/sh is too old/non-POSIX compliant
+    AC_PATH_PROGS(POSIX_SHELL, [ksh93 ksh sh])
+    SHELL="$POSIX_SHELL"
+    ;;
+esac
+
+dnl clang is mostly GCC-compatible, but its version is much lower,
+dnl so we have to check for it.
+AC_MSG_CHECKING([if compiling with clang])
+
+AC_COMPILE_IFELSE(
+[AC_LANG_PROGRAM([], [[
+#ifndef __clang__
+       not clang
+#endif
+]])],
+[CLANG=yes], [CLANG=no])
+
+AC_MSG_RESULT([$CLANG])
+
+dnl If we're using GCC, make sure that it is at least version 3.3.0.  Older
+dnl versions are explictly not supported.
+if test "x$GCC" = xyes -a "x$CLANG" = xno; then
+    AC_MSG_CHECKING([whether gcc version is sufficient])
+    major=0
+    minor=0
+
+    GCC_VERSION=`$CC -dumpversion`
+    if test $? -eq 0; then
+        major=`echo $GCC_VERSION | cut -d. -f1`
+        minor=`echo $GCC_VERSION | cut -d. -f1`
+    fi
+
+    if test $major -lt 3 -o $major -eq 3 -a $minor -lt 3 ; then
+        AC_MSG_RESULT([no])
+        AC_MSG_ERROR([If using GCC, version 3.3.0 or later is required.])
+    else
+        AC_MSG_RESULT([yes])
+    fi
+fi
+
+
+MKDEP_OPTIONS=-fdepend
+dnl Ask gcc where it's keeping its secret headers
+if test "x$GCC" = xyes; then
+    for dir in include include-fixed; do
+        GCC_INCLUDES=`$CC -print-file-name=$dir`
+        if test "x$GCC_INCLUDES" != x && \
+           test "$GCC_INCLUDES" != "$dir" && \
+           test -d "$GCC_INCLUDES"; then
+            MKDEP_OPTIONS="$MKDEP_OPTIONS -I$GCC_INCLUDES"
+        fi
+    done
+fi
+AC_SUBST([MKDEP_OPTIONS])
+
+dnl Make sure the pkg-config macros are defined
+m4_ifndef([PKG_PROG_PKG_CONFIG],
+    [m4_fatal([Could not locate the pkg-config autoconf macros.
+  These are usually located in /usr/share/aclocal/pkg.m4. If your macros
+  are in a different location, try setting the environment variable
+  ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])])
+PKG_PROG_PKG_CONFIG()
+
+dnl LIB_DIR - library basename
+LIB_DIR=`echo $libdir | $SED 's%.*/%%'`
+AC_SUBST([LIB_DIR])
+
+dnl Cache LDFLAGS so we can add EXTRA_LIB_PATH and restore it later
+_SAVE_LDFLAGS="$LDFLAGS"
+AC_ARG_VAR([EXTRA_LIB_PATH],[Extra -L paths for the linker])
+AC_SUBST([EXTRA_LIB_PATH])
+
+dnl Cache CPPFLAGS so we can add *_INCLUDES and restore it later
+_SAVE_CPPFLAGS="$CPPFLAGS"
+AC_ARG_VAR([X11_INCLUDES],[Extra -I paths for X11 headers])
+AC_SUBST([X11_INCLUDES])
+
+dnl Compiler macros
+DEFINES=""
+AC_SUBST([DEFINES])
+case "$host_os" in
+linux*|*-gnu*|gnu*)
+    DEFINES="$DEFINES -D_GNU_SOURCE -DPTHREADS"
+    ;;
+solaris*)
+    DEFINES="$DEFINES -DPTHREADS -DSVR4"
+    ;;
+cygwin*)
+    DEFINES="$DEFINES -DPTHREADS"
+    ;;
+esac
+
+dnl Add flags for gcc and g++
+if test "x$GCC" = xyes; then
+    CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -std=c99"
+    if test "x$CLANG" = "xno"; then
+       CFLAGS="$CFLAGS -ffast-math"
+    fi
+
+    # Enable -fvisibility=hidden if using a gcc that supports it
+    save_CFLAGS="$CFLAGS"
+    AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
+    VISIBILITY_CFLAGS="-fvisibility=hidden"
+    CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
+		   [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);
+
+    # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.
+    CFLAGS=$save_CFLAGS
+
+    # Work around aliasing bugs - developers should comment this out
+    CFLAGS="$CFLAGS -fno-strict-aliasing"
+fi
+if test "x$GXX" = xyes; then
+    CXXFLAGS="$CXXFLAGS -Wall"
+
+    # Enable -fvisibility=hidden if using a gcc that supports it
+    save_CXXFLAGS="$CXXFLAGS"
+    AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])
+    VISIBILITY_CXXFLAGS="-fvisibility=hidden"
+    CXXFLAGS="$CXXFLAGS $VISIBILITY_CXXFLAGS"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
+		   [VISIBILITY_CXXFLAGS="" ; AC_MSG_RESULT([no])]);
+
+    # Restore CXXFLAGS; VISIBILITY_CXXFLAGS are added to it where needed.
+    CXXFLAGS=$save_CXXFLAGS
+
+    # Work around aliasing bugs - developers should comment this out
+    CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+fi
+
+AC_SUBST([VISIBILITY_CFLAGS])
+AC_SUBST([VISIBILITY_CXXFLAGS])
+
+dnl These should be unnecessary, but let the user set them if they want
+AC_ARG_VAR([OPT_FLAGS], [Additional optimization flags for the compiler.
+    Default is to use CFLAGS.])
+AC_ARG_VAR([ARCH_FLAGS], [Additional architecture specific flags for the
+    compiler. Default is to use CFLAGS.])
+AC_SUBST([OPT_FLAGS])
+AC_SUBST([ARCH_FLAGS])
+
+dnl
+dnl Hacks to enable 32 or 64 bit build
+dnl
+AC_ARG_ENABLE([32-bit],
+    [AS_HELP_STRING([--enable-32-bit],
+        [build 32-bit libraries @<:@default=auto@:>@])],
+    [enable_32bit="$enableval"],
+    [enable_32bit=auto]
+)
+if test "x$enable_32bit" = xyes; then
+    if test "x$GCC" = xyes; then
+        CFLAGS="$CFLAGS -m32"
+        ARCH_FLAGS="$ARCH_FLAGS -m32"
+    fi
+    if test "x$GXX" = xyes; then
+        CXXFLAGS="$CXXFLAGS -m32"
+    fi
+fi
+AC_ARG_ENABLE([64-bit],
+    [AS_HELP_STRING([--enable-64-bit],
+        [build 64-bit libraries @<:@default=auto@:>@])],
+    [enable_64bit="$enableval"],
+    [enable_64bit=auto]
+)
+if test "x$enable_64bit" = xyes; then
+    if test "x$GCC" = xyes; then
+        CFLAGS="$CFLAGS -m64"
+    fi
+    if test "x$GXX" = xyes; then
+        CXXFLAGS="$CXXFLAGS -m64"
+    fi
+fi
+
+dnl
+dnl shared/static libraries, mimic libtool options
+dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static],
+        [build static libraries @<:@default=disabled@:>@])],
+    [enable_static="$enableval"],
+    [enable_static=no]
+)
+case "x$enable_static" in
+xyes|xno ) ;;
+x ) enable_static=no ;;
+* )
+    AC_MSG_ERROR([Static library option '$enable_static' is not a valid])
+    ;;
+esac
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--disable-shared],
+        [build shared libraries @<:@default=enabled@:>@])],
+    [enable_shared="$enableval"],
+    [enable_shared=yes]
+)
+case "x$enable_shared" in
+xyes|xno ) ;;
+x ) enable_shared=yes ;;
+* )
+    AC_MSG_ERROR([Shared library option '$enable_shared' is not a valid])
+    ;;
+esac
+
+dnl Can't have static and shared libraries, default to static if user
+dnl explicitly requested. If both disabled, set to static since shared
+dnl was explicitly requirested.
+case "x$enable_static$enable_shared" in
+xyesyes )
+    AC_MSG_WARN([Can't build static and shared libraries, disabling shared])
+    enable_shared=no
+    ;;
+xnono )
+    AC_MSG_WARN([Can't disable both static and shared libraries, enabling static])
+    enable_static=yes
+    ;;
+esac
+
+dnl
+dnl mklib options
+dnl
+AC_ARG_VAR([MKLIB_OPTIONS],[Options for the Mesa library script, mklib])
+if test "$enable_static" = yes; then
+    MKLIB_OPTIONS="$MKLIB_OPTIONS -static"
+fi
+AC_SUBST([MKLIB_OPTIONS])
+
+dnl
+dnl other compiler options
+dnl
+AC_ARG_ENABLE([debug],
+    [AS_HELP_STRING([--enable-debug],
+        [use debug compiler flags and macros @<:@default=disabled@:>@])],
+    [enable_debug="$enableval"],
+    [enable_debug=no]
+)
+if test "x$enable_debug" = xyes; then
+    DEFINES="$DEFINES -DDEBUG"
+    if test "x$GCC" = xyes; then
+        CFLAGS="$CFLAGS -g"
+    fi
+    if test "x$GXX" = xyes; then
+        CXXFLAGS="$CXXFLAGS -g"
+    fi
+fi
+
+dnl
+dnl library names
+dnl
+LIB_PREFIX_GLOB='lib'
+LIB_VERSION_SEPARATOR='.'
+if test "$enable_static" = yes; then
+    LIB_EXTENSION='a'
+else
+    case "$host_os" in
+    darwin* )
+        LIB_EXTENSION='dylib' ;;
+    cygwin* )
+        dnl prefix can be 'cyg' or 'lib'
+        LIB_PREFIX_GLOB='???'
+        LIB_VERSION_SEPARATOR='-'
+        LIB_EXTENSION='dll' ;;
+    aix* )
+        LIB_EXTENSION='a' ;;
+    * )
+        LIB_EXTENSION='so' ;;
+    esac
+fi
+
+dnl
+dnl potentially-infringing-but-nobody-knows-for-sure stuff
+dnl
+AC_ARG_ENABLE([texture-float],
+    [AS_HELP_STRING([--enable-texture-float],
+        [enable floating-point textures and renderbuffers @<:@default=disabled@:>@])],
+    [enable_texture_float="$enableval"],
+    [enable_texture_float=no]
+)
+if test "x$enable_texture_float" = xyes; then
+    AC_MSG_WARN([Floating-point textures enabled.])
+    AC_MSG_WARN([Please consult docs/patents.txt with your lawyer before building Mesa.])
+    DEFINES="$DEFINES -DTEXTURE_FLOAT_ENABLED"
+fi
+
+GL_LIB_NAME='lib$(GL_LIB).'${LIB_EXTENSION}
+GLU_LIB_NAME='lib$(GLU_LIB).'${LIB_EXTENSION}
+GLUT_LIB_NAME='lib$(GLUT_LIB).'${LIB_EXTENSION}
+GLW_LIB_NAME='lib$(GLW_LIB).'${LIB_EXTENSION}
+OSMESA_LIB_NAME='lib$(OSMESA_LIB).'${LIB_EXTENSION}
+EGL_LIB_NAME='lib$(EGL_LIB).'${LIB_EXTENSION}
+GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION}
+GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION}
+VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION}
+GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION}
+WAYLAND_EGL_LIB_NAME='lib$(WAYLAND_EGL_LIB).'${LIB_EXTENSION}
+
+GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLUT_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLUT_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLW_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLW_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+OSMESA_LIB_GLOB=${LIB_PREFIX_GLOB}'$(OSMESA_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLESv1_CM_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv1_CM_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLESv2_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv2_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+VG_LIB_GLOB=${LIB_PREFIX_GLOB}'$(VG_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLAPI_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLAPI_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+WAYLAND_EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(WAYLAND_EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+
+AC_SUBST([GL_LIB_NAME])
+AC_SUBST([GLU_LIB_NAME])
+AC_SUBST([GLUT_LIB_NAME])
+AC_SUBST([GLW_LIB_NAME])
+AC_SUBST([OSMESA_LIB_NAME])
+AC_SUBST([EGL_LIB_NAME])
+AC_SUBST([GLESv1_CM_LIB_NAME])
+AC_SUBST([GLESv2_LIB_NAME])
+AC_SUBST([VG_LIB_NAME])
+AC_SUBST([GLAPI_LIB_NAME])
+AC_SUBST([WAYLAND_EGL_LIB_NAME])
+
+AC_SUBST([GL_LIB_GLOB])
+AC_SUBST([GLU_LIB_GLOB])
+AC_SUBST([GLUT_LIB_GLOB])
+AC_SUBST([GLW_LIB_GLOB])
+AC_SUBST([OSMESA_LIB_GLOB])
+AC_SUBST([EGL_LIB_GLOB])
+AC_SUBST([GLESv1_CM_LIB_GLOB])
+AC_SUBST([GLESv2_LIB_GLOB])
+AC_SUBST([VG_LIB_GLOB])
+AC_SUBST([GLAPI_LIB_GLOB])
+AC_SUBST([WAYLAND_EGL_LIB_GLOB])
+
+dnl
+dnl Arch/platform-specific settings
+dnl
+AC_ARG_ENABLE([asm],
+    [AS_HELP_STRING([--disable-asm],
+        [disable assembly usage @<:@default=enabled on supported plaforms@:>@])],
+    [enable_asm="$enableval"],
+    [enable_asm=yes]
+)
+asm_arch=""
+ASM_FLAGS=""
+MESA_ASM_SOURCES=""
+GLAPI_ASM_SOURCES=""
+AC_MSG_CHECKING([whether to enable assembly])
+test "x$enable_asm" = xno && AC_MSG_RESULT([no])
+# disable if cross compiling on x86/x86_64 since we must run gen_matypes
+if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then
+    case "$host_cpu" in
+    i?86 | x86_64)
+        enable_asm=no
+        AC_MSG_RESULT([no, cross compiling])
+        ;;
+    esac
+fi
+# check for supported arches
+if test "x$enable_asm" = xyes; then
+    case "$host_cpu" in
+    i?86)
+        case "$host_os" in
+        linux* | *freebsd* | dragonfly* | *netbsd*)
+            test "x$enable_64bit" = xyes && asm_arch=x86_64 || asm_arch=x86
+            ;;
+        esac
+        ;;
+    x86_64)
+        case "$host_os" in
+        linux* | *freebsd* | dragonfly* | *netbsd*)
+            test "x$enable_32bit" = xyes && asm_arch=x86 || asm_arch=x86_64
+            ;;
+        esac
+        ;;
+    powerpc)
+        case "$host_os" in
+        linux*)
+            asm_arch=ppc
+            ;;
+        esac
+        ;;
+    sparc*)
+        case "$host_os" in
+        linux*)
+            asm_arch=sparc
+            ;;
+        esac
+        ;;
+    esac
+
+    case "$asm_arch" in
+    x86)
+        ASM_FLAGS="-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM"
+        MESA_ASM_SOURCES='$(X86_SOURCES)'
+        GLAPI_ASM_SOURCES='$(X86_API)'
+        AC_MSG_RESULT([yes, x86])
+        ;;
+    x86_64)
+        ASM_FLAGS="-DUSE_X86_64_ASM"
+        MESA_ASM_SOURCES='$(X86-64_SOURCES)'
+        GLAPI_ASM_SOURCES='$(X86-64_API)'
+        AC_MSG_RESULT([yes, x86_64])
+        ;;
+    ppc)
+        ASM_FLAGS="-DUSE_PPC_ASM -DUSE_VMX_ASM"
+        MESA_ASM_SOURCES='$(PPC_SOURCES)'
+        AC_MSG_RESULT([yes, ppc])
+        ;;
+    sparc)
+        ASM_FLAGS="-DUSE_SPARC_ASM"
+        MESA_ASM_SOURCES='$(SPARC_SOURCES)'
+        GLAPI_ASM_SOURCES='$(SPARC_API)'
+        AC_MSG_RESULT([yes, sparc])
+        ;;
+    *)
+        AC_MSG_RESULT([no, platform not supported])
+        ;;
+    esac
+fi
+AC_SUBST([ASM_FLAGS])
+AC_SUBST([MESA_ASM_SOURCES])
+AC_SUBST([GLAPI_ASM_SOURCES])
+
+dnl PIC code macro
+MESA_PIC_FLAGS
+
+dnl Check to see if dlopen is in default libraries (like Solaris, which
+dnl has it in libc), or if libdl is needed to get it.
+AC_CHECK_FUNC([dlopen], [],
+    [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
+AC_SUBST([DLOPEN_LIBS])
+
+dnl See if posix_memalign is available
+AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
+
+dnl SELinux awareness.
+AC_ARG_ENABLE([selinux],
+    [AS_HELP_STRING([--enable-selinux],
+        [Build SELinux-aware Mesa @<:@default=disabled@:>@])],
+    [MESA_SELINUX="$enableval"],
+    [MESA_SELINUX=no])
+if test "x$enable_selinux" = "xyes"; then
+    AC_CHECK_HEADER([selinux/selinux.h],[],
+                    [AC_MSG_ERROR([SELinux headers not found])])
+    AC_CHECK_LIB([selinux],[is_selinux_enabled],[],
+                 [AC_MSG_ERROR([SELinux library not found])])
+    SELINUX_LIBS="-lselinux"
+    DEFINES="$DEFINES -DMESA_SELINUX"
+fi
+
+dnl Determine which APIs to support
+AC_ARG_ENABLE([opengl],
+    [AS_HELP_STRING([--disable-opengl],
+        [disable support for standard OpenGL API @<:@default=no@:>@])],
+    [enable_opengl="$enableval"],
+    [enable_opengl=yes])
+AC_ARG_ENABLE([gles1],
+    [AS_HELP_STRING([--enable-gles1],
+        [enable support for OpenGL ES 1.x API @<:@default=no@:>@])],
+    [enable_gles1="$enableval"],
+    [enable_gles1=no])
+AC_ARG_ENABLE([gles2],
+    [AS_HELP_STRING([--enable-gles2],
+        [enable support for OpenGL ES 2.x API @<:@default=no@:>@])],
+    [enable_gles2="$enableval"],
+    [enable_gles2=no])
+AC_ARG_ENABLE([gles-overlay],
+    [AS_HELP_STRING([--enable-gles-overlay],
+        [DEPRECATED.  Same as --enable-gles1 and --enable-gles2])],
+    [enable_gles1="$enableval"; enable_gles2="$enableval"],
+    [])
+
+AC_ARG_ENABLE([openvg],
+    [AS_HELP_STRING([--enable-openvg],
+        [enable support for OpenVG API @<:@default=no@:>@])],
+    [enable_openvg="$enableval"],
+    [enable_openvg=no])
+
+dnl smooth the transition; should be removed eventually
+if test "x$enable_openvg" = xno; then
+    case "x$with_state_trackers" in
+    x*vega*)
+        AC_MSG_WARN([vega state tracker is enabled without --enable-openvg])
+        enable_openvg=yes
+        ;;
+    esac
+fi
+
+if test "x$enable_opengl" = xno -a \
+        "x$enable_gles1" = xno -a \
+        "x$enable_gles2" = xno -a \
+        "x$enable_openvg" = xno; then
+    AC_MSG_ERROR([at least one API should be enabled])
+fi
+
+API_DEFINES=""
+if test "x$enable_opengl" = xno; then
+    API_DEFINES="$API_DEFINES -DFEATURE_GL=0"
+else
+    API_DEFINES="$API_DEFINES -DFEATURE_GL=1"
+fi
+if test "x$enable_gles1" = xyes; then
+    API_DEFINES="$API_DEFINES -DFEATURE_ES1=1"
+fi
+if test "x$enable_gles2" = xyes; then
+    API_DEFINES="$API_DEFINES -DFEATURE_ES2=1"
+fi
+AC_SUBST([API_DEFINES])
+
+AC_ARG_ENABLE([shared-glapi],
+    [AS_HELP_STRING([--enable-shared-glapi],
+        [EXPERIMENTAL.  Enable shared glapi for OpenGL @<:@default=no@:>@])],
+    [enable_shared_glapi="$enableval"],
+    [enable_shared_glapi=no])
+
+SHARED_GLAPI="0"
+if test "x$enable_shared_glapi" = xyes; then
+    SHARED_GLAPI="1"
+fi
+AC_SUBST([SHARED_GLAPI])
+
+dnl
+dnl Driver configuration. Options are xlib, dri and osmesa right now.
+dnl More later: fbdev, ...
+dnl
+default_driver="xlib"
+
+case "$host_os" in
+linux*)
+    case "$host_cpu" in
+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
+    esac
+    ;;
+*freebsd* | dragonfly* | *netbsd*)
+    case "$host_cpu" in
+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
+    esac
+    ;;
+esac
+
+if test "x$enable_opengl" = xno; then
+    default_driver="no"
+fi
+
+AC_ARG_WITH([driver],
+    [AS_HELP_STRING([--with-driver=DRIVER],
+        [driver for Mesa: xlib,dri,osmesa @<:@default=dri when available, or xlib@:>@])],
+    [mesa_driver="$withval"],
+    [mesa_driver="$default_driver"])
+dnl Check for valid option
+case "x$mesa_driver" in
+xxlib|xdri|xosmesa)
+    if test "x$enable_opengl" = xno; then
+        AC_MSG_ERROR([Driver '$mesa_driver' requires OpenGL enabled])
+    fi
+    ;;
+xno)
+    ;;
+*)
+    AC_MSG_ERROR([Driver '$mesa_driver' is not a valid option])
+    ;;
+esac
+
+dnl
+dnl Driver specific build directories
+dnl
+
+dnl this variable will be prepended to SRC_DIRS and is not exported
+CORE_DIRS=""
+
+SRC_DIRS=""
+GLU_DIRS="sgi"
+GALLIUM_DIRS="auxiliary drivers state_trackers"
+GALLIUM_TARGET_DIRS=""
+GALLIUM_WINSYS_DIRS="sw"
+GALLIUM_DRIVERS_DIRS="softpipe failover galahad trace rbug noop identity"
+GALLIUM_STATE_TRACKERS_DIRS=""
+
+# build shared-glapi if enabled for OpenGL or if OpenGL ES is enabled
+case "x$enable_shared_glapi$enable_gles1$enable_gles2" in
+x*yes*)
+    CORE_DIRS="$CORE_DIRS mapi/shared-glapi"
+    ;;
+esac
+
+# build glapi if OpenGL is enabled
+if test "x$enable_opengl" = xyes; then
+    CORE_DIRS="$CORE_DIRS mapi/glapi"
+fi
+
+# build es1api if OpenGL ES 1.x is enabled
+if test "x$enable_gles1" = xyes; then
+    CORE_DIRS="$CORE_DIRS mapi/es1api"
+fi
+
+# build es2api if OpenGL ES 2.x is enabled
+if test "x$enable_gles2" = xyes; then
+    CORE_DIRS="$CORE_DIRS mapi/es2api"
+fi
+
+# build vgapi if OpenVG is enabled
+if test "x$enable_openvg" = xyes; then
+    CORE_DIRS="$CORE_DIRS mapi/vgapi"
+fi
+
+# build glsl and mesa if OpenGL or OpenGL ES is enabled
+case "x$enable_opengl$enable_gles1$enable_gles2" in
+x*yes*)
+    CORE_DIRS="$CORE_DIRS glsl mesa"
+    ;;
+esac
+
+case "$mesa_driver" in
+xlib)
+    DRIVER_DIRS="x11"
+    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib"
+    GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib"
+    ;;
+dri)
+    SRC_DIRS="$SRC_DIRS glx"
+    DRIVER_DIRS="dri"
+    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib sw/dri"
+    ;;
+osmesa)
+    DRIVER_DIRS="osmesa"
+    ;;
+no)
+    DRIVER_DRIS=""
+    ;;
+esac
+AC_SUBST([SRC_DIRS])
+AC_SUBST([GLU_DIRS])
+AC_SUBST([DRIVER_DIRS])
+AC_SUBST([GALLIUM_DIRS])
+AC_SUBST([GALLIUM_TARGET_DIRS])
+AC_SUBST([GALLIUM_WINSYS_DIRS])
+AC_SUBST([GALLIUM_DRIVERS_DIRS])
+AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])
+AC_SUBST([MESA_LLVM])
+
+dnl
+dnl Find out if X is available. The variable have_x is set if libX11 is
+dnl found to mimic AC_PATH_XTRA.
+dnl
+if test -n "$PKG_CONFIG"; then
+    AC_MSG_CHECKING([pkg-config files for X11 are available])
+    PKG_CHECK_EXISTS([x11],[
+        x11_pkgconfig=yes
+        have_x=yes
+        ],[
+        x11_pkgconfig=no
+    ])
+    AC_MSG_RESULT([$x11_pkgconfig])
+else
+    x11_pkgconfig=no
+fi
+dnl Use the autoconf macro if no pkg-config files
+if test "$x11_pkgconfig" = yes; then
+    PKG_CHECK_MODULES([X11], [x11])
+else
+    AC_PATH_XTRA
+    test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS"
+    test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11"
+    AC_SUBST([X11_CFLAGS])
+    AC_SUBST([X11_LIBS])
+fi
+
+dnl Try to tell the user that the --x-* options are only used when
+dnl pkg-config is not available. This must be right after AC_PATH_XTRA.
+m4_divert_once([HELP_BEGIN],
+[These options are only used when the X libraries cannot be found by the
+pkg-config utility.])
+
+dnl We need X for xlib and dri, so bomb now if it's not found
+case "$mesa_driver" in
+xlib|dri)
+    if test "$no_x" = yes; then
+        AC_MSG_ERROR([X11 development libraries needed for $mesa_driver driver])
+    fi
+    ;;
+esac
+
+dnl XCB - this is only used for GLX right now
+AC_ARG_ENABLE([xcb],
+    [AS_HELP_STRING([--enable-xcb],
+        [use XCB for GLX @<:@default=disabled@:>@])],
+    [enable_xcb="$enableval"],
+    [enable_xcb=no])
+if test "x$enable_xcb" = xyes; then
+    DEFINES="$DEFINES -DUSE_XCB"
+else
+    enable_xcb=no
+fi
+
+dnl Direct rendering or just indirect rendering
+case "$host_os" in
+gnu*)
+    dnl Disable by default on GNU/Hurd
+    driglx_direct_default="no"
+    ;;
+cygwin*)
+    dnl Disable by default on cygwin
+    driglx_direct_default="no"
+    ;;
+*)
+    driglx_direct_default="yes"
+    ;;
+esac
+AC_ARG_ENABLE([driglx-direct],
+    [AS_HELP_STRING([--disable-driglx-direct],
+        [enable direct rendering in GLX and EGL for DRI \
+            @<:@default=auto@:>@])],
+    [driglx_direct="$enableval"],
+    [driglx_direct="$driglx_direct_default"])
+
+dnl
+dnl libGL configuration per driver
+dnl
+case "$mesa_driver" in
+xlib)
+    if test "$x11_pkgconfig" = yes; then
+        PKG_CHECK_MODULES([XLIBGL], [x11 xext])
+        GL_PC_REQ_PRIV="x11 xext"
+        X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS"
+        GL_LIB_DEPS="$XLIBGL_LIBS"
+    else
+        # should check these...
+        X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"
+        GL_LIB_DEPS="$X_LIBS -lX11 -lXext"
+        GL_PC_LIB_PRIV="$GL_LIB_DEPS"
+        GL_PC_CFLAGS="$X11_INCLUDES"
+    fi
+    GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread"
+    GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread"
+
+    # if static, move the external libraries to the programs
+    # and empty the libraries for libGL
+    if test "$enable_static" = yes; then
+        APP_LIB_DEPS="$APP_LIB_DEPS $GL_LIB_DEPS"
+        GL_LIB_DEPS=""
+    fi
+    ;;
+dri|no) # these checks are still desired when there is no mesa_driver
+    # DRI must be shared, I think
+    if test "$enable_static" = yes; then
+        AC_MSG_ERROR([Can't use static libraries for DRI drivers])
+    fi
+
+    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
+    GL_PC_REQ_PRIV="glproto >= $GLPROTO_REQUIRED"
+    DRI_PC_REQ_PRIV=""
+
+    if test x"$driglx_direct" = xyes; then
+        # Check for libdrm
+        PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
+        PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
+        GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED"
+        DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
+    fi
+
+    # find the DRI deps for libGL
+    if test "$x11_pkgconfig" = yes; then
+        dri_modules="x11 xext xdamage xfixes"
+
+        # add xf86vidmode if available
+        PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no)
+        if test "$HAVE_XF86VIDMODE" = yes ; then
+            dri_modules="$dri_modules xxf86vm"
+        fi
+
+        # add xcb modules if necessary
+        if test "$enable_xcb" = yes; then
+            dri_modules="$dri_modules x11-xcb xcb-glx"
+        fi
+
+        PKG_CHECK_MODULES([DRIGL], [$dri_modules])
+        GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"
+        X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS"
+        GL_LIB_DEPS="$DRIGL_LIBS"
+    else
+        # should check these...
+        X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"
+        GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes"
+        GL_PC_LIB_PRIV="$GL_LIB_DEPS"
+        GL_PC_CFLAGS="$X11_INCLUDES"
+
+        # XCB can only be used from pkg-config
+        if test "$enable_xcb" = yes; then
+            PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx])
+            GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV x11-xcb xcb-glx"
+            X11_INCLUDES="$X11_INCLUDES $XCB_CFLAGS"
+            GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS"
+        fi
+    fi
+
+    # need DRM libs, -lpthread, etc.
+    GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
+    GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+    GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
+    GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+    GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
+    GLESv2_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+    ;;
+osmesa)
+    # No libGL for osmesa
+    GL_LIB_DEPS=""
+    ;;
+esac
+AC_SUBST([GL_LIB_DEPS])
+AC_SUBST([GL_PC_REQ_PRIV])
+AC_SUBST([GL_PC_LIB_PRIV])
+AC_SUBST([GL_PC_CFLAGS])
+AC_SUBST([DRI_PC_REQ_PRIV])
+AC_SUBST([GLESv1_CM_LIB_DEPS])
+AC_SUBST([GLESv1_CM_PC_LIB_PRIV])
+AC_SUBST([GLESv2_LIB_DEPS])
+AC_SUBST([GLESv2_PC_LIB_PRIV])
+
+GLAPI_LIB_DEPS="-lpthread"
+AC_SUBST([GLAPI_LIB_DEPS])
+
+
+dnl Setup default DRI CFLAGS
+DRI_CFLAGS='$(CFLAGS)'
+DRI_CXXFLAGS='$(CXXFLAGS)'
+DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
+MESA_MODULES='$(TOP)/src/mesa/libmesa.a'
+
+AC_ARG_ENABLE([shared-dricore],
+    [AS_HELP_STRING([--enable-shared-dricore],
+        [link DRI modules with shared core DRI routines @<:@default=disabled@:>@])],
+    [enable_dricore="$enableval"],
+    [enable_dricore=no])
+if test "$mesa_driver" = dri ; then
+   if test "$enable_dricore" = yes ; then
+      if test "$GCC$GXX" != yesyes ; then
+      	 AC_MSG_WARN([Shared dricore requires GCC-compatible rpath handling.  Disabling shared dricore])
+	 enable_dricore=no
+      else
+	 DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'
+	 DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'
+	 DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl'
+      	 DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore -lglsl'
+      	 DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE'
+      	 DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE'
+      	 MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'
+      fi
+   fi
+fi
+AC_SUBST([DRICORE_LIBS])
+AC_SUBST([DRICORE_GLSL_LIBS])
+AC_SUBST([DRICORE_LIB_DEPS])
+AC_SUBST([DRI_CXXFLAGS])
+AC_SUBST([DRI_CFLAGS])
+AC_SUBST([MESA_MODULES])
+
+AC_SUBST([HAVE_XF86VIDMODE])
+
+PKG_CHECK_MODULES([LIBDRM_RADEON],
+		  [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED],
+		  HAVE_LIBDRM_RADEON=yes,
+		  HAVE_LIBDRM_RADEON=no)
+
+dnl
+dnl More X11 setup
+dnl
+if test "$mesa_driver" = xlib; then
+    DEFINES="$DEFINES -DUSE_XSHM"
+fi
+
+dnl
+dnl TLS detection
+dnl
+
+AC_ARG_ENABLE([glx-tls],
+    [AS_HELP_STRING([--enable-glx-tls],
+        [enable TLS support in GLX @<:@default=disabled@:>@])],
+    [GLX_USE_TLS="$enableval"],
+    [GLX_USE_TLS=no])
+AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
+
+AS_IF([test "x$GLX_USE_TLS" = xyes],
+      [DEFINES="${DEFINES} -DGLX_USE_TLS -DPTHREADS"])
+
+dnl
+dnl More DRI setup
+dnl
+dnl Directory for DRI drivers
+AC_ARG_WITH([dri-driverdir],
+    [AS_HELP_STRING([--with-dri-driverdir=DIR],
+        [directory for the DRI drivers @<:@${libdir}/dri@:>@])],
+    [DRI_DRIVER_INSTALL_DIR="$withval"],
+    [DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])
+AC_SUBST([DRI_DRIVER_INSTALL_DIR])
+dnl Extra search path for DRI drivers
+AC_ARG_WITH([dri-searchpath],
+    [AS_HELP_STRING([--with-dri-searchpath=DIRS...],
+        [semicolon delimited DRI driver search directories @<:@${libdir}/dri@:>@])],
+    [DRI_DRIVER_SEARCH_DIR="$withval"],
+    [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])
+AC_SUBST([DRI_DRIVER_SEARCH_DIR])
+dnl Which drivers to build - default is chosen by platform
+AC_ARG_WITH([dri-drivers],
+    [AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@],
+        [comma delimited DRI drivers list, e.g.
+        "swrast,i965,radeon" @<:@default=auto@:>@])],
+    [with_dri_drivers="$withval"],
+    [with_dri_drivers=yes])
+if test "x$with_dri_drivers" = x; then
+    with_dri_drivers=no
+fi
+
+dnl If $with_dri_drivers is yes, directories will be added through
+dnl platform checks
+DRI_DIRS=""
+case "$with_dri_drivers" in
+no) ;;
+yes)
+    DRI_DIRS="yes"
+    ;;
+*)
+    # verify the requested driver directories exist
+    dri_drivers=`IFS=', '; echo $with_dri_drivers`
+    for driver in $dri_drivers; do
+        test -d "$srcdir/src/mesa/drivers/dri/$driver" || \
+            AC_MSG_ERROR([DRI driver directory '$driver' doesn't exist])
+    done
+    DRI_DIRS="$dri_drivers"
+    ;;
+esac
+
+dnl Set DRI_DIRS, DEFINES and LIB_DEPS
+if test "$mesa_driver" = dri -o "$mesa_driver" = no; then
+    # Platform specific settings and drivers to build
+    case "$host_os" in
+    linux*)
+        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
+        if test "x$driglx_direct" = xyes; then
+            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+        fi
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"
+
+        case "$host_cpu" in
+        x86_64)
+            # sis is missing because they have not be converted to use
+            # the new interface.  i810 are missing because there is no
+            # x86-64 system where they could *ever* be used.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon \
+                    savage tdfx unichrome swrast"
+            fi
+            ;;
+        powerpc*)
+            # Build only the drivers for cards that exist on PowerPC.
+            # At some point MGA will be added, but not yet.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"
+            fi
+            ;;
+        sparc*)
+            # Build only the drivers for cards that exist on sparc`
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"
+            fi
+            ;;
+        esac
+        ;;
+    freebsd* | dragonfly* | *netbsd*)
+        DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
+        DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
+        if test "x$driglx_direct" = xyes; then
+            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+        fi
+
+        if test "x$DRI_DIRS" = "xyes"; then
+            DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
+                unichrome savage sis swrast"
+        fi
+        ;;
+    gnu*)
+        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"
+	;;
+    solaris*)
+        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
+        if test "x$driglx_direct" = xyes; then
+            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+        fi
+        ;;
+    cygwin*)
+        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
+        if test "x$driglx_direct" = xyes; then
+            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+        fi
+        if test "x$DRI_DIRS" = "xyes"; then
+            DRI_DIRS="swrast"
+        fi
+        ;;
+    esac
+
+    # default drivers
+    if test "x$DRI_DIRS" = "xyes"; then
+        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
+            savage sis tdfx unichrome swrast"
+    fi
+
+    DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`
+
+    # Check for expat
+    if test "$mesa_driver" = dri; then
+        EXPAT_INCLUDES=""
+        EXPAT_LIB=-lexpat
+        AC_ARG_WITH([expat],
+            [AS_HELP_STRING([--with-expat=DIR],
+                [expat install directory])],[
+            EXPAT_INCLUDES="-I$withval/include"
+            CPPFLAGS="$CPPFLAGS $EXPAT_INCLUDES"
+            LDFLAGS="$LDFLAGS -L$withval/$LIB_DIR"
+            EXPAT_LIB="-L$withval/$LIB_DIR -lexpat"
+            ])
+        AC_CHECK_HEADER([expat.h],[],[AC_MSG_ERROR([Expat required for DRI.])])
+        AC_CHECK_LIB([expat],[XML_ParserCreate],[],
+            [AC_MSG_ERROR([Expat required for DRI.])])
+    fi
+
+    # put all the necessary libs together, including possibly libdricore
+    DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"
+fi
+AC_SUBST([DRI_DIRS])
+AC_SUBST([EXPAT_INCLUDES])
+AC_SUBST([DRI_LIB_DEPS])
+
+case $DRI_DIRS in
+*i915*|*i965*)
+    PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
+    ;;
+esac
+
+case $DRI_DIRS in
+*radeon*|*r200*|*r300*|*r600*)
+    if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+	RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
+	RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
+    fi
+    ;;
+esac
+AC_SUBST([RADEON_CFLAGS])
+AC_SUBST([RADEON_LDFLAGS])
+
+
+dnl
+dnl OSMesa configuration
+dnl
+if test "$mesa_driver" = xlib; then
+    default_gl_osmesa=yes
+else
+    default_gl_osmesa=no
+fi
+AC_ARG_ENABLE([gl-osmesa],
+    [AS_HELP_STRING([--enable-gl-osmesa],
+        [enable OSMesa with libGL @<:@default=enabled for xlib driver@:>@])],
+    [gl_osmesa="$enableval"],
+    [gl_osmesa="$default_gl_osmesa"])
+if test "x$gl_osmesa" = xyes; then
+    if test "x$enable_opengl" = xno; then
+        AC_MSG_ERROR([OpenGL is not available for OSMesa driver])
+    fi
+    if test "$mesa_driver" = osmesa; then
+        AC_MSG_ERROR([libGL is not available for OSMesa driver])
+    else
+        DRIVER_DIRS="$DRIVER_DIRS osmesa"
+    fi
+fi
+
+dnl Configure the channel bits for OSMesa (libOSMesa, libOSMesa16, ...)
+AC_ARG_WITH([osmesa-bits],
+    [AS_HELP_STRING([--with-osmesa-bits=BITS],
+        [OSMesa channel bits and library name: 8, 16, 32 @<:@default=8@:>@])],
+    [osmesa_bits="$withval"],
+    [osmesa_bits=8])
+if test "$mesa_driver" != osmesa && test "x$osmesa_bits" != x8; then
+    AC_MSG_WARN([Ignoring OSMesa channel bits for non-OSMesa driver])
+    osmesa_bits=8
+fi
+case "x$osmesa_bits" in
+x8)
+    OSMESA_LIB=OSMesa
+    ;;
+x16|x32)
+    OSMESA_LIB="OSMesa$osmesa_bits"
+    DEFINES="$DEFINES -DCHAN_BITS=$osmesa_bits -DDEFAULT_SOFTWARE_DEPTH_BITS=31"
+    ;;
+*)
+    AC_MSG_ERROR([OSMesa bits '$osmesa_bits' is not a valid option])
+    ;;
+esac
+AC_SUBST([OSMESA_LIB])
+
+case "$DRIVER_DIRS" in
+*osmesa*)
+    # only link libraries with osmesa if shared
+    if test "$enable_static" = no; then
+        OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
+    else
+        OSMESA_LIB_DEPS=""
+    fi
+    OSMESA_MESA_DEPS=""
+    OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
+    ;;
+esac
+AC_SUBST([OSMESA_LIB_DEPS])
+AC_SUBST([OSMESA_MESA_DEPS])
+AC_SUBST([OSMESA_PC_REQ])
+AC_SUBST([OSMESA_PC_LIB_PRIV])
+
+dnl
+dnl EGL configuration
+dnl
+AC_ARG_ENABLE([egl],
+    [AS_HELP_STRING([--disable-egl],
+        [disable EGL library @<:@default=enabled@:>@])],
+    [enable_egl="$enableval"],
+    [enable_egl=yes])
+if test "x$enable_egl" = xno; then
+    if test "x$mesa_driver" = xno; then
+        AC_MSG_ERROR([cannot disable EGL when there is no mesa driver])
+    fi
+    if test "x$enable_openvg" = xyes; then
+        AC_MSG_ERROR([cannot enable OpenVG without EGL])
+    fi
+fi
+if test "x$enable_egl" = xyes; then
+    SRC_DIRS="$SRC_DIRS egl"
+    EGL_LIB_DEPS="$DLOPEN_LIBS $SELINUX_LIBS -lpthread"
+    EGL_DRIVERS_DIRS=""
+    if test "$enable_static" != yes; then
+        # build egl_glx when libGL is built
+        if test "$mesa_driver" = xlib -o "$mesa_driver" = dri; then
+            EGL_DRIVERS_DIRS="glx"
+        fi
+
+        PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],
+                          [have_libudev=yes],[have_libudev=no])
+        if test "$have_libudev" = yes; then
+            DEFINES="$DEFINES -DHAVE_LIBUDEV"
+        fi
+        if test "$mesa_driver" = dri; then
+            # build egl_dri2 when xcb-dri2 is available
+            PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes],
+            		  [have_xcb_dri2=yes],[have_xcb_dri2=no])
+            
+            if test "$have_xcb_dri2" = yes; then
+                EGL_DRIVER_DRI2=dri2
+                DEFINES="$DEFINES -DHAVE_XCB_DRI2"
+                # workaround a bug in xcb-dri2 generated by xcb-proto 1.6
+                AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [],
+                          [DEFINES="$DEFINES -DXCB_DRI2_CONNECT_DEVICE_NAME_BROKEN"])
+            fi
+	fi
+
+        EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS $EGL_DRIVER_DRI2"
+    fi
+fi
+AC_SUBST([EGL_LIB_DEPS])
+AC_SUBST([EGL_DRIVERS_DIRS])
+
+dnl
+dnl GLU configuration
+dnl
+AC_ARG_ENABLE([glu],
+    [AS_HELP_STRING([--disable-glu],
+        [enable OpenGL Utility library @<:@default=enabled@:>@])],
+    [enable_glu="$enableval"],
+    [enable_glu=yes])
+
+if test "x$enable_glu" = xyes -a "x$mesa_driver" = xno; then
+    AC_MSG_NOTICE([Disabling GLU since there is no OpenGL driver])
+    enable_glu=no
+fi
+
+if test "x$enable_glu" = xyes; then
+    SRC_DIRS="$SRC_DIRS glu"
+
+    case "$mesa_driver" in
+    osmesa)
+        # Link libGLU to libOSMesa instead of libGL
+        GLU_LIB_DEPS=""
+        GLU_PC_REQ="osmesa"
+        if test "$enable_static" = no; then
+            GLU_MESA_DEPS='-l$(OSMESA_LIB)'
+        else
+            GLU_MESA_DEPS=""
+        fi
+        ;;
+    *)
+        # If static, empty GLU_LIB_DEPS and add libs for programs to link
+        GLU_PC_REQ="gl"
+        GLU_PC_LIB_PRIV="-lm"
+        if test "$enable_static" = no; then
+            GLU_LIB_DEPS="-lm"
+            GLU_MESA_DEPS='-l$(GL_LIB)'
+        else
+            GLU_LIB_DEPS=""
+            GLU_MESA_DEPS=""
+            APP_LIB_DEPS="$APP_LIB_DEPS -lstdc++"
+        fi
+        ;;
+    esac
+fi
+if test "$enable_static" = no; then
+    GLU_LIB_DEPS="$GLU_LIB_DEPS $OS_CPLUSPLUS_LIBS"
+fi
+GLU_PC_LIB_PRIV="$GLU_PC_LIB_PRIV $OS_CPLUSPLUS_LIBS"
+AC_SUBST([GLU_LIB_DEPS])
+AC_SUBST([GLU_MESA_DEPS])
+AC_SUBST([GLU_PC_REQ])
+AC_SUBST([GLU_PC_REQ_PRIV])
+AC_SUBST([GLU_PC_LIB_PRIV])
+AC_SUBST([GLU_PC_CFLAGS])
+
+dnl
+dnl GLw configuration
+dnl
+AC_ARG_ENABLE([glw],
+    [AS_HELP_STRING([--disable-glw],
+        [enable Xt/Motif widget library @<:@default=enabled@:>@])],
+    [enable_glw="$enableval"],
+    [enable_glw=yes])
+dnl Don't build GLw on osmesa
+if test "x$enable_glw" = xyes; then
+    case "$mesa_driver" in
+    osmesa|no)
+        AC_MSG_NOTICE([Disabling GLw since there is no OpenGL driver])
+        enable_glw=no
+        ;;
+    esac
+fi
+AC_ARG_ENABLE([motif],
+    [AS_HELP_STRING([--enable-motif],
+        [use Motif widgets in GLw @<:@default=disabled@:>@])],
+    [enable_motif="$enableval"],
+    [enable_motif=no])
+
+if test "x$enable_glw" = xyes; then
+    SRC_DIRS="$SRC_DIRS glw"
+    if test "$x11_pkgconfig" = yes; then
+        PKG_CHECK_MODULES([GLW],[x11 xt])
+        GLW_PC_REQ_PRIV="x11 xt"
+        GLW_LIB_DEPS="$GLW_LIBS"
+    else
+        # should check these...
+        GLW_LIB_DEPS="$X_LIBS -lXt -lX11"
+        GLW_PC_LIB_PRIV="$GLW_LIB_DEPS"
+        GLW_PC_CFLAGS="$X11_INCLUDES"
+    fi
+
+    GLW_SOURCES="GLwDrawA.c"
+    MOTIF_CFLAGS=
+    if test "x$enable_motif" = xyes; then
+        GLW_SOURCES="$GLW_SOURCES GLwMDrawA.c"
+        AC_PATH_PROG([MOTIF_CONFIG], [motif-config], [no])
+        if test "x$MOTIF_CONFIG" != xno; then
+            MOTIF_CFLAGS=`$MOTIF_CONFIG --cflags`
+            MOTIF_LIBS=`$MOTIF_CONFIG --libs`
+        else
+            AC_CHECK_HEADER([Xm/PrimitiveP.h], [],
+                [AC_MSG_ERROR([Can't locate Motif headers])])
+            AC_CHECK_LIB([Xm], [XmGetPixmap], [MOTIF_LIBS="-lXm"],
+                [AC_MSG_ERROR([Can't locate Motif Xm library])])
+        fi
+        # MOTIF_LIBS is prepended to GLW_LIB_DEPS since Xm needs Xt/X11
+        GLW_LIB_DEPS="$MOTIF_LIBS $GLW_LIB_DEPS"
+        GLW_PC_LIB_PRIV="$MOTIF_LIBS $GLW_PC_LIB_PRIV"
+        GLW_PC_CFLAGS="$MOTIF_CFLAGS $GLW_PC_CFLAGS"
+    fi
+
+    # If static, empty GLW_LIB_DEPS and add libs for programs to link
+    GLW_PC_LIB_PRIV="$GLW_PC_LIB_PRIV"
+    if test "$enable_static" = no; then
+        GLW_MESA_DEPS='-l$(GL_LIB)'
+        GLW_LIB_DEPS="$GLW_LIB_DEPS"
+    else
+        APP_LIB_DEPS="$APP_LIB_DEPS $GLW_LIB_DEPS"
+        GLW_LIB_DEPS=""
+        GLW_MESA_DEPS=""
+    fi
+fi
+AC_SUBST([GLW_LIB_DEPS])
+AC_SUBST([GLW_MESA_DEPS])
+AC_SUBST([GLW_SOURCES])
+AC_SUBST([MOTIF_CFLAGS])
+AC_SUBST([GLW_PC_REQ_PRIV])
+AC_SUBST([GLW_PC_LIB_PRIV])
+AC_SUBST([GLW_PC_CFLAGS])
+
+dnl
+dnl GLUT configuration
+dnl
+if test -f "$srcdir/include/GL/glut.h"; then
+    default_glut=yes
+else
+    default_glut=no
+fi
+AC_ARG_ENABLE([glut],
+    [AS_HELP_STRING([--disable-glut],
+        [enable GLUT library @<:@default=enabled if source available@:>@])],
+    [enable_glut="$enableval"],
+    [enable_glut="$default_glut"])
+
+dnl Don't build glut on osmesa
+if test "x$enable_glut" = xyes; then
+    case "$mesa_driver" in
+    osmesa|no)
+        AC_MSG_NOTICE([Disabling glut since there is no OpenGL driver])
+        enable_glut=no
+        ;;
+    esac
+fi
+dnl Can't build glut if GLU not available
+if test "x$enable_glu$enable_glut" = xnoyes; then
+    AC_MSG_WARN([Disabling glut since GLU is disabled])
+    enable_glut=no
+fi
+
+if test "x$enable_glut" = xyes; then
+    SRC_DIRS="$SRC_DIRS glut/glx"
+    if test "$x11_pkgconfig" = yes; then
+        PKG_CHECK_MODULES([GLUT],[x11 xmu xi])
+        GLUT_PC_REQ_PRIV="x11 xmu xi"
+        GLUT_LIB_DEPS="$GLUT_LIBS"
+    else
+        # should check these...
+        GLUT_LIB_DEPS="$X_LIBS -lX11 -lXmu -lXi"
+        GLUT_PC_LIB_PRIV="$GLUT_LIB_DEPS"
+        GLUT_PC_CFLAGS="$X11_INCLUDES"
+    fi
+    if test "x$GCC" = xyes; then
+        GLUT_CFLAGS="$GLUT_CFLAGS -fexceptions"
+    fi
+    GLUT_LIB_DEPS="$GLUT_LIB_DEPS -lm"
+    GLUT_PC_LIB_PRIV="$GLUT_PC_LIB_PRIV -lm"
+
+    # If static, empty GLUT_LIB_DEPS and add libs for programs to link
+    if test "$enable_static" = no; then
+        GLUT_MESA_DEPS='-l$(GLU_LIB) -l$(GL_LIB)'
+    else
+        APP_LIB_DEPS="$APP_LIB_DEPS $GLUT_LIB_DEPS"
+        GLUT_LIB_DEPS=""
+        GLUT_MESA_DEPS=""
+    fi
+fi
+AC_SUBST([GLUT_LIB_DEPS])
+AC_SUBST([GLUT_MESA_DEPS])
+AC_SUBST([GLUT_CFLAGS])
+AC_SUBST([GLUT_PC_REQ_PRIV])
+AC_SUBST([GLUT_PC_LIB_PRIV])
+AC_SUBST([GLUT_PC_CFLAGS])
+
+dnl
+dnl Program library dependencies
+dnl    Only libm is added here if necessary as the libraries should
+dnl    be pulled in by the linker
+dnl
+if test "x$APP_LIB_DEPS" = x; then
+    case "$host_os" in
+    solaris*)
+        APP_LIB_DEPS="-lX11 -lsocket -lnsl -lm"
+        ;;
+    cygwin*)
+        APP_LIB_DEPS="-lX11"
+        ;;
+    *)
+        APP_LIB_DEPS="-lm"
+        ;;
+    esac
+fi
+AC_SUBST([APP_LIB_DEPS])
+AC_SUBST([PROGRAM_DIRS])
+
+dnl
+dnl Gallium configuration
+dnl
+AC_ARG_ENABLE([gallium],
+    [AS_HELP_STRING([--disable-gallium],
+        [build gallium @<:@default=enabled@:>@])],
+    [enable_gallium="$enableval"],
+    [enable_gallium=yes])
+if test "x$enable_gallium" = xno -a "x$enable_openvg" = xyes; then
+    AC_MSG_ERROR([cannot enable OpenVG without Gallium])
+fi
+if test "x$enable_gallium" = xyes; then
+    SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
+    AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
+fi
+
+AC_SUBST([LLVM_CFLAGS])
+AC_SUBST([LLVM_LIBS])
+AC_SUBST([LLVM_LDFLAGS])
+AC_SUBST([LLVM_VERSION])
+
+dnl
+dnl Gallium state trackers configuration
+dnl
+
+AC_ARG_ENABLE([gallium-egl],
+    [AS_HELP_STRING([--enable-gallium-egl],
+        [enable gallium EGL state tracker @<:@default=auto@:>@])],
+    [enable_gallium_egl="$enableval"],
+    [enable_gallium_egl=auto])
+if test "x$enable_gallium_egl" = xauto; then
+    case "$mesa_driver" in
+    dri|no)
+        enable_gallium_egl=$enable_egl
+        ;;
+    *)
+        enable_gallium_egl=$enable_openvg
+        ;;
+    esac
+fi
+case "x$enable_egl$enable_gallium_egl" in
+xnoyes)
+    AC_MSG_ERROR([cannot build Gallium EGL state tracker without EGL])
+esac
+
+AC_ARG_WITH([state-trackers],
+    [AS_HELP_STRING([--with-state-trackers@<:@=DIRS...@:>@],
+        [comma delimited state_trackers list, e.g.
+        "egl,glx" @<:@default=auto@:>@])],
+    [with_state_trackers="$withval"],
+    [with_state_trackers=yes])
+
+case "$with_state_trackers" in
+no)
+    GALLIUM_STATE_TRACKERS_DIRS=""
+    ;;
+yes)
+    # look at what else is built
+    case "$mesa_driver" in
+    xlib)
+        GALLIUM_STATE_TRACKERS_DIRS=glx
+        ;;
+    dri)
+        GALLIUM_STATE_TRACKERS_DIRS="dri"
+        HAVE_ST_DRI="yes"
+        # Have only tested st/xorg on 1.6.0 servers
+        PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0 libdrm >= $LIBDRM_XORG_REQUIRED libkms >= $LIBKMS_XORG_REQUIRED],
+            HAVE_ST_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg",
+            HAVE_ST_XORG="no")
+        ;;
+    esac
+
+    if test "x$enable_egl" = xyes; then
+        if test "$enable_openvg" = yes; then
+            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vega"
+            st_egl="yes"
+        fi
+
+        if test "$enable_gallium_egl" = yes; then
+            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"
+            HAVE_ST_EGL="yes"
+        fi
+    fi
+    ;;
+*)
+    # verify the requested state tracker exist
+    state_trackers=""
+    _state_trackers=`IFS=', '; echo $with_state_trackers`
+    for tracker in $_state_trackers; do
+        case "$tracker" in
+        dri)
+            if test "x$mesa_driver" != xdri; then
+                AC_MSG_ERROR([cannot build dri state tracker without mesa driver set to dri])
+            fi
+            HAVE_ST_DRI="yes"
+            ;;
+        egl)
+            if test "x$enable_egl" != xyes; then
+                AC_MSG_ERROR([cannot build egl state tracker without EGL library])
+            fi
+            HAVE_ST_EGL="yes"
+            ;;
+        xorg)
+            PKG_CHECK_MODULES([XORG], [xorg-server >= 1.6.0])
+            PKG_CHECK_MODULES([LIBDRM_XORG], [libdrm >= $LIBDRM_XORG_REQUIRED])
+            PKG_CHECK_MODULES([LIBKMS_XORG], [libkms >= $LIBKMS_XORG_REQUIRED])
+            HAVE_ST_XORG="yes"
+            ;;
+        vega)
+            if test "x$enable_openvg" != xyes; then
+                AC_MSG_ERROR([cannot build vega state tracker without --enable-openvg])
+            fi
+            have_st_vega="yes"
+            ;;
+        esac
+
+	if test -n "$tracker"; then
+            test -d "$srcdir/src/gallium/state_trackers/$tracker" || \
+                AC_MSG_ERROR([state tracker '$tracker' doesn't exist])
+            if test -n "$state_trackers"; then
+                state_trackers="$state_trackers $tracker"
+            else
+                state_trackers="$tracker"
+            fi
+        fi
+    done
+    GALLIUM_STATE_TRACKERS_DIRS="$state_trackers"
+
+    # append --enable-openvg/--enable-gallium-egl to --with-state-trackers
+    if test "x$have_st_vega" != xyes -a "x$enable_openvg" = xyes; then
+        AC_MSG_ERROR([--with-state-trackers specified but vega is missing])
+    fi
+    if test "x$HAVE_ST_EGL" != xyes -a "x$enable_gallium_egl" = xyes; then
+        AC_MSG_ERROR([--with-state-trackers specified but egl is missing])
+    fi
+    ;;
+esac
+
+
+EGL_CLIENT_APIS=""
+VG_LIB_DEPS=""
+
+case "x$enable_opengl$enable_gles1$enable_gles2" in
+x*yes*)
+    EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GL_LIB)'
+    ;;
+esac
+if test "x$enable_openvg" = xyes; then
+    EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)'
+    VG_LIB_DEPS="$VG_LIB_DEPS $SELINUX_LIBS -lpthread"
+fi
+
+AC_SUBST([VG_LIB_DEPS])
+AC_SUBST([EGL_CLIENT_APIS])
+
+if test "x$HAVE_ST_EGL" = xyes; then
+	GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl"
+fi
+
+if test "x$HAVE_ST_XORG" = xyes; then
+    PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+        HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71",
+        HAVE_XEXTPROTO_71="no")
+fi
+
+AC_ARG_WITH([egl-platforms],
+    [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
+        [comma delimited native platforms libEGL supports, e.g.
+        "x11,drm" @<:@default=auto@:>@])],
+    [with_egl_platforms="$withval"],
+    [with_egl_platforms=yes])
+AC_ARG_WITH([egl-displays],
+    [AS_HELP_STRING([--with-egl-displays@<:@=DIRS...@:>@],
+        [DEPRECATED.  Use --with-egl-platforms instead])],
+    [with_egl_platforms="$withval"])
+
+EGL_PLATFORMS=""
+WAYLAND_EGL_LIB_DEPS=""
+
+case "$with_egl_platforms" in
+yes)
+    if test "x$enable_egl" = xyes && test "x$mesa_driver" != xosmesa; then
+        EGL_PLATFORMS="x11"
+        if test "$mesa_driver" = dri; then
+            EGL_PLATFORMS="$EGL_PLATFORMS drm"
+        fi
+    fi
+    ;;
+*)
+    if test "x$enable_egl" != xyes; then
+        AC_MSG_ERROR([cannot build egl state tracker without EGL library])
+    fi
+    # verify the requested driver directories exist
+    egl_platforms=`IFS=', '; echo $with_egl_platforms`
+    for plat in $egl_platforms; do
+        test -d "$srcdir/src/gallium/state_trackers/egl/$plat" || \
+            AC_MSG_ERROR([EGL platform '$plat' doesn't exist])
+        if test "$plat" = "fbdev"; then
+                GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/fbdev"
+        fi
+	if test "$plat" = "wayland"; then
+		PKG_CHECK_MODULES([WAYLAND], [wayland-client wayland-server],, \
+				  [AC_MSG_ERROR([cannot find libwayland-client])])
+		WAYLAND_EGL_LIB_DEPS="$WAYLAND_LIBS $LIBDRM_LIBS"
+                GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/wayland"
+	fi
+    done
+    EGL_PLATFORMS="$egl_platforms"
+    ;;
+esac
+AC_SUBST([EGL_PLATFORMS])
+
+AC_SUBST([WAYLAND_EGL_LIB_DEPS])
+WAYLAND_EGL_PC_REQ_PRIV="wayland-client libdrm"
+WAYLAND_EGL_PC_LIB_PRIV=
+WAYLAND_EGL_PC_CFLAGS=
+
+AC_SUBST([WAYLAND_EGL_PC_REQ_PRIV])
+AC_SUBST([WAYLAND_EGL_PC_LIB_PRIV])
+AC_SUBST([WAYLAND_EGL_PC_CFLAGS])
+
+
+AC_ARG_WITH([egl-driver-dir],
+    [AS_HELP_STRING([--with-egl-driver-dir=DIR],
+                    [directory for EGL drivers [[default=${libdir}/egl]]])],
+    [EGL_DRIVER_INSTALL_DIR="$withval"],
+    [EGL_DRIVER_INSTALL_DIR='${libdir}/egl'])
+AC_SUBST([EGL_DRIVER_INSTALL_DIR])
+
+AC_ARG_WITH([xorg-driver-dir],
+    [AS_HELP_STRING([--with-xorg-driver-dir=DIR],
+                    [Default xorg driver directory[[default=${libdir}/xorg/modules/drivers]]])],
+    [XORG_DRIVER_INSTALL_DIR="$withval"],
+    [XORG_DRIVER_INSTALL_DIR="${libdir}/xorg/modules/drivers"])
+AC_SUBST([XORG_DRIVER_INSTALL_DIR])
+
+AC_ARG_WITH([max-width],
+    [AS_HELP_STRING([--with-max-width=N],
+                    [Maximum framebuffer width (4096)])],
+    [DEFINES="${DEFINES} -DMAX_WIDTH=${withval}";
+     AS_IF([test "${withval}" -gt "4096"],
+           [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]
+)
+AC_ARG_WITH([max-height],
+    [AS_HELP_STRING([--with-max-height=N],
+                    [Maximum framebuffer height (4096)])],
+    [DEFINES="${DEFINES} -DMAX_HEIGHT=${withval}";
+     AS_IF([test "${withval}" -gt "4096"],
+           [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]
+)
+
+dnl
+dnl Gallium LLVM
+dnl
+AC_ARG_ENABLE([gallium-llvm],
+    [AS_HELP_STRING([--enable-gallium-llvm],
+        [build gallium LLVM support @<:@default=enabled on x86/x86_64@:>@])],
+    [enable_gallium_llvm="$enableval"],
+    [enable_gallium_llvm=auto])
+if test "x$enable_gallium_llvm" = xauto; then
+    case "$host_cpu" in
+    i*86|x86_64) enable_gallium_llvm=yes;;
+    esac
+fi
+if test "x$enable_gallium_llvm" = xyes; then
+    if test "x$LLVM_CONFIG" != xno; then
+	LLVM_VERSION=`$LLVM_CONFIG --version`
+	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
+	LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++"
+
+	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
+	GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
+	DEFINES="$DEFINES -DGALLIUM_LLVMPIPE -D__STDC_CONSTANT_MACROS"
+	MESA_LLVM=1
+    else
+	MESA_LLVM=0
+    fi
+else
+    MESA_LLVM=0
+fi
+
+dnl
+dnl Gallium helper functions
+dnl
+gallium_check_st() {
+    if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes; then
+         GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1"
+    fi
+    if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then
+         GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $2"
+    fi
+    if test "x$HAVE_ST_XORG" = xyes && test "x$3" != x; then
+         GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3"
+    fi
+}
+
+
+dnl
+dnl Gallium SVGA configuration
+dnl
+AC_ARG_ENABLE([gallium-svga],
+    [AS_HELP_STRING([--enable-gallium-svga],
+        [build gallium SVGA @<:@default=disabled@:>@])],
+    [enable_gallium_svga="$enableval"],
+    [enable_gallium_svga=auto])
+if test "x$enable_gallium_svga" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
+    gallium_check_st "svga/drm" "dri-vmwgfx" "xorg-vmwgfx"
+elif test "x$enable_gallium_svga" = xauto; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
+fi
+
+dnl
+dnl Gallium i915 configuration
+dnl
+AC_ARG_ENABLE([gallium-i915],
+    [AS_HELP_STRING([--enable-gallium-i915],
+        [build gallium i915 @<:@default=disabled@:>@])],
+    [enable_gallium_i915="$enableval"],
+    [enable_gallium_i915=auto])
+if test "x$enable_gallium_i915" = xyes; then
+    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
+    gallium_check_st "i915/drm" "dri-i915" "xorg-i915"
+elif test "x$enable_gallium_i915" = xauto; then
+    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
+fi
+
+dnl
+dnl Gallium i965 configuration
+dnl
+AC_ARG_ENABLE([gallium-i965],
+    [AS_HELP_STRING([--enable-gallium-i965],
+        [build gallium i965 @<:@default=disabled@:>@])],
+    [enable_gallium_i965="$enableval"],
+    [enable_gallium_i965=auto])
+if test "x$enable_gallium_i965" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"
+    gallium_check_st "i965/drm" "dri-i965" "xorg-i965"
+elif test "x$enable_gallium_i965" = xauto; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"
+fi
+
+dnl
+dnl Gallium Radeon r300g configuration
+dnl
+AC_ARG_ENABLE([gallium-r300],
+    [AS_HELP_STRING([--enable-gallium-r300],
+        [build gallium r300 @<:@default=build DRI driver only@:>@])],
+    [enable_gallium_r300="$enableval"],
+    [enable_gallium_r300=auto])
+
+if test "$mesa_driver" != dri ; then
+    if test "x$enable_gallium_r300" = xauto; then
+      enable_gallium_r300=no
+    fi
+fi
+
+if test "x$enable_gallium_r300" != xno; then
+    if test "x$MESA_LLVM" = x0; then
+        case "$host_cpu" in
+        i*86|x86_64) AC_MSG_ERROR([LLVM is required to build Gallium R300 on x86 and x86_64]);;
+        esac
+    fi
+fi
+if test "x$enable_gallium_r300" = xauto; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+    gallium_check_st "radeon/drm" "dri-r300"
+elif test "x$enable_gallium_r300" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+    gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
+fi
+
+dnl
+dnl Gallium Radeon r600g configuration
+dnl
+AC_ARG_ENABLE([gallium-r600],
+    [AS_HELP_STRING([--enable-gallium-r600],
+        [build gallium r600 @<:@default=disabled@:>@])],
+    [enable_gallium_r600="$enableval"],
+    [enable_gallium_r600=auto])
+if test "x$enable_gallium_r600" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
+    gallium_check_st "r600/drm" "dri-r600"
+fi
+
+dnl
+dnl Gallium Nouveau configuration
+dnl
+AC_ARG_ENABLE([gallium-nouveau],
+    [AS_HELP_STRING([--enable-gallium-nouveau],
+        [build gallium nouveau @<:@default=disabled@:>@])],
+    [enable_gallium_nouveau="$enableval"],
+    [enable_gallium_nouveau=no])
+if test "x$enable_gallium_nouveau" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50 nvc0"
+    gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau"
+fi
+
+dnl
+dnl Gallium swrast configuration
+dnl
+AC_ARG_ENABLE([gallium-swrast],
+    [AS_HELP_STRING([--enable-gallium-swrast],
+        [build gallium swrast @<:@default=auto@:>@])],
+    [enable_gallium_swrast="$enableval"],
+    [enable_gallium_swrast=auto])
+if test "x$enable_gallium_swrast" = xyes || test "x$enable_gallium_swrast" = xauto; then
+    if test "x$HAVE_ST_DRI" = xyes; then
+        GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast"
+    fi
+fi
+
+dnl prepend CORE_DIRS to SRC_DIRS
+SRC_DIRS="$CORE_DIRS $SRC_DIRS"
+
+dnl Restore LDFLAGS and CPPFLAGS
+LDFLAGS="$_SAVE_LDFLAGS"
+CPPFLAGS="$_SAVE_CPPFLAGS"
+
+dnl Substitute the config
+AC_CONFIG_FILES([configs/autoconf])
+
+dnl Replace the configs/current symlink
+AC_CONFIG_COMMANDS([configs],[
+if test -f configs/current || test -L configs/current; then
+    rm -f configs/current
+fi
+ln -s autoconf configs/current
+])
+
+AC_OUTPUT
+
+dnl
+dnl Output some configuration info for the user
+dnl
+echo ""
+echo "        prefix:          $prefix"
+echo "        exec_prefix:     $exec_prefix"
+echo "        libdir:          $libdir"
+echo "        includedir:      $includedir"
+
+dnl API info
+echo ""
+echo "        OpenGL:          $enable_opengl (ES1: $enable_gles1 ES2: $enable_gles2)"
+echo "        OpenVG:          $enable_openvg"
+
+dnl Driver info
+echo ""
+echo "        Driver:          $mesa_driver"
+if test "$mesa_driver" != no; then
+    if echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1; then
+        echo "        OSMesa:          lib$OSMESA_LIB"
+    else
+        echo "        OSMesa:          no"
+    fi
+    if test "$mesa_driver" = dri; then
+        # cleanup the drivers var
+        dri_dirs=`echo $DRI_DIRS | $SED 's/^ *//;s/  */ /;s/ *$//'`
+        if test "x$DRI_DIRS" = x; then
+            echo "        DRI drivers:     no"
+        else
+            echo "        DRI drivers:     $dri_dirs"
+        fi
+        echo "        DRI driver dir:  $DRI_DRIVER_INSTALL_DIR"
+        echo "        Use XCB:         $enable_xcb"
+        echo "        Shared dricore:  $enable_dricore"
+    fi
+fi
+echo ""
+echo "        GLU:             $enable_glu"
+echo "        GLw:             $enable_glw (Motif: $enable_motif)"
+echo "        glut:            $enable_glut"
+
+dnl EGL
+echo ""
+echo "        EGL:             $enable_egl"
+if test "$enable_egl" = yes; then
+    echo "        EGL platforms:   $EGL_PLATFORMS"
+
+    egl_drivers=""
+    for d in $EGL_DRIVERS_DIRS; do
+        egl_drivers="$egl_drivers builtin:egl_$d"
+    done
+
+    if test "$enable_gallium" = yes -a "$HAVE_ST_EGL" = yes; then
+        echo "        EGL drivers:    ${egl_drivers} egl_gallium"
+        echo "        EGL Gallium STs:$EGL_CLIENT_APIS"
+    else
+        echo "        EGL drivers:    $egl_drivers"
+    fi
+fi
+
+echo ""
+if test "x$MESA_LLVM" = x1; then
+    echo "        llvm:            yes"
+    echo "        llvm-config:     $LLVM_CONFIG"
+    echo "        llvm-version:    $LLVM_VERSION"
+else
+    echo "        llvm:            no"
+fi
+
+echo ""
+if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then
+    echo "        Gallium:         yes"
+    echo "        Gallium dirs:    $GALLIUM_DIRS"
+    echo "        Target dirs:     $GALLIUM_TARGET_DIRS"
+    echo "        Winsys dirs:     $GALLIUM_WINSYS_DIRS"
+    echo "        Driver dirs:     $GALLIUM_DRIVERS_DIRS"
+    echo "        Trackers dirs:   $GALLIUM_STATE_TRACKERS_DIRS"
+else
+    echo "        Gallium:         no"
+fi
+
+dnl Libraries
+echo ""
+echo "        Shared libs:     $enable_shared"
+echo "        Static libs:     $enable_static"
+
+dnl Compiler options
+# cleanup the CFLAGS/CXXFLAGS/DEFINES vars
+cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
+    $SED 's/^ *//;s/  */ /;s/ *$//'`
+cxxflags=`echo $CXXFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
+    $SED 's/^ *//;s/  */ /;s/ *$//'`
+defines=`echo $DEFINES $ASM_FLAGS | $SED 's/^ *//;s/  */ /;s/ *$//'`
+echo ""
+echo "        CFLAGS:          $cflags"
+echo "        CXXFLAGS:        $cxxflags"
+echo "        Macros:          $defines"
+echo ""
+echo "        PYTHON2:         $PYTHON2"
+
+echo ""
+echo "        Run '${MAKE-make}' to build Mesa"
+echo ""
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index 03155b7ac..1e237a95d 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -1593,6 +1593,8 @@ _mesa_UseProgramObjectARB(GLhandleARB program)
    struct gl_transform_feedback_object *obj =
       ctx->TransformFeedback.CurrentObject;
 
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
    if (obj->Active) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glUseProgram(transform feedback active)");
diff --git a/mesalib/src/mesa/state_tracker/st_cb_blit.c b/mesalib/src/mesa/state_tracker/st_cb_blit.c
index 25c95c7b9..416be194d 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_blit.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_blit.c
@@ -109,6 +109,11 @@ st_BlitFramebuffer(struct gl_context *ctx,
       dstY1 = tmp;
    }
 
+   /* Disable conditional rendering. */
+   if (st->render_condition) {
+      st->pipe->render_condition(st->pipe, NULL, 0);
+   }
+
    if (mask & GL_COLOR_BUFFER_BIT) {
       struct gl_renderbuffer_attachment *srcAtt =
          &readFB->Attachment[readFB->_ColorReadBufferIndex];
@@ -121,7 +126,7 @@ st_BlitFramebuffer(struct gl_context *ctx,
          struct pipe_surface *dstSurf = dstRb->surface;
 
          if (!srcObj->pt)
-            return;
+            goto done;
 
          util_blit_pixels(st->blit, srcObj->pt, srcAtt->TextureLevel,
                           srcX0, srcY0, srcX1, srcY1,
@@ -199,6 +204,13 @@ st_BlitFramebuffer(struct gl_context *ctx,
          }
       }
    }
+
+done:
+   /* Restore conditional rendering state. */
+   if (st->render_condition) {
+      st->pipe->render_condition(st->pipe, st->render_condition,
+                                 st->condition_mode);
+   }
 }
 
 
diff --git a/mesalib/src/mesa/state_tracker/st_cb_condrender.c b/mesalib/src/mesa/state_tracker/st_cb_condrender.c
index 679527569..64c6c117f 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_condrender.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_condrender.c
@@ -1,96 +1,103 @@
-/**************************************************************************

- * 

- * Copyright 2009 VMware, Inc.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL THE AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * 

- **************************************************************************/

-

-

-/**

- * glBegin/EndCondtionalRender functions

- *

- * \author Brian Paul

- */

-

-

-#include "main/imports.h"

-#include "main/context.h"

-

-#include "pipe/p_context.h"

-#include "pipe/p_defines.h"

-#include "st_context.h"

-#include "st_cb_queryobj.h"

-#include "st_cb_condrender.h"

-

-

-/**

- * Called via ctx->Driver.BeginConditionalRender()

- */

-static void

-st_BeginConditionalRender(struct gl_context *ctx, struct gl_query_object *q,

-                          GLenum mode)

-{

-   struct st_query_object *stq = st_query_object(q);

-   struct pipe_context *pipe = st_context(ctx)->pipe;

-   uint m;

-

-   switch (mode) {

-   case GL_QUERY_WAIT:

-      m = PIPE_RENDER_COND_WAIT;

-      break;

-   case GL_QUERY_NO_WAIT:

-      m = PIPE_RENDER_COND_NO_WAIT;

-      break;

-   case GL_QUERY_BY_REGION_WAIT:

-      m = PIPE_RENDER_COND_BY_REGION_WAIT;

-      break;

-   case GL_QUERY_BY_REGION_NO_WAIT:

-      m = PIPE_RENDER_COND_BY_REGION_NO_WAIT;

-      break;

-   default:

-      assert(0 && "bad mode in st_BeginConditionalRender");

-      m = PIPE_RENDER_COND_WAIT;

-   }

-

-   pipe->render_condition(pipe, stq->pq, m);

-}

-

-

-/**

- * Called via ctx->Driver.BeginConditionalRender()

- */

-static void

-st_EndConditionalRender(struct gl_context *ctx, struct gl_query_object *q)

-{

-   struct pipe_context *pipe = st_context(ctx)->pipe;

-   (void) q;

-   pipe->render_condition(pipe, NULL, 0);

-}

-

-

-

-void st_init_cond_render_functions(struct dd_function_table *functions)

-{

-   functions->BeginConditionalRender = st_BeginConditionalRender;

-   functions->EndConditionalRender = st_EndConditionalRender;

-}

+/**************************************************************************
+ * 
+ * Copyright 2009 VMware, Inc.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+/**
+ * glBegin/EndCondtionalRender functions
+ *
+ * \author Brian Paul
+ */
+
+
+#include "main/imports.h"
+#include "main/context.h"
+
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+#include "st_context.h"
+#include "st_cb_queryobj.h"
+#include "st_cb_condrender.h"
+
+
+/**
+ * Called via ctx->Driver.BeginConditionalRender()
+ */
+static void
+st_BeginConditionalRender(struct gl_context *ctx, struct gl_query_object *q,
+                          GLenum mode)
+{
+   struct st_query_object *stq = st_query_object(q);
+   struct st_context *st = st_context(ctx);
+   struct pipe_context *pipe = st->pipe;
+   uint m;
+
+   switch (mode) {
+   case GL_QUERY_WAIT:
+      m = PIPE_RENDER_COND_WAIT;
+      break;
+   case GL_QUERY_NO_WAIT:
+      m = PIPE_RENDER_COND_NO_WAIT;
+      break;
+   case GL_QUERY_BY_REGION_WAIT:
+      m = PIPE_RENDER_COND_BY_REGION_WAIT;
+      break;
+   case GL_QUERY_BY_REGION_NO_WAIT:
+      m = PIPE_RENDER_COND_BY_REGION_NO_WAIT;
+      break;
+   default:
+      assert(0 && "bad mode in st_BeginConditionalRender");
+      m = PIPE_RENDER_COND_WAIT;
+   }
+
+   st->render_condition = stq->pq;
+   st->condition_mode = m;
+
+   pipe->render_condition(pipe, stq->pq, m);
+}
+
+
+/**
+ * Called via ctx->Driver.BeginConditionalRender()
+ */
+static void
+st_EndConditionalRender(struct gl_context *ctx, struct gl_query_object *q)
+{
+   struct st_context *st = st_context(ctx);
+   struct pipe_context *pipe = st->pipe;
+   (void) q;
+
+   pipe->render_condition(pipe, NULL, 0);
+   st->render_condition = NULL;
+}
+
+
+
+void st_init_cond_render_functions(struct dd_function_table *functions)
+{
+   functions->BeginConditionalRender = st_BeginConditionalRender;
+   functions->EndConditionalRender = st_EndConditionalRender;
+}
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
index 29c1df4ae..965fbcd1d 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -1247,7 +1247,8 @@ blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,
        !ctx->VertexProgram.Enabled &&
        !ctx->Shader.CurrentFragmentProgram &&
        st_fb_orientation(ctx->ReadBuffer) == st_fb_orientation(ctx->DrawBuffer) &&
-       ctx->DrawBuffer->_NumColorDrawBuffers == 1) {
+       ctx->DrawBuffer->_NumColorDrawBuffers == 1 &&
+       !ctx->Query.CondRenderQuery) {
       struct st_renderbuffer *rbRead, *rbDraw;
       GLint drawX, drawY;
 
diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
index 2e87d202c..64424f776 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
@@ -1,665 +1,662 @@
-/**************************************************************************

- * 

- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * 

- **************************************************************************/

-

-

-/**

- * Framebuffer/renderbuffer functions.

- *

- * \author Brian Paul

- */

-

-

-#include "main/imports.h"

-#include "main/context.h"

-#include "main/fbobject.h"

-#include "main/framebuffer.h"

-#include "main/macros.h"

-#include "main/mfeatures.h"

-#include "main/renderbuffer.h"

-

-#include "pipe/p_context.h"

-#include "pipe/p_defines.h"

-#include "pipe/p_screen.h"

-#include "st_context.h"

-#include "st_cb_fbo.h"

-#include "st_cb_flush.h"

-#include "st_format.h"

-#include "st_texture.h"

-#include "st_manager.h"

-

-#include "util/u_format.h"

-#include "util/u_inlines.h"

-#include "util/u_surface.h"

-

-

-/**

- * gl_renderbuffer::AllocStorage()

- * This is called to allocate the original drawing surface, and

- * during window resize.

- */

-static GLboolean

-st_renderbuffer_alloc_storage(struct gl_context * ctx,

-                              struct gl_renderbuffer *rb,

-                              GLenum internalFormat,

-                              GLuint width, GLuint height)

-{

-   struct st_context *st = st_context(ctx);

-   struct pipe_context *pipe = st->pipe;

-   struct pipe_screen *screen = st->pipe->screen;

-   struct st_renderbuffer *strb = st_renderbuffer(rb);

-   enum pipe_format format;

-   struct pipe_surface surf_tmpl;

-

-   if (strb->format != PIPE_FORMAT_NONE)

-      format = strb->format;

-   else

-      format = st_choose_renderbuffer_format(screen, internalFormat,

-                                             rb->NumSamples);

-

-   if (format == PIPE_FORMAT_NONE) {

-      return FALSE;

-   }

-

-   /* init renderbuffer fields */

-   strb->Base.Width  = width;

-   strb->Base.Height = height;

-   strb->Base.Format = st_pipe_format_to_mesa_format(format);

-   strb->Base._BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);

-   strb->Base.DataType = st_format_datatype(format);

-   strb->format = format;

-

-   strb->defined = GL_FALSE;  /* undefined contents now */

-

-   if (strb->software) {

-      size_t size;

-      

-      free(strb->data);

-

-      assert(strb->format != PIPE_FORMAT_NONE);

-      

-      strb->stride = util_format_get_stride(strb->format, width);

-      size = util_format_get_2d_size(strb->format, strb->stride, height);

-      

-      strb->data = malloc(size);

-      

-      return strb->data != NULL;

-   }

-   else {

-      struct pipe_resource template;

-    

-      /* Free the old surface and texture

-       */

-      pipe_surface_reference( &strb->surface, NULL );

-      pipe_resource_reference( &strb->texture, NULL );

-      pipe_sampler_view_reference(&strb->sampler_view, NULL);

-

-      /* Setup new texture template.

-       */

-      memset(&template, 0, sizeof(template));

-      template.target = st->internal_target;

-      template.format = format;

-      template.width0 = width;

-      template.height0 = height;

-      template.depth0 = 1;

-      template.array_size = 1;

-      template.last_level = 0;

-      template.nr_samples = rb->NumSamples;

-      if (util_format_is_depth_or_stencil(format)) {

-         template.bind = PIPE_BIND_DEPTH_STENCIL;

-      }

-      else {

-         template.bind = (PIPE_BIND_DISPLAY_TARGET |

-                          PIPE_BIND_RENDER_TARGET);

-      }

-

-      strb->texture = screen->resource_create(screen, &template);

-

-      if (!strb->texture) 

-         return FALSE;

-

-      memset(&surf_tmpl, 0, sizeof(surf_tmpl));

-      u_surface_default_template(&surf_tmpl, strb->texture, template.bind);

-      strb->surface = pipe->create_surface(pipe,

-                                           strb->texture,

-                                           &surf_tmpl);

-      if (strb->surface) {

-         assert(strb->surface->texture);

-         assert(strb->surface->format);

-         assert(strb->surface->width == width);

-         assert(strb->surface->height == height);

-      }

-

-      return strb->surface != NULL;

-   }

-}

-

-

-/**

- * gl_renderbuffer::Delete()

- */

-static void

-st_renderbuffer_delete(struct gl_renderbuffer *rb)

-{

-   struct st_renderbuffer *strb = st_renderbuffer(rb);

-   ASSERT(strb);

-   pipe_surface_reference(&strb->surface, NULL);

-   pipe_resource_reference(&strb->texture, NULL);

-   pipe_sampler_view_reference(&strb->sampler_view, NULL);

-   free(strb->data);

-   free(strb);

-}

-

-

-/**

- * gl_renderbuffer::GetPointer()

- */

-static void *

-null_get_pointer(struct gl_context * ctx, struct gl_renderbuffer *rb,

-                 GLint x, GLint y)

-{

-   /* By returning NULL we force all software rendering to go through

-    * the span routines.

-    */

-#if 0

-   assert(0);  /* Should never get called with softpipe */

-#endif

-   return NULL;

-}

-

-

-/**

- * Called via ctx->Driver.NewFramebuffer()

- */

-static struct gl_framebuffer *

-st_new_framebuffer(struct gl_context *ctx, GLuint name)

-{

-   /* XXX not sure we need to subclass gl_framebuffer for pipe */

-   return _mesa_new_framebuffer(ctx, name);

-}

-

-

-/**

- * Called via ctx->Driver.NewRenderbuffer()

- */

-static struct gl_renderbuffer *

-st_new_renderbuffer(struct gl_context *ctx, GLuint name)

-{

-   struct st_renderbuffer *strb = ST_CALLOC_STRUCT(st_renderbuffer);

-   if (strb) {

-      _mesa_init_renderbuffer(&strb->Base, name);

-      strb->Base.Delete = st_renderbuffer_delete;

-      strb->Base.AllocStorage = st_renderbuffer_alloc_storage;

-      strb->Base.GetPointer = null_get_pointer;

-      strb->format = PIPE_FORMAT_NONE;

-      return &strb->Base;

-   }

-   return NULL;

-}

-

-

-/**

- * Allocate a renderbuffer for a an on-screen window (not a user-created

- * renderbuffer).  The window system code determines the format.

- */

-struct gl_renderbuffer *

-st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)

-{

-   struct st_renderbuffer *strb;

-

-   strb = ST_CALLOC_STRUCT(st_renderbuffer);

-   if (!strb) {

-      _mesa_error(NULL, GL_OUT_OF_MEMORY, "creating renderbuffer");

-      return NULL;

-   }

-

-   _mesa_init_renderbuffer(&strb->Base, 0);

-   strb->Base.ClassID = 0x4242; /* just a unique value */

-   strb->Base.NumSamples = samples;

-   strb->Base.Format = st_pipe_format_to_mesa_format(format);

-   strb->Base._BaseFormat = _mesa_get_format_base_format(strb->Base.Format);

-   strb->Base.DataType = st_format_datatype(format);

-   strb->format = format;

-   strb->software = sw;

-   

-   switch (format) {

-   case PIPE_FORMAT_R8G8B8A8_UNORM:

-   case PIPE_FORMAT_B8G8R8A8_UNORM:

-   case PIPE_FORMAT_A8R8G8B8_UNORM:

-   case PIPE_FORMAT_R8G8B8X8_UNORM:

-   case PIPE_FORMAT_B8G8R8X8_UNORM:

-   case PIPE_FORMAT_X8R8G8B8_UNORM:

-   case PIPE_FORMAT_B5G5R5A1_UNORM:

-   case PIPE_FORMAT_B4G4R4A4_UNORM:

-   case PIPE_FORMAT_B5G6R5_UNORM:

-      strb->Base.InternalFormat = GL_RGBA;

-      break;

-   case PIPE_FORMAT_Z16_UNORM:

-      strb->Base.InternalFormat = GL_DEPTH_COMPONENT16;

-      break;

-   case PIPE_FORMAT_Z32_UNORM:

-      strb->Base.InternalFormat = GL_DEPTH_COMPONENT32;

-      break;

-   case PIPE_FORMAT_Z24_UNORM_S8_USCALED:

-   case PIPE_FORMAT_S8_USCALED_Z24_UNORM:

-   case PIPE_FORMAT_Z24X8_UNORM:

-   case PIPE_FORMAT_X8Z24_UNORM:

-      strb->Base.InternalFormat = GL_DEPTH24_STENCIL8_EXT;

-      break;

-   case PIPE_FORMAT_S8_USCALED:

-      strb->Base.InternalFormat = GL_STENCIL_INDEX8_EXT;

-      break;

-   case PIPE_FORMAT_R16G16B16A16_SNORM:

-      strb->Base.InternalFormat = GL_RGBA16;

-      break;

-   case PIPE_FORMAT_R8_UNORM:

-      strb->Base.InternalFormat = GL_R8;

-      break;

-   case PIPE_FORMAT_R8G8_UNORM:

-      strb->Base.InternalFormat = GL_RG8;

-      break;

-   case PIPE_FORMAT_R16_UNORM:

-      strb->Base.InternalFormat = GL_R16;

-      break;

-   case PIPE_FORMAT_R16G16_UNORM:

-      strb->Base.InternalFormat = GL_RG16;

-      break;

-   default:

-      _mesa_problem(NULL,

-		    "Unexpected format in st_new_renderbuffer_fb");

-      free(strb);

-      return NULL;

-   }

-

-   /* st-specific methods */

-   strb->Base.Delete = st_renderbuffer_delete;

-   strb->Base.AllocStorage = st_renderbuffer_alloc_storage;

-   strb->Base.GetPointer = null_get_pointer;

-

-   /* surface is allocated in st_renderbuffer_alloc_storage() */

-   strb->surface = NULL;

-

-   return &strb->Base;

-}

-

-

-

-

-/**

- * Called via ctx->Driver.BindFramebufferEXT().

- */

-static void

-st_bind_framebuffer(struct gl_context *ctx, GLenum target,

-                    struct gl_framebuffer *fb, struct gl_framebuffer *fbread)

-{

-

-}

-

-/**

- * Called by ctx->Driver.FramebufferRenderbuffer

- */

-static void

-st_framebuffer_renderbuffer(struct gl_context *ctx, 

-                            struct gl_framebuffer *fb,

-                            GLenum attachment,

-                            struct gl_renderbuffer *rb)

-{

-   /* XXX no need for derivation? */

-   _mesa_framebuffer_renderbuffer(ctx, fb, attachment, rb);

-}

-

-

-/**

- * Called by ctx->Driver.RenderTexture

- */

-static void

-st_render_texture(struct gl_context *ctx,

-                  struct gl_framebuffer *fb,

-                  struct gl_renderbuffer_attachment *att)

-{

-   struct st_context *st = st_context(ctx);

-   struct pipe_context *pipe = st->pipe;

-   struct st_renderbuffer *strb;

-   struct gl_renderbuffer *rb;

-   struct pipe_resource *pt = st_get_texobj_resource(att->Texture);

-   struct st_texture_object *stObj;

-   const struct gl_texture_image *texImage;

-   struct pipe_surface surf_tmpl;

-

-   /* When would this fail?  Perhaps assert? */

-   if (!pt) 

-      return;

-

-   /* get pointer to texture image we're rendeing to */

-   texImage = _mesa_get_attachment_teximage(att);

-

-   /* create new renderbuffer which wraps the texture image */

-   rb = st_new_renderbuffer(ctx, 0);

-   if (!rb) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glFramebufferTexture()");

-      return;

-   }

-

-   _mesa_reference_renderbuffer(&att->Renderbuffer, rb);

-   assert(rb->RefCount == 1);

-   rb->AllocStorage = NULL; /* should not get called */

-   strb = st_renderbuffer(rb);

-

-   assert(strb->Base.RefCount > 0);

-

-   /* get the texture for the texture object */

-   stObj = st_texture_object(att->Texture);

-

-   /* point renderbuffer at texobject */

-   strb->rtt = stObj;

-   strb->rtt_level = att->TextureLevel;

-   strb->rtt_face = att->CubeMapFace;

-   strb->rtt_slice = att->Zoffset;

-

-   rb->Width = texImage->Width2;

-   rb->Height = texImage->Height2;

-   rb->_BaseFormat = texImage->_BaseFormat;

-   /*printf("***** render to texture level %d: %d x %d\n", att->TextureLevel, rb->Width, rb->Height);*/

-

-   /*printf("***** pipe texture %d x %d\n", pt->width0, pt->height0);*/

-

-   pipe_resource_reference( &strb->texture, pt );

-

-   pipe_surface_reference(&strb->surface, NULL);

-

-   pipe_sampler_view_reference(&strb->sampler_view,

-                               st_get_texture_sampler_view(stObj, pipe));

-

-   assert(strb->rtt_level <= strb->texture->last_level);

-

-   /* new surface for rendering into the texture */

-   memset(&surf_tmpl, 0, sizeof(surf_tmpl));

-   surf_tmpl.format = ctx->Color.sRGBEnabled ? strb->texture->format : util_format_linear(strb->texture->format);

-   surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;

-   surf_tmpl.u.tex.level = strb->rtt_level;

-   surf_tmpl.u.tex.first_layer = strb->rtt_face + strb->rtt_slice;

-   surf_tmpl.u.tex.last_layer = strb->rtt_face + strb->rtt_slice;

-   strb->surface = pipe->create_surface(pipe,

-                                        strb->texture,

-                                        &surf_tmpl);

-

-   strb->format = pt->format;

-

-   strb->Base.Format = st_pipe_format_to_mesa_format(pt->format);

-   strb->Base.DataType = st_format_datatype(pt->format);

-

-   /*

-   printf("RENDER TO TEXTURE obj=%p pt=%p surf=%p  %d x %d\n",

-          att->Texture, pt, strb->surface, rb->Width, rb->Height);

-   */

-

-   /* Invalidate buffer state so that the pipe's framebuffer state

-    * gets updated.

-    * That's where the new renderbuffer (which we just created) gets

-    * passed to the pipe as a (color/depth) render target.

-    */

-   st_invalidate_state(ctx, _NEW_BUFFERS);

-}

-

-

-/**

- * Called via ctx->Driver.FinishRenderTexture.

- */

-static void

-st_finish_render_texture(struct gl_context *ctx,

-                         struct gl_renderbuffer_attachment *att)

-{

-   struct st_renderbuffer *strb = st_renderbuffer(att->Renderbuffer);

-

-   if (!strb)

-      return;

-

-   strb->rtt = NULL;

-

-   /*

-   printf("FINISH RENDER TO TEXTURE surf=%p\n", strb->surface);

-   */

-

-   /* restore previous framebuffer state */

-   st_invalidate_state(ctx, _NEW_BUFFERS);

-}

-

-

-/**

- * Validate a renderbuffer attachment for a particular set of bindings.

- */

-static GLboolean

-st_validate_attachment(struct gl_context *ctx,

-		       struct pipe_screen *screen,

-		       const struct gl_renderbuffer_attachment *att,

-		       unsigned bindings)

-{

-   const struct st_texture_object *stObj = st_texture_object(att->Texture);

-   enum pipe_format format;

-   gl_format texFormat;

-

-   /* Only validate texture attachments for now, since

-    * st_renderbuffer_alloc_storage makes sure that

-    * the format is supported.

-    */

-   if (att->Type != GL_TEXTURE)

-      return GL_TRUE;

-

-   if (!stObj)

-      return GL_FALSE;

-

-   format = stObj->pt->format;

-   texFormat = _mesa_get_attachment_teximage_const(att)->TexFormat;

-

-   /* If the encoding is sRGB and sRGB rendering cannot be enabled,

-    * check for linear format support instead.

-    * Later when we create a surface, we change the format to a linear one. */

-   if (!ctx->Const.sRGBCapable &&

-       _mesa_get_format_color_encoding(texFormat) == GL_SRGB) {

-      const gl_format linearFormat = _mesa_get_srgb_format_linear(texFormat);

-      format = st_mesa_format_to_pipe_format(linearFormat);

-   }

-

-   return screen->is_format_supported(screen, format,

-                                      PIPE_TEXTURE_2D,

-                                      stObj->pt->nr_samples, bindings);

-}

-

-

-/**

- * Check if two renderbuffer attachments name a combined depth/stencil

- * renderbuffer.

- */

-GLboolean

-st_is_depth_stencil_combined(const struct gl_renderbuffer_attachment *depth,

-                             const struct gl_renderbuffer_attachment *stencil)

-{

-   assert(depth && stencil);

-

-   if (depth->Type == stencil->Type) {

-      if (depth->Type == GL_RENDERBUFFER_EXT &&

-          depth->Renderbuffer == stencil->Renderbuffer)

-         return GL_TRUE;

-

-      if (depth->Type == GL_TEXTURE &&

-          depth->Texture == stencil->Texture)

-         return GL_TRUE;

-   }

-

-   return GL_FALSE;

-}

- 

-

-/**

- * Check that the framebuffer configuration is valid in terms of what

- * the driver can support.

- *

- * For Gallium we only supports combined Z+stencil, not separate buffers.

- */

-static void

-st_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)

-{

-   struct st_context *st = st_context(ctx);

-   struct pipe_screen *screen = st->pipe->screen;

-   const struct gl_renderbuffer_attachment *depth =

-         &fb->Attachment[BUFFER_DEPTH];

-   const struct gl_renderbuffer_attachment *stencil =

-         &fb->Attachment[BUFFER_STENCIL];

-   GLuint i;

-   enum pipe_format first_format = PIPE_FORMAT_NONE;

-   boolean mixed_formats =

-         screen->get_param(screen, PIPE_CAP_MIXED_COLORBUFFER_FORMATS) != 0;

-

-   if (depth->Type && stencil->Type && depth->Type != stencil->Type) {

-      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-      return;

-   }

-   if (depth->Type == GL_RENDERBUFFER_EXT &&

-       stencil->Type == GL_RENDERBUFFER_EXT &&

-       depth->Renderbuffer != stencil->Renderbuffer) {

-      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-      return;

-   }

-   if (depth->Type == GL_TEXTURE &&

-       stencil->Type == GL_TEXTURE &&

-       depth->Texture != stencil->Texture) {

-      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-      return;

-   }

-

-   if (!st_validate_attachment(ctx,

-                               screen,

-                               depth,

-			       PIPE_BIND_DEPTH_STENCIL)) {

-      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-      return;

-   }

-   if (!st_validate_attachment(ctx,

-                               screen,

-                               stencil,

-			       PIPE_BIND_DEPTH_STENCIL)) {

-      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-      return;

-   }

-   for (i = 0; i < ctx->Const.MaxColorAttachments; i++) {

-      struct gl_renderbuffer_attachment *att =

-            &fb->Attachment[BUFFER_COLOR0 + i];

-      enum pipe_format format;

-

-      if (!st_validate_attachment(ctx,

-                                  screen,

-				  att,

-				  PIPE_BIND_RENDER_TARGET)) {

-	 fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-	 return;

-      }

-

-      if (!mixed_formats) {

-         /* Disallow mixed formats. */

-         if (att->Type != GL_NONE) {

-            format = st_renderbuffer(att->Renderbuffer)->surface->format;

-         } else {

-            continue;

-         }

-

-         if (first_format == PIPE_FORMAT_NONE) {

-            first_format = format;

-         } else if (format != first_format) {

-            fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

-            return;

-         }

-      }

-   }

-}

-

-

-/**

- * Called via glDrawBuffer.

- */

-static void

-st_DrawBuffers(struct gl_context *ctx, GLsizei count, const GLenum *buffers)

-{

-   struct st_context *st = st_context(ctx);

-   struct gl_framebuffer *fb = ctx->DrawBuffer;

-   GLuint i;

-

-   (void) count;

-   (void) buffers;

-

-   /* add the renderbuffers on demand */

-   for (i = 0; i < fb->_NumColorDrawBuffers; i++) {

-      gl_buffer_index idx = fb->_ColorDrawBufferIndexes[i];

-      st_manager_add_color_renderbuffer(st, fb, idx);

-   }

-}

-

-

-/**

- * Called via glReadBuffer.

- */

-static void

-st_ReadBuffer(struct gl_context *ctx, GLenum buffer)

-{

-   struct st_context *st = st_context(ctx);

-   struct gl_framebuffer *fb = ctx->ReadBuffer;

-

-   (void) buffer;

-

-   /* add the renderbuffer on demand */

-   st_manager_add_color_renderbuffer(st, fb, fb->_ColorReadBufferIndex);

-}

-

-

-void st_init_fbo_functions(struct dd_function_table *functions)

-{

-#if FEATURE_EXT_framebuffer_object

-   functions->NewFramebuffer = st_new_framebuffer;

-   functions->NewRenderbuffer = st_new_renderbuffer;

-   functions->BindFramebuffer = st_bind_framebuffer;

-   functions->FramebufferRenderbuffer = st_framebuffer_renderbuffer;

-   functions->RenderTexture = st_render_texture;

-   functions->FinishRenderTexture = st_finish_render_texture;

-   functions->ValidateFramebuffer = st_validate_framebuffer;

-#endif

-   /* no longer needed by core Mesa, drivers handle resizes...

-   functions->ResizeBuffers = st_resize_buffers;

-   */

-

-   functions->DrawBuffers = st_DrawBuffers;

-   functions->ReadBuffer = st_ReadBuffer;

-}

-

-/* XXX unused ? */

-struct pipe_sampler_view *

-st_get_renderbuffer_sampler_view(struct st_renderbuffer *rb,

-                                 struct pipe_context *pipe)

-{

-   if (!rb->sampler_view) {

-      rb->sampler_view = st_create_texture_sampler_view(pipe, rb->texture);

-   }

-

-   return rb->sampler_view;

-}

+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+/**
+ * Framebuffer/renderbuffer functions.
+ *
+ * \author Brian Paul
+ */
+
+
+#include "main/imports.h"
+#include "main/context.h"
+#include "main/fbobject.h"
+#include "main/framebuffer.h"
+#include "main/macros.h"
+#include "main/mfeatures.h"
+#include "main/renderbuffer.h"
+
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+#include "pipe/p_screen.h"
+#include "st_context.h"
+#include "st_cb_fbo.h"
+#include "st_cb_flush.h"
+#include "st_format.h"
+#include "st_texture.h"
+#include "st_manager.h"
+
+#include "util/u_format.h"
+#include "util/u_inlines.h"
+#include "util/u_surface.h"
+
+
+/**
+ * gl_renderbuffer::AllocStorage()
+ * This is called to allocate the original drawing surface, and
+ * during window resize.
+ */
+static GLboolean
+st_renderbuffer_alloc_storage(struct gl_context * ctx,
+                              struct gl_renderbuffer *rb,
+                              GLenum internalFormat,
+                              GLuint width, GLuint height)
+{
+   struct st_context *st = st_context(ctx);
+   struct pipe_context *pipe = st->pipe;
+   struct pipe_screen *screen = st->pipe->screen;
+   struct st_renderbuffer *strb = st_renderbuffer(rb);
+   enum pipe_format format;
+   struct pipe_surface surf_tmpl;
+
+   format = st_choose_renderbuffer_format(screen, internalFormat,
+                                          rb->NumSamples);
+
+   if (format == PIPE_FORMAT_NONE) {
+      return FALSE;
+   }
+
+   /* init renderbuffer fields */
+   strb->Base.Width  = width;
+   strb->Base.Height = height;
+   strb->Base.Format = st_pipe_format_to_mesa_format(format);
+   strb->Base._BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);
+   strb->Base.DataType = st_format_datatype(format);
+   strb->format = format;
+
+   strb->defined = GL_FALSE;  /* undefined contents now */
+
+   if (strb->software) {
+      size_t size;
+      
+      free(strb->data);
+
+      assert(strb->format != PIPE_FORMAT_NONE);
+      
+      strb->stride = util_format_get_stride(strb->format, width);
+      size = util_format_get_2d_size(strb->format, strb->stride, height);
+      
+      strb->data = malloc(size);
+      
+      return strb->data != NULL;
+   }
+   else {
+      struct pipe_resource template;
+    
+      /* Free the old surface and texture
+       */
+      pipe_surface_reference( &strb->surface, NULL );
+      pipe_resource_reference( &strb->texture, NULL );
+      pipe_sampler_view_reference(&strb->sampler_view, NULL);
+
+      /* Setup new texture template.
+       */
+      memset(&template, 0, sizeof(template));
+      template.target = st->internal_target;
+      template.format = format;
+      template.width0 = width;
+      template.height0 = height;
+      template.depth0 = 1;
+      template.array_size = 1;
+      template.last_level = 0;
+      template.nr_samples = rb->NumSamples;
+      if (util_format_is_depth_or_stencil(format)) {
+         template.bind = PIPE_BIND_DEPTH_STENCIL;
+      }
+      else {
+         template.bind = (PIPE_BIND_DISPLAY_TARGET |
+                          PIPE_BIND_RENDER_TARGET);
+      }
+
+      strb->texture = screen->resource_create(screen, &template);
+
+      if (!strb->texture) 
+         return FALSE;
+
+      memset(&surf_tmpl, 0, sizeof(surf_tmpl));
+      u_surface_default_template(&surf_tmpl, strb->texture, template.bind);
+      strb->surface = pipe->create_surface(pipe,
+                                           strb->texture,
+                                           &surf_tmpl);
+      if (strb->surface) {
+         assert(strb->surface->texture);
+         assert(strb->surface->format);
+         assert(strb->surface->width == width);
+         assert(strb->surface->height == height);
+      }
+
+      return strb->surface != NULL;
+   }
+}
+
+
+/**
+ * gl_renderbuffer::Delete()
+ */
+static void
+st_renderbuffer_delete(struct gl_renderbuffer *rb)
+{
+   struct st_renderbuffer *strb = st_renderbuffer(rb);
+   ASSERT(strb);
+   pipe_surface_reference(&strb->surface, NULL);
+   pipe_resource_reference(&strb->texture, NULL);
+   pipe_sampler_view_reference(&strb->sampler_view, NULL);
+   free(strb->data);
+   free(strb);
+}
+
+
+/**
+ * gl_renderbuffer::GetPointer()
+ */
+static void *
+null_get_pointer(struct gl_context * ctx, struct gl_renderbuffer *rb,
+                 GLint x, GLint y)
+{
+   /* By returning NULL we force all software rendering to go through
+    * the span routines.
+    */
+#if 0
+   assert(0);  /* Should never get called with softpipe */
+#endif
+   return NULL;
+}
+
+
+/**
+ * Called via ctx->Driver.NewFramebuffer()
+ */
+static struct gl_framebuffer *
+st_new_framebuffer(struct gl_context *ctx, GLuint name)
+{
+   /* XXX not sure we need to subclass gl_framebuffer for pipe */
+   return _mesa_new_framebuffer(ctx, name);
+}
+
+
+/**
+ * Called via ctx->Driver.NewRenderbuffer()
+ */
+static struct gl_renderbuffer *
+st_new_renderbuffer(struct gl_context *ctx, GLuint name)
+{
+   struct st_renderbuffer *strb = ST_CALLOC_STRUCT(st_renderbuffer);
+   if (strb) {
+      _mesa_init_renderbuffer(&strb->Base, name);
+      strb->Base.Delete = st_renderbuffer_delete;
+      strb->Base.AllocStorage = st_renderbuffer_alloc_storage;
+      strb->Base.GetPointer = null_get_pointer;
+      strb->format = PIPE_FORMAT_NONE;
+      return &strb->Base;
+   }
+   return NULL;
+}
+
+
+/**
+ * Allocate a renderbuffer for a an on-screen window (not a user-created
+ * renderbuffer).  The window system code determines the format.
+ */
+struct gl_renderbuffer *
+st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)
+{
+   struct st_renderbuffer *strb;
+
+   strb = ST_CALLOC_STRUCT(st_renderbuffer);
+   if (!strb) {
+      _mesa_error(NULL, GL_OUT_OF_MEMORY, "creating renderbuffer");
+      return NULL;
+   }
+
+   _mesa_init_renderbuffer(&strb->Base, 0);
+   strb->Base.ClassID = 0x4242; /* just a unique value */
+   strb->Base.NumSamples = samples;
+   strb->Base.Format = st_pipe_format_to_mesa_format(format);
+   strb->Base._BaseFormat = _mesa_get_format_base_format(strb->Base.Format);
+   strb->Base.DataType = st_format_datatype(format);
+   strb->format = format;
+   strb->software = sw;
+   
+   switch (format) {
+   case PIPE_FORMAT_R8G8B8A8_UNORM:
+   case PIPE_FORMAT_B8G8R8A8_UNORM:
+   case PIPE_FORMAT_A8R8G8B8_UNORM:
+   case PIPE_FORMAT_R8G8B8X8_UNORM:
+   case PIPE_FORMAT_B8G8R8X8_UNORM:
+   case PIPE_FORMAT_X8R8G8B8_UNORM:
+   case PIPE_FORMAT_B5G5R5A1_UNORM:
+   case PIPE_FORMAT_B4G4R4A4_UNORM:
+   case PIPE_FORMAT_B5G6R5_UNORM:
+      strb->Base.InternalFormat = GL_RGBA;
+      break;
+   case PIPE_FORMAT_Z16_UNORM:
+      strb->Base.InternalFormat = GL_DEPTH_COMPONENT16;
+      break;
+   case PIPE_FORMAT_Z32_UNORM:
+      strb->Base.InternalFormat = GL_DEPTH_COMPONENT32;
+      break;
+   case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
+   case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
+   case PIPE_FORMAT_Z24X8_UNORM:
+   case PIPE_FORMAT_X8Z24_UNORM:
+      strb->Base.InternalFormat = GL_DEPTH24_STENCIL8_EXT;
+      break;
+   case PIPE_FORMAT_S8_USCALED:
+      strb->Base.InternalFormat = GL_STENCIL_INDEX8_EXT;
+      break;
+   case PIPE_FORMAT_R16G16B16A16_SNORM:
+      strb->Base.InternalFormat = GL_RGBA16;
+      break;
+   case PIPE_FORMAT_R8_UNORM:
+      strb->Base.InternalFormat = GL_R8;
+      break;
+   case PIPE_FORMAT_R8G8_UNORM:
+      strb->Base.InternalFormat = GL_RG8;
+      break;
+   case PIPE_FORMAT_R16_UNORM:
+      strb->Base.InternalFormat = GL_R16;
+      break;
+   case PIPE_FORMAT_R16G16_UNORM:
+      strb->Base.InternalFormat = GL_RG16;
+      break;
+   default:
+      _mesa_problem(NULL,
+		    "Unexpected format in st_new_renderbuffer_fb");
+      free(strb);
+      return NULL;
+   }
+
+   /* st-specific methods */
+   strb->Base.Delete = st_renderbuffer_delete;
+   strb->Base.AllocStorage = st_renderbuffer_alloc_storage;
+   strb->Base.GetPointer = null_get_pointer;
+
+   /* surface is allocated in st_renderbuffer_alloc_storage() */
+   strb->surface = NULL;
+
+   return &strb->Base;
+}
+
+
+
+
+/**
+ * Called via ctx->Driver.BindFramebufferEXT().
+ */
+static void
+st_bind_framebuffer(struct gl_context *ctx, GLenum target,
+                    struct gl_framebuffer *fb, struct gl_framebuffer *fbread)
+{
+
+}
+
+/**
+ * Called by ctx->Driver.FramebufferRenderbuffer
+ */
+static void
+st_framebuffer_renderbuffer(struct gl_context *ctx, 
+                            struct gl_framebuffer *fb,
+                            GLenum attachment,
+                            struct gl_renderbuffer *rb)
+{
+   /* XXX no need for derivation? */
+   _mesa_framebuffer_renderbuffer(ctx, fb, attachment, rb);
+}
+
+
+/**
+ * Called by ctx->Driver.RenderTexture
+ */
+static void
+st_render_texture(struct gl_context *ctx,
+                  struct gl_framebuffer *fb,
+                  struct gl_renderbuffer_attachment *att)
+{
+   struct st_context *st = st_context(ctx);
+   struct pipe_context *pipe = st->pipe;
+   struct st_renderbuffer *strb;
+   struct gl_renderbuffer *rb;
+   struct pipe_resource *pt = st_get_texobj_resource(att->Texture);
+   struct st_texture_object *stObj;
+   const struct gl_texture_image *texImage;
+   struct pipe_surface surf_tmpl;
+
+   /* When would this fail?  Perhaps assert? */
+   if (!pt) 
+      return;
+
+   /* get pointer to texture image we're rendeing to */
+   texImage = _mesa_get_attachment_teximage(att);
+
+   /* create new renderbuffer which wraps the texture image */
+   rb = st_new_renderbuffer(ctx, 0);
+   if (!rb) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glFramebufferTexture()");
+      return;
+   }
+
+   _mesa_reference_renderbuffer(&att->Renderbuffer, rb);
+   assert(rb->RefCount == 1);
+   rb->AllocStorage = NULL; /* should not get called */
+   strb = st_renderbuffer(rb);
+
+   assert(strb->Base.RefCount > 0);
+
+   /* get the texture for the texture object */
+   stObj = st_texture_object(att->Texture);
+
+   /* point renderbuffer at texobject */
+   strb->rtt = stObj;
+   strb->rtt_level = att->TextureLevel;
+   strb->rtt_face = att->CubeMapFace;
+   strb->rtt_slice = att->Zoffset;
+
+   rb->Width = texImage->Width2;
+   rb->Height = texImage->Height2;
+   rb->_BaseFormat = texImage->_BaseFormat;
+   /*printf("***** render to texture level %d: %d x %d\n", att->TextureLevel, rb->Width, rb->Height);*/
+
+   /*printf("***** pipe texture %d x %d\n", pt->width0, pt->height0);*/
+
+   pipe_resource_reference( &strb->texture, pt );
+
+   pipe_surface_reference(&strb->surface, NULL);
+
+   pipe_sampler_view_reference(&strb->sampler_view,
+                               st_get_texture_sampler_view(stObj, pipe));
+
+   assert(strb->rtt_level <= strb->texture->last_level);
+
+   /* new surface for rendering into the texture */
+   memset(&surf_tmpl, 0, sizeof(surf_tmpl));
+   surf_tmpl.format = ctx->Color.sRGBEnabled ? strb->texture->format : util_format_linear(strb->texture->format);
+   surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;
+   surf_tmpl.u.tex.level = strb->rtt_level;
+   surf_tmpl.u.tex.first_layer = strb->rtt_face + strb->rtt_slice;
+   surf_tmpl.u.tex.last_layer = strb->rtt_face + strb->rtt_slice;
+   strb->surface = pipe->create_surface(pipe,
+                                        strb->texture,
+                                        &surf_tmpl);
+
+   strb->format = pt->format;
+
+   strb->Base.Format = st_pipe_format_to_mesa_format(pt->format);
+   strb->Base.DataType = st_format_datatype(pt->format);
+
+   /*
+   printf("RENDER TO TEXTURE obj=%p pt=%p surf=%p  %d x %d\n",
+          att->Texture, pt, strb->surface, rb->Width, rb->Height);
+   */
+
+   /* Invalidate buffer state so that the pipe's framebuffer state
+    * gets updated.
+    * That's where the new renderbuffer (which we just created) gets
+    * passed to the pipe as a (color/depth) render target.
+    */
+   st_invalidate_state(ctx, _NEW_BUFFERS);
+}
+
+
+/**
+ * Called via ctx->Driver.FinishRenderTexture.
+ */
+static void
+st_finish_render_texture(struct gl_context *ctx,
+                         struct gl_renderbuffer_attachment *att)
+{
+   struct st_renderbuffer *strb = st_renderbuffer(att->Renderbuffer);
+
+   if (!strb)
+      return;
+
+   strb->rtt = NULL;
+
+   /*
+   printf("FINISH RENDER TO TEXTURE surf=%p\n", strb->surface);
+   */
+
+   /* restore previous framebuffer state */
+   st_invalidate_state(ctx, _NEW_BUFFERS);
+}
+
+
+/**
+ * Validate a renderbuffer attachment for a particular set of bindings.
+ */
+static GLboolean
+st_validate_attachment(struct gl_context *ctx,
+		       struct pipe_screen *screen,
+		       const struct gl_renderbuffer_attachment *att,
+		       unsigned bindings)
+{
+   const struct st_texture_object *stObj = st_texture_object(att->Texture);
+   enum pipe_format format;
+   gl_format texFormat;
+
+   /* Only validate texture attachments for now, since
+    * st_renderbuffer_alloc_storage makes sure that
+    * the format is supported.
+    */
+   if (att->Type != GL_TEXTURE)
+      return GL_TRUE;
+
+   if (!stObj)
+      return GL_FALSE;
+
+   format = stObj->pt->format;
+   texFormat = _mesa_get_attachment_teximage_const(att)->TexFormat;
+
+   /* If the encoding is sRGB and sRGB rendering cannot be enabled,
+    * check for linear format support instead.
+    * Later when we create a surface, we change the format to a linear one. */
+   if (!ctx->Const.sRGBCapable &&
+       _mesa_get_format_color_encoding(texFormat) == GL_SRGB) {
+      const gl_format linearFormat = _mesa_get_srgb_format_linear(texFormat);
+      format = st_mesa_format_to_pipe_format(linearFormat);
+   }
+
+   return screen->is_format_supported(screen, format,
+                                      PIPE_TEXTURE_2D,
+                                      stObj->pt->nr_samples, bindings);
+}
+
+
+/**
+ * Check if two renderbuffer attachments name a combined depth/stencil
+ * renderbuffer.
+ */
+GLboolean
+st_is_depth_stencil_combined(const struct gl_renderbuffer_attachment *depth,
+                             const struct gl_renderbuffer_attachment *stencil)
+{
+   assert(depth && stencil);
+
+   if (depth->Type == stencil->Type) {
+      if (depth->Type == GL_RENDERBUFFER_EXT &&
+          depth->Renderbuffer == stencil->Renderbuffer)
+         return GL_TRUE;
+
+      if (depth->Type == GL_TEXTURE &&
+          depth->Texture == stencil->Texture)
+         return GL_TRUE;
+   }
+
+   return GL_FALSE;
+}
+ 
+
+/**
+ * Check that the framebuffer configuration is valid in terms of what
+ * the driver can support.
+ *
+ * For Gallium we only supports combined Z+stencil, not separate buffers.
+ */
+static void
+st_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
+{
+   struct st_context *st = st_context(ctx);
+   struct pipe_screen *screen = st->pipe->screen;
+   const struct gl_renderbuffer_attachment *depth =
+         &fb->Attachment[BUFFER_DEPTH];
+   const struct gl_renderbuffer_attachment *stencil =
+         &fb->Attachment[BUFFER_STENCIL];
+   GLuint i;
+   enum pipe_format first_format = PIPE_FORMAT_NONE;
+   boolean mixed_formats =
+         screen->get_param(screen, PIPE_CAP_MIXED_COLORBUFFER_FORMATS) != 0;
+
+   if (depth->Type && stencil->Type && depth->Type != stencil->Type) {
+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+      return;
+   }
+   if (depth->Type == GL_RENDERBUFFER_EXT &&
+       stencil->Type == GL_RENDERBUFFER_EXT &&
+       depth->Renderbuffer != stencil->Renderbuffer) {
+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+      return;
+   }
+   if (depth->Type == GL_TEXTURE &&
+       stencil->Type == GL_TEXTURE &&
+       depth->Texture != stencil->Texture) {
+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+      return;
+   }
+
+   if (!st_validate_attachment(ctx,
+                               screen,
+                               depth,
+			       PIPE_BIND_DEPTH_STENCIL)) {
+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+      return;
+   }
+   if (!st_validate_attachment(ctx,
+                               screen,
+                               stencil,
+			       PIPE_BIND_DEPTH_STENCIL)) {
+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+      return;
+   }
+   for (i = 0; i < ctx->Const.MaxColorAttachments; i++) {
+      struct gl_renderbuffer_attachment *att =
+            &fb->Attachment[BUFFER_COLOR0 + i];
+      enum pipe_format format;
+
+      if (!st_validate_attachment(ctx,
+                                  screen,
+				  att,
+				  PIPE_BIND_RENDER_TARGET)) {
+	 fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+	 return;
+      }
+
+      if (!mixed_formats) {
+         /* Disallow mixed formats. */
+         if (att->Type != GL_NONE) {
+            format = st_renderbuffer(att->Renderbuffer)->surface->format;
+         } else {
+            continue;
+         }
+
+         if (first_format == PIPE_FORMAT_NONE) {
+            first_format = format;
+         } else if (format != first_format) {
+            fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+            return;
+         }
+      }
+   }
+}
+
+
+/**
+ * Called via glDrawBuffer.
+ */
+static void
+st_DrawBuffers(struct gl_context *ctx, GLsizei count, const GLenum *buffers)
+{
+   struct st_context *st = st_context(ctx);
+   struct gl_framebuffer *fb = ctx->DrawBuffer;
+   GLuint i;
+
+   (void) count;
+   (void) buffers;
+
+   /* add the renderbuffers on demand */
+   for (i = 0; i < fb->_NumColorDrawBuffers; i++) {
+      gl_buffer_index idx = fb->_ColorDrawBufferIndexes[i];
+      st_manager_add_color_renderbuffer(st, fb, idx);
+   }
+}
+
+
+/**
+ * Called via glReadBuffer.
+ */
+static void
+st_ReadBuffer(struct gl_context *ctx, GLenum buffer)
+{
+   struct st_context *st = st_context(ctx);
+   struct gl_framebuffer *fb = ctx->ReadBuffer;
+
+   (void) buffer;
+
+   /* add the renderbuffer on demand */
+   st_manager_add_color_renderbuffer(st, fb, fb->_ColorReadBufferIndex);
+}
+
+
+void st_init_fbo_functions(struct dd_function_table *functions)
+{
+#if FEATURE_EXT_framebuffer_object
+   functions->NewFramebuffer = st_new_framebuffer;
+   functions->NewRenderbuffer = st_new_renderbuffer;
+   functions->BindFramebuffer = st_bind_framebuffer;
+   functions->FramebufferRenderbuffer = st_framebuffer_renderbuffer;
+   functions->RenderTexture = st_render_texture;
+   functions->FinishRenderTexture = st_finish_render_texture;
+   functions->ValidateFramebuffer = st_validate_framebuffer;
+#endif
+   /* no longer needed by core Mesa, drivers handle resizes...
+   functions->ResizeBuffers = st_resize_buffers;
+   */
+
+   functions->DrawBuffers = st_DrawBuffers;
+   functions->ReadBuffer = st_ReadBuffer;
+}
+
+/* XXX unused ? */
+struct pipe_sampler_view *
+st_get_renderbuffer_sampler_view(struct st_renderbuffer *rb,
+                                 struct pipe_context *pipe)
+{
+   if (!rb->sampler_view) {
+      rb->sampler_view = st_create_texture_sampler_view(pipe, rb->texture);
+   }
+
+   return rb->sampler_view;
+}
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index 9d824b46c..88f62902b 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -795,6 +795,11 @@ decompress_with_blit(struct gl_context * ctx, GLenum target, GLint level,
       return;
    }
 
+   /* Disable conditional rendering. */
+   if (st->render_condition) {
+      pipe->render_condition(pipe, NULL, 0);
+   }
+
    /* blit/render/decompress */
    util_blit_pixels_tex(st->blit,
                         src_view,      /* pipe_resource (src) */
@@ -806,6 +811,12 @@ decompress_with_blit(struct gl_context * ctx, GLenum target, GLint level,
                         0.0,              /* z */
                         PIPE_TEX_MIPFILTER_NEAREST);
 
+   /* Restore conditional rendering state. */
+   if (st->render_condition) {
+      pipe->render_condition(pipe, st->render_condition,
+                             st->condition_mode);
+   }
+
    /* map the dst_surface so we can read from it */
    tex_xfer = pipe_get_transfer(pipe,
                                 dst_texture, 0, 0,
@@ -1556,6 +1567,11 @@ st_copy_texsubimage(struct gl_context *ctx,
             srcY1 = srcY0 + height;
          }
 
+         /* Disable conditional rendering. */
+         if (st->render_condition) {
+            pipe->render_condition(pipe, NULL, 0);
+         }
+
          util_blit_pixels_writemask(st->blit,
                                     strb->texture,
                                     strb->surface->u.tex.level,
@@ -1567,6 +1583,13 @@ st_copy_texsubimage(struct gl_context *ctx,
                                     destX + width, destY + height,
                                     0.0, PIPE_TEX_MIPFILTER_NEAREST,
                                     format_writemask);
+
+         /* Restore conditional rendering state. */
+         if (st->render_condition) {
+            pipe->render_condition(pipe, st->render_condition,
+                                   st->condition_mode);
+         }
+
          use_fallback = GL_FALSE;
       }
 
diff --git a/mesalib/src/mesa/state_tracker/st_context.h b/mesalib/src/mesa/state_tracker/st_context.h
index c6fc31801..ff207039d 100644
--- a/mesalib/src/mesa/state_tracker/st_context.h
+++ b/mesalib/src/mesa/state_tracker/st_context.h
@@ -200,6 +200,10 @@ struct st_context
       GLsizei stride;
    } user_attrib[PIPE_MAX_ATTRIBS];
    unsigned num_user_attribs;
+
+   /* Active render condition. */
+   struct pipe_query *render_condition;
+   unsigned condition_mode;
 };
 
 
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index de30b4fc6..dc8551dfe 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -595,6 +595,14 @@ struct format_mapping
       PIPE_FORMAT_A8B8G8R8_SRGB, \
       0
 
+#define DEFAULT_DEPTH_FORMATS \
+      PIPE_FORMAT_Z24X8_UNORM, \
+      PIPE_FORMAT_X8Z24_UNORM, \
+      PIPE_FORMAT_Z16_UNORM, \
+      PIPE_FORMAT_Z24_UNORM_S8_USCALED, \
+      PIPE_FORMAT_S8_USCALED_Z24_UNORM, \
+      0
+
 /**
  * This table maps OpenGL texture format enums to Gallium pipe_format enums.
  * Multiple GL enums might map to multiple pipe_formats.
@@ -604,7 +612,7 @@ static struct format_mapping format_map[] = {
    /* Basic RGB, RGBA formats */
    {
       { GL_RGB10, GL_RGB10_A2, 0 },
-      { PIPE_FORMAT_B10G10R10A2_UNORM, 0 }
+      { PIPE_FORMAT_B10G10R10A2_UNORM, DEFAULT_RGBA_FORMATS }
    },
    {
       { 4, GL_RGBA, GL_RGBA8, 0 },
@@ -612,7 +620,7 @@ static struct format_mapping format_map[] = {
    },
    {
       { GL_BGRA, 0 },
-      { PIPE_FORMAT_B8G8R8A8_UNORM, DEFAULT_RGB_FORMATS, 0 }
+      { PIPE_FORMAT_B8G8R8A8_UNORM, DEFAULT_RGBA_FORMATS }
    },
    {
       { 3, GL_RGB, GL_RGB8, 0 },
@@ -620,7 +628,7 @@ static struct format_mapping format_map[] = {
    },
    {
       { GL_RGB12, GL_RGB16, GL_RGBA12, GL_RGBA16, 0 },
-      { PIPE_FORMAT_R16G16B16A16_UNORM, DEFAULT_RGB_FORMATS, 0 }
+      { PIPE_FORMAT_R16G16B16A16_UNORM, DEFAULT_RGBA_FORMATS }
    },
    {
       { GL_RGBA4, GL_RGBA2, 0 },
@@ -628,7 +636,7 @@ static struct format_mapping format_map[] = {
    },
    {
       { GL_RGB5_A1, 0 },
-      { PIPE_FORMAT_B5G5R5A1_UNORM, DEFAULT_RGBA_FORMATS, 0 }
+      { PIPE_FORMAT_B5G5R5A1_UNORM, DEFAULT_RGBA_FORMATS }
    },
    {
       { GL_R3_G3_B2, 0 },
@@ -655,11 +663,11 @@ static struct format_mapping format_map[] = {
    /* basic Luminance formats */
    {
       { GL_LUMINANCE12, GL_LUMINANCE16, 0 },
-      { PIPE_FORMAT_L16_UNORM, PIPE_FORMAT_L8_UNORM, DEFAULT_RGBA_FORMATS, 0 }
+      { PIPE_FORMAT_L16_UNORM, PIPE_FORMAT_L8_UNORM, DEFAULT_RGB_FORMATS }
    },
    {
       { 1, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, 0 },
-      { PIPE_FORMAT_L8_UNORM, DEFAULT_RGBA_FORMATS }
+      { PIPE_FORMAT_L8_UNORM, DEFAULT_RGB_FORMATS }
    },
 
    /* basic Luminance/Alpha formats */
@@ -667,7 +675,7 @@ static struct format_mapping format_map[] = {
       { GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12,
         GL_LUMINANCE16_ALPHA16, 0},
       { PIPE_FORMAT_L16A16_UNORM, PIPE_FORMAT_L8A8_UNORM,
-        PIPE_FORMAT_L8A8_UNORM, DEFAULT_RGBA_FORMATS }
+        DEFAULT_RGBA_FORMATS }
    },
    {
       { 2, GL_LUMINANCE_ALPHA, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, 0 },
@@ -675,7 +683,7 @@ static struct format_mapping format_map[] = {
    },
    {
       { GL_LUMINANCE4_ALPHA4, 0 },
-      { PIPE_FORMAT_L4A4_UNORM, PIPE_FORMAT_L4A4_UNORM,
+      { PIPE_FORMAT_L4A4_UNORM, PIPE_FORMAT_L8A8_UNORM,
         DEFAULT_RGBA_FORMATS }
    },
 
@@ -699,11 +707,11 @@ static struct format_mapping format_map[] = {
    /* compressed formats */ /* XXX PIPE_BIND_SAMPLER_VIEW only */
    {
       { GL_COMPRESSED_RGB, 0 },
-      { PIPE_FORMAT_DXT1_RGB, 0 }
+      { PIPE_FORMAT_DXT1_RGB, DEFAULT_RGB_FORMATS }
    },
    {
       { GL_COMPRESSED_RGBA, 0 },
-      { PIPE_FORMAT_DXT5_RGBA, 0 }
+      { PIPE_FORMAT_DXT5_RGBA, DEFAULT_RGBA_FORMATS }
    },
    {
       { GL_RGB_S3TC, GL_RGB4_S3TC, GL_COMPRESSED_RGB_S3TC_DXT1_EXT, 0 },
@@ -729,31 +737,27 @@ static struct format_mapping format_map[] = {
    },
    {
       { GL_COMPRESSED_RGBA_FXT1_3DFX, 0 },
-      { PIPE_FORMAT_RGB_FXT1, 0 }
+      { PIPE_FORMAT_RGBA_FXT1, 0 }
    },
 #endif
 
    /* Depth formats */
    {
       { GL_DEPTH_COMPONENT16, 0 },
-      { PIPE_FORMAT_Z16_UNORM, PIPE_FORMAT_Z24_UNORM_S8_USCALED,
-        PIPE_FORMAT_S8_USCALED_Z24_UNORM, PIPE_FORMAT_Z32_UNORM, 0 }
+      { PIPE_FORMAT_Z16_UNORM, DEFAULT_DEPTH_FORMATS }
    },
    {
       { GL_DEPTH_COMPONENT24, 0 },
       { PIPE_FORMAT_Z24X8_UNORM, PIPE_FORMAT_X8Z24_UNORM,
-        PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_S8_USCALED_Z24_UNORM,
-        PIPE_FORMAT_Z32_UNORM, 0 }
+        DEFAULT_DEPTH_FORMATS }
    },
    {
       { GL_DEPTH_COMPONENT32, 0 },
-      { PIPE_FORMAT_Z32_UNORM, 0 }
+      { PIPE_FORMAT_Z32_UNORM, DEFAULT_DEPTH_FORMATS }
    },
    {
       { GL_DEPTH_COMPONENT, 0 },
-      { PIPE_FORMAT_Z24X8_UNORM, PIPE_FORMAT_X8Z24_UNORM,
-        PIPE_FORMAT_Z32_UNORM, PIPE_FORMAT_Z16_UNORM,
-        PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_S8_USCALED_Z24_UNORM, 0 }
+      { DEFAULT_DEPTH_FORMATS }
    },
 
    /* stencil formats */
diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
index b34794f1b..b0911294a 100644
--- a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
@@ -91,9 +91,18 @@ st_render_mipmap(struct st_context *st,
       return FALSE;
    }
 
+   /* Disable conditional rendering. */
+   if (st->render_condition) {
+      pipe->render_condition(pipe, NULL, 0);
+   }
+
    util_gen_mipmap(st->gen_mipmap, psv, face, baseLevel, lastLevel,
                    PIPE_TEX_FILTER_LINEAR);
 
+   if (st->render_condition) {
+      pipe->render_condition(pipe, st->render_condition, st->condition_mode);
+   }
+
    return TRUE;
 }
 
diff --git a/mesalib/src/mesa/swrast/s_blit.c b/mesalib/src/mesa/swrast/s_blit.c
index 2dd11399f..3516a41bf 100644
--- a/mesalib/src/mesa/swrast/s_blit.c
+++ b/mesalib/src/mesa/swrast/s_blit.c
@@ -1,619 +1,616 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5

- *

- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-#include "main/glheader.h"

-#include "main/condrender.h"

-#include "main/image.h"

-#include "main/macros.h"

-#include "s_context.h"

-

-

-#define ABS(X)   ((X) < 0 ? -(X) : (X))

-

-

-/**

- * Generate a row resampler function for GL_NEAREST mode.

- */

-#define RESAMPLE(NAME, PIXELTYPE, SIZE)			\

-static void						\

-NAME(GLint srcWidth, GLint dstWidth,			\

-     const GLvoid *srcBuffer, GLvoid *dstBuffer,	\

-     GLboolean flip)					\

-{							\

-   const PIXELTYPE *src = (const PIXELTYPE *) srcBuffer;\

-   PIXELTYPE *dst = (PIXELTYPE *) dstBuffer;		\

-   GLint dstCol;					\

-							\

-   if (flip) {						\

-      for (dstCol = 0; dstCol < dstWidth; dstCol++) {	\

-         GLint srcCol = (dstCol * srcWidth) / dstWidth;	\

-         ASSERT(srcCol >= 0);				\

-         ASSERT(srcCol < srcWidth);			\

-         srcCol = srcWidth - 1 - srcCol; /* flip */	\

-         if (SIZE == 1) {				\

-            dst[dstCol] = src[srcCol];			\

-         }						\

-         else if (SIZE == 2) {				\

-            dst[dstCol*2+0] = src[srcCol*2+0];		\

-            dst[dstCol*2+1] = src[srcCol*2+1];		\

-         }						\

-         else if (SIZE == 4) {				\

-            dst[dstCol*4+0] = src[srcCol*4+0];		\

-            dst[dstCol*4+1] = src[srcCol*4+1];		\

-            dst[dstCol*4+2] = src[srcCol*4+2];		\

-            dst[dstCol*4+3] = src[srcCol*4+3];		\

-         }						\

-      }							\

-   }							\

-   else {						\

-      for (dstCol = 0; dstCol < dstWidth; dstCol++) {	\

-         GLint srcCol = (dstCol * srcWidth) / dstWidth;	\

-         ASSERT(srcCol >= 0);				\

-         ASSERT(srcCol < srcWidth);			\

-         if (SIZE == 1) {				\

-            dst[dstCol] = src[srcCol];			\

-         }						\

-         else if (SIZE == 2) {				\

-            dst[dstCol*2+0] = src[srcCol*2+0];		\

-            dst[dstCol*2+1] = src[srcCol*2+1];		\

-         }						\

-         else if (SIZE == 4) {				\

-            dst[dstCol*4+0] = src[srcCol*4+0];		\

-            dst[dstCol*4+1] = src[srcCol*4+1];		\

-            dst[dstCol*4+2] = src[srcCol*4+2];		\

-            dst[dstCol*4+3] = src[srcCol*4+3];		\

-         }						\

-      }							\

-   }							\

-}

-

-/**

- * Resamplers for 1, 2, 4, 8 and 16-byte pixels.

- */

-RESAMPLE(resample_row_1, GLubyte, 1)

-RESAMPLE(resample_row_2, GLushort, 1)

-RESAMPLE(resample_row_4, GLuint, 1)

-RESAMPLE(resample_row_8, GLuint, 2)

-RESAMPLE(resample_row_16, GLuint, 4)

-

-

-/**

- * Blit color, depth or stencil with GL_NEAREST filtering.

- */

-static void

-blit_nearest(struct gl_context *ctx,

-             GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

-             GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

-             GLbitfield buffer)

-{

-   struct gl_renderbuffer *readRb, *drawRb;

-

-   const GLint srcWidth = ABS(srcX1 - srcX0);

-   const GLint dstWidth = ABS(dstX1 - dstX0);

-   const GLint srcHeight = ABS(srcY1 - srcY0);

-   const GLint dstHeight = ABS(dstY1 - dstY0);

-

-   const GLint srcXpos = MIN2(srcX0, srcX1);

-   const GLint srcYpos = MIN2(srcY0, srcY1);

-   const GLint dstXpos = MIN2(dstX0, dstX1);

-   const GLint dstYpos = MIN2(dstY0, dstY1);

-

-   const GLboolean invertX = (srcX1 < srcX0) ^ (dstX1 < dstX0);

-   const GLboolean invertY = (srcY1 < srcY0) ^ (dstY1 < dstY0);

-

-   GLint dstRow;

-

-   GLint comps, pixelSize;

-   GLvoid *srcBuffer, *dstBuffer;

-   GLint prevY = -1;

-

-   typedef void (*resample_func)(GLint srcWidth, GLint dstWidth,

-                                 const GLvoid *srcBuffer, GLvoid *dstBuffer,

-                                 GLboolean flip);

-   resample_func resampleRow;

-

-   switch (buffer) {

-   case GL_COLOR_BUFFER_BIT:

-      readRb = ctx->ReadBuffer->_ColorReadBuffer;

-      drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];

-      comps = 4;

-      break;

-   case GL_DEPTH_BUFFER_BIT:

-      readRb = ctx->ReadBuffer->_DepthBuffer;

-      drawRb = ctx->DrawBuffer->_DepthBuffer;

-      comps = 1;

-      break;

-   case GL_STENCIL_BUFFER_BIT:

-      readRb = ctx->ReadBuffer->_StencilBuffer;

-      drawRb = ctx->DrawBuffer->_StencilBuffer;

-      comps = 1;

-      break;

-   default:

-      _mesa_problem(ctx, "unexpected buffer in blit_nearest()");

-      return;

-   }

-

-   switch (readRb->DataType) {

-   case GL_UNSIGNED_BYTE:

-      pixelSize = comps * sizeof(GLubyte);

-      break;

-   case GL_UNSIGNED_SHORT:

-      pixelSize = comps * sizeof(GLushort);

-      break;

-   case GL_UNSIGNED_INT:

-      pixelSize = comps * sizeof(GLuint);

-      break;

-   case GL_FLOAT:

-      pixelSize = comps * sizeof(GLfloat);

-      break;

-   default:

-      _mesa_problem(ctx, "unexpected buffer type (0x%x) in blit_nearest",

-                    readRb->DataType);

-      return;

-   }

-

-   /* choose row resampler */

-   switch (pixelSize) {

-   case 1:

-      resampleRow = resample_row_1;

-      break;

-   case 2:

-      resampleRow = resample_row_2;

-      break;

-   case 4:

-      resampleRow = resample_row_4;

-      break;

-   case 8:

-      resampleRow = resample_row_8;

-      break;

-   case 16:

-      resampleRow = resample_row_16;

-      break;

-   default:

-      _mesa_problem(ctx, "unexpected pixel size (%d) in blit_nearest",

-                    pixelSize);

-      return;

-   }

-

-   /* allocate the src/dst row buffers */

-   srcBuffer = malloc(pixelSize * srcWidth);

-   if (!srcBuffer) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

-      return;

-   }

-   dstBuffer = malloc(pixelSize * dstWidth);

-   if (!dstBuffer) {

-      free(srcBuffer);

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

-      return;

-   }

-

-   for (dstRow = 0; dstRow < dstHeight; dstRow++) {

-      const GLint dstY = dstYpos + dstRow;

-      GLint srcRow = (dstRow * srcHeight) / dstHeight;

-      GLint srcY;

-

-      ASSERT(srcRow >= 0);

-      ASSERT(srcRow < srcHeight);

-

-      if (invertY) {

-         srcRow = srcHeight - 1 - srcRow;

-      }

-

-      srcY = srcYpos + srcRow;

-

-      /* get pixel row from source and resample to match dest width */

-      if (prevY != srcY) {

-         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY, srcBuffer);

-         (*resampleRow)(srcWidth, dstWidth, srcBuffer, dstBuffer, invertX);

-         prevY = srcY;

-      }

-

-      /* store pixel row in destination */

-      drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);

-   }

-

-   free(srcBuffer);

-   free(dstBuffer);

-}

-

-

-

-#define LERP(T, A, B)  ( (A) + (T) * ((B) - (A)) )

-

-static INLINE GLfloat

-lerp_2d(GLfloat a, GLfloat b,

-        GLfloat v00, GLfloat v10, GLfloat v01, GLfloat v11)

-{

-   const GLfloat temp0 = LERP(a, v00, v10);

-   const GLfloat temp1 = LERP(a, v01, v11);

-   return LERP(b, temp0, temp1);

-}

-

-

-/**

- * Bilinear interpolation of two source rows.

- * GLubyte pixels.

- */

-static void

-resample_linear_row_ub(GLint srcWidth, GLint dstWidth,

-                       const GLvoid *srcBuffer0, const GLvoid *srcBuffer1,

-                       GLvoid *dstBuffer, GLboolean flip, GLfloat rowWeight)

-{

-   const GLubyte (*srcColor0)[4] = (const GLubyte (*)[4]) srcBuffer0;

-   const GLubyte (*srcColor1)[4] = (const GLubyte (*)[4]) srcBuffer1;

-   GLubyte (*dstColor)[4] = (GLubyte (*)[4]) dstBuffer;

-   const GLfloat dstWidthF = (GLfloat) dstWidth;

-   GLint dstCol;

-

-   for (dstCol = 0; dstCol < dstWidth; dstCol++) {

-      const GLfloat srcCol = (dstCol * srcWidth) / dstWidthF;

-      GLint srcCol0 = IFLOOR(srcCol);

-      GLint srcCol1 = srcCol0 + 1;

-      GLfloat colWeight = srcCol - srcCol0; /* fractional part of srcCol */

-      GLfloat red, green, blue, alpha;

-

-      ASSERT(srcCol0 >= 0);

-      ASSERT(srcCol0 < srcWidth);

-      ASSERT(srcCol1 <= srcWidth);

-

-      if (srcCol1 == srcWidth) {

-         /* last column fudge */

-         srcCol1--;

-         colWeight = 0.0;

-      }

-

-      if (flip) {

-         srcCol0 = srcWidth - 1 - srcCol0;

-         srcCol1 = srcWidth - 1 - srcCol1;

-      }

-

-      red = lerp_2d(colWeight, rowWeight,

-                    srcColor0[srcCol0][RCOMP], srcColor0[srcCol1][RCOMP],

-                    srcColor1[srcCol0][RCOMP], srcColor1[srcCol1][RCOMP]);

-      green = lerp_2d(colWeight, rowWeight,

-                    srcColor0[srcCol0][GCOMP], srcColor0[srcCol1][GCOMP],

-                    srcColor1[srcCol0][GCOMP], srcColor1[srcCol1][GCOMP]);

-      blue = lerp_2d(colWeight, rowWeight,

-                    srcColor0[srcCol0][BCOMP], srcColor0[srcCol1][BCOMP],

-                    srcColor1[srcCol0][BCOMP], srcColor1[srcCol1][BCOMP]);

-      alpha = lerp_2d(colWeight, rowWeight,

-                    srcColor0[srcCol0][ACOMP], srcColor0[srcCol1][ACOMP],

-                    srcColor1[srcCol0][ACOMP], srcColor1[srcCol1][ACOMP]);

-      

-      dstColor[dstCol][RCOMP] = IFLOOR(red);

-      dstColor[dstCol][GCOMP] = IFLOOR(green);

-      dstColor[dstCol][BCOMP] = IFLOOR(blue);

-      dstColor[dstCol][ACOMP] = IFLOOR(alpha);

-   }

-}

-

-

-

-/**

- * Bilinear filtered blit (color only).

- */

-static void

-blit_linear(struct gl_context *ctx,

-            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

-            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1)

-{

-   struct gl_renderbuffer *readRb = ctx->ReadBuffer->_ColorReadBuffer;

-   struct gl_renderbuffer *drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];

-

-   const GLint srcWidth = ABS(srcX1 - srcX0);

-   const GLint dstWidth = ABS(dstX1 - dstX0);

-   const GLint srcHeight = ABS(srcY1 - srcY0);

-   const GLint dstHeight = ABS(dstY1 - dstY0);

-   const GLfloat dstHeightF = (GLfloat) dstHeight;

-

-   const GLint srcXpos = MIN2(srcX0, srcX1);

-   const GLint srcYpos = MIN2(srcY0, srcY1);

-   const GLint dstXpos = MIN2(dstX0, dstX1);

-   const GLint dstYpos = MIN2(dstY0, dstY1);

-

-   const GLboolean invertX = (srcX1 < srcX0) ^ (dstX1 < dstX0);

-   const GLboolean invertY = (srcY1 < srcY0) ^ (dstY1 < dstY0);

-

-   GLint dstRow;

-

-   GLint pixelSize;

-   GLvoid *srcBuffer0, *srcBuffer1;

-   GLint srcBufferY0 = -1, srcBufferY1 = -1;

-   GLvoid *dstBuffer;

-

-   switch (readRb->DataType) {

-   case GL_UNSIGNED_BYTE:

-      pixelSize = 4 * sizeof(GLubyte);

-      break;

-   case GL_UNSIGNED_SHORT:

-      pixelSize = 4 * sizeof(GLushort);

-      break;

-   case GL_UNSIGNED_INT:

-      pixelSize = 4 * sizeof(GLuint);

-      break;

-   case GL_FLOAT:

-      pixelSize = 4 * sizeof(GLfloat);

-      break;

-   default:

-      _mesa_problem(ctx, "unexpected buffer type (0x%x) in blit_nearest",

-                    readRb->DataType);

-      return;

-   }

-

-   /* Allocate the src/dst row buffers.

-    * Keep two adjacent src rows around for bilinear sampling.

-    */

-   srcBuffer0 = malloc(pixelSize * srcWidth);

-   if (!srcBuffer0) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

-      return;

-   }

-   srcBuffer1 = malloc(pixelSize * srcWidth);

-   if (!srcBuffer1) {

-      free(srcBuffer0);

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

-      return;

-   }

-   dstBuffer = malloc(pixelSize * dstWidth);

-   if (!dstBuffer) {

-      free(srcBuffer0);

-      free(srcBuffer1);

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

-      return;

-   }

-

-   for (dstRow = 0; dstRow < dstHeight; dstRow++) {

-      const GLint dstY = dstYpos + dstRow;

-      const GLfloat srcRow = (dstRow * srcHeight) / dstHeightF;

-      GLint srcRow0 = IFLOOR(srcRow);

-      GLint srcRow1 = srcRow0 + 1;

-      GLfloat rowWeight = srcRow - srcRow0; /* fractional part of srcRow */

-

-      ASSERT(srcRow >= 0);

-      ASSERT(srcRow < srcHeight);

-

-      if (srcRow1 == srcHeight) {

-         /* last row fudge */

-         srcRow1 = srcRow0;

-         rowWeight = 0.0;

-      }

-

-      if (invertY) {

-         srcRow0 = srcHeight - 1 - srcRow0;

-         srcRow1 = srcHeight - 1 - srcRow1;

-      }

-

-      srcY0 = srcYpos + srcRow0;

-      srcY1 = srcYpos + srcRow1;

-

-      /* get the two source rows */

-      if (srcY0 == srcBufferY0 && srcY1 == srcBufferY1) {

-         /* use same source row buffers again */

-      }

-      else if (srcY0 == srcBufferY1) {

-         /* move buffer1 into buffer0 by swapping pointers */

-         GLvoid *tmp = srcBuffer0;

-         srcBuffer0 = srcBuffer1;

-         srcBuffer1 = tmp;

-         /* get y1 row */

-         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY1, srcBuffer1);

-         srcBufferY0 = srcY0;

-         srcBufferY1 = srcY1;

-      }

-      else {

-         /* get both new rows */

-         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY0, srcBuffer0);

-         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY1, srcBuffer1);

-         srcBufferY0 = srcY0;

-         srcBufferY1 = srcY1;

-      }

-

-      if (readRb->DataType == GL_UNSIGNED_BYTE) {

-         resample_linear_row_ub(srcWidth, dstWidth, srcBuffer0, srcBuffer1,

-                                dstBuffer, invertX, rowWeight);

-      }

-      else {

-         _mesa_problem(ctx, "Unsupported color channel type in sw blit");

-         break;

-      }

-

-      /* store pixel row in destination */

-      drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);

-   }

-

-   free(srcBuffer0);

-   free(srcBuffer1);

-   free(dstBuffer);

-}

-

-

-/**

- * Simple case:  Blit color, depth or stencil with no scaling or flipping.

- * XXX we could easily support vertical flipping here.

- */

-static void

-simple_blit(struct gl_context *ctx,

-            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

-            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

-            GLbitfield buffer)

-{

-   struct gl_renderbuffer *readRb, *drawRb;

-   const GLint width = srcX1 - srcX0;

-   const GLint height = srcY1 - srcY0;

-   GLint row, srcY, dstY, yStep;

-   GLint comps, bytesPerRow;

-   void *rowBuffer;

-

-   /* only one buffer */

-   ASSERT(_mesa_bitcount(buffer) == 1);

-   /* no flipping checks */

-   ASSERT(srcX0 < srcX1);

-   ASSERT(srcY0 < srcY1);

-   ASSERT(dstX0 < dstX1);

-   ASSERT(dstY0 < dstY1);

-   /* size checks */

-   ASSERT(srcX1 - srcX0 == dstX1 - dstX0);

-   ASSERT(srcY1 - srcY0 == dstY1 - dstY0);

-

-   /* determine if copy should be bottom-to-top or top-to-bottom */

-   if (srcY0 > dstY0) {

-      /* src above dst: copy bottom-to-top */

-      yStep = 1;

-      srcY = srcY0;

-      dstY = dstY0;

-   }

-   else {

-      /* src below dst: copy top-to-bottom */

-      yStep = -1;

-      srcY = srcY1 - 1;

-      dstY = dstY1 - 1;

-   }

-

-   switch (buffer) {

-   case GL_COLOR_BUFFER_BIT:

-      readRb = ctx->ReadBuffer->_ColorReadBuffer;

-      drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];

-      comps = 4;

-      break;

-   case GL_DEPTH_BUFFER_BIT:

-      readRb = ctx->ReadBuffer->_DepthBuffer;

-      drawRb = ctx->DrawBuffer->_DepthBuffer;

-      comps = 1;

-      break;

-   case GL_STENCIL_BUFFER_BIT:

-      readRb = ctx->ReadBuffer->_StencilBuffer;

-      drawRb = ctx->DrawBuffer->_StencilBuffer;

-      comps = 1;

-      break;

-   default:

-      _mesa_problem(ctx, "unexpected buffer in simple_blit()");

-      return;

-   }

-

-   ASSERT(readRb->DataType == drawRb->DataType);

-

-   /* compute bytes per row */

-   switch (readRb->DataType) {

-   case GL_UNSIGNED_BYTE:

-      bytesPerRow = comps * width * sizeof(GLubyte);

-      break;

-   case GL_UNSIGNED_SHORT:

-      bytesPerRow = comps * width * sizeof(GLushort);

-      break;

-   case GL_UNSIGNED_INT:

-      bytesPerRow = comps * width * sizeof(GLuint);

-      break;

-   case GL_FLOAT:

-      bytesPerRow = comps * width * sizeof(GLfloat);

-      break;

-   default:

-      _mesa_problem(ctx, "unexpected buffer type in simple_blit");

-      return;

-   }

-

-   /* allocate the row buffer */

-   rowBuffer = malloc(bytesPerRow);

-   if (!rowBuffer) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

-      return;

-   }

-

-   for (row = 0; row < height; row++) {

-      readRb->GetRow(ctx, readRb, width, srcX0, srcY, rowBuffer);

-      drawRb->PutRow(ctx, drawRb, width, dstX0, dstY, rowBuffer, NULL);

-      srcY += yStep;

-      dstY += yStep;

-   }

-

-   free(rowBuffer);

-}

-

-

-/**

- * Software fallback for glBlitFramebufferEXT().

- */

-void

-_swrast_BlitFramebuffer(struct gl_context *ctx,

-                        GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

-                        GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

-                        GLbitfield mask, GLenum filter)

-{

-   static const GLbitfield buffers[3] = {

-      GL_COLOR_BUFFER_BIT,

-      GL_DEPTH_BUFFER_BIT,

-      GL_STENCIL_BUFFER_BIT

-   };

-   GLint i;

-

-   if (!_mesa_check_conditional_render(ctx))

-      return; /* don't clear */

-

-   if (!ctx->DrawBuffer->_NumColorDrawBuffers)

-      return;

-

-   if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,

-                        &dstX0, &dstY0, &dstX1, &dstY1)) {

-      return;

-   }

-

-   swrast_render_start(ctx);

-

-   if (srcX1 - srcX0 == dstX1 - dstX0 &&

-       srcY1 - srcY0 == dstY1 - dstY0 &&

-       srcX0 < srcX1 &&

-       srcY0 < srcY1 &&

-       dstX0 < dstX1 &&

-       dstY0 < dstY1) {

-      /* no stretching or flipping.

-       * filter doesn't matter.

-       */

-      for (i = 0; i < 3; i++) {

-         if (mask & buffers[i]) {

-            simple_blit(ctx, srcX0, srcY0, srcX1, srcY1,

-                        dstX0, dstY0, dstX1, dstY1, buffers[i]);

-         }

-      }

-   }

-   else {

-      if (filter == GL_NEAREST) {

-         for (i = 0; i < 3; i++) {

-            if (mask & buffers[i]) {

-               blit_nearest(ctx,  srcX0, srcY0, srcX1, srcY1,

-                            dstX0, dstY0, dstX1, dstY1, buffers[i]);

-            }

-         }

-      }

-      else {

-         ASSERT(filter == GL_LINEAR);

-         if (mask & GL_COLOR_BUFFER_BIT) {  /* depth/stencil not allowed */

-            blit_linear(ctx,  srcX0, srcY0, srcX1, srcY1,

-                        dstX0, dstY0, dstX1, dstY1);

-         }

-      }

-   }

-

-   swrast_render_finish(ctx);

-}

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "main/glheader.h"
+#include "main/condrender.h"
+#include "main/image.h"
+#include "main/macros.h"
+#include "s_context.h"
+
+
+#define ABS(X)   ((X) < 0 ? -(X) : (X))
+
+
+/**
+ * Generate a row resampler function for GL_NEAREST mode.
+ */
+#define RESAMPLE(NAME, PIXELTYPE, SIZE)			\
+static void						\
+NAME(GLint srcWidth, GLint dstWidth,			\
+     const GLvoid *srcBuffer, GLvoid *dstBuffer,	\
+     GLboolean flip)					\
+{							\
+   const PIXELTYPE *src = (const PIXELTYPE *) srcBuffer;\
+   PIXELTYPE *dst = (PIXELTYPE *) dstBuffer;		\
+   GLint dstCol;					\
+							\
+   if (flip) {						\
+      for (dstCol = 0; dstCol < dstWidth; dstCol++) {	\
+         GLint srcCol = (dstCol * srcWidth) / dstWidth;	\
+         ASSERT(srcCol >= 0);				\
+         ASSERT(srcCol < srcWidth);			\
+         srcCol = srcWidth - 1 - srcCol; /* flip */	\
+         if (SIZE == 1) {				\
+            dst[dstCol] = src[srcCol];			\
+         }						\
+         else if (SIZE == 2) {				\
+            dst[dstCol*2+0] = src[srcCol*2+0];		\
+            dst[dstCol*2+1] = src[srcCol*2+1];		\
+         }						\
+         else if (SIZE == 4) {				\
+            dst[dstCol*4+0] = src[srcCol*4+0];		\
+            dst[dstCol*4+1] = src[srcCol*4+1];		\
+            dst[dstCol*4+2] = src[srcCol*4+2];		\
+            dst[dstCol*4+3] = src[srcCol*4+3];		\
+         }						\
+      }							\
+   }							\
+   else {						\
+      for (dstCol = 0; dstCol < dstWidth; dstCol++) {	\
+         GLint srcCol = (dstCol * srcWidth) / dstWidth;	\
+         ASSERT(srcCol >= 0);				\
+         ASSERT(srcCol < srcWidth);			\
+         if (SIZE == 1) {				\
+            dst[dstCol] = src[srcCol];			\
+         }						\
+         else if (SIZE == 2) {				\
+            dst[dstCol*2+0] = src[srcCol*2+0];		\
+            dst[dstCol*2+1] = src[srcCol*2+1];		\
+         }						\
+         else if (SIZE == 4) {				\
+            dst[dstCol*4+0] = src[srcCol*4+0];		\
+            dst[dstCol*4+1] = src[srcCol*4+1];		\
+            dst[dstCol*4+2] = src[srcCol*4+2];		\
+            dst[dstCol*4+3] = src[srcCol*4+3];		\
+         }						\
+      }							\
+   }							\
+}
+
+/**
+ * Resamplers for 1, 2, 4, 8 and 16-byte pixels.
+ */
+RESAMPLE(resample_row_1, GLubyte, 1)
+RESAMPLE(resample_row_2, GLushort, 1)
+RESAMPLE(resample_row_4, GLuint, 1)
+RESAMPLE(resample_row_8, GLuint, 2)
+RESAMPLE(resample_row_16, GLuint, 4)
+
+
+/**
+ * Blit color, depth or stencil with GL_NEAREST filtering.
+ */
+static void
+blit_nearest(struct gl_context *ctx,
+             GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+             GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
+             GLbitfield buffer)
+{
+   struct gl_renderbuffer *readRb, *drawRb;
+
+   const GLint srcWidth = ABS(srcX1 - srcX0);
+   const GLint dstWidth = ABS(dstX1 - dstX0);
+   const GLint srcHeight = ABS(srcY1 - srcY0);
+   const GLint dstHeight = ABS(dstY1 - dstY0);
+
+   const GLint srcXpos = MIN2(srcX0, srcX1);
+   const GLint srcYpos = MIN2(srcY0, srcY1);
+   const GLint dstXpos = MIN2(dstX0, dstX1);
+   const GLint dstYpos = MIN2(dstY0, dstY1);
+
+   const GLboolean invertX = (srcX1 < srcX0) ^ (dstX1 < dstX0);
+   const GLboolean invertY = (srcY1 < srcY0) ^ (dstY1 < dstY0);
+
+   GLint dstRow;
+
+   GLint comps, pixelSize;
+   GLvoid *srcBuffer, *dstBuffer;
+   GLint prevY = -1;
+
+   typedef void (*resample_func)(GLint srcWidth, GLint dstWidth,
+                                 const GLvoid *srcBuffer, GLvoid *dstBuffer,
+                                 GLboolean flip);
+   resample_func resampleRow;
+
+   switch (buffer) {
+   case GL_COLOR_BUFFER_BIT:
+      readRb = ctx->ReadBuffer->_ColorReadBuffer;
+      drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];
+      comps = 4;
+      break;
+   case GL_DEPTH_BUFFER_BIT:
+      readRb = ctx->ReadBuffer->_DepthBuffer;
+      drawRb = ctx->DrawBuffer->_DepthBuffer;
+      comps = 1;
+      break;
+   case GL_STENCIL_BUFFER_BIT:
+      readRb = ctx->ReadBuffer->_StencilBuffer;
+      drawRb = ctx->DrawBuffer->_StencilBuffer;
+      comps = 1;
+      break;
+   default:
+      _mesa_problem(ctx, "unexpected buffer in blit_nearest()");
+      return;
+   }
+
+   switch (readRb->DataType) {
+   case GL_UNSIGNED_BYTE:
+      pixelSize = comps * sizeof(GLubyte);
+      break;
+   case GL_UNSIGNED_SHORT:
+      pixelSize = comps * sizeof(GLushort);
+      break;
+   case GL_UNSIGNED_INT:
+      pixelSize = comps * sizeof(GLuint);
+      break;
+   case GL_FLOAT:
+      pixelSize = comps * sizeof(GLfloat);
+      break;
+   default:
+      _mesa_problem(ctx, "unexpected buffer type (0x%x) in blit_nearest",
+                    readRb->DataType);
+      return;
+   }
+
+   /* choose row resampler */
+   switch (pixelSize) {
+   case 1:
+      resampleRow = resample_row_1;
+      break;
+   case 2:
+      resampleRow = resample_row_2;
+      break;
+   case 4:
+      resampleRow = resample_row_4;
+      break;
+   case 8:
+      resampleRow = resample_row_8;
+      break;
+   case 16:
+      resampleRow = resample_row_16;
+      break;
+   default:
+      _mesa_problem(ctx, "unexpected pixel size (%d) in blit_nearest",
+                    pixelSize);
+      return;
+   }
+
+   /* allocate the src/dst row buffers */
+   srcBuffer = malloc(pixelSize * srcWidth);
+   if (!srcBuffer) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
+      return;
+   }
+   dstBuffer = malloc(pixelSize * dstWidth);
+   if (!dstBuffer) {
+      free(srcBuffer);
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
+      return;
+   }
+
+   for (dstRow = 0; dstRow < dstHeight; dstRow++) {
+      const GLint dstY = dstYpos + dstRow;
+      GLint srcRow = (dstRow * srcHeight) / dstHeight;
+      GLint srcY;
+
+      ASSERT(srcRow >= 0);
+      ASSERT(srcRow < srcHeight);
+
+      if (invertY) {
+         srcRow = srcHeight - 1 - srcRow;
+      }
+
+      srcY = srcYpos + srcRow;
+
+      /* get pixel row from source and resample to match dest width */
+      if (prevY != srcY) {
+         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY, srcBuffer);
+         (*resampleRow)(srcWidth, dstWidth, srcBuffer, dstBuffer, invertX);
+         prevY = srcY;
+      }
+
+      /* store pixel row in destination */
+      drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);
+   }
+
+   free(srcBuffer);
+   free(dstBuffer);
+}
+
+
+
+#define LERP(T, A, B)  ( (A) + (T) * ((B) - (A)) )
+
+static INLINE GLfloat
+lerp_2d(GLfloat a, GLfloat b,
+        GLfloat v00, GLfloat v10, GLfloat v01, GLfloat v11)
+{
+   const GLfloat temp0 = LERP(a, v00, v10);
+   const GLfloat temp1 = LERP(a, v01, v11);
+   return LERP(b, temp0, temp1);
+}
+
+
+/**
+ * Bilinear interpolation of two source rows.
+ * GLubyte pixels.
+ */
+static void
+resample_linear_row_ub(GLint srcWidth, GLint dstWidth,
+                       const GLvoid *srcBuffer0, const GLvoid *srcBuffer1,
+                       GLvoid *dstBuffer, GLboolean flip, GLfloat rowWeight)
+{
+   const GLubyte (*srcColor0)[4] = (const GLubyte (*)[4]) srcBuffer0;
+   const GLubyte (*srcColor1)[4] = (const GLubyte (*)[4]) srcBuffer1;
+   GLubyte (*dstColor)[4] = (GLubyte (*)[4]) dstBuffer;
+   const GLfloat dstWidthF = (GLfloat) dstWidth;
+   GLint dstCol;
+
+   for (dstCol = 0; dstCol < dstWidth; dstCol++) {
+      const GLfloat srcCol = (dstCol * srcWidth) / dstWidthF;
+      GLint srcCol0 = IFLOOR(srcCol);
+      GLint srcCol1 = srcCol0 + 1;
+      GLfloat colWeight = srcCol - srcCol0; /* fractional part of srcCol */
+      GLfloat red, green, blue, alpha;
+
+      ASSERT(srcCol0 >= 0);
+      ASSERT(srcCol0 < srcWidth);
+      ASSERT(srcCol1 <= srcWidth);
+
+      if (srcCol1 == srcWidth) {
+         /* last column fudge */
+         srcCol1--;
+         colWeight = 0.0;
+      }
+
+      if (flip) {
+         srcCol0 = srcWidth - 1 - srcCol0;
+         srcCol1 = srcWidth - 1 - srcCol1;
+      }
+
+      red = lerp_2d(colWeight, rowWeight,
+                    srcColor0[srcCol0][RCOMP], srcColor0[srcCol1][RCOMP],
+                    srcColor1[srcCol0][RCOMP], srcColor1[srcCol1][RCOMP]);
+      green = lerp_2d(colWeight, rowWeight,
+                    srcColor0[srcCol0][GCOMP], srcColor0[srcCol1][GCOMP],
+                    srcColor1[srcCol0][GCOMP], srcColor1[srcCol1][GCOMP]);
+      blue = lerp_2d(colWeight, rowWeight,
+                    srcColor0[srcCol0][BCOMP], srcColor0[srcCol1][BCOMP],
+                    srcColor1[srcCol0][BCOMP], srcColor1[srcCol1][BCOMP]);
+      alpha = lerp_2d(colWeight, rowWeight,
+                    srcColor0[srcCol0][ACOMP], srcColor0[srcCol1][ACOMP],
+                    srcColor1[srcCol0][ACOMP], srcColor1[srcCol1][ACOMP]);
+      
+      dstColor[dstCol][RCOMP] = IFLOOR(red);
+      dstColor[dstCol][GCOMP] = IFLOOR(green);
+      dstColor[dstCol][BCOMP] = IFLOOR(blue);
+      dstColor[dstCol][ACOMP] = IFLOOR(alpha);
+   }
+}
+
+
+
+/**
+ * Bilinear filtered blit (color only).
+ */
+static void
+blit_linear(struct gl_context *ctx,
+            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1)
+{
+   struct gl_renderbuffer *readRb = ctx->ReadBuffer->_ColorReadBuffer;
+   struct gl_renderbuffer *drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];
+
+   const GLint srcWidth = ABS(srcX1 - srcX0);
+   const GLint dstWidth = ABS(dstX1 - dstX0);
+   const GLint srcHeight = ABS(srcY1 - srcY0);
+   const GLint dstHeight = ABS(dstY1 - dstY0);
+   const GLfloat dstHeightF = (GLfloat) dstHeight;
+
+   const GLint srcXpos = MIN2(srcX0, srcX1);
+   const GLint srcYpos = MIN2(srcY0, srcY1);
+   const GLint dstXpos = MIN2(dstX0, dstX1);
+   const GLint dstYpos = MIN2(dstY0, dstY1);
+
+   const GLboolean invertX = (srcX1 < srcX0) ^ (dstX1 < dstX0);
+   const GLboolean invertY = (srcY1 < srcY0) ^ (dstY1 < dstY0);
+
+   GLint dstRow;
+
+   GLint pixelSize;
+   GLvoid *srcBuffer0, *srcBuffer1;
+   GLint srcBufferY0 = -1, srcBufferY1 = -1;
+   GLvoid *dstBuffer;
+
+   switch (readRb->DataType) {
+   case GL_UNSIGNED_BYTE:
+      pixelSize = 4 * sizeof(GLubyte);
+      break;
+   case GL_UNSIGNED_SHORT:
+      pixelSize = 4 * sizeof(GLushort);
+      break;
+   case GL_UNSIGNED_INT:
+      pixelSize = 4 * sizeof(GLuint);
+      break;
+   case GL_FLOAT:
+      pixelSize = 4 * sizeof(GLfloat);
+      break;
+   default:
+      _mesa_problem(ctx, "unexpected buffer type (0x%x) in blit_nearest",
+                    readRb->DataType);
+      return;
+   }
+
+   /* Allocate the src/dst row buffers.
+    * Keep two adjacent src rows around for bilinear sampling.
+    */
+   srcBuffer0 = malloc(pixelSize * srcWidth);
+   if (!srcBuffer0) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
+      return;
+   }
+   srcBuffer1 = malloc(pixelSize * srcWidth);
+   if (!srcBuffer1) {
+      free(srcBuffer0);
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
+      return;
+   }
+   dstBuffer = malloc(pixelSize * dstWidth);
+   if (!dstBuffer) {
+      free(srcBuffer0);
+      free(srcBuffer1);
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
+      return;
+   }
+
+   for (dstRow = 0; dstRow < dstHeight; dstRow++) {
+      const GLint dstY = dstYpos + dstRow;
+      const GLfloat srcRow = (dstRow * srcHeight) / dstHeightF;
+      GLint srcRow0 = IFLOOR(srcRow);
+      GLint srcRow1 = srcRow0 + 1;
+      GLfloat rowWeight = srcRow - srcRow0; /* fractional part of srcRow */
+
+      ASSERT(srcRow >= 0);
+      ASSERT(srcRow < srcHeight);
+
+      if (srcRow1 == srcHeight) {
+         /* last row fudge */
+         srcRow1 = srcRow0;
+         rowWeight = 0.0;
+      }
+
+      if (invertY) {
+         srcRow0 = srcHeight - 1 - srcRow0;
+         srcRow1 = srcHeight - 1 - srcRow1;
+      }
+
+      srcY0 = srcYpos + srcRow0;
+      srcY1 = srcYpos + srcRow1;
+
+      /* get the two source rows */
+      if (srcY0 == srcBufferY0 && srcY1 == srcBufferY1) {
+         /* use same source row buffers again */
+      }
+      else if (srcY0 == srcBufferY1) {
+         /* move buffer1 into buffer0 by swapping pointers */
+         GLvoid *tmp = srcBuffer0;
+         srcBuffer0 = srcBuffer1;
+         srcBuffer1 = tmp;
+         /* get y1 row */
+         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY1, srcBuffer1);
+         srcBufferY0 = srcY0;
+         srcBufferY1 = srcY1;
+      }
+      else {
+         /* get both new rows */
+         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY0, srcBuffer0);
+         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY1, srcBuffer1);
+         srcBufferY0 = srcY0;
+         srcBufferY1 = srcY1;
+      }
+
+      if (readRb->DataType == GL_UNSIGNED_BYTE) {
+         resample_linear_row_ub(srcWidth, dstWidth, srcBuffer0, srcBuffer1,
+                                dstBuffer, invertX, rowWeight);
+      }
+      else {
+         _mesa_problem(ctx, "Unsupported color channel type in sw blit");
+         break;
+      }
+
+      /* store pixel row in destination */
+      drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);
+   }
+
+   free(srcBuffer0);
+   free(srcBuffer1);
+   free(dstBuffer);
+}
+
+
+/**
+ * Simple case:  Blit color, depth or stencil with no scaling or flipping.
+ * XXX we could easily support vertical flipping here.
+ */
+static void
+simple_blit(struct gl_context *ctx,
+            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
+            GLbitfield buffer)
+{
+   struct gl_renderbuffer *readRb, *drawRb;
+   const GLint width = srcX1 - srcX0;
+   const GLint height = srcY1 - srcY0;
+   GLint row, srcY, dstY, yStep;
+   GLint comps, bytesPerRow;
+   void *rowBuffer;
+
+   /* only one buffer */
+   ASSERT(_mesa_bitcount(buffer) == 1);
+   /* no flipping checks */
+   ASSERT(srcX0 < srcX1);
+   ASSERT(srcY0 < srcY1);
+   ASSERT(dstX0 < dstX1);
+   ASSERT(dstY0 < dstY1);
+   /* size checks */
+   ASSERT(srcX1 - srcX0 == dstX1 - dstX0);
+   ASSERT(srcY1 - srcY0 == dstY1 - dstY0);
+
+   /* determine if copy should be bottom-to-top or top-to-bottom */
+   if (srcY0 > dstY0) {
+      /* src above dst: copy bottom-to-top */
+      yStep = 1;
+      srcY = srcY0;
+      dstY = dstY0;
+   }
+   else {
+      /* src below dst: copy top-to-bottom */
+      yStep = -1;
+      srcY = srcY1 - 1;
+      dstY = dstY1 - 1;
+   }
+
+   switch (buffer) {
+   case GL_COLOR_BUFFER_BIT:
+      readRb = ctx->ReadBuffer->_ColorReadBuffer;
+      drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];
+      comps = 4;
+      break;
+   case GL_DEPTH_BUFFER_BIT:
+      readRb = ctx->ReadBuffer->_DepthBuffer;
+      drawRb = ctx->DrawBuffer->_DepthBuffer;
+      comps = 1;
+      break;
+   case GL_STENCIL_BUFFER_BIT:
+      readRb = ctx->ReadBuffer->_StencilBuffer;
+      drawRb = ctx->DrawBuffer->_StencilBuffer;
+      comps = 1;
+      break;
+   default:
+      _mesa_problem(ctx, "unexpected buffer in simple_blit()");
+      return;
+   }
+
+   ASSERT(readRb->DataType == drawRb->DataType);
+
+   /* compute bytes per row */
+   switch (readRb->DataType) {
+   case GL_UNSIGNED_BYTE:
+      bytesPerRow = comps * width * sizeof(GLubyte);
+      break;
+   case GL_UNSIGNED_SHORT:
+      bytesPerRow = comps * width * sizeof(GLushort);
+      break;
+   case GL_UNSIGNED_INT:
+      bytesPerRow = comps * width * sizeof(GLuint);
+      break;
+   case GL_FLOAT:
+      bytesPerRow = comps * width * sizeof(GLfloat);
+      break;
+   default:
+      _mesa_problem(ctx, "unexpected buffer type in simple_blit");
+      return;
+   }
+
+   /* allocate the row buffer */
+   rowBuffer = malloc(bytesPerRow);
+   if (!rowBuffer) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
+      return;
+   }
+
+   for (row = 0; row < height; row++) {
+      readRb->GetRow(ctx, readRb, width, srcX0, srcY, rowBuffer);
+      drawRb->PutRow(ctx, drawRb, width, dstX0, dstY, rowBuffer, NULL);
+      srcY += yStep;
+      dstY += yStep;
+   }
+
+   free(rowBuffer);
+}
+
+
+/**
+ * Software fallback for glBlitFramebufferEXT().
+ */
+void
+_swrast_BlitFramebuffer(struct gl_context *ctx,
+                        GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+                        GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
+                        GLbitfield mask, GLenum filter)
+{
+   static const GLbitfield buffers[3] = {
+      GL_COLOR_BUFFER_BIT,
+      GL_DEPTH_BUFFER_BIT,
+      GL_STENCIL_BUFFER_BIT
+   };
+   GLint i;
+
+   if (!ctx->DrawBuffer->_NumColorDrawBuffers)
+      return;
+
+   if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,
+                        &dstX0, &dstY0, &dstX1, &dstY1)) {
+      return;
+   }
+
+   swrast_render_start(ctx);
+
+   if (srcX1 - srcX0 == dstX1 - dstX0 &&
+       srcY1 - srcY0 == dstY1 - dstY0 &&
+       srcX0 < srcX1 &&
+       srcY0 < srcY1 &&
+       dstX0 < dstX1 &&
+       dstY0 < dstY1) {
+      /* no stretching or flipping.
+       * filter doesn't matter.
+       */
+      for (i = 0; i < 3; i++) {
+         if (mask & buffers[i]) {
+            simple_blit(ctx, srcX0, srcY0, srcX1, srcY1,
+                        dstX0, dstY0, dstX1, dstY1, buffers[i]);
+         }
+      }
+   }
+   else {
+      if (filter == GL_NEAREST) {
+         for (i = 0; i < 3; i++) {
+            if (mask & buffers[i]) {
+               blit_nearest(ctx,  srcX0, srcY0, srcX1, srcY1,
+                            dstX0, dstY0, dstX1, dstY1, buffers[i]);
+            }
+         }
+      }
+      else {
+         ASSERT(filter == GL_LINEAR);
+         if (mask & GL_COLOR_BUFFER_BIT) {  /* depth/stencil not allowed */
+            blit_linear(ctx,  srcX0, srcY0, srcX1, srcY1,
+                        dstX0, dstY0, dstX1, dstY1);
+         }
+      }
+   }
+
+   swrast_render_finish(ctx);
+}
diff --git a/pixman/demos/alpha-test.c b/pixman/demos/alpha-test.c
index 92c208142..54e30fad5 100644
--- a/pixman/demos/alpha-test.c
+++ b/pixman/demos/alpha-test.c
@@ -40,10 +40,12 @@ main (int argc, char **argv)
     };
 #endif
 
+#if 0
     pixman_point_fixed_t c_inner;
     pixman_point_fixed_t c_outer;
     pixman_fixed_t r_inner;
     pixman_fixed_t r_outer;
+#endif
     
     for (i = 0; i < WIDTH * HEIGHT; ++i)
 	alpha[i] = 0x4f00004f; /* pale blue */
@@ -69,6 +71,7 @@ main (int argc, char **argv)
 					src,
 					WIDTH * 4);
     
+#if 0
     c_inner.x = pixman_double_to_fixed (50.0);
     c_inner.y = pixman_double_to_fixed (50.0);
     c_outer.x = pixman_double_to_fixed (50.0);
@@ -76,7 +79,6 @@ main (int argc, char **argv)
     r_inner = 0;
     r_outer = pixman_double_to_fixed (50.0);
     
-#if 0
     grad_img = pixman_image_create_conical_gradient (&c_inner, r_inner,
 						    stops, 2);
 #endif
diff --git a/pixman/demos/gradient-test.c b/pixman/demos/gradient-test.c
index fc84844b0..20f78a6aa 100644
--- a/pixman/demos/gradient-test.c
+++ b/pixman/demos/gradient-test.c
@@ -36,10 +36,12 @@ main (int argc, char **argv)
     };
 #endif
 
+#if 0
     pixman_point_fixed_t c_inner;
     pixman_point_fixed_t c_outer;
     pixman_fixed_t r_inner;
     pixman_fixed_t r_outer;
+#endif
     
     for (i = 0; i < WIDTH * HEIGHT; ++i)
 	dest[i] = 0x4f00004f; /* pale blue */
@@ -49,6 +51,7 @@ main (int argc, char **argv)
 					 dest,
 					 WIDTH * 4);
 
+#if 0
     c_inner.x = pixman_double_to_fixed (50.0);
     c_inner.y = pixman_double_to_fixed (50.0);
     c_outer.x = pixman_double_to_fixed (50.0);
@@ -58,6 +61,7 @@ main (int argc, char **argv)
     
     src_img = pixman_image_create_conical_gradient (&c_inner, r_inner,
 						    stops, 2);
+#endif
 #if 0
     src_img = pixman_image_create_conical_gradient (&c_inner, r_inner,
 						    stops, 2);
diff --git a/pixman/pixman/pixman-mmx.c b/pixman/pixman/pixman-mmx.c
index 027234773..62a73d6f3 100644
--- a/pixman/pixman/pixman-mmx.c
+++ b/pixman/pixman/pixman-mmx.c
@@ -1267,7 +1267,7 @@ mmx_composite_over_n_8888_8888_ca (pixman_implementation_t *imp,
                                    int32_t                  width,
                                    int32_t                  height)
 {
-    uint32_t src, srca;
+    uint32_t src;
     uint32_t    *dst_line;
     uint32_t    *mask_line;
     int dst_stride, mask_stride;
@@ -1277,7 +1277,6 @@ mmx_composite_over_n_8888_8888_ca (pixman_implementation_t *imp,
 
     src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
 
-    srca = src >> 24;
     if (src == 0)
 	return;
 
@@ -1377,7 +1376,6 @@ mmx_composite_over_8888_n_8888 (pixman_implementation_t *imp,
     __m64 vmask;
     int dst_stride, src_stride;
     int32_t w;
-    __m64 srca;
 
     CHECKPOINT ();
 
@@ -1388,7 +1386,6 @@ mmx_composite_over_8888_n_8888 (pixman_implementation_t *imp,
     mask &= 0xff000000;
     mask = mask | mask >> 8 | mask >> 16 | mask >> 24;
     vmask = load8888 (mask);
-    srca = MC (4x00ff);
 
     while (height--)
     {
@@ -2033,7 +2030,7 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp,
     uint8_t     *mask_line, *mask;
     int dst_stride, mask_stride;
     int32_t w;
-    __m64 vsrc, vsrca;
+    __m64 vsrc;
     uint64_t srcsrc;
 
     CHECKPOINT ();
@@ -2055,7 +2052,6 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp,
     PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
 
     vsrc = load8888 (src);
-    vsrca = expand_alpha (vsrc);
 
     while (height--)
     {
@@ -2101,11 +2097,8 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp,
 	    }
 	    else if (m0 | m1)
 	    {
-		__m64 vdest;
 		__m64 dest0, dest1;
 
-		vdest = *(__m64 *)dst;
-
 		dest0 = in (vsrc, expand_alpha_rev (to_m64 (m0)));
 		dest1 = in (vsrc, expand_alpha_rev (to_m64 (m1)));
 
@@ -2524,7 +2517,7 @@ mmx_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
                                    int32_t                  width,
                                    int32_t                  height)
 {
-    uint32_t src, srca;
+    uint32_t src;
     uint16_t    *dst_line;
     uint32_t    *mask_line;
     int dst_stride, mask_stride;
@@ -2534,7 +2527,6 @@ mmx_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
 
     src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
 
-    srca = src >> 24;
     if (src == 0)
 	return;
 
@@ -2663,12 +2655,9 @@ mmx_composite_in_n_8_8 (pixman_implementation_t *imp,
 	{
 	    while (w >= 4)
 	    {
-		uint32_t m;
 		__m64 vmask;
 		__m64 vdest;
 
-		m = 0;
-
 		vmask = load8888 (*(uint32_t *)mask);
 		vdest = load8888 (*(uint32_t *)dst);
 
diff --git a/pixman/pixman/pixman-sse2.c b/pixman/pixman/pixman-sse2.c
index a52a959f5..1fd66bf48 100644
--- a/pixman/pixman/pixman-sse2.c
+++ b/pixman/pixman/pixman-sse2.c
@@ -1,6076 +1,6066 @@
-/*

- * Copyright © 2008 Rodrigo Kumpera

- * Copyright © 2008 André Tupinambá

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Red Hat not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  Red Hat makes no representations about the

- * suitability of this software for any purpose.  It is provided "as is"

- * without express or implied warranty.

- *

- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY

- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN

- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING

- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

- * SOFTWARE.

- *

- * Author:  Rodrigo Kumpera (kumpera@gmail.com)

- *          André Tupinambá (andrelrt@gmail.com)

- *

- * Based on work by Owen Taylor and Søren Sandmann

- */

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-

-#include <xmmintrin.h> /* for _mm_shuffle_pi16 and _MM_SHUFFLE */

-#include <emmintrin.h> /* for SSE2 intrinsics */

-#include "pixman-private.h"

-#include "pixman-combine32.h"

-#include "pixman-fast-path.h"

-

-static __m128i mask_0080;

-static __m128i mask_00ff;

-static __m128i mask_0101;

-static __m128i mask_ffff;

-static __m128i mask_ff000000;

-static __m128i mask_alpha;

-

-static __m128i mask_565_r;

-static __m128i mask_565_g1, mask_565_g2;

-static __m128i mask_565_b;

-static __m128i mask_red;

-static __m128i mask_green;

-static __m128i mask_blue;

-

-static __m128i mask_565_fix_rb;

-static __m128i mask_565_fix_g;

-

-static force_inline __m128i

-unpack_32_1x128 (uint32_t data)

-{

-    return _mm_unpacklo_epi8 (_mm_cvtsi32_si128 (data), _mm_setzero_si128 ());

-}

-

-static force_inline void

-unpack_128_2x128 (__m128i data, __m128i* data_lo, __m128i* data_hi)

-{

-    *data_lo = _mm_unpacklo_epi8 (data, _mm_setzero_si128 ());

-    *data_hi = _mm_unpackhi_epi8 (data, _mm_setzero_si128 ());

-}

-

-static force_inline __m128i

-unpack_565_to_8888 (__m128i lo)

-{

-    __m128i r, g, b, rb, t;

-

-    r = _mm_and_si128 (_mm_slli_epi32 (lo, 8), mask_red);

-    g = _mm_and_si128 (_mm_slli_epi32 (lo, 5), mask_green);

-    b = _mm_and_si128 (_mm_slli_epi32 (lo, 3), mask_blue);

-

-    rb = _mm_or_si128 (r, b);

-    t  = _mm_and_si128 (rb, mask_565_fix_rb);

-    t  = _mm_srli_epi32 (t, 5);

-    rb = _mm_or_si128 (rb, t);

-

-    t  = _mm_and_si128 (g, mask_565_fix_g);

-    t  = _mm_srli_epi32 (t, 6);

-    g  = _mm_or_si128 (g, t);

-

-    return _mm_or_si128 (rb, g);

-}

-

-static force_inline void

-unpack_565_128_4x128 (__m128i  data,

-                      __m128i* data0,

-                      __m128i* data1,

-                      __m128i* data2,

-                      __m128i* data3)

-{

-    __m128i lo, hi;

-

-    lo = _mm_unpacklo_epi16 (data, _mm_setzero_si128 ());

-    hi = _mm_unpackhi_epi16 (data, _mm_setzero_si128 ());

-

-    lo = unpack_565_to_8888 (lo);

-    hi = unpack_565_to_8888 (hi);

-

-    unpack_128_2x128 (lo, data0, data1);

-    unpack_128_2x128 (hi, data2, data3);

-}

-

-static force_inline uint16_t

-pack_565_32_16 (uint32_t pixel)

-{

-    return (uint16_t) (((pixel >> 8) & 0xf800) |

-		       ((pixel >> 5) & 0x07e0) |

-		       ((pixel >> 3) & 0x001f));

-}

-

-static force_inline __m128i

-pack_2x128_128 (__m128i lo, __m128i hi)

-{

-    return _mm_packus_epi16 (lo, hi);

-}

-

-static force_inline __m128i

-pack_565_2x128_128 (__m128i lo, __m128i hi)

-{

-    __m128i data;

-    __m128i r, g1, g2, b;

-

-    data = pack_2x128_128 (lo, hi);

-

-    r  = _mm_and_si128 (data, mask_565_r);

-    g1 = _mm_and_si128 (_mm_slli_epi32 (data, 3), mask_565_g1);

-    g2 = _mm_and_si128 (_mm_srli_epi32 (data, 5), mask_565_g2);

-    b  = _mm_and_si128 (_mm_srli_epi32 (data, 3), mask_565_b);

-

-    return _mm_or_si128 (_mm_or_si128 (_mm_or_si128 (r, g1), g2), b);

-}

-

-static force_inline __m128i

-pack_565_4x128_128 (__m128i* xmm0, __m128i* xmm1, __m128i* xmm2, __m128i* xmm3)

-{

-    return _mm_packus_epi16 (pack_565_2x128_128 (*xmm0, *xmm1),

-			     pack_565_2x128_128 (*xmm2, *xmm3));

-}

-

-static force_inline int

-is_opaque (__m128i x)

-{

-    __m128i ffs = _mm_cmpeq_epi8 (x, x);

-

-    return (_mm_movemask_epi8 (_mm_cmpeq_epi8 (x, ffs)) & 0x8888) == 0x8888;

-}

-

-static force_inline int

-is_zero (__m128i x)

-{

-    return _mm_movemask_epi8 (

-	_mm_cmpeq_epi8 (x, _mm_setzero_si128 ())) == 0xffff;

-}

-

-static force_inline int

-is_transparent (__m128i x)

-{

-    return (_mm_movemask_epi8 (

-		_mm_cmpeq_epi8 (x, _mm_setzero_si128 ())) & 0x8888) == 0x8888;

-}

-

-static force_inline __m128i

-expand_pixel_32_1x128 (uint32_t data)

-{

-    return _mm_shuffle_epi32 (unpack_32_1x128 (data), _MM_SHUFFLE (1, 0, 1, 0));

-}

-

-static force_inline __m128i

-expand_alpha_1x128 (__m128i data)

-{

-    return _mm_shufflehi_epi16 (_mm_shufflelo_epi16 (data,

-						     _MM_SHUFFLE (3, 3, 3, 3)),

-				_MM_SHUFFLE (3, 3, 3, 3));

-}

-

-static force_inline void

-expand_alpha_2x128 (__m128i  data_lo,

-                    __m128i  data_hi,

-                    __m128i* alpha_lo,

-                    __m128i* alpha_hi)

-{

-    __m128i lo, hi;

-

-    lo = _mm_shufflelo_epi16 (data_lo, _MM_SHUFFLE (3, 3, 3, 3));

-    hi = _mm_shufflelo_epi16 (data_hi, _MM_SHUFFLE (3, 3, 3, 3));

-

-    *alpha_lo = _mm_shufflehi_epi16 (lo, _MM_SHUFFLE (3, 3, 3, 3));

-    *alpha_hi = _mm_shufflehi_epi16 (hi, _MM_SHUFFLE (3, 3, 3, 3));

-}

-

-static force_inline void

-expand_alpha_rev_2x128 (__m128i  data_lo,

-                        __m128i  data_hi,

-                        __m128i* alpha_lo,

-                        __m128i* alpha_hi)

-{

-    __m128i lo, hi;

-

-    lo = _mm_shufflelo_epi16 (data_lo, _MM_SHUFFLE (0, 0, 0, 0));

-    hi = _mm_shufflelo_epi16 (data_hi, _MM_SHUFFLE (0, 0, 0, 0));

-    *alpha_lo = _mm_shufflehi_epi16 (lo, _MM_SHUFFLE (0, 0, 0, 0));

-    *alpha_hi = _mm_shufflehi_epi16 (hi, _MM_SHUFFLE (0, 0, 0, 0));

-}

-

-static force_inline void

-pix_multiply_2x128 (__m128i* data_lo,

-                    __m128i* data_hi,

-                    __m128i* alpha_lo,

-                    __m128i* alpha_hi,

-                    __m128i* ret_lo,

-                    __m128i* ret_hi)

-{

-    __m128i lo, hi;

-

-    lo = _mm_mullo_epi16 (*data_lo, *alpha_lo);

-    hi = _mm_mullo_epi16 (*data_hi, *alpha_hi);

-    lo = _mm_adds_epu16 (lo, mask_0080);

-    hi = _mm_adds_epu16 (hi, mask_0080);

-    *ret_lo = _mm_mulhi_epu16 (lo, mask_0101);

-    *ret_hi = _mm_mulhi_epu16 (hi, mask_0101);

-}

-

-static force_inline void

-pix_add_multiply_2x128 (__m128i* src_lo,

-                        __m128i* src_hi,

-                        __m128i* alpha_dst_lo,

-                        __m128i* alpha_dst_hi,

-                        __m128i* dst_lo,

-                        __m128i* dst_hi,

-                        __m128i* alpha_src_lo,

-                        __m128i* alpha_src_hi,

-                        __m128i* ret_lo,

-                        __m128i* ret_hi)

-{

-    __m128i t1_lo, t1_hi;

-    __m128i t2_lo, t2_hi;

-

-    pix_multiply_2x128 (src_lo, src_hi, alpha_dst_lo, alpha_dst_hi, &t1_lo, &t1_hi);

-    pix_multiply_2x128 (dst_lo, dst_hi, alpha_src_lo, alpha_src_hi, &t2_lo, &t2_hi);

-

-    *ret_lo = _mm_adds_epu8 (t1_lo, t2_lo);

-    *ret_hi = _mm_adds_epu8 (t1_hi, t2_hi);

-}

-

-static force_inline void

-negate_2x128 (__m128i  data_lo,

-              __m128i  data_hi,

-              __m128i* neg_lo,

-              __m128i* neg_hi)

-{

-    *neg_lo = _mm_xor_si128 (data_lo, mask_00ff);

-    *neg_hi = _mm_xor_si128 (data_hi, mask_00ff);

-}

-

-static force_inline void

-invert_colors_2x128 (__m128i  data_lo,

-                     __m128i  data_hi,

-                     __m128i* inv_lo,

-                     __m128i* inv_hi)

-{

-    __m128i lo, hi;

-

-    lo = _mm_shufflelo_epi16 (data_lo, _MM_SHUFFLE (3, 0, 1, 2));

-    hi = _mm_shufflelo_epi16 (data_hi, _MM_SHUFFLE (3, 0, 1, 2));

-    *inv_lo = _mm_shufflehi_epi16 (lo, _MM_SHUFFLE (3, 0, 1, 2));

-    *inv_hi = _mm_shufflehi_epi16 (hi, _MM_SHUFFLE (3, 0, 1, 2));

-}

-

-static force_inline void

-over_2x128 (__m128i* src_lo,

-            __m128i* src_hi,

-            __m128i* alpha_lo,

-            __m128i* alpha_hi,

-            __m128i* dst_lo,

-            __m128i* dst_hi)

-{

-    __m128i t1, t2;

-

-    negate_2x128 (*alpha_lo, *alpha_hi, &t1, &t2);

-

-    pix_multiply_2x128 (dst_lo, dst_hi, &t1, &t2, dst_lo, dst_hi);

-

-    *dst_lo = _mm_adds_epu8 (*src_lo, *dst_lo);

-    *dst_hi = _mm_adds_epu8 (*src_hi, *dst_hi);

-}

-

-static force_inline void

-over_rev_non_pre_2x128 (__m128i  src_lo,

-                        __m128i  src_hi,

-                        __m128i* dst_lo,

-                        __m128i* dst_hi)

-{

-    __m128i lo, hi;

-    __m128i alpha_lo, alpha_hi;

-

-    expand_alpha_2x128 (src_lo, src_hi, &alpha_lo, &alpha_hi);

-

-    lo = _mm_or_si128 (alpha_lo, mask_alpha);

-    hi = _mm_or_si128 (alpha_hi, mask_alpha);

-

-    invert_colors_2x128 (src_lo, src_hi, &src_lo, &src_hi);

-

-    pix_multiply_2x128 (&src_lo, &src_hi, &lo, &hi, &lo, &hi);

-

-    over_2x128 (&lo, &hi, &alpha_lo, &alpha_hi, dst_lo, dst_hi);

-}

-

-static force_inline void

-in_over_2x128 (__m128i* src_lo,

-               __m128i* src_hi,

-               __m128i* alpha_lo,

-               __m128i* alpha_hi,

-               __m128i* mask_lo,

-               __m128i* mask_hi,

-               __m128i* dst_lo,

-               __m128i* dst_hi)

-{

-    __m128i s_lo, s_hi;

-    __m128i a_lo, a_hi;

-

-    pix_multiply_2x128 (src_lo,   src_hi, mask_lo, mask_hi, &s_lo, &s_hi);

-    pix_multiply_2x128 (alpha_lo, alpha_hi, mask_lo, mask_hi, &a_lo, &a_hi);

-

-    over_2x128 (&s_lo, &s_hi, &a_lo, &a_hi, dst_lo, dst_hi);

-}

-

-/* load 4 pixels from a 16-byte boundary aligned address */

-static force_inline __m128i

-load_128_aligned (__m128i* src)

-{

-    return _mm_load_si128 (src);

-}

-

-/* load 4 pixels from a unaligned address */

-static force_inline __m128i

-load_128_unaligned (const __m128i* src)

-{

-    return _mm_loadu_si128 (src);

-}

-

-/* save 4 pixels using Write Combining memory on a 16-byte

- * boundary aligned address

- */

-static force_inline void

-save_128_write_combining (__m128i* dst,

-                          __m128i  data)

-{

-    _mm_stream_si128 (dst, data);

-}

-

-/* save 4 pixels on a 16-byte boundary aligned address */

-static force_inline void

-save_128_aligned (__m128i* dst,

-                  __m128i  data)

-{

-    _mm_store_si128 (dst, data);

-}

-

-/* save 4 pixels on a unaligned address */

-static force_inline void

-save_128_unaligned (__m128i* dst,

-                    __m128i  data)

-{

-    _mm_storeu_si128 (dst, data);

-}

-

-static force_inline __m128i

-load_32_1x128 (uint32_t data)

-{

-    return _mm_cvtsi32_si128 (data);

-}

-

-static force_inline __m128i

-expand_alpha_rev_1x128 (__m128i data)

-{

-    return _mm_shufflelo_epi16 (data, _MM_SHUFFLE (0, 0, 0, 0));

-}

-

-static force_inline __m128i

-expand_pixel_8_1x128 (uint8_t data)

-{

-    return _mm_shufflelo_epi16 (

-	unpack_32_1x128 ((uint32_t)data), _MM_SHUFFLE (0, 0, 0, 0));

-}

-

-static force_inline __m128i

-pix_multiply_1x128 (__m128i data,

-		    __m128i alpha)

-{

-    return _mm_mulhi_epu16 (_mm_adds_epu16 (_mm_mullo_epi16 (data, alpha),

-					    mask_0080),

-			    mask_0101);

-}

-

-static force_inline __m128i

-pix_add_multiply_1x128 (__m128i* src,

-			__m128i* alpha_dst,

-			__m128i* dst,

-			__m128i* alpha_src)

-{

-    __m128i t1 = pix_multiply_1x128 (*src, *alpha_dst);

-    __m128i t2 = pix_multiply_1x128 (*dst, *alpha_src);

-

-    return _mm_adds_epu8 (t1, t2);

-}

-

-static force_inline __m128i

-negate_1x128 (__m128i data)

-{

-    return _mm_xor_si128 (data, mask_00ff);

-}

-

-static force_inline __m128i

-invert_colors_1x128 (__m128i data)

-{

-    return _mm_shufflelo_epi16 (data, _MM_SHUFFLE (3, 0, 1, 2));

-}

-

-static force_inline __m128i

-over_1x128 (__m128i src, __m128i alpha, __m128i dst)

-{

-    return _mm_adds_epu8 (src, pix_multiply_1x128 (dst, negate_1x128 (alpha)));

-}

-

-static force_inline __m128i

-in_over_1x128 (__m128i* src, __m128i* alpha, __m128i* mask, __m128i* dst)

-{

-    return over_1x128 (pix_multiply_1x128 (*src, *mask),

-		       pix_multiply_1x128 (*alpha, *mask),

-		       *dst);

-}

-

-static force_inline __m128i

-over_rev_non_pre_1x128 (__m128i src, __m128i dst)

-{

-    __m128i alpha = expand_alpha_1x128 (src);

-

-    return over_1x128 (pix_multiply_1x128 (invert_colors_1x128 (src),

-					   _mm_or_si128 (alpha, mask_alpha)),

-		       alpha,

-		       dst);

-}

-

-static force_inline uint32_t

-pack_1x128_32 (__m128i data)

-{

-    return _mm_cvtsi128_si32 (_mm_packus_epi16 (data, _mm_setzero_si128 ()));

-}

-

-static force_inline __m128i

-expand565_16_1x128 (uint16_t pixel)

-{

-    __m128i m = _mm_cvtsi32_si128 (pixel);

-

-    m = unpack_565_to_8888 (m);

-

-    return _mm_unpacklo_epi8 (m, _mm_setzero_si128 ());

-}

-

-static force_inline uint32_t

-core_combine_over_u_pixel_sse2 (uint32_t src, uint32_t dst)

-{

-    uint8_t a;

-    __m128i xmms;

-

-    a = src >> 24;

-

-    if (a == 0xff)

-    {

-	return src;

-    }

-    else if (src)

-    {

-	xmms = unpack_32_1x128 (src);

-	return pack_1x128_32 (

-	    over_1x128 (xmms, expand_alpha_1x128 (xmms),

-			unpack_32_1x128 (dst)));

-    }

-

-    return dst;

-}

-

-static force_inline uint32_t

-combine1 (const uint32_t *ps, const uint32_t *pm)

-{

-    uint32_t s = *ps;

-

-    if (pm)

-    {

-	__m128i ms, mm;

-

-	mm = unpack_32_1x128 (*pm);

-	mm = expand_alpha_1x128 (mm);

-

-	ms = unpack_32_1x128 (s);

-	ms = pix_multiply_1x128 (ms, mm);

-

-	s = pack_1x128_32 (ms);

-    }

-

-    return s;

-}

-

-static force_inline __m128i

-combine4 (const __m128i *ps, const __m128i *pm)

-{

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_msk_lo, xmm_msk_hi;

-    __m128i s;

-

-    if (pm)

-    {

-	xmm_msk_lo = load_128_unaligned (pm);

-

-	if (is_transparent (xmm_msk_lo))

-	    return _mm_setzero_si128 ();

-    }

-

-    s = load_128_unaligned (ps);

-

-    if (pm)

-    {

-	unpack_128_2x128 (s, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_msk_lo, &xmm_msk_lo, &xmm_msk_hi);

-

-	expand_alpha_2x128 (xmm_msk_lo, xmm_msk_hi, &xmm_msk_lo, &xmm_msk_hi);

-

-	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,

-			    &xmm_msk_lo, &xmm_msk_hi,

-			    &xmm_src_lo, &xmm_src_hi);

-

-	s = pack_2x128_128 (xmm_src_lo, xmm_src_hi);

-    }

-

-    return s;

-}

-

-static force_inline void

-core_combine_over_u_sse2_mask (uint32_t *	  pd,

-			       const uint32_t*    ps,

-			       const uint32_t*    pm,

-			       int                w)

-{

-    uint32_t s, d;

-

-    /* Align dst on a 16-byte boundary */

-    while (w && ((unsigned long)pd & 15))

-    {

-	d = *pd;

-	s = combine1 (ps, pm);

-

-	if (s)

-	    *pd = core_combine_over_u_pixel_sse2 (s, d);

-	pd++;

-	ps++;

-	pm++;

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	__m128i mask = load_128_unaligned ((__m128i *)pm);

-

-	if (!is_zero (mask))

-	{

-	    __m128i src;

-	    __m128i src_hi, src_lo;

-	    __m128i mask_hi, mask_lo;

-	    __m128i alpha_hi, alpha_lo;

-

-	    src = load_128_unaligned ((__m128i *)ps);

-

-	    if (is_opaque (_mm_and_si128 (src, mask)))

-	    {

-		save_128_aligned ((__m128i *)pd, src);

-	    }

-	    else

-	    {

-		__m128i dst = load_128_aligned ((__m128i *)pd);

-		__m128i dst_hi, dst_lo;

-

-		unpack_128_2x128 (mask, &mask_lo, &mask_hi);

-		unpack_128_2x128 (src, &src_lo, &src_hi);

-

-		expand_alpha_2x128 (mask_lo, mask_hi, &mask_lo, &mask_hi);

-		pix_multiply_2x128 (&src_lo, &src_hi,

-				    &mask_lo, &mask_hi,

-				    &src_lo, &src_hi);

-

-		unpack_128_2x128 (dst, &dst_lo, &dst_hi);

-

-		expand_alpha_2x128 (src_lo, src_hi,

-				    &alpha_lo, &alpha_hi);

-

-		over_2x128 (&src_lo, &src_hi, &alpha_lo, &alpha_hi,

-			    &dst_lo, &dst_hi);

-

-		save_128_aligned (

-		    (__m128i *)pd,

-		    pack_2x128_128 (dst_lo, dst_hi));

-	    }

-	}

-

-	pm += 4;

-	ps += 4;

-	pd += 4;

-	w -= 4;

-    }

-    while (w)

-    {

-	d = *pd;

-	s = combine1 (ps, pm);

-

-	if (s)

-	    *pd = core_combine_over_u_pixel_sse2 (s, d);

-	pd++;

-	ps++;

-	pm++;

-

-	w--;

-    }

-}

-

-static force_inline void

-core_combine_over_u_sse2_no_mask (uint32_t *	  pd,

-				  const uint32_t*    ps,

-				  int                w)

-{

-    uint32_t s, d;

-

-    /* Align dst on a 16-byte boundary */

-    while (w && ((unsigned long)pd & 15))

-    {

-	d = *pd;

-	s = *ps;

-

-	if (s)

-	    *pd = core_combine_over_u_pixel_sse2 (s, d);

-	pd++;

-	ps++;

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	__m128i src;

-	__m128i src_hi, src_lo, dst_hi, dst_lo;

-	__m128i alpha_hi, alpha_lo;

-

-	src = load_128_unaligned ((__m128i *)ps);

-

-	if (!is_zero (src))

-	{

-	    if (is_opaque (src))

-	    {

-		save_128_aligned ((__m128i *)pd, src);

-	    }

-	    else

-	    {

-		__m128i dst = load_128_aligned ((__m128i *)pd);

-

-		unpack_128_2x128 (src, &src_lo, &src_hi);

-		unpack_128_2x128 (dst, &dst_lo, &dst_hi);

-

-		expand_alpha_2x128 (src_lo, src_hi,

-				    &alpha_lo, &alpha_hi);

-		over_2x128 (&src_lo, &src_hi, &alpha_lo, &alpha_hi,

-			    &dst_lo, &dst_hi);

-

-		save_128_aligned (

-		    (__m128i *)pd,

-		    pack_2x128_128 (dst_lo, dst_hi));

-	    }

-	}

-

-	ps += 4;

-	pd += 4;

-	w -= 4;

-    }

-    while (w)

-    {

-	d = *pd;

-	s = *ps;

-

-	if (s)

-	    *pd = core_combine_over_u_pixel_sse2 (s, d);

-	pd++;

-	ps++;

-

-	w--;

-    }

-}

-

-static force_inline void

-sse2_combine_over_u (pixman_implementation_t *imp,

-                     pixman_op_t              op,

-                     uint32_t *               pd,

-                     const uint32_t *         ps,

-                     const uint32_t *         pm,

-                     int                      w)

-{

-    if (pm)

-	core_combine_over_u_sse2_mask (pd, ps, pm, w);

-    else

-	core_combine_over_u_sse2_no_mask (pd, ps, w);

-}

-

-static void

-sse2_combine_over_reverse_u (pixman_implementation_t *imp,

-                             pixman_op_t              op,

-                             uint32_t *               pd,

-                             const uint32_t *         ps,

-                             const uint32_t *         pm,

-                             int                      w)

-{

-    uint32_t s, d;

-

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_alpha_lo, xmm_alpha_hi;

-

-    /* Align dst on a 16-byte boundary */

-    while (w &&

-           ((unsigned long)pd & 15))

-    {

-	d = *pd;

-	s = combine1 (ps, pm);

-

-	*pd++ = core_combine_over_u_pixel_sse2 (d, s);

-	w--;

-	ps++;

-	if (pm)

-	    pm++;

-    }

-

-    while (w >= 4)

-    {

-	/* I'm loading unaligned because I'm not sure

-	 * about the address alignment.

-	 */

-	xmm_src_hi = combine4 ((__m128i*)ps, (__m128i*)pm);

-	xmm_dst_hi = load_128_aligned ((__m128i*) pd);

-

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-

-	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi);

-

-	over_2x128 (&xmm_dst_lo, &xmm_dst_hi,

-		    &xmm_alpha_lo, &xmm_alpha_hi,

-		    &xmm_src_lo, &xmm_src_hi);

-

-	/* rebuid the 4 pixel data and save*/

-	save_128_aligned ((__m128i*)pd,

-			  pack_2x128_128 (xmm_src_lo, xmm_src_hi));

-

-	w -= 4;

-	ps += 4;

-	pd += 4;

-

-	if (pm)

-	    pm += 4;

-    }

-

-    while (w)

-    {

-	d = *pd;

-	s = combine1 (ps, pm);

-

-	*pd++ = core_combine_over_u_pixel_sse2 (d, s);

-	ps++;

-	w--;

-	if (pm)

-	    pm++;

-    }

-}

-

-static force_inline uint32_t

-core_combine_in_u_pixel_sse2 (uint32_t src, uint32_t dst)

-{

-    uint32_t maska = src >> 24;

-

-    if (maska == 0)

-    {

-	return 0;

-    }

-    else if (maska != 0xff)

-    {

-	return pack_1x128_32 (

-	    pix_multiply_1x128 (unpack_32_1x128 (dst),

-				expand_alpha_1x128 (unpack_32_1x128 (src))));

-    }

-

-    return dst;

-}

-

-static void

-sse2_combine_in_u (pixman_implementation_t *imp,

-                   pixman_op_t              op,

-                   uint32_t *               pd,

-                   const uint32_t *         ps,

-                   const uint32_t *         pm,

-                   int                      w)

-{

-    uint32_t s, d;

-

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-

-    while (w && ((unsigned long) pd & 15))

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	*pd++ = core_combine_in_u_pixel_sse2 (d, s);

-	w--;

-	ps++;

-	if (pm)

-	    pm++;

-    }

-

-    while (w >= 4)

-    {

-	xmm_dst_hi = load_128_aligned ((__m128i*) pd);

-	xmm_src_hi = combine4 ((__m128i*) ps, (__m128i*) pm);

-

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,

-			    &xmm_dst_lo, &xmm_dst_hi,

-			    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned ((__m128i*)pd,

-			  pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	w -= 4;

-	if (pm)

-	    pm += 4;

-    }

-

-    while (w)

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	*pd++ = core_combine_in_u_pixel_sse2 (d, s);

-	w--;

-	ps++;

-	if (pm)

-	    pm++;

-    }

-}

-

-static void

-sse2_combine_in_reverse_u (pixman_implementation_t *imp,

-                           pixman_op_t              op,

-                           uint32_t *               pd,

-                           const uint32_t *         ps,

-                           const uint32_t *         pm,

-                           int                      w)

-{

-    uint32_t s, d;

-

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-

-    while (w && ((unsigned long) pd & 15))

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	*pd++ = core_combine_in_u_pixel_sse2 (s, d);

-	ps++;

-	w--;

-	if (pm)

-	    pm++;

-    }

-

-    while (w >= 4)

-    {

-	xmm_dst_hi = load_128_aligned ((__m128i*) pd);

-	xmm_src_hi = combine4 ((__m128i*) ps, (__m128i*)pm);

-

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-	pix_multiply_2x128 (&xmm_dst_lo, &xmm_dst_hi,

-			    &xmm_src_lo, &xmm_src_hi,

-			    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	w -= 4;

-	if (pm)

-	    pm += 4;

-    }

-

-    while (w)

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	*pd++ = core_combine_in_u_pixel_sse2 (s, d);

-	w--;

-	ps++;

-	if (pm)

-	    pm++;

-    }

-}

-

-static void

-sse2_combine_out_reverse_u (pixman_implementation_t *imp,

-                            pixman_op_t              op,

-                            uint32_t *               pd,

-                            const uint32_t *         ps,

-                            const uint32_t *         pm,

-                            int                      w)

-{

-    while (w && ((unsigned long) pd & 15))

-    {

-	uint32_t s = combine1 (ps, pm);

-	uint32_t d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (

-		unpack_32_1x128 (d), negate_1x128 (

-		    expand_alpha_1x128 (unpack_32_1x128 (s)))));

-

-	if (pm)

-	    pm++;

-	ps++;

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	__m128i xmm_src_lo, xmm_src_hi;

-	__m128i xmm_dst_lo, xmm_dst_hi;

-

-	xmm_src_hi = combine4 ((__m128i*)ps, (__m128i*)pm);

-	xmm_dst_hi = load_128_aligned ((__m128i*) pd);

-

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-

-	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	negate_2x128       (xmm_src_lo, xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-

-	pix_multiply_2x128 (&xmm_dst_lo, &xmm_dst_hi,

-			    &xmm_src_lo, &xmm_src_hi,

-			    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	if (pm)

-	    pm += 4;

-

-	w -= 4;

-    }

-

-    while (w)

-    {

-	uint32_t s = combine1 (ps, pm);

-	uint32_t d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (

-		unpack_32_1x128 (d), negate_1x128 (

-		    expand_alpha_1x128 (unpack_32_1x128 (s)))));

-	ps++;

-	if (pm)

-	    pm++;

-	w--;

-    }

-}

-

-static void

-sse2_combine_out_u (pixman_implementation_t *imp,

-                    pixman_op_t              op,

-                    uint32_t *               pd,

-                    const uint32_t *         ps,

-                    const uint32_t *         pm,

-                    int                      w)

-{

-    while (w && ((unsigned long) pd & 15))

-    {

-	uint32_t s = combine1 (ps, pm);

-	uint32_t d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (

-		unpack_32_1x128 (s), negate_1x128 (

-		    expand_alpha_1x128 (unpack_32_1x128 (d)))));

-	w--;

-	ps++;

-	if (pm)

-	    pm++;

-    }

-

-    while (w >= 4)

-    {

-	__m128i xmm_src_lo, xmm_src_hi;

-	__m128i xmm_dst_lo, xmm_dst_hi;

-

-	xmm_src_hi = combine4 ((__m128i*) ps, (__m128i*)pm);

-	xmm_dst_hi = load_128_aligned ((__m128i*) pd);

-

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-

-	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-	negate_2x128       (xmm_dst_lo, xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-

-	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,

-			    &xmm_dst_lo, &xmm_dst_hi,

-			    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	w -= 4;

-	if (pm)

-	    pm += 4;

-    }

-

-    while (w)

-    {

-	uint32_t s = combine1 (ps, pm);

-	uint32_t d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (

-		unpack_32_1x128 (s), negate_1x128 (

-		    expand_alpha_1x128 (unpack_32_1x128 (d)))));

-	w--;

-	ps++;

-	if (pm)

-	    pm++;

-    }

-}

-

-static force_inline uint32_t

-core_combine_atop_u_pixel_sse2 (uint32_t src,

-                                uint32_t dst)

-{

-    __m128i s = unpack_32_1x128 (src);

-    __m128i d = unpack_32_1x128 (dst);

-

-    __m128i sa = negate_1x128 (expand_alpha_1x128 (s));

-    __m128i da = expand_alpha_1x128 (d);

-

-    return pack_1x128_32 (pix_add_multiply_1x128 (&s, &da, &d, &sa));

-}

-

-static void

-sse2_combine_atop_u (pixman_implementation_t *imp,

-                     pixman_op_t              op,

-                     uint32_t *               pd,

-                     const uint32_t *         ps,

-                     const uint32_t *         pm,

-                     int                      w)

-{

-    uint32_t s, d;

-

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_alpha_src_lo, xmm_alpha_src_hi;

-    __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi;

-

-    while (w && ((unsigned long) pd & 15))

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	*pd++ = core_combine_atop_u_pixel_sse2 (s, d);

-	w--;

-	ps++;

-	if (pm)

-	    pm++;

-    }

-

-    while (w >= 4)

-    {

-	xmm_src_hi = combine4 ((__m128i*)ps, (__m128i*)pm);

-	xmm_dst_hi = load_128_aligned ((__m128i*) pd);

-

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-

-	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-			    &xmm_alpha_src_lo, &xmm_alpha_src_hi);

-	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,

-			    &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);

-

-	negate_2x128 (xmm_alpha_src_lo, xmm_alpha_src_hi,

-		      &xmm_alpha_src_lo, &xmm_alpha_src_hi);

-

-	pix_add_multiply_2x128 (

-	    &xmm_src_lo, &xmm_src_hi, &xmm_alpha_dst_lo, &xmm_alpha_dst_hi,

-	    &xmm_dst_lo, &xmm_dst_hi, &xmm_alpha_src_lo, &xmm_alpha_src_hi,

-	    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	w -= 4;

-	if (pm)

-	    pm += 4;

-    }

-

-    while (w)

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	*pd++ = core_combine_atop_u_pixel_sse2 (s, d);

-	w--;

-	ps++;

-	if (pm)

-	    pm++;

-    }

-}

-

-static force_inline uint32_t

-core_combine_reverse_atop_u_pixel_sse2 (uint32_t src,

-                                        uint32_t dst)

-{

-    __m128i s = unpack_32_1x128 (src);

-    __m128i d = unpack_32_1x128 (dst);

-

-    __m128i sa = expand_alpha_1x128 (s);

-    __m128i da = negate_1x128 (expand_alpha_1x128 (d));

-

-    return pack_1x128_32 (pix_add_multiply_1x128 (&s, &da, &d, &sa));

-}

-

-static void

-sse2_combine_atop_reverse_u (pixman_implementation_t *imp,

-                             pixman_op_t              op,

-                             uint32_t *               pd,

-                             const uint32_t *         ps,

-                             const uint32_t *         pm,

-                             int                      w)

-{

-    uint32_t s, d;

-

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_alpha_src_lo, xmm_alpha_src_hi;

-    __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi;

-

-    while (w && ((unsigned long) pd & 15))

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	*pd++ = core_combine_reverse_atop_u_pixel_sse2 (s, d);

-	ps++;

-	w--;

-	if (pm)

-	    pm++;

-    }

-

-    while (w >= 4)

-    {

-	xmm_src_hi = combine4 ((__m128i*)ps, (__m128i*)pm);

-	xmm_dst_hi = load_128_aligned ((__m128i*) pd);

-

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-

-	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-			    &xmm_alpha_src_lo, &xmm_alpha_src_hi);

-	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,

-			    &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);

-

-	negate_2x128 (xmm_alpha_dst_lo, xmm_alpha_dst_hi,

-		      &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);

-

-	pix_add_multiply_2x128 (

-	    &xmm_src_lo, &xmm_src_hi, &xmm_alpha_dst_lo, &xmm_alpha_dst_hi,

-	    &xmm_dst_lo, &xmm_dst_hi, &xmm_alpha_src_lo, &xmm_alpha_src_hi,

-	    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	w -= 4;

-	if (pm)

-	    pm += 4;

-    }

-

-    while (w)

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	*pd++ = core_combine_reverse_atop_u_pixel_sse2 (s, d);

-	ps++;

-	w--;

-	if (pm)

-	    pm++;

-    }

-}

-

-static force_inline uint32_t

-core_combine_xor_u_pixel_sse2 (uint32_t src,

-                               uint32_t dst)

-{

-    __m128i s = unpack_32_1x128 (src);

-    __m128i d = unpack_32_1x128 (dst);

-

-    __m128i neg_d = negate_1x128 (expand_alpha_1x128 (d));

-    __m128i neg_s = negate_1x128 (expand_alpha_1x128 (s));

-

-    return pack_1x128_32 (pix_add_multiply_1x128 (&s, &neg_d, &d, &neg_s));

-}

-

-static void

-sse2_combine_xor_u (pixman_implementation_t *imp,

-                    pixman_op_t              op,

-                    uint32_t *               dst,

-                    const uint32_t *         src,

-                    const uint32_t *         mask,

-                    int                      width)

-{

-    int w = width;

-    uint32_t s, d;

-    uint32_t* pd = dst;

-    const uint32_t* ps = src;

-    const uint32_t* pm = mask;

-

-    __m128i xmm_src, xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_alpha_src_lo, xmm_alpha_src_hi;

-    __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi;

-

-    while (w && ((unsigned long) pd & 15))

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	*pd++ = core_combine_xor_u_pixel_sse2 (s, d);

-	w--;

-	ps++;

-	if (pm)

-	    pm++;

-    }

-

-    while (w >= 4)

-    {

-	xmm_src = combine4 ((__m128i*) ps, (__m128i*) pm);

-	xmm_dst = load_128_aligned ((__m128i*) pd);

-

-	unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-

-	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-			    &xmm_alpha_src_lo, &xmm_alpha_src_hi);

-	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,

-			    &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);

-

-	negate_2x128 (xmm_alpha_src_lo, xmm_alpha_src_hi,

-		      &xmm_alpha_src_lo, &xmm_alpha_src_hi);

-	negate_2x128 (xmm_alpha_dst_lo, xmm_alpha_dst_hi,

-		      &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);

-

-	pix_add_multiply_2x128 (

-	    &xmm_src_lo, &xmm_src_hi, &xmm_alpha_dst_lo, &xmm_alpha_dst_hi,

-	    &xmm_dst_lo, &xmm_dst_hi, &xmm_alpha_src_lo, &xmm_alpha_src_hi,

-	    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	w -= 4;

-	if (pm)

-	    pm += 4;

-    }

-

-    while (w)

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	*pd++ = core_combine_xor_u_pixel_sse2 (s, d);

-	w--;

-	ps++;

-	if (pm)

-	    pm++;

-    }

-}

-

-static force_inline void

-sse2_combine_add_u (pixman_implementation_t *imp,

-                    pixman_op_t              op,

-                    uint32_t *               dst,

-                    const uint32_t *         src,

-                    const uint32_t *         mask,

-                    int                      width)

-{

-    int w = width;

-    uint32_t s, d;

-    uint32_t* pd = dst;

-    const uint32_t* ps = src;

-    const uint32_t* pm = mask;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	ps++;

-	if (pm)

-	    pm++;

-	*pd++ = _mm_cvtsi128_si32 (

-	    _mm_adds_epu8 (_mm_cvtsi32_si128 (s), _mm_cvtsi32_si128 (d)));

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	__m128i s;

-

-	s = combine4 ((__m128i*)ps, (__m128i*)pm);

-

-	save_128_aligned (

-	    (__m128i*)pd, _mm_adds_epu8 (s, load_128_aligned  ((__m128i*)pd)));

-

-	pd += 4;

-	ps += 4;

-	if (pm)

-	    pm += 4;

-	w -= 4;

-    }

-

-    while (w--)

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	ps++;

-	*pd++ = _mm_cvtsi128_si32 (

-	    _mm_adds_epu8 (_mm_cvtsi32_si128 (s), _mm_cvtsi32_si128 (d)));

-	if (pm)

-	    pm++;

-    }

-}

-

-static force_inline uint32_t

-core_combine_saturate_u_pixel_sse2 (uint32_t src,

-                                    uint32_t dst)

-{

-    __m128i ms = unpack_32_1x128 (src);

-    __m128i md = unpack_32_1x128 (dst);

-    uint32_t sa = src >> 24;

-    uint32_t da = ~dst >> 24;

-

-    if (sa > da)

-    {

-	ms = pix_multiply_1x128 (

-	    ms, expand_alpha_1x128 (unpack_32_1x128 (DIV_UN8 (da, sa) << 24)));

-    }

-

-    return pack_1x128_32 (_mm_adds_epu16 (md, ms));

-}

-

-static void

-sse2_combine_saturate_u (pixman_implementation_t *imp,

-                         pixman_op_t              op,

-                         uint32_t *               pd,

-                         const uint32_t *         ps,

-                         const uint32_t *         pm,

-                         int                      w)

-{

-    uint32_t s, d;

-

-    uint32_t pack_cmp;

-    __m128i xmm_src, xmm_dst;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	*pd++ = core_combine_saturate_u_pixel_sse2 (s, d);

-	w--;

-	ps++;

-	if (pm)

-	    pm++;

-    }

-

-    while (w >= 4)

-    {

-	xmm_dst = load_128_aligned  ((__m128i*)pd);

-	xmm_src = combine4 ((__m128i*)ps, (__m128i*)pm);

-

-	pack_cmp = _mm_movemask_epi8 (

-	    _mm_cmpgt_epi32 (

-		_mm_srli_epi32 (xmm_src, 24),

-		_mm_srli_epi32 (_mm_xor_si128 (xmm_dst, mask_ff000000), 24)));

-

-	/* if some alpha src is grater than respective ~alpha dst */

-	if (pack_cmp)

-	{

-	    s = combine1 (ps++, pm);

-	    d = *pd;

-	    *pd++ = core_combine_saturate_u_pixel_sse2 (s, d);

-	    if (pm)

-		pm++;

-

-	    s = combine1 (ps++, pm);

-	    d = *pd;

-	    *pd++ = core_combine_saturate_u_pixel_sse2 (s, d);

-	    if (pm)

-		pm++;

-

-	    s = combine1 (ps++, pm);

-	    d = *pd;

-	    *pd++ = core_combine_saturate_u_pixel_sse2 (s, d);

-	    if (pm)

-		pm++;

-

-	    s = combine1 (ps++, pm);

-	    d = *pd;

-	    *pd++ = core_combine_saturate_u_pixel_sse2 (s, d);

-	    if (pm)

-		pm++;

-	}

-	else

-	{

-	    save_128_aligned ((__m128i*)pd, _mm_adds_epu8 (xmm_dst, xmm_src));

-

-	    pd += 4;

-	    ps += 4;

-	    if (pm)

-		pm += 4;

-	}

-

-	w -= 4;

-    }

-

-    while (w--)

-    {

-	s = combine1 (ps, pm);

-	d = *pd;

-

-	*pd++ = core_combine_saturate_u_pixel_sse2 (s, d);

-	ps++;

-	if (pm)

-	    pm++;

-    }

-}

-

-static void

-sse2_combine_src_ca (pixman_implementation_t *imp,

-                     pixman_op_t              op,

-                     uint32_t *               pd,

-                     const uint32_t *         ps,

-                     const uint32_t *         pm,

-                     int                      w)

-{

-    uint32_t s, m;

-

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_mask_lo, xmm_mask_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = *ps++;

-	m = *pm++;

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (unpack_32_1x128 (s), unpack_32_1x128 (m)));

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	xmm_src_hi = load_128_unaligned ((__m128i*)ps);

-	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);

-

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,

-			    &xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	pm += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	s = *ps++;

-	m = *pm++;

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (unpack_32_1x128 (s), unpack_32_1x128 (m)));

-	w--;

-    }

-}

-

-static force_inline uint32_t

-core_combine_over_ca_pixel_sse2 (uint32_t src,

-                                 uint32_t mask,

-                                 uint32_t dst)

-{

-    __m128i s = unpack_32_1x128 (src);

-    __m128i expAlpha = expand_alpha_1x128 (s);

-    __m128i unpk_mask = unpack_32_1x128 (mask);

-    __m128i unpk_dst  = unpack_32_1x128 (dst);

-

-    return pack_1x128_32 (in_over_1x128 (&s, &expAlpha, &unpk_mask, &unpk_dst));

-}

-

-static void

-sse2_combine_over_ca (pixman_implementation_t *imp,

-                      pixman_op_t              op,

-                      uint32_t *               pd,

-                      const uint32_t *         ps,

-                      const uint32_t *         pm,

-                      int                      w)

-{

-    uint32_t s, m, d;

-

-    __m128i xmm_alpha_lo, xmm_alpha_hi;

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_mask_lo, xmm_mask_hi;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = core_combine_over_ca_pixel_sse2 (s, m, d);

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	xmm_dst_hi = load_128_aligned ((__m128i*)pd);

-	xmm_src_hi = load_128_unaligned ((__m128i*)ps);

-	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);

-

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi);

-

-	in_over_2x128 (&xmm_src_lo, &xmm_src_hi,

-		       &xmm_alpha_lo, &xmm_alpha_hi,

-		       &xmm_mask_lo, &xmm_mask_hi,

-		       &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	pm += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = core_combine_over_ca_pixel_sse2 (s, m, d);

-	w--;

-    }

-}

-

-static force_inline uint32_t

-core_combine_over_reverse_ca_pixel_sse2 (uint32_t src,

-                                         uint32_t mask,

-                                         uint32_t dst)

-{

-    __m128i d = unpack_32_1x128 (dst);

-

-    return pack_1x128_32 (

-	over_1x128 (d, expand_alpha_1x128 (d),

-		    pix_multiply_1x128 (unpack_32_1x128 (src),

-					unpack_32_1x128 (mask))));

-}

-

-static void

-sse2_combine_over_reverse_ca (pixman_implementation_t *imp,

-                              pixman_op_t              op,

-                              uint32_t *               pd,

-                              const uint32_t *         ps,

-                              const uint32_t *         pm,

-                              int                      w)

-{

-    uint32_t s, m, d;

-

-    __m128i xmm_alpha_lo, xmm_alpha_hi;

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_mask_lo, xmm_mask_hi;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = core_combine_over_reverse_ca_pixel_sse2 (s, m, d);

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	xmm_dst_hi = load_128_aligned ((__m128i*)pd);

-	xmm_src_hi = load_128_unaligned ((__m128i*)ps);

-	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);

-

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi);

-	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,

-			    &xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_mask_lo, &xmm_mask_hi);

-

-	over_2x128 (&xmm_dst_lo, &xmm_dst_hi,

-		    &xmm_alpha_lo, &xmm_alpha_hi,

-		    &xmm_mask_lo, &xmm_mask_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_mask_lo, xmm_mask_hi));

-

-	ps += 4;

-	pd += 4;

-	pm += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = core_combine_over_reverse_ca_pixel_sse2 (s, m, d);

-	w--;

-    }

-}

-

-static void

-sse2_combine_in_ca (pixman_implementation_t *imp,

-                    pixman_op_t              op,

-                    uint32_t *               pd,

-                    const uint32_t *         ps,

-                    const uint32_t *         pm,

-                    int                      w)

-{

-    uint32_t s, m, d;

-

-    __m128i xmm_alpha_lo, xmm_alpha_hi;

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_mask_lo, xmm_mask_hi;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (

-		pix_multiply_1x128 (unpack_32_1x128 (s), unpack_32_1x128 (m)),

-		expand_alpha_1x128 (unpack_32_1x128 (d))));

-

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	xmm_dst_hi = load_128_aligned ((__m128i*)pd);

-	xmm_src_hi = load_128_unaligned ((__m128i*)ps);

-	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);

-

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi);

-

-	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,

-			    &xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_dst_lo, &xmm_dst_hi);

-

-	pix_multiply_2x128 (&xmm_dst_lo, &xmm_dst_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi,

-			    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	pm += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (

-		pix_multiply_1x128 (

-		    unpack_32_1x128 (s), unpack_32_1x128 (m)),

-		expand_alpha_1x128 (unpack_32_1x128 (d))));

-

-	w--;

-    }

-}

-

-static void

-sse2_combine_in_reverse_ca (pixman_implementation_t *imp,

-                            pixman_op_t              op,

-                            uint32_t *               pd,

-                            const uint32_t *         ps,

-                            const uint32_t *         pm,

-                            int                      w)

-{

-    uint32_t s, m, d;

-

-    __m128i xmm_alpha_lo, xmm_alpha_hi;

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_mask_lo, xmm_mask_hi;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (

-		unpack_32_1x128 (d),

-		pix_multiply_1x128 (unpack_32_1x128 (m),

-				   expand_alpha_1x128 (unpack_32_1x128 (s)))));

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	xmm_dst_hi = load_128_aligned ((__m128i*)pd);

-	xmm_src_hi = load_128_unaligned ((__m128i*)ps);

-	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);

-

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi);

-	pix_multiply_2x128 (&xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi);

-

-	pix_multiply_2x128 (&xmm_dst_lo, &xmm_dst_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi,

-			    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	pm += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (

-		unpack_32_1x128 (d),

-		pix_multiply_1x128 (unpack_32_1x128 (m),

-				   expand_alpha_1x128 (unpack_32_1x128 (s)))));

-	w--;

-    }

-}

-

-static void

-sse2_combine_out_ca (pixman_implementation_t *imp,

-                     pixman_op_t              op,

-                     uint32_t *               pd,

-                     const uint32_t *         ps,

-                     const uint32_t *         pm,

-                     int                      w)

-{

-    uint32_t s, m, d;

-

-    __m128i xmm_alpha_lo, xmm_alpha_hi;

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_mask_lo, xmm_mask_hi;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (

-		pix_multiply_1x128 (

-		    unpack_32_1x128 (s), unpack_32_1x128 (m)),

-		negate_1x128 (expand_alpha_1x128 (unpack_32_1x128 (d)))));

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	xmm_dst_hi = load_128_aligned ((__m128i*)pd);

-	xmm_src_hi = load_128_unaligned ((__m128i*)ps);

-	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);

-

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi);

-	negate_2x128 (xmm_alpha_lo, xmm_alpha_hi,

-		      &xmm_alpha_lo, &xmm_alpha_hi);

-

-	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,

-			    &xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_dst_lo, &xmm_dst_hi);

-	pix_multiply_2x128 (&xmm_dst_lo, &xmm_dst_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi,

-			    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	pm += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (

-		pix_multiply_1x128 (

-		    unpack_32_1x128 (s), unpack_32_1x128 (m)),

-		negate_1x128 (expand_alpha_1x128 (unpack_32_1x128 (d)))));

-

-	w--;

-    }

-}

-

-static void

-sse2_combine_out_reverse_ca (pixman_implementation_t *imp,

-                             pixman_op_t              op,

-                             uint32_t *               pd,

-                             const uint32_t *         ps,

-                             const uint32_t *         pm,

-                             int                      w)

-{

-    uint32_t s, m, d;

-

-    __m128i xmm_alpha_lo, xmm_alpha_hi;

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_mask_lo, xmm_mask_hi;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (

-		unpack_32_1x128 (d),

-		negate_1x128 (pix_multiply_1x128 (

-				 unpack_32_1x128 (m),

-				 expand_alpha_1x128 (unpack_32_1x128 (s))))));

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	xmm_dst_hi = load_128_aligned ((__m128i*)pd);

-	xmm_src_hi = load_128_unaligned ((__m128i*)ps);

-	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);

-

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi);

-

-	pix_multiply_2x128 (&xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_alpha_lo, &xmm_alpha_hi,

-			    &xmm_mask_lo, &xmm_mask_hi);

-

-	negate_2x128 (xmm_mask_lo, xmm_mask_hi,

-		      &xmm_mask_lo, &xmm_mask_hi);

-

-	pix_multiply_2x128 (&xmm_dst_lo, &xmm_dst_hi,

-			    &xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	pm += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    pix_multiply_1x128 (

-		unpack_32_1x128 (d),

-		negate_1x128 (pix_multiply_1x128 (

-				 unpack_32_1x128 (m),

-				 expand_alpha_1x128 (unpack_32_1x128 (s))))));

-	w--;

-    }

-}

-

-static force_inline uint32_t

-core_combine_atop_ca_pixel_sse2 (uint32_t src,

-                                 uint32_t mask,

-                                 uint32_t dst)

-{

-    __m128i m = unpack_32_1x128 (mask);

-    __m128i s = unpack_32_1x128 (src);

-    __m128i d = unpack_32_1x128 (dst);

-    __m128i sa = expand_alpha_1x128 (s);

-    __m128i da = expand_alpha_1x128 (d);

-

-    s = pix_multiply_1x128 (s, m);

-    m = negate_1x128 (pix_multiply_1x128 (m, sa));

-

-    return pack_1x128_32 (pix_add_multiply_1x128 (&d, &m, &s, &da));

-}

-

-static void

-sse2_combine_atop_ca (pixman_implementation_t *imp,

-                      pixman_op_t              op,

-                      uint32_t *               pd,

-                      const uint32_t *         ps,

-                      const uint32_t *         pm,

-                      int                      w)

-{

-    uint32_t s, m, d;

-

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_alpha_src_lo, xmm_alpha_src_hi;

-    __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi;

-    __m128i xmm_mask_lo, xmm_mask_hi;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = core_combine_atop_ca_pixel_sse2 (s, m, d);

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	xmm_dst_hi = load_128_aligned ((__m128i*)pd);

-	xmm_src_hi = load_128_unaligned ((__m128i*)ps);

-	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);

-

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-			    &xmm_alpha_src_lo, &xmm_alpha_src_hi);

-	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,

-			    &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);

-

-	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,

-			    &xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_src_lo, &xmm_src_hi);

-	pix_multiply_2x128 (&xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_alpha_src_lo, &xmm_alpha_src_hi,

-			    &xmm_mask_lo, &xmm_mask_hi);

-

-	negate_2x128 (xmm_mask_lo, xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-	pix_add_multiply_2x128 (

-	    &xmm_dst_lo, &xmm_dst_hi, &xmm_mask_lo, &xmm_mask_hi,

-	    &xmm_src_lo, &xmm_src_hi, &xmm_alpha_dst_lo, &xmm_alpha_dst_hi,

-	    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	pm += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = core_combine_atop_ca_pixel_sse2 (s, m, d);

-	w--;

-    }

-}

-

-static force_inline uint32_t

-core_combine_reverse_atop_ca_pixel_sse2 (uint32_t src,

-                                         uint32_t mask,

-                                         uint32_t dst)

-{

-    __m128i m = unpack_32_1x128 (mask);

-    __m128i s = unpack_32_1x128 (src);

-    __m128i d = unpack_32_1x128 (dst);

-

-    __m128i da = negate_1x128 (expand_alpha_1x128 (d));

-    __m128i sa = expand_alpha_1x128 (s);

-

-    s = pix_multiply_1x128 (s, m);

-    m = pix_multiply_1x128 (m, sa);

-

-    return pack_1x128_32 (pix_add_multiply_1x128 (&d, &m, &s, &da));

-}

-

-static void

-sse2_combine_atop_reverse_ca (pixman_implementation_t *imp,

-                              pixman_op_t              op,

-                              uint32_t *               pd,

-                              const uint32_t *         ps,

-                              const uint32_t *         pm,

-                              int                      w)

-{

-    uint32_t s, m, d;

-

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_alpha_src_lo, xmm_alpha_src_hi;

-    __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi;

-    __m128i xmm_mask_lo, xmm_mask_hi;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = core_combine_reverse_atop_ca_pixel_sse2 (s, m, d);

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	xmm_dst_hi = load_128_aligned ((__m128i*)pd);

-	xmm_src_hi = load_128_unaligned ((__m128i*)ps);

-	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);

-

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-			    &xmm_alpha_src_lo, &xmm_alpha_src_hi);

-	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,

-			    &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);

-

-	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,

-			    &xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_src_lo, &xmm_src_hi);

-	pix_multiply_2x128 (&xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_alpha_src_lo, &xmm_alpha_src_hi,

-			    &xmm_mask_lo, &xmm_mask_hi);

-

-	negate_2x128 (xmm_alpha_dst_lo, xmm_alpha_dst_hi,

-		      &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);

-

-	pix_add_multiply_2x128 (

-	    &xmm_dst_lo, &xmm_dst_hi, &xmm_mask_lo, &xmm_mask_hi,

-	    &xmm_src_lo, &xmm_src_hi, &xmm_alpha_dst_lo, &xmm_alpha_dst_hi,

-	    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	pm += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = core_combine_reverse_atop_ca_pixel_sse2 (s, m, d);

-	w--;

-    }

-}

-

-static force_inline uint32_t

-core_combine_xor_ca_pixel_sse2 (uint32_t src,

-                                uint32_t mask,

-                                uint32_t dst)

-{

-    __m128i a = unpack_32_1x128 (mask);

-    __m128i s = unpack_32_1x128 (src);

-    __m128i d = unpack_32_1x128 (dst);

-

-    __m128i alpha_dst = negate_1x128 (pix_multiply_1x128 (

-				       a, expand_alpha_1x128 (s)));

-    __m128i dest      = pix_multiply_1x128 (s, a);

-    __m128i alpha_src = negate_1x128 (expand_alpha_1x128 (d));

-

-    return pack_1x128_32 (pix_add_multiply_1x128 (&d,

-                                                &alpha_dst,

-                                                &dest,

-                                                &alpha_src));

-}

-

-static void

-sse2_combine_xor_ca (pixman_implementation_t *imp,

-                     pixman_op_t              op,

-                     uint32_t *               pd,

-                     const uint32_t *         ps,

-                     const uint32_t *         pm,

-                     int                      w)

-{

-    uint32_t s, m, d;

-

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_alpha_src_lo, xmm_alpha_src_hi;

-    __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi;

-    __m128i xmm_mask_lo, xmm_mask_hi;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = core_combine_xor_ca_pixel_sse2 (s, m, d);

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	xmm_dst_hi = load_128_aligned ((__m128i*)pd);

-	xmm_src_hi = load_128_unaligned ((__m128i*)ps);

-	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);

-

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-			    &xmm_alpha_src_lo, &xmm_alpha_src_hi);

-	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,

-			    &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);

-

-	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,

-			    &xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_src_lo, &xmm_src_hi);

-	pix_multiply_2x128 (&xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_alpha_src_lo, &xmm_alpha_src_hi,

-			    &xmm_mask_lo, &xmm_mask_hi);

-

-	negate_2x128 (xmm_alpha_dst_lo, xmm_alpha_dst_hi,

-		      &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);

-	negate_2x128 (xmm_mask_lo, xmm_mask_hi,

-		      &xmm_mask_lo, &xmm_mask_hi);

-

-	pix_add_multiply_2x128 (

-	    &xmm_dst_lo, &xmm_dst_hi, &xmm_mask_lo, &xmm_mask_hi,

-	    &xmm_src_lo, &xmm_src_hi, &xmm_alpha_dst_lo, &xmm_alpha_dst_hi,

-	    &xmm_dst_lo, &xmm_dst_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	ps += 4;

-	pd += 4;

-	pm += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = core_combine_xor_ca_pixel_sse2 (s, m, d);

-	w--;

-    }

-}

-

-static void

-sse2_combine_add_ca (pixman_implementation_t *imp,

-                     pixman_op_t              op,

-                     uint32_t *               pd,

-                     const uint32_t *         ps,

-                     const uint32_t *         pm,

-                     int                      w)

-{

-    uint32_t s, m, d;

-

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_mask_lo, xmm_mask_hi;

-

-    while (w && (unsigned long)pd & 15)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    _mm_adds_epu8 (pix_multiply_1x128 (unpack_32_1x128 (s),

-					       unpack_32_1x128 (m)),

-			   unpack_32_1x128 (d)));

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	xmm_src_hi = load_128_unaligned ((__m128i*)ps);

-	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);

-	xmm_dst_hi = load_128_aligned ((__m128i*)pd);

-

-	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-

-	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,

-			    &xmm_mask_lo, &xmm_mask_hi,

-			    &xmm_src_lo, &xmm_src_hi);

-

-	save_128_aligned (

-	    (__m128i*)pd, pack_2x128_128 (

-		_mm_adds_epu8 (xmm_src_lo, xmm_dst_lo),

-		_mm_adds_epu8 (xmm_src_hi, xmm_dst_hi)));

-

-	ps += 4;

-	pd += 4;

-	pm += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	s = *ps++;

-	m = *pm++;

-	d = *pd;

-

-	*pd++ = pack_1x128_32 (

-	    _mm_adds_epu8 (pix_multiply_1x128 (unpack_32_1x128 (s),

-					       unpack_32_1x128 (m)),

-			   unpack_32_1x128 (d)));

-	w--;

-    }

-}

-

-static force_inline __m128i

-create_mask_16_128 (uint16_t mask)

-{

-    return _mm_set1_epi16 (mask);

-}

-

-/* Work around a code generation bug in Sun Studio 12. */

-#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)

-# define create_mask_2x32_128(mask0, mask1)				\

-    (_mm_set_epi32 ((mask0), (mask1), (mask0), (mask1)))

-#else

-static force_inline __m128i

-create_mask_2x32_128 (uint32_t mask0,

-                      uint32_t mask1)

-{

-    return _mm_set_epi32 (mask0, mask1, mask0, mask1);

-}

-#endif

-

-static void

-sse2_composite_over_n_8888 (pixman_implementation_t *imp,

-                            pixman_op_t              op,

-                            pixman_image_t *         src_image,

-                            pixman_image_t *         mask_image,

-                            pixman_image_t *         dst_image,

-                            int32_t                  src_x,

-                            int32_t                  src_y,

-                            int32_t                  mask_x,

-                            int32_t                  mask_y,

-                            int32_t                  dest_x,

-                            int32_t                  dest_y,

-                            int32_t                  width,

-                            int32_t                  height)

-{

-    uint32_t src;

-    uint32_t    *dst_line, *dst, d;

-    int32_t w;

-    int dst_stride;

-    __m128i xmm_src, xmm_alpha;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-

-    if (src == 0)

-	return;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-

-    xmm_src = expand_pixel_32_1x128 (src);

-    xmm_alpha = expand_alpha_1x128 (xmm_src);

-

-    while (height--)

-    {

-	dst = dst_line;

-

-	dst_line += dst_stride;

-	w = width;

-

-	while (w && (unsigned long)dst & 15)

-	{

-	    d = *dst;

-	    *dst++ = pack_1x128_32 (over_1x128 (xmm_src,

-						xmm_alpha,

-						unpack_32_1x128 (d)));

-	    w--;

-	}

-

-	while (w >= 4)

-	{

-	    xmm_dst = load_128_aligned ((__m128i*)dst);

-

-	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-

-	    over_2x128 (&xmm_src, &xmm_src,

-			&xmm_alpha, &xmm_alpha,

-			&xmm_dst_lo, &xmm_dst_hi);

-

-	    /* rebuid the 4 pixel data and save*/

-	    save_128_aligned (

-		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	    w -= 4;

-	    dst += 4;

-	}

-

-	while (w)

-	{

-	    d = *dst;

-	    *dst++ = pack_1x128_32 (over_1x128 (xmm_src,

-						xmm_alpha,

-						unpack_32_1x128 (d)));

-	    w--;

-	}

-

-    }

-}

-

-static void

-sse2_composite_over_n_0565 (pixman_implementation_t *imp,

-                            pixman_op_t              op,

-                            pixman_image_t *         src_image,

-                            pixman_image_t *         mask_image,

-                            pixman_image_t *         dst_image,

-                            int32_t                  src_x,

-                            int32_t                  src_y,

-                            int32_t                  mask_x,

-                            int32_t                  mask_y,

-                            int32_t                  dest_x,

-                            int32_t                  dest_y,

-                            int32_t                  width,

-                            int32_t                  height)

-{

-    uint32_t src;

-    uint16_t    *dst_line, *dst, d;

-    int32_t w;

-    int dst_stride;

-    __m128i xmm_src, xmm_alpha;

-    __m128i xmm_dst, xmm_dst0, xmm_dst1, xmm_dst2, xmm_dst3;

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-

-    if (src == 0)

-	return;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);

-

-    xmm_src = expand_pixel_32_1x128 (src);

-    xmm_alpha = expand_alpha_1x128 (xmm_src);

-

-    while (height--)

-    {

-	dst = dst_line;

-

-	dst_line += dst_stride;

-	w = width;

-

-	while (w && (unsigned long)dst & 15)

-	{

-	    d = *dst;

-

-	    *dst++ = pack_565_32_16 (

-		pack_1x128_32 (over_1x128 (xmm_src,

-					   xmm_alpha,

-					   expand565_16_1x128 (d))));

-	    w--;

-	}

-

-	while (w >= 8)

-	{

-	    xmm_dst = load_128_aligned ((__m128i*)dst);

-

-	    unpack_565_128_4x128 (xmm_dst,

-				  &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3);

-

-	    over_2x128 (&xmm_src, &xmm_src,

-			&xmm_alpha, &xmm_alpha,

-			&xmm_dst0, &xmm_dst1);

-	    over_2x128 (&xmm_src, &xmm_src,

-			&xmm_alpha, &xmm_alpha,

-			&xmm_dst2, &xmm_dst3);

-

-	    xmm_dst = pack_565_4x128_128 (

-		&xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3);

-

-	    save_128_aligned ((__m128i*)dst, xmm_dst);

-

-	    dst += 8;

-	    w -= 8;

-	}

-

-	while (w--)

-	{

-	    d = *dst;

-	    *dst++ = pack_565_32_16 (

-		pack_1x128_32 (over_1x128 (xmm_src, xmm_alpha,

-					   expand565_16_1x128 (d))));

-	}

-    }

-

-}

-

-static void

-sse2_composite_add_n_8888_8888_ca (pixman_implementation_t *imp,

-				   pixman_op_t              op,

-				   pixman_image_t *         src_image,

-				   pixman_image_t *         mask_image,

-				   pixman_image_t *         dst_image,

-				   int32_t                  src_x,

-				   int32_t                  src_y,

-				   int32_t                  mask_x,

-				   int32_t                  mask_y,

-				   int32_t                  dest_x,

-				   int32_t                  dest_y,

-				   int32_t                  width,

-				   int32_t                  height)

-{

-    uint32_t src, srca;

-    uint32_t    *dst_line, d;

-    uint32_t    *mask_line, m;

-    uint32_t pack_cmp;

-    int dst_stride, mask_stride;

-

-    __m128i xmm_src, xmm_alpha;

-    __m128i xmm_dst;

-    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;

-

-    __m128i mmx_src, mmx_alpha, mmx_mask, mmx_dest;

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-    srca = src >> 24;

-

-    if (src == 0)

-	return;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);

-

-    xmm_src = _mm_unpacklo_epi8 (

-	create_mask_2x32_128 (src, src), _mm_setzero_si128 ());

-    xmm_alpha = expand_alpha_1x128 (xmm_src);

-    mmx_src   = xmm_src;

-    mmx_alpha = xmm_alpha;

-

-    while (height--)

-    {

-	int w = width;

-	const uint32_t *pm = (uint32_t *)mask_line;

-	uint32_t *pd = (uint32_t *)dst_line;

-

-	dst_line += dst_stride;

-	mask_line += mask_stride;

-

-	while (w && (unsigned long)pd & 15)

-	{

-	    m = *pm++;

-

-	    if (m)

-	    {

-		d = *pd;

-

-		mmx_mask = unpack_32_1x128 (m);

-		mmx_dest = unpack_32_1x128 (d);

-

-		*pd = pack_1x128_32 (

-		    _mm_adds_epu8 (pix_multiply_1x128 (mmx_mask, mmx_src),

-				   mmx_dest));

-	    }

-

-	    pd++;

-	    w--;

-	}

-

-	while (w >= 4)

-	{

-	    xmm_mask = load_128_unaligned ((__m128i*)pm);

-

-	    pack_cmp =

-		_mm_movemask_epi8 (

-		    _mm_cmpeq_epi32 (xmm_mask, _mm_setzero_si128 ()));

-

-	    /* if all bits in mask are zero, pack_cmp are equal to 0xffff */

-	    if (pack_cmp != 0xffff)

-	    {

-		xmm_dst = load_128_aligned ((__m128i*)pd);

-

-		unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-

-		pix_multiply_2x128 (&xmm_src, &xmm_src,

-				    &xmm_mask_lo, &xmm_mask_hi,

-				    &xmm_mask_lo, &xmm_mask_hi);

-		xmm_mask_hi = pack_2x128_128 (xmm_mask_lo, xmm_mask_hi);

-

-		save_128_aligned (

-		    (__m128i*)pd, _mm_adds_epu8 (xmm_mask_hi, xmm_dst));

-	    }

-

-	    pd += 4;

-	    pm += 4;

-	    w -= 4;

-	}

-

-	while (w)

-	{

-	    m = *pm++;

-

-	    if (m)

-	    {

-		d = *pd;

-

-		mmx_mask = unpack_32_1x128 (m);

-		mmx_dest = unpack_32_1x128 (d);

-

-		*pd = pack_1x128_32 (

-		    _mm_adds_epu8 (pix_multiply_1x128 (mmx_mask, mmx_src),

-				   mmx_dest));

-	    }

-

-	    pd++;

-	    w--;

-	}

-    }

-

-}

-

-static void

-sse2_composite_over_n_8888_8888_ca (pixman_implementation_t *imp,

-                                    pixman_op_t              op,

-                                    pixman_image_t *         src_image,

-                                    pixman_image_t *         mask_image,

-                                    pixman_image_t *         dst_image,

-                                    int32_t                  src_x,

-                                    int32_t                  src_y,

-                                    int32_t                  mask_x,

-                                    int32_t                  mask_y,

-                                    int32_t                  dest_x,

-                                    int32_t                  dest_y,

-                                    int32_t                  width,

-                                    int32_t                  height)

-{

-    uint32_t src;

-    uint32_t    *dst_line, d;

-    uint32_t    *mask_line, m;

-    uint32_t pack_cmp;

-    int dst_stride, mask_stride;

-

-    __m128i xmm_src, xmm_alpha;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;

-

-    __m128i mmx_src, mmx_alpha, mmx_mask, mmx_dest;

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-

-    if (src == 0)

-	return;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);

-

-    xmm_src = _mm_unpacklo_epi8 (

-	create_mask_2x32_128 (src, src), _mm_setzero_si128 ());

-    xmm_alpha = expand_alpha_1x128 (xmm_src);

-    mmx_src   = xmm_src;

-    mmx_alpha = xmm_alpha;

-

-    while (height--)

-    {

-	int w = width;

-	const uint32_t *pm = (uint32_t *)mask_line;

-	uint32_t *pd = (uint32_t *)dst_line;

-

-	dst_line += dst_stride;

-	mask_line += mask_stride;

-

-	while (w && (unsigned long)pd & 15)

-	{

-	    m = *pm++;

-

-	    if (m)

-	    {

-		d = *pd;

-		mmx_mask = unpack_32_1x128 (m);

-		mmx_dest = unpack_32_1x128 (d);

-

-		*pd = pack_1x128_32 (in_over_1x128 (&mmx_src,

-		                                  &mmx_alpha,

-		                                  &mmx_mask,

-		                                  &mmx_dest));

-	    }

-

-	    pd++;

-	    w--;

-	}

-

-	while (w >= 4)

-	{

-	    xmm_mask = load_128_unaligned ((__m128i*)pm);

-

-	    pack_cmp =

-		_mm_movemask_epi8 (

-		    _mm_cmpeq_epi32 (xmm_mask, _mm_setzero_si128 ()));

-

-	    /* if all bits in mask are zero, pack_cmp are equal to 0xffff */

-	    if (pack_cmp != 0xffff)

-	    {

-		xmm_dst = load_128_aligned ((__m128i*)pd);

-

-		unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-		unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-

-		in_over_2x128 (&xmm_src, &xmm_src,

-			       &xmm_alpha, &xmm_alpha,

-			       &xmm_mask_lo, &xmm_mask_hi,

-			       &xmm_dst_lo, &xmm_dst_hi);

-

-		save_128_aligned (

-		    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-	    }

-

-	    pd += 4;

-	    pm += 4;

-	    w -= 4;

-	}

-

-	while (w)

-	{

-	    m = *pm++;

-

-	    if (m)

-	    {

-		d = *pd;

-		mmx_mask = unpack_32_1x128 (m);

-		mmx_dest = unpack_32_1x128 (d);

-

-		*pd = pack_1x128_32 (

-		    in_over_1x128 (&mmx_src, &mmx_alpha, &mmx_mask, &mmx_dest));

-	    }

-

-	    pd++;

-	    w--;

-	}

-    }

-

-}

-

-static void

-sse2_composite_over_8888_n_8888 (pixman_implementation_t *imp,

-                                 pixman_op_t              op,

-                                 pixman_image_t *         src_image,

-                                 pixman_image_t *         mask_image,

-                                 pixman_image_t *         dst_image,

-                                 int32_t                  src_x,

-                                 int32_t                  src_y,

-                                 int32_t                  mask_x,

-                                 int32_t                  mask_y,

-                                 int32_t                  dest_x,

-                                 int32_t                  dest_y,

-                                 int32_t                  width,

-                                 int32_t                  height)

-{

-    uint32_t    *dst_line, *dst;

-    uint32_t    *src_line, *src;

-    uint32_t mask;

-    int32_t w;

-    int dst_stride, src_stride;

-

-    __m128i xmm_mask;

-    __m128i xmm_src, xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_alpha_lo, xmm_alpha_hi;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);

-

-    mask = _pixman_image_get_solid (imp, mask_image, PIXMAN_a8r8g8b8);

-

-    xmm_mask = create_mask_16_128 (mask >> 24);

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	src = src_line;

-	src_line += src_stride;

-	w = width;

-

-	while (w && (unsigned long)dst & 15)

-	{

-	    uint32_t s = *src++;

-

-	    if (s)

-	    {

-		uint32_t d = *dst;

-		

-		__m128i ms = unpack_32_1x128 (s);

-		__m128i alpha    = expand_alpha_1x128 (ms);

-		__m128i dest     = xmm_mask;

-		__m128i alpha_dst = unpack_32_1x128 (d);

-		

-		*dst = pack_1x128_32 (

-		    in_over_1x128 (&ms, &alpha, &dest, &alpha_dst));

-	    }

-	    dst++;

-	    w--;

-	}

-

-	while (w >= 4)

-	{

-	    xmm_src = load_128_unaligned ((__m128i*)src);

-

-	    if (!is_zero (xmm_src))

-	    {

-		xmm_dst = load_128_aligned ((__m128i*)dst);

-		

-		unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);

-		unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-		expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-				    &xmm_alpha_lo, &xmm_alpha_hi);

-		

-		in_over_2x128 (&xmm_src_lo, &xmm_src_hi,

-			       &xmm_alpha_lo, &xmm_alpha_hi,

-			       &xmm_mask, &xmm_mask,

-			       &xmm_dst_lo, &xmm_dst_hi);

-		

-		save_128_aligned (

-		    (__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-	    }

-		

-	    dst += 4;

-	    src += 4;

-	    w -= 4;

-	}

-

-	while (w)

-	{

-	    uint32_t s = *src++;

-

-	    if (s)

-	    {

-		uint32_t d = *dst;

-		

-		__m128i ms = unpack_32_1x128 (s);

-		__m128i alpha = expand_alpha_1x128 (ms);

-		__m128i mask  = xmm_mask;

-		__m128i dest  = unpack_32_1x128 (d);

-		

-		*dst = pack_1x128_32 (

-		    in_over_1x128 (&ms, &alpha, &mask, &dest));

-	    }

-

-	    dst++;

-	    w--;

-	}

-    }

-

-}

-

-static void

-sse2_composite_src_x888_8888 (pixman_implementation_t *imp,

-			      pixman_op_t              op,

-			      pixman_image_t *         src_image,

-			      pixman_image_t *         mask_image,

-			      pixman_image_t *         dst_image,

-			      int32_t                  src_x,

-			      int32_t                  src_y,

-			      int32_t                  mask_x,

-			      int32_t                  mask_y,

-			      int32_t                  dest_x,

-			      int32_t                  dest_y,

-			      int32_t                  width,

-			      int32_t                  height)

-{

-    uint32_t    *dst_line, *dst;

-    uint32_t    *src_line, *src;

-    int32_t w;

-    int dst_stride, src_stride;

-

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	src = src_line;

-	src_line += src_stride;

-	w = width;

-

-	while (w && (unsigned long)dst & 15)

-	{

-	    *dst++ = *src++ | 0xff000000;

-	    w--;

-	}

-

-	while (w >= 16)

-	{

-	    __m128i xmm_src1, xmm_src2, xmm_src3, xmm_src4;

-	    

-	    xmm_src1 = load_128_unaligned ((__m128i*)src + 0);

-	    xmm_src2 = load_128_unaligned ((__m128i*)src + 1);

-	    xmm_src3 = load_128_unaligned ((__m128i*)src + 2);

-	    xmm_src4 = load_128_unaligned ((__m128i*)src + 3);

-	    

-	    save_128_aligned ((__m128i*)dst + 0, _mm_or_si128 (xmm_src1, mask_ff000000));

-	    save_128_aligned ((__m128i*)dst + 1, _mm_or_si128 (xmm_src2, mask_ff000000));

-	    save_128_aligned ((__m128i*)dst + 2, _mm_or_si128 (xmm_src3, mask_ff000000));

-	    save_128_aligned ((__m128i*)dst + 3, _mm_or_si128 (xmm_src4, mask_ff000000));

-	    

-	    dst += 16;

-	    src += 16;

-	    w -= 16;

-	}

-

-	while (w)

-	{

-	    *dst++ = *src++ | 0xff000000;

-	    w--;

-	}

-    }

-

-}

-

-static void

-sse2_composite_over_x888_n_8888 (pixman_implementation_t *imp,

-                                 pixman_op_t              op,

-                                 pixman_image_t *         src_image,

-                                 pixman_image_t *         mask_image,

-                                 pixman_image_t *         dst_image,

-                                 int32_t                  src_x,

-                                 int32_t                  src_y,

-                                 int32_t                  mask_x,

-                                 int32_t                  mask_y,

-                                 int32_t                  dest_x,

-                                 int32_t                  dest_y,

-                                 int32_t                  width,

-                                 int32_t                  height)

-{

-    uint32_t    *dst_line, *dst;

-    uint32_t    *src_line, *src;

-    uint32_t mask;

-    int dst_stride, src_stride;

-    int32_t w;

-

-    __m128i xmm_mask, xmm_alpha;

-    __m128i xmm_src, xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);

-

-    mask = _pixman_image_get_solid (imp, mask_image, PIXMAN_a8r8g8b8);

-

-    xmm_mask = create_mask_16_128 (mask >> 24);

-    xmm_alpha = mask_00ff;

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	src = src_line;

-	src_line += src_stride;

-	w = width;

-

-	while (w && (unsigned long)dst & 15)

-	{

-	    uint32_t s = (*src++) | 0xff000000;

-	    uint32_t d = *dst;

-

-	    __m128i src   = unpack_32_1x128 (s);

-	    __m128i alpha = xmm_alpha;

-	    __m128i mask  = xmm_mask;

-	    __m128i dest  = unpack_32_1x128 (d);

-

-	    *dst++ = pack_1x128_32 (

-		in_over_1x128 (&src, &alpha, &mask, &dest));

-

-	    w--;

-	}

-

-	while (w >= 4)

-	{

-	    xmm_src = _mm_or_si128 (

-		load_128_unaligned ((__m128i*)src), mask_ff000000);

-	    xmm_dst = load_128_aligned ((__m128i*)dst);

-

-	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);

-	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-

-	    in_over_2x128 (&xmm_src_lo, &xmm_src_hi,

-			   &xmm_alpha, &xmm_alpha,

-			   &xmm_mask, &xmm_mask,

-			   &xmm_dst_lo, &xmm_dst_hi);

-

-	    save_128_aligned (

-		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	    dst += 4;

-	    src += 4;

-	    w -= 4;

-

-	}

-

-	while (w)

-	{

-	    uint32_t s = (*src++) | 0xff000000;

-	    uint32_t d = *dst;

-

-	    __m128i src  = unpack_32_1x128 (s);

-	    __m128i alpha = xmm_alpha;

-	    __m128i mask  = xmm_mask;

-	    __m128i dest  = unpack_32_1x128 (d);

-

-	    *dst++ = pack_1x128_32 (

-		in_over_1x128 (&src, &alpha, &mask, &dest));

-

-	    w--;

-	}

-    }

-

-}

-

-static void

-sse2_composite_over_8888_8888 (pixman_implementation_t *imp,

-                               pixman_op_t              op,

-                               pixman_image_t *         src_image,

-                               pixman_image_t *         mask_image,

-                               pixman_image_t *         dst_image,

-                               int32_t                  src_x,

-                               int32_t                  src_y,

-                               int32_t                  mask_x,

-                               int32_t                  mask_y,

-                               int32_t                  dest_x,

-                               int32_t                  dest_y,

-                               int32_t                  width,

-                               int32_t                  height)

-{

-    int dst_stride, src_stride;

-    uint32_t    *dst_line, *dst;

-    uint32_t    *src_line, *src;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);

-

-    dst = dst_line;

-    src = src_line;

-

-    while (height--)

-    {

-	sse2_combine_over_u (imp, op, dst, src, NULL, width);

-

-	dst += dst_stride;

-	src += src_stride;

-    }

-}

-

-static force_inline uint16_t

-composite_over_8888_0565pixel (uint32_t src, uint16_t dst)

-{

-    __m128i ms;

-

-    ms = unpack_32_1x128 (src);

-    return pack_565_32_16 (

-	pack_1x128_32 (

-	    over_1x128 (

-		ms, expand_alpha_1x128 (ms), expand565_16_1x128 (dst))));

-}

-

-static void

-sse2_composite_over_8888_0565 (pixman_implementation_t *imp,

-                               pixman_op_t              op,

-                               pixman_image_t *         src_image,

-                               pixman_image_t *         mask_image,

-                               pixman_image_t *         dst_image,

-                               int32_t                  src_x,

-                               int32_t                  src_y,

-                               int32_t                  mask_x,

-                               int32_t                  mask_y,

-                               int32_t                  dest_x,

-                               int32_t                  dest_y,

-                               int32_t                  width,

-                               int32_t                  height)

-{

-    uint16_t    *dst_line, *dst, d;

-    uint32_t    *src_line, *src, s;

-    int dst_stride, src_stride;

-    int32_t w;

-

-    __m128i xmm_alpha_lo, xmm_alpha_hi;

-    __m128i xmm_src, xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst, xmm_dst0, xmm_dst1, xmm_dst2, xmm_dst3;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);

-

-    while (height--)

-    {

-	dst = dst_line;

-	src = src_line;

-

-	dst_line += dst_stride;

-	src_line += src_stride;

-	w = width;

-

-	/* Align dst on a 16-byte boundary */

-	while (w &&

-	       ((unsigned long)dst & 15))

-	{

-	    s = *src++;

-	    d = *dst;

-

-	    *dst++ = composite_over_8888_0565pixel (s, d);

-	    w--;

-	}

-

-	/* It's a 8 pixel loop */

-	while (w >= 8)

-	{

-	    /* I'm loading unaligned because I'm not sure

-	     * about the address alignment.

-	     */

-	    xmm_src = load_128_unaligned ((__m128i*) src);

-	    xmm_dst = load_128_aligned ((__m128i*) dst);

-

-	    /* Unpacking */

-	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);

-	    unpack_565_128_4x128 (xmm_dst,

-				  &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3);

-	    expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-				&xmm_alpha_lo, &xmm_alpha_hi);

-

-	    /* I'm loading next 4 pixels from memory

-	     * before to optimze the memory read.

-	     */

-	    xmm_src = load_128_unaligned ((__m128i*) (src + 4));

-

-	    over_2x128 (&xmm_src_lo, &xmm_src_hi,

-			&xmm_alpha_lo, &xmm_alpha_hi,

-			&xmm_dst0, &xmm_dst1);

-

-	    /* Unpacking */

-	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);

-	    expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-				&xmm_alpha_lo, &xmm_alpha_hi);

-

-	    over_2x128 (&xmm_src_lo, &xmm_src_hi,

-			&xmm_alpha_lo, &xmm_alpha_hi,

-			&xmm_dst2, &xmm_dst3);

-

-	    save_128_aligned (

-		(__m128i*)dst, pack_565_4x128_128 (

-		    &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3));

-

-	    w -= 8;

-	    dst += 8;

-	    src += 8;

-	}

-

-	while (w--)

-	{

-	    s = *src++;

-	    d = *dst;

-

-	    *dst++ = composite_over_8888_0565pixel (s, d);

-	}

-    }

-

-}

-

-static void

-sse2_composite_over_n_8_8888 (pixman_implementation_t *imp,

-                              pixman_op_t              op,

-                              pixman_image_t *         src_image,

-                              pixman_image_t *         mask_image,

-                              pixman_image_t *         dst_image,

-                              int32_t                  src_x,

-                              int32_t                  src_y,

-                              int32_t                  mask_x,

-                              int32_t                  mask_y,

-                              int32_t                  dest_x,

-                              int32_t                  dest_y,

-                              int32_t                  width,

-                              int32_t                  height)

-{

-    uint32_t src, srca;

-    uint32_t *dst_line, *dst;

-    uint8_t *mask_line, *mask;

-    int dst_stride, mask_stride;

-    int32_t w;

-    uint32_t m, d;

-

-    __m128i xmm_src, xmm_alpha, xmm_def;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;

-

-    __m128i mmx_src, mmx_alpha, mmx_mask, mmx_dest;

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-

-    srca = src >> 24;

-    if (src == 0)

-	return;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);

-

-    xmm_def = create_mask_2x32_128 (src, src);

-    xmm_src = expand_pixel_32_1x128 (src);

-    xmm_alpha = expand_alpha_1x128 (xmm_src);

-    mmx_src   = xmm_src;

-    mmx_alpha = xmm_alpha;

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	mask = mask_line;

-	mask_line += mask_stride;

-	w = width;

-

-	while (w && (unsigned long)dst & 15)

-	{

-	    uint8_t m = *mask++;

-

-	    if (m)

-	    {

-		d = *dst;

-		mmx_mask = expand_pixel_8_1x128 (m);

-		mmx_dest = unpack_32_1x128 (d);

-

-		*dst = pack_1x128_32 (in_over_1x128 (&mmx_src,

-		                                   &mmx_alpha,

-		                                   &mmx_mask,

-		                                   &mmx_dest));

-	    }

-

-	    w--;

-	    dst++;

-	}

-

-	while (w >= 4)

-	{

-	    m = *((uint32_t*)mask);

-

-	    if (srca == 0xff && m == 0xffffffff)

-	    {

-		save_128_aligned ((__m128i*)dst, xmm_def);

-	    }

-	    else if (m)

-	    {

-		xmm_dst = load_128_aligned ((__m128i*) dst);

-		xmm_mask = unpack_32_1x128 (m);

-		xmm_mask = _mm_unpacklo_epi8 (xmm_mask, _mm_setzero_si128 ());

-

-		/* Unpacking */

-		unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-		unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-

-		expand_alpha_rev_2x128 (xmm_mask_lo, xmm_mask_hi,

-					&xmm_mask_lo, &xmm_mask_hi);

-

-		in_over_2x128 (&xmm_src, &xmm_src,

-			       &xmm_alpha, &xmm_alpha,

-			       &xmm_mask_lo, &xmm_mask_hi,

-			       &xmm_dst_lo, &xmm_dst_hi);

-

-		save_128_aligned (

-		    (__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-	    }

-

-	    w -= 4;

-	    dst += 4;

-	    mask += 4;

-	}

-

-	while (w)

-	{

-	    uint8_t m = *mask++;

-

-	    if (m)

-	    {

-		d = *dst;

-		mmx_mask = expand_pixel_8_1x128 (m);

-		mmx_dest = unpack_32_1x128 (d);

-

-		*dst = pack_1x128_32 (in_over_1x128 (&mmx_src,

-		                                   &mmx_alpha,

-		                                   &mmx_mask,

-		                                   &mmx_dest));

-	    }

-

-	    w--;

-	    dst++;

-	}

-    }

-

-}

-

-static pixman_bool_t

-pixman_fill_sse2 (uint32_t *bits,

-                  int       stride,

-                  int       bpp,

-                  int       x,

-                  int       y,

-                  int       width,

-                  int       height,

-                  uint32_t  data)

-{

-    uint32_t byte_width;

-    uint8_t         *byte_line;

-

-    __m128i xmm_def;

-

-    if (bpp == 8)

-    {

-	uint8_t b;

-	uint16_t w;

-

-	stride = stride * (int) sizeof (uint32_t) / 1;

-	byte_line = (uint8_t *)(((uint8_t *)bits) + stride * y + x);

-	byte_width = width;

-	stride *= 1;

-

-	b = data & 0xff;

-	w = (b << 8) | b;

-	data = (w << 16) | w;

-    }

-    else if (bpp == 16)

-    {

-	stride = stride * (int) sizeof (uint32_t) / 2;

-	byte_line = (uint8_t *)(((uint16_t *)bits) + stride * y + x);

-	byte_width = 2 * width;

-	stride *= 2;

-

-        data = (data & 0xffff) * 0x00010001;

-    }

-    else if (bpp == 32)

-    {

-	stride = stride * (int) sizeof (uint32_t) / 4;

-	byte_line = (uint8_t *)(((uint32_t *)bits) + stride * y + x);

-	byte_width = 4 * width;

-	stride *= 4;

-    }

-    else

-    {

-	return FALSE;

-    }

-

-    xmm_def = create_mask_2x32_128 (data, data);

-

-    while (height--)

-    {

-	int w;

-	uint8_t *d = byte_line;

-	byte_line += stride;

-	w = byte_width;

-

-	while (w >= 1 && ((unsigned long)d & 1))

-	{

-	    *(uint8_t *)d = data;

-	    w -= 1;

-	    d += 1;

-	}

-

-	while (w >= 2 && ((unsigned long)d & 3))

-	{

-	    *(uint16_t *)d = data;

-	    w -= 2;

-	    d += 2;

-	}

-

-	while (w >= 4 && ((unsigned long)d & 15))

-	{

-	    *(uint32_t *)d = data;

-

-	    w -= 4;

-	    d += 4;

-	}

-

-	while (w >= 128)

-	{

-	    save_128_aligned ((__m128i*)(d),     xmm_def);

-	    save_128_aligned ((__m128i*)(d + 16),  xmm_def);

-	    save_128_aligned ((__m128i*)(d + 32),  xmm_def);

-	    save_128_aligned ((__m128i*)(d + 48),  xmm_def);

-	    save_128_aligned ((__m128i*)(d + 64),  xmm_def);

-	    save_128_aligned ((__m128i*)(d + 80),  xmm_def);

-	    save_128_aligned ((__m128i*)(d + 96),  xmm_def);

-	    save_128_aligned ((__m128i*)(d + 112), xmm_def);

-

-	    d += 128;

-	    w -= 128;

-	}

-

-	if (w >= 64)

-	{

-	    save_128_aligned ((__m128i*)(d),     xmm_def);

-	    save_128_aligned ((__m128i*)(d + 16),  xmm_def);

-	    save_128_aligned ((__m128i*)(d + 32),  xmm_def);

-	    save_128_aligned ((__m128i*)(d + 48),  xmm_def);

-

-	    d += 64;

-	    w -= 64;

-	}

-

-	if (w >= 32)

-	{

-	    save_128_aligned ((__m128i*)(d),     xmm_def);

-	    save_128_aligned ((__m128i*)(d + 16),  xmm_def);

-

-	    d += 32;

-	    w -= 32;

-	}

-

-	if (w >= 16)

-	{

-	    save_128_aligned ((__m128i*)(d),     xmm_def);

-

-	    d += 16;

-	    w -= 16;

-	}

-

-	while (w >= 4)

-	{

-	    *(uint32_t *)d = data;

-

-	    w -= 4;

-	    d += 4;

-	}

-

-	if (w >= 2)

-	{

-	    *(uint16_t *)d = data;

-	    w -= 2;

-	    d += 2;

-	}

-

-	if (w >= 1)

-	{

-	    *(uint8_t *)d = data;

-	    w -= 1;

-	    d += 1;

-	}

-    }

-

-    return TRUE;

-}

-

-static void

-sse2_composite_src_n_8_8888 (pixman_implementation_t *imp,

-                             pixman_op_t              op,

-                             pixman_image_t *         src_image,

-                             pixman_image_t *         mask_image,

-                             pixman_image_t *         dst_image,

-                             int32_t                  src_x,

-                             int32_t                  src_y,

-                             int32_t                  mask_x,

-                             int32_t                  mask_y,

-                             int32_t                  dest_x,

-                             int32_t                  dest_y,

-                             int32_t                  width,

-                             int32_t                  height)

-{

-    uint32_t src, srca;

-    uint32_t    *dst_line, *dst;

-    uint8_t     *mask_line, *mask;

-    int dst_stride, mask_stride;

-    int32_t w;

-    uint32_t m;

-

-    __m128i xmm_src, xmm_def;

-    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-

-    srca = src >> 24;

-    if (src == 0)

-    {

-	pixman_fill_sse2 (dst_image->bits.bits, dst_image->bits.rowstride,

-	                  PIXMAN_FORMAT_BPP (dst_image->bits.format),

-	                  dest_x, dest_y, width, height, 0);

-	return;

-    }

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);

-

-    xmm_def = create_mask_2x32_128 (src, src);

-    xmm_src = expand_pixel_32_1x128 (src);

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	mask = mask_line;

-	mask_line += mask_stride;

-	w = width;

-

-	while (w && (unsigned long)dst & 15)

-	{

-	    uint8_t m = *mask++;

-

-	    if (m)

-	    {

-		*dst = pack_1x128_32 (

-		    pix_multiply_1x128 (xmm_src, expand_pixel_8_1x128 (m)));

-	    }

-	    else

-	    {

-		*dst = 0;

-	    }

-

-	    w--;

-	    dst++;

-	}

-

-	while (w >= 4)

-	{

-	    m = *((uint32_t*)mask);

-

-	    if (srca == 0xff && m == 0xffffffff)

-	    {

-		save_128_aligned ((__m128i*)dst, xmm_def);

-	    }

-	    else if (m)

-	    {

-		xmm_mask = unpack_32_1x128 (m);

-		xmm_mask = _mm_unpacklo_epi8 (xmm_mask, _mm_setzero_si128 ());

-

-		/* Unpacking */

-		unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-

-		expand_alpha_rev_2x128 (xmm_mask_lo, xmm_mask_hi,

-					&xmm_mask_lo, &xmm_mask_hi);

-

-		pix_multiply_2x128 (&xmm_src, &xmm_src,

-				    &xmm_mask_lo, &xmm_mask_hi,

-				    &xmm_mask_lo, &xmm_mask_hi);

-

-		save_128_aligned (

-		    (__m128i*)dst, pack_2x128_128 (xmm_mask_lo, xmm_mask_hi));

-	    }

-	    else

-	    {

-		save_128_aligned ((__m128i*)dst, _mm_setzero_si128 ());

-	    }

-

-	    w -= 4;

-	    dst += 4;

-	    mask += 4;

-	}

-

-	while (w)

-	{

-	    uint8_t m = *mask++;

-

-	    if (m)

-	    {

-		*dst = pack_1x128_32 (

-		    pix_multiply_1x128 (

-			xmm_src, expand_pixel_8_1x128 (m)));

-	    }

-	    else

-	    {

-		*dst = 0;

-	    }

-

-	    w--;

-	    dst++;

-	}

-    }

-

-}

-

-static void

-sse2_composite_over_n_8_0565 (pixman_implementation_t *imp,

-                              pixman_op_t              op,

-                              pixman_image_t *         src_image,

-                              pixman_image_t *         mask_image,

-                              pixman_image_t *         dst_image,

-                              int32_t                  src_x,

-                              int32_t                  src_y,

-                              int32_t                  mask_x,

-                              int32_t                  mask_y,

-                              int32_t                  dest_x,

-                              int32_t                  dest_y,

-                              int32_t                  width,

-                              int32_t                  height)

-{

-    uint32_t src, srca;

-    uint16_t    *dst_line, *dst, d;

-    uint8_t     *mask_line, *mask;

-    int dst_stride, mask_stride;

-    int32_t w;

-    uint32_t m;

-    __m128i mmx_src, mmx_alpha, mmx_mask, mmx_dest;

-

-    __m128i xmm_src, xmm_alpha;

-    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;

-    __m128i xmm_dst, xmm_dst0, xmm_dst1, xmm_dst2, xmm_dst3;

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-

-    srca = src >> 24;

-    if (src == 0)

-	return;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);

-

-    xmm_src = expand_pixel_32_1x128 (src);

-    xmm_alpha = expand_alpha_1x128 (xmm_src);

-    mmx_src = xmm_src;

-    mmx_alpha = xmm_alpha;

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	mask = mask_line;

-	mask_line += mask_stride;

-	w = width;

-

-	while (w && (unsigned long)dst & 15)

-	{

-	    m = *mask++;

-

-	    if (m)

-	    {

-		d = *dst;

-		mmx_mask = expand_alpha_rev_1x128 (unpack_32_1x128 (m));

-		mmx_dest = expand565_16_1x128 (d);

-

-		*dst = pack_565_32_16 (

-		    pack_1x128_32 (

-			in_over_1x128 (

-			    &mmx_src, &mmx_alpha, &mmx_mask, &mmx_dest)));

-	    }

-

-	    w--;

-	    dst++;

-	}

-

-	while (w >= 8)

-	{

-	    xmm_dst = load_128_aligned ((__m128i*) dst);

-	    unpack_565_128_4x128 (xmm_dst,

-				  &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3);

-

-	    m = *((uint32_t*)mask);

-	    mask += 4;

-

-	    if (m)

-	    {

-		xmm_mask = unpack_32_1x128 (m);

-		xmm_mask = _mm_unpacklo_epi8 (xmm_mask, _mm_setzero_si128 ());

-

-		/* Unpacking */

-		unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-

-		expand_alpha_rev_2x128 (xmm_mask_lo, xmm_mask_hi,

-					&xmm_mask_lo, &xmm_mask_hi);

-

-		in_over_2x128 (&xmm_src, &xmm_src,

-			       &xmm_alpha, &xmm_alpha,

-			       &xmm_mask_lo, &xmm_mask_hi,

-			       &xmm_dst0, &xmm_dst1);

-	    }

-

-	    m = *((uint32_t*)mask);

-	    mask += 4;

-

-	    if (m)

-	    {

-		xmm_mask = unpack_32_1x128 (m);

-		xmm_mask = _mm_unpacklo_epi8 (xmm_mask, _mm_setzero_si128 ());

-

-		/* Unpacking */

-		unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-

-		expand_alpha_rev_2x128 (xmm_mask_lo, xmm_mask_hi,

-					&xmm_mask_lo, &xmm_mask_hi);

-		in_over_2x128 (&xmm_src, &xmm_src,

-			       &xmm_alpha, &xmm_alpha,

-			       &xmm_mask_lo, &xmm_mask_hi,

-			       &xmm_dst2, &xmm_dst3);

-	    }

-

-	    save_128_aligned (

-		(__m128i*)dst, pack_565_4x128_128 (

-		    &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3));

-

-	    w -= 8;

-	    dst += 8;

-	}

-

-	while (w)

-	{

-	    m = *mask++;

-

-	    if (m)

-	    {

-		d = *dst;

-		mmx_mask = expand_alpha_rev_1x128 (unpack_32_1x128 (m));

-		mmx_dest = expand565_16_1x128 (d);

-

-		*dst = pack_565_32_16 (

-		    pack_1x128_32 (

-			in_over_1x128 (

-			    &mmx_src, &mmx_alpha, &mmx_mask, &mmx_dest)));

-	    }

-

-	    w--;

-	    dst++;

-	}

-    }

-

-}

-

-static void

-sse2_composite_over_pixbuf_0565 (pixman_implementation_t *imp,

-                                 pixman_op_t              op,

-                                 pixman_image_t *         src_image,

-                                 pixman_image_t *         mask_image,

-                                 pixman_image_t *         dst_image,

-                                 int32_t                  src_x,

-                                 int32_t                  src_y,

-                                 int32_t                  mask_x,

-                                 int32_t                  mask_y,

-                                 int32_t                  dest_x,

-                                 int32_t                  dest_y,

-                                 int32_t                  width,

-                                 int32_t                  height)

-{

-    uint16_t    *dst_line, *dst, d;

-    uint32_t    *src_line, *src, s;

-    int dst_stride, src_stride;

-    int32_t w;

-    uint32_t opaque, zero;

-

-    __m128i ms;

-    __m128i xmm_src, xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst, xmm_dst0, xmm_dst1, xmm_dst2, xmm_dst3;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	src = src_line;

-	src_line += src_stride;

-	w = width;

-

-	while (w && (unsigned long)dst & 15)

-	{

-	    s = *src++;

-	    d = *dst;

-

-	    ms = unpack_32_1x128 (s);

-

-	    *dst++ = pack_565_32_16 (

-		pack_1x128_32 (

-		    over_rev_non_pre_1x128 (ms, expand565_16_1x128 (d))));

-	    w--;

-	}

-

-	while (w >= 8)

-	{

-	    /* First round */

-	    xmm_src = load_128_unaligned ((__m128i*)src);

-	    xmm_dst = load_128_aligned  ((__m128i*)dst);

-

-	    opaque = is_opaque (xmm_src);

-	    zero = is_zero (xmm_src);

-

-	    unpack_565_128_4x128 (xmm_dst,

-				  &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3);

-	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);

-

-	    /* preload next round*/

-	    xmm_src = load_128_unaligned ((__m128i*)(src + 4));

-

-	    if (opaque)

-	    {

-		invert_colors_2x128 (xmm_src_lo, xmm_src_hi,

-				     &xmm_dst0, &xmm_dst1);

-	    }

-	    else if (!zero)

-	    {

-		over_rev_non_pre_2x128 (xmm_src_lo, xmm_src_hi,

-					&xmm_dst0, &xmm_dst1);

-	    }

-

-	    /* Second round */

-	    opaque = is_opaque (xmm_src);

-	    zero = is_zero (xmm_src);

-

-	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);

-

-	    if (opaque)

-	    {

-		invert_colors_2x128 (xmm_src_lo, xmm_src_hi,

-				     &xmm_dst2, &xmm_dst3);

-	    }

-	    else if (!zero)

-	    {

-		over_rev_non_pre_2x128 (xmm_src_lo, xmm_src_hi,

-					&xmm_dst2, &xmm_dst3);

-	    }

-

-	    save_128_aligned (

-		(__m128i*)dst, pack_565_4x128_128 (

-		    &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3));

-

-	    w -= 8;

-	    src += 8;

-	    dst += 8;

-	}

-

-	while (w)

-	{

-	    s = *src++;

-	    d = *dst;

-

-	    ms = unpack_32_1x128 (s);

-

-	    *dst++ = pack_565_32_16 (

-		pack_1x128_32 (

-		    over_rev_non_pre_1x128 (ms, expand565_16_1x128 (d))));

-	    w--;

-	}

-    }

-

-}

-

-static void

-sse2_composite_over_pixbuf_8888 (pixman_implementation_t *imp,

-                                 pixman_op_t              op,

-                                 pixman_image_t *         src_image,

-                                 pixman_image_t *         mask_image,

-                                 pixman_image_t *         dst_image,

-                                 int32_t                  src_x,

-                                 int32_t                  src_y,

-                                 int32_t                  mask_x,

-                                 int32_t                  mask_y,

-                                 int32_t                  dest_x,

-                                 int32_t                  dest_y,

-                                 int32_t                  width,

-                                 int32_t                  height)

-{

-    uint32_t    *dst_line, *dst, d;

-    uint32_t    *src_line, *src, s;

-    int dst_stride, src_stride;

-    int32_t w;

-    uint32_t opaque, zero;

-

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst_lo, xmm_dst_hi;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	src = src_line;

-	src_line += src_stride;

-	w = width;

-

-	while (w && (unsigned long)dst & 15)

-	{

-	    s = *src++;

-	    d = *dst;

-

-	    *dst++ = pack_1x128_32 (

-		over_rev_non_pre_1x128 (

-		    unpack_32_1x128 (s), unpack_32_1x128 (d)));

-

-	    w--;

-	}

-

-	while (w >= 4)

-	{

-	    xmm_src_hi = load_128_unaligned ((__m128i*)src);

-

-	    opaque = is_opaque (xmm_src_hi);

-	    zero = is_zero (xmm_src_hi);

-

-	    unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-

-	    if (opaque)

-	    {

-		invert_colors_2x128 (xmm_src_lo, xmm_src_hi,

-				     &xmm_dst_lo, &xmm_dst_hi);

-

-		save_128_aligned (

-		    (__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-	    }

-	    else if (!zero)

-	    {

-		xmm_dst_hi = load_128_aligned  ((__m128i*)dst);

-

-		unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-

-		over_rev_non_pre_2x128 (xmm_src_lo, xmm_src_hi,

-					&xmm_dst_lo, &xmm_dst_hi);

-

-		save_128_aligned (

-		    (__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-	    }

-

-	    w -= 4;

-	    dst += 4;

-	    src += 4;

-	}

-

-	while (w)

-	{

-	    s = *src++;

-	    d = *dst;

-

-	    *dst++ = pack_1x128_32 (

-		over_rev_non_pre_1x128 (

-		    unpack_32_1x128 (s), unpack_32_1x128 (d)));

-

-	    w--;

-	}

-    }

-

-}

-

-static void

-sse2_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,

-                                    pixman_op_t              op,

-                                    pixman_image_t *         src_image,

-                                    pixman_image_t *         mask_image,

-                                    pixman_image_t *         dst_image,

-                                    int32_t                  src_x,

-                                    int32_t                  src_y,

-                                    int32_t                  mask_x,

-                                    int32_t                  mask_y,

-                                    int32_t                  dest_x,

-                                    int32_t                  dest_y,

-                                    int32_t                  width,

-                                    int32_t                  height)

-{

-    uint32_t src;

-    uint16_t    *dst_line, *dst, d;

-    uint32_t    *mask_line, *mask, m;

-    int dst_stride, mask_stride;

-    int w;

-    uint32_t pack_cmp;

-

-    __m128i xmm_src, xmm_alpha;

-    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;

-    __m128i xmm_dst, xmm_dst0, xmm_dst1, xmm_dst2, xmm_dst3;

-

-    __m128i mmx_src, mmx_alpha, mmx_mask, mmx_dest;

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-

-    if (src == 0)

-	return;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);

-

-    xmm_src = expand_pixel_32_1x128 (src);

-    xmm_alpha = expand_alpha_1x128 (xmm_src);

-    mmx_src = xmm_src;

-    mmx_alpha = xmm_alpha;

-

-    while (height--)

-    {

-	w = width;

-	mask = mask_line;

-	dst = dst_line;

-	mask_line += mask_stride;

-	dst_line += dst_stride;

-

-	while (w && ((unsigned long)dst & 15))

-	{

-	    m = *(uint32_t *) mask;

-

-	    if (m)

-	    {

-		d = *dst;

-		mmx_mask = unpack_32_1x128 (m);

-		mmx_dest = expand565_16_1x128 (d);

-

-		*dst = pack_565_32_16 (

-		    pack_1x128_32 (

-			in_over_1x128 (

-			    &mmx_src, &mmx_alpha, &mmx_mask, &mmx_dest)));

-	    }

-

-	    w--;

-	    dst++;

-	    mask++;

-	}

-

-	while (w >= 8)

-	{

-	    /* First round */

-	    xmm_mask = load_128_unaligned ((__m128i*)mask);

-	    xmm_dst = load_128_aligned ((__m128i*)dst);

-

-	    pack_cmp = _mm_movemask_epi8 (

-		_mm_cmpeq_epi32 (xmm_mask, _mm_setzero_si128 ()));

-

-	    unpack_565_128_4x128 (xmm_dst,

-				  &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3);

-	    unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-

-	    /* preload next round */

-	    xmm_mask = load_128_unaligned ((__m128i*)(mask + 4));

-

-	    /* preload next round */

-	    if (pack_cmp != 0xffff)

-	    {

-		in_over_2x128 (&xmm_src, &xmm_src,

-			       &xmm_alpha, &xmm_alpha,

-			       &xmm_mask_lo, &xmm_mask_hi,

-			       &xmm_dst0, &xmm_dst1);

-	    }

-

-	    /* Second round */

-	    pack_cmp = _mm_movemask_epi8 (

-		_mm_cmpeq_epi32 (xmm_mask, _mm_setzero_si128 ()));

-

-	    unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-

-	    if (pack_cmp != 0xffff)

-	    {

-		in_over_2x128 (&xmm_src, &xmm_src,

-			       &xmm_alpha, &xmm_alpha,

-			       &xmm_mask_lo, &xmm_mask_hi,

-			       &xmm_dst2, &xmm_dst3);

-	    }

-

-	    save_128_aligned (

-		(__m128i*)dst, pack_565_4x128_128 (

-		    &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3));

-

-	    w -= 8;

-	    dst += 8;

-	    mask += 8;

-	}

-

-	while (w)

-	{

-	    m = *(uint32_t *) mask;

-

-	    if (m)

-	    {

-		d = *dst;

-		mmx_mask = unpack_32_1x128 (m);

-		mmx_dest = expand565_16_1x128 (d);

-

-		*dst = pack_565_32_16 (

-		    pack_1x128_32 (

-			in_over_1x128 (

-			    &mmx_src, &mmx_alpha, &mmx_mask, &mmx_dest)));

-	    }

-

-	    w--;

-	    dst++;

-	    mask++;

-	}

-    }

-

-}

-

-static void

-sse2_composite_in_n_8_8 (pixman_implementation_t *imp,

-                         pixman_op_t              op,

-                         pixman_image_t *         src_image,

-                         pixman_image_t *         mask_image,

-                         pixman_image_t *         dst_image,

-                         int32_t                  src_x,

-                         int32_t                  src_y,

-                         int32_t                  mask_x,

-                         int32_t                  mask_y,

-                         int32_t                  dest_x,

-                         int32_t                  dest_y,

-                         int32_t                  width,

-                         int32_t                  height)

-{

-    uint8_t     *dst_line, *dst;

-    uint8_t     *mask_line, *mask;

-    int dst_stride, mask_stride;

-    uint32_t d, m;

-    uint32_t src;

-    uint8_t sa;

-    int32_t w;

-

-    __m128i xmm_alpha;

-    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-

-    sa = src >> 24;

-

-    xmm_alpha = expand_alpha_1x128 (expand_pixel_32_1x128 (src));

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	mask = mask_line;

-	mask_line += mask_stride;

-	w = width;

-

-	while (w && ((unsigned long)dst & 15))

-	{

-	    m = (uint32_t) *mask++;

-	    d = (uint32_t) *dst;

-

-	    *dst++ = (uint8_t) pack_1x128_32 (

-		pix_multiply_1x128 (

-		    pix_multiply_1x128 (xmm_alpha,

-				       unpack_32_1x128 (m)),

-		    unpack_32_1x128 (d)));

-	    w--;

-	}

-

-	while (w >= 16)

-	{

-	    xmm_mask = load_128_unaligned ((__m128i*)mask);

-	    xmm_dst = load_128_aligned ((__m128i*)dst);

-

-	    unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-

-	    pix_multiply_2x128 (&xmm_alpha, &xmm_alpha,

-				&xmm_mask_lo, &xmm_mask_hi,

-				&xmm_mask_lo, &xmm_mask_hi);

-

-	    pix_multiply_2x128 (&xmm_mask_lo, &xmm_mask_hi,

-				&xmm_dst_lo, &xmm_dst_hi,

-				&xmm_dst_lo, &xmm_dst_hi);

-

-	    save_128_aligned (

-		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	    mask += 16;

-	    dst += 16;

-	    w -= 16;

-	}

-

-	while (w)

-	{

-	    m = (uint32_t) *mask++;

-	    d = (uint32_t) *dst;

-

-	    *dst++ = (uint8_t) pack_1x128_32 (

-		pix_multiply_1x128 (

-		    pix_multiply_1x128 (

-			xmm_alpha, unpack_32_1x128 (m)),

-		    unpack_32_1x128 (d)));

-	    w--;

-	}

-    }

-

-}

-

-static void

-sse2_composite_in_n_8 (pixman_implementation_t *imp,

-		       pixman_op_t              op,

-		       pixman_image_t *         src_image,

-		       pixman_image_t *         mask_image,

-		       pixman_image_t *         dst_image,

-		       int32_t                  src_x,

-		       int32_t                  src_y,

-		       int32_t                  mask_x,

-		       int32_t                  mask_y,

-		       int32_t                  dest_x,

-		       int32_t                  dest_y,

-		       int32_t                  width,

-		       int32_t                  height)

-{

-    uint8_t     *dst_line, *dst;

-    int dst_stride;

-    uint32_t d;

-    uint32_t src;

-    int32_t w;

-

-    __m128i xmm_alpha;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-

-    xmm_alpha = expand_alpha_1x128 (expand_pixel_32_1x128 (src));

-

-    src = src >> 24;

-

-    if (src == 0xff)

-	return;

-

-    if (src == 0x00)

-    {

-	pixman_fill (dst_image->bits.bits, dst_image->bits.rowstride,

-		     8, dest_x, dest_y, width, height, src);

-

-	return;

-    }

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	w = width;

-

-	while (w && ((unsigned long)dst & 15))

-	{

-	    d = (uint32_t) *dst;

-

-	    *dst++ = (uint8_t) pack_1x128_32 (

-		pix_multiply_1x128 (

-		    xmm_alpha,

-		    unpack_32_1x128 (d)));

-	    w--;

-	}

-

-	while (w >= 16)

-	{

-	    xmm_dst = load_128_aligned ((__m128i*)dst);

-

-	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-	    

-	    pix_multiply_2x128 (&xmm_alpha, &xmm_alpha,

-				&xmm_dst_lo, &xmm_dst_hi,

-				&xmm_dst_lo, &xmm_dst_hi);

-

-	    save_128_aligned (

-		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	    dst += 16;

-	    w -= 16;

-	}

-

-	while (w)

-	{

-	    d = (uint32_t) *dst;

-

-	    *dst++ = (uint8_t) pack_1x128_32 (

-		pix_multiply_1x128 (

-		    xmm_alpha,

-		    unpack_32_1x128 (d)));

-	    w--;

-	}

-    }

-

-}

-

-static void

-sse2_composite_in_8_8 (pixman_implementation_t *imp,

-                       pixman_op_t              op,

-                       pixman_image_t *         src_image,

-                       pixman_image_t *         mask_image,

-                       pixman_image_t *         dst_image,

-                       int32_t                  src_x,

-                       int32_t                  src_y,

-                       int32_t                  mask_x,

-                       int32_t                  mask_y,

-                       int32_t                  dest_x,

-                       int32_t                  dest_y,

-                       int32_t                  width,

-                       int32_t                  height)

-{

-    uint8_t     *dst_line, *dst;

-    uint8_t     *src_line, *src;

-    int src_stride, dst_stride;

-    int32_t w;

-    uint32_t s, d;

-

-    __m128i xmm_src, xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint8_t, src_stride, src_line, 1);

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	src = src_line;

-	src_line += src_stride;

-	w = width;

-

-	while (w && ((unsigned long)dst & 15))

-	{

-	    s = (uint32_t) *src++;

-	    d = (uint32_t) *dst;

-

-	    *dst++ = (uint8_t) pack_1x128_32 (

-		pix_multiply_1x128 (

-		    unpack_32_1x128 (s), unpack_32_1x128 (d)));

-	    w--;

-	}

-

-	while (w >= 16)

-	{

-	    xmm_src = load_128_unaligned ((__m128i*)src);

-	    xmm_dst = load_128_aligned ((__m128i*)dst);

-

-	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);

-	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-

-	    pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,

-				&xmm_dst_lo, &xmm_dst_hi,

-				&xmm_dst_lo, &xmm_dst_hi);

-

-	    save_128_aligned (

-		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	    src += 16;

-	    dst += 16;

-	    w -= 16;

-	}

-

-	while (w)

-	{

-	    s = (uint32_t) *src++;

-	    d = (uint32_t) *dst;

-

-	    *dst++ = (uint8_t) pack_1x128_32 (

-		pix_multiply_1x128 (unpack_32_1x128 (s), unpack_32_1x128 (d)));

-	    w--;

-	}

-    }

-

-}

-

-static void

-sse2_composite_add_n_8_8 (pixman_implementation_t *imp,

-			  pixman_op_t              op,

-			  pixman_image_t *         src_image,

-			  pixman_image_t *         mask_image,

-			  pixman_image_t *         dst_image,

-			  int32_t                  src_x,

-			  int32_t                  src_y,

-			  int32_t                  mask_x,

-			  int32_t                  mask_y,

-			  int32_t                  dest_x,

-			  int32_t                  dest_y,

-			  int32_t                  width,

-			  int32_t                  height)

-{

-    uint8_t     *dst_line, *dst;

-    uint8_t     *mask_line, *mask;

-    int dst_stride, mask_stride;

-    int32_t w;

-    uint32_t src;

-    uint8_t sa;

-    uint32_t m, d;

-

-    __m128i xmm_alpha;

-    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-

-    sa = src >> 24;

-

-    xmm_alpha = expand_alpha_1x128 (expand_pixel_32_1x128 (src));

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	mask = mask_line;

-	mask_line += mask_stride;

-	w = width;

-

-	while (w && ((unsigned long)dst & 15))

-	{

-	    m = (uint32_t) *mask++;

-	    d = (uint32_t) *dst;

-

-	    *dst++ = (uint8_t) pack_1x128_32 (

-		_mm_adds_epu16 (

-		    pix_multiply_1x128 (

-			xmm_alpha, unpack_32_1x128 (m)),

-		    unpack_32_1x128 (d)));

-	    w--;

-	}

-

-	while (w >= 16)

-	{

-	    xmm_mask = load_128_unaligned ((__m128i*)mask);

-	    xmm_dst = load_128_aligned ((__m128i*)dst);

-

-	    unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-

-	    pix_multiply_2x128 (&xmm_alpha, &xmm_alpha,

-				&xmm_mask_lo, &xmm_mask_hi,

-				&xmm_mask_lo, &xmm_mask_hi);

-

-	    xmm_dst_lo = _mm_adds_epu16 (xmm_mask_lo, xmm_dst_lo);

-	    xmm_dst_hi = _mm_adds_epu16 (xmm_mask_hi, xmm_dst_hi);

-

-	    save_128_aligned (

-		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-

-	    mask += 16;

-	    dst += 16;

-	    w -= 16;

-	}

-

-	while (w)

-	{

-	    m = (uint32_t) *mask++;

-	    d = (uint32_t) *dst;

-

-	    *dst++ = (uint8_t) pack_1x128_32 (

-		_mm_adds_epu16 (

-		    pix_multiply_1x128 (

-			xmm_alpha, unpack_32_1x128 (m)),

-		    unpack_32_1x128 (d)));

-

-	    w--;

-	}

-    }

-

-}

-

-static void

-sse2_composite_add_n_8 (pixman_implementation_t *imp,

-			pixman_op_t              op,

-			pixman_image_t *         src_image,

-			pixman_image_t *         mask_image,

-			pixman_image_t *         dst_image,

-			int32_t                  src_x,

-			int32_t                  src_y,

-			int32_t                  mask_x,

-			int32_t                  mask_y,

-			int32_t                  dest_x,

-			int32_t                  dest_y,

-			int32_t                  width,

-			int32_t                  height)

-{

-    uint8_t     *dst_line, *dst;

-    int dst_stride;

-    int32_t w;

-    uint32_t src;

-

-    __m128i xmm_src;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-

-    src >>= 24;

-

-    if (src == 0x00)

-	return;

-

-    if (src == 0xff)

-    {

-	pixman_fill (dst_image->bits.bits, dst_image->bits.rowstride,

-		     8, dest_x, dest_y, width, height, 0xff);

-

-	return;

-    }

-

-    src = (src << 24) | (src << 16) | (src << 8) | src;

-    xmm_src = _mm_set_epi32 (src, src, src, src);

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	w = width;

-

-	while (w && ((unsigned long)dst & 15))

-	{

-	    *dst = (uint8_t)_mm_cvtsi128_si32 (

-		_mm_adds_epu8 (

-		    xmm_src,

-		    _mm_cvtsi32_si128 (*dst)));

-

-	    w--;

-	    dst++;

-	}

-

-	while (w >= 16)

-	{

-	    save_128_aligned (

-		(__m128i*)dst, _mm_adds_epu8 (xmm_src, load_128_aligned  ((__m128i*)dst)));

-

-	    dst += 16;

-	    w -= 16;

-	}

-

-	while (w)

-	{

-	    *dst = (uint8_t)_mm_cvtsi128_si32 (

-		_mm_adds_epu8 (

-		    xmm_src,

-		    _mm_cvtsi32_si128 (*dst)));

-

-	    w--;

-	    dst++;

-	}

-    }

-

-}

-

-static void

-sse2_composite_add_8_8 (pixman_implementation_t *imp,

-			pixman_op_t              op,

-			pixman_image_t *         src_image,

-			pixman_image_t *         mask_image,

-			pixman_image_t *         dst_image,

-			int32_t                  src_x,

-			int32_t                  src_y,

-			int32_t                  mask_x,

-			int32_t                  mask_y,

-			int32_t                  dest_x,

-			int32_t                  dest_y,

-			int32_t                  width,

-			int32_t                  height)

-{

-    uint8_t     *dst_line, *dst;

-    uint8_t     *src_line, *src;

-    int dst_stride, src_stride;

-    int32_t w;

-    uint16_t t;

-

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint8_t, src_stride, src_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);

-

-    while (height--)

-    {

-	dst = dst_line;

-	src = src_line;

-

-	dst_line += dst_stride;

-	src_line += src_stride;

-	w = width;

-

-	/* Small head */

-	while (w && (unsigned long)dst & 3)

-	{

-	    t = (*dst) + (*src++);

-	    *dst++ = t | (0 - (t >> 8));

-	    w--;

-	}

-

-	sse2_combine_add_u (imp, op,

-			    (uint32_t*)dst, (uint32_t*)src, NULL, w >> 2);

-

-	/* Small tail */

-	dst += w & 0xfffc;

-	src += w & 0xfffc;

-

-	w &= 3;

-

-	while (w)

-	{

-	    t = (*dst) + (*src++);

-	    *dst++ = t | (0 - (t >> 8));

-	    w--;

-	}

-    }

-

-}

-

-static void

-sse2_composite_add_8888_8888 (pixman_implementation_t *imp,

-                              pixman_op_t              op,

-                              pixman_image_t *         src_image,

-                              pixman_image_t *         mask_image,

-                              pixman_image_t *         dst_image,

-                              int32_t                  src_x,

-                              int32_t                  src_y,

-                              int32_t                  mask_x,

-                              int32_t                  mask_y,

-                              int32_t                  dest_x,

-                              int32_t                  dest_y,

-                              int32_t                  width,

-                              int32_t                  height)

-{

-    uint32_t    *dst_line, *dst;

-    uint32_t    *src_line, *src;

-    int dst_stride, src_stride;

-

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-

-    while (height--)

-    {

-	dst = dst_line;

-	dst_line += dst_stride;

-	src = src_line;

-	src_line += src_stride;

-

-	sse2_combine_add_u (imp, op, dst, src, NULL, width);

-    }

-

-}

-

-static pixman_bool_t

-pixman_blt_sse2 (uint32_t *src_bits,

-                 uint32_t *dst_bits,

-                 int       src_stride,

-                 int       dst_stride,

-                 int       src_bpp,

-                 int       dst_bpp,

-                 int       src_x,

-                 int       src_y,

-                 int       dst_x,

-                 int       dst_y,

-                 int       width,

-                 int       height)

-{

-    uint8_t *   src_bytes;

-    uint8_t *   dst_bytes;

-    int byte_width;

-

-    if (src_bpp != dst_bpp)

-	return FALSE;

-

-    if (src_bpp == 16)

-    {

-	src_stride = src_stride * (int) sizeof (uint32_t) / 2;

-	dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;

-	src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));

-	dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));

-	byte_width = 2 * width;

-	src_stride *= 2;

-	dst_stride *= 2;

-    }

-    else if (src_bpp == 32)

-    {

-	src_stride = src_stride * (int) sizeof (uint32_t) / 4;

-	dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;

-	src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));

-	dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));

-	byte_width = 4 * width;

-	src_stride *= 4;

-	dst_stride *= 4;

-    }

-    else

-    {

-	return FALSE;

-    }

-

-    while (height--)

-    {

-	int w;

-	uint8_t *s = src_bytes;

-	uint8_t *d = dst_bytes;

-	src_bytes += src_stride;

-	dst_bytes += dst_stride;

-	w = byte_width;

-

-	while (w >= 2 && ((unsigned long)d & 3))

-	{

-	    *(uint16_t *)d = *(uint16_t *)s;

-	    w -= 2;

-	    s += 2;

-	    d += 2;

-	}

-

-	while (w >= 4 && ((unsigned long)d & 15))

-	{

-	    *(uint32_t *)d = *(uint32_t *)s;

-

-	    w -= 4;

-	    s += 4;

-	    d += 4;

-	}

-

-	while (w >= 64)

-	{

-	    __m128i xmm0, xmm1, xmm2, xmm3;

-

-	    xmm0 = load_128_unaligned ((__m128i*)(s));

-	    xmm1 = load_128_unaligned ((__m128i*)(s + 16));

-	    xmm2 = load_128_unaligned ((__m128i*)(s + 32));

-	    xmm3 = load_128_unaligned ((__m128i*)(s + 48));

-

-	    save_128_aligned ((__m128i*)(d),    xmm0);

-	    save_128_aligned ((__m128i*)(d + 16), xmm1);

-	    save_128_aligned ((__m128i*)(d + 32), xmm2);

-	    save_128_aligned ((__m128i*)(d + 48), xmm3);

-

-	    s += 64;

-	    d += 64;

-	    w -= 64;

-	}

-

-	while (w >= 16)

-	{

-	    save_128_aligned ((__m128i*)d, load_128_unaligned ((__m128i*)s) );

-

-	    w -= 16;

-	    d += 16;

-	    s += 16;

-	}

-

-	while (w >= 4)

-	{

-	    *(uint32_t *)d = *(uint32_t *)s;

-

-	    w -= 4;

-	    s += 4;

-	    d += 4;

-	}

-

-	if (w >= 2)

-	{

-	    *(uint16_t *)d = *(uint16_t *)s;

-	    w -= 2;

-	    s += 2;

-	    d += 2;

-	}

-    }

-

-

-    return TRUE;

-}

-

-static void

-sse2_composite_copy_area (pixman_implementation_t *imp,

-                          pixman_op_t              op,

-                          pixman_image_t *         src_image,

-                          pixman_image_t *         mask_image,

-                          pixman_image_t *         dst_image,

-                          int32_t                  src_x,

-                          int32_t                  src_y,

-                          int32_t                  mask_x,

-                          int32_t                  mask_y,

-                          int32_t                  dest_x,

-                          int32_t                  dest_y,

-                          int32_t                  width,

-                          int32_t                  height)

-{

-    pixman_blt_sse2 (src_image->bits.bits,

-                     dst_image->bits.bits,

-                     src_image->bits.rowstride,

-                     dst_image->bits.rowstride,

-                     PIXMAN_FORMAT_BPP (src_image->bits.format),

-                     PIXMAN_FORMAT_BPP (dst_image->bits.format),

-                     src_x, src_y, dest_x, dest_y, width, height);

-}

-

-static void

-sse2_composite_over_x888_8_8888 (pixman_implementation_t *imp,

-                                 pixman_op_t              op,

-                                 pixman_image_t *         src_image,

-                                 pixman_image_t *         mask_image,

-                                 pixman_image_t *         dst_image,

-                                 int32_t                  src_x,

-                                 int32_t                  src_y,

-                                 int32_t                  mask_x,

-                                 int32_t                  mask_y,

-                                 int32_t                  dest_x,

-                                 int32_t                  dest_y,

-                                 int32_t                  width,

-                                 int32_t                  height)

-{

-    uint32_t    *src, *src_line, s;

-    uint32_t    *dst, *dst_line, d;

-    uint8_t         *mask, *mask_line;

-    uint32_t m;

-    int src_stride, mask_stride, dst_stride;

-    int32_t w;

-    __m128i ms;

-

-    __m128i xmm_src, xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);

-

-    while (height--)

-    {

-        src = src_line;

-        src_line += src_stride;

-        dst = dst_line;

-        dst_line += dst_stride;

-        mask = mask_line;

-        mask_line += mask_stride;

-

-        w = width;

-

-        while (w && (unsigned long)dst & 15)

-        {

-            s = 0xff000000 | *src++;

-            m = (uint32_t) *mask++;

-            d = *dst;

-            ms = unpack_32_1x128 (s);

-

-            if (m != 0xff)

-            {

-		__m128i ma = expand_alpha_rev_1x128 (unpack_32_1x128 (m));

-		__m128i md = unpack_32_1x128 (d);

-

-                ms = in_over_1x128 (&ms, &mask_00ff, &ma, &md);

-            }

-

-            *dst++ = pack_1x128_32 (ms);

-            w--;

-        }

-

-        while (w >= 4)

-        {

-            m = *(uint32_t*) mask;

-            xmm_src = _mm_or_si128 (

-		load_128_unaligned ((__m128i*)src), mask_ff000000);

-

-            if (m == 0xffffffff)

-            {

-                save_128_aligned ((__m128i*)dst, xmm_src);

-            }

-            else

-            {

-                xmm_dst = load_128_aligned ((__m128i*)dst);

-

-                xmm_mask = _mm_unpacklo_epi16 (unpack_32_1x128 (m), _mm_setzero_si128());

-

-                unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);

-                unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-                unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-

-                expand_alpha_rev_2x128 (

-		    xmm_mask_lo, xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-                in_over_2x128 (&xmm_src_lo, &xmm_src_hi,

-			       &mask_00ff, &mask_00ff, &xmm_mask_lo, &xmm_mask_hi,

-			       &xmm_dst_lo, &xmm_dst_hi);

-

-                save_128_aligned ((__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-            }

-

-            src += 4;

-            dst += 4;

-            mask += 4;

-            w -= 4;

-        }

-

-        while (w)

-        {

-            m = (uint32_t) *mask++;

-

-            if (m)

-            {

-                s = 0xff000000 | *src;

-

-                if (m == 0xff)

-                {

-                    *dst = s;

-                }

-                else

-                {

-		    __m128i ma, md, ms;

-

-                    d = *dst;

-

-		    ma = expand_alpha_rev_1x128 (unpack_32_1x128 (m));

-		    md = unpack_32_1x128 (d);

-		    ms = unpack_32_1x128 (s);

-

-                    *dst = pack_1x128_32 (in_over_1x128 (&ms, &mask_00ff, &ma, &md));

-                }

-

-            }

-

-            src++;

-            dst++;

-            w--;

-        }

-    }

-

-}

-

-static void

-sse2_composite_over_8888_8_8888 (pixman_implementation_t *imp,

-                                 pixman_op_t              op,

-                                 pixman_image_t *         src_image,

-                                 pixman_image_t *         mask_image,

-                                 pixman_image_t *         dst_image,

-                                 int32_t                  src_x,

-                                 int32_t                  src_y,

-                                 int32_t                  mask_x,

-                                 int32_t                  mask_y,

-                                 int32_t                  dest_x,

-                                 int32_t                  dest_y,

-                                 int32_t                  width,

-                                 int32_t                  height)

-{

-    uint32_t    *src, *src_line, s;

-    uint32_t    *dst, *dst_line, d;

-    uint8_t         *mask, *mask_line;

-    uint32_t m;

-    int src_stride, mask_stride, dst_stride;

-    int32_t w;

-

-    __m128i xmm_src, xmm_src_lo, xmm_src_hi, xmm_srca_lo, xmm_srca_hi;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);

-

-    while (height--)

-    {

-        src = src_line;

-        src_line += src_stride;

-        dst = dst_line;

-        dst_line += dst_stride;

-        mask = mask_line;

-        mask_line += mask_stride;

-

-        w = width;

-

-        while (w && (unsigned long)dst & 15)

-        {

-	    uint32_t sa;

-

-            s = *src++;

-            m = (uint32_t) *mask++;

-            d = *dst;

-

-	    sa = s >> 24;

-

-	    if (m)

-	    {

-		if (sa == 0xff && m == 0xff)

-		{

-		    *dst = s;

-		}

-		else

-		{

-		    __m128i ms, md, ma, msa;

-

-		    ma = expand_alpha_rev_1x128 (load_32_1x128 (m));

-		    ms = unpack_32_1x128 (s);

-		    md = unpack_32_1x128 (d);

-

-		    msa = expand_alpha_rev_1x128 (load_32_1x128 (sa));

-

-		    *dst = pack_1x128_32 (in_over_1x128 (&ms, &msa, &ma, &md));

-		}

-	    }

-

-	    dst++;

-            w--;

-        }

-

-        while (w >= 4)

-        {

-            m = *(uint32_t *) mask;

-

-	    if (m)

-	    {

-		xmm_src = load_128_unaligned ((__m128i*)src);

-

-		if (m == 0xffffffff && is_opaque (xmm_src))

-		{

-		    save_128_aligned ((__m128i *)dst, xmm_src);

-		}

-		else

-		{

-		    xmm_dst = load_128_aligned ((__m128i *)dst);

-

-		    xmm_mask = _mm_unpacklo_epi16 (unpack_32_1x128 (m), _mm_setzero_si128());

-

-		    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);

-		    unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-		    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-

-		    expand_alpha_2x128 (xmm_src_lo, xmm_src_hi, &xmm_srca_lo, &xmm_srca_hi);

-		    expand_alpha_rev_2x128 (xmm_mask_lo, xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-		    in_over_2x128 (&xmm_src_lo, &xmm_src_hi, &xmm_srca_lo, &xmm_srca_hi,

-				   &xmm_mask_lo, &xmm_mask_hi, &xmm_dst_lo, &xmm_dst_hi);

-

-		    save_128_aligned ((__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-		}

-	    }

-

-            src += 4;

-            dst += 4;

-            mask += 4;

-            w -= 4;

-        }

-

-        while (w)

-        {

-	    uint32_t sa;

-

-            s = *src++;

-            m = (uint32_t) *mask++;

-            d = *dst;

-

-	    sa = s >> 24;

-

-	    if (m)

-	    {

-		if (sa == 0xff && m == 0xff)

-		{

-		    *dst = s;

-		}

-		else

-		{

-		    __m128i ms, md, ma, msa;

-

-		    ma = expand_alpha_rev_1x128 (load_32_1x128 (m));

-		    ms = unpack_32_1x128 (s);

-		    md = unpack_32_1x128 (d);

-

-		    msa = expand_alpha_rev_1x128 (load_32_1x128 (sa));

-

-		    *dst = pack_1x128_32 (in_over_1x128 (&ms, &msa, &ma, &md));

-		}

-	    }

-

-	    dst++;

-            w--;

-        }

-    }

-

-}

-

-static void

-sse2_composite_over_reverse_n_8888 (pixman_implementation_t *imp,

-				    pixman_op_t              op,

-				    pixman_image_t *         src_image,

-				    pixman_image_t *         mask_image,

-				    pixman_image_t *         dst_image,

-				    int32_t                  src_x,

-				    int32_t                  src_y,

-				    int32_t                  mask_x,

-				    int32_t                  mask_y,

-				    int32_t                  dest_x,

-				    int32_t                  dest_y,

-				    int32_t                  width,

-				    int32_t                  height)

-{

-    uint32_t src;

-    uint32_t    *dst_line, *dst;

-    __m128i xmm_src;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_dsta_hi, xmm_dsta_lo;

-    int dst_stride;

-    int32_t w;

-

-    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);

-

-    if (src == 0)

-	return;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-

-    xmm_src = expand_pixel_32_1x128 (src);

-

-    while (height--)

-    {

-	dst = dst_line;

-

-	dst_line += dst_stride;

-	w = width;

-

-	while (w && (unsigned long)dst & 15)

-	{

-	    __m128i vd;

-

-	    vd = unpack_32_1x128 (*dst);

-

-	    *dst = pack_1x128_32 (over_1x128 (vd, expand_alpha_1x128 (vd),

-					      xmm_src));

-	    w--;

-	    dst++;

-	}

-

-	while (w >= 4)

-	{

-	    __m128i tmp_lo, tmp_hi;

-

-	    xmm_dst = load_128_aligned ((__m128i*)dst);

-

-	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-	    expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi, &xmm_dsta_lo, &xmm_dsta_hi);

-

-	    tmp_lo = xmm_src;

-	    tmp_hi = xmm_src;

-

-	    over_2x128 (&xmm_dst_lo, &xmm_dst_hi,

-			&xmm_dsta_lo, &xmm_dsta_hi,

-			&tmp_lo, &tmp_hi);

-

-	    save_128_aligned (

-		(__m128i*)dst, pack_2x128_128 (tmp_lo, tmp_hi));

-

-	    w -= 4;

-	    dst += 4;

-	}

-

-	while (w)

-	{

-	    __m128i vd;

-

-	    vd = unpack_32_1x128 (*dst);

-

-	    *dst = pack_1x128_32 (over_1x128 (vd, expand_alpha_1x128 (vd),

-					      xmm_src));

-	    w--;

-	    dst++;

-	}

-

-    }

-

-}

-

-static void

-sse2_composite_over_8888_8888_8888 (pixman_implementation_t *imp,

-				    pixman_op_t              op,

-				    pixman_image_t *         src_image,

-				    pixman_image_t *         mask_image,

-				    pixman_image_t *         dst_image,

-				    int32_t                  src_x,

-				    int32_t                  src_y,

-				    int32_t                  mask_x,

-				    int32_t                  mask_y,

-				    int32_t                  dest_x,

-				    int32_t                  dest_y,

-				    int32_t                  width,

-				    int32_t                  height)

-{

-    uint32_t    *src, *src_line, s;

-    uint32_t    *dst, *dst_line, d;

-    uint32_t    *mask, *mask_line;

-    uint32_t    m;

-    int src_stride, mask_stride, dst_stride;

-    int32_t w;

-

-    __m128i xmm_src, xmm_src_lo, xmm_src_hi, xmm_srca_lo, xmm_srca_hi;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;

-

-    PIXMAN_IMAGE_GET_LINE (

-	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);

-    PIXMAN_IMAGE_GET_LINE (

-	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);

-

-    while (height--)

-    {

-        src = src_line;

-        src_line += src_stride;

-        dst = dst_line;

-        dst_line += dst_stride;

-        mask = mask_line;

-        mask_line += mask_stride;

-

-        w = width;

-

-        while (w && (unsigned long)dst & 15)

-        {

-	    uint32_t sa;

-

-            s = *src++;

-            m = (*mask++) >> 24;

-            d = *dst;

-

-	    sa = s >> 24;

-

-	    if (m)

-	    {

-		if (sa == 0xff && m == 0xff)

-		{

-		    *dst = s;

-		}

-		else

-		{

-		    __m128i ms, md, ma, msa;

-

-		    ma = expand_alpha_rev_1x128 (load_32_1x128 (m));

-		    ms = unpack_32_1x128 (s);

-		    md = unpack_32_1x128 (d);

-

-		    msa = expand_alpha_rev_1x128 (load_32_1x128 (sa));

-

-		    *dst = pack_1x128_32 (in_over_1x128 (&ms, &msa, &ma, &md));

-		}

-	    }

-

-	    dst++;

-            w--;

-        }

-

-        while (w >= 4)

-        {

-	    xmm_mask = load_128_unaligned ((__m128i*)mask);

-

-	    if (!is_transparent (xmm_mask))

-	    {

-		xmm_src = load_128_unaligned ((__m128i*)src);

-

-		if (is_opaque (xmm_mask) && is_opaque (xmm_src))

-		{

-		    save_128_aligned ((__m128i *)dst, xmm_src);

-		}

-		else

-		{

-		    xmm_dst = load_128_aligned ((__m128i *)dst);

-

-		    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);

-		    unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);

-		    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-

-		    expand_alpha_2x128 (xmm_src_lo, xmm_src_hi, &xmm_srca_lo, &xmm_srca_hi);

-		    expand_alpha_2x128 (xmm_mask_lo, xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);

-

-		    in_over_2x128 (&xmm_src_lo, &xmm_src_hi, &xmm_srca_lo, &xmm_srca_hi,

-				   &xmm_mask_lo, &xmm_mask_hi, &xmm_dst_lo, &xmm_dst_hi);

-

-		    save_128_aligned ((__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-		}

-	    }

-

-            src += 4;

-            dst += 4;

-            mask += 4;

-            w -= 4;

-        }

-

-        while (w)

-        {

-	    uint32_t sa;

-

-            s = *src++;

-            m = (*mask++) >> 24;

-            d = *dst;

-

-	    sa = s >> 24;

-

-	    if (m)

-	    {

-		if (sa == 0xff && m == 0xff)

-		{

-		    *dst = s;

-		}

-		else

-		{

-		    __m128i ms, md, ma, msa;

-

-		    ma = expand_alpha_rev_1x128 (load_32_1x128 (m));

-		    ms = unpack_32_1x128 (s);

-		    md = unpack_32_1x128 (d);

-

-		    msa = expand_alpha_rev_1x128 (load_32_1x128 (sa));

-

-		    *dst = pack_1x128_32 (in_over_1x128 (&ms, &msa, &ma, &md));

-		}

-	    }

-

-	    dst++;

-            w--;

-        }

-    }

-

-}

-

-/* A variant of 'sse2_combine_over_u' with minor tweaks */

-static force_inline void

-scaled_nearest_scanline_sse2_8888_8888_OVER (uint32_t*       pd,

-                                             const uint32_t* ps,

-                                             int32_t         w,

-                                             pixman_fixed_t  vx,

-                                             pixman_fixed_t  unit_x,

-                                             pixman_fixed_t  max_vx,

-                                             pixman_bool_t   fully_transparent_src)

-{

-    uint32_t s, d;

-    const uint32_t* pm = NULL;

-

-    __m128i xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_src_lo, xmm_src_hi;

-    __m128i xmm_alpha_lo, xmm_alpha_hi;

-

-    if (fully_transparent_src)

-	return;

-

-    /* Align dst on a 16-byte boundary */

-    while (w && ((unsigned long)pd & 15))

-    {

-	d = *pd;

-	s = combine1 (ps + (vx >> 16), pm);

-	vx += unit_x;

-

-	*pd++ = core_combine_over_u_pixel_sse2 (s, d);

-	if (pm)

-	    pm++;

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	__m128i tmp;

-	uint32_t tmp1, tmp2, tmp3, tmp4;

-

-	tmp1 = ps[vx >> 16];

-	vx += unit_x;

-	tmp2 = ps[vx >> 16];

-	vx += unit_x;

-	tmp3 = ps[vx >> 16];

-	vx += unit_x;

-	tmp4 = ps[vx >> 16];

-	vx += unit_x;

-

-	tmp = _mm_set_epi32 (tmp4, tmp3, tmp2, tmp1);

-

-	xmm_src_hi = combine4 ((__m128i*)&tmp, (__m128i*)pm);

-

-	if (is_opaque (xmm_src_hi))

-	{

-	    save_128_aligned ((__m128i*)pd, xmm_src_hi);

-	}

-	else if (!is_zero (xmm_src_hi))

-	{

-	    xmm_dst_hi = load_128_aligned ((__m128i*) pd);

-

-	    unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);

-	    unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);

-

-	    expand_alpha_2x128 (

-		xmm_src_lo, xmm_src_hi, &xmm_alpha_lo, &xmm_alpha_hi);

-

-	    over_2x128 (&xmm_src_lo, &xmm_src_hi,

-			&xmm_alpha_lo, &xmm_alpha_hi,

-			&xmm_dst_lo, &xmm_dst_hi);

-

-	    /* rebuid the 4 pixel data and save*/

-	    save_128_aligned ((__m128i*)pd,

-			      pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-	}

-

-	w -= 4;

-	pd += 4;

-	if (pm)

-	    pm += 4;

-    }

-

-    while (w)

-    {

-	d = *pd;

-	s = combine1 (ps + (vx >> 16), pm);

-	vx += unit_x;

-

-	*pd++ = core_combine_over_u_pixel_sse2 (s, d);

-	if (pm)

-	    pm++;

-

-	w--;

-    }

-}

-

-FAST_NEAREST_MAINLOOP (sse2_8888_8888_cover_OVER,

-		       scaled_nearest_scanline_sse2_8888_8888_OVER,

-		       uint32_t, uint32_t, COVER)

-FAST_NEAREST_MAINLOOP (sse2_8888_8888_none_OVER,

-		       scaled_nearest_scanline_sse2_8888_8888_OVER,

-		       uint32_t, uint32_t, NONE)

-FAST_NEAREST_MAINLOOP (sse2_8888_8888_pad_OVER,

-		       scaled_nearest_scanline_sse2_8888_8888_OVER,

-		       uint32_t, uint32_t, PAD)

-

-static force_inline void

-scaled_nearest_scanline_sse2_8888_n_8888_OVER (const uint32_t * mask,

-					       uint32_t *       dst,

-					       const uint32_t * src,

-					       int32_t          w,

-					       pixman_fixed_t   vx,

-					       pixman_fixed_t   unit_x,

-					       pixman_fixed_t   max_vx,

-					       pixman_bool_t    zero_src)

-{

-    __m128i xmm_mask;

-    __m128i xmm_src, xmm_src_lo, xmm_src_hi;

-    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;

-    __m128i xmm_alpha_lo, xmm_alpha_hi;

-

-    if (zero_src || (*mask >> 24) == 0)

-	return;

-

-    xmm_mask = create_mask_16_128 (*mask >> 24);

-

-    while (w && (unsigned long)dst & 15)

-    {

-	uint32_t s = src[pixman_fixed_to_int (vx)];

-	vx += unit_x;

-

-	if (s)

-	{

-	    uint32_t d = *dst;

-

-	    __m128i ms = unpack_32_1x128 (s);

-	    __m128i alpha     = expand_alpha_1x128 (ms);

-	    __m128i dest      = xmm_mask;

-	    __m128i alpha_dst = unpack_32_1x128 (d);

-

-	    *dst = pack_1x128_32 (

-		in_over_1x128 (&ms, &alpha, &dest, &alpha_dst));

-	}

-	dst++;

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	uint32_t tmp1, tmp2, tmp3, tmp4;

-

-	tmp1 = src[pixman_fixed_to_int (vx)];

-	vx += unit_x;

-	tmp2 = src[pixman_fixed_to_int (vx)];

-	vx += unit_x;

-	tmp3 = src[pixman_fixed_to_int (vx)];

-	vx += unit_x;

-	tmp4 = src[pixman_fixed_to_int (vx)];

-	vx += unit_x;

-

-	xmm_src = _mm_set_epi32 (tmp4, tmp3, tmp2, tmp1);

-

-	if (!is_zero (xmm_src))

-	{

-	    xmm_dst = load_128_aligned ((__m128i*)dst);

-

-	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);

-	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);

-	    expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,

-			        &xmm_alpha_lo, &xmm_alpha_hi);

-

-	    in_over_2x128 (&xmm_src_lo, &xmm_src_hi,

-			   &xmm_alpha_lo, &xmm_alpha_hi,

-			   &xmm_mask, &xmm_mask,

-			   &xmm_dst_lo, &xmm_dst_hi);

-

-	    save_128_aligned (

-		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));

-	}

-

-	dst += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	uint32_t s = src[pixman_fixed_to_int (vx)];

-	vx += unit_x;

-

-	if (s)

-	{

-	    uint32_t d = *dst;

-

-	    __m128i ms = unpack_32_1x128 (s);

-	    __m128i alpha = expand_alpha_1x128 (ms);

-	    __m128i mask  = xmm_mask;

-	    __m128i dest  = unpack_32_1x128 (d);

-

-	    *dst = pack_1x128_32 (

-		in_over_1x128 (&ms, &alpha, &mask, &dest));

-	}

-

-	dst++;

-	w--;

-    }

-

-}

-

-FAST_NEAREST_MAINLOOP_COMMON (sse2_8888_n_8888_cover_OVER,

-			      scaled_nearest_scanline_sse2_8888_n_8888_OVER,

-			      uint32_t, uint32_t, uint32_t, COVER, TRUE, TRUE)

-FAST_NEAREST_MAINLOOP_COMMON (sse2_8888_n_8888_pad_OVER,

-			      scaled_nearest_scanline_sse2_8888_n_8888_OVER,

-			      uint32_t, uint32_t, uint32_t, PAD, TRUE, TRUE)

-FAST_NEAREST_MAINLOOP_COMMON (sse2_8888_n_8888_none_OVER,

-			      scaled_nearest_scanline_sse2_8888_n_8888_OVER,

-			      uint32_t, uint32_t, uint32_t, NONE, TRUE, TRUE)

-

-static void

-bilinear_interpolate_line_sse2 (uint32_t *       out,

-                                const uint32_t * top,

-                                const uint32_t * bottom,

-                                int              wt,

-                                int              wb,

-                                pixman_fixed_t   x,

-                                pixman_fixed_t   ux,

-                                int              width)

-{

-    const __m128i xmm_wt = _mm_set_epi16 (wt, wt, wt, wt, wt, wt, wt, wt);

-    const __m128i xmm_wb = _mm_set_epi16 (wb, wb, wb, wb, wb, wb, wb, wb);

-    const __m128i xmm_xorc = _mm_set_epi16 (0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff);

-    const __m128i xmm_addc = _mm_set_epi16 (0, 0, 0, 0, 1, 1, 1, 1);

-    const __m128i xmm_ux = _mm_set_epi16 (ux, ux, ux, ux, ux, ux, ux, ux);

-    const __m128i xmm_zero = _mm_setzero_si128 ();

-    __m128i xmm_x = _mm_set_epi16 (x, x, x, x, x, x, x, x);

-    uint32_t pix1, pix2, pix3, pix4;

-

-    #define INTERPOLATE_ONE_PIXEL(pix)						\

-    do {									\

-	__m128i xmm_wh, xmm_lo, xmm_hi, a;					\

-	/* fetch 2x2 pixel block into sse2 register */				\

-	uint32_t tl = top [pixman_fixed_to_int (x)];				\

-	uint32_t tr = top [pixman_fixed_to_int (x) + 1];			\

-	uint32_t bl = bottom [pixman_fixed_to_int (x)];				\

-	uint32_t br = bottom [pixman_fixed_to_int (x) + 1];			\

-	a = _mm_set_epi32 (tr, tl, br, bl);					\

-        x += ux;								\

-	/* vertical interpolation */						\

-	a = _mm_add_epi16 (_mm_mullo_epi16 (_mm_unpackhi_epi8 (a, xmm_zero),	\

-					    xmm_wt),				\

-			   _mm_mullo_epi16 (_mm_unpacklo_epi8 (a, xmm_zero),	\

-					    xmm_wb));				\

-	/* calculate horizontal weights */					\

-	xmm_wh = _mm_add_epi16 (xmm_addc,					\

-				_mm_xor_si128 (xmm_xorc,			\

-					       _mm_srli_epi16 (xmm_x, 8)));	\

-	xmm_x = _mm_add_epi16 (xmm_x, xmm_ux);					\

-	/* horizontal interpolation */						\

-	xmm_lo = _mm_mullo_epi16 (a, xmm_wh);					\

-	xmm_hi = _mm_mulhi_epu16 (a, xmm_wh);					\

-	a = _mm_add_epi32 (_mm_unpacklo_epi16 (xmm_lo, xmm_hi),			\

-			   _mm_unpackhi_epi16 (xmm_lo, xmm_hi));		\

-	/* shift and pack the result */						\

-	a = _mm_srli_epi32 (a, 16);						\

-	a = _mm_packs_epi32 (a, a);						\

-	a = _mm_packus_epi16 (a, a);						\

-	pix = _mm_cvtsi128_si32 (a);						\

-    } while (0)

-

-    while ((width -= 4) >= 0)

-    {

-	INTERPOLATE_ONE_PIXEL (pix1);

-	INTERPOLATE_ONE_PIXEL (pix2);

-	INTERPOLATE_ONE_PIXEL (pix3);

-	INTERPOLATE_ONE_PIXEL (pix4);

-	*out++ = pix1;

-	*out++ = pix2;

-	*out++ = pix3;

-	*out++ = pix4;

-    }

-    if (width & 2)

-    {

-	INTERPOLATE_ONE_PIXEL (pix1);

-	INTERPOLATE_ONE_PIXEL (pix2);

-	*out++ = pix1;

-	*out++ = pix2;

-    }

-    if (width & 1)

-    {

-	INTERPOLATE_ONE_PIXEL (pix1);

-	*out = pix1;

-    }

-

-    #undef INTERPOLATE_ONE_PIXEL

-}

-

-static force_inline void

-scaled_bilinear_scanline_sse2_8888_8888_SRC (uint32_t *       dst,

-					     const uint32_t * mask,

-					     const uint32_t * src_top,

-					     const uint32_t * src_bottom,

-					     int32_t          w,

-					     int              wt,

-					     int              wb,

-					     pixman_fixed_t   vx,

-					     pixman_fixed_t   unit_x,

-					     pixman_fixed_t   max_vx,

-					     pixman_bool_t    zero_src)

-{

-    bilinear_interpolate_line_sse2 (dst, src_top, src_bottom,

-				    wt, wb, vx, unit_x, w);

-}

-

-FAST_BILINEAR_MAINLOOP_COMMON (sse2_8888_8888_cover_SRC,

-			       scaled_bilinear_scanline_sse2_8888_8888_SRC,

-			       uint32_t, uint32_t, uint32_t,

-			       COVER, FALSE, FALSE)

-FAST_BILINEAR_MAINLOOP_COMMON (sse2_8888_8888_pad_SRC,

-			       scaled_bilinear_scanline_sse2_8888_8888_SRC,

-			       uint32_t, uint32_t, uint32_t,

-			       PAD, FALSE, FALSE)

-FAST_BILINEAR_MAINLOOP_COMMON (sse2_8888_8888_none_SRC,

-			       scaled_bilinear_scanline_sse2_8888_8888_SRC,

-			       uint32_t, uint32_t, uint32_t,

-			       NONE, FALSE, FALSE)

-

-static const pixman_fast_path_t sse2_fast_paths[] =

-{

-    /* PIXMAN_OP_OVER */

-    PIXMAN_STD_FAST_PATH (OVER, solid, a8, r5g6b5, sse2_composite_over_n_8_0565),

-    PIXMAN_STD_FAST_PATH (OVER, solid, a8, b5g6r5, sse2_composite_over_n_8_0565),

-    PIXMAN_STD_FAST_PATH (OVER, solid, null, a8r8g8b8, sse2_composite_over_n_8888),

-    PIXMAN_STD_FAST_PATH (OVER, solid, null, x8r8g8b8, sse2_composite_over_n_8888),

-    PIXMAN_STD_FAST_PATH (OVER, solid, null, r5g6b5, sse2_composite_over_n_0565),

-    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, a8r8g8b8, sse2_composite_over_8888_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, x8r8g8b8, sse2_composite_over_8888_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, a8b8g8r8, sse2_composite_over_8888_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, x8b8g8r8, sse2_composite_over_8888_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, r5g6b5, sse2_composite_over_8888_0565),

-    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, b5g6r5, sse2_composite_over_8888_0565),

-    PIXMAN_STD_FAST_PATH (OVER, solid, a8, a8r8g8b8, sse2_composite_over_n_8_8888),

-    PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8r8g8b8, sse2_composite_over_n_8_8888),

-    PIXMAN_STD_FAST_PATH (OVER, solid, a8, a8b8g8r8, sse2_composite_over_n_8_8888),

-    PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8b8g8r8, sse2_composite_over_n_8_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, a8r8g8b8, a8r8g8b8, sse2_composite_over_8888_8888_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, a8, x8r8g8b8, sse2_composite_over_8888_8_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, a8, a8r8g8b8, sse2_composite_over_8888_8_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, a8, x8b8g8r8, sse2_composite_over_8888_8_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, a8, a8b8g8r8, sse2_composite_over_8888_8_8888),

-    PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, a8, x8r8g8b8, sse2_composite_over_x888_8_8888),

-    PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, a8, a8r8g8b8, sse2_composite_over_x888_8_8888),

-    PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, a8, x8b8g8r8, sse2_composite_over_x888_8_8888),

-    PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, a8, a8b8g8r8, sse2_composite_over_x888_8_8888),

-    PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, solid, a8r8g8b8, sse2_composite_over_x888_n_8888),

-    PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, solid, x8r8g8b8, sse2_composite_over_x888_n_8888),

-    PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, solid, a8b8g8r8, sse2_composite_over_x888_n_8888),

-    PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, solid, x8b8g8r8, sse2_composite_over_x888_n_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, a8r8g8b8, sse2_composite_over_8888_n_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, x8r8g8b8, sse2_composite_over_8888_n_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, solid, a8b8g8r8, sse2_composite_over_8888_n_8888),

-    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, solid, x8b8g8r8, sse2_composite_over_8888_n_8888),

-    PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, a8r8g8b8, sse2_composite_over_n_8888_8888_ca),

-    PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, x8r8g8b8, sse2_composite_over_n_8888_8888_ca),

-    PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, a8b8g8r8, sse2_composite_over_n_8888_8888_ca),

-    PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, x8b8g8r8, sse2_composite_over_n_8888_8888_ca),

-    PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, r5g6b5, sse2_composite_over_n_8888_0565_ca),

-    PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, b5g6r5, sse2_composite_over_n_8888_0565_ca),

-    PIXMAN_STD_FAST_PATH (OVER, pixbuf, pixbuf, a8r8g8b8, sse2_composite_over_pixbuf_8888),

-    PIXMAN_STD_FAST_PATH (OVER, pixbuf, pixbuf, x8r8g8b8, sse2_composite_over_pixbuf_8888),

-    PIXMAN_STD_FAST_PATH (OVER, rpixbuf, rpixbuf, a8b8g8r8, sse2_composite_over_pixbuf_8888),

-    PIXMAN_STD_FAST_PATH (OVER, rpixbuf, rpixbuf, x8b8g8r8, sse2_composite_over_pixbuf_8888),

-    PIXMAN_STD_FAST_PATH (OVER, pixbuf, pixbuf, r5g6b5, sse2_composite_over_pixbuf_0565),

-    PIXMAN_STD_FAST_PATH (OVER, rpixbuf, rpixbuf, b5g6r5, sse2_composite_over_pixbuf_0565),

-    PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, null, x8r8g8b8, sse2_composite_copy_area),

-    PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, null, x8b8g8r8, sse2_composite_copy_area),

-    

-    /* PIXMAN_OP_OVER_REVERSE */

-    PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8r8g8b8, sse2_composite_over_reverse_n_8888),

-    PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8b8g8r8, sse2_composite_over_reverse_n_8888),

-

-    /* PIXMAN_OP_ADD */

-    PIXMAN_STD_FAST_PATH_CA (ADD, solid, a8r8g8b8, a8r8g8b8, sse2_composite_add_n_8888_8888_ca),

-    PIXMAN_STD_FAST_PATH (ADD, a8, null, a8, sse2_composite_add_8_8),

-    PIXMAN_STD_FAST_PATH (ADD, a8r8g8b8, null, a8r8g8b8, sse2_composite_add_8888_8888),

-    PIXMAN_STD_FAST_PATH (ADD, a8b8g8r8, null, a8b8g8r8, sse2_composite_add_8888_8888),

-    PIXMAN_STD_FAST_PATH (ADD, solid, a8, a8, sse2_composite_add_n_8_8),

-    PIXMAN_STD_FAST_PATH (ADD, solid, null, a8, sse2_composite_add_n_8),

-

-    /* PIXMAN_OP_SRC */

-    PIXMAN_STD_FAST_PATH (SRC, solid, a8, a8r8g8b8, sse2_composite_src_n_8_8888),

-    PIXMAN_STD_FAST_PATH (SRC, solid, a8, x8r8g8b8, sse2_composite_src_n_8_8888),

-    PIXMAN_STD_FAST_PATH (SRC, solid, a8, a8b8g8r8, sse2_composite_src_n_8_8888),

-    PIXMAN_STD_FAST_PATH (SRC, solid, a8, x8b8g8r8, sse2_composite_src_n_8_8888),

-    PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, a8r8g8b8, sse2_composite_src_x888_8888),

-    PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, a8b8g8r8, sse2_composite_src_x888_8888),

-    PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, a8r8g8b8, sse2_composite_copy_area),

-    PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, a8b8g8r8, sse2_composite_copy_area),

-    PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, x8r8g8b8, sse2_composite_copy_area),

-    PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, x8b8g8r8, sse2_composite_copy_area),

-    PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, x8r8g8b8, sse2_composite_copy_area),

-    PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, x8b8g8r8, sse2_composite_copy_area),

-    PIXMAN_STD_FAST_PATH (SRC, r5g6b5, null, r5g6b5, sse2_composite_copy_area),

-    PIXMAN_STD_FAST_PATH (SRC, b5g6r5, null, b5g6r5, sse2_composite_copy_area),

-

-    /* PIXMAN_OP_IN */

-    PIXMAN_STD_FAST_PATH (IN, a8, null, a8, sse2_composite_in_8_8),

-    PIXMAN_STD_FAST_PATH (IN, solid, a8, a8, sse2_composite_in_n_8_8),

-    PIXMAN_STD_FAST_PATH (IN, solid, null, a8, sse2_composite_in_n_8),

-

-    SIMPLE_NEAREST_FAST_PATH_COVER (OVER, a8r8g8b8, x8r8g8b8, sse2_8888_8888),

-    SIMPLE_NEAREST_FAST_PATH_COVER (OVER, a8b8g8r8, x8b8g8r8, sse2_8888_8888),

-    SIMPLE_NEAREST_FAST_PATH_COVER (OVER, a8r8g8b8, a8r8g8b8, sse2_8888_8888),

-    SIMPLE_NEAREST_FAST_PATH_COVER (OVER, a8b8g8r8, a8b8g8r8, sse2_8888_8888),

-    SIMPLE_NEAREST_FAST_PATH_NONE (OVER, a8r8g8b8, x8r8g8b8, sse2_8888_8888),

-    SIMPLE_NEAREST_FAST_PATH_NONE (OVER, a8b8g8r8, x8b8g8r8, sse2_8888_8888),

-    SIMPLE_NEAREST_FAST_PATH_NONE (OVER, a8r8g8b8, a8r8g8b8, sse2_8888_8888),

-    SIMPLE_NEAREST_FAST_PATH_NONE (OVER, a8b8g8r8, a8b8g8r8, sse2_8888_8888),

-    SIMPLE_NEAREST_FAST_PATH_PAD (OVER, a8r8g8b8, x8r8g8b8, sse2_8888_8888),

-    SIMPLE_NEAREST_FAST_PATH_PAD (OVER, a8b8g8r8, x8b8g8r8, sse2_8888_8888),

-    SIMPLE_NEAREST_FAST_PATH_PAD (OVER, a8r8g8b8, a8r8g8b8, sse2_8888_8888),

-    SIMPLE_NEAREST_FAST_PATH_PAD (OVER, a8b8g8r8, a8b8g8r8, sse2_8888_8888),

-

-    SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8r8g8b8, a8r8g8b8, sse2_8888_n_8888),

-    SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8b8g8r8, a8b8g8r8, sse2_8888_n_8888),

-    SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8r8g8b8, x8r8g8b8, sse2_8888_n_8888),

-    SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8b8g8r8, x8b8g8r8, sse2_8888_n_8888),

-

-    SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, a8r8g8b8, sse2_8888_8888),

-    SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, x8r8g8b8, sse2_8888_8888),

-    SIMPLE_BILINEAR_FAST_PATH (SRC, x8r8g8b8, x8r8g8b8, sse2_8888_8888),

-

-    { PIXMAN_OP_NONE },

-};

-

-static pixman_bool_t

-sse2_blt (pixman_implementation_t *imp,

-          uint32_t *               src_bits,

-          uint32_t *               dst_bits,

-          int                      src_stride,

-          int                      dst_stride,

-          int                      src_bpp,

-          int                      dst_bpp,

-          int                      src_x,

-          int                      src_y,

-          int                      dst_x,

-          int                      dst_y,

-          int                      width,

-          int                      height)

-{

-    if (!pixman_blt_sse2 (

-            src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,

-            src_x, src_y, dst_x, dst_y, width, height))

-

-    {

-	return _pixman_implementation_blt (

-	    imp->delegate,

-	    src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,

-	    src_x, src_y, dst_x, dst_y, width, height);

-    }

-

-    return TRUE;

-}

-

-#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)

-__attribute__((__force_align_arg_pointer__))

-#endif

-static pixman_bool_t

-sse2_fill (pixman_implementation_t *imp,

-           uint32_t *               bits,

-           int                      stride,

-           int                      bpp,

-           int                      x,

-           int                      y,

-           int                      width,

-           int                      height,

-           uint32_t xor)

-{

-    if (!pixman_fill_sse2 (bits, stride, bpp, x, y, width, height, xor))

-    {

-	return _pixman_implementation_fill (

-	    imp->delegate, bits, stride, bpp, x, y, width, height, xor);

-    }

-

-    return TRUE;

-}

-

-static uint32_t *

-sse2_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask)

-{

-    int w = iter->width;

-    __m128i ff000000 = mask_ff000000;

-    uint32_t *dst = iter->buffer;

-    uint32_t *src = (uint32_t *)iter->bits;

-

-    iter->bits += iter->stride;

-

-    while (w && ((unsigned long)dst) & 0x0f)

-    {

-	*dst++ = (*src++) | 0xff000000;

-	w--;

-    }

-

-    while (w >= 4)

-    {

-	save_128_aligned (

-	    (__m128i *)dst, _mm_or_si128 (

-		load_128_unaligned ((__m128i *)src), ff000000));

-

-	dst += 4;

-	src += 4;

-	w -= 4;

-    }

-

-    while (w)

-    {

-	*dst++ = (*src++) | 0xff000000;

-	w--;

-    }

-

-    return iter->buffer;

-}

-

-static uint32_t *

-sse2_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask)

-{

-    int w = iter->width;

-    uint32_t *dst = iter->buffer;

-    uint16_t *src = (uint16_t *)iter->bits;

-    __m128i ff000000 = mask_ff000000;

-

-    iter->bits += iter->stride;

-

-    while (w && ((unsigned long)dst) & 0x0f)

-    {

-	uint16_t s = *src++;

-

-	*dst++ = CONVERT_0565_TO_8888 (s);

-	w--;

-    }

-

-    while (w >= 8)

-    {

-	__m128i lo, hi, s;

-

-	s = _mm_loadu_si128 ((__m128i *)src);

-

-	lo = unpack_565_to_8888 (_mm_unpacklo_epi16 (s, _mm_setzero_si128 ()));

-	hi = unpack_565_to_8888 (_mm_unpackhi_epi16 (s, _mm_setzero_si128 ()));

-

-	save_128_aligned ((__m128i *)(dst + 0), _mm_or_si128 (lo, ff000000));

-	save_128_aligned ((__m128i *)(dst + 4), _mm_or_si128 (hi, ff000000));

-

-	dst += 8;

-	src += 8;

-	w -= 8;

-    }

-

-    while (w)

-    {

-	uint16_t s = *src++;

-

-	*dst++ = CONVERT_0565_TO_8888 (s);

-	w--;

-    }

-

-    return iter->buffer;

-}

-

-static uint32_t *

-sse2_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask)

-{

-    int w = iter->width;

-    uint32_t *dst = iter->buffer;

-    uint8_t *src = iter->bits;

-    __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6;

-

-    iter->bits += iter->stride;

-

-    while (w && (((unsigned long)dst) & 15))

-    {

-        *dst++ = *(src++) << 24;

-        w--;

-    }

-

-    while (w >= 16)

-    {

-	xmm0 = _mm_loadu_si128((__m128i *)src);

-

-	xmm1 = _mm_unpacklo_epi8  (_mm_setzero_si128(), xmm0);

-	xmm2 = _mm_unpackhi_epi8  (_mm_setzero_si128(), xmm0);

-	xmm3 = _mm_unpacklo_epi16 (_mm_setzero_si128(), xmm1);

-	xmm4 = _mm_unpackhi_epi16 (_mm_setzero_si128(), xmm1);

-	xmm5 = _mm_unpacklo_epi16 (_mm_setzero_si128(), xmm2);

-	xmm6 = _mm_unpackhi_epi16 (_mm_setzero_si128(), xmm2);

-

-	_mm_store_si128(((__m128i *)(dst +  0)), xmm3);

-	_mm_store_si128(((__m128i *)(dst +  4)), xmm4);

-	_mm_store_si128(((__m128i *)(dst +  8)), xmm5);

-	_mm_store_si128(((__m128i *)(dst + 12)), xmm6);

-

-	dst += 16;

-	src += 16;

-	w -= 16;

-    }

-

-    while (w)

-    {

-	*dst++ = *(src++) << 24;

-	w--;

-    }

-

-    return iter->buffer;

-}

-

-typedef struct

-{

-    pixman_format_code_t	format;

-    pixman_iter_get_scanline_t	get_scanline;

-} fetcher_info_t;

-

-static const fetcher_info_t fetchers[] =

-{

-    { PIXMAN_x8r8g8b8,		sse2_fetch_x8r8g8b8 },

-    { PIXMAN_r5g6b5,		sse2_fetch_r5g6b5 },

-    { PIXMAN_a8,		sse2_fetch_a8 },

-    { PIXMAN_null }

-};

-

-static void

-sse2_src_iter_init (pixman_implementation_t *imp, pixman_iter_t *iter)

-{

-    pixman_image_t *image = iter->image;

-    int x = iter->x;

-    int y = iter->y;

-    int width = iter->width;

-    int height = iter->height;

-

-#define FLAGS								\

-    (FAST_PATH_STANDARD_FLAGS | FAST_PATH_ID_TRANSFORM)

-

-    if ((iter->flags & ITER_NARROW)				&&

-	(image->common.flags & FLAGS) == FLAGS			&&

-	x >= 0 && y >= 0					&&

-	x + width <= image->bits.width				&&

-	y + height <= image->bits.height)

-    {

-	const fetcher_info_t *f;

-

-	for (f = &fetchers[0]; f->format != PIXMAN_null; f++)

-	{

-	    if (image->common.extended_format_code == f->format)

-	    {

-		uint8_t *b = (uint8_t *)image->bits.bits;

-		int s = image->bits.rowstride * 4;

-

-		iter->bits = b + s * iter->y + x * PIXMAN_FORMAT_BPP (f->format) / 8;

-		iter->stride = s;

-

-		iter->get_scanline = f->get_scanline;

-		return;

-	    }

-	}

-    }

-

-    imp->delegate->src_iter_init (imp->delegate, iter);

-}

-

-#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)

-__attribute__((__force_align_arg_pointer__))

-#endif

-pixman_implementation_t *

-_pixman_implementation_create_sse2 (pixman_implementation_t *fallback)

-{

-    pixman_implementation_t *imp = _pixman_implementation_create (fallback, sse2_fast_paths);

-

-    /* SSE2 constants */

-    mask_565_r  = create_mask_2x32_128 (0x00f80000, 0x00f80000);

-    mask_565_g1 = create_mask_2x32_128 (0x00070000, 0x00070000);

-    mask_565_g2 = create_mask_2x32_128 (0x000000e0, 0x000000e0);

-    mask_565_b  = create_mask_2x32_128 (0x0000001f, 0x0000001f);

-    mask_red   = create_mask_2x32_128 (0x00f80000, 0x00f80000);

-    mask_green = create_mask_2x32_128 (0x0000fc00, 0x0000fc00);

-    mask_blue  = create_mask_2x32_128 (0x000000f8, 0x000000f8);

-    mask_565_fix_rb = create_mask_2x32_128 (0x00e000e0, 0x00e000e0);

-    mask_565_fix_g = create_mask_2x32_128  (0x0000c000, 0x0000c000);

-    mask_0080 = create_mask_16_128 (0x0080);

-    mask_00ff = create_mask_16_128 (0x00ff);

-    mask_0101 = create_mask_16_128 (0x0101);

-    mask_ffff = create_mask_16_128 (0xffff);

-    mask_ff000000 = create_mask_2x32_128 (0xff000000, 0xff000000);

-    mask_alpha = create_mask_2x32_128 (0x00ff0000, 0x00000000);

-

-    /* Set up function pointers */

-    imp->combine_32[PIXMAN_OP_OVER] = sse2_combine_over_u;

-    imp->combine_32[PIXMAN_OP_OVER_REVERSE] = sse2_combine_over_reverse_u;

-    imp->combine_32[PIXMAN_OP_IN] = sse2_combine_in_u;

-    imp->combine_32[PIXMAN_OP_IN_REVERSE] = sse2_combine_in_reverse_u;

-    imp->combine_32[PIXMAN_OP_OUT] = sse2_combine_out_u;

-    imp->combine_32[PIXMAN_OP_OUT_REVERSE] = sse2_combine_out_reverse_u;

-    imp->combine_32[PIXMAN_OP_ATOP] = sse2_combine_atop_u;

-    imp->combine_32[PIXMAN_OP_ATOP_REVERSE] = sse2_combine_atop_reverse_u;

-    imp->combine_32[PIXMAN_OP_XOR] = sse2_combine_xor_u;

-    imp->combine_32[PIXMAN_OP_ADD] = sse2_combine_add_u;

-

-    imp->combine_32[PIXMAN_OP_SATURATE] = sse2_combine_saturate_u;

-

-    imp->combine_32_ca[PIXMAN_OP_SRC] = sse2_combine_src_ca;

-    imp->combine_32_ca[PIXMAN_OP_OVER] = sse2_combine_over_ca;

-    imp->combine_32_ca[PIXMAN_OP_OVER_REVERSE] = sse2_combine_over_reverse_ca;

-    imp->combine_32_ca[PIXMAN_OP_IN] = sse2_combine_in_ca;

-    imp->combine_32_ca[PIXMAN_OP_IN_REVERSE] = sse2_combine_in_reverse_ca;

-    imp->combine_32_ca[PIXMAN_OP_OUT] = sse2_combine_out_ca;

-    imp->combine_32_ca[PIXMAN_OP_OUT_REVERSE] = sse2_combine_out_reverse_ca;

-    imp->combine_32_ca[PIXMAN_OP_ATOP] = sse2_combine_atop_ca;

-    imp->combine_32_ca[PIXMAN_OP_ATOP_REVERSE] = sse2_combine_atop_reverse_ca;

-    imp->combine_32_ca[PIXMAN_OP_XOR] = sse2_combine_xor_ca;

-    imp->combine_32_ca[PIXMAN_OP_ADD] = sse2_combine_add_ca;

-

-    imp->blt = sse2_blt;

-    imp->fill = sse2_fill;

-

-    imp->src_iter_init = sse2_src_iter_init;

-

-    return imp;

-}

+/*
+ * Copyright © 2008 Rodrigo Kumpera
+ * Copyright © 2008 André Tupinambá
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Red Hat not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  Red Hat makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ *
+ * Author:  Rodrigo Kumpera (kumpera@gmail.com)
+ *          André Tupinambá (andrelrt@gmail.com)
+ *
+ * Based on work by Owen Taylor and Søren Sandmann
+ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <xmmintrin.h> /* for _mm_shuffle_pi16 and _MM_SHUFFLE */
+#include <emmintrin.h> /* for SSE2 intrinsics */
+#include "pixman-private.h"
+#include "pixman-combine32.h"
+#include "pixman-fast-path.h"
+
+static __m128i mask_0080;
+static __m128i mask_00ff;
+static __m128i mask_0101;
+static __m128i mask_ffff;
+static __m128i mask_ff000000;
+static __m128i mask_alpha;
+
+static __m128i mask_565_r;
+static __m128i mask_565_g1, mask_565_g2;
+static __m128i mask_565_b;
+static __m128i mask_red;
+static __m128i mask_green;
+static __m128i mask_blue;
+
+static __m128i mask_565_fix_rb;
+static __m128i mask_565_fix_g;
+
+static force_inline __m128i
+unpack_32_1x128 (uint32_t data)
+{
+    return _mm_unpacklo_epi8 (_mm_cvtsi32_si128 (data), _mm_setzero_si128 ());
+}
+
+static force_inline void
+unpack_128_2x128 (__m128i data, __m128i* data_lo, __m128i* data_hi)
+{
+    *data_lo = _mm_unpacklo_epi8 (data, _mm_setzero_si128 ());
+    *data_hi = _mm_unpackhi_epi8 (data, _mm_setzero_si128 ());
+}
+
+static force_inline __m128i
+unpack_565_to_8888 (__m128i lo)
+{
+    __m128i r, g, b, rb, t;
+
+    r = _mm_and_si128 (_mm_slli_epi32 (lo, 8), mask_red);
+    g = _mm_and_si128 (_mm_slli_epi32 (lo, 5), mask_green);
+    b = _mm_and_si128 (_mm_slli_epi32 (lo, 3), mask_blue);
+
+    rb = _mm_or_si128 (r, b);
+    t  = _mm_and_si128 (rb, mask_565_fix_rb);
+    t  = _mm_srli_epi32 (t, 5);
+    rb = _mm_or_si128 (rb, t);
+
+    t  = _mm_and_si128 (g, mask_565_fix_g);
+    t  = _mm_srli_epi32 (t, 6);
+    g  = _mm_or_si128 (g, t);
+
+    return _mm_or_si128 (rb, g);
+}
+
+static force_inline void
+unpack_565_128_4x128 (__m128i  data,
+                      __m128i* data0,
+                      __m128i* data1,
+                      __m128i* data2,
+                      __m128i* data3)
+{
+    __m128i lo, hi;
+
+    lo = _mm_unpacklo_epi16 (data, _mm_setzero_si128 ());
+    hi = _mm_unpackhi_epi16 (data, _mm_setzero_si128 ());
+
+    lo = unpack_565_to_8888 (lo);
+    hi = unpack_565_to_8888 (hi);
+
+    unpack_128_2x128 (lo, data0, data1);
+    unpack_128_2x128 (hi, data2, data3);
+}
+
+static force_inline uint16_t
+pack_565_32_16 (uint32_t pixel)
+{
+    return (uint16_t) (((pixel >> 8) & 0xf800) |
+		       ((pixel >> 5) & 0x07e0) |
+		       ((pixel >> 3) & 0x001f));
+}
+
+static force_inline __m128i
+pack_2x128_128 (__m128i lo, __m128i hi)
+{
+    return _mm_packus_epi16 (lo, hi);
+}
+
+static force_inline __m128i
+pack_565_2x128_128 (__m128i lo, __m128i hi)
+{
+    __m128i data;
+    __m128i r, g1, g2, b;
+
+    data = pack_2x128_128 (lo, hi);
+
+    r  = _mm_and_si128 (data, mask_565_r);
+    g1 = _mm_and_si128 (_mm_slli_epi32 (data, 3), mask_565_g1);
+    g2 = _mm_and_si128 (_mm_srli_epi32 (data, 5), mask_565_g2);
+    b  = _mm_and_si128 (_mm_srli_epi32 (data, 3), mask_565_b);
+
+    return _mm_or_si128 (_mm_or_si128 (_mm_or_si128 (r, g1), g2), b);
+}
+
+static force_inline __m128i
+pack_565_4x128_128 (__m128i* xmm0, __m128i* xmm1, __m128i* xmm2, __m128i* xmm3)
+{
+    return _mm_packus_epi16 (pack_565_2x128_128 (*xmm0, *xmm1),
+			     pack_565_2x128_128 (*xmm2, *xmm3));
+}
+
+static force_inline int
+is_opaque (__m128i x)
+{
+    __m128i ffs = _mm_cmpeq_epi8 (x, x);
+
+    return (_mm_movemask_epi8 (_mm_cmpeq_epi8 (x, ffs)) & 0x8888) == 0x8888;
+}
+
+static force_inline int
+is_zero (__m128i x)
+{
+    return _mm_movemask_epi8 (
+	_mm_cmpeq_epi8 (x, _mm_setzero_si128 ())) == 0xffff;
+}
+
+static force_inline int
+is_transparent (__m128i x)
+{
+    return (_mm_movemask_epi8 (
+		_mm_cmpeq_epi8 (x, _mm_setzero_si128 ())) & 0x8888) == 0x8888;
+}
+
+static force_inline __m128i
+expand_pixel_32_1x128 (uint32_t data)
+{
+    return _mm_shuffle_epi32 (unpack_32_1x128 (data), _MM_SHUFFLE (1, 0, 1, 0));
+}
+
+static force_inline __m128i
+expand_alpha_1x128 (__m128i data)
+{
+    return _mm_shufflehi_epi16 (_mm_shufflelo_epi16 (data,
+						     _MM_SHUFFLE (3, 3, 3, 3)),
+				_MM_SHUFFLE (3, 3, 3, 3));
+}
+
+static force_inline void
+expand_alpha_2x128 (__m128i  data_lo,
+                    __m128i  data_hi,
+                    __m128i* alpha_lo,
+                    __m128i* alpha_hi)
+{
+    __m128i lo, hi;
+
+    lo = _mm_shufflelo_epi16 (data_lo, _MM_SHUFFLE (3, 3, 3, 3));
+    hi = _mm_shufflelo_epi16 (data_hi, _MM_SHUFFLE (3, 3, 3, 3));
+
+    *alpha_lo = _mm_shufflehi_epi16 (lo, _MM_SHUFFLE (3, 3, 3, 3));
+    *alpha_hi = _mm_shufflehi_epi16 (hi, _MM_SHUFFLE (3, 3, 3, 3));
+}
+
+static force_inline void
+expand_alpha_rev_2x128 (__m128i  data_lo,
+                        __m128i  data_hi,
+                        __m128i* alpha_lo,
+                        __m128i* alpha_hi)
+{
+    __m128i lo, hi;
+
+    lo = _mm_shufflelo_epi16 (data_lo, _MM_SHUFFLE (0, 0, 0, 0));
+    hi = _mm_shufflelo_epi16 (data_hi, _MM_SHUFFLE (0, 0, 0, 0));
+    *alpha_lo = _mm_shufflehi_epi16 (lo, _MM_SHUFFLE (0, 0, 0, 0));
+    *alpha_hi = _mm_shufflehi_epi16 (hi, _MM_SHUFFLE (0, 0, 0, 0));
+}
+
+static force_inline void
+pix_multiply_2x128 (__m128i* data_lo,
+                    __m128i* data_hi,
+                    __m128i* alpha_lo,
+                    __m128i* alpha_hi,
+                    __m128i* ret_lo,
+                    __m128i* ret_hi)
+{
+    __m128i lo, hi;
+
+    lo = _mm_mullo_epi16 (*data_lo, *alpha_lo);
+    hi = _mm_mullo_epi16 (*data_hi, *alpha_hi);
+    lo = _mm_adds_epu16 (lo, mask_0080);
+    hi = _mm_adds_epu16 (hi, mask_0080);
+    *ret_lo = _mm_mulhi_epu16 (lo, mask_0101);
+    *ret_hi = _mm_mulhi_epu16 (hi, mask_0101);
+}
+
+static force_inline void
+pix_add_multiply_2x128 (__m128i* src_lo,
+                        __m128i* src_hi,
+                        __m128i* alpha_dst_lo,
+                        __m128i* alpha_dst_hi,
+                        __m128i* dst_lo,
+                        __m128i* dst_hi,
+                        __m128i* alpha_src_lo,
+                        __m128i* alpha_src_hi,
+                        __m128i* ret_lo,
+                        __m128i* ret_hi)
+{
+    __m128i t1_lo, t1_hi;
+    __m128i t2_lo, t2_hi;
+
+    pix_multiply_2x128 (src_lo, src_hi, alpha_dst_lo, alpha_dst_hi, &t1_lo, &t1_hi);
+    pix_multiply_2x128 (dst_lo, dst_hi, alpha_src_lo, alpha_src_hi, &t2_lo, &t2_hi);
+
+    *ret_lo = _mm_adds_epu8 (t1_lo, t2_lo);
+    *ret_hi = _mm_adds_epu8 (t1_hi, t2_hi);
+}
+
+static force_inline void
+negate_2x128 (__m128i  data_lo,
+              __m128i  data_hi,
+              __m128i* neg_lo,
+              __m128i* neg_hi)
+{
+    *neg_lo = _mm_xor_si128 (data_lo, mask_00ff);
+    *neg_hi = _mm_xor_si128 (data_hi, mask_00ff);
+}
+
+static force_inline void
+invert_colors_2x128 (__m128i  data_lo,
+                     __m128i  data_hi,
+                     __m128i* inv_lo,
+                     __m128i* inv_hi)
+{
+    __m128i lo, hi;
+
+    lo = _mm_shufflelo_epi16 (data_lo, _MM_SHUFFLE (3, 0, 1, 2));
+    hi = _mm_shufflelo_epi16 (data_hi, _MM_SHUFFLE (3, 0, 1, 2));
+    *inv_lo = _mm_shufflehi_epi16 (lo, _MM_SHUFFLE (3, 0, 1, 2));
+    *inv_hi = _mm_shufflehi_epi16 (hi, _MM_SHUFFLE (3, 0, 1, 2));
+}
+
+static force_inline void
+over_2x128 (__m128i* src_lo,
+            __m128i* src_hi,
+            __m128i* alpha_lo,
+            __m128i* alpha_hi,
+            __m128i* dst_lo,
+            __m128i* dst_hi)
+{
+    __m128i t1, t2;
+
+    negate_2x128 (*alpha_lo, *alpha_hi, &t1, &t2);
+
+    pix_multiply_2x128 (dst_lo, dst_hi, &t1, &t2, dst_lo, dst_hi);
+
+    *dst_lo = _mm_adds_epu8 (*src_lo, *dst_lo);
+    *dst_hi = _mm_adds_epu8 (*src_hi, *dst_hi);
+}
+
+static force_inline void
+over_rev_non_pre_2x128 (__m128i  src_lo,
+                        __m128i  src_hi,
+                        __m128i* dst_lo,
+                        __m128i* dst_hi)
+{
+    __m128i lo, hi;
+    __m128i alpha_lo, alpha_hi;
+
+    expand_alpha_2x128 (src_lo, src_hi, &alpha_lo, &alpha_hi);
+
+    lo = _mm_or_si128 (alpha_lo, mask_alpha);
+    hi = _mm_or_si128 (alpha_hi, mask_alpha);
+
+    invert_colors_2x128 (src_lo, src_hi, &src_lo, &src_hi);
+
+    pix_multiply_2x128 (&src_lo, &src_hi, &lo, &hi, &lo, &hi);
+
+    over_2x128 (&lo, &hi, &alpha_lo, &alpha_hi, dst_lo, dst_hi);
+}
+
+static force_inline void
+in_over_2x128 (__m128i* src_lo,
+               __m128i* src_hi,
+               __m128i* alpha_lo,
+               __m128i* alpha_hi,
+               __m128i* mask_lo,
+               __m128i* mask_hi,
+               __m128i* dst_lo,
+               __m128i* dst_hi)
+{
+    __m128i s_lo, s_hi;
+    __m128i a_lo, a_hi;
+
+    pix_multiply_2x128 (src_lo,   src_hi, mask_lo, mask_hi, &s_lo, &s_hi);
+    pix_multiply_2x128 (alpha_lo, alpha_hi, mask_lo, mask_hi, &a_lo, &a_hi);
+
+    over_2x128 (&s_lo, &s_hi, &a_lo, &a_hi, dst_lo, dst_hi);
+}
+
+/* load 4 pixels from a 16-byte boundary aligned address */
+static force_inline __m128i
+load_128_aligned (__m128i* src)
+{
+    return _mm_load_si128 (src);
+}
+
+/* load 4 pixels from a unaligned address */
+static force_inline __m128i
+load_128_unaligned (const __m128i* src)
+{
+    return _mm_loadu_si128 (src);
+}
+
+/* save 4 pixels using Write Combining memory on a 16-byte
+ * boundary aligned address
+ */
+static force_inline void
+save_128_write_combining (__m128i* dst,
+                          __m128i  data)
+{
+    _mm_stream_si128 (dst, data);
+}
+
+/* save 4 pixels on a 16-byte boundary aligned address */
+static force_inline void
+save_128_aligned (__m128i* dst,
+                  __m128i  data)
+{
+    _mm_store_si128 (dst, data);
+}
+
+/* save 4 pixels on a unaligned address */
+static force_inline void
+save_128_unaligned (__m128i* dst,
+                    __m128i  data)
+{
+    _mm_storeu_si128 (dst, data);
+}
+
+static force_inline __m128i
+load_32_1x128 (uint32_t data)
+{
+    return _mm_cvtsi32_si128 (data);
+}
+
+static force_inline __m128i
+expand_alpha_rev_1x128 (__m128i data)
+{
+    return _mm_shufflelo_epi16 (data, _MM_SHUFFLE (0, 0, 0, 0));
+}
+
+static force_inline __m128i
+expand_pixel_8_1x128 (uint8_t data)
+{
+    return _mm_shufflelo_epi16 (
+	unpack_32_1x128 ((uint32_t)data), _MM_SHUFFLE (0, 0, 0, 0));
+}
+
+static force_inline __m128i
+pix_multiply_1x128 (__m128i data,
+		    __m128i alpha)
+{
+    return _mm_mulhi_epu16 (_mm_adds_epu16 (_mm_mullo_epi16 (data, alpha),
+					    mask_0080),
+			    mask_0101);
+}
+
+static force_inline __m128i
+pix_add_multiply_1x128 (__m128i* src,
+			__m128i* alpha_dst,
+			__m128i* dst,
+			__m128i* alpha_src)
+{
+    __m128i t1 = pix_multiply_1x128 (*src, *alpha_dst);
+    __m128i t2 = pix_multiply_1x128 (*dst, *alpha_src);
+
+    return _mm_adds_epu8 (t1, t2);
+}
+
+static force_inline __m128i
+negate_1x128 (__m128i data)
+{
+    return _mm_xor_si128 (data, mask_00ff);
+}
+
+static force_inline __m128i
+invert_colors_1x128 (__m128i data)
+{
+    return _mm_shufflelo_epi16 (data, _MM_SHUFFLE (3, 0, 1, 2));
+}
+
+static force_inline __m128i
+over_1x128 (__m128i src, __m128i alpha, __m128i dst)
+{
+    return _mm_adds_epu8 (src, pix_multiply_1x128 (dst, negate_1x128 (alpha)));
+}
+
+static force_inline __m128i
+in_over_1x128 (__m128i* src, __m128i* alpha, __m128i* mask, __m128i* dst)
+{
+    return over_1x128 (pix_multiply_1x128 (*src, *mask),
+		       pix_multiply_1x128 (*alpha, *mask),
+		       *dst);
+}
+
+static force_inline __m128i
+over_rev_non_pre_1x128 (__m128i src, __m128i dst)
+{
+    __m128i alpha = expand_alpha_1x128 (src);
+
+    return over_1x128 (pix_multiply_1x128 (invert_colors_1x128 (src),
+					   _mm_or_si128 (alpha, mask_alpha)),
+		       alpha,
+		       dst);
+}
+
+static force_inline uint32_t
+pack_1x128_32 (__m128i data)
+{
+    return _mm_cvtsi128_si32 (_mm_packus_epi16 (data, _mm_setzero_si128 ()));
+}
+
+static force_inline __m128i
+expand565_16_1x128 (uint16_t pixel)
+{
+    __m128i m = _mm_cvtsi32_si128 (pixel);
+
+    m = unpack_565_to_8888 (m);
+
+    return _mm_unpacklo_epi8 (m, _mm_setzero_si128 ());
+}
+
+static force_inline uint32_t
+core_combine_over_u_pixel_sse2 (uint32_t src, uint32_t dst)
+{
+    uint8_t a;
+    __m128i xmms;
+
+    a = src >> 24;
+
+    if (a == 0xff)
+    {
+	return src;
+    }
+    else if (src)
+    {
+	xmms = unpack_32_1x128 (src);
+	return pack_1x128_32 (
+	    over_1x128 (xmms, expand_alpha_1x128 (xmms),
+			unpack_32_1x128 (dst)));
+    }
+
+    return dst;
+}
+
+static force_inline uint32_t
+combine1 (const uint32_t *ps, const uint32_t *pm)
+{
+    uint32_t s = *ps;
+
+    if (pm)
+    {
+	__m128i ms, mm;
+
+	mm = unpack_32_1x128 (*pm);
+	mm = expand_alpha_1x128 (mm);
+
+	ms = unpack_32_1x128 (s);
+	ms = pix_multiply_1x128 (ms, mm);
+
+	s = pack_1x128_32 (ms);
+    }
+
+    return s;
+}
+
+static force_inline __m128i
+combine4 (const __m128i *ps, const __m128i *pm)
+{
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_msk_lo, xmm_msk_hi;
+    __m128i s;
+
+    if (pm)
+    {
+	xmm_msk_lo = load_128_unaligned (pm);
+
+	if (is_transparent (xmm_msk_lo))
+	    return _mm_setzero_si128 ();
+    }
+
+    s = load_128_unaligned (ps);
+
+    if (pm)
+    {
+	unpack_128_2x128 (s, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_msk_lo, &xmm_msk_lo, &xmm_msk_hi);
+
+	expand_alpha_2x128 (xmm_msk_lo, xmm_msk_hi, &xmm_msk_lo, &xmm_msk_hi);
+
+	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,
+			    &xmm_msk_lo, &xmm_msk_hi,
+			    &xmm_src_lo, &xmm_src_hi);
+
+	s = pack_2x128_128 (xmm_src_lo, xmm_src_hi);
+    }
+
+    return s;
+}
+
+static force_inline void
+core_combine_over_u_sse2_mask (uint32_t *	  pd,
+			       const uint32_t*    ps,
+			       const uint32_t*    pm,
+			       int                w)
+{
+    uint32_t s, d;
+
+    /* Align dst on a 16-byte boundary */
+    while (w && ((unsigned long)pd & 15))
+    {
+	d = *pd;
+	s = combine1 (ps, pm);
+
+	if (s)
+	    *pd = core_combine_over_u_pixel_sse2 (s, d);
+	pd++;
+	ps++;
+	pm++;
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	__m128i mask = load_128_unaligned ((__m128i *)pm);
+
+	if (!is_zero (mask))
+	{
+	    __m128i src;
+	    __m128i src_hi, src_lo;
+	    __m128i mask_hi, mask_lo;
+	    __m128i alpha_hi, alpha_lo;
+
+	    src = load_128_unaligned ((__m128i *)ps);
+
+	    if (is_opaque (_mm_and_si128 (src, mask)))
+	    {
+		save_128_aligned ((__m128i *)pd, src);
+	    }
+	    else
+	    {
+		__m128i dst = load_128_aligned ((__m128i *)pd);
+		__m128i dst_hi, dst_lo;
+
+		unpack_128_2x128 (mask, &mask_lo, &mask_hi);
+		unpack_128_2x128 (src, &src_lo, &src_hi);
+
+		expand_alpha_2x128 (mask_lo, mask_hi, &mask_lo, &mask_hi);
+		pix_multiply_2x128 (&src_lo, &src_hi,
+				    &mask_lo, &mask_hi,
+				    &src_lo, &src_hi);
+
+		unpack_128_2x128 (dst, &dst_lo, &dst_hi);
+
+		expand_alpha_2x128 (src_lo, src_hi,
+				    &alpha_lo, &alpha_hi);
+
+		over_2x128 (&src_lo, &src_hi, &alpha_lo, &alpha_hi,
+			    &dst_lo, &dst_hi);
+
+		save_128_aligned (
+		    (__m128i *)pd,
+		    pack_2x128_128 (dst_lo, dst_hi));
+	    }
+	}
+
+	pm += 4;
+	ps += 4;
+	pd += 4;
+	w -= 4;
+    }
+    while (w)
+    {
+	d = *pd;
+	s = combine1 (ps, pm);
+
+	if (s)
+	    *pd = core_combine_over_u_pixel_sse2 (s, d);
+	pd++;
+	ps++;
+	pm++;
+
+	w--;
+    }
+}
+
+static force_inline void
+core_combine_over_u_sse2_no_mask (uint32_t *	  pd,
+				  const uint32_t*    ps,
+				  int                w)
+{
+    uint32_t s, d;
+
+    /* Align dst on a 16-byte boundary */
+    while (w && ((unsigned long)pd & 15))
+    {
+	d = *pd;
+	s = *ps;
+
+	if (s)
+	    *pd = core_combine_over_u_pixel_sse2 (s, d);
+	pd++;
+	ps++;
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	__m128i src;
+	__m128i src_hi, src_lo, dst_hi, dst_lo;
+	__m128i alpha_hi, alpha_lo;
+
+	src = load_128_unaligned ((__m128i *)ps);
+
+	if (!is_zero (src))
+	{
+	    if (is_opaque (src))
+	    {
+		save_128_aligned ((__m128i *)pd, src);
+	    }
+	    else
+	    {
+		__m128i dst = load_128_aligned ((__m128i *)pd);
+
+		unpack_128_2x128 (src, &src_lo, &src_hi);
+		unpack_128_2x128 (dst, &dst_lo, &dst_hi);
+
+		expand_alpha_2x128 (src_lo, src_hi,
+				    &alpha_lo, &alpha_hi);
+		over_2x128 (&src_lo, &src_hi, &alpha_lo, &alpha_hi,
+			    &dst_lo, &dst_hi);
+
+		save_128_aligned (
+		    (__m128i *)pd,
+		    pack_2x128_128 (dst_lo, dst_hi));
+	    }
+	}
+
+	ps += 4;
+	pd += 4;
+	w -= 4;
+    }
+    while (w)
+    {
+	d = *pd;
+	s = *ps;
+
+	if (s)
+	    *pd = core_combine_over_u_pixel_sse2 (s, d);
+	pd++;
+	ps++;
+
+	w--;
+    }
+}
+
+static force_inline void
+sse2_combine_over_u (pixman_implementation_t *imp,
+                     pixman_op_t              op,
+                     uint32_t *               pd,
+                     const uint32_t *         ps,
+                     const uint32_t *         pm,
+                     int                      w)
+{
+    if (pm)
+	core_combine_over_u_sse2_mask (pd, ps, pm, w);
+    else
+	core_combine_over_u_sse2_no_mask (pd, ps, w);
+}
+
+static void
+sse2_combine_over_reverse_u (pixman_implementation_t *imp,
+                             pixman_op_t              op,
+                             uint32_t *               pd,
+                             const uint32_t *         ps,
+                             const uint32_t *         pm,
+                             int                      w)
+{
+    uint32_t s, d;
+
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_alpha_lo, xmm_alpha_hi;
+
+    /* Align dst on a 16-byte boundary */
+    while (w &&
+           ((unsigned long)pd & 15))
+    {
+	d = *pd;
+	s = combine1 (ps, pm);
+
+	*pd++ = core_combine_over_u_pixel_sse2 (d, s);
+	w--;
+	ps++;
+	if (pm)
+	    pm++;
+    }
+
+    while (w >= 4)
+    {
+	/* I'm loading unaligned because I'm not sure
+	 * about the address alignment.
+	 */
+	xmm_src_hi = combine4 ((__m128i*)ps, (__m128i*)pm);
+	xmm_dst_hi = load_128_aligned ((__m128i*) pd);
+
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+
+	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi);
+
+	over_2x128 (&xmm_dst_lo, &xmm_dst_hi,
+		    &xmm_alpha_lo, &xmm_alpha_hi,
+		    &xmm_src_lo, &xmm_src_hi);
+
+	/* rebuid the 4 pixel data and save*/
+	save_128_aligned ((__m128i*)pd,
+			  pack_2x128_128 (xmm_src_lo, xmm_src_hi));
+
+	w -= 4;
+	ps += 4;
+	pd += 4;
+
+	if (pm)
+	    pm += 4;
+    }
+
+    while (w)
+    {
+	d = *pd;
+	s = combine1 (ps, pm);
+
+	*pd++ = core_combine_over_u_pixel_sse2 (d, s);
+	ps++;
+	w--;
+	if (pm)
+	    pm++;
+    }
+}
+
+static force_inline uint32_t
+core_combine_in_u_pixel_sse2 (uint32_t src, uint32_t dst)
+{
+    uint32_t maska = src >> 24;
+
+    if (maska == 0)
+    {
+	return 0;
+    }
+    else if (maska != 0xff)
+    {
+	return pack_1x128_32 (
+	    pix_multiply_1x128 (unpack_32_1x128 (dst),
+				expand_alpha_1x128 (unpack_32_1x128 (src))));
+    }
+
+    return dst;
+}
+
+static void
+sse2_combine_in_u (pixman_implementation_t *imp,
+                   pixman_op_t              op,
+                   uint32_t *               pd,
+                   const uint32_t *         ps,
+                   const uint32_t *         pm,
+                   int                      w)
+{
+    uint32_t s, d;
+
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+
+    while (w && ((unsigned long) pd & 15))
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	*pd++ = core_combine_in_u_pixel_sse2 (d, s);
+	w--;
+	ps++;
+	if (pm)
+	    pm++;
+    }
+
+    while (w >= 4)
+    {
+	xmm_dst_hi = load_128_aligned ((__m128i*) pd);
+	xmm_src_hi = combine4 ((__m128i*) ps, (__m128i*) pm);
+
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,
+			    &xmm_dst_lo, &xmm_dst_hi,
+			    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned ((__m128i*)pd,
+			  pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	w -= 4;
+	if (pm)
+	    pm += 4;
+    }
+
+    while (w)
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	*pd++ = core_combine_in_u_pixel_sse2 (d, s);
+	w--;
+	ps++;
+	if (pm)
+	    pm++;
+    }
+}
+
+static void
+sse2_combine_in_reverse_u (pixman_implementation_t *imp,
+                           pixman_op_t              op,
+                           uint32_t *               pd,
+                           const uint32_t *         ps,
+                           const uint32_t *         pm,
+                           int                      w)
+{
+    uint32_t s, d;
+
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+
+    while (w && ((unsigned long) pd & 15))
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	*pd++ = core_combine_in_u_pixel_sse2 (s, d);
+	ps++;
+	w--;
+	if (pm)
+	    pm++;
+    }
+
+    while (w >= 4)
+    {
+	xmm_dst_hi = load_128_aligned ((__m128i*) pd);
+	xmm_src_hi = combine4 ((__m128i*) ps, (__m128i*)pm);
+
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+	pix_multiply_2x128 (&xmm_dst_lo, &xmm_dst_hi,
+			    &xmm_src_lo, &xmm_src_hi,
+			    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	w -= 4;
+	if (pm)
+	    pm += 4;
+    }
+
+    while (w)
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	*pd++ = core_combine_in_u_pixel_sse2 (s, d);
+	w--;
+	ps++;
+	if (pm)
+	    pm++;
+    }
+}
+
+static void
+sse2_combine_out_reverse_u (pixman_implementation_t *imp,
+                            pixman_op_t              op,
+                            uint32_t *               pd,
+                            const uint32_t *         ps,
+                            const uint32_t *         pm,
+                            int                      w)
+{
+    while (w && ((unsigned long) pd & 15))
+    {
+	uint32_t s = combine1 (ps, pm);
+	uint32_t d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (
+		unpack_32_1x128 (d), negate_1x128 (
+		    expand_alpha_1x128 (unpack_32_1x128 (s)))));
+
+	if (pm)
+	    pm++;
+	ps++;
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	__m128i xmm_src_lo, xmm_src_hi;
+	__m128i xmm_dst_lo, xmm_dst_hi;
+
+	xmm_src_hi = combine4 ((__m128i*)ps, (__m128i*)pm);
+	xmm_dst_hi = load_128_aligned ((__m128i*) pd);
+
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+
+	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	negate_2x128       (xmm_src_lo, xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+
+	pix_multiply_2x128 (&xmm_dst_lo, &xmm_dst_hi,
+			    &xmm_src_lo, &xmm_src_hi,
+			    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	if (pm)
+	    pm += 4;
+
+	w -= 4;
+    }
+
+    while (w)
+    {
+	uint32_t s = combine1 (ps, pm);
+	uint32_t d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (
+		unpack_32_1x128 (d), negate_1x128 (
+		    expand_alpha_1x128 (unpack_32_1x128 (s)))));
+	ps++;
+	if (pm)
+	    pm++;
+	w--;
+    }
+}
+
+static void
+sse2_combine_out_u (pixman_implementation_t *imp,
+                    pixman_op_t              op,
+                    uint32_t *               pd,
+                    const uint32_t *         ps,
+                    const uint32_t *         pm,
+                    int                      w)
+{
+    while (w && ((unsigned long) pd & 15))
+    {
+	uint32_t s = combine1 (ps, pm);
+	uint32_t d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (
+		unpack_32_1x128 (s), negate_1x128 (
+		    expand_alpha_1x128 (unpack_32_1x128 (d)))));
+	w--;
+	ps++;
+	if (pm)
+	    pm++;
+    }
+
+    while (w >= 4)
+    {
+	__m128i xmm_src_lo, xmm_src_hi;
+	__m128i xmm_dst_lo, xmm_dst_hi;
+
+	xmm_src_hi = combine4 ((__m128i*) ps, (__m128i*)pm);
+	xmm_dst_hi = load_128_aligned ((__m128i*) pd);
+
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+
+	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+	negate_2x128       (xmm_dst_lo, xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+
+	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,
+			    &xmm_dst_lo, &xmm_dst_hi,
+			    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	w -= 4;
+	if (pm)
+	    pm += 4;
+    }
+
+    while (w)
+    {
+	uint32_t s = combine1 (ps, pm);
+	uint32_t d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (
+		unpack_32_1x128 (s), negate_1x128 (
+		    expand_alpha_1x128 (unpack_32_1x128 (d)))));
+	w--;
+	ps++;
+	if (pm)
+	    pm++;
+    }
+}
+
+static force_inline uint32_t
+core_combine_atop_u_pixel_sse2 (uint32_t src,
+                                uint32_t dst)
+{
+    __m128i s = unpack_32_1x128 (src);
+    __m128i d = unpack_32_1x128 (dst);
+
+    __m128i sa = negate_1x128 (expand_alpha_1x128 (s));
+    __m128i da = expand_alpha_1x128 (d);
+
+    return pack_1x128_32 (pix_add_multiply_1x128 (&s, &da, &d, &sa));
+}
+
+static void
+sse2_combine_atop_u (pixman_implementation_t *imp,
+                     pixman_op_t              op,
+                     uint32_t *               pd,
+                     const uint32_t *         ps,
+                     const uint32_t *         pm,
+                     int                      w)
+{
+    uint32_t s, d;
+
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_alpha_src_lo, xmm_alpha_src_hi;
+    __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi;
+
+    while (w && ((unsigned long) pd & 15))
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	*pd++ = core_combine_atop_u_pixel_sse2 (s, d);
+	w--;
+	ps++;
+	if (pm)
+	    pm++;
+    }
+
+    while (w >= 4)
+    {
+	xmm_src_hi = combine4 ((__m128i*)ps, (__m128i*)pm);
+	xmm_dst_hi = load_128_aligned ((__m128i*) pd);
+
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+
+	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+			    &xmm_alpha_src_lo, &xmm_alpha_src_hi);
+	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,
+			    &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);
+
+	negate_2x128 (xmm_alpha_src_lo, xmm_alpha_src_hi,
+		      &xmm_alpha_src_lo, &xmm_alpha_src_hi);
+
+	pix_add_multiply_2x128 (
+	    &xmm_src_lo, &xmm_src_hi, &xmm_alpha_dst_lo, &xmm_alpha_dst_hi,
+	    &xmm_dst_lo, &xmm_dst_hi, &xmm_alpha_src_lo, &xmm_alpha_src_hi,
+	    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	w -= 4;
+	if (pm)
+	    pm += 4;
+    }
+
+    while (w)
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	*pd++ = core_combine_atop_u_pixel_sse2 (s, d);
+	w--;
+	ps++;
+	if (pm)
+	    pm++;
+    }
+}
+
+static force_inline uint32_t
+core_combine_reverse_atop_u_pixel_sse2 (uint32_t src,
+                                        uint32_t dst)
+{
+    __m128i s = unpack_32_1x128 (src);
+    __m128i d = unpack_32_1x128 (dst);
+
+    __m128i sa = expand_alpha_1x128 (s);
+    __m128i da = negate_1x128 (expand_alpha_1x128 (d));
+
+    return pack_1x128_32 (pix_add_multiply_1x128 (&s, &da, &d, &sa));
+}
+
+static void
+sse2_combine_atop_reverse_u (pixman_implementation_t *imp,
+                             pixman_op_t              op,
+                             uint32_t *               pd,
+                             const uint32_t *         ps,
+                             const uint32_t *         pm,
+                             int                      w)
+{
+    uint32_t s, d;
+
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_alpha_src_lo, xmm_alpha_src_hi;
+    __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi;
+
+    while (w && ((unsigned long) pd & 15))
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	*pd++ = core_combine_reverse_atop_u_pixel_sse2 (s, d);
+	ps++;
+	w--;
+	if (pm)
+	    pm++;
+    }
+
+    while (w >= 4)
+    {
+	xmm_src_hi = combine4 ((__m128i*)ps, (__m128i*)pm);
+	xmm_dst_hi = load_128_aligned ((__m128i*) pd);
+
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+
+	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+			    &xmm_alpha_src_lo, &xmm_alpha_src_hi);
+	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,
+			    &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);
+
+	negate_2x128 (xmm_alpha_dst_lo, xmm_alpha_dst_hi,
+		      &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);
+
+	pix_add_multiply_2x128 (
+	    &xmm_src_lo, &xmm_src_hi, &xmm_alpha_dst_lo, &xmm_alpha_dst_hi,
+	    &xmm_dst_lo, &xmm_dst_hi, &xmm_alpha_src_lo, &xmm_alpha_src_hi,
+	    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	w -= 4;
+	if (pm)
+	    pm += 4;
+    }
+
+    while (w)
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	*pd++ = core_combine_reverse_atop_u_pixel_sse2 (s, d);
+	ps++;
+	w--;
+	if (pm)
+	    pm++;
+    }
+}
+
+static force_inline uint32_t
+core_combine_xor_u_pixel_sse2 (uint32_t src,
+                               uint32_t dst)
+{
+    __m128i s = unpack_32_1x128 (src);
+    __m128i d = unpack_32_1x128 (dst);
+
+    __m128i neg_d = negate_1x128 (expand_alpha_1x128 (d));
+    __m128i neg_s = negate_1x128 (expand_alpha_1x128 (s));
+
+    return pack_1x128_32 (pix_add_multiply_1x128 (&s, &neg_d, &d, &neg_s));
+}
+
+static void
+sse2_combine_xor_u (pixman_implementation_t *imp,
+                    pixman_op_t              op,
+                    uint32_t *               dst,
+                    const uint32_t *         src,
+                    const uint32_t *         mask,
+                    int                      width)
+{
+    int w = width;
+    uint32_t s, d;
+    uint32_t* pd = dst;
+    const uint32_t* ps = src;
+    const uint32_t* pm = mask;
+
+    __m128i xmm_src, xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_alpha_src_lo, xmm_alpha_src_hi;
+    __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi;
+
+    while (w && ((unsigned long) pd & 15))
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	*pd++ = core_combine_xor_u_pixel_sse2 (s, d);
+	w--;
+	ps++;
+	if (pm)
+	    pm++;
+    }
+
+    while (w >= 4)
+    {
+	xmm_src = combine4 ((__m128i*) ps, (__m128i*) pm);
+	xmm_dst = load_128_aligned ((__m128i*) pd);
+
+	unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+
+	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+			    &xmm_alpha_src_lo, &xmm_alpha_src_hi);
+	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,
+			    &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);
+
+	negate_2x128 (xmm_alpha_src_lo, xmm_alpha_src_hi,
+		      &xmm_alpha_src_lo, &xmm_alpha_src_hi);
+	negate_2x128 (xmm_alpha_dst_lo, xmm_alpha_dst_hi,
+		      &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);
+
+	pix_add_multiply_2x128 (
+	    &xmm_src_lo, &xmm_src_hi, &xmm_alpha_dst_lo, &xmm_alpha_dst_hi,
+	    &xmm_dst_lo, &xmm_dst_hi, &xmm_alpha_src_lo, &xmm_alpha_src_hi,
+	    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	w -= 4;
+	if (pm)
+	    pm += 4;
+    }
+
+    while (w)
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	*pd++ = core_combine_xor_u_pixel_sse2 (s, d);
+	w--;
+	ps++;
+	if (pm)
+	    pm++;
+    }
+}
+
+static force_inline void
+sse2_combine_add_u (pixman_implementation_t *imp,
+                    pixman_op_t              op,
+                    uint32_t *               dst,
+                    const uint32_t *         src,
+                    const uint32_t *         mask,
+                    int                      width)
+{
+    int w = width;
+    uint32_t s, d;
+    uint32_t* pd = dst;
+    const uint32_t* ps = src;
+    const uint32_t* pm = mask;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	ps++;
+	if (pm)
+	    pm++;
+	*pd++ = _mm_cvtsi128_si32 (
+	    _mm_adds_epu8 (_mm_cvtsi32_si128 (s), _mm_cvtsi32_si128 (d)));
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	__m128i s;
+
+	s = combine4 ((__m128i*)ps, (__m128i*)pm);
+
+	save_128_aligned (
+	    (__m128i*)pd, _mm_adds_epu8 (s, load_128_aligned  ((__m128i*)pd)));
+
+	pd += 4;
+	ps += 4;
+	if (pm)
+	    pm += 4;
+	w -= 4;
+    }
+
+    while (w--)
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	ps++;
+	*pd++ = _mm_cvtsi128_si32 (
+	    _mm_adds_epu8 (_mm_cvtsi32_si128 (s), _mm_cvtsi32_si128 (d)));
+	if (pm)
+	    pm++;
+    }
+}
+
+static force_inline uint32_t
+core_combine_saturate_u_pixel_sse2 (uint32_t src,
+                                    uint32_t dst)
+{
+    __m128i ms = unpack_32_1x128 (src);
+    __m128i md = unpack_32_1x128 (dst);
+    uint32_t sa = src >> 24;
+    uint32_t da = ~dst >> 24;
+
+    if (sa > da)
+    {
+	ms = pix_multiply_1x128 (
+	    ms, expand_alpha_1x128 (unpack_32_1x128 (DIV_UN8 (da, sa) << 24)));
+    }
+
+    return pack_1x128_32 (_mm_adds_epu16 (md, ms));
+}
+
+static void
+sse2_combine_saturate_u (pixman_implementation_t *imp,
+                         pixman_op_t              op,
+                         uint32_t *               pd,
+                         const uint32_t *         ps,
+                         const uint32_t *         pm,
+                         int                      w)
+{
+    uint32_t s, d;
+
+    uint32_t pack_cmp;
+    __m128i xmm_src, xmm_dst;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	*pd++ = core_combine_saturate_u_pixel_sse2 (s, d);
+	w--;
+	ps++;
+	if (pm)
+	    pm++;
+    }
+
+    while (w >= 4)
+    {
+	xmm_dst = load_128_aligned  ((__m128i*)pd);
+	xmm_src = combine4 ((__m128i*)ps, (__m128i*)pm);
+
+	pack_cmp = _mm_movemask_epi8 (
+	    _mm_cmpgt_epi32 (
+		_mm_srli_epi32 (xmm_src, 24),
+		_mm_srli_epi32 (_mm_xor_si128 (xmm_dst, mask_ff000000), 24)));
+
+	/* if some alpha src is grater than respective ~alpha dst */
+	if (pack_cmp)
+	{
+	    s = combine1 (ps++, pm);
+	    d = *pd;
+	    *pd++ = core_combine_saturate_u_pixel_sse2 (s, d);
+	    if (pm)
+		pm++;
+
+	    s = combine1 (ps++, pm);
+	    d = *pd;
+	    *pd++ = core_combine_saturate_u_pixel_sse2 (s, d);
+	    if (pm)
+		pm++;
+
+	    s = combine1 (ps++, pm);
+	    d = *pd;
+	    *pd++ = core_combine_saturate_u_pixel_sse2 (s, d);
+	    if (pm)
+		pm++;
+
+	    s = combine1 (ps++, pm);
+	    d = *pd;
+	    *pd++ = core_combine_saturate_u_pixel_sse2 (s, d);
+	    if (pm)
+		pm++;
+	}
+	else
+	{
+	    save_128_aligned ((__m128i*)pd, _mm_adds_epu8 (xmm_dst, xmm_src));
+
+	    pd += 4;
+	    ps += 4;
+	    if (pm)
+		pm += 4;
+	}
+
+	w -= 4;
+    }
+
+    while (w--)
+    {
+	s = combine1 (ps, pm);
+	d = *pd;
+
+	*pd++ = core_combine_saturate_u_pixel_sse2 (s, d);
+	ps++;
+	if (pm)
+	    pm++;
+    }
+}
+
+static void
+sse2_combine_src_ca (pixman_implementation_t *imp,
+                     pixman_op_t              op,
+                     uint32_t *               pd,
+                     const uint32_t *         ps,
+                     const uint32_t *         pm,
+                     int                      w)
+{
+    uint32_t s, m;
+
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_mask_lo, xmm_mask_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = *ps++;
+	m = *pm++;
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (unpack_32_1x128 (s), unpack_32_1x128 (m)));
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	xmm_src_hi = load_128_unaligned ((__m128i*)ps);
+	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);
+
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,
+			    &xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	pm += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	s = *ps++;
+	m = *pm++;
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (unpack_32_1x128 (s), unpack_32_1x128 (m)));
+	w--;
+    }
+}
+
+static force_inline uint32_t
+core_combine_over_ca_pixel_sse2 (uint32_t src,
+                                 uint32_t mask,
+                                 uint32_t dst)
+{
+    __m128i s = unpack_32_1x128 (src);
+    __m128i expAlpha = expand_alpha_1x128 (s);
+    __m128i unpk_mask = unpack_32_1x128 (mask);
+    __m128i unpk_dst  = unpack_32_1x128 (dst);
+
+    return pack_1x128_32 (in_over_1x128 (&s, &expAlpha, &unpk_mask, &unpk_dst));
+}
+
+static void
+sse2_combine_over_ca (pixman_implementation_t *imp,
+                      pixman_op_t              op,
+                      uint32_t *               pd,
+                      const uint32_t *         ps,
+                      const uint32_t *         pm,
+                      int                      w)
+{
+    uint32_t s, m, d;
+
+    __m128i xmm_alpha_lo, xmm_alpha_hi;
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_mask_lo, xmm_mask_hi;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = core_combine_over_ca_pixel_sse2 (s, m, d);
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	xmm_dst_hi = load_128_aligned ((__m128i*)pd);
+	xmm_src_hi = load_128_unaligned ((__m128i*)ps);
+	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);
+
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi);
+
+	in_over_2x128 (&xmm_src_lo, &xmm_src_hi,
+		       &xmm_alpha_lo, &xmm_alpha_hi,
+		       &xmm_mask_lo, &xmm_mask_hi,
+		       &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	pm += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = core_combine_over_ca_pixel_sse2 (s, m, d);
+	w--;
+    }
+}
+
+static force_inline uint32_t
+core_combine_over_reverse_ca_pixel_sse2 (uint32_t src,
+                                         uint32_t mask,
+                                         uint32_t dst)
+{
+    __m128i d = unpack_32_1x128 (dst);
+
+    return pack_1x128_32 (
+	over_1x128 (d, expand_alpha_1x128 (d),
+		    pix_multiply_1x128 (unpack_32_1x128 (src),
+					unpack_32_1x128 (mask))));
+}
+
+static void
+sse2_combine_over_reverse_ca (pixman_implementation_t *imp,
+                              pixman_op_t              op,
+                              uint32_t *               pd,
+                              const uint32_t *         ps,
+                              const uint32_t *         pm,
+                              int                      w)
+{
+    uint32_t s, m, d;
+
+    __m128i xmm_alpha_lo, xmm_alpha_hi;
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_mask_lo, xmm_mask_hi;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = core_combine_over_reverse_ca_pixel_sse2 (s, m, d);
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	xmm_dst_hi = load_128_aligned ((__m128i*)pd);
+	xmm_src_hi = load_128_unaligned ((__m128i*)ps);
+	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);
+
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi);
+	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,
+			    &xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_mask_lo, &xmm_mask_hi);
+
+	over_2x128 (&xmm_dst_lo, &xmm_dst_hi,
+		    &xmm_alpha_lo, &xmm_alpha_hi,
+		    &xmm_mask_lo, &xmm_mask_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_mask_lo, xmm_mask_hi));
+
+	ps += 4;
+	pd += 4;
+	pm += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = core_combine_over_reverse_ca_pixel_sse2 (s, m, d);
+	w--;
+    }
+}
+
+static void
+sse2_combine_in_ca (pixman_implementation_t *imp,
+                    pixman_op_t              op,
+                    uint32_t *               pd,
+                    const uint32_t *         ps,
+                    const uint32_t *         pm,
+                    int                      w)
+{
+    uint32_t s, m, d;
+
+    __m128i xmm_alpha_lo, xmm_alpha_hi;
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_mask_lo, xmm_mask_hi;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (
+		pix_multiply_1x128 (unpack_32_1x128 (s), unpack_32_1x128 (m)),
+		expand_alpha_1x128 (unpack_32_1x128 (d))));
+
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	xmm_dst_hi = load_128_aligned ((__m128i*)pd);
+	xmm_src_hi = load_128_unaligned ((__m128i*)ps);
+	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);
+
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi);
+
+	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,
+			    &xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_dst_lo, &xmm_dst_hi);
+
+	pix_multiply_2x128 (&xmm_dst_lo, &xmm_dst_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi,
+			    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	pm += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (
+		pix_multiply_1x128 (
+		    unpack_32_1x128 (s), unpack_32_1x128 (m)),
+		expand_alpha_1x128 (unpack_32_1x128 (d))));
+
+	w--;
+    }
+}
+
+static void
+sse2_combine_in_reverse_ca (pixman_implementation_t *imp,
+                            pixman_op_t              op,
+                            uint32_t *               pd,
+                            const uint32_t *         ps,
+                            const uint32_t *         pm,
+                            int                      w)
+{
+    uint32_t s, m, d;
+
+    __m128i xmm_alpha_lo, xmm_alpha_hi;
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_mask_lo, xmm_mask_hi;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (
+		unpack_32_1x128 (d),
+		pix_multiply_1x128 (unpack_32_1x128 (m),
+				   expand_alpha_1x128 (unpack_32_1x128 (s)))));
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	xmm_dst_hi = load_128_aligned ((__m128i*)pd);
+	xmm_src_hi = load_128_unaligned ((__m128i*)ps);
+	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);
+
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi);
+	pix_multiply_2x128 (&xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi);
+
+	pix_multiply_2x128 (&xmm_dst_lo, &xmm_dst_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi,
+			    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	pm += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (
+		unpack_32_1x128 (d),
+		pix_multiply_1x128 (unpack_32_1x128 (m),
+				   expand_alpha_1x128 (unpack_32_1x128 (s)))));
+	w--;
+    }
+}
+
+static void
+sse2_combine_out_ca (pixman_implementation_t *imp,
+                     pixman_op_t              op,
+                     uint32_t *               pd,
+                     const uint32_t *         ps,
+                     const uint32_t *         pm,
+                     int                      w)
+{
+    uint32_t s, m, d;
+
+    __m128i xmm_alpha_lo, xmm_alpha_hi;
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_mask_lo, xmm_mask_hi;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (
+		pix_multiply_1x128 (
+		    unpack_32_1x128 (s), unpack_32_1x128 (m)),
+		negate_1x128 (expand_alpha_1x128 (unpack_32_1x128 (d)))));
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	xmm_dst_hi = load_128_aligned ((__m128i*)pd);
+	xmm_src_hi = load_128_unaligned ((__m128i*)ps);
+	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);
+
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi);
+	negate_2x128 (xmm_alpha_lo, xmm_alpha_hi,
+		      &xmm_alpha_lo, &xmm_alpha_hi);
+
+	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,
+			    &xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_dst_lo, &xmm_dst_hi);
+	pix_multiply_2x128 (&xmm_dst_lo, &xmm_dst_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi,
+			    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	pm += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (
+		pix_multiply_1x128 (
+		    unpack_32_1x128 (s), unpack_32_1x128 (m)),
+		negate_1x128 (expand_alpha_1x128 (unpack_32_1x128 (d)))));
+
+	w--;
+    }
+}
+
+static void
+sse2_combine_out_reverse_ca (pixman_implementation_t *imp,
+                             pixman_op_t              op,
+                             uint32_t *               pd,
+                             const uint32_t *         ps,
+                             const uint32_t *         pm,
+                             int                      w)
+{
+    uint32_t s, m, d;
+
+    __m128i xmm_alpha_lo, xmm_alpha_hi;
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_mask_lo, xmm_mask_hi;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (
+		unpack_32_1x128 (d),
+		negate_1x128 (pix_multiply_1x128 (
+				 unpack_32_1x128 (m),
+				 expand_alpha_1x128 (unpack_32_1x128 (s))))));
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	xmm_dst_hi = load_128_aligned ((__m128i*)pd);
+	xmm_src_hi = load_128_unaligned ((__m128i*)ps);
+	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);
+
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi);
+
+	pix_multiply_2x128 (&xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_alpha_lo, &xmm_alpha_hi,
+			    &xmm_mask_lo, &xmm_mask_hi);
+
+	negate_2x128 (xmm_mask_lo, xmm_mask_hi,
+		      &xmm_mask_lo, &xmm_mask_hi);
+
+	pix_multiply_2x128 (&xmm_dst_lo, &xmm_dst_hi,
+			    &xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	pm += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    pix_multiply_1x128 (
+		unpack_32_1x128 (d),
+		negate_1x128 (pix_multiply_1x128 (
+				 unpack_32_1x128 (m),
+				 expand_alpha_1x128 (unpack_32_1x128 (s))))));
+	w--;
+    }
+}
+
+static force_inline uint32_t
+core_combine_atop_ca_pixel_sse2 (uint32_t src,
+                                 uint32_t mask,
+                                 uint32_t dst)
+{
+    __m128i m = unpack_32_1x128 (mask);
+    __m128i s = unpack_32_1x128 (src);
+    __m128i d = unpack_32_1x128 (dst);
+    __m128i sa = expand_alpha_1x128 (s);
+    __m128i da = expand_alpha_1x128 (d);
+
+    s = pix_multiply_1x128 (s, m);
+    m = negate_1x128 (pix_multiply_1x128 (m, sa));
+
+    return pack_1x128_32 (pix_add_multiply_1x128 (&d, &m, &s, &da));
+}
+
+static void
+sse2_combine_atop_ca (pixman_implementation_t *imp,
+                      pixman_op_t              op,
+                      uint32_t *               pd,
+                      const uint32_t *         ps,
+                      const uint32_t *         pm,
+                      int                      w)
+{
+    uint32_t s, m, d;
+
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_alpha_src_lo, xmm_alpha_src_hi;
+    __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi;
+    __m128i xmm_mask_lo, xmm_mask_hi;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = core_combine_atop_ca_pixel_sse2 (s, m, d);
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	xmm_dst_hi = load_128_aligned ((__m128i*)pd);
+	xmm_src_hi = load_128_unaligned ((__m128i*)ps);
+	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);
+
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+			    &xmm_alpha_src_lo, &xmm_alpha_src_hi);
+	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,
+			    &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);
+
+	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,
+			    &xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_src_lo, &xmm_src_hi);
+	pix_multiply_2x128 (&xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_alpha_src_lo, &xmm_alpha_src_hi,
+			    &xmm_mask_lo, &xmm_mask_hi);
+
+	negate_2x128 (xmm_mask_lo, xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+	pix_add_multiply_2x128 (
+	    &xmm_dst_lo, &xmm_dst_hi, &xmm_mask_lo, &xmm_mask_hi,
+	    &xmm_src_lo, &xmm_src_hi, &xmm_alpha_dst_lo, &xmm_alpha_dst_hi,
+	    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	pm += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = core_combine_atop_ca_pixel_sse2 (s, m, d);
+	w--;
+    }
+}
+
+static force_inline uint32_t
+core_combine_reverse_atop_ca_pixel_sse2 (uint32_t src,
+                                         uint32_t mask,
+                                         uint32_t dst)
+{
+    __m128i m = unpack_32_1x128 (mask);
+    __m128i s = unpack_32_1x128 (src);
+    __m128i d = unpack_32_1x128 (dst);
+
+    __m128i da = negate_1x128 (expand_alpha_1x128 (d));
+    __m128i sa = expand_alpha_1x128 (s);
+
+    s = pix_multiply_1x128 (s, m);
+    m = pix_multiply_1x128 (m, sa);
+
+    return pack_1x128_32 (pix_add_multiply_1x128 (&d, &m, &s, &da));
+}
+
+static void
+sse2_combine_atop_reverse_ca (pixman_implementation_t *imp,
+                              pixman_op_t              op,
+                              uint32_t *               pd,
+                              const uint32_t *         ps,
+                              const uint32_t *         pm,
+                              int                      w)
+{
+    uint32_t s, m, d;
+
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_alpha_src_lo, xmm_alpha_src_hi;
+    __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi;
+    __m128i xmm_mask_lo, xmm_mask_hi;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = core_combine_reverse_atop_ca_pixel_sse2 (s, m, d);
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	xmm_dst_hi = load_128_aligned ((__m128i*)pd);
+	xmm_src_hi = load_128_unaligned ((__m128i*)ps);
+	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);
+
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+			    &xmm_alpha_src_lo, &xmm_alpha_src_hi);
+	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,
+			    &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);
+
+	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,
+			    &xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_src_lo, &xmm_src_hi);
+	pix_multiply_2x128 (&xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_alpha_src_lo, &xmm_alpha_src_hi,
+			    &xmm_mask_lo, &xmm_mask_hi);
+
+	negate_2x128 (xmm_alpha_dst_lo, xmm_alpha_dst_hi,
+		      &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);
+
+	pix_add_multiply_2x128 (
+	    &xmm_dst_lo, &xmm_dst_hi, &xmm_mask_lo, &xmm_mask_hi,
+	    &xmm_src_lo, &xmm_src_hi, &xmm_alpha_dst_lo, &xmm_alpha_dst_hi,
+	    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	pm += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = core_combine_reverse_atop_ca_pixel_sse2 (s, m, d);
+	w--;
+    }
+}
+
+static force_inline uint32_t
+core_combine_xor_ca_pixel_sse2 (uint32_t src,
+                                uint32_t mask,
+                                uint32_t dst)
+{
+    __m128i a = unpack_32_1x128 (mask);
+    __m128i s = unpack_32_1x128 (src);
+    __m128i d = unpack_32_1x128 (dst);
+
+    __m128i alpha_dst = negate_1x128 (pix_multiply_1x128 (
+				       a, expand_alpha_1x128 (s)));
+    __m128i dest      = pix_multiply_1x128 (s, a);
+    __m128i alpha_src = negate_1x128 (expand_alpha_1x128 (d));
+
+    return pack_1x128_32 (pix_add_multiply_1x128 (&d,
+                                                &alpha_dst,
+                                                &dest,
+                                                &alpha_src));
+}
+
+static void
+sse2_combine_xor_ca (pixman_implementation_t *imp,
+                     pixman_op_t              op,
+                     uint32_t *               pd,
+                     const uint32_t *         ps,
+                     const uint32_t *         pm,
+                     int                      w)
+{
+    uint32_t s, m, d;
+
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_alpha_src_lo, xmm_alpha_src_hi;
+    __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi;
+    __m128i xmm_mask_lo, xmm_mask_hi;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = core_combine_xor_ca_pixel_sse2 (s, m, d);
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	xmm_dst_hi = load_128_aligned ((__m128i*)pd);
+	xmm_src_hi = load_128_unaligned ((__m128i*)ps);
+	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);
+
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+	expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+			    &xmm_alpha_src_lo, &xmm_alpha_src_hi);
+	expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi,
+			    &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);
+
+	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,
+			    &xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_src_lo, &xmm_src_hi);
+	pix_multiply_2x128 (&xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_alpha_src_lo, &xmm_alpha_src_hi,
+			    &xmm_mask_lo, &xmm_mask_hi);
+
+	negate_2x128 (xmm_alpha_dst_lo, xmm_alpha_dst_hi,
+		      &xmm_alpha_dst_lo, &xmm_alpha_dst_hi);
+	negate_2x128 (xmm_mask_lo, xmm_mask_hi,
+		      &xmm_mask_lo, &xmm_mask_hi);
+
+	pix_add_multiply_2x128 (
+	    &xmm_dst_lo, &xmm_dst_hi, &xmm_mask_lo, &xmm_mask_hi,
+	    &xmm_src_lo, &xmm_src_hi, &xmm_alpha_dst_lo, &xmm_alpha_dst_hi,
+	    &xmm_dst_lo, &xmm_dst_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	ps += 4;
+	pd += 4;
+	pm += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = core_combine_xor_ca_pixel_sse2 (s, m, d);
+	w--;
+    }
+}
+
+static void
+sse2_combine_add_ca (pixman_implementation_t *imp,
+                     pixman_op_t              op,
+                     uint32_t *               pd,
+                     const uint32_t *         ps,
+                     const uint32_t *         pm,
+                     int                      w)
+{
+    uint32_t s, m, d;
+
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_mask_lo, xmm_mask_hi;
+
+    while (w && (unsigned long)pd & 15)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    _mm_adds_epu8 (pix_multiply_1x128 (unpack_32_1x128 (s),
+					       unpack_32_1x128 (m)),
+			   unpack_32_1x128 (d)));
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	xmm_src_hi = load_128_unaligned ((__m128i*)ps);
+	xmm_mask_hi = load_128_unaligned ((__m128i*)pm);
+	xmm_dst_hi = load_128_aligned ((__m128i*)pd);
+
+	unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	unpack_128_2x128 (xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+	unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+
+	pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,
+			    &xmm_mask_lo, &xmm_mask_hi,
+			    &xmm_src_lo, &xmm_src_hi);
+
+	save_128_aligned (
+	    (__m128i*)pd, pack_2x128_128 (
+		_mm_adds_epu8 (xmm_src_lo, xmm_dst_lo),
+		_mm_adds_epu8 (xmm_src_hi, xmm_dst_hi)));
+
+	ps += 4;
+	pd += 4;
+	pm += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	s = *ps++;
+	m = *pm++;
+	d = *pd;
+
+	*pd++ = pack_1x128_32 (
+	    _mm_adds_epu8 (pix_multiply_1x128 (unpack_32_1x128 (s),
+					       unpack_32_1x128 (m)),
+			   unpack_32_1x128 (d)));
+	w--;
+    }
+}
+
+static force_inline __m128i
+create_mask_16_128 (uint16_t mask)
+{
+    return _mm_set1_epi16 (mask);
+}
+
+/* Work around a code generation bug in Sun Studio 12. */
+#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
+# define create_mask_2x32_128(mask0, mask1)				\
+    (_mm_set_epi32 ((mask0), (mask1), (mask0), (mask1)))
+#else
+static force_inline __m128i
+create_mask_2x32_128 (uint32_t mask0,
+                      uint32_t mask1)
+{
+    return _mm_set_epi32 (mask0, mask1, mask0, mask1);
+}
+#endif
+
+static void
+sse2_composite_over_n_8888 (pixman_implementation_t *imp,
+                            pixman_op_t              op,
+                            pixman_image_t *         src_image,
+                            pixman_image_t *         mask_image,
+                            pixman_image_t *         dst_image,
+                            int32_t                  src_x,
+                            int32_t                  src_y,
+                            int32_t                  mask_x,
+                            int32_t                  mask_y,
+                            int32_t                  dest_x,
+                            int32_t                  dest_y,
+                            int32_t                  width,
+                            int32_t                  height)
+{
+    uint32_t src;
+    uint32_t    *dst_line, *dst, d;
+    int32_t w;
+    int dst_stride;
+    __m128i xmm_src, xmm_alpha;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    if (src == 0)
+	return;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+
+    xmm_src = expand_pixel_32_1x128 (src);
+    xmm_alpha = expand_alpha_1x128 (xmm_src);
+
+    while (height--)
+    {
+	dst = dst_line;
+
+	dst_line += dst_stride;
+	w = width;
+
+	while (w && (unsigned long)dst & 15)
+	{
+	    d = *dst;
+	    *dst++ = pack_1x128_32 (over_1x128 (xmm_src,
+						xmm_alpha,
+						unpack_32_1x128 (d)));
+	    w--;
+	}
+
+	while (w >= 4)
+	{
+	    xmm_dst = load_128_aligned ((__m128i*)dst);
+
+	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+
+	    over_2x128 (&xmm_src, &xmm_src,
+			&xmm_alpha, &xmm_alpha,
+			&xmm_dst_lo, &xmm_dst_hi);
+
+	    /* rebuid the 4 pixel data and save*/
+	    save_128_aligned (
+		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	    w -= 4;
+	    dst += 4;
+	}
+
+	while (w)
+	{
+	    d = *dst;
+	    *dst++ = pack_1x128_32 (over_1x128 (xmm_src,
+						xmm_alpha,
+						unpack_32_1x128 (d)));
+	    w--;
+	}
+
+    }
+}
+
+static void
+sse2_composite_over_n_0565 (pixman_implementation_t *imp,
+                            pixman_op_t              op,
+                            pixman_image_t *         src_image,
+                            pixman_image_t *         mask_image,
+                            pixman_image_t *         dst_image,
+                            int32_t                  src_x,
+                            int32_t                  src_y,
+                            int32_t                  mask_x,
+                            int32_t                  mask_y,
+                            int32_t                  dest_x,
+                            int32_t                  dest_y,
+                            int32_t                  width,
+                            int32_t                  height)
+{
+    uint32_t src;
+    uint16_t    *dst_line, *dst, d;
+    int32_t w;
+    int dst_stride;
+    __m128i xmm_src, xmm_alpha;
+    __m128i xmm_dst, xmm_dst0, xmm_dst1, xmm_dst2, xmm_dst3;
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    if (src == 0)
+	return;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
+
+    xmm_src = expand_pixel_32_1x128 (src);
+    xmm_alpha = expand_alpha_1x128 (xmm_src);
+
+    while (height--)
+    {
+	dst = dst_line;
+
+	dst_line += dst_stride;
+	w = width;
+
+	while (w && (unsigned long)dst & 15)
+	{
+	    d = *dst;
+
+	    *dst++ = pack_565_32_16 (
+		pack_1x128_32 (over_1x128 (xmm_src,
+					   xmm_alpha,
+					   expand565_16_1x128 (d))));
+	    w--;
+	}
+
+	while (w >= 8)
+	{
+	    xmm_dst = load_128_aligned ((__m128i*)dst);
+
+	    unpack_565_128_4x128 (xmm_dst,
+				  &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3);
+
+	    over_2x128 (&xmm_src, &xmm_src,
+			&xmm_alpha, &xmm_alpha,
+			&xmm_dst0, &xmm_dst1);
+	    over_2x128 (&xmm_src, &xmm_src,
+			&xmm_alpha, &xmm_alpha,
+			&xmm_dst2, &xmm_dst3);
+
+	    xmm_dst = pack_565_4x128_128 (
+		&xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3);
+
+	    save_128_aligned ((__m128i*)dst, xmm_dst);
+
+	    dst += 8;
+	    w -= 8;
+	}
+
+	while (w--)
+	{
+	    d = *dst;
+	    *dst++ = pack_565_32_16 (
+		pack_1x128_32 (over_1x128 (xmm_src, xmm_alpha,
+					   expand565_16_1x128 (d))));
+	}
+    }
+
+}
+
+static void
+sse2_composite_add_n_8888_8888_ca (pixman_implementation_t *imp,
+				   pixman_op_t              op,
+				   pixman_image_t *         src_image,
+				   pixman_image_t *         mask_image,
+				   pixman_image_t *         dst_image,
+				   int32_t                  src_x,
+				   int32_t                  src_y,
+				   int32_t                  mask_x,
+				   int32_t                  mask_y,
+				   int32_t                  dest_x,
+				   int32_t                  dest_y,
+				   int32_t                  width,
+				   int32_t                  height)
+{
+    uint32_t src;
+    uint32_t    *dst_line, d;
+    uint32_t    *mask_line, m;
+    uint32_t pack_cmp;
+    int dst_stride, mask_stride;
+
+    __m128i xmm_src;
+    __m128i xmm_dst;
+    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;
+
+    __m128i mmx_src, mmx_mask, mmx_dest;
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    if (src == 0)
+	return;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);
+
+    xmm_src = _mm_unpacklo_epi8 (
+	create_mask_2x32_128 (src, src), _mm_setzero_si128 ());
+    mmx_src   = xmm_src;
+
+    while (height--)
+    {
+	int w = width;
+	const uint32_t *pm = (uint32_t *)mask_line;
+	uint32_t *pd = (uint32_t *)dst_line;
+
+	dst_line += dst_stride;
+	mask_line += mask_stride;
+
+	while (w && (unsigned long)pd & 15)
+	{
+	    m = *pm++;
+
+	    if (m)
+	    {
+		d = *pd;
+
+		mmx_mask = unpack_32_1x128 (m);
+		mmx_dest = unpack_32_1x128 (d);
+
+		*pd = pack_1x128_32 (
+		    _mm_adds_epu8 (pix_multiply_1x128 (mmx_mask, mmx_src),
+				   mmx_dest));
+	    }
+
+	    pd++;
+	    w--;
+	}
+
+	while (w >= 4)
+	{
+	    xmm_mask = load_128_unaligned ((__m128i*)pm);
+
+	    pack_cmp =
+		_mm_movemask_epi8 (
+		    _mm_cmpeq_epi32 (xmm_mask, _mm_setzero_si128 ()));
+
+	    /* if all bits in mask are zero, pack_cmp are equal to 0xffff */
+	    if (pack_cmp != 0xffff)
+	    {
+		xmm_dst = load_128_aligned ((__m128i*)pd);
+
+		unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+
+		pix_multiply_2x128 (&xmm_src, &xmm_src,
+				    &xmm_mask_lo, &xmm_mask_hi,
+				    &xmm_mask_lo, &xmm_mask_hi);
+		xmm_mask_hi = pack_2x128_128 (xmm_mask_lo, xmm_mask_hi);
+
+		save_128_aligned (
+		    (__m128i*)pd, _mm_adds_epu8 (xmm_mask_hi, xmm_dst));
+	    }
+
+	    pd += 4;
+	    pm += 4;
+	    w -= 4;
+	}
+
+	while (w)
+	{
+	    m = *pm++;
+
+	    if (m)
+	    {
+		d = *pd;
+
+		mmx_mask = unpack_32_1x128 (m);
+		mmx_dest = unpack_32_1x128 (d);
+
+		*pd = pack_1x128_32 (
+		    _mm_adds_epu8 (pix_multiply_1x128 (mmx_mask, mmx_src),
+				   mmx_dest));
+	    }
+
+	    pd++;
+	    w--;
+	}
+    }
+
+}
+
+static void
+sse2_composite_over_n_8888_8888_ca (pixman_implementation_t *imp,
+                                    pixman_op_t              op,
+                                    pixman_image_t *         src_image,
+                                    pixman_image_t *         mask_image,
+                                    pixman_image_t *         dst_image,
+                                    int32_t                  src_x,
+                                    int32_t                  src_y,
+                                    int32_t                  mask_x,
+                                    int32_t                  mask_y,
+                                    int32_t                  dest_x,
+                                    int32_t                  dest_y,
+                                    int32_t                  width,
+                                    int32_t                  height)
+{
+    uint32_t src;
+    uint32_t    *dst_line, d;
+    uint32_t    *mask_line, m;
+    uint32_t pack_cmp;
+    int dst_stride, mask_stride;
+
+    __m128i xmm_src, xmm_alpha;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;
+
+    __m128i mmx_src, mmx_alpha, mmx_mask, mmx_dest;
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    if (src == 0)
+	return;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);
+
+    xmm_src = _mm_unpacklo_epi8 (
+	create_mask_2x32_128 (src, src), _mm_setzero_si128 ());
+    xmm_alpha = expand_alpha_1x128 (xmm_src);
+    mmx_src   = xmm_src;
+    mmx_alpha = xmm_alpha;
+
+    while (height--)
+    {
+	int w = width;
+	const uint32_t *pm = (uint32_t *)mask_line;
+	uint32_t *pd = (uint32_t *)dst_line;
+
+	dst_line += dst_stride;
+	mask_line += mask_stride;
+
+	while (w && (unsigned long)pd & 15)
+	{
+	    m = *pm++;
+
+	    if (m)
+	    {
+		d = *pd;
+		mmx_mask = unpack_32_1x128 (m);
+		mmx_dest = unpack_32_1x128 (d);
+
+		*pd = pack_1x128_32 (in_over_1x128 (&mmx_src,
+		                                  &mmx_alpha,
+		                                  &mmx_mask,
+		                                  &mmx_dest));
+	    }
+
+	    pd++;
+	    w--;
+	}
+
+	while (w >= 4)
+	{
+	    xmm_mask = load_128_unaligned ((__m128i*)pm);
+
+	    pack_cmp =
+		_mm_movemask_epi8 (
+		    _mm_cmpeq_epi32 (xmm_mask, _mm_setzero_si128 ()));
+
+	    /* if all bits in mask are zero, pack_cmp are equal to 0xffff */
+	    if (pack_cmp != 0xffff)
+	    {
+		xmm_dst = load_128_aligned ((__m128i*)pd);
+
+		unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+		unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+
+		in_over_2x128 (&xmm_src, &xmm_src,
+			       &xmm_alpha, &xmm_alpha,
+			       &xmm_mask_lo, &xmm_mask_hi,
+			       &xmm_dst_lo, &xmm_dst_hi);
+
+		save_128_aligned (
+		    (__m128i*)pd, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+	    }
+
+	    pd += 4;
+	    pm += 4;
+	    w -= 4;
+	}
+
+	while (w)
+	{
+	    m = *pm++;
+
+	    if (m)
+	    {
+		d = *pd;
+		mmx_mask = unpack_32_1x128 (m);
+		mmx_dest = unpack_32_1x128 (d);
+
+		*pd = pack_1x128_32 (
+		    in_over_1x128 (&mmx_src, &mmx_alpha, &mmx_mask, &mmx_dest));
+	    }
+
+	    pd++;
+	    w--;
+	}
+    }
+
+}
+
+static void
+sse2_composite_over_8888_n_8888 (pixman_implementation_t *imp,
+                                 pixman_op_t              op,
+                                 pixman_image_t *         src_image,
+                                 pixman_image_t *         mask_image,
+                                 pixman_image_t *         dst_image,
+                                 int32_t                  src_x,
+                                 int32_t                  src_y,
+                                 int32_t                  mask_x,
+                                 int32_t                  mask_y,
+                                 int32_t                  dest_x,
+                                 int32_t                  dest_y,
+                                 int32_t                  width,
+                                 int32_t                  height)
+{
+    uint32_t    *dst_line, *dst;
+    uint32_t    *src_line, *src;
+    uint32_t mask;
+    int32_t w;
+    int dst_stride, src_stride;
+
+    __m128i xmm_mask;
+    __m128i xmm_src, xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_alpha_lo, xmm_alpha_hi;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+
+    mask = _pixman_image_get_solid (imp, mask_image, PIXMAN_a8r8g8b8);
+
+    xmm_mask = create_mask_16_128 (mask >> 24);
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	src = src_line;
+	src_line += src_stride;
+	w = width;
+
+	while (w && (unsigned long)dst & 15)
+	{
+	    uint32_t s = *src++;
+
+	    if (s)
+	    {
+		uint32_t d = *dst;
+		
+		__m128i ms = unpack_32_1x128 (s);
+		__m128i alpha    = expand_alpha_1x128 (ms);
+		__m128i dest     = xmm_mask;
+		__m128i alpha_dst = unpack_32_1x128 (d);
+		
+		*dst = pack_1x128_32 (
+		    in_over_1x128 (&ms, &alpha, &dest, &alpha_dst));
+	    }
+	    dst++;
+	    w--;
+	}
+
+	while (w >= 4)
+	{
+	    xmm_src = load_128_unaligned ((__m128i*)src);
+
+	    if (!is_zero (xmm_src))
+	    {
+		xmm_dst = load_128_aligned ((__m128i*)dst);
+		
+		unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);
+		unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+		expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+				    &xmm_alpha_lo, &xmm_alpha_hi);
+		
+		in_over_2x128 (&xmm_src_lo, &xmm_src_hi,
+			       &xmm_alpha_lo, &xmm_alpha_hi,
+			       &xmm_mask, &xmm_mask,
+			       &xmm_dst_lo, &xmm_dst_hi);
+		
+		save_128_aligned (
+		    (__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+	    }
+		
+	    dst += 4;
+	    src += 4;
+	    w -= 4;
+	}
+
+	while (w)
+	{
+	    uint32_t s = *src++;
+
+	    if (s)
+	    {
+		uint32_t d = *dst;
+		
+		__m128i ms = unpack_32_1x128 (s);
+		__m128i alpha = expand_alpha_1x128 (ms);
+		__m128i mask  = xmm_mask;
+		__m128i dest  = unpack_32_1x128 (d);
+		
+		*dst = pack_1x128_32 (
+		    in_over_1x128 (&ms, &alpha, &mask, &dest));
+	    }
+
+	    dst++;
+	    w--;
+	}
+    }
+
+}
+
+static void
+sse2_composite_src_x888_8888 (pixman_implementation_t *imp,
+			      pixman_op_t              op,
+			      pixman_image_t *         src_image,
+			      pixman_image_t *         mask_image,
+			      pixman_image_t *         dst_image,
+			      int32_t                  src_x,
+			      int32_t                  src_y,
+			      int32_t                  mask_x,
+			      int32_t                  mask_y,
+			      int32_t                  dest_x,
+			      int32_t                  dest_y,
+			      int32_t                  width,
+			      int32_t                  height)
+{
+    uint32_t    *dst_line, *dst;
+    uint32_t    *src_line, *src;
+    int32_t w;
+    int dst_stride, src_stride;
+
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	src = src_line;
+	src_line += src_stride;
+	w = width;
+
+	while (w && (unsigned long)dst & 15)
+	{
+	    *dst++ = *src++ | 0xff000000;
+	    w--;
+	}
+
+	while (w >= 16)
+	{
+	    __m128i xmm_src1, xmm_src2, xmm_src3, xmm_src4;
+	    
+	    xmm_src1 = load_128_unaligned ((__m128i*)src + 0);
+	    xmm_src2 = load_128_unaligned ((__m128i*)src + 1);
+	    xmm_src3 = load_128_unaligned ((__m128i*)src + 2);
+	    xmm_src4 = load_128_unaligned ((__m128i*)src + 3);
+	    
+	    save_128_aligned ((__m128i*)dst + 0, _mm_or_si128 (xmm_src1, mask_ff000000));
+	    save_128_aligned ((__m128i*)dst + 1, _mm_or_si128 (xmm_src2, mask_ff000000));
+	    save_128_aligned ((__m128i*)dst + 2, _mm_or_si128 (xmm_src3, mask_ff000000));
+	    save_128_aligned ((__m128i*)dst + 3, _mm_or_si128 (xmm_src4, mask_ff000000));
+	    
+	    dst += 16;
+	    src += 16;
+	    w -= 16;
+	}
+
+	while (w)
+	{
+	    *dst++ = *src++ | 0xff000000;
+	    w--;
+	}
+    }
+
+}
+
+static void
+sse2_composite_over_x888_n_8888 (pixman_implementation_t *imp,
+                                 pixman_op_t              op,
+                                 pixman_image_t *         src_image,
+                                 pixman_image_t *         mask_image,
+                                 pixman_image_t *         dst_image,
+                                 int32_t                  src_x,
+                                 int32_t                  src_y,
+                                 int32_t                  mask_x,
+                                 int32_t                  mask_y,
+                                 int32_t                  dest_x,
+                                 int32_t                  dest_y,
+                                 int32_t                  width,
+                                 int32_t                  height)
+{
+    uint32_t    *dst_line, *dst;
+    uint32_t    *src_line, *src;
+    uint32_t mask;
+    int dst_stride, src_stride;
+    int32_t w;
+
+    __m128i xmm_mask, xmm_alpha;
+    __m128i xmm_src, xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+
+    mask = _pixman_image_get_solid (imp, mask_image, PIXMAN_a8r8g8b8);
+
+    xmm_mask = create_mask_16_128 (mask >> 24);
+    xmm_alpha = mask_00ff;
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	src = src_line;
+	src_line += src_stride;
+	w = width;
+
+	while (w && (unsigned long)dst & 15)
+	{
+	    uint32_t s = (*src++) | 0xff000000;
+	    uint32_t d = *dst;
+
+	    __m128i src   = unpack_32_1x128 (s);
+	    __m128i alpha = xmm_alpha;
+	    __m128i mask  = xmm_mask;
+	    __m128i dest  = unpack_32_1x128 (d);
+
+	    *dst++ = pack_1x128_32 (
+		in_over_1x128 (&src, &alpha, &mask, &dest));
+
+	    w--;
+	}
+
+	while (w >= 4)
+	{
+	    xmm_src = _mm_or_si128 (
+		load_128_unaligned ((__m128i*)src), mask_ff000000);
+	    xmm_dst = load_128_aligned ((__m128i*)dst);
+
+	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);
+	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+
+	    in_over_2x128 (&xmm_src_lo, &xmm_src_hi,
+			   &xmm_alpha, &xmm_alpha,
+			   &xmm_mask, &xmm_mask,
+			   &xmm_dst_lo, &xmm_dst_hi);
+
+	    save_128_aligned (
+		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	    dst += 4;
+	    src += 4;
+	    w -= 4;
+
+	}
+
+	while (w)
+	{
+	    uint32_t s = (*src++) | 0xff000000;
+	    uint32_t d = *dst;
+
+	    __m128i src  = unpack_32_1x128 (s);
+	    __m128i alpha = xmm_alpha;
+	    __m128i mask  = xmm_mask;
+	    __m128i dest  = unpack_32_1x128 (d);
+
+	    *dst++ = pack_1x128_32 (
+		in_over_1x128 (&src, &alpha, &mask, &dest));
+
+	    w--;
+	}
+    }
+
+}
+
+static void
+sse2_composite_over_8888_8888 (pixman_implementation_t *imp,
+                               pixman_op_t              op,
+                               pixman_image_t *         src_image,
+                               pixman_image_t *         mask_image,
+                               pixman_image_t *         dst_image,
+                               int32_t                  src_x,
+                               int32_t                  src_y,
+                               int32_t                  mask_x,
+                               int32_t                  mask_y,
+                               int32_t                  dest_x,
+                               int32_t                  dest_y,
+                               int32_t                  width,
+                               int32_t                  height)
+{
+    int dst_stride, src_stride;
+    uint32_t    *dst_line, *dst;
+    uint32_t    *src_line, *src;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+
+    dst = dst_line;
+    src = src_line;
+
+    while (height--)
+    {
+	sse2_combine_over_u (imp, op, dst, src, NULL, width);
+
+	dst += dst_stride;
+	src += src_stride;
+    }
+}
+
+static force_inline uint16_t
+composite_over_8888_0565pixel (uint32_t src, uint16_t dst)
+{
+    __m128i ms;
+
+    ms = unpack_32_1x128 (src);
+    return pack_565_32_16 (
+	pack_1x128_32 (
+	    over_1x128 (
+		ms, expand_alpha_1x128 (ms), expand565_16_1x128 (dst))));
+}
+
+static void
+sse2_composite_over_8888_0565 (pixman_implementation_t *imp,
+                               pixman_op_t              op,
+                               pixman_image_t *         src_image,
+                               pixman_image_t *         mask_image,
+                               pixman_image_t *         dst_image,
+                               int32_t                  src_x,
+                               int32_t                  src_y,
+                               int32_t                  mask_x,
+                               int32_t                  mask_y,
+                               int32_t                  dest_x,
+                               int32_t                  dest_y,
+                               int32_t                  width,
+                               int32_t                  height)
+{
+    uint16_t    *dst_line, *dst, d;
+    uint32_t    *src_line, *src, s;
+    int dst_stride, src_stride;
+    int32_t w;
+
+    __m128i xmm_alpha_lo, xmm_alpha_hi;
+    __m128i xmm_src, xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst, xmm_dst0, xmm_dst1, xmm_dst2, xmm_dst3;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+
+    while (height--)
+    {
+	dst = dst_line;
+	src = src_line;
+
+	dst_line += dst_stride;
+	src_line += src_stride;
+	w = width;
+
+	/* Align dst on a 16-byte boundary */
+	while (w &&
+	       ((unsigned long)dst & 15))
+	{
+	    s = *src++;
+	    d = *dst;
+
+	    *dst++ = composite_over_8888_0565pixel (s, d);
+	    w--;
+	}
+
+	/* It's a 8 pixel loop */
+	while (w >= 8)
+	{
+	    /* I'm loading unaligned because I'm not sure
+	     * about the address alignment.
+	     */
+	    xmm_src = load_128_unaligned ((__m128i*) src);
+	    xmm_dst = load_128_aligned ((__m128i*) dst);
+
+	    /* Unpacking */
+	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);
+	    unpack_565_128_4x128 (xmm_dst,
+				  &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3);
+	    expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+				&xmm_alpha_lo, &xmm_alpha_hi);
+
+	    /* I'm loading next 4 pixels from memory
+	     * before to optimze the memory read.
+	     */
+	    xmm_src = load_128_unaligned ((__m128i*) (src + 4));
+
+	    over_2x128 (&xmm_src_lo, &xmm_src_hi,
+			&xmm_alpha_lo, &xmm_alpha_hi,
+			&xmm_dst0, &xmm_dst1);
+
+	    /* Unpacking */
+	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);
+	    expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+				&xmm_alpha_lo, &xmm_alpha_hi);
+
+	    over_2x128 (&xmm_src_lo, &xmm_src_hi,
+			&xmm_alpha_lo, &xmm_alpha_hi,
+			&xmm_dst2, &xmm_dst3);
+
+	    save_128_aligned (
+		(__m128i*)dst, pack_565_4x128_128 (
+		    &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3));
+
+	    w -= 8;
+	    dst += 8;
+	    src += 8;
+	}
+
+	while (w--)
+	{
+	    s = *src++;
+	    d = *dst;
+
+	    *dst++ = composite_over_8888_0565pixel (s, d);
+	}
+    }
+
+}
+
+static void
+sse2_composite_over_n_8_8888 (pixman_implementation_t *imp,
+                              pixman_op_t              op,
+                              pixman_image_t *         src_image,
+                              pixman_image_t *         mask_image,
+                              pixman_image_t *         dst_image,
+                              int32_t                  src_x,
+                              int32_t                  src_y,
+                              int32_t                  mask_x,
+                              int32_t                  mask_y,
+                              int32_t                  dest_x,
+                              int32_t                  dest_y,
+                              int32_t                  width,
+                              int32_t                  height)
+{
+    uint32_t src, srca;
+    uint32_t *dst_line, *dst;
+    uint8_t *mask_line, *mask;
+    int dst_stride, mask_stride;
+    int32_t w;
+    uint32_t m, d;
+
+    __m128i xmm_src, xmm_alpha, xmm_def;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;
+
+    __m128i mmx_src, mmx_alpha, mmx_mask, mmx_dest;
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    srca = src >> 24;
+    if (src == 0)
+	return;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
+
+    xmm_def = create_mask_2x32_128 (src, src);
+    xmm_src = expand_pixel_32_1x128 (src);
+    xmm_alpha = expand_alpha_1x128 (xmm_src);
+    mmx_src   = xmm_src;
+    mmx_alpha = xmm_alpha;
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	mask = mask_line;
+	mask_line += mask_stride;
+	w = width;
+
+	while (w && (unsigned long)dst & 15)
+	{
+	    uint8_t m = *mask++;
+
+	    if (m)
+	    {
+		d = *dst;
+		mmx_mask = expand_pixel_8_1x128 (m);
+		mmx_dest = unpack_32_1x128 (d);
+
+		*dst = pack_1x128_32 (in_over_1x128 (&mmx_src,
+		                                   &mmx_alpha,
+		                                   &mmx_mask,
+		                                   &mmx_dest));
+	    }
+
+	    w--;
+	    dst++;
+	}
+
+	while (w >= 4)
+	{
+	    m = *((uint32_t*)mask);
+
+	    if (srca == 0xff && m == 0xffffffff)
+	    {
+		save_128_aligned ((__m128i*)dst, xmm_def);
+	    }
+	    else if (m)
+	    {
+		xmm_dst = load_128_aligned ((__m128i*) dst);
+		xmm_mask = unpack_32_1x128 (m);
+		xmm_mask = _mm_unpacklo_epi8 (xmm_mask, _mm_setzero_si128 ());
+
+		/* Unpacking */
+		unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+		unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+
+		expand_alpha_rev_2x128 (xmm_mask_lo, xmm_mask_hi,
+					&xmm_mask_lo, &xmm_mask_hi);
+
+		in_over_2x128 (&xmm_src, &xmm_src,
+			       &xmm_alpha, &xmm_alpha,
+			       &xmm_mask_lo, &xmm_mask_hi,
+			       &xmm_dst_lo, &xmm_dst_hi);
+
+		save_128_aligned (
+		    (__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+	    }
+
+	    w -= 4;
+	    dst += 4;
+	    mask += 4;
+	}
+
+	while (w)
+	{
+	    uint8_t m = *mask++;
+
+	    if (m)
+	    {
+		d = *dst;
+		mmx_mask = expand_pixel_8_1x128 (m);
+		mmx_dest = unpack_32_1x128 (d);
+
+		*dst = pack_1x128_32 (in_over_1x128 (&mmx_src,
+		                                   &mmx_alpha,
+		                                   &mmx_mask,
+		                                   &mmx_dest));
+	    }
+
+	    w--;
+	    dst++;
+	}
+    }
+
+}
+
+static pixman_bool_t
+pixman_fill_sse2 (uint32_t *bits,
+                  int       stride,
+                  int       bpp,
+                  int       x,
+                  int       y,
+                  int       width,
+                  int       height,
+                  uint32_t  data)
+{
+    uint32_t byte_width;
+    uint8_t         *byte_line;
+
+    __m128i xmm_def;
+
+    if (bpp == 8)
+    {
+	uint8_t b;
+	uint16_t w;
+
+	stride = stride * (int) sizeof (uint32_t) / 1;
+	byte_line = (uint8_t *)(((uint8_t *)bits) + stride * y + x);
+	byte_width = width;
+	stride *= 1;
+
+	b = data & 0xff;
+	w = (b << 8) | b;
+	data = (w << 16) | w;
+    }
+    else if (bpp == 16)
+    {
+	stride = stride * (int) sizeof (uint32_t) / 2;
+	byte_line = (uint8_t *)(((uint16_t *)bits) + stride * y + x);
+	byte_width = 2 * width;
+	stride *= 2;
+
+        data = (data & 0xffff) * 0x00010001;
+    }
+    else if (bpp == 32)
+    {
+	stride = stride * (int) sizeof (uint32_t) / 4;
+	byte_line = (uint8_t *)(((uint32_t *)bits) + stride * y + x);
+	byte_width = 4 * width;
+	stride *= 4;
+    }
+    else
+    {
+	return FALSE;
+    }
+
+    xmm_def = create_mask_2x32_128 (data, data);
+
+    while (height--)
+    {
+	int w;
+	uint8_t *d = byte_line;
+	byte_line += stride;
+	w = byte_width;
+
+	while (w >= 1 && ((unsigned long)d & 1))
+	{
+	    *(uint8_t *)d = data;
+	    w -= 1;
+	    d += 1;
+	}
+
+	while (w >= 2 && ((unsigned long)d & 3))
+	{
+	    *(uint16_t *)d = data;
+	    w -= 2;
+	    d += 2;
+	}
+
+	while (w >= 4 && ((unsigned long)d & 15))
+	{
+	    *(uint32_t *)d = data;
+
+	    w -= 4;
+	    d += 4;
+	}
+
+	while (w >= 128)
+	{
+	    save_128_aligned ((__m128i*)(d),     xmm_def);
+	    save_128_aligned ((__m128i*)(d + 16),  xmm_def);
+	    save_128_aligned ((__m128i*)(d + 32),  xmm_def);
+	    save_128_aligned ((__m128i*)(d + 48),  xmm_def);
+	    save_128_aligned ((__m128i*)(d + 64),  xmm_def);
+	    save_128_aligned ((__m128i*)(d + 80),  xmm_def);
+	    save_128_aligned ((__m128i*)(d + 96),  xmm_def);
+	    save_128_aligned ((__m128i*)(d + 112), xmm_def);
+
+	    d += 128;
+	    w -= 128;
+	}
+
+	if (w >= 64)
+	{
+	    save_128_aligned ((__m128i*)(d),     xmm_def);
+	    save_128_aligned ((__m128i*)(d + 16),  xmm_def);
+	    save_128_aligned ((__m128i*)(d + 32),  xmm_def);
+	    save_128_aligned ((__m128i*)(d + 48),  xmm_def);
+
+	    d += 64;
+	    w -= 64;
+	}
+
+	if (w >= 32)
+	{
+	    save_128_aligned ((__m128i*)(d),     xmm_def);
+	    save_128_aligned ((__m128i*)(d + 16),  xmm_def);
+
+	    d += 32;
+	    w -= 32;
+	}
+
+	if (w >= 16)
+	{
+	    save_128_aligned ((__m128i*)(d),     xmm_def);
+
+	    d += 16;
+	    w -= 16;
+	}
+
+	while (w >= 4)
+	{
+	    *(uint32_t *)d = data;
+
+	    w -= 4;
+	    d += 4;
+	}
+
+	if (w >= 2)
+	{
+	    *(uint16_t *)d = data;
+	    w -= 2;
+	    d += 2;
+	}
+
+	if (w >= 1)
+	{
+	    *(uint8_t *)d = data;
+	    w -= 1;
+	    d += 1;
+	}
+    }
+
+    return TRUE;
+}
+
+static void
+sse2_composite_src_n_8_8888 (pixman_implementation_t *imp,
+                             pixman_op_t              op,
+                             pixman_image_t *         src_image,
+                             pixman_image_t *         mask_image,
+                             pixman_image_t *         dst_image,
+                             int32_t                  src_x,
+                             int32_t                  src_y,
+                             int32_t                  mask_x,
+                             int32_t                  mask_y,
+                             int32_t                  dest_x,
+                             int32_t                  dest_y,
+                             int32_t                  width,
+                             int32_t                  height)
+{
+    uint32_t src, srca;
+    uint32_t    *dst_line, *dst;
+    uint8_t     *mask_line, *mask;
+    int dst_stride, mask_stride;
+    int32_t w;
+    uint32_t m;
+
+    __m128i xmm_src, xmm_def;
+    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    srca = src >> 24;
+    if (src == 0)
+    {
+	pixman_fill_sse2 (dst_image->bits.bits, dst_image->bits.rowstride,
+	                  PIXMAN_FORMAT_BPP (dst_image->bits.format),
+	                  dest_x, dest_y, width, height, 0);
+	return;
+    }
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
+
+    xmm_def = create_mask_2x32_128 (src, src);
+    xmm_src = expand_pixel_32_1x128 (src);
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	mask = mask_line;
+	mask_line += mask_stride;
+	w = width;
+
+	while (w && (unsigned long)dst & 15)
+	{
+	    uint8_t m = *mask++;
+
+	    if (m)
+	    {
+		*dst = pack_1x128_32 (
+		    pix_multiply_1x128 (xmm_src, expand_pixel_8_1x128 (m)));
+	    }
+	    else
+	    {
+		*dst = 0;
+	    }
+
+	    w--;
+	    dst++;
+	}
+
+	while (w >= 4)
+	{
+	    m = *((uint32_t*)mask);
+
+	    if (srca == 0xff && m == 0xffffffff)
+	    {
+		save_128_aligned ((__m128i*)dst, xmm_def);
+	    }
+	    else if (m)
+	    {
+		xmm_mask = unpack_32_1x128 (m);
+		xmm_mask = _mm_unpacklo_epi8 (xmm_mask, _mm_setzero_si128 ());
+
+		/* Unpacking */
+		unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+
+		expand_alpha_rev_2x128 (xmm_mask_lo, xmm_mask_hi,
+					&xmm_mask_lo, &xmm_mask_hi);
+
+		pix_multiply_2x128 (&xmm_src, &xmm_src,
+				    &xmm_mask_lo, &xmm_mask_hi,
+				    &xmm_mask_lo, &xmm_mask_hi);
+
+		save_128_aligned (
+		    (__m128i*)dst, pack_2x128_128 (xmm_mask_lo, xmm_mask_hi));
+	    }
+	    else
+	    {
+		save_128_aligned ((__m128i*)dst, _mm_setzero_si128 ());
+	    }
+
+	    w -= 4;
+	    dst += 4;
+	    mask += 4;
+	}
+
+	while (w)
+	{
+	    uint8_t m = *mask++;
+
+	    if (m)
+	    {
+		*dst = pack_1x128_32 (
+		    pix_multiply_1x128 (
+			xmm_src, expand_pixel_8_1x128 (m)));
+	    }
+	    else
+	    {
+		*dst = 0;
+	    }
+
+	    w--;
+	    dst++;
+	}
+    }
+
+}
+
+static void
+sse2_composite_over_n_8_0565 (pixman_implementation_t *imp,
+                              pixman_op_t              op,
+                              pixman_image_t *         src_image,
+                              pixman_image_t *         mask_image,
+                              pixman_image_t *         dst_image,
+                              int32_t                  src_x,
+                              int32_t                  src_y,
+                              int32_t                  mask_x,
+                              int32_t                  mask_y,
+                              int32_t                  dest_x,
+                              int32_t                  dest_y,
+                              int32_t                  width,
+                              int32_t                  height)
+{
+    uint32_t src;
+    uint16_t    *dst_line, *dst, d;
+    uint8_t     *mask_line, *mask;
+    int dst_stride, mask_stride;
+    int32_t w;
+    uint32_t m;
+    __m128i mmx_src, mmx_alpha, mmx_mask, mmx_dest;
+
+    __m128i xmm_src, xmm_alpha;
+    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;
+    __m128i xmm_dst, xmm_dst0, xmm_dst1, xmm_dst2, xmm_dst3;
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    if (src == 0)
+	return;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
+
+    xmm_src = expand_pixel_32_1x128 (src);
+    xmm_alpha = expand_alpha_1x128 (xmm_src);
+    mmx_src = xmm_src;
+    mmx_alpha = xmm_alpha;
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	mask = mask_line;
+	mask_line += mask_stride;
+	w = width;
+
+	while (w && (unsigned long)dst & 15)
+	{
+	    m = *mask++;
+
+	    if (m)
+	    {
+		d = *dst;
+		mmx_mask = expand_alpha_rev_1x128 (unpack_32_1x128 (m));
+		mmx_dest = expand565_16_1x128 (d);
+
+		*dst = pack_565_32_16 (
+		    pack_1x128_32 (
+			in_over_1x128 (
+			    &mmx_src, &mmx_alpha, &mmx_mask, &mmx_dest)));
+	    }
+
+	    w--;
+	    dst++;
+	}
+
+	while (w >= 8)
+	{
+	    xmm_dst = load_128_aligned ((__m128i*) dst);
+	    unpack_565_128_4x128 (xmm_dst,
+				  &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3);
+
+	    m = *((uint32_t*)mask);
+	    mask += 4;
+
+	    if (m)
+	    {
+		xmm_mask = unpack_32_1x128 (m);
+		xmm_mask = _mm_unpacklo_epi8 (xmm_mask, _mm_setzero_si128 ());
+
+		/* Unpacking */
+		unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+
+		expand_alpha_rev_2x128 (xmm_mask_lo, xmm_mask_hi,
+					&xmm_mask_lo, &xmm_mask_hi);
+
+		in_over_2x128 (&xmm_src, &xmm_src,
+			       &xmm_alpha, &xmm_alpha,
+			       &xmm_mask_lo, &xmm_mask_hi,
+			       &xmm_dst0, &xmm_dst1);
+	    }
+
+	    m = *((uint32_t*)mask);
+	    mask += 4;
+
+	    if (m)
+	    {
+		xmm_mask = unpack_32_1x128 (m);
+		xmm_mask = _mm_unpacklo_epi8 (xmm_mask, _mm_setzero_si128 ());
+
+		/* Unpacking */
+		unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+
+		expand_alpha_rev_2x128 (xmm_mask_lo, xmm_mask_hi,
+					&xmm_mask_lo, &xmm_mask_hi);
+		in_over_2x128 (&xmm_src, &xmm_src,
+			       &xmm_alpha, &xmm_alpha,
+			       &xmm_mask_lo, &xmm_mask_hi,
+			       &xmm_dst2, &xmm_dst3);
+	    }
+
+	    save_128_aligned (
+		(__m128i*)dst, pack_565_4x128_128 (
+		    &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3));
+
+	    w -= 8;
+	    dst += 8;
+	}
+
+	while (w)
+	{
+	    m = *mask++;
+
+	    if (m)
+	    {
+		d = *dst;
+		mmx_mask = expand_alpha_rev_1x128 (unpack_32_1x128 (m));
+		mmx_dest = expand565_16_1x128 (d);
+
+		*dst = pack_565_32_16 (
+		    pack_1x128_32 (
+			in_over_1x128 (
+			    &mmx_src, &mmx_alpha, &mmx_mask, &mmx_dest)));
+	    }
+
+	    w--;
+	    dst++;
+	}
+    }
+
+}
+
+static void
+sse2_composite_over_pixbuf_0565 (pixman_implementation_t *imp,
+                                 pixman_op_t              op,
+                                 pixman_image_t *         src_image,
+                                 pixman_image_t *         mask_image,
+                                 pixman_image_t *         dst_image,
+                                 int32_t                  src_x,
+                                 int32_t                  src_y,
+                                 int32_t                  mask_x,
+                                 int32_t                  mask_y,
+                                 int32_t                  dest_x,
+                                 int32_t                  dest_y,
+                                 int32_t                  width,
+                                 int32_t                  height)
+{
+    uint16_t    *dst_line, *dst, d;
+    uint32_t    *src_line, *src, s;
+    int dst_stride, src_stride;
+    int32_t w;
+    uint32_t opaque, zero;
+
+    __m128i ms;
+    __m128i xmm_src, xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst, xmm_dst0, xmm_dst1, xmm_dst2, xmm_dst3;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	src = src_line;
+	src_line += src_stride;
+	w = width;
+
+	while (w && (unsigned long)dst & 15)
+	{
+	    s = *src++;
+	    d = *dst;
+
+	    ms = unpack_32_1x128 (s);
+
+	    *dst++ = pack_565_32_16 (
+		pack_1x128_32 (
+		    over_rev_non_pre_1x128 (ms, expand565_16_1x128 (d))));
+	    w--;
+	}
+
+	while (w >= 8)
+	{
+	    /* First round */
+	    xmm_src = load_128_unaligned ((__m128i*)src);
+	    xmm_dst = load_128_aligned  ((__m128i*)dst);
+
+	    opaque = is_opaque (xmm_src);
+	    zero = is_zero (xmm_src);
+
+	    unpack_565_128_4x128 (xmm_dst,
+				  &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3);
+	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);
+
+	    /* preload next round*/
+	    xmm_src = load_128_unaligned ((__m128i*)(src + 4));
+
+	    if (opaque)
+	    {
+		invert_colors_2x128 (xmm_src_lo, xmm_src_hi,
+				     &xmm_dst0, &xmm_dst1);
+	    }
+	    else if (!zero)
+	    {
+		over_rev_non_pre_2x128 (xmm_src_lo, xmm_src_hi,
+					&xmm_dst0, &xmm_dst1);
+	    }
+
+	    /* Second round */
+	    opaque = is_opaque (xmm_src);
+	    zero = is_zero (xmm_src);
+
+	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);
+
+	    if (opaque)
+	    {
+		invert_colors_2x128 (xmm_src_lo, xmm_src_hi,
+				     &xmm_dst2, &xmm_dst3);
+	    }
+	    else if (!zero)
+	    {
+		over_rev_non_pre_2x128 (xmm_src_lo, xmm_src_hi,
+					&xmm_dst2, &xmm_dst3);
+	    }
+
+	    save_128_aligned (
+		(__m128i*)dst, pack_565_4x128_128 (
+		    &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3));
+
+	    w -= 8;
+	    src += 8;
+	    dst += 8;
+	}
+
+	while (w)
+	{
+	    s = *src++;
+	    d = *dst;
+
+	    ms = unpack_32_1x128 (s);
+
+	    *dst++ = pack_565_32_16 (
+		pack_1x128_32 (
+		    over_rev_non_pre_1x128 (ms, expand565_16_1x128 (d))));
+	    w--;
+	}
+    }
+
+}
+
+static void
+sse2_composite_over_pixbuf_8888 (pixman_implementation_t *imp,
+                                 pixman_op_t              op,
+                                 pixman_image_t *         src_image,
+                                 pixman_image_t *         mask_image,
+                                 pixman_image_t *         dst_image,
+                                 int32_t                  src_x,
+                                 int32_t                  src_y,
+                                 int32_t                  mask_x,
+                                 int32_t                  mask_y,
+                                 int32_t                  dest_x,
+                                 int32_t                  dest_y,
+                                 int32_t                  width,
+                                 int32_t                  height)
+{
+    uint32_t    *dst_line, *dst, d;
+    uint32_t    *src_line, *src, s;
+    int dst_stride, src_stride;
+    int32_t w;
+    uint32_t opaque, zero;
+
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst_lo, xmm_dst_hi;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	src = src_line;
+	src_line += src_stride;
+	w = width;
+
+	while (w && (unsigned long)dst & 15)
+	{
+	    s = *src++;
+	    d = *dst;
+
+	    *dst++ = pack_1x128_32 (
+		over_rev_non_pre_1x128 (
+		    unpack_32_1x128 (s), unpack_32_1x128 (d)));
+
+	    w--;
+	}
+
+	while (w >= 4)
+	{
+	    xmm_src_hi = load_128_unaligned ((__m128i*)src);
+
+	    opaque = is_opaque (xmm_src_hi);
+	    zero = is_zero (xmm_src_hi);
+
+	    unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+
+	    if (opaque)
+	    {
+		invert_colors_2x128 (xmm_src_lo, xmm_src_hi,
+				     &xmm_dst_lo, &xmm_dst_hi);
+
+		save_128_aligned (
+		    (__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+	    }
+	    else if (!zero)
+	    {
+		xmm_dst_hi = load_128_aligned  ((__m128i*)dst);
+
+		unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+
+		over_rev_non_pre_2x128 (xmm_src_lo, xmm_src_hi,
+					&xmm_dst_lo, &xmm_dst_hi);
+
+		save_128_aligned (
+		    (__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+	    }
+
+	    w -= 4;
+	    dst += 4;
+	    src += 4;
+	}
+
+	while (w)
+	{
+	    s = *src++;
+	    d = *dst;
+
+	    *dst++ = pack_1x128_32 (
+		over_rev_non_pre_1x128 (
+		    unpack_32_1x128 (s), unpack_32_1x128 (d)));
+
+	    w--;
+	}
+    }
+
+}
+
+static void
+sse2_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
+                                    pixman_op_t              op,
+                                    pixman_image_t *         src_image,
+                                    pixman_image_t *         mask_image,
+                                    pixman_image_t *         dst_image,
+                                    int32_t                  src_x,
+                                    int32_t                  src_y,
+                                    int32_t                  mask_x,
+                                    int32_t                  mask_y,
+                                    int32_t                  dest_x,
+                                    int32_t                  dest_y,
+                                    int32_t                  width,
+                                    int32_t                  height)
+{
+    uint32_t src;
+    uint16_t    *dst_line, *dst, d;
+    uint32_t    *mask_line, *mask, m;
+    int dst_stride, mask_stride;
+    int w;
+    uint32_t pack_cmp;
+
+    __m128i xmm_src, xmm_alpha;
+    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;
+    __m128i xmm_dst, xmm_dst0, xmm_dst1, xmm_dst2, xmm_dst3;
+
+    __m128i mmx_src, mmx_alpha, mmx_mask, mmx_dest;
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    if (src == 0)
+	return;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);
+
+    xmm_src = expand_pixel_32_1x128 (src);
+    xmm_alpha = expand_alpha_1x128 (xmm_src);
+    mmx_src = xmm_src;
+    mmx_alpha = xmm_alpha;
+
+    while (height--)
+    {
+	w = width;
+	mask = mask_line;
+	dst = dst_line;
+	mask_line += mask_stride;
+	dst_line += dst_stride;
+
+	while (w && ((unsigned long)dst & 15))
+	{
+	    m = *(uint32_t *) mask;
+
+	    if (m)
+	    {
+		d = *dst;
+		mmx_mask = unpack_32_1x128 (m);
+		mmx_dest = expand565_16_1x128 (d);
+
+		*dst = pack_565_32_16 (
+		    pack_1x128_32 (
+			in_over_1x128 (
+			    &mmx_src, &mmx_alpha, &mmx_mask, &mmx_dest)));
+	    }
+
+	    w--;
+	    dst++;
+	    mask++;
+	}
+
+	while (w >= 8)
+	{
+	    /* First round */
+	    xmm_mask = load_128_unaligned ((__m128i*)mask);
+	    xmm_dst = load_128_aligned ((__m128i*)dst);
+
+	    pack_cmp = _mm_movemask_epi8 (
+		_mm_cmpeq_epi32 (xmm_mask, _mm_setzero_si128 ()));
+
+	    unpack_565_128_4x128 (xmm_dst,
+				  &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3);
+	    unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+
+	    /* preload next round */
+	    xmm_mask = load_128_unaligned ((__m128i*)(mask + 4));
+
+	    /* preload next round */
+	    if (pack_cmp != 0xffff)
+	    {
+		in_over_2x128 (&xmm_src, &xmm_src,
+			       &xmm_alpha, &xmm_alpha,
+			       &xmm_mask_lo, &xmm_mask_hi,
+			       &xmm_dst0, &xmm_dst1);
+	    }
+
+	    /* Second round */
+	    pack_cmp = _mm_movemask_epi8 (
+		_mm_cmpeq_epi32 (xmm_mask, _mm_setzero_si128 ()));
+
+	    unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+
+	    if (pack_cmp != 0xffff)
+	    {
+		in_over_2x128 (&xmm_src, &xmm_src,
+			       &xmm_alpha, &xmm_alpha,
+			       &xmm_mask_lo, &xmm_mask_hi,
+			       &xmm_dst2, &xmm_dst3);
+	    }
+
+	    save_128_aligned (
+		(__m128i*)dst, pack_565_4x128_128 (
+		    &xmm_dst0, &xmm_dst1, &xmm_dst2, &xmm_dst3));
+
+	    w -= 8;
+	    dst += 8;
+	    mask += 8;
+	}
+
+	while (w)
+	{
+	    m = *(uint32_t *) mask;
+
+	    if (m)
+	    {
+		d = *dst;
+		mmx_mask = unpack_32_1x128 (m);
+		mmx_dest = expand565_16_1x128 (d);
+
+		*dst = pack_565_32_16 (
+		    pack_1x128_32 (
+			in_over_1x128 (
+			    &mmx_src, &mmx_alpha, &mmx_mask, &mmx_dest)));
+	    }
+
+	    w--;
+	    dst++;
+	    mask++;
+	}
+    }
+
+}
+
+static void
+sse2_composite_in_n_8_8 (pixman_implementation_t *imp,
+                         pixman_op_t              op,
+                         pixman_image_t *         src_image,
+                         pixman_image_t *         mask_image,
+                         pixman_image_t *         dst_image,
+                         int32_t                  src_x,
+                         int32_t                  src_y,
+                         int32_t                  mask_x,
+                         int32_t                  mask_y,
+                         int32_t                  dest_x,
+                         int32_t                  dest_y,
+                         int32_t                  width,
+                         int32_t                  height)
+{
+    uint8_t     *dst_line, *dst;
+    uint8_t     *mask_line, *mask;
+    int dst_stride, mask_stride;
+    uint32_t d, m;
+    uint32_t src;
+    int32_t w;
+
+    __m128i xmm_alpha;
+    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    xmm_alpha = expand_alpha_1x128 (expand_pixel_32_1x128 (src));
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	mask = mask_line;
+	mask_line += mask_stride;
+	w = width;
+
+	while (w && ((unsigned long)dst & 15))
+	{
+	    m = (uint32_t) *mask++;
+	    d = (uint32_t) *dst;
+
+	    *dst++ = (uint8_t) pack_1x128_32 (
+		pix_multiply_1x128 (
+		    pix_multiply_1x128 (xmm_alpha,
+				       unpack_32_1x128 (m)),
+		    unpack_32_1x128 (d)));
+	    w--;
+	}
+
+	while (w >= 16)
+	{
+	    xmm_mask = load_128_unaligned ((__m128i*)mask);
+	    xmm_dst = load_128_aligned ((__m128i*)dst);
+
+	    unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+
+	    pix_multiply_2x128 (&xmm_alpha, &xmm_alpha,
+				&xmm_mask_lo, &xmm_mask_hi,
+				&xmm_mask_lo, &xmm_mask_hi);
+
+	    pix_multiply_2x128 (&xmm_mask_lo, &xmm_mask_hi,
+				&xmm_dst_lo, &xmm_dst_hi,
+				&xmm_dst_lo, &xmm_dst_hi);
+
+	    save_128_aligned (
+		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	    mask += 16;
+	    dst += 16;
+	    w -= 16;
+	}
+
+	while (w)
+	{
+	    m = (uint32_t) *mask++;
+	    d = (uint32_t) *dst;
+
+	    *dst++ = (uint8_t) pack_1x128_32 (
+		pix_multiply_1x128 (
+		    pix_multiply_1x128 (
+			xmm_alpha, unpack_32_1x128 (m)),
+		    unpack_32_1x128 (d)));
+	    w--;
+	}
+    }
+
+}
+
+static void
+sse2_composite_in_n_8 (pixman_implementation_t *imp,
+		       pixman_op_t              op,
+		       pixman_image_t *         src_image,
+		       pixman_image_t *         mask_image,
+		       pixman_image_t *         dst_image,
+		       int32_t                  src_x,
+		       int32_t                  src_y,
+		       int32_t                  mask_x,
+		       int32_t                  mask_y,
+		       int32_t                  dest_x,
+		       int32_t                  dest_y,
+		       int32_t                  width,
+		       int32_t                  height)
+{
+    uint8_t     *dst_line, *dst;
+    int dst_stride;
+    uint32_t d;
+    uint32_t src;
+    int32_t w;
+
+    __m128i xmm_alpha;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    xmm_alpha = expand_alpha_1x128 (expand_pixel_32_1x128 (src));
+
+    src = src >> 24;
+
+    if (src == 0xff)
+	return;
+
+    if (src == 0x00)
+    {
+	pixman_fill (dst_image->bits.bits, dst_image->bits.rowstride,
+		     8, dest_x, dest_y, width, height, src);
+
+	return;
+    }
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	w = width;
+
+	while (w && ((unsigned long)dst & 15))
+	{
+	    d = (uint32_t) *dst;
+
+	    *dst++ = (uint8_t) pack_1x128_32 (
+		pix_multiply_1x128 (
+		    xmm_alpha,
+		    unpack_32_1x128 (d)));
+	    w--;
+	}
+
+	while (w >= 16)
+	{
+	    xmm_dst = load_128_aligned ((__m128i*)dst);
+
+	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+	    
+	    pix_multiply_2x128 (&xmm_alpha, &xmm_alpha,
+				&xmm_dst_lo, &xmm_dst_hi,
+				&xmm_dst_lo, &xmm_dst_hi);
+
+	    save_128_aligned (
+		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	    dst += 16;
+	    w -= 16;
+	}
+
+	while (w)
+	{
+	    d = (uint32_t) *dst;
+
+	    *dst++ = (uint8_t) pack_1x128_32 (
+		pix_multiply_1x128 (
+		    xmm_alpha,
+		    unpack_32_1x128 (d)));
+	    w--;
+	}
+    }
+
+}
+
+static void
+sse2_composite_in_8_8 (pixman_implementation_t *imp,
+                       pixman_op_t              op,
+                       pixman_image_t *         src_image,
+                       pixman_image_t *         mask_image,
+                       pixman_image_t *         dst_image,
+                       int32_t                  src_x,
+                       int32_t                  src_y,
+                       int32_t                  mask_x,
+                       int32_t                  mask_y,
+                       int32_t                  dest_x,
+                       int32_t                  dest_y,
+                       int32_t                  width,
+                       int32_t                  height)
+{
+    uint8_t     *dst_line, *dst;
+    uint8_t     *src_line, *src;
+    int src_stride, dst_stride;
+    int32_t w;
+    uint32_t s, d;
+
+    __m128i xmm_src, xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint8_t, src_stride, src_line, 1);
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	src = src_line;
+	src_line += src_stride;
+	w = width;
+
+	while (w && ((unsigned long)dst & 15))
+	{
+	    s = (uint32_t) *src++;
+	    d = (uint32_t) *dst;
+
+	    *dst++ = (uint8_t) pack_1x128_32 (
+		pix_multiply_1x128 (
+		    unpack_32_1x128 (s), unpack_32_1x128 (d)));
+	    w--;
+	}
+
+	while (w >= 16)
+	{
+	    xmm_src = load_128_unaligned ((__m128i*)src);
+	    xmm_dst = load_128_aligned ((__m128i*)dst);
+
+	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);
+	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+
+	    pix_multiply_2x128 (&xmm_src_lo, &xmm_src_hi,
+				&xmm_dst_lo, &xmm_dst_hi,
+				&xmm_dst_lo, &xmm_dst_hi);
+
+	    save_128_aligned (
+		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	    src += 16;
+	    dst += 16;
+	    w -= 16;
+	}
+
+	while (w)
+	{
+	    s = (uint32_t) *src++;
+	    d = (uint32_t) *dst;
+
+	    *dst++ = (uint8_t) pack_1x128_32 (
+		pix_multiply_1x128 (unpack_32_1x128 (s), unpack_32_1x128 (d)));
+	    w--;
+	}
+    }
+
+}
+
+static void
+sse2_composite_add_n_8_8 (pixman_implementation_t *imp,
+			  pixman_op_t              op,
+			  pixman_image_t *         src_image,
+			  pixman_image_t *         mask_image,
+			  pixman_image_t *         dst_image,
+			  int32_t                  src_x,
+			  int32_t                  src_y,
+			  int32_t                  mask_x,
+			  int32_t                  mask_y,
+			  int32_t                  dest_x,
+			  int32_t                  dest_y,
+			  int32_t                  width,
+			  int32_t                  height)
+{
+    uint8_t     *dst_line, *dst;
+    uint8_t     *mask_line, *mask;
+    int dst_stride, mask_stride;
+    int32_t w;
+    uint32_t src;
+    uint32_t m, d;
+
+    __m128i xmm_alpha;
+    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    xmm_alpha = expand_alpha_1x128 (expand_pixel_32_1x128 (src));
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	mask = mask_line;
+	mask_line += mask_stride;
+	w = width;
+
+	while (w && ((unsigned long)dst & 15))
+	{
+	    m = (uint32_t) *mask++;
+	    d = (uint32_t) *dst;
+
+	    *dst++ = (uint8_t) pack_1x128_32 (
+		_mm_adds_epu16 (
+		    pix_multiply_1x128 (
+			xmm_alpha, unpack_32_1x128 (m)),
+		    unpack_32_1x128 (d)));
+	    w--;
+	}
+
+	while (w >= 16)
+	{
+	    xmm_mask = load_128_unaligned ((__m128i*)mask);
+	    xmm_dst = load_128_aligned ((__m128i*)dst);
+
+	    unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+
+	    pix_multiply_2x128 (&xmm_alpha, &xmm_alpha,
+				&xmm_mask_lo, &xmm_mask_hi,
+				&xmm_mask_lo, &xmm_mask_hi);
+
+	    xmm_dst_lo = _mm_adds_epu16 (xmm_mask_lo, xmm_dst_lo);
+	    xmm_dst_hi = _mm_adds_epu16 (xmm_mask_hi, xmm_dst_hi);
+
+	    save_128_aligned (
+		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+
+	    mask += 16;
+	    dst += 16;
+	    w -= 16;
+	}
+
+	while (w)
+	{
+	    m = (uint32_t) *mask++;
+	    d = (uint32_t) *dst;
+
+	    *dst++ = (uint8_t) pack_1x128_32 (
+		_mm_adds_epu16 (
+		    pix_multiply_1x128 (
+			xmm_alpha, unpack_32_1x128 (m)),
+		    unpack_32_1x128 (d)));
+
+	    w--;
+	}
+    }
+
+}
+
+static void
+sse2_composite_add_n_8 (pixman_implementation_t *imp,
+			pixman_op_t              op,
+			pixman_image_t *         src_image,
+			pixman_image_t *         mask_image,
+			pixman_image_t *         dst_image,
+			int32_t                  src_x,
+			int32_t                  src_y,
+			int32_t                  mask_x,
+			int32_t                  mask_y,
+			int32_t                  dest_x,
+			int32_t                  dest_y,
+			int32_t                  width,
+			int32_t                  height)
+{
+    uint8_t     *dst_line, *dst;
+    int dst_stride;
+    int32_t w;
+    uint32_t src;
+
+    __m128i xmm_src;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    src >>= 24;
+
+    if (src == 0x00)
+	return;
+
+    if (src == 0xff)
+    {
+	pixman_fill (dst_image->bits.bits, dst_image->bits.rowstride,
+		     8, dest_x, dest_y, width, height, 0xff);
+
+	return;
+    }
+
+    src = (src << 24) | (src << 16) | (src << 8) | src;
+    xmm_src = _mm_set_epi32 (src, src, src, src);
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	w = width;
+
+	while (w && ((unsigned long)dst & 15))
+	{
+	    *dst = (uint8_t)_mm_cvtsi128_si32 (
+		_mm_adds_epu8 (
+		    xmm_src,
+		    _mm_cvtsi32_si128 (*dst)));
+
+	    w--;
+	    dst++;
+	}
+
+	while (w >= 16)
+	{
+	    save_128_aligned (
+		(__m128i*)dst, _mm_adds_epu8 (xmm_src, load_128_aligned  ((__m128i*)dst)));
+
+	    dst += 16;
+	    w -= 16;
+	}
+
+	while (w)
+	{
+	    *dst = (uint8_t)_mm_cvtsi128_si32 (
+		_mm_adds_epu8 (
+		    xmm_src,
+		    _mm_cvtsi32_si128 (*dst)));
+
+	    w--;
+	    dst++;
+	}
+    }
+
+}
+
+static void
+sse2_composite_add_8_8 (pixman_implementation_t *imp,
+			pixman_op_t              op,
+			pixman_image_t *         src_image,
+			pixman_image_t *         mask_image,
+			pixman_image_t *         dst_image,
+			int32_t                  src_x,
+			int32_t                  src_y,
+			int32_t                  mask_x,
+			int32_t                  mask_y,
+			int32_t                  dest_x,
+			int32_t                  dest_y,
+			int32_t                  width,
+			int32_t                  height)
+{
+    uint8_t     *dst_line, *dst;
+    uint8_t     *src_line, *src;
+    int dst_stride, src_stride;
+    int32_t w;
+    uint16_t t;
+
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint8_t, src_stride, src_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint8_t, dst_stride, dst_line, 1);
+
+    while (height--)
+    {
+	dst = dst_line;
+	src = src_line;
+
+	dst_line += dst_stride;
+	src_line += src_stride;
+	w = width;
+
+	/* Small head */
+	while (w && (unsigned long)dst & 3)
+	{
+	    t = (*dst) + (*src++);
+	    *dst++ = t | (0 - (t >> 8));
+	    w--;
+	}
+
+	sse2_combine_add_u (imp, op,
+			    (uint32_t*)dst, (uint32_t*)src, NULL, w >> 2);
+
+	/* Small tail */
+	dst += w & 0xfffc;
+	src += w & 0xfffc;
+
+	w &= 3;
+
+	while (w)
+	{
+	    t = (*dst) + (*src++);
+	    *dst++ = t | (0 - (t >> 8));
+	    w--;
+	}
+    }
+
+}
+
+static void
+sse2_composite_add_8888_8888 (pixman_implementation_t *imp,
+                              pixman_op_t              op,
+                              pixman_image_t *         src_image,
+                              pixman_image_t *         mask_image,
+                              pixman_image_t *         dst_image,
+                              int32_t                  src_x,
+                              int32_t                  src_y,
+                              int32_t                  mask_x,
+                              int32_t                  mask_y,
+                              int32_t                  dest_x,
+                              int32_t                  dest_y,
+                              int32_t                  width,
+                              int32_t                  height)
+{
+    uint32_t    *dst_line, *dst;
+    uint32_t    *src_line, *src;
+    int dst_stride, src_stride;
+
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+
+    while (height--)
+    {
+	dst = dst_line;
+	dst_line += dst_stride;
+	src = src_line;
+	src_line += src_stride;
+
+	sse2_combine_add_u (imp, op, dst, src, NULL, width);
+    }
+
+}
+
+static pixman_bool_t
+pixman_blt_sse2 (uint32_t *src_bits,
+                 uint32_t *dst_bits,
+                 int       src_stride,
+                 int       dst_stride,
+                 int       src_bpp,
+                 int       dst_bpp,
+                 int       src_x,
+                 int       src_y,
+                 int       dst_x,
+                 int       dst_y,
+                 int       width,
+                 int       height)
+{
+    uint8_t *   src_bytes;
+    uint8_t *   dst_bytes;
+    int byte_width;
+
+    if (src_bpp != dst_bpp)
+	return FALSE;
+
+    if (src_bpp == 16)
+    {
+	src_stride = src_stride * (int) sizeof (uint32_t) / 2;
+	dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
+	src_bytes =(uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
+	dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+	byte_width = 2 * width;
+	src_stride *= 2;
+	dst_stride *= 2;
+    }
+    else if (src_bpp == 32)
+    {
+	src_stride = src_stride * (int) sizeof (uint32_t) / 4;
+	dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
+	src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
+	dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
+	byte_width = 4 * width;
+	src_stride *= 4;
+	dst_stride *= 4;
+    }
+    else
+    {
+	return FALSE;
+    }
+
+    while (height--)
+    {
+	int w;
+	uint8_t *s = src_bytes;
+	uint8_t *d = dst_bytes;
+	src_bytes += src_stride;
+	dst_bytes += dst_stride;
+	w = byte_width;
+
+	while (w >= 2 && ((unsigned long)d & 3))
+	{
+	    *(uint16_t *)d = *(uint16_t *)s;
+	    w -= 2;
+	    s += 2;
+	    d += 2;
+	}
+
+	while (w >= 4 && ((unsigned long)d & 15))
+	{
+	    *(uint32_t *)d = *(uint32_t *)s;
+
+	    w -= 4;
+	    s += 4;
+	    d += 4;
+	}
+
+	while (w >= 64)
+	{
+	    __m128i xmm0, xmm1, xmm2, xmm3;
+
+	    xmm0 = load_128_unaligned ((__m128i*)(s));
+	    xmm1 = load_128_unaligned ((__m128i*)(s + 16));
+	    xmm2 = load_128_unaligned ((__m128i*)(s + 32));
+	    xmm3 = load_128_unaligned ((__m128i*)(s + 48));
+
+	    save_128_aligned ((__m128i*)(d),    xmm0);
+	    save_128_aligned ((__m128i*)(d + 16), xmm1);
+	    save_128_aligned ((__m128i*)(d + 32), xmm2);
+	    save_128_aligned ((__m128i*)(d + 48), xmm3);
+
+	    s += 64;
+	    d += 64;
+	    w -= 64;
+	}
+
+	while (w >= 16)
+	{
+	    save_128_aligned ((__m128i*)d, load_128_unaligned ((__m128i*)s) );
+
+	    w -= 16;
+	    d += 16;
+	    s += 16;
+	}
+
+	while (w >= 4)
+	{
+	    *(uint32_t *)d = *(uint32_t *)s;
+
+	    w -= 4;
+	    s += 4;
+	    d += 4;
+	}
+
+	if (w >= 2)
+	{
+	    *(uint16_t *)d = *(uint16_t *)s;
+	    w -= 2;
+	    s += 2;
+	    d += 2;
+	}
+    }
+
+
+    return TRUE;
+}
+
+static void
+sse2_composite_copy_area (pixman_implementation_t *imp,
+                          pixman_op_t              op,
+                          pixman_image_t *         src_image,
+                          pixman_image_t *         mask_image,
+                          pixman_image_t *         dst_image,
+                          int32_t                  src_x,
+                          int32_t                  src_y,
+                          int32_t                  mask_x,
+                          int32_t                  mask_y,
+                          int32_t                  dest_x,
+                          int32_t                  dest_y,
+                          int32_t                  width,
+                          int32_t                  height)
+{
+    pixman_blt_sse2 (src_image->bits.bits,
+                     dst_image->bits.bits,
+                     src_image->bits.rowstride,
+                     dst_image->bits.rowstride,
+                     PIXMAN_FORMAT_BPP (src_image->bits.format),
+                     PIXMAN_FORMAT_BPP (dst_image->bits.format),
+                     src_x, src_y, dest_x, dest_y, width, height);
+}
+
+static void
+sse2_composite_over_x888_8_8888 (pixman_implementation_t *imp,
+                                 pixman_op_t              op,
+                                 pixman_image_t *         src_image,
+                                 pixman_image_t *         mask_image,
+                                 pixman_image_t *         dst_image,
+                                 int32_t                  src_x,
+                                 int32_t                  src_y,
+                                 int32_t                  mask_x,
+                                 int32_t                  mask_y,
+                                 int32_t                  dest_x,
+                                 int32_t                  dest_y,
+                                 int32_t                  width,
+                                 int32_t                  height)
+{
+    uint32_t    *src, *src_line, s;
+    uint32_t    *dst, *dst_line, d;
+    uint8_t         *mask, *mask_line;
+    uint32_t m;
+    int src_stride, mask_stride, dst_stride;
+    int32_t w;
+    __m128i ms;
+
+    __m128i xmm_src, xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+
+    while (height--)
+    {
+        src = src_line;
+        src_line += src_stride;
+        dst = dst_line;
+        dst_line += dst_stride;
+        mask = mask_line;
+        mask_line += mask_stride;
+
+        w = width;
+
+        while (w && (unsigned long)dst & 15)
+        {
+            s = 0xff000000 | *src++;
+            m = (uint32_t) *mask++;
+            d = *dst;
+            ms = unpack_32_1x128 (s);
+
+            if (m != 0xff)
+            {
+		__m128i ma = expand_alpha_rev_1x128 (unpack_32_1x128 (m));
+		__m128i md = unpack_32_1x128 (d);
+
+                ms = in_over_1x128 (&ms, &mask_00ff, &ma, &md);
+            }
+
+            *dst++ = pack_1x128_32 (ms);
+            w--;
+        }
+
+        while (w >= 4)
+        {
+            m = *(uint32_t*) mask;
+            xmm_src = _mm_or_si128 (
+		load_128_unaligned ((__m128i*)src), mask_ff000000);
+
+            if (m == 0xffffffff)
+            {
+                save_128_aligned ((__m128i*)dst, xmm_src);
+            }
+            else
+            {
+                xmm_dst = load_128_aligned ((__m128i*)dst);
+
+                xmm_mask = _mm_unpacklo_epi16 (unpack_32_1x128 (m), _mm_setzero_si128());
+
+                unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);
+                unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+                unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+
+                expand_alpha_rev_2x128 (
+		    xmm_mask_lo, xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+                in_over_2x128 (&xmm_src_lo, &xmm_src_hi,
+			       &mask_00ff, &mask_00ff, &xmm_mask_lo, &xmm_mask_hi,
+			       &xmm_dst_lo, &xmm_dst_hi);
+
+                save_128_aligned ((__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+            }
+
+            src += 4;
+            dst += 4;
+            mask += 4;
+            w -= 4;
+        }
+
+        while (w)
+        {
+            m = (uint32_t) *mask++;
+
+            if (m)
+            {
+                s = 0xff000000 | *src;
+
+                if (m == 0xff)
+                {
+                    *dst = s;
+                }
+                else
+                {
+		    __m128i ma, md, ms;
+
+                    d = *dst;
+
+		    ma = expand_alpha_rev_1x128 (unpack_32_1x128 (m));
+		    md = unpack_32_1x128 (d);
+		    ms = unpack_32_1x128 (s);
+
+                    *dst = pack_1x128_32 (in_over_1x128 (&ms, &mask_00ff, &ma, &md));
+                }
+
+            }
+
+            src++;
+            dst++;
+            w--;
+        }
+    }
+
+}
+
+static void
+sse2_composite_over_8888_8_8888 (pixman_implementation_t *imp,
+                                 pixman_op_t              op,
+                                 pixman_image_t *         src_image,
+                                 pixman_image_t *         mask_image,
+                                 pixman_image_t *         dst_image,
+                                 int32_t                  src_x,
+                                 int32_t                  src_y,
+                                 int32_t                  mask_x,
+                                 int32_t                  mask_y,
+                                 int32_t                  dest_x,
+                                 int32_t                  dest_y,
+                                 int32_t                  width,
+                                 int32_t                  height)
+{
+    uint32_t    *src, *src_line, s;
+    uint32_t    *dst, *dst_line, d;
+    uint8_t         *mask, *mask_line;
+    uint32_t m;
+    int src_stride, mask_stride, dst_stride;
+    int32_t w;
+
+    __m128i xmm_src, xmm_src_lo, xmm_src_hi, xmm_srca_lo, xmm_srca_hi;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+
+    while (height--)
+    {
+        src = src_line;
+        src_line += src_stride;
+        dst = dst_line;
+        dst_line += dst_stride;
+        mask = mask_line;
+        mask_line += mask_stride;
+
+        w = width;
+
+        while (w && (unsigned long)dst & 15)
+        {
+	    uint32_t sa;
+
+            s = *src++;
+            m = (uint32_t) *mask++;
+            d = *dst;
+
+	    sa = s >> 24;
+
+	    if (m)
+	    {
+		if (sa == 0xff && m == 0xff)
+		{
+		    *dst = s;
+		}
+		else
+		{
+		    __m128i ms, md, ma, msa;
+
+		    ma = expand_alpha_rev_1x128 (load_32_1x128 (m));
+		    ms = unpack_32_1x128 (s);
+		    md = unpack_32_1x128 (d);
+
+		    msa = expand_alpha_rev_1x128 (load_32_1x128 (sa));
+
+		    *dst = pack_1x128_32 (in_over_1x128 (&ms, &msa, &ma, &md));
+		}
+	    }
+
+	    dst++;
+            w--;
+        }
+
+        while (w >= 4)
+        {
+            m = *(uint32_t *) mask;
+
+	    if (m)
+	    {
+		xmm_src = load_128_unaligned ((__m128i*)src);
+
+		if (m == 0xffffffff && is_opaque (xmm_src))
+		{
+		    save_128_aligned ((__m128i *)dst, xmm_src);
+		}
+		else
+		{
+		    xmm_dst = load_128_aligned ((__m128i *)dst);
+
+		    xmm_mask = _mm_unpacklo_epi16 (unpack_32_1x128 (m), _mm_setzero_si128());
+
+		    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);
+		    unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+		    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+
+		    expand_alpha_2x128 (xmm_src_lo, xmm_src_hi, &xmm_srca_lo, &xmm_srca_hi);
+		    expand_alpha_rev_2x128 (xmm_mask_lo, xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+		    in_over_2x128 (&xmm_src_lo, &xmm_src_hi, &xmm_srca_lo, &xmm_srca_hi,
+				   &xmm_mask_lo, &xmm_mask_hi, &xmm_dst_lo, &xmm_dst_hi);
+
+		    save_128_aligned ((__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+		}
+	    }
+
+            src += 4;
+            dst += 4;
+            mask += 4;
+            w -= 4;
+        }
+
+        while (w)
+        {
+	    uint32_t sa;
+
+            s = *src++;
+            m = (uint32_t) *mask++;
+            d = *dst;
+
+	    sa = s >> 24;
+
+	    if (m)
+	    {
+		if (sa == 0xff && m == 0xff)
+		{
+		    *dst = s;
+		}
+		else
+		{
+		    __m128i ms, md, ma, msa;
+
+		    ma = expand_alpha_rev_1x128 (load_32_1x128 (m));
+		    ms = unpack_32_1x128 (s);
+		    md = unpack_32_1x128 (d);
+
+		    msa = expand_alpha_rev_1x128 (load_32_1x128 (sa));
+
+		    *dst = pack_1x128_32 (in_over_1x128 (&ms, &msa, &ma, &md));
+		}
+	    }
+
+	    dst++;
+            w--;
+        }
+    }
+
+}
+
+static void
+sse2_composite_over_reverse_n_8888 (pixman_implementation_t *imp,
+				    pixman_op_t              op,
+				    pixman_image_t *         src_image,
+				    pixman_image_t *         mask_image,
+				    pixman_image_t *         dst_image,
+				    int32_t                  src_x,
+				    int32_t                  src_y,
+				    int32_t                  mask_x,
+				    int32_t                  mask_y,
+				    int32_t                  dest_x,
+				    int32_t                  dest_y,
+				    int32_t                  width,
+				    int32_t                  height)
+{
+    uint32_t src;
+    uint32_t    *dst_line, *dst;
+    __m128i xmm_src;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_dsta_hi, xmm_dsta_lo;
+    int dst_stride;
+    int32_t w;
+
+    src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format);
+
+    if (src == 0)
+	return;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+
+    xmm_src = expand_pixel_32_1x128 (src);
+
+    while (height--)
+    {
+	dst = dst_line;
+
+	dst_line += dst_stride;
+	w = width;
+
+	while (w && (unsigned long)dst & 15)
+	{
+	    __m128i vd;
+
+	    vd = unpack_32_1x128 (*dst);
+
+	    *dst = pack_1x128_32 (over_1x128 (vd, expand_alpha_1x128 (vd),
+					      xmm_src));
+	    w--;
+	    dst++;
+	}
+
+	while (w >= 4)
+	{
+	    __m128i tmp_lo, tmp_hi;
+
+	    xmm_dst = load_128_aligned ((__m128i*)dst);
+
+	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+	    expand_alpha_2x128 (xmm_dst_lo, xmm_dst_hi, &xmm_dsta_lo, &xmm_dsta_hi);
+
+	    tmp_lo = xmm_src;
+	    tmp_hi = xmm_src;
+
+	    over_2x128 (&xmm_dst_lo, &xmm_dst_hi,
+			&xmm_dsta_lo, &xmm_dsta_hi,
+			&tmp_lo, &tmp_hi);
+
+	    save_128_aligned (
+		(__m128i*)dst, pack_2x128_128 (tmp_lo, tmp_hi));
+
+	    w -= 4;
+	    dst += 4;
+	}
+
+	while (w)
+	{
+	    __m128i vd;
+
+	    vd = unpack_32_1x128 (*dst);
+
+	    *dst = pack_1x128_32 (over_1x128 (vd, expand_alpha_1x128 (vd),
+					      xmm_src));
+	    w--;
+	    dst++;
+	}
+
+    }
+
+}
+
+static void
+sse2_composite_over_8888_8888_8888 (pixman_implementation_t *imp,
+				    pixman_op_t              op,
+				    pixman_image_t *         src_image,
+				    pixman_image_t *         mask_image,
+				    pixman_image_t *         dst_image,
+				    int32_t                  src_x,
+				    int32_t                  src_y,
+				    int32_t                  mask_x,
+				    int32_t                  mask_y,
+				    int32_t                  dest_x,
+				    int32_t                  dest_y,
+				    int32_t                  width,
+				    int32_t                  height)
+{
+    uint32_t    *src, *src_line, s;
+    uint32_t    *dst, *dst_line, d;
+    uint32_t    *mask, *mask_line;
+    uint32_t    m;
+    int src_stride, mask_stride, dst_stride;
+    int32_t w;
+
+    __m128i xmm_src, xmm_src_lo, xmm_src_hi, xmm_srca_lo, xmm_srca_hi;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi;
+
+    PIXMAN_IMAGE_GET_LINE (
+	dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);
+    PIXMAN_IMAGE_GET_LINE (
+	src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
+
+    while (height--)
+    {
+        src = src_line;
+        src_line += src_stride;
+        dst = dst_line;
+        dst_line += dst_stride;
+        mask = mask_line;
+        mask_line += mask_stride;
+
+        w = width;
+
+        while (w && (unsigned long)dst & 15)
+        {
+	    uint32_t sa;
+
+            s = *src++;
+            m = (*mask++) >> 24;
+            d = *dst;
+
+	    sa = s >> 24;
+
+	    if (m)
+	    {
+		if (sa == 0xff && m == 0xff)
+		{
+		    *dst = s;
+		}
+		else
+		{
+		    __m128i ms, md, ma, msa;
+
+		    ma = expand_alpha_rev_1x128 (load_32_1x128 (m));
+		    ms = unpack_32_1x128 (s);
+		    md = unpack_32_1x128 (d);
+
+		    msa = expand_alpha_rev_1x128 (load_32_1x128 (sa));
+
+		    *dst = pack_1x128_32 (in_over_1x128 (&ms, &msa, &ma, &md));
+		}
+	    }
+
+	    dst++;
+            w--;
+        }
+
+        while (w >= 4)
+        {
+	    xmm_mask = load_128_unaligned ((__m128i*)mask);
+
+	    if (!is_transparent (xmm_mask))
+	    {
+		xmm_src = load_128_unaligned ((__m128i*)src);
+
+		if (is_opaque (xmm_mask) && is_opaque (xmm_src))
+		{
+		    save_128_aligned ((__m128i *)dst, xmm_src);
+		}
+		else
+		{
+		    xmm_dst = load_128_aligned ((__m128i *)dst);
+
+		    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);
+		    unpack_128_2x128 (xmm_mask, &xmm_mask_lo, &xmm_mask_hi);
+		    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+
+		    expand_alpha_2x128 (xmm_src_lo, xmm_src_hi, &xmm_srca_lo, &xmm_srca_hi);
+		    expand_alpha_2x128 (xmm_mask_lo, xmm_mask_hi, &xmm_mask_lo, &xmm_mask_hi);
+
+		    in_over_2x128 (&xmm_src_lo, &xmm_src_hi, &xmm_srca_lo, &xmm_srca_hi,
+				   &xmm_mask_lo, &xmm_mask_hi, &xmm_dst_lo, &xmm_dst_hi);
+
+		    save_128_aligned ((__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+		}
+	    }
+
+            src += 4;
+            dst += 4;
+            mask += 4;
+            w -= 4;
+        }
+
+        while (w)
+        {
+	    uint32_t sa;
+
+            s = *src++;
+            m = (*mask++) >> 24;
+            d = *dst;
+
+	    sa = s >> 24;
+
+	    if (m)
+	    {
+		if (sa == 0xff && m == 0xff)
+		{
+		    *dst = s;
+		}
+		else
+		{
+		    __m128i ms, md, ma, msa;
+
+		    ma = expand_alpha_rev_1x128 (load_32_1x128 (m));
+		    ms = unpack_32_1x128 (s);
+		    md = unpack_32_1x128 (d);
+
+		    msa = expand_alpha_rev_1x128 (load_32_1x128 (sa));
+
+		    *dst = pack_1x128_32 (in_over_1x128 (&ms, &msa, &ma, &md));
+		}
+	    }
+
+	    dst++;
+            w--;
+        }
+    }
+
+}
+
+/* A variant of 'sse2_combine_over_u' with minor tweaks */
+static force_inline void
+scaled_nearest_scanline_sse2_8888_8888_OVER (uint32_t*       pd,
+                                             const uint32_t* ps,
+                                             int32_t         w,
+                                             pixman_fixed_t  vx,
+                                             pixman_fixed_t  unit_x,
+                                             pixman_fixed_t  max_vx,
+                                             pixman_bool_t   fully_transparent_src)
+{
+    uint32_t s, d;
+    const uint32_t* pm = NULL;
+
+    __m128i xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_src_lo, xmm_src_hi;
+    __m128i xmm_alpha_lo, xmm_alpha_hi;
+
+    if (fully_transparent_src)
+	return;
+
+    /* Align dst on a 16-byte boundary */
+    while (w && ((unsigned long)pd & 15))
+    {
+	d = *pd;
+	s = combine1 (ps + (vx >> 16), pm);
+	vx += unit_x;
+
+	*pd++ = core_combine_over_u_pixel_sse2 (s, d);
+	if (pm)
+	    pm++;
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	__m128i tmp;
+	uint32_t tmp1, tmp2, tmp3, tmp4;
+
+	tmp1 = ps[vx >> 16];
+	vx += unit_x;
+	tmp2 = ps[vx >> 16];
+	vx += unit_x;
+	tmp3 = ps[vx >> 16];
+	vx += unit_x;
+	tmp4 = ps[vx >> 16];
+	vx += unit_x;
+
+	tmp = _mm_set_epi32 (tmp4, tmp3, tmp2, tmp1);
+
+	xmm_src_hi = combine4 ((__m128i*)&tmp, (__m128i*)pm);
+
+	if (is_opaque (xmm_src_hi))
+	{
+	    save_128_aligned ((__m128i*)pd, xmm_src_hi);
+	}
+	else if (!is_zero (xmm_src_hi))
+	{
+	    xmm_dst_hi = load_128_aligned ((__m128i*) pd);
+
+	    unpack_128_2x128 (xmm_src_hi, &xmm_src_lo, &xmm_src_hi);
+	    unpack_128_2x128 (xmm_dst_hi, &xmm_dst_lo, &xmm_dst_hi);
+
+	    expand_alpha_2x128 (
+		xmm_src_lo, xmm_src_hi, &xmm_alpha_lo, &xmm_alpha_hi);
+
+	    over_2x128 (&xmm_src_lo, &xmm_src_hi,
+			&xmm_alpha_lo, &xmm_alpha_hi,
+			&xmm_dst_lo, &xmm_dst_hi);
+
+	    /* rebuid the 4 pixel data and save*/
+	    save_128_aligned ((__m128i*)pd,
+			      pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+	}
+
+	w -= 4;
+	pd += 4;
+	if (pm)
+	    pm += 4;
+    }
+
+    while (w)
+    {
+	d = *pd;
+	s = combine1 (ps + (vx >> 16), pm);
+	vx += unit_x;
+
+	*pd++ = core_combine_over_u_pixel_sse2 (s, d);
+	if (pm)
+	    pm++;
+
+	w--;
+    }
+}
+
+FAST_NEAREST_MAINLOOP (sse2_8888_8888_cover_OVER,
+		       scaled_nearest_scanline_sse2_8888_8888_OVER,
+		       uint32_t, uint32_t, COVER)
+FAST_NEAREST_MAINLOOP (sse2_8888_8888_none_OVER,
+		       scaled_nearest_scanline_sse2_8888_8888_OVER,
+		       uint32_t, uint32_t, NONE)
+FAST_NEAREST_MAINLOOP (sse2_8888_8888_pad_OVER,
+		       scaled_nearest_scanline_sse2_8888_8888_OVER,
+		       uint32_t, uint32_t, PAD)
+
+static force_inline void
+scaled_nearest_scanline_sse2_8888_n_8888_OVER (const uint32_t * mask,
+					       uint32_t *       dst,
+					       const uint32_t * src,
+					       int32_t          w,
+					       pixman_fixed_t   vx,
+					       pixman_fixed_t   unit_x,
+					       pixman_fixed_t   max_vx,
+					       pixman_bool_t    zero_src)
+{
+    __m128i xmm_mask;
+    __m128i xmm_src, xmm_src_lo, xmm_src_hi;
+    __m128i xmm_dst, xmm_dst_lo, xmm_dst_hi;
+    __m128i xmm_alpha_lo, xmm_alpha_hi;
+
+    if (zero_src || (*mask >> 24) == 0)
+	return;
+
+    xmm_mask = create_mask_16_128 (*mask >> 24);
+
+    while (w && (unsigned long)dst & 15)
+    {
+	uint32_t s = src[pixman_fixed_to_int (vx)];
+	vx += unit_x;
+
+	if (s)
+	{
+	    uint32_t d = *dst;
+
+	    __m128i ms = unpack_32_1x128 (s);
+	    __m128i alpha     = expand_alpha_1x128 (ms);
+	    __m128i dest      = xmm_mask;
+	    __m128i alpha_dst = unpack_32_1x128 (d);
+
+	    *dst = pack_1x128_32 (
+		in_over_1x128 (&ms, &alpha, &dest, &alpha_dst));
+	}
+	dst++;
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	uint32_t tmp1, tmp2, tmp3, tmp4;
+
+	tmp1 = src[pixman_fixed_to_int (vx)];
+	vx += unit_x;
+	tmp2 = src[pixman_fixed_to_int (vx)];
+	vx += unit_x;
+	tmp3 = src[pixman_fixed_to_int (vx)];
+	vx += unit_x;
+	tmp4 = src[pixman_fixed_to_int (vx)];
+	vx += unit_x;
+
+	xmm_src = _mm_set_epi32 (tmp4, tmp3, tmp2, tmp1);
+
+	if (!is_zero (xmm_src))
+	{
+	    xmm_dst = load_128_aligned ((__m128i*)dst);
+
+	    unpack_128_2x128 (xmm_src, &xmm_src_lo, &xmm_src_hi);
+	    unpack_128_2x128 (xmm_dst, &xmm_dst_lo, &xmm_dst_hi);
+	    expand_alpha_2x128 (xmm_src_lo, xmm_src_hi,
+			        &xmm_alpha_lo, &xmm_alpha_hi);
+
+	    in_over_2x128 (&xmm_src_lo, &xmm_src_hi,
+			   &xmm_alpha_lo, &xmm_alpha_hi,
+			   &xmm_mask, &xmm_mask,
+			   &xmm_dst_lo, &xmm_dst_hi);
+
+	    save_128_aligned (
+		(__m128i*)dst, pack_2x128_128 (xmm_dst_lo, xmm_dst_hi));
+	}
+
+	dst += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	uint32_t s = src[pixman_fixed_to_int (vx)];
+	vx += unit_x;
+
+	if (s)
+	{
+	    uint32_t d = *dst;
+
+	    __m128i ms = unpack_32_1x128 (s);
+	    __m128i alpha = expand_alpha_1x128 (ms);
+	    __m128i mask  = xmm_mask;
+	    __m128i dest  = unpack_32_1x128 (d);
+
+	    *dst = pack_1x128_32 (
+		in_over_1x128 (&ms, &alpha, &mask, &dest));
+	}
+
+	dst++;
+	w--;
+    }
+
+}
+
+FAST_NEAREST_MAINLOOP_COMMON (sse2_8888_n_8888_cover_OVER,
+			      scaled_nearest_scanline_sse2_8888_n_8888_OVER,
+			      uint32_t, uint32_t, uint32_t, COVER, TRUE, TRUE)
+FAST_NEAREST_MAINLOOP_COMMON (sse2_8888_n_8888_pad_OVER,
+			      scaled_nearest_scanline_sse2_8888_n_8888_OVER,
+			      uint32_t, uint32_t, uint32_t, PAD, TRUE, TRUE)
+FAST_NEAREST_MAINLOOP_COMMON (sse2_8888_n_8888_none_OVER,
+			      scaled_nearest_scanline_sse2_8888_n_8888_OVER,
+			      uint32_t, uint32_t, uint32_t, NONE, TRUE, TRUE)
+
+static void
+bilinear_interpolate_line_sse2 (uint32_t *       out,
+                                const uint32_t * top,
+                                const uint32_t * bottom,
+                                int              wt,
+                                int              wb,
+                                pixman_fixed_t   x,
+                                pixman_fixed_t   ux,
+                                int              width)
+{
+    const __m128i xmm_wt = _mm_set_epi16 (wt, wt, wt, wt, wt, wt, wt, wt);
+    const __m128i xmm_wb = _mm_set_epi16 (wb, wb, wb, wb, wb, wb, wb, wb);
+    const __m128i xmm_xorc = _mm_set_epi16 (0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff);
+    const __m128i xmm_addc = _mm_set_epi16 (0, 0, 0, 0, 1, 1, 1, 1);
+    const __m128i xmm_ux = _mm_set_epi16 (ux, ux, ux, ux, ux, ux, ux, ux);
+    const __m128i xmm_zero = _mm_setzero_si128 ();
+    __m128i xmm_x = _mm_set_epi16 (x, x, x, x, x, x, x, x);
+    uint32_t pix1, pix2, pix3, pix4;
+
+    #define INTERPOLATE_ONE_PIXEL(pix)						\
+    do {									\
+	__m128i xmm_wh, xmm_lo, xmm_hi, a;					\
+	/* fetch 2x2 pixel block into sse2 register */				\
+	uint32_t tl = top [pixman_fixed_to_int (x)];				\
+	uint32_t tr = top [pixman_fixed_to_int (x) + 1];			\
+	uint32_t bl = bottom [pixman_fixed_to_int (x)];				\
+	uint32_t br = bottom [pixman_fixed_to_int (x) + 1];			\
+	a = _mm_set_epi32 (tr, tl, br, bl);					\
+        x += ux;								\
+	/* vertical interpolation */						\
+	a = _mm_add_epi16 (_mm_mullo_epi16 (_mm_unpackhi_epi8 (a, xmm_zero),	\
+					    xmm_wt),				\
+			   _mm_mullo_epi16 (_mm_unpacklo_epi8 (a, xmm_zero),	\
+					    xmm_wb));				\
+	/* calculate horizontal weights */					\
+	xmm_wh = _mm_add_epi16 (xmm_addc,					\
+				_mm_xor_si128 (xmm_xorc,			\
+					       _mm_srli_epi16 (xmm_x, 8)));	\
+	xmm_x = _mm_add_epi16 (xmm_x, xmm_ux);					\
+	/* horizontal interpolation */						\
+	xmm_lo = _mm_mullo_epi16 (a, xmm_wh);					\
+	xmm_hi = _mm_mulhi_epu16 (a, xmm_wh);					\
+	a = _mm_add_epi32 (_mm_unpacklo_epi16 (xmm_lo, xmm_hi),			\
+			   _mm_unpackhi_epi16 (xmm_lo, xmm_hi));		\
+	/* shift and pack the result */						\
+	a = _mm_srli_epi32 (a, 16);						\
+	a = _mm_packs_epi32 (a, a);						\
+	a = _mm_packus_epi16 (a, a);						\
+	pix = _mm_cvtsi128_si32 (a);						\
+    } while (0)
+
+    while ((width -= 4) >= 0)
+    {
+	INTERPOLATE_ONE_PIXEL (pix1);
+	INTERPOLATE_ONE_PIXEL (pix2);
+	INTERPOLATE_ONE_PIXEL (pix3);
+	INTERPOLATE_ONE_PIXEL (pix4);
+	*out++ = pix1;
+	*out++ = pix2;
+	*out++ = pix3;
+	*out++ = pix4;
+    }
+    if (width & 2)
+    {
+	INTERPOLATE_ONE_PIXEL (pix1);
+	INTERPOLATE_ONE_PIXEL (pix2);
+	*out++ = pix1;
+	*out++ = pix2;
+    }
+    if (width & 1)
+    {
+	INTERPOLATE_ONE_PIXEL (pix1);
+	*out = pix1;
+    }
+
+    #undef INTERPOLATE_ONE_PIXEL
+}
+
+static force_inline void
+scaled_bilinear_scanline_sse2_8888_8888_SRC (uint32_t *       dst,
+					     const uint32_t * mask,
+					     const uint32_t * src_top,
+					     const uint32_t * src_bottom,
+					     int32_t          w,
+					     int              wt,
+					     int              wb,
+					     pixman_fixed_t   vx,
+					     pixman_fixed_t   unit_x,
+					     pixman_fixed_t   max_vx,
+					     pixman_bool_t    zero_src)
+{
+    bilinear_interpolate_line_sse2 (dst, src_top, src_bottom,
+				    wt, wb, vx, unit_x, w);
+}
+
+FAST_BILINEAR_MAINLOOP_COMMON (sse2_8888_8888_cover_SRC,
+			       scaled_bilinear_scanline_sse2_8888_8888_SRC,
+			       uint32_t, uint32_t, uint32_t,
+			       COVER, FALSE, FALSE)
+FAST_BILINEAR_MAINLOOP_COMMON (sse2_8888_8888_pad_SRC,
+			       scaled_bilinear_scanline_sse2_8888_8888_SRC,
+			       uint32_t, uint32_t, uint32_t,
+			       PAD, FALSE, FALSE)
+FAST_BILINEAR_MAINLOOP_COMMON (sse2_8888_8888_none_SRC,
+			       scaled_bilinear_scanline_sse2_8888_8888_SRC,
+			       uint32_t, uint32_t, uint32_t,
+			       NONE, FALSE, FALSE)
+
+static const pixman_fast_path_t sse2_fast_paths[] =
+{
+    /* PIXMAN_OP_OVER */
+    PIXMAN_STD_FAST_PATH (OVER, solid, a8, r5g6b5, sse2_composite_over_n_8_0565),
+    PIXMAN_STD_FAST_PATH (OVER, solid, a8, b5g6r5, sse2_composite_over_n_8_0565),
+    PIXMAN_STD_FAST_PATH (OVER, solid, null, a8r8g8b8, sse2_composite_over_n_8888),
+    PIXMAN_STD_FAST_PATH (OVER, solid, null, x8r8g8b8, sse2_composite_over_n_8888),
+    PIXMAN_STD_FAST_PATH (OVER, solid, null, r5g6b5, sse2_composite_over_n_0565),
+    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, a8r8g8b8, sse2_composite_over_8888_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, x8r8g8b8, sse2_composite_over_8888_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, a8b8g8r8, sse2_composite_over_8888_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, x8b8g8r8, sse2_composite_over_8888_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, null, r5g6b5, sse2_composite_over_8888_0565),
+    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, null, b5g6r5, sse2_composite_over_8888_0565),
+    PIXMAN_STD_FAST_PATH (OVER, solid, a8, a8r8g8b8, sse2_composite_over_n_8_8888),
+    PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8r8g8b8, sse2_composite_over_n_8_8888),
+    PIXMAN_STD_FAST_PATH (OVER, solid, a8, a8b8g8r8, sse2_composite_over_n_8_8888),
+    PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8b8g8r8, sse2_composite_over_n_8_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, a8r8g8b8, a8r8g8b8, sse2_composite_over_8888_8888_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, a8, x8r8g8b8, sse2_composite_over_8888_8_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, a8, a8r8g8b8, sse2_composite_over_8888_8_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, a8, x8b8g8r8, sse2_composite_over_8888_8_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, a8, a8b8g8r8, sse2_composite_over_8888_8_8888),
+    PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, a8, x8r8g8b8, sse2_composite_over_x888_8_8888),
+    PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, a8, a8r8g8b8, sse2_composite_over_x888_8_8888),
+    PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, a8, x8b8g8r8, sse2_composite_over_x888_8_8888),
+    PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, a8, a8b8g8r8, sse2_composite_over_x888_8_8888),
+    PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, solid, a8r8g8b8, sse2_composite_over_x888_n_8888),
+    PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, solid, x8r8g8b8, sse2_composite_over_x888_n_8888),
+    PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, solid, a8b8g8r8, sse2_composite_over_x888_n_8888),
+    PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, solid, x8b8g8r8, sse2_composite_over_x888_n_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, a8r8g8b8, sse2_composite_over_8888_n_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, x8r8g8b8, sse2_composite_over_8888_n_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, solid, a8b8g8r8, sse2_composite_over_8888_n_8888),
+    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, solid, x8b8g8r8, sse2_composite_over_8888_n_8888),
+    PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, a8r8g8b8, sse2_composite_over_n_8888_8888_ca),
+    PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, x8r8g8b8, sse2_composite_over_n_8888_8888_ca),
+    PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, a8b8g8r8, sse2_composite_over_n_8888_8888_ca),
+    PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, x8b8g8r8, sse2_composite_over_n_8888_8888_ca),
+    PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, r5g6b5, sse2_composite_over_n_8888_0565_ca),
+    PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, b5g6r5, sse2_composite_over_n_8888_0565_ca),
+    PIXMAN_STD_FAST_PATH (OVER, pixbuf, pixbuf, a8r8g8b8, sse2_composite_over_pixbuf_8888),
+    PIXMAN_STD_FAST_PATH (OVER, pixbuf, pixbuf, x8r8g8b8, sse2_composite_over_pixbuf_8888),
+    PIXMAN_STD_FAST_PATH (OVER, rpixbuf, rpixbuf, a8b8g8r8, sse2_composite_over_pixbuf_8888),
+    PIXMAN_STD_FAST_PATH (OVER, rpixbuf, rpixbuf, x8b8g8r8, sse2_composite_over_pixbuf_8888),
+    PIXMAN_STD_FAST_PATH (OVER, pixbuf, pixbuf, r5g6b5, sse2_composite_over_pixbuf_0565),
+    PIXMAN_STD_FAST_PATH (OVER, rpixbuf, rpixbuf, b5g6r5, sse2_composite_over_pixbuf_0565),
+    PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, null, x8r8g8b8, sse2_composite_copy_area),
+    PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, null, x8b8g8r8, sse2_composite_copy_area),
+    
+    /* PIXMAN_OP_OVER_REVERSE */
+    PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8r8g8b8, sse2_composite_over_reverse_n_8888),
+    PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8b8g8r8, sse2_composite_over_reverse_n_8888),
+
+    /* PIXMAN_OP_ADD */
+    PIXMAN_STD_FAST_PATH_CA (ADD, solid, a8r8g8b8, a8r8g8b8, sse2_composite_add_n_8888_8888_ca),
+    PIXMAN_STD_FAST_PATH (ADD, a8, null, a8, sse2_composite_add_8_8),
+    PIXMAN_STD_FAST_PATH (ADD, a8r8g8b8, null, a8r8g8b8, sse2_composite_add_8888_8888),
+    PIXMAN_STD_FAST_PATH (ADD, a8b8g8r8, null, a8b8g8r8, sse2_composite_add_8888_8888),
+    PIXMAN_STD_FAST_PATH (ADD, solid, a8, a8, sse2_composite_add_n_8_8),
+    PIXMAN_STD_FAST_PATH (ADD, solid, null, a8, sse2_composite_add_n_8),
+
+    /* PIXMAN_OP_SRC */
+    PIXMAN_STD_FAST_PATH (SRC, solid, a8, a8r8g8b8, sse2_composite_src_n_8_8888),
+    PIXMAN_STD_FAST_PATH (SRC, solid, a8, x8r8g8b8, sse2_composite_src_n_8_8888),
+    PIXMAN_STD_FAST_PATH (SRC, solid, a8, a8b8g8r8, sse2_composite_src_n_8_8888),
+    PIXMAN_STD_FAST_PATH (SRC, solid, a8, x8b8g8r8, sse2_composite_src_n_8_8888),
+    PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, a8r8g8b8, sse2_composite_src_x888_8888),
+    PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, a8b8g8r8, sse2_composite_src_x888_8888),
+    PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, a8r8g8b8, sse2_composite_copy_area),
+    PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, a8b8g8r8, sse2_composite_copy_area),
+    PIXMAN_STD_FAST_PATH (SRC, a8r8g8b8, null, x8r8g8b8, sse2_composite_copy_area),
+    PIXMAN_STD_FAST_PATH (SRC, a8b8g8r8, null, x8b8g8r8, sse2_composite_copy_area),
+    PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, x8r8g8b8, sse2_composite_copy_area),
+    PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, x8b8g8r8, sse2_composite_copy_area),
+    PIXMAN_STD_FAST_PATH (SRC, r5g6b5, null, r5g6b5, sse2_composite_copy_area),
+    PIXMAN_STD_FAST_PATH (SRC, b5g6r5, null, b5g6r5, sse2_composite_copy_area),
+
+    /* PIXMAN_OP_IN */
+    PIXMAN_STD_FAST_PATH (IN, a8, null, a8, sse2_composite_in_8_8),
+    PIXMAN_STD_FAST_PATH (IN, solid, a8, a8, sse2_composite_in_n_8_8),
+    PIXMAN_STD_FAST_PATH (IN, solid, null, a8, sse2_composite_in_n_8),
+
+    SIMPLE_NEAREST_FAST_PATH_COVER (OVER, a8r8g8b8, x8r8g8b8, sse2_8888_8888),
+    SIMPLE_NEAREST_FAST_PATH_COVER (OVER, a8b8g8r8, x8b8g8r8, sse2_8888_8888),
+    SIMPLE_NEAREST_FAST_PATH_COVER (OVER, a8r8g8b8, a8r8g8b8, sse2_8888_8888),
+    SIMPLE_NEAREST_FAST_PATH_COVER (OVER, a8b8g8r8, a8b8g8r8, sse2_8888_8888),
+    SIMPLE_NEAREST_FAST_PATH_NONE (OVER, a8r8g8b8, x8r8g8b8, sse2_8888_8888),
+    SIMPLE_NEAREST_FAST_PATH_NONE (OVER, a8b8g8r8, x8b8g8r8, sse2_8888_8888),
+    SIMPLE_NEAREST_FAST_PATH_NONE (OVER, a8r8g8b8, a8r8g8b8, sse2_8888_8888),
+    SIMPLE_NEAREST_FAST_PATH_NONE (OVER, a8b8g8r8, a8b8g8r8, sse2_8888_8888),
+    SIMPLE_NEAREST_FAST_PATH_PAD (OVER, a8r8g8b8, x8r8g8b8, sse2_8888_8888),
+    SIMPLE_NEAREST_FAST_PATH_PAD (OVER, a8b8g8r8, x8b8g8r8, sse2_8888_8888),
+    SIMPLE_NEAREST_FAST_PATH_PAD (OVER, a8r8g8b8, a8r8g8b8, sse2_8888_8888),
+    SIMPLE_NEAREST_FAST_PATH_PAD (OVER, a8b8g8r8, a8b8g8r8, sse2_8888_8888),
+
+    SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8r8g8b8, a8r8g8b8, sse2_8888_n_8888),
+    SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8b8g8r8, a8b8g8r8, sse2_8888_n_8888),
+    SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8r8g8b8, x8r8g8b8, sse2_8888_n_8888),
+    SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8b8g8r8, x8b8g8r8, sse2_8888_n_8888),
+
+    SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, a8r8g8b8, sse2_8888_8888),
+    SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, x8r8g8b8, sse2_8888_8888),
+    SIMPLE_BILINEAR_FAST_PATH (SRC, x8r8g8b8, x8r8g8b8, sse2_8888_8888),
+
+    { PIXMAN_OP_NONE },
+};
+
+static pixman_bool_t
+sse2_blt (pixman_implementation_t *imp,
+          uint32_t *               src_bits,
+          uint32_t *               dst_bits,
+          int                      src_stride,
+          int                      dst_stride,
+          int                      src_bpp,
+          int                      dst_bpp,
+          int                      src_x,
+          int                      src_y,
+          int                      dst_x,
+          int                      dst_y,
+          int                      width,
+          int                      height)
+{
+    if (!pixman_blt_sse2 (
+            src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
+            src_x, src_y, dst_x, dst_y, width, height))
+
+    {
+	return _pixman_implementation_blt (
+	    imp->delegate,
+	    src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
+	    src_x, src_y, dst_x, dst_y, width, height);
+    }
+
+    return TRUE;
+}
+
+#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)
+__attribute__((__force_align_arg_pointer__))
+#endif
+static pixman_bool_t
+sse2_fill (pixman_implementation_t *imp,
+           uint32_t *               bits,
+           int                      stride,
+           int                      bpp,
+           int                      x,
+           int                      y,
+           int                      width,
+           int                      height,
+           uint32_t xor)
+{
+    if (!pixman_fill_sse2 (bits, stride, bpp, x, y, width, height, xor))
+    {
+	return _pixman_implementation_fill (
+	    imp->delegate, bits, stride, bpp, x, y, width, height, xor);
+    }
+
+    return TRUE;
+}
+
+static uint32_t *
+sse2_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask)
+{
+    int w = iter->width;
+    __m128i ff000000 = mask_ff000000;
+    uint32_t *dst = iter->buffer;
+    uint32_t *src = (uint32_t *)iter->bits;
+
+    iter->bits += iter->stride;
+
+    while (w && ((unsigned long)dst) & 0x0f)
+    {
+	*dst++ = (*src++) | 0xff000000;
+	w--;
+    }
+
+    while (w >= 4)
+    {
+	save_128_aligned (
+	    (__m128i *)dst, _mm_or_si128 (
+		load_128_unaligned ((__m128i *)src), ff000000));
+
+	dst += 4;
+	src += 4;
+	w -= 4;
+    }
+
+    while (w)
+    {
+	*dst++ = (*src++) | 0xff000000;
+	w--;
+    }
+
+    return iter->buffer;
+}
+
+static uint32_t *
+sse2_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask)
+{
+    int w = iter->width;
+    uint32_t *dst = iter->buffer;
+    uint16_t *src = (uint16_t *)iter->bits;
+    __m128i ff000000 = mask_ff000000;
+
+    iter->bits += iter->stride;
+
+    while (w && ((unsigned long)dst) & 0x0f)
+    {
+	uint16_t s = *src++;
+
+	*dst++ = CONVERT_0565_TO_8888 (s);
+	w--;
+    }
+
+    while (w >= 8)
+    {
+	__m128i lo, hi, s;
+
+	s = _mm_loadu_si128 ((__m128i *)src);
+
+	lo = unpack_565_to_8888 (_mm_unpacklo_epi16 (s, _mm_setzero_si128 ()));
+	hi = unpack_565_to_8888 (_mm_unpackhi_epi16 (s, _mm_setzero_si128 ()));
+
+	save_128_aligned ((__m128i *)(dst + 0), _mm_or_si128 (lo, ff000000));
+	save_128_aligned ((__m128i *)(dst + 4), _mm_or_si128 (hi, ff000000));
+
+	dst += 8;
+	src += 8;
+	w -= 8;
+    }
+
+    while (w)
+    {
+	uint16_t s = *src++;
+
+	*dst++ = CONVERT_0565_TO_8888 (s);
+	w--;
+    }
+
+    return iter->buffer;
+}
+
+static uint32_t *
+sse2_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask)
+{
+    int w = iter->width;
+    uint32_t *dst = iter->buffer;
+    uint8_t *src = iter->bits;
+    __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6;
+
+    iter->bits += iter->stride;
+
+    while (w && (((unsigned long)dst) & 15))
+    {
+        *dst++ = *(src++) << 24;
+        w--;
+    }
+
+    while (w >= 16)
+    {
+	xmm0 = _mm_loadu_si128((__m128i *)src);
+
+	xmm1 = _mm_unpacklo_epi8  (_mm_setzero_si128(), xmm0);
+	xmm2 = _mm_unpackhi_epi8  (_mm_setzero_si128(), xmm0);
+	xmm3 = _mm_unpacklo_epi16 (_mm_setzero_si128(), xmm1);
+	xmm4 = _mm_unpackhi_epi16 (_mm_setzero_si128(), xmm1);
+	xmm5 = _mm_unpacklo_epi16 (_mm_setzero_si128(), xmm2);
+	xmm6 = _mm_unpackhi_epi16 (_mm_setzero_si128(), xmm2);
+
+	_mm_store_si128(((__m128i *)(dst +  0)), xmm3);
+	_mm_store_si128(((__m128i *)(dst +  4)), xmm4);
+	_mm_store_si128(((__m128i *)(dst +  8)), xmm5);
+	_mm_store_si128(((__m128i *)(dst + 12)), xmm6);
+
+	dst += 16;
+	src += 16;
+	w -= 16;
+    }
+
+    while (w)
+    {
+	*dst++ = *(src++) << 24;
+	w--;
+    }
+
+    return iter->buffer;
+}
+
+typedef struct
+{
+    pixman_format_code_t	format;
+    pixman_iter_get_scanline_t	get_scanline;
+} fetcher_info_t;
+
+static const fetcher_info_t fetchers[] =
+{
+    { PIXMAN_x8r8g8b8,		sse2_fetch_x8r8g8b8 },
+    { PIXMAN_r5g6b5,		sse2_fetch_r5g6b5 },
+    { PIXMAN_a8,		sse2_fetch_a8 },
+    { PIXMAN_null }
+};
+
+static void
+sse2_src_iter_init (pixman_implementation_t *imp, pixman_iter_t *iter)
+{
+    pixman_image_t *image = iter->image;
+    int x = iter->x;
+    int y = iter->y;
+    int width = iter->width;
+    int height = iter->height;
+
+#define FLAGS								\
+    (FAST_PATH_STANDARD_FLAGS | FAST_PATH_ID_TRANSFORM)
+
+    if ((iter->flags & ITER_NARROW)				&&
+	(image->common.flags & FLAGS) == FLAGS			&&
+	x >= 0 && y >= 0					&&
+	x + width <= image->bits.width				&&
+	y + height <= image->bits.height)
+    {
+	const fetcher_info_t *f;
+
+	for (f = &fetchers[0]; f->format != PIXMAN_null; f++)
+	{
+	    if (image->common.extended_format_code == f->format)
+	    {
+		uint8_t *b = (uint8_t *)image->bits.bits;
+		int s = image->bits.rowstride * 4;
+
+		iter->bits = b + s * iter->y + x * PIXMAN_FORMAT_BPP (f->format) / 8;
+		iter->stride = s;
+
+		iter->get_scanline = f->get_scanline;
+		return;
+	    }
+	}
+    }
+
+    imp->delegate->src_iter_init (imp->delegate, iter);
+}
+
+#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)
+__attribute__((__force_align_arg_pointer__))
+#endif
+pixman_implementation_t *
+_pixman_implementation_create_sse2 (pixman_implementation_t *fallback)
+{
+    pixman_implementation_t *imp = _pixman_implementation_create (fallback, sse2_fast_paths);
+
+    /* SSE2 constants */
+    mask_565_r  = create_mask_2x32_128 (0x00f80000, 0x00f80000);
+    mask_565_g1 = create_mask_2x32_128 (0x00070000, 0x00070000);
+    mask_565_g2 = create_mask_2x32_128 (0x000000e0, 0x000000e0);
+    mask_565_b  = create_mask_2x32_128 (0x0000001f, 0x0000001f);
+    mask_red   = create_mask_2x32_128 (0x00f80000, 0x00f80000);
+    mask_green = create_mask_2x32_128 (0x0000fc00, 0x0000fc00);
+    mask_blue  = create_mask_2x32_128 (0x000000f8, 0x000000f8);
+    mask_565_fix_rb = create_mask_2x32_128 (0x00e000e0, 0x00e000e0);
+    mask_565_fix_g = create_mask_2x32_128  (0x0000c000, 0x0000c000);
+    mask_0080 = create_mask_16_128 (0x0080);
+    mask_00ff = create_mask_16_128 (0x00ff);
+    mask_0101 = create_mask_16_128 (0x0101);
+    mask_ffff = create_mask_16_128 (0xffff);
+    mask_ff000000 = create_mask_2x32_128 (0xff000000, 0xff000000);
+    mask_alpha = create_mask_2x32_128 (0x00ff0000, 0x00000000);
+
+    /* Set up function pointers */
+    imp->combine_32[PIXMAN_OP_OVER] = sse2_combine_over_u;
+    imp->combine_32[PIXMAN_OP_OVER_REVERSE] = sse2_combine_over_reverse_u;
+    imp->combine_32[PIXMAN_OP_IN] = sse2_combine_in_u;
+    imp->combine_32[PIXMAN_OP_IN_REVERSE] = sse2_combine_in_reverse_u;
+    imp->combine_32[PIXMAN_OP_OUT] = sse2_combine_out_u;
+    imp->combine_32[PIXMAN_OP_OUT_REVERSE] = sse2_combine_out_reverse_u;
+    imp->combine_32[PIXMAN_OP_ATOP] = sse2_combine_atop_u;
+    imp->combine_32[PIXMAN_OP_ATOP_REVERSE] = sse2_combine_atop_reverse_u;
+    imp->combine_32[PIXMAN_OP_XOR] = sse2_combine_xor_u;
+    imp->combine_32[PIXMAN_OP_ADD] = sse2_combine_add_u;
+
+    imp->combine_32[PIXMAN_OP_SATURATE] = sse2_combine_saturate_u;
+
+    imp->combine_32_ca[PIXMAN_OP_SRC] = sse2_combine_src_ca;
+    imp->combine_32_ca[PIXMAN_OP_OVER] = sse2_combine_over_ca;
+    imp->combine_32_ca[PIXMAN_OP_OVER_REVERSE] = sse2_combine_over_reverse_ca;
+    imp->combine_32_ca[PIXMAN_OP_IN] = sse2_combine_in_ca;
+    imp->combine_32_ca[PIXMAN_OP_IN_REVERSE] = sse2_combine_in_reverse_ca;
+    imp->combine_32_ca[PIXMAN_OP_OUT] = sse2_combine_out_ca;
+    imp->combine_32_ca[PIXMAN_OP_OUT_REVERSE] = sse2_combine_out_reverse_ca;
+    imp->combine_32_ca[PIXMAN_OP_ATOP] = sse2_combine_atop_ca;
+    imp->combine_32_ca[PIXMAN_OP_ATOP_REVERSE] = sse2_combine_atop_reverse_ca;
+    imp->combine_32_ca[PIXMAN_OP_XOR] = sse2_combine_xor_ca;
+    imp->combine_32_ca[PIXMAN_OP_ADD] = sse2_combine_add_ca;
+
+    imp->blt = sse2_blt;
+    imp->fill = sse2_fill;
+
+    imp->src_iter_init = sse2_src_iter_init;
+
+    return imp;
+}
diff --git a/xorg-server/xkeyboard-config/NEWS b/xorg-server/xkeyboard-config/NEWS
index 306c1e638..98ac6c05c 100644
--- a/xorg-server/xkeyboard-config/NEWS
+++ b/xorg-server/xkeyboard-config/NEWS
@@ -1,3 +1,6 @@
+2.3	First scheduled (and reasonably polished) release since GNOME3.
+	Serious cleanup of descriptions
+	18 bugfixes, updated translations
 2.2	Non-scheduled release for GNOME3.
 	Major change in the structure of descriptions.
 	Some new stuff added too.
diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in
index f692d5ba2..e4008a973 100644
--- a/xorg-server/xkeyboard-config/configure.in
+++ b/xorg-server/xkeyboard-config/configure.in
@@ -67,7 +67,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 
 AM_GLIB_GNU_GETTEXT
 
-ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ka ko ky lt nb nl pl ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ja ka ko ky lt nb nl pl ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW"
 
 AC_SUBST(xkb_base)
 AC_SUBST(xkb_rules_symlink)
diff --git a/xorg-server/xkeyboard-config/po/bg.po b/xorg-server/xkeyboard-config/po/bg.po
index 04c813a90..29adf2521 100644
--- a/xorg-server/xkeyboard-config/po/bg.po
+++ b/xorg-server/xkeyboard-config/po/bg.po
@@ -1,3101 +1,3918 @@
 # Bulgarian translation of xkeyboard-config.
 # Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the xkeyboard-config package.
-# Alexander Shopov <ash@kambanaria.org>, 2002, 2005, 2006, 2007, 2008, 2009, 2010.
+# Alexander Shopov <ash@kambanaria.org>, 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
 # Damyan Ivanov <dam+gnome@ktnx.net>, 2010.
 #
+#
+# = Правила за съкращение на език: =
+#
+# 1. Започва с главна, продължава с малки букви
+#
+# 2. Винаги трибуквено — някои от вариантите в оригинал са 3 буквени,
+# няма защо да сме по-малко информативни от това
+#
+# 3. Ако оригиналът или полученото съкращение е под 3 букви, се допълва
+# с интервали без разделяне „ “ - &nbsp; U+00A0 NO-BREAK SPACE - да се
+# уеднакви широчината на надписа доколкото е възмоно
+#
+# 4. Взима се първата буква, изпускат се буквите „аъоуеиюяйь“ и се
+# взимат 2-та и третата от останалите букви.
+#
+# 5. В случаите, когато това правило води до повтарящи се имена,
+# полученото име не се ползва, а се търси съкращения, които по-точно
+# идентифицират резултата. Често е достатъчно ползването на първите три
+# букви. Пример: белгийска — блгск → Блг, българска — блгрск → Блг;
+# вместо това: белгийска → Бел, българска → Бъл. Пример: латвийска —
+# лтвск → Лтв, литовска — лтвск → Лтв; вместо това латвийска → Лат,
+# литовска → Лит. В много редките случаи (1) когато и това не е
+# достатъчно, се работи ad hoc.
+#
+# = Правила за означение на подредба: =
+#
+# Някои подредби се идентифицират с местата на определени знаци. Пример
+# qwerty, Bepo, Q при турските. Това означение се изписва с правилните
+# знаци, главна буква, ако е една, и малки, ако са повече → qwerty,
+# bépo, Q.  
+#
+# = Правила за знаци =
+#
+# Знаците се изписват графично, не се описват — „€“, а не евро. Думата
+# „знак“ се избягва. Знаците се слагат в български кавички. Ако графично
+# силно приличат на българските кавички, се ползват френски, и се гледа
+# в рамките на едно съобщение цитирането да се прави с еднакви кавички.
+#
+# = Правила за пунктуация =
+#
+# Предпочита се дълго тире „—“ пред скоби „()“.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.1-pre1\n"
+"Project-Id-Version: xkeyboard-config-2.3\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-01-12 00:16+0000\n"
-"PO-Revision-Date: 2011-01-15 16:09+0200\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-05-19 06:23+0300\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../rules/base.xml.in.h:1
 msgid "&lt;Less/Greater&gt;"
-msgstr "&lt;По-малко/по-голямо&gt;"
+msgstr "„&lt;&gt;“"
 
 #: ../rules/base.xml.in.h:2
-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 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, 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 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 "(F)"
-msgstr "(F)"
+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 "(Legacy) Alternative"
-msgstr "(остаряла) алтернативна"
+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 "(Legacy) Alternative, Sun dead keys"
-msgstr "(остаряла) алтернативна, с „мъртви“ клавиши на Sun"
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
 
 #: ../rules/base.xml.in.h:7
-msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "(остаряла) алтернативна, без „мъртви“ клавиши"
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
 
 #: ../rules/base.xml.in.h:8
-msgid "101/104 key Compatible"
-msgstr "Съвместима със 101/104 клавиша"
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23 — безжична"
 
 #: ../rules/base.xml.in.h:9
-msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/запетая/с „мъртви“ клавиши"
+msgid "ATM/phone-style"
+msgstr "Като банкомат/телефон"
 
 #: ../rules/base.xml.in.h:10
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/запетая/без „мъртви“ клавиши"
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
 
 #: ../rules/base.xml.in.h:11
-msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/точка/с „мъртви“ клавиши"
+msgid "Acer C300"
+msgstr "Acer C300"
 
 #: ../rules/base.xml.in.h:12
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/точка/без „мъртви“ клавиши"
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
 
 #: ../rules/base.xml.in.h:13
-msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/запетая/с „мъртви“ клавиши"
+msgid "Acer Laptop"
+msgstr "Acer, за мобилен компютър"
 
 #: ../rules/base.xml.in.h:14
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwertz/запетая/без „мъртви“ клавиши"
+msgid "Add the standard behavior to Menu key"
+msgstr "Добавяне на стандартното поведение на Menu"
 
 #: ../rules/base.xml.in.h:15
-msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/точка/с „мъртви“ клавиши"
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Добавяне на двойните ударения на Esperanto"
 
 #: ../rules/base.xml.in.h:16
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/точка/без „мъртви“ клавиши"
+msgid "Adding currency signs to certain keys"
+msgstr "Добавяне на знак за валута към някои клавиши"
 
 #: ../rules/base.xml.in.h:17
-msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/запетая/с „мъртви“ клавиши"
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
 
 #: ../rules/base.xml.in.h:18
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/запетая/без „мъртви“ клавиши"
+msgid "Afghani"
+msgstr "афганистанска"
 
 #: ../rules/base.xml.in.h:19
-msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/точка/с „мъртви“ клавиши"
+msgid "Akan"
+msgstr "аканска"
 
 #: ../rules/base.xml.in.h:20
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/точка/без „мъртви“ клавиши"
+msgid "Albanian"
+msgstr "албанска"
 
 #: ../rules/base.xml.in.h:21
-msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/запетая/с „мъртви“ клавиши"
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt-овете отговарят на Meta и на Alt"
 
 #: ../rules/base.xml.in.h:22
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/запетая/без „мъртви“ клавиши"
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Десният Win е Alt, а Menu — Super"
 
 #: ../rules/base.xml.in.h:23
-msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/точка/с „мъртви“ клавиши"
+msgid "Alt+Caps Lock"
+msgstr "Alt+Caps Lock"
 
 #: ../rules/base.xml.in.h:24
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/точка/без „мъртви“ клавиши"
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
 
 #: ../rules/base.xml.in.h:25
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
 
 #: ../rules/base.xml.in.h:26
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
+msgid "Alt+Space"
+msgstr "Alt+Space"
 
 #: ../rules/base.xml.in.h:27
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23 (безжична)"
+msgid "Alt/Win key behavior"
+msgstr "Поведение на Alt/Win"
 
 #: ../rules/base.xml.in.h:28
-msgid "ATM/phone-style"
-msgstr "Като банкомат/телефон"
+msgid "Amharic"
+msgstr "амхарска"
 
 #: ../rules/base.xml.in.h:29
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
+msgid "Any Alt key"
+msgstr "Всеки Alt"
 
 #: ../rules/base.xml.in.h:30
-msgid "Acer C300"
-msgstr "Acer C300"
+msgid "Any Win key"
+msgstr "Всеки Win"
 
 #: ../rules/base.xml.in.h:31
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
+msgid "Any Win key (while pressed)"
+msgstr "Всеки Win (докато е натиснат)"
 
 #: ../rules/base.xml.in.h:32
-msgid "Acer Laptop"
-msgstr "Acer, за мобилен компютър"
+msgid "Apple"
+msgstr "Apple"
 
 #: ../rules/base.xml.in.h:33
-msgid "Add the standard behavior to Menu key"
-msgstr "Добавяне на стандартното поведение на Menu"
+msgid "Apple Aluminium Keyboard (ANSI)"
+msgstr "Apple Aluminium Keyboard — стандарт ANSI"
 
 #: ../rules/base.xml.in.h:34
-msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr "Добавяне на двойните ударения на Esperanto"
+msgid "Apple Aluminium Keyboard (ISO)"
+msgstr "Apple Aluminium Keyboard — стандарт ISO"
 
 #: ../rules/base.xml.in.h:35
-msgid "Adding currency signs to certain keys"
-msgstr "Добавяне на знак за валута към някои клавиши"
+msgid "Apple Aluminium Keyboard (JIS)"
+msgstr "Apple Aluminium Keyboard — стандарт JIS"
 
 #: ../rules/base.xml.in.h:36
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
+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 "Afg"
-msgstr "Афг"
+msgid "Apple Laptop"
+msgstr "Apple, за мобилен компютър"
 
 #: ../rules/base.xml.in.h:38
-msgid "Afghanistan"
-msgstr "афганистанска"
+msgid "Arabic"
+msgstr "арабска"
 
 #: ../rules/base.xml.in.h:39
-msgid "Akan"
-msgstr "акан"
+msgid "Arabic (Buckwalter)"
+msgstr "арабска — транслитерация по Бъкуолтър"
 
 #: ../rules/base.xml.in.h:40
-msgid "Alb"
-msgstr "Алб"
+msgid "Arabic (Morocco)"
+msgstr "арабска — мароканска"
 
 #: ../rules/base.xml.in.h:41
-msgid "Albania"
-msgstr "албанска"
+msgid "Arabic (Pakistan)"
+msgstr "арабска — пакистанска"
 
 #: ../rules/base.xml.in.h:42
-msgid "Alt and Meta are on Alt keys"
-msgstr "Alt-овете отговарят на Meta и на Alt"
+msgid "Arabic (Syria)"
+msgstr "арабска — сирийска"
 
 #: ../rules/base.xml.in.h:43
-msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr "Десният Win е Alt, а Menu — Super"
+msgid "Arabic (azerty)"
+msgstr "арабска — azerty"
 
 #: ../rules/base.xml.in.h:44
-msgid "Alt+Caps Lock"
-msgstr "Alt+Caps Lock"
+msgid "Arabic (azerty/digits)"
+msgstr "арабска — azerty/цифри"
 
 #: ../rules/base.xml.in.h:45
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
+msgid "Arabic (digits)"
+msgstr "арабска — цифри"
 
 #: ../rules/base.xml.in.h:46
-msgid "Alt+Shift"
-msgstr "Alt+Shift"
+msgid "Arabic (qwerty)"
+msgstr "арабска — qwerty"
 
 #: ../rules/base.xml.in.h:47
-msgid "Alt+Space"
-msgstr "Alt+Space"
+msgid "Arabic (qwerty/digits)"
+msgstr "арабска — querty/цифри"
 
-#: ../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 "арменска"
 
 #: ../rules/base.xml.in.h:49
-msgid "Alt/Win key behavior"
-msgstr "Поведение на Alt/Win"
+msgid "Armenian (alternative eastern)"
+msgstr "арменска — източна, алтернативна"
 
-#: ../rules/base.xml.in.h:50
-msgid "Alternative"
-msgstr "алтернативна"
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+msgid "Armenian (alternative phonetic)"
+msgstr "арменска — фонетична, алтернативна"
 
 #: ../rules/base.xml.in.h:51
-msgid "Alternative Eastern"
-msgstr "алтернативна източна"
+msgid "Armenian (eastern)"
+msgstr "арменска — източна"
 
 #: ../rules/base.xml.in.h:52
-msgid "Alternative Phonetic"
-msgstr "фонетична, алтернативна"
+msgid "Armenian (phonetic)"
+msgstr "арменска — фонетична"
 
 #: ../rules/base.xml.in.h:53
-msgid "Alternative international"
-msgstr "алтернативна, международна"
+msgid "Armenian (western)"
+msgstr "арменска — западна"
 
 #: ../rules/base.xml.in.h:54
-msgid "Alternative, Sun dead keys"
-msgstr "алтернативна, с „мъртви“ клавиши на Sun"
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "астурска — испанска с „Ḥ“ и „Ḷ“"
 
 #: ../rules/base.xml.in.h:55
-msgid "Alternative, eliminate dead keys"
-msgstr "алтернативна, без „мъртви“ клавиши"
+msgid "Asus Laptop"
+msgstr "Asus, за мобилен компютър"
 
 #: ../rules/base.xml.in.h:56
-msgid "Alternative, latin-9 only"
-msgstr "алтернативна, само латиница-9"
+msgid "At bottom left"
+msgstr "Долу вляво"
 
 #: ../rules/base.xml.in.h:57
-msgid "And"
-msgstr "Анд"
+msgid "At left of 'A'"
+msgstr "Вляво от „A“"
 
 #: ../rules/base.xml.in.h:58
-msgid "Andorra"
-msgstr "андорска"
+msgid "Avatime"
+msgstr "аватимска"
 
 #: ../rules/base.xml.in.h:59
-msgid "Any Alt key"
-msgstr "Всеки Alt"
+msgid "Azerbaijani"
+msgstr "азърбейджанска"
 
 #: ../rules/base.xml.in.h:60
-msgid "Any Win key"
-msgstr "Всеки Win"
+msgid "Azerbaijani (Cyrillic)"
+msgstr "азърбейджанска — кирилица"
 
 #: ../rules/base.xml.in.h:61
-msgid "Any Win key (while pressed)"
-msgstr "Всеки Win (докато е натиснат)"
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet Keyboard — безжична, за Интернет"
 
 #: ../rules/base.xml.in.h:62
-msgid "Apostrophe (') variant"
-msgstr "вариант с апостроф (')"
+msgid "BTC 5090"
+msgstr "BTC 5090"
 
 #: ../rules/base.xml.in.h:63
-msgid "Apple"
-msgstr "Apple"
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia — за мултимедия"
 
 #: ../rules/base.xml.in.h:64
-msgid "Apple Aluminium Keyboard (ANSI)"
-msgstr "Apple Aluminium Keyboard (стандарт ANSI)"
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
 
 #: ../rules/base.xml.in.h:65
-msgid "Apple Aluminium Keyboard (ISO)"
-msgstr "Apple Aluminium Keyboard (стандарт ISO)"
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
 
 #: ../rules/base.xml.in.h:66
-msgid "Apple Aluminium Keyboard (JIS)"
-msgstr "Apple Aluminium Keyboard (стандарт JIS)"
+msgid "BTC 9000"
+msgstr "BTC 9000"
 
 #: ../rules/base.xml.in.h:67
-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 "BTC 9000A"
+msgstr "BTC 9000A"
 
 #: ../rules/base.xml.in.h:68
-msgid "Apple Laptop"
-msgstr "Apple, за мобилен компютър"
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
 
 #: ../rules/base.xml.in.h:69
-msgid "Ara"
-msgstr "Ара"
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
 
 #: ../rules/base.xml.in.h:70
-msgid "Arabic"
-msgstr "арабска"
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr ""
+"BTC 9116U Mini Wireless Internet and Gaming — безжична, за Интернет и игри"
 
 #: ../rules/base.xml.in.h:71
-msgid "Arm"
-msgstr "Арм"
+msgid "Backslash"
+msgstr "Обратно наклонена черта"
 
 #: ../rules/base.xml.in.h:72
-msgid "Armenia"
-msgstr "арменска"
+msgid ""
+"Backslash (chooses 3rd level, latches when pressed together with another 3rd-"
+"level-chooser)"
+msgstr ""
+"Обратно наклонената черта избира третото ниво и го заключва заедно с друг "
+"клавиш за трето ниво"
 
 #: ../rules/base.xml.in.h:73
-msgid "Asturian variant with bottom-dot H and bottom-dot L"
-msgstr "астурски вариант с Ḥ и Ḷ (с точки отдолу)"
+msgid "Bambara"
+msgstr "бамбарска"
 
 #: ../rules/base.xml.in.h:74
-msgid "Asus Laptop"
-msgstr "Asus, за мобилен компютър"
+msgid "Bashkirian"
+msgstr "башкирска"
 
 #: ../rules/base.xml.in.h:75
-msgid "At bottom left"
-msgstr "Долу вляво"
+msgid "Belarusian"
+msgstr "беларуска"
 
 #: ../rules/base.xml.in.h:76
-msgid "At left of 'A'"
-msgstr "Вляво от „A“"
+msgid "Belarusian (Latin)"
+msgstr "беларуска — латиница"
 
 #: ../rules/base.xml.in.h:77
-msgid "Austria"
-msgstr "австрийска"
+msgid "Belarusian (legacy)"
+msgstr "беларуска — остаряла"
 
 #: ../rules/base.xml.in.h:78
-msgid "Aut"
-msgstr "Авс"
+msgid "Belgian"
+msgstr "белгийска"
 
 #: ../rules/base.xml.in.h:79
-msgid "Avatime"
-msgstr "аватимска"
+msgid "Belgian (ISO alternate)"
+msgstr "белгийска — алтернативна по ISO"
 
 #: ../rules/base.xml.in.h:80
-msgid "Aze"
-msgstr "Азъ"
+msgid "Belgian (Sun dead keys)"
+msgstr "белгийска — с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:81
-msgid "Azerbaijan"
-msgstr "азърбейджанска"
+msgid "Belgian (Wang model 724 azerty)"
+msgstr "белгийска — Wang, модел 724, azerty"
 
 #: ../rules/base.xml.in.h:82
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 wireless Internet Keyboard (безжична, за Интернет)"
+msgid "Belgian (alternative)"
+msgstr "белгийска — алтернативна"
 
 #: ../rules/base.xml.in.h:83
-msgid "BTC 5090"
-msgstr "BTC 5090"
+msgid "Belgian (alternative, Sun dead keys)"
+msgstr "белгийска — алтернативна, с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:84
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia (за мултимедия)"
+msgid "Belgian (alternative, latin-9 only)"
+msgstr "белгийска — алтернативна, само латиница по ISO 8859-9"
 
 #: ../rules/base.xml.in.h:85
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
+msgid "Belgian (eliminate dead keys)"
+msgstr "белгийска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:86
-msgid "BTC 6301URF"
-msgstr "BTC 6301URF"
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
 
 #: ../rules/base.xml.in.h:87
-msgid "BTC 9000"
-msgstr "BTC 9000"
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
 
 #: ../rules/base.xml.in.h:88
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
 
 #: ../rules/base.xml.in.h:89
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
+msgid "Bengali"
+msgstr "бенгалска"
 
 #: ../rules/base.xml.in.h:90
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
+msgid "Bengali (Probhat)"
+msgstr "бенгалска — пробхат"
 
 #: ../rules/base.xml.in.h:91
-msgid "BTC 9116U Mini Wireless Internet and Gaming"
-msgstr "BTC 9116U Mini Wireless Internet and Gaming (безжична, за Интернет и игри)"
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgstr "берберска — мароканска, фонетична за тифинах, алтернативна"
 
 #: ../rules/base.xml.in.h:92
-msgid "Backslash"
-msgstr "Обратно наклонена черта"
+msgid "Berber (Morocco, Tifinagh alternative)"
+msgstr "берберска — мароканска, за тифинах, алтернативна"
 
 #: ../rules/base.xml.in.h:93
-msgid "Bangladesh"
-msgstr "бангладешска"
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgstr "берберска — мароканска, разширена фонетична за тифинах"
 
 #: ../rules/base.xml.in.h:94
-msgid "Bashkirian"
-msgstr "башкирска"
+msgid "Berber (Morocco, Tifinagh extended)"
+msgstr "берберска — мароканска, разширена за тифинах"
 
 #: ../rules/base.xml.in.h:95
-msgid "Bel"
-msgstr "Бел"
+msgid "Berber (Morocco, Tifinagh phonetic)"
+msgstr "берберска — мароканска, фонетична за тифинах"
 
 #: ../rules/base.xml.in.h:96
-msgid "Belarus"
-msgstr "беларуска"
+msgid "Berber (Morocco, Tifinagh)"
+msgstr "берберска — мароканска, за тифинах"
 
 #: ../rules/base.xml.in.h:97
-msgid "Belgium"
-msgstr "белгийска"
+msgid "Bosnian"
+msgstr "босненска"
 
 #: ../rules/base.xml.in.h:98
-msgid "BenQ X-Touch"
-msgstr "BenQ X-Touch"
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
+msgstr "босненска — американска с босненски диграфи"
 
 #: ../rules/base.xml.in.h:99
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
+msgid "Bosnian (US keyboard with Bosnian letters)"
+msgstr "босненска — американска с босненски букви"
 
 #: ../rules/base.xml.in.h:100
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
+msgid "Bosnian (use Bosnian digraphs)"
+msgstr "босненска — с босненски диграфи"
 
 #: ../rules/base.xml.in.h:101
-msgid "Bengali"
-msgstr "бенгалска"
+msgid "Bosnian (use guillemets for quotes)"
+msgstr "босненска — с „«»“"
 
 #: ../rules/base.xml.in.h:102
-msgid "Bengali Probhat"
-msgstr "бенгалска — пробхат"
+msgid "Both Alt keys together"
+msgstr "Двата Alt-а заедно"
 
 #: ../rules/base.xml.in.h:103
-msgid "Bepo, ergonomic, Dvorak way"
-msgstr "Bepo, ергономична, по Дворак"
+msgid "Both Ctrl keys together"
+msgstr "Двата Ctrl-а заедно"
 
 #: ../rules/base.xml.in.h:104
-msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
-msgstr "Bepo, ергономична, по Дворак, само латиница-9"
+msgid "Both Shift keys together"
+msgstr "Двата Shift-а заедно"
 
 #: ../rules/base.xml.in.h:105
-msgid "Bgd"
-msgstr "Бан"
+msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
+msgstr ""
+"Двата Shift-а заедно включват Caps Lock, самостоятелен Shift го изключва"
 
 #: ../rules/base.xml.in.h:106
-msgid "Bgr"
-msgstr "Бъл"
+msgid "Both Shift-Keys together toggle Caps Lock"
+msgstr "Двата Shift-а заедно превключват Caps Lock"
 
 #: ../rules/base.xml.in.h:107
-msgid "Bhutan"
-msgstr "бутанска"
+msgid "Both Shift-Keys together toggle ShiftLock"
+msgstr "Двата Shift-а заедно превключват ShiftLock"
 
 #: ../rules/base.xml.in.h:108
-msgid "Biblical Hebrew (Tiro)"
-msgstr "библейски иврит (Тиро)"
+msgid "Braille"
+msgstr "брайл"
 
 #: ../rules/base.xml.in.h:109
-msgid "Bih"
-msgstr "БиХ"
+msgid "Braille (left hand)"
+msgstr "брайл за левичари"
 
 #: ../rules/base.xml.in.h:110
-msgid "Blr"
-msgstr "Бел"
+msgid "Braille (right hand)"
+msgstr "брайл за десничари"
 
 #: ../rules/base.xml.in.h:111
-msgid "Bosnia and Herzegovina"
-msgstr "босненска"
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard — за Интернет"
 
 #: ../rules/base.xml.in.h:112
-msgid "Both Alt keys together"
-msgstr "Двата Alt-а заедно"
+msgid "Bulgarian"
+msgstr "българска"
 
 #: ../rules/base.xml.in.h:113
-msgid "Both Ctrl keys together"
-msgstr "Двата Ctrl-а заедно"
+msgid "Bulgarian (new phonetic)"
+msgstr "българска — нова фонетична"
 
 #: ../rules/base.xml.in.h:114
-msgid "Both Shift keys together"
-msgstr "Двата Shift-а заедно"
+msgid "Bulgarian (traditional phonetic)"
+msgstr "българска — традиционна фонетична"
 
 #: ../rules/base.xml.in.h:115
-msgid "Both Shift-Keys together toggle Caps Lock"
-msgstr "Двата Shift-а заедно превключват Caps Lock"
+msgid "Burmese"
+msgstr "бурманска"
 
 #: ../rules/base.xml.in.h:116
-msgid "Botswana"
-msgstr "ботсуанска"
+msgid "Canadian Multilingual"
+msgstr "канадска — многоезична"
 
 #: ../rules/base.xml.in.h:117
-msgid "Bra"
-msgstr "Бра"
+msgid "Canadian Multilingual (first part)"
+msgstr "канадска — многоезична, първа част"
 
 #: ../rules/base.xml.in.h:118
-msgid "Braille"
-msgstr "брайл"
+msgid "Canadian Multilingual (second part)"
+msgstr "канадска — многоезична, втора част"
 
 #: ../rules/base.xml.in.h:119
-msgid "Brazil"
-msgstr "бразилска"
+msgid "Caps Lock"
+msgstr "Caps Lock"
 
 #: ../rules/base.xml.in.h:120
-msgid "Breton"
-msgstr "бретонска"
+msgid ""
+"Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-"
+"level-chooser)"
+msgstr ""
+"Caps Lock избира третото ниво и го заключва заедно с друг клавиш за трето "
+"ниво"
 
 #: ../rules/base.xml.in.h:121
-msgid "Brl"
-msgstr "Брй"
+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 "Brother Internet Keyboard"
-msgstr "Brother Internet Keyboard (за Интернет)"
+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
-msgid "Btn"
-msgstr "Бтн"
+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
-msgid "Buckwalter"
-msgstr "Buckwalter"
+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
-msgid "Bulgaria"
-msgstr "българска"
+msgid "Caps Lock is disabled"
+msgstr "Caps Lock е изключен"
 
 #: ../rules/base.xml.in.h:126
-msgid "Bwa"
-msgstr "Бот"
+msgid "Caps Lock key behavior"
+msgstr "Поведение на Caps Lock"
 
 #: ../rules/base.xml.in.h:127
-msgid "COD"
-msgstr "Кнг"
+msgid "Caps Lock toggles Shift so all keys are affected"
+msgstr "Caps Lock сменя състоянието Shift за всички клавиши"
 
 #: ../rules/base.xml.in.h:128
-msgid "CRULP"
-msgstr "CRULP (урду)"
+msgid "Caps Lock toggles normal capitalization of alphabetic characters"
+msgstr "Caps Lock сменя състоянието Shift само на буквените клавиши"
 
 #: ../rules/base.xml.in.h:129
-msgid "Cambodia"
-msgstr "камбоджанска"
+msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
+msgstr ""
+"Caps Lock използва вътрешна промяна на регистъра. Shift временно отменя Caps "
+"Lock"
 
 #: ../rules/base.xml.in.h:130
-msgid "Can"
-msgstr "Кан"
+msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
+msgstr ""
+"Caps Lock използва вътрешна промяна на регистъра. Shift не влияе на Caps Lock"
 
 #: ../rules/base.xml.in.h:131
-msgid "Canada"
-msgstr "канадска"
+msgid "Catalan"
+msgstr "каталунска"
 
 #: ../rules/base.xml.in.h:132
-msgid "Capewell-Dvorak (Baybayin)"
-msgstr "Дворак на Кейпуел (байбаин)"
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "каталунска — испанска с „Ŀ“"
 
 #: ../rules/base.xml.in.h:133
-msgid "Capewell-Dvorak (Latin)"
-msgstr "Дворак на Кейпуел (латиница)"
+msgid "Cherokee"
+msgstr "черокска"
 
 #: ../rules/base.xml.in.h:134
-msgid "Capewell-QWERF 2006 (Baybayin)"
-msgstr "QWERF 2006 на Кейпуел (байбаин)"
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
 
 #: ../rules/base.xml.in.h:135
-msgid "Capewell-QWERF 2006 (Latin)"
-msgstr "QWERF 2006 на Кейпуел (латиница)"
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
 
 #: ../rules/base.xml.in.h:136
-msgid "Caps Lock"
-msgstr "CapsLock"
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd — алтернативен вариант"
 
 #: ../rules/base.xml.in.h:137
-msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
-msgstr "Caps Lock (към първата подредба), Shift+Caps Lock (към последната)"
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
 
 #: ../rules/base.xml.in.h:138
-msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
-msgstr "Caps Lock (докато е натиснат), Alt+Caps Lock замества Caps Lock"
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
 
 #: ../rules/base.xml.in.h:139
-msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
-msgstr "Caps Lock работи като Shift със заключване. Shift временно отменя Caps Lock"
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
 
 #: ../rules/base.xml.in.h:140
-msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
-msgstr "Caps Lock работи като Shift със заключване. Shift не влияе на Caps Lock"
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
 
 #: ../rules/base.xml.in.h:141
-msgid "Caps Lock is disabled"
-msgstr "Caps Lock е изключен"
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard — за Интернет"
 
 #: ../rules/base.xml.in.h:142
-msgid "Caps Lock key behavior"
-msgstr "Поведение на Caps Lock"
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
 
 #: ../rules/base.xml.in.h:143
-msgid "Caps Lock toggles Shift so all keys are affected"
-msgstr "Caps Lock сменя състоянието Shift за всички клавиши"
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
 
 #: ../rules/base.xml.in.h:144
-msgid "Caps Lock toggles normal capitalization of alphabetic characters"
-msgstr "Caps Lock сменя състоянието Shift само на буквените клавиши"
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
 
 #: ../rules/base.xml.in.h:145
-msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
-msgstr "Caps Lock използва вътрешна промяна на регистъра. Shift временно отменя Caps Lock"
+msgid "Chinese"
+msgstr "китайска"
 
 #: ../rules/base.xml.in.h:146
-msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
-msgstr "Caps Lock използва вътрешна промяна на регистъра. Shift не влияе на Caps Lock"
+msgid "Chuvash"
+msgstr "чувашка"
 
 #: ../rules/base.xml.in.h:147
-msgid "Catalan variant with middle-dot L"
-msgstr "каталунски вариант с Ŀ (с точка в средата)"
+msgid "Chuvash (Latin)"
+msgstr "чувашка — латиница"
 
 #: ../rules/base.xml.in.h:148
-msgid "Cedilla"
-msgstr "седий"
+msgid "Classmate PC"
+msgstr "Classmate PC"
 
 #: ../rules/base.xml.in.h:149
-msgid "Che"
-msgstr "Чех"
+msgid "CloGaelach"
+msgstr "келтска латиница"
 
 #: ../rules/base.xml.in.h:150
-msgid "Cherokee"
-msgstr "черокска"
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard — за лесен достъп"
 
 #: ../rules/base.xml.in.h:151
-msgid "Cherry B.UNLIMITED"
-msgstr "Cherry B.UNLIMITED"
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard — за Интернет, 13 допълнителни клавиша"
 
 #: ../rules/base.xml.in.h:152
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard — за Интернет, 18 допълнителни клавиша"
 
 #: ../rules/base.xml.in.h:153
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (алтернативен вариант)"
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard — за Интернет, 7 допълнителни клавиша"
 
 #: ../rules/base.xml.in.h:154
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
 
 #: ../rules/base.xml.in.h:155
-msgid "Cherry CyMotion Expert"
-msgstr "Cherry CyMotion Expert"
+msgid "Compose key position"
+msgstr "Положение на Compose"
 
 #: ../rules/base.xml.in.h:156
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
+msgid "Control + Alt + Backspace"
+msgstr "Control+Alt+Backspace"
 
 #: ../rules/base.xml.in.h:157
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "И двата Alt-а са Control, Win е Alt"
 
 #: ../rules/base.xml.in.h:158
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internet Keyboard (за Интернет)"
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "И двата Win-а са Control (както и клавишите Ctrl)"
 
 #: ../rules/base.xml.in.h:159
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
+msgid "Creative Desktop Wireless 7000"
+msgstr "Creative Desktop Wireless 7000 — безжична"
 
 #: ../rules/base.xml.in.h:160
-msgid "Chicony KU-0108"
-msgstr "Chicony KU-0108"
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "кримски татарски — „Q“ горе-вляво, Добруджа-Q"
 
 #: ../rules/base.xml.in.h:161
-msgid "Chicony KU-0420"
-msgstr "Chicony KU-0420"
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "кримски татарски — турска, „Q“ горе-вляво, алтернативна"
 
 #: ../rules/base.xml.in.h:162
-msgid "China"
-msgstr "Китай"
+msgid "Crimean Tatar (Turkish F)"
+msgstr "кримски татарски — турска, „F“ горе-вляво"
 
 #: ../rules/base.xml.in.h:163
-msgid "Chn"
-msgstr "Кит"
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "кримски татарски — турска, „Q“ горе-вляво"
 
 #: ../rules/base.xml.in.h:164
-msgid "Chuvash"
-msgstr "чувашка"
+msgid "Croatian"
+msgstr "хърватска"
 
 #: ../rules/base.xml.in.h:165
-msgid "Chuvash Latin"
-msgstr "чувашка, латиница"
+msgid "Croatian (US keyboard with Croatian digraphs)"
+msgstr "хърватска — американска с хърватски диграфи"
 
 #: ../rules/base.xml.in.h:166
-msgid "Classic"
-msgstr "класическа"
+msgid "Croatian (US keyboard with Croatian letters)"
+msgstr "хърватска — американска с хърватски букви"
 
 #: ../rules/base.xml.in.h:167
-msgid "Classic Dvorak"
-msgstr "класическа, Дворак"
+msgid "Croatian (use Croatian digraphs)"
+msgstr "хърватска — с хърватски диграфи"
 
 #: ../rules/base.xml.in.h:168
-msgid "Classic, eliminate dead keys"
-msgstr "класическа, без „мъртви“ клавиши"
+msgid "Croatian (use guillemets for quotes)"
+msgstr "хърватска — с „«»“"
 
 #: ../rules/base.xml.in.h:169
-msgid "Classmate PC"
-msgstr "Classmate PC"
+msgid "Ctrl key position"
+msgstr "Положение на Ctrl"
 
 #: ../rules/base.xml.in.h:170
-msgid "CloGaelach"
-msgstr "CloGaelach"
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
 
 #: ../rules/base.xml.in.h:171
-msgid "Colemak"
-msgstr "коулмак"
+msgid "Czech"
+msgstr "чешка"
 
 #: ../rules/base.xml.in.h:172
-msgid "Colemak (Baybayin)"
-msgstr "коулмак (байбаин)"
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "чешка — UCW, само букви с надредни знаци"
 
 #: ../rules/base.xml.in.h:173
-msgid "Colemak (Latin)"
-msgstr "коулмак (латиница)"
+msgid "Czech (US Dvorak with CZ UCW support)"
+msgstr "чешка — американски Дворак с поддръжка на UCW"
 
 #: ../rules/base.xml.in.h:174
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access Keyboard (за лесен достъп)"
+msgid "Czech (qwerty)"
+msgstr "чешка — qwerty"
 
 #: ../rules/base.xml.in.h:175
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet Keyboard (за Интернет, 13 допълнителни клавиша)"
+msgid "Czech (qwerty, extended Backslash)"
+msgstr "чешка — qwerty с „\\“"
 
 #: ../rules/base.xml.in.h:176
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet Keyboard (за Интернет, 18 допълнителни клавиша)"
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "чешка — с „\\|“"
 
 #: ../rules/base.xml.in.h:177
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet Keyboard (за Интернет, 7 допълнителни клавиша)"
+msgid "DTK2000"
+msgstr "DTK2000"
 
 #: ../rules/base.xml.in.h:178
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Keyboard"
+msgid "Danish"
+msgstr "датска"
 
 #: ../rules/base.xml.in.h:179
-msgid "Compose key position"
-msgstr "Положение на Compose"
+msgid "Danish (Dvorak)"
+msgstr "датска — Дворак"
 
 #: ../rules/base.xml.in.h:180
-msgid "Congo, Democratic Republic of the"
-msgstr "конгоанска (ДРК)"
+msgid "Danish (Macintosh)"
+msgstr "датска — за Макинтош"
 
 #: ../rules/base.xml.in.h:181
-msgid "Control + Alt + Backspace"
-msgstr "Control+Alt+Backspace"
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "датска — за Макинтош, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:182
-msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
-msgstr "И двата Alt-а са Control, Win е Alt"
+msgid "Danish (eliminate dead keys)"
+msgstr "датска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:183
-msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
-msgstr "И двата Win-а са Control (както и клавишите Ctrl)"
+msgid "Default numeric keypad keys"
+msgstr "Стандартни клавиши на цифровата клавиатура"
 
 #: ../rules/base.xml.in.h:184
-msgid "Creative Desktop Wireless 7000"
-msgstr "Creative Desktop Wireless 7000 (безжична)"
+msgid "Dell"
+msgstr "Dell"
 
 #: ../rules/base.xml.in.h:185
-msgid "Crimean Tatar (Dobruca-1 Q)"
-msgstr "татарска (Крим) (Dobruca-1 Q)"
+msgid "Dell 101-key PC"
+msgstr "Клавиатура на Dell със 101 клавиша за PC"
 
 #: ../rules/base.xml.in.h:186
-msgid "Crimean Tatar (Dobruca-2 Q)"
-msgstr "татарска (Крим) (Dobruca-2 Q)"
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx — за мобилен компютър"
 
 #: ../rules/base.xml.in.h:187
-msgid "Crimean Tatar (Turkish Alt-Q)"
-msgstr "татарска (Крим) (турско Alt-Q)"
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Laptop/notebook Precision M series — за мобилен компютър"
 
 #: ../rules/base.xml.in.h:188
-msgid "Crimean Tatar (Turkish F)"
-msgstr "татарска (Крим) (турско F)"
+msgid "Dell Latitude series laptop"
+msgstr "За преносим компютър Dell Latitude"
 
 #: ../rules/base.xml.in.h:189
-msgid "Crimean Tatar (Turkish Q)"
-msgstr "татарска (Крим) (турско Q)"
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
 
 #: ../rules/base.xml.in.h:190
-msgid "Croatia"
-msgstr "хърватска"
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
 
 #: ../rules/base.xml.in.h:191
-msgid "Ctrl key position"
-msgstr "Положение на Ctrl"
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
 
 #: ../rules/base.xml.in.h:192
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Shift"
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia Keybard — за мултимедия"
 
 #: ../rules/base.xml.in.h:193
-msgid "Cyrillic"
-msgstr "кирилска"
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard — безжична"
 
 #: ../rules/base.xml.in.h:194
-msgid "Cyrillic with guillemets"
-msgstr "кирилска с френски кавички"
+msgid "Dhivehi"
+msgstr "дивеи"
 
 #: ../rules/base.xml.in.h:195
-msgid "Cyrillic, Z and ZHE swapped"
-msgstr "кирилска с разменени „З“ и „Ж“"
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801/9802 series"
 
 #: ../rules/base.xml.in.h:196
-msgid "Cze"
-msgstr "Чеч"
+msgid "Dutch"
+msgstr "холандска"
 
 #: ../rules/base.xml.in.h:197
-msgid "Czechia"
-msgstr "чеченска"
+msgid "Dutch (Macintosh)"
+msgstr "холандска — за Макинтош"
 
 #: ../rules/base.xml.in.h:198
-msgid "DOS"
-msgstr "DOS"
+msgid "Dutch (Sun dead keys)"
+msgstr "холандска — с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:199
-msgid "DTK2000"
-msgstr "DTK2000"
+msgid "Dutch (standard)"
+msgstr "холандска — стандартна"
 
 #: ../rules/base.xml.in.h:200
-msgid "Dead acute"
-msgstr "„мъртво“ ударение"
+msgid "Dzongkha"
+msgstr "дзонка"
 
 #: ../rules/base.xml.in.h:201
-msgid "Dead grave acute"
-msgstr "„мъртво“ тежко ударение"
+msgid "Enable extra typographic characters"
+msgstr "Допълнителни типографски знаци"
 
 #: ../rules/base.xml.in.h:202
-msgid "Default numeric keypad keys"
-msgstr "Стандартни клавиши на цифровата клавиатура"
+msgid "English (Cameroon Dvorak)"
+msgstr "английска — камерунска, Дворак"
 
 #: ../rules/base.xml.in.h:203
-msgid "Dell"
-msgstr "Dell"
+msgid "English (Cameroon qwerty)"
+msgstr "английска — камерунска, qwerty"
 
 #: ../rules/base.xml.in.h:204
-msgid "Dell 101-key PC"
-msgstr "Клавиатура на Dell със 101 клавиша за PC"
+msgid "English (Cameroon)"
+msgstr "английска — камерунска"
 
 #: ../rules/base.xml.in.h:205
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx (за мобилен компютър)"
+msgid "English (Canada)"
+msgstr "английска — канадска"
 
 #: ../rules/base.xml.in.h:206
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Dell Laptop/notebook Precision M series (за мобилен компютър)"
+msgid "English (Colemak)"
+msgstr "английска — Коулмак"
 
+# FIXME алтернативна да е след международна
 #: ../rules/base.xml.in.h:207
-msgid "Dell Latitude series laptop"
-msgstr "За преносим компютър Dell Latitude"
+msgid "English (Dvorak alternative international no dead keys)"
+msgstr "английска — Дворак, международна, алтернативна, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:208
-msgid "Dell Precision M65"
-msgstr "Dell Precision M65"
+msgid "English (Dvorak international with dead keys)"
+msgstr "английска — Дворак, международна, с „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:209
-msgid "Dell SK-8125"
-msgstr "Dell SK-8125"
+msgid "English (Dvorak)"
+msgstr "английска — Дворак"
 
 #: ../rules/base.xml.in.h:210
-msgid "Dell SK-8135"
-msgstr "Dell SK-8135"
+msgid "English (Ghana)"
+msgstr "английска — ганайска"
 
 #: ../rules/base.xml.in.h:211
-msgid "Dell USB Multimedia Keyboard"
-msgstr "Dell USB Multimedia Keybard (за мултимедия)"
+msgid "English (Ghana, GILLBT)"
+msgstr "английска — ганайска, GILLBT"
 
 #: ../rules/base.xml.in.h:212
-msgid "Denmark"
-msgstr "датска"
+msgid "English (Ghana, multilingual)"
+msgstr "английска — ганайска, международна"
 
 #: ../rules/base.xml.in.h:213
-msgid "Deu"
-msgstr "Нем"
+msgid "English (India, with RupeeSign)"
+msgstr "английска — индийска, с „₨“"
 
 #: ../rules/base.xml.in.h:214
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop Keyboard (безжична)"
+msgid "English (Macintosh)"
+msgstr "английска — за Макинтош"
 
 #: ../rules/base.xml.in.h:215
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801/9802 series"
+msgid "English (Mali, US Macintosh)"
+msgstr "английска — малийска, американска за Макинтош"
 
 #: ../rules/base.xml.in.h:216
-msgid "Dnk"
-msgstr "Дат"
+msgid "English (Mali, US international)"
+msgstr "английска — малийска, американска международна"
 
 #: ../rules/base.xml.in.h:217
-msgid "Dvorak"
-msgstr "Дворак"
+msgid "English (Nigeria)"
+msgstr "английска — нигерийска"
 
 #: ../rules/base.xml.in.h:218
-msgid "Dvorak (Baybayin)"
-msgstr "Дворак (байбаин)"
+msgid "English (South Africa)"
+msgstr "английска — южноафриканска"
 
 #: ../rules/base.xml.in.h:219
-msgid "Dvorak (Latin)"
-msgstr "Дворак (латиница)"
+msgid "English (UK)"
+msgstr "английска — великобританска"
 
 #: ../rules/base.xml.in.h:220
-msgid "Dvorak (UK Punctuation)"
-msgstr "Дворак (пунктуация на Обединеното кралство)"
+msgid "English (UK, Colemak)"
+msgstr "английска — великобританска, Коулмак"
 
 #: ../rules/base.xml.in.h:221
-msgid "Dvorak alternative international (no dead keys)"
-msgstr "Дворак, алтернативна, международна (без „мъртви“ клавиши)"
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr ""
+"английска — великобританска, с пунктуация на Обединеното кралство, Дворак"
 
 #: ../rules/base.xml.in.h:222
-msgid "Dvorak international (with dead keys)"
-msgstr "Дворак, международна (с „мъртви“ клавиши)"
+msgid "English (UK, Dvorak)"
+msgstr "английска — великобританска, Дворак"
 
 #: ../rules/base.xml.in.h:223
-msgid "Dvorak, Polish quotes on key 1"
-msgstr "Дворак, полски кавички на клавиша „1“"
+msgid "English (UK, Macintosh international)"
+msgstr "английска  — великобританска, за Макинтош, международна"
 
 #: ../rules/base.xml.in.h:224
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "Дворак, полски кавички на клавиша за кавички"
+msgid "English (UK, Macintosh)"
+msgstr "английска — великобританска, за Макинтош"
 
 #: ../rules/base.xml.in.h:225
-msgid "Eastern"
-msgstr "източна"
+msgid "English (UK, extended WinKeys)"
+msgstr "английска  — великобританска, разширена, с клавиши на Windows"
 
 #: ../rules/base.xml.in.h:226
-msgid "Eliminate dead keys"
-msgstr "без „мъртви“ клавиши"
+msgid "English (UK, international with dead keys)"
+msgstr "английска  — великобританска, международна, с „мъртви“ клавиши"
 
-#: ../rules/base.xml.in.h:227
-msgid "Enable extra typographic characters"
-msgstr "Допълнителни типографски знаци"
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+msgid "English (US)"
+msgstr "английска — американска"
 
 #: ../rules/base.xml.in.h:228
-msgid "English"
-msgstr "английска"
+msgid "English (US, alternative international)"
+msgstr "английска — американска, международна, алтернативна"
 
 #: ../rules/base.xml.in.h:229
-msgid "English (USA International)"
-msgstr "английска (САЩ, международна)"
+msgid "English (US, international with dead keys)"
+msgstr "английска — американска, международна, с „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:230
-msgid "English (USA Macintosh)"
-msgstr "английска (САЩ, за Macintosh)"
+msgid "English (US, with euro on 5)"
+msgstr "английска — американска, c „€“ при 5"
 
 #: ../rules/base.xml.in.h:231
-msgid "English with RupeeSign"
-msgstr "английска със знак на рупия (₨)"
+msgid "English (classic Dvorak)"
+msgstr "английска — класически Дворак"
 
 #: ../rules/base.xml.in.h:232
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
+msgid "English (international AltGr dead keys)"
+msgstr "английска — международна, с „мъртви“ клавиши чрез AltGr"
 
 #: ../rules/base.xml.in.h:233
-msgid "Enter on keypad"
-msgstr "Enter на цифровата клавиатура"
+msgid "English (layout toggle on multiply/divide key)"
+msgstr "английска — смяна на подредбата при натискане на „*“ и „/“"
 
 #: ../rules/base.xml.in.h:234
-msgid "Epo"
-msgstr "Есп"
+msgid "English (left handed Dvorak)"
+msgstr "английска — Дворак за левичари"
 
 #: ../rules/base.xml.in.h:235
-msgid "Ergonomic"
-msgstr "ергономична"
+msgid "English (programmer Dvorak)"
+msgstr "английска — Дворак за програмисти"
 
 #: ../rules/base.xml.in.h:236
-msgid "Esp"
-msgstr "Исп"
+msgid "English (right handed Dvorak)"
+msgstr "английска — Дворак за десничари"
 
 #: ../rules/base.xml.in.h:237
-msgid "Esperanto"
-msgstr "есперантска"
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
 
 #: ../rules/base.xml.in.h:238
-msgid "Est"
-msgstr "Ест"
+msgid "Enter on keypad"
+msgstr "Enter на цифровата клавиатура"
 
 #: ../rules/base.xml.in.h:239
-msgid "Estonia"
-msgstr "естонска"
+msgid "Esperanto"
+msgstr "есперантска"
 
 #: ../rules/base.xml.in.h:240
-msgid "Eth"
-msgstr "Ети"
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "есперантска — португалска, нативна"
 
 #: ../rules/base.xml.in.h:241
-msgid "Ethiopia"
-msgstr "етиопска"
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr "есперантска — разменени „;“ и „\"“, остаряла"
 
 #: ../rules/base.xml.in.h:242
-msgid "Euro on 2"
-msgstr "Евро (€) при „2“"
+msgid "Estonian"
+msgstr "естонска"
 
 #: ../rules/base.xml.in.h:243
-msgid "Euro on 4"
-msgstr "Евро (€) при „4“"
+msgid "Estonian (Dvorak)"
+msgstr "естонска — Дворак"
 
 #: ../rules/base.xml.in.h:244
-msgid "Euro on 5"
-msgstr "Евро (€) при „5“"
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr "естонска — американска с естонски букви"
 
 #: ../rules/base.xml.in.h:245
-msgid "Euro on E"
-msgstr "Евро (€) при „E“"
+msgid "Estonian (eliminate dead keys)"
+msgstr "естонска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:246
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
+msgid "Euro on 2"
+msgstr "„€“ при „2“"
 
 #: ../rules/base.xml.in.h:247
-msgid "Ewe"
-msgstr "еве"
+msgid "Euro on 4"
+msgstr "„€“ при „4“"
 
 #: ../rules/base.xml.in.h:248
-msgid "Extended"
-msgstr "разширена"
+msgid "Euro on 5"
+msgstr "„€“ при „5“"
 
 #: ../rules/base.xml.in.h:249
-msgid "Extended - Winkeys"
-msgstr "разширена — Winkeys"
+msgid "Euro on E"
+msgstr "„€“ при „E“"
 
 #: ../rules/base.xml.in.h:250
-msgid "Extended Backslash"
-msgstr "удължен Backslash"
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
 
 #: ../rules/base.xml.in.h:251
-msgid "F-letter (F) variant"
-msgstr "вариант с буква F (F)"
+msgid "Ewe"
+msgstr "еве"
 
 #: ../rules/base.xml.in.h:252
 msgid "FL90"
 msgstr "FL90"
 
 #: ../rules/base.xml.in.h:253
-msgid "Faroe Islands"
+msgid "Faroese"
 msgstr "фарьорска"
 
 #: ../rules/base.xml.in.h:254
-msgid "Fin"
-msgstr "Фин"
+msgid "Faroese (eliminate dead keys)"
+msgstr "фарьорска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:255
-msgid "Finland"
-msgstr "финландска"
+msgid "Filipino"
+msgstr "филипинска"
+
+#: ../rules/base.xml.in.h:256
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr "филипинска — Дворак на Кейпуел за байбаин"
+
+#: ../rules/base.xml.in.h:257
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr "филипинска — Дворак на Кейпуел за латиница"
 
-#. This assumes the KP_ abstract symbols are actually useful for some apps
-#. The description needs to be rewritten
 #: ../rules/base.xml.in.h:258
-msgid "Four-level key with abstract separators"
-msgstr "Клавиш на четири нива с абстрактни разделители"
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr "филипинска — QWERF 2006 на Кейпуел за байбаин"
 
 #: ../rules/base.xml.in.h:259
-msgid "Four-level key with comma"
-msgstr "Клавиш на четири нива с десетична запетая"
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr "филипинска — QWERF 2006 на Кейпуел за латиница"
 
 #: ../rules/base.xml.in.h:260
-msgid "Four-level key with dot"
-msgstr "Клавиш на четири нива с десетична точка"
+msgid "Filipino (Colemak Baybayin)"
+msgstr "филипинска — Коулмак за байбаин"
 
 #: ../rules/base.xml.in.h:261
-msgid "Four-level key with dot, latin-9 restriction"
-msgstr "Клавиш на четири нива с десетична точка, само латиница-9"
+msgid "Filipino (Colemak Latin)"
+msgstr "филипинска — Коулмак за латиница"
 
 #: ../rules/base.xml.in.h:262
-msgid "Four-level key with momayyez"
-msgstr "Клавиш на четири нива с арабска десетична запетая"
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "филипинска — Дворак за байбаин"
 
 #: ../rules/base.xml.in.h:263
-msgid "Fra"
-msgstr "Фре"
+msgid "Filipino (Dvorak Latin)"
+msgstr "филипинска — Дворак за латиница"
 
 #: ../rules/base.xml.in.h:264
-msgid "France"
-msgstr "френска"
+msgid "Filipino (QWERTY Baybayin)"
+msgstr "филипинска — QWERTY за байбаин"
 
 #: ../rules/base.xml.in.h:265
-msgid "Français (France Alternative)"
-msgstr "френска (алтернативна)"
+msgid "Finnish"
+msgstr "финландска"
 
 #: ../rules/base.xml.in.h:266
-msgid "French"
-msgstr "френска"
+msgid "Finnish (Macintosh)"
+msgstr "финландска — за Макинтош"
 
 #: ../rules/base.xml.in.h:267
-msgid "French (Macintosh)"
-msgstr "френска (за Macintosh)"
+msgid "Finnish (classic)"
+msgstr "финландска — класическа"
 
 #: ../rules/base.xml.in.h:268
-msgid "French (legacy)"
-msgstr "френска (остаряла)"
-
-#: ../rules/base.xml.in.h:269
-msgid "French Dvorak"
-msgstr "френска Дворак"
-
-#: ../rules/base.xml.in.h:270
-msgid "French, Sun dead keys"
-msgstr "френска, с „мъртвите“ клавиши на Sun"
+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
-msgid "French, eliminate dead keys"
-msgstr "френска, без „мъртви“ клавиши"
+msgid "Four-level key with abstract separators"
+msgstr "Клавиш на четири нива с абстрактни разделители"
 
 #: ../rules/base.xml.in.h:272
-msgid "Fro"
-msgstr "Фро"
+msgid "Four-level key with comma"
+msgstr "Клавиш на четири нива с десетична запетая"
 
 #: ../rules/base.xml.in.h:273
-msgid "Fujitsu-Siemens Computers AMILO laptop"
-msgstr "Fujitsu-Siemens Computers AMILO laptop (за мобилен компютър)"
+msgid "Four-level key with dot"
+msgstr "Клавиш на четири нива с десетична точка"
 
 #: ../rules/base.xml.in.h:274
-msgid "Fula"
-msgstr "фула"
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Клавиш на четири нива с десетична точка, само латиница по ISO-8859-9"
 
 #: ../rules/base.xml.in.h:275
-msgid "GBr"
-msgstr "ВБр"
+msgid "Four-level key with momayyez"
+msgstr "Клавиш на четири нива с арабска десетична запетая"
 
 #: ../rules/base.xml.in.h:276
-msgid "GILLBT"
-msgstr "GILLBT (Ганийски институт по лингвистика, грамотност и превод на Библията)"
+msgid "French"
+msgstr "френска"
 
 #: ../rules/base.xml.in.h:277
-msgid "Ga"
-msgstr "га"
+msgid "French (Bepo, ergonomic, Dvorak way)"
+msgstr "френска — Дворак, bépo, ергономична"
 
 #: ../rules/base.xml.in.h:278
-msgid "Generic 101-key PC"
-msgstr "Стандартна клавиатура за PC със 101 клавиша"
+msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
+msgstr "френска — Дворак, bépo, ергономична, само латиница по ISO 8859-9"
 
 #: ../rules/base.xml.in.h:279
-msgid "Generic 102-key (Intl) PC"
-msgstr "Стандартна клавиатура за PC със 102 клавиша (международна)"
+msgid "French (Breton)"
+msgstr "френска — бретонска"
 
 #: ../rules/base.xml.in.h:280
-msgid "Generic 104-key PC"
-msgstr "Стандартна клавиатура за PC със 104 клавиша"
+msgid "French (Cameroon azerty)"
+msgstr "френска — камерунска, azerty"
 
 #: ../rules/base.xml.in.h:281
-msgid "Generic 105-key (Intl) PC"
-msgstr "Стандартна клавиатура за PC със 105 клавиша (международна)"
+msgid "French (Cameroon)"
+msgstr "френска — камерунска"
 
-#: ../rules/base.xml.in.h:282
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "френска — канадска"
 
 #: ../rules/base.xml.in.h:283
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M/Genius MM Keyboard KWD-910"
+msgid "French (Canada, Dvorak)"
+msgstr "френска — канадска, Дворак"
 
 #: ../rules/base.xml.in.h:284
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
+msgid "French (Canada, legacy)"
+msgstr "френска — канадска, остаряла"
 
 #: ../rules/base.xml.in.h:285
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
+msgid "French (Democratic Republic of the Congo)"
+msgstr "френска — конгоанска"
 
 #: ../rules/base.xml.in.h:286
-msgid "Genius KKB-2050HS"
-msgstr "Genius KKB-2050HS"
+msgid "French (Dvorak)"
+msgstr "френска — Дворак"
 
 #: ../rules/base.xml.in.h:287
-msgid "Geo"
-msgstr "Гру"
+msgid "French (Guinea)"
+msgstr "френска — гвинейска"
 
 #: ../rules/base.xml.in.h:288
-msgid "Georgia"
-msgstr "грузинска"
+msgid "French (Macintosh)"
+msgstr "френска — за Макинтош"
 
 #: ../rules/base.xml.in.h:289
-msgid "Georgian"
-msgstr "грузинска"
+msgid "French (Mali, alternative)"
+msgstr "френска — малийска, алтернативна"
 
 #: ../rules/base.xml.in.h:290
-msgid "Georgian AZERTY Tskapo"
-msgstr "грузинска, цкапо azerty"
+msgid "French (Morocco)"
+msgstr "френска — мароканска"
 
 #: ../rules/base.xml.in.h:291
-msgid "German (Macintosh)"
-msgstr "немска (за Macintosh)"
+msgid "French (Sun dead keys)"
+msgstr "френска — с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:292
-msgid "German, Sun dead keys"
-msgstr "немска, с „мъртви“ клавиши на Sun"
+msgid "French (Switzerland)"
+msgstr "френска — швейцарска"
 
 #: ../rules/base.xml.in.h:293
-msgid "German, eliminate dead keys"
-msgstr "немска, без „мъртви“ клавиши"
+msgid "French (Switzerland, Macintosh)"
+msgstr "френска — швейцарска, за Макинтош"
 
 #: ../rules/base.xml.in.h:294
-msgid "Germany"
-msgstr "немска"
+msgid "French (Switzerland, Sun dead keys)"
+msgstr "френска — швейцарска, с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:295
-msgid "Gha"
-msgstr "Ган"
+msgid "French (Switzerland, eliminate dead keys)"
+msgstr "френска — швейцарска, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:296
-msgid "Ghana"
-msgstr "ганийска"
+msgid "French (alternative)"
+msgstr "френска — алтернативна"
 
 #: ../rules/base.xml.in.h:297
-msgid "Gin"
-msgstr "Гви"
+msgid "French (alternative, Sun dead keys)"
+msgstr "френска — алтернативна, с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:298
-msgid "Grc"
-msgstr "Грц"
+msgid "French (alternative, eliminate dead keys)"
+msgstr "френска — алтернативна, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:299
-msgid "Greece"
-msgstr "гръцка"
+msgid "French (alternative, latin-9 only)"
+msgstr "френска — алтернативна, само латиница по ISO 8859-9"
 
 #: ../rules/base.xml.in.h:300
-msgid "Guinea"
-msgstr "гвинейска"
+msgid "French (eliminate dead keys)"
+msgstr "френска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:301
-msgid "Gujarati"
-msgstr "гуджарати"
+msgid "French (legacy, alternative)"
+msgstr "френска — алтернативна, остаряла"
 
 #: ../rules/base.xml.in.h:302
-msgid "Gurmukhi"
-msgstr "гурмуки"
+msgid "French (legacy, alternative, Sun dead keys)"
+msgstr "френска — алтернативна, остаряла, с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:303
-msgid "Gurmukhi Jhelum"
-msgstr "гурмуки джелум"
+msgid "French (legacy, alternative, eliminate dead keys)"
+msgstr "френска — алтернативна, остаряла, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:304
-msgid "Gyration"
-msgstr "Gyration"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO laptop — за мобилен компютър"
 
 #: ../rules/base.xml.in.h:305
-msgid "HTC Dream"
-msgstr "HTC Dream"
+msgid "Fula"
+msgstr "фула"
 
 #: ../rules/base.xml.in.h:306
-msgid "Happy Hacking Keyboard"
-msgstr "Happy Hacking Keyboard (за весело хакерстване)"
+msgid "Ga"
+msgstr "га"
 
 #: ../rules/base.xml.in.h:307
-msgid "Happy Hacking Keyboard for Mac"
-msgstr "Happy Hacking Keyboard for Mac (за весело хакерстване)"
+msgid "Generic 101-key PC"
+msgstr "Стандартна клавиатура за PC със 101 клавиша"
 
 #: ../rules/base.xml.in.h:308
-msgid "Hausa"
-msgstr "хауска"
+msgid "Generic 102-key (Intl) PC"
+msgstr "Стандартна клавиатура за PC със 102 клавиша — международна"
 
 #: ../rules/base.xml.in.h:309
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet Keyboard (за Интернет)"
+msgid "Generic 104-key PC"
+msgstr "Стандартна клавиатура за PC със 104 клавиша"
 
 #: ../rules/base.xml.in.h:310
-msgid "Hewlett-Packard Mini 110 Notebook"
-msgstr "Hewlett-Packard Mini 110 Notebook (за мобилен компютър)"
+msgid "Generic 105-key (Intl) PC"
+msgstr "Стандартна клавиатура за PC със 105 клавиша — международна"
 
 #: ../rules/base.xml.in.h:311
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
 
 #: ../rules/base.xml.in.h:312
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
+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
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
 
 #: ../rules/base.xml.in.h:314
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
 
 #: ../rules/base.xml.in.h:315
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
 
 #: ../rules/base.xml.in.h:316
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
+msgid "Georgian"
+msgstr "грузинска"
 
 #: ../rules/base.xml.in.h:317
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "грузинска — azerty на Цкапо"
 
 #: ../rules/base.xml.in.h:318
-msgid "Hewlett-Packard Pavilion dv5"
-msgstr "Hewlett-Packard Pavilion dv5"
+msgid "Georgian (Italy)"
+msgstr "грузинска — италианска"
 
 #: ../rules/base.xml.in.h:319
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-250x Multimedia Keyboard (за мултимедия)"
+msgid "Georgian (MESS)"
+msgstr "грузинска — MESS"
 
 #: ../rules/base.xml.in.h:320
-msgid "Hewlett-Packard nx9020"
-msgstr "Hewlett-Packard nx9020"
+msgid "Georgian (ergonomic)"
+msgstr "грузинска — ергономична"
 
 #: ../rules/base.xml.in.h:321
-msgid "Hexadecimal"
-msgstr "шестнадесетична"
+msgid "German"
+msgstr "немска"
 
 #: ../rules/base.xml.in.h:322
-msgid "Hindi Bolnagri"
-msgstr "фонетична Болнагри за хинди"
+msgid "German (Austria)"
+msgstr "немска — австрийска"
 
 #: ../rules/base.xml.in.h:323
-msgid "Hindi Wx"
-msgstr "хинди Wx"
+msgid "German (Austria, Macintosh)"
+msgstr "немска — австрийска, за Макинтош"
 
 #: ../rules/base.xml.in.h:324
-msgid "Homophonic"
-msgstr "фонетична"
+msgid "German (Austria, Sun dead keys)"
+msgstr "немска — австрийска, с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:325
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
+msgid "German (Austria, eliminate dead keys)"
+msgstr "немска, австрийска, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:326
-msgid "Hrv"
-msgstr "Хър"
+msgid "German (Dvorak)"
+msgstr "немска — Дворак"
 
 #: ../rules/base.xml.in.h:327
-msgid "Htc Dream phone"
-msgstr "Телефон HTC Dream"
+msgid "German (Macintosh)"
+msgstr "немска — за Макинтош"
 
 #: ../rules/base.xml.in.h:328
-msgid "Hun"
-msgstr "Унг"
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "немска — за Макинтош, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:329
-msgid "Hungary"
-msgstr "унгарска"
+msgid "German (Neo 2)"
+msgstr "немска — Neo 2, добавени гръцки букви"
 
 #: ../rules/base.xml.in.h:330
-msgid "Hyper is mapped to Win-keys"
-msgstr "И двата Win-а са Hyper"
+msgid "German (Sun dead keys)"
+msgstr "немска — с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:331
-msgid "IBM (LST 1205-92)"
-msgstr "IBM (LST 1205-92)"
+msgid "German (Switzerland)"
+msgstr "немска — швейцарска"
 
 #: ../rules/base.xml.in.h:332
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
+msgid "German (Switzerland, Macintosh)"
+msgstr "немска — швейцарска, за Макинтош"
 
 #: ../rules/base.xml.in.h:333
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
+msgid "German (Switzerland, Sun dead keys)"
+msgstr "немска — швейцарска, с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:334
-msgid "IBM Space Saver"
-msgstr "IBM Space Saver"
+msgid "German (Switzerland, eliminate dead keys)"
+msgstr "немска — швейцарска, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:335
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+msgid "German (Switzerland, legacy)"
+msgstr "немска — швейцарска, остаряла"
 
 #: ../rules/base.xml.in.h:336
-msgid "IBM ThinkPad R60/T60/R61/T61"
-msgstr "IBM ThinkPad R60/T60/R61/T61"
+msgid "German (dead acute)"
+msgstr "немска — с „мъртво“ ударение"
 
 #: ../rules/base.xml.in.h:337
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgid "German (dead grave acute)"
+msgstr "немска — с „мъртво“ тежко ударение"
 
 #: ../rules/base.xml.in.h:338
-msgid "ISO Alternate"
-msgstr "ISO (алтернативна)"
+msgid "German (eliminate dead keys)"
+msgstr "немска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:339
-msgid "Iceland"
-msgstr "исландска"
+msgid "German (qwerty)"
+msgstr "немска — qwerty"
 
 #: ../rules/base.xml.in.h:340
-msgid "Igbo"
-msgstr "игбо"
+msgid "Greek"
+msgstr "гръцка"
 
 #: ../rules/base.xml.in.h:341
-msgid "Include dead tilde"
-msgstr "включване на „мъртва“ тилда"
+msgid "Greek (eliminate dead keys)"
+msgstr "гръцка — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:342
-msgid "Ind"
-msgstr "Инд"
+msgid "Greek (extended)"
+msgstr "гръцка — разширена"
 
 #: ../rules/base.xml.in.h:343
-msgid "India"
-msgstr "индийска"
+msgid "Greek (polytonic)"
+msgstr "гръцка — политонална"
 
 #: ../rules/base.xml.in.h:344
-msgid "International (AltGr dead keys)"
-msgstr "международна, с „мъртви“ клавиши чрез AltGr"
+msgid "Greek (simple)"
+msgstr "гръцка — опростена"
 
 #: ../rules/base.xml.in.h:345
-msgid "International (with dead keys)"
-msgstr "международна, с „мъртви“ клавиши"
+msgid "Gujarati"
+msgstr "гуджарати"
 
 #: ../rules/base.xml.in.h:346
-msgid "Inuktitut"
-msgstr "ескимоска"
+msgid "Gyration"
+msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:347 ../rules/base.extras.xml.in.h:8
-msgid "Iran"
-msgstr "иранска"
+#: ../rules/base.xml.in.h:347
+msgid "HTC Dream"
+msgstr "HTC Dream"
 
 #: ../rules/base.xml.in.h:348
-msgid "Iraq"
-msgstr "иракска"
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking Keyboard — за весело хакерстване"
 
 #: ../rules/base.xml.in.h:349
-msgid "Ireland"
-msgstr "ирландска"
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking Keyboard for Mac — за весело хакерстване"
 
 #: ../rules/base.xml.in.h:350
-msgid "Irl"
-msgstr "Ирл"
+msgid "Hausa"
+msgstr "хауска"
 
 #: ../rules/base.xml.in.h:351
-msgid "Irn"
-msgstr "Ирн"
+msgid "Hebrew"
+msgstr "иврит"
 
 #: ../rules/base.xml.in.h:352
-msgid "Irq"
-msgstr "Ирк"
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "иврит — библейска, Тиро"
 
 #: ../rules/base.xml.in.h:353
-msgid "Isl"
-msgstr "Исл"
+msgid "Hebrew (lyx)"
+msgstr "иврит — LyX"
 
 #: ../rules/base.xml.in.h:354
-msgid "Isr"
-msgstr "Изр"
+msgid "Hebrew (phonetic)"
+msgstr "иврит — фонетична"
 
 #: ../rules/base.xml.in.h:355
-msgid "Israel"
-msgstr "израелска"
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard — за Интернет"
 
 #: ../rules/base.xml.in.h:356
-msgid "Ita"
-msgstr "Ита"
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook — за мобилен компютър"
 
 #: ../rules/base.xml.in.h:357
-msgid "Italy"
-msgstr "италианска"
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
 
 #: ../rules/base.xml.in.h:358
-msgid "Japan"
-msgstr "японска"
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
 
 #: ../rules/base.xml.in.h:359
-msgid "Japan (PC-98xx Series)"
-msgstr "японска, серии PC-98xx"
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
 
 #: ../rules/base.xml.in.h:360
-msgid "Japanese keyboard options"
-msgstr "Настройки за японска клавиатура"
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
 
 #: ../rules/base.xml.in.h:361
-msgid "Jpn"
-msgstr "Япо"
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
 
 #: ../rules/base.xml.in.h:362
-msgid "Kalmyk"
-msgstr "калмишка"
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
 
 #: ../rules/base.xml.in.h:363
-msgid "Kana"
-msgstr "японска сричкова (кана)"
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
 
 #: ../rules/base.xml.in.h:364
-msgid "Kana 86"
-msgstr "японска сричкова (кана) 86"
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
 
 #: ../rules/base.xml.in.h:365
-msgid "Kana Lock key is locking"
-msgstr "Клавишът Lock на кана заключва"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia Keyboard — за мултимедия"
 
 #: ../rules/base.xml.in.h:366
-msgid "Kannada"
-msgstr "канареска"
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
 
 #: ../rules/base.xml.in.h:367
-msgid "Kashubian"
-msgstr "кашубска"
+msgid "Hexadecimal"
+msgstr "шестнадесетична"
 
 #: ../rules/base.xml.in.h:368
-msgid "Kaz"
-msgstr "Каз"
+msgid "Hindi (Bolnagri)"
+msgstr "хинди — Болнагри"
 
 #: ../rules/base.xml.in.h:369
-msgid "Kazakh with Russian"
-msgstr "казахска с руски букви"
+msgid "Hindi (Wx)"
+msgstr "хинди — Wx"
 
 #: ../rules/base.xml.in.h:370
-msgid "Kazakhstan"
-msgstr "казахска"
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
 
 #: ../rules/base.xml.in.h:371
-msgid "Ken"
-msgstr "Кен"
+msgid "Htc Dream phone"
+msgstr "Телефон HTC Dream"
 
 #: ../rules/base.xml.in.h:372
-msgid "Kenya"
-msgstr "кенийска"
+msgid "Hungarian"
+msgstr "унгарска"
 
 #: ../rules/base.xml.in.h:373
-msgid "Key sequence to kill the X server"
-msgstr "Клавишна комбинация за убиването на X сървъра"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr "унгарска — 101 клавиша, qwerty, „,“, с „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:374
-msgid "Key to choose 3rd level"
-msgstr "Клавиш за избор третото ниво"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr "унгарска — 101 клавиша, qwerty, „,“, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:375
-msgid "Key to choose 5th level"
-msgstr "Клавиш за избор петото ниво"
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr "унгарска — 101 клавиша, qwerty, „.“, с „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:376
-msgid "Key(s) to change layout"
-msgstr "Клавиш(и) за смяна на подредбата"
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr "унгарска — 101 клавиша, qwerty, „.“, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:377
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
+msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgstr "унгарска — 101 клавиша, qwertz, „,“, с „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:378
-msgid "Kgz"
-msgstr "Крг"
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr "унгарска — 101 клавиша, qwertz, „,“, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:379
-msgid "Khm"
-msgstr "Кам"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgstr "унгарска — 101 клавиша, qwertz, „.“, с „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:380
-msgid "Kikuyu"
-msgstr "кикуйска"
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr "унгарска — 101 клавиша, qwertz, „.“, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:381
-msgid "Kinesis"
-msgstr "Кинезис"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgstr "унгарска — 102 клавиша, qwerty, „,“, с „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:382
-msgid "Komi"
-msgstr "комска"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgstr "унгарска — 102 клавиша, qwerty, „,“, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:383
-msgid "Kor"
-msgstr "Кор"
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr "унгарска — 102 клавиша, qwerty, „.“, с „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:384
-msgid "Korea, Republic of"
-msgstr "корейска (Република Корея)"
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgstr "унгарска — 102 клавиша, qwerty, „.“, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:385
-msgid "Ktunaxa"
-msgstr "ктунакса"
+msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgstr "унгарска — 102 клавиша, qwertz, „,“, с „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:386
-msgid "Kurdish, (F)"
-msgstr "кюрдска (F)"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgstr "унгарска — 102 клавиша, qwertz, „,“, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:387
-msgid "Kurdish, Arabic-Latin"
-msgstr "кюрдска, арабски и латински букви"
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr "унгарска — 102 клавиша, qwertz, „.“, с „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:388
-msgid "Kurdish, Latin Alt-Q"
-msgstr "кюрдска, латинско Alt-Q"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr "унгарска — 102 клавиша, qwertz, „.“, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:389
-msgid "Kurdish, Latin Q"
-msgstr "кюрдска, латинско Q"
+msgid "Hungarian (eliminate dead keys)"
+msgstr "унгарска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:390
-msgid "Kyrgyzstan"
-msgstr "киргистанска"
+msgid "Hungarian (qwerty)"
+msgstr "унгарска — qwerty"
 
 #: ../rules/base.xml.in.h:391
-msgid "LEKP"
-msgstr "LEKP"
+msgid "Hungarian (standard)"
+msgstr "унгарска — стандартна"
 
 #: ../rules/base.xml.in.h:392
-msgid "LEKPa"
-msgstr "LEKPa"
+msgid "Hyper is mapped to Win-keys"
+msgstr "И двата Win-а са Hyper"
 
 #: ../rules/base.xml.in.h:393
-msgid "Lao"
-msgstr "Лао"
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
 
 #: ../rules/base.xml.in.h:394
-msgid "Laos"
-msgstr "лаоска"
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
 
 #: ../rules/base.xml.in.h:395
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Laptop/notebook Compaq Laptop Keyboard (за мобилен компютър, напр. Armada)"
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
 
 #: ../rules/base.xml.in.h:396
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Laptop/notebook Compaq Internet Keyboard (за мобилен компютър, напр. Presario, и Интернет)"
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:397
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "Laptop/notebook eMachines m68xx (за мобилен компютър)"
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
 
 #: ../rules/base.xml.in.h:398
-msgid "Latin"
-msgstr "латинска"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
 #: ../rules/base.xml.in.h:399
-msgid "Latin American"
-msgstr "латиноамериканска"
+msgid "Icelandic"
+msgstr "исландска"
 
 #: ../rules/base.xml.in.h:400
-msgid "Latin Unicode"
-msgstr "латинска за Уникод"
+msgid "Icelandic (Dvorak)"
+msgstr "исландска — Дворак"
 
 #: ../rules/base.xml.in.h:401
-msgid "Latin Unicode qwerty"
-msgstr "латинска за Уникод (qwerty)"
+msgid "Icelandic (Macintosh)"
+msgstr "исландска — за Макинтош"
 
 #: ../rules/base.xml.in.h:402
-msgid "Latin qwerty"
-msgstr "латинска (qwerty)"
+msgid "Icelandic (Sun dead keys)"
+msgstr "исландска — с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:403
-msgid "Latin unicode"
-msgstr "латинска за Уникод"
+msgid "Icelandic (eliminate dead keys)"
+msgstr "исландска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:404
-msgid "Latin unicode qwerty"
-msgstr "латинска за Уникод, qwerty"
+msgid "Igbo"
+msgstr "игбо"
 
 #: ../rules/base.xml.in.h:405
-msgid "Latin with guillemets"
-msgstr "латинска с френски кавички"
+msgid "Indian"
+msgstr "индийска"
 
 #: ../rules/base.xml.in.h:406
-msgid "Latvia"
-msgstr "латвийска"
+msgid "Inuktitut"
+msgstr "ескимоска"
 
 #: ../rules/base.xml.in.h:407
-msgid "Layout toggle on multiply/divide key"
-msgstr "Смяна на подредбата при натискане на умножение/деление"
+msgid "Iraqi"
+msgstr "иракска"
 
 #: ../rules/base.xml.in.h:408
-msgid "Left Alt"
-msgstr "Левият Alt"
+msgid "Irish"
+msgstr "ирландска"
 
 #: ../rules/base.xml.in.h:409
-msgid "Left Alt (while pressed)"
-msgstr "Левият Alt (докато е натиснат)"
+msgid "Irish (UnicodeExpert)"
+msgstr "ирландска — експертна за Уникод"
 
 #: ../rules/base.xml.in.h:410
-msgid "Left Alt is swapped with Left Win"
-msgstr "Левият Alt е разменен с левия Win"
+msgid "Italian"
+msgstr "италианска"
 
 #: ../rules/base.xml.in.h:411
-msgid "Left Ctrl"
-msgstr "Левият Ctrl"
+msgid "Italian (Macintosh)"
+msgstr "италианска — за Макинтош"
 
 #: ../rules/base.xml.in.h:412
-msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
-msgstr "Левият Ctrl (към първата подредба), десният Ctrl (към последната)"
+msgid "Italian (US keyboard with Italian letters)"
+msgstr "италианска — американска с италиански букви"
 
 #: ../rules/base.xml.in.h:413
-msgid "Left Ctrl+Left Shift"
-msgstr "Левият Ctrl+левият Shift"
+msgid "Italian (eliminate dead keys)"
+msgstr "италианска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:414
-msgid "Left Shift"
-msgstr "Левият Shift"
+msgid "Japanese"
+msgstr "японска"
 
 #: ../rules/base.xml.in.h:415
-msgid "Left Win"
-msgstr "Левият Win"
+msgid "Japanese (Kana 86)"
+msgstr "японска — кана 86"
 
 #: ../rules/base.xml.in.h:416
-msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
-msgstr "CapsLock (към първата подредба), десният Win/Menu (към последната)"
+msgid "Japanese (Kana)"
+msgstr "японска — кана"
 
 #: ../rules/base.xml.in.h:417
-msgid "Left Win (while pressed)"
-msgstr "Левият Win (докато е натиснат)"
+msgid "Japanese (Macintosh)"
+msgstr "японска — за Макинтош"
 
 #: ../rules/base.xml.in.h:418
-msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Левият Win избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
+msgid "Japanese (OADG 109A)"
+msgstr "японска — OADG 109A"
 
 #: ../rules/base.xml.in.h:419
-msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "Левият Win избира петото ниво, заключва го заедно с друг клавиш за пето ниво и го отключва при единично натискане"
+msgid "Japanese (PC-98xx Series)"
+msgstr "японска — серии PC-98xx"
 
 #: ../rules/base.xml.in.h:420
-msgid "Left hand"
-msgstr "за левичари"
+msgid "Japanese keyboard options"
+msgstr "Настройки за японска клавиатура"
 
 #: ../rules/base.xml.in.h:421
-msgid "Left handed Dvorak"
-msgstr "Дворак за левичари"
+msgid "Kalmyk"
+msgstr "калмикска"
 
 #: ../rules/base.xml.in.h:422
-msgid "Legacy"
-msgstr "остаряла"
+msgid "Kana Lock key is locking"
+msgstr "Клавишът Lock на кана заключва"
 
 #: ../rules/base.xml.in.h:423
-msgid "Legacy Wang 724"
-msgstr "Остаряла Wang 724"
+msgid "Kannada"
+msgstr "канареска"
+
+#: ../rules/base.xml.in.h:424
+msgid "Kashubian"
+msgstr "кашубска"
 
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:425
-msgid "Legacy key with comma"
-msgstr "Остарял клавиш с десетична запетая"
+msgid "Kazakh"
+msgstr "казахска"
 
 #: ../rules/base.xml.in.h:426
-msgid "Legacy key with dot"
-msgstr "Остарял клавиш с десетична точка"
+msgid "Kazakh (with Russian)"
+msgstr "казахска с руски букви"
 
 #: ../rules/base.xml.in.h:427
-msgid "Lithuania"
-msgstr "литовска"
+msgid "Key sequence to kill the X server"
+msgstr "Клавишна комбинация за убиването на X сървъра"
 
 #: ../rules/base.xml.in.h:428
-msgid "Lka"
-msgstr "ШрЛ"
+msgid "Key to choose 3rd level"
+msgstr "Клавиш за избор третото ниво"
 
 #: ../rules/base.xml.in.h:429
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Keyboard"
+msgid "Key to choose 5th level"
+msgstr "Клавиш за избор петото ниво"
 
 #: ../rules/base.xml.in.h:430
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop (безжична)"
+msgid "Key(s) to change layout"
+msgstr "Клавиш(и) за смяна на подредбата"
 
 #: ../rules/base.xml.in.h:431
-msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "Logitech Cordless Desktop (алтернативен вариант)"
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
 
 #: ../rules/base.xml.in.h:432
-msgid "Logitech Cordless Desktop EX110"
-msgstr "Logitech Cordless Desktop EX110"
+msgid "Khmer (Cambodia)"
+msgstr "кхмерска — камбоджанска"
 
 #: ../rules/base.xml.in.h:433
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300 (безжична)"
+msgid "Kikuyu"
+msgstr "кикуйска"
 
 #: ../rules/base.xml.in.h:434
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator (безжична)"
+msgid "Kinesis"
+msgstr "Кинезис"
 
 #: ../rules/base.xml.in.h:435
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical (оптична)"
+msgid "Komi"
+msgstr "комска"
 
 #: ../rules/base.xml.in.h:436
-msgid "Logitech Cordless Desktop Pro (alternate option 2)"
-msgstr "Logitech Cordless Desktop Pro (алтернативен вариант 2)"
+msgid "Korean"
+msgstr "корейска"
 
 #: ../rules/base.xml.in.h:437
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch (безжична)"
+msgid "Korean (101/104 key compatible)"
+msgstr "корейска — съвместима със 101/104 клавиша"
 
 #: ../rules/base.xml.in.h:438
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator (безжична)"
+msgid "Kurdish (Iran, Arabic-Latin)"
+msgstr "кюрдска — иранска, арабски и латински букви"
 
 #: ../rules/base.xml.in.h:439
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15, допълнителни клавиши чрез G15daemon"
+msgid "Kurdish (Iran, F)"
+msgstr "кюрдска — иранска, „F“ горе-вляво"
 
 #: ../rules/base.xml.in.h:440
-msgid "Logitech Generic Keyboard"
-msgstr "Logitech Generic Keyboard (стандартна)"
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "кюрдска — иранска, латиница, „Q“ горе-вляво, алтернативна"
 
 #: ../rules/base.xml.in.h:441
-msgid "Logitech Internet 350 Keyboard"
-msgstr "Logitech Internet 350 Keyboard (за Интернет)"
+msgid "Kurdish (Iran, Latin Q)"
+msgstr "кюрдска — иранска, латиница, „Q“ горе-вляво"
 
 #: ../rules/base.xml.in.h:442
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Keyboard (за Интернет)"
+msgid "Kurdish (Iraq, Arabic-Latin)"
+msgstr "кюрдска — иракска, арабски и латински букви"
 
 #: ../rules/base.xml.in.h:443
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator Keyboard (за Интернет)"
+msgid "Kurdish (Iraq, F)"
+msgstr "кюрдска — иракска, „F“ горе-вляво"
 
 #: ../rules/base.xml.in.h:444
-msgid "Logitech Media Elite Keyboard"
-msgstr "Logitech Media Elite Keyboard"
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr "кюрдска — иракска, латиница, „Q“ горе-вляво, алтернативна"
 
 #: ../rules/base.xml.in.h:445
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
-msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard (безжична, за мултимедия)"
+msgid "Kurdish (Iraq, Latin Q)"
+msgstr "кюрдска — иракска, латиница, „Q“ горе-вляво"
 
 #: ../rules/base.xml.in.h:446
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X Keyboard"
+msgid "Kurdish (Syria, F)"
+msgstr "кюрдска — сирийска, „F“ горе-вляво"
 
 #: ../rules/base.xml.in.h:447
-msgid "Logitech diNovo Edge Keyboard"
-msgstr "Logitech diNovo Edge Keyboard"
+msgid "Kurdish (Syria, Latin Alt-Q)"
+msgstr "кюрдска — сирийска, латиница, „Q“ горе-вляво, алтернативна"
 
 #: ../rules/base.xml.in.h:448
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech diNovo Keyboard"
+msgid "Kurdish (Syria, Latin Q)"
+msgstr "кюрдска — сирийска, латиница, „Q“ горе-вляво"
 
 #: ../rules/base.xml.in.h:449
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
+msgid "Kurdish (Turkey, F)"
+msgstr "кюрдска — турска, „F“ горе-вляво"
 
 #: ../rules/base.xml.in.h:450
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6) (безжична)"
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr "кюрдска — турска, латиница, „Q“ горе-вляво, алтернативна"
 
 #: ../rules/base.xml.in.h:451
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE (за Интернет)"
+msgid "Kurdish (Turkey, Latin Q)"
+msgstr "кюрдска — турска, латиница, „Q“ горе-вляво"
 
 #: ../rules/base.xml.in.h:452
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB) (за Интернет)"
+msgid "Kyrgyz"
+msgstr "киргистанска"
 
 #: ../rules/base.xml.in.h:453
-msgid "Lower Sorbian"
-msgstr "долно сорбска"
+msgid "Kyrgyz (phonetic)"
+msgstr "киргистанска — фонетична"
 
 #: ../rules/base.xml.in.h:454
-msgid "Lower Sorbian (qwertz)"
-msgstr "долно сорбска (qwertz)"
+msgid "Lao"
+msgstr "лаоска"
 
 #: ../rules/base.xml.in.h:455
-msgid "Ltu"
-msgstr "Лит"
+msgid "Lao (STEA proposed standard layout)"
+msgstr "лаоска — стандартна подредба по STEA"
 
 #: ../rules/base.xml.in.h:456
-msgid "Lva"
-msgstr "Лат"
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr ""
+"Laptop/notebook Compaq Laptop Keyboard — за мобилен компютър, напр. Armada"
 
 #: ../rules/base.xml.in.h:457
-msgid "MESS"
-msgstr "MESS"
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr ""
+"Laptop/notebook Compaq Internet Keyboard — за мобилен компютър, напр. "
+"Presario, и Интернет"
 
 #: ../rules/base.xml.in.h:458
-msgid "MNE"
-msgstr "Чгр"
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx — за мобилен компютър"
 
-#: ../rules/base.xml.in.h:459
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+msgid "Latvian"
+msgstr "латвийска"
 
 #: ../rules/base.xml.in.h:460
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (международна)"
+msgid "Latvian (F variant)"
+msgstr "латвийска — с „F“"
 
 #: ../rules/base.xml.in.h:461
-msgid "Macedonia"
-msgstr "македонска"
+msgid "Latvian (adapted)"
+msgstr "латвийска — адаптирана"
 
 #: ../rules/base.xml.in.h:462
-msgid "Macintosh"
-msgstr "Macintosh"
+msgid "Latvian (apostrophe variant)"
+msgstr "латвийска — с „'“"
 
 #: ../rules/base.xml.in.h:463
-msgid "Macintosh (International)"
-msgstr "Macintosh (международна)"
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "латвийска — ергономична, ūgjrmv"
 
 #: ../rules/base.xml.in.h:464
-msgid "Macintosh Old"
-msgstr "Macintosh Old (стар вариант)"
+msgid "Latvian (modern)"
+msgstr "латвийска — модерна"
 
 #: ../rules/base.xml.in.h:465
-msgid "Macintosh, Sun dead keys"
-msgstr "Macintosh, с „мъртви“ клавиши на Sun"
+msgid "Latvian (tilde variant)"
+msgstr "латвийска — с „~“"
 
 #: ../rules/base.xml.in.h:466
-msgid "Macintosh, eliminate dead keys"
-msgstr "Macintosh, без „мъртви“ клавиши"
+msgid "Left Alt"
+msgstr "Левият Alt"
 
 #: ../rules/base.xml.in.h:467
-msgid "Make Caps Lock an additional Backspace"
-msgstr "Caps Lock е допълнителен Backspace"
+msgid "Left Alt (while pressed)"
+msgstr "Левият Alt (докато е натиснат)"
 
 #: ../rules/base.xml.in.h:468
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Caps Lock е допълнителен Ctrl"
+msgid "Left Alt is swapped with Left Win"
+msgstr "Левият Alt е разменен с левия Win"
 
 #: ../rules/base.xml.in.h:469
-msgid "Make Caps Lock an additional ESC"
-msgstr "Caps Lock е допълнителен Esc"
+msgid "Left Ctrl"
+msgstr "Левият Ctrl"
 
 #: ../rules/base.xml.in.h:470
-msgid "Make Caps Lock an additional Hyper"
-msgstr "Caps Lock е допълнителен Hyper"
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Левият Ctrl (към първата подредба), десният Ctrl (към последната)"
 
 #: ../rules/base.xml.in.h:471
-msgid "Make Caps Lock an additional Num Lock"
-msgstr "Caps Lock е допълнителен Num Lock"
+msgid "Left Ctrl+Left Shift"
+msgstr "Левият Ctrl+левият Shift"
 
 #: ../rules/base.xml.in.h:472
-msgid "Make Caps Lock an additional Super"
-msgstr "Caps Lock е допълнителен Super"
+msgid "Left Shift"
+msgstr "Левият Shift"
 
 #: ../rules/base.xml.in.h:473
-msgid "Malayalam"
-msgstr "малаяламска"
+msgid "Left Win"
+msgstr "Левият Win"
 
 #: ../rules/base.xml.in.h:474
-msgid "Malayalam Lalitha"
-msgstr "малаяламска лалита"
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Левият Win (към първата подредба), десният Win/Menu (към последната)"
 
 #: ../rules/base.xml.in.h:475
-msgid "Maldives"
-msgstr "малдивска"
+msgid "Left Win (while pressed)"
+msgstr "Левият Win (докато е натиснат)"
 
 #: ../rules/base.xml.in.h:476
-msgid "Mali"
-msgstr "малийска"
+msgid ""
+"Left Win chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser"
+msgstr ""
+"Левият Win избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
 
 #: ../rules/base.xml.in.h:477
-msgid "Malta"
-msgstr "малтийска"
+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
-msgid "Maltese keyboard with US layout"
-msgstr "малтийска с американска подредба"
+msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
+msgstr ""
+"Левият Ctrl+левият Win (към първата подредба), десният Ctrl+Menu (към "
+"последната)"
 
 #: ../rules/base.xml.in.h:479
-msgid "Mao"
-msgstr "Мао"
+msgid "Legacy"
+msgstr "остаряла"
 
 #: ../rules/base.xml.in.h:480
-msgid "Maori"
-msgstr "маорска"
-
-#: ../rules/base.xml.in.h:481
-msgid "Mari"
-msgstr "марийска"
+msgid "Legacy Wang 724"
+msgstr "Остаряла Wang 724"
 
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:482
-msgid "Mdv"
-msgstr "Мдв"
+msgid "Legacy key with comma"
+msgstr "Остарял клавиш с десетична запетая"
 
 #: ../rules/base.xml.in.h:483
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
+msgid "Legacy key with dot"
+msgstr "Остарял клавиш с десетична точка"
 
-#: ../rules/base.xml.in.h:484
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access Keyboard (за лесен достъп)"
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian"
+msgstr "литовска"
 
 #: ../rules/base.xml.in.h:485
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
+msgid "Lithuanian (IBM LST 1205-92)"
+msgstr "литовска — IBM LST 1205-92"
 
 #: ../rules/base.xml.in.h:486
-msgid "Menu"
-msgstr "Menu"
+msgid "Lithuanian (LEKP)"
+msgstr "литовска — LEKP"
 
 #: ../rules/base.xml.in.h:487
-msgid "Meta is mapped to Left Win"
-msgstr "Левият Win е Meta"
+msgid "Lithuanian (LEKPa)"
+msgstr "литовска — LEKPa"
 
 #: ../rules/base.xml.in.h:488
-msgid "Meta is mapped to Win keys"
-msgstr "И двата Win-а са Meta"
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgstr "литовска — американска с литовски букви"
 
 #: ../rules/base.xml.in.h:489
-msgid "Meta on Left Ctrl"
-msgstr "Левият Ctrl отговаря на Meta"
+msgid "Lithuanian (standard)"
+msgstr "литовска — стандартна"
 
 #: ../rules/base.xml.in.h:490
-msgid "Microsoft Comfort Curve Keyboard 2000"
-msgstr "Microsoft Comfort Curve Keyboard 2000"
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
 
 #: ../rules/base.xml.in.h:491
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internet Keyboard (за Интернет)"
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop — безжична"
 
 #: ../rules/base.xml.in.h:492
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, Swedish (за Интернет, шведска)"
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop — алтернативен вариант"
 
 #: ../rules/base.xml.in.h:493
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
 
 #: ../rules/base.xml.in.h:494
-msgid "Microsoft Natural Keyboard Elite"
-msgstr "Microsoft Natural Keyboard Elite"
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300 — безжична"
 
 #: ../rules/base.xml.in.h:495
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro/Microsoft Internet Keyboard Pro (за Интернет)"
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator — безжична"
 
 #: ../rules/base.xml.in.h:496
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical — оптична"
 
 #: ../rules/base.xml.in.h:497
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB/Microsoft Internet Keyboard Pro (за Интернет)"
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro — алтернативен вариант 2"
 
 #: ../rules/base.xml.in.h:498
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000 (безжична, ергономична)"
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch — безжична"
 
 #: ../rules/base.xml.in.h:499
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office Keyboard (за офиса)"
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator — безжична"
 
 #: ../rules/base.xml.in.h:500
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Wireless Multimedia Keyboard 1.0A (безжична, за мултимедия)"
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15, допълнителни клавиши чрез G15daemon"
 
 #: ../rules/base.xml.in.h:501
-msgid "Miscellaneous compatibility options"
-msgstr "Разни настройки за съвместимост"
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Generic Keyboard — стандартна"
 
 #: ../rules/base.xml.in.h:502
-msgid "Mkd"
-msgstr "Мак"
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard — за Интернет"
 
 #: ../rules/base.xml.in.h:503
-msgid "Mli"
-msgstr "Мли"
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard — за Интернет"
 
 #: ../rules/base.xml.in.h:504
-msgid "Mlt"
-msgstr "Мал"
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard — за Интернет"
 
 #: ../rules/base.xml.in.h:505
-msgid "Mmr"
-msgstr "Миа"
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
 
 #: ../rules/base.xml.in.h:506
-msgid "Mng"
-msgstr "Мон"
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr ""
+"Logitech Ultra-X Cordless Media Desktop Keyboard — безжична, за мултимедия"
 
 #: ../rules/base.xml.in.h:507
-msgid "Mongolia"
-msgstr "монголска"
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
 
 #: ../rules/base.xml.in.h:508
-msgid "Montenegro"
-msgstr "черногорска"
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
 
 #: ../rules/base.xml.in.h:509
-msgid "Morocco"
-msgstr "мароканска"
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
 
 #: ../rules/base.xml.in.h:510
-msgid "Multilingual"
-msgstr "многоезична"
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
 
 #: ../rules/base.xml.in.h:511
-msgid "Multilingual, first part"
-msgstr "многоезична, първа част"
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard — model Y-RB6, безжична"
 
 #: ../rules/base.xml.in.h:512
-msgid "Multilingual, second part"
-msgstr "многоезична, втора част"
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE — за Интернет"
 
 #: ../rules/base.xml.in.h:513
-msgid "Myanmar"
-msgstr "мианмарска"
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE — USB, за Интернет"
 
 #: ../rules/base.xml.in.h:514
-msgid "NICOLA-F style Backspace"
-msgstr "Backspace на мястото определено от подредбата NICOLA-F"
+msgid "Lower Sorbian"
+msgstr "долно сорбска"
 
 #: ../rules/base.xml.in.h:515
-msgid "NLA"
-msgstr "NLA"
+msgid "Lower Sorbian (qwertz)"
+msgstr "долно сорбска — qwertz"
 
 #: ../rules/base.xml.in.h:516
-msgid "Nativo"
-msgstr "нативна"
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
 
 #: ../rules/base.xml.in.h:517
-msgid "Nativo for Esperanto"
-msgstr "нативна за есперанто"
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro — международна"
 
 #: ../rules/base.xml.in.h:518
-msgid "Nativo for USA keyboards"
-msgstr "нативна за САЩ"
+msgid "Macedonian"
+msgstr "македонска"
 
 #: ../rules/base.xml.in.h:519
-msgid "Neo 2"
-msgstr "Neo 2"
+msgid "Macedonian (eliminate dead keys)"
+msgstr "македонска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:520
-msgid "Nepal"
-msgstr "непалска"
+msgid "Macintosh"
+msgstr "Macintosh"
 
 #: ../rules/base.xml.in.h:521
-msgid "Netherlands"
-msgstr "холандска"
+msgid "Macintosh Old"
+msgstr "Macintosh Old — стар вариант"
 
 #: ../rules/base.xml.in.h:522
-msgid "New phonetic"
-msgstr "фонетична, нова"
+msgid "Make Caps Lock an additional Backspace"
+msgstr "Caps Lock е допълнителен Backspace"
 
 #: ../rules/base.xml.in.h:523
-msgid "Nga"
-msgstr "Ниг"
+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 "Nigeria"
-msgstr "нигерийска"
+msgid "Make Caps Lock an additional Ctrl"
+msgstr "Caps Lock е допълнителен Ctrl"
 
 #: ../rules/base.xml.in.h:525
-msgid "Nld"
-msgstr "Хол"
+msgid "Make Caps Lock an additional ESC"
+msgstr "Caps Lock е допълнителен Esc"
 
 #: ../rules/base.xml.in.h:526
-msgid "Non-breakable space character at fourth level"
-msgstr "Интервал без разделяне на четвърто ниво"
+msgid "Make Caps Lock an additional Hyper"
+msgstr "Caps Lock е допълнителен Hyper"
 
 #: ../rules/base.xml.in.h:527
-msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Интервал без разделяне на четвърто ниво и тесен интервал без разделяне на шесто ниво"
+msgid "Make Caps Lock an additional Num Lock"
+msgstr "Caps Lock е допълнителен Num Lock"
 
 #: ../rules/base.xml.in.h:528
-msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
-msgstr "Интервал без разделяне на четвърто ниво и тесен интервал без разделяне на шесто ниво (с Ctrl+Shift)"
+msgid "Make Caps Lock an additional Super"
+msgstr "Caps Lock е допълнителен Super"
 
 #: ../rules/base.xml.in.h:529
-msgid "Non-breakable space character at second level"
-msgstr "Интервал без разделяне на второ ниво"
+msgid "Malayalam"
+msgstr "малаяламска"
 
 #: ../rules/base.xml.in.h:530
-msgid "Non-breakable space character at third level"
-msgstr "Интервал без разделяне на трето ниво"
+msgid "Malayalam (Lalitha)"
+msgstr "малаяламска — лалита"
 
 #: ../rules/base.xml.in.h:531
-msgid "Non-breakable space character at third level, nothing at fourth level"
-msgstr "Интервал без разделяне на трето ниво и нищо на четвърто ниво"
+msgid "Malayalam (enhanced Inscript with Rupee Sign)"
+msgstr "малаяламска — разширена писменост с „₨“"
 
 #: ../rules/base.xml.in.h:532
-msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Интервал без разделяне на трето ниво и тесен интервал без разделяне на четвърто ниво"
+msgid "Maltese"
+msgstr "малтийска"
 
 #: ../rules/base.xml.in.h:533
-msgid "Nor"
-msgstr "Нор"
+msgid "Maltese (with US layout)"
+msgstr "малтийска — американска подредба"
 
 #: ../rules/base.xml.in.h:534
-msgid "Northern Saami"
-msgstr "северносамска (Норвегия)"
+msgid "Maori"
+msgstr "маорска"
 
 #: ../rules/base.xml.in.h:535
-msgid "Northern Saami, eliminate dead keys"
-msgstr "северносамска, без „мъртви“ клавиши"
+msgid "Mari"
+msgstr "марийска"
 
 #: ../rules/base.xml.in.h:536
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
 
 #: ../rules/base.xml.in.h:537
-msgid "Norway"
-msgstr "норвежка"
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard — за лесен достъп"
 
 #: ../rules/base.xml.in.h:538
-msgid "Npl"
-msgstr "Нпл"
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
 
 #: ../rules/base.xml.in.h:539
-msgid "Num Lock"
-msgstr "Num Lock"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../rules/base.xml.in.h:540
-msgid "Numeric keypad delete key behaviour"
-msgstr "Поведение на клавиша за триене на цифровата клавиатура"
+msgid "Meta is mapped to Left Win"
+msgstr "Левият Win е Meta"
 
 #: ../rules/base.xml.in.h:541
-msgid "Numeric keypad keys work as with Mac"
-msgstr "Цифровата клавиатура функционира като в Macintosh"
+msgid "Meta is mapped to Win keys"
+msgstr "И двата Win-а са Meta"
 
 #: ../rules/base.xml.in.h:542
-msgid "Numeric keypad layout selection"
-msgstr "Избор на подредбата на цифровата клавиатура"
+msgid "Meta on Left Ctrl"
+msgstr "Левият Ctrl отговаря на Meta"
 
 #: ../rules/base.xml.in.h:543
-msgid "OADG 109A"
-msgstr "OADG 109A"
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
 
 #: ../rules/base.xml.in.h:544
-msgid "OLPC"
-msgstr "OLPC"
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard — за Интернет"
 
 #: ../rules/base.xml.in.h:545
-msgid "OLPC Dari"
-msgstr "дарийска за OLPC (фарси)"
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Swedish — за Интернет, шведска"
 
 #: ../rules/base.xml.in.h:546
-msgid "OLPC Pashto"
-msgstr "пащунска за OLPC"
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
 
 #: ../rules/base.xml.in.h:547
-msgid "OLPC Southern Uzbek"
-msgstr "южно узбекска за OLPC"
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
 
 #: ../rules/base.xml.in.h:548
-msgid "Occitan"
-msgstr "провансалска"
+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 "Ogham"
-msgstr "огамска"
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
 
 #: ../rules/base.xml.in.h:550
-msgid "Ogham IS434"
-msgstr "огамска IS434"
+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 "Oriya"
-msgstr "орийска"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgstr ""
+"Microsoft Natural Wireless Ergonomic Keyboard 4000 — безжична, ергономична"
 
 #: ../rules/base.xml.in.h:552
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Ortek MCK-800 MM/Internet keyboard (за Интернет)"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr ""
+"Microsoft Natural Wireless Ergonomic Keyboard 7000 — безжична, ергономична"
 
 #: ../rules/base.xml.in.h:553
-msgid "Ossetian"
-msgstr "осетинска"
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard — за офиса"
 
 #: ../rules/base.xml.in.h:554
-msgid "Ossetian, Winkeys"
-msgstr "осетинска, клавиши Win"
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A — безжична, за мултимедия"
 
 #: ../rules/base.xml.in.h:555
-msgid "Ossetian, legacy"
-msgstr "осетинска, остаряла"
+msgid "Miscellaneous compatibility options"
+msgstr "Разни настройки за съвместимост"
 
 #: ../rules/base.xml.in.h:556
-msgid "PC-98xx Series"
-msgstr "Серии PC-98xx"
+msgid "Mongolian"
+msgstr "монголска"
 
 #: ../rules/base.xml.in.h:557
-msgid "Pak"
-msgstr "Пак"
+msgid "Montenegrin"
+msgstr "черногорска"
 
 #: ../rules/base.xml.in.h:558
-msgid "Pakistan"
-msgstr "пакистанска"
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr "черногорска — кирилица с „«»“"
 
 #: ../rules/base.xml.in.h:559
-msgid "Pannonian Rusyn Homophonic"
-msgstr "русинска, фонетична"
+msgid "Montenegrin (Cyrillic)"
+msgstr "черногорска — кирилица"
 
 #: ../rules/base.xml.in.h:560
-msgid "Pashto"
-msgstr "пащунска"
+msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
+msgstr "черногорска — кирилица с разменени „З“ и „Ж“"
 
 #: ../rules/base.xml.in.h:561
-msgid "Pattachote"
-msgstr "патачотска"
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "черногорска — латиница за Уникод, qwerty"
 
 #: ../rules/base.xml.in.h:562
-msgid "Pause"
-msgstr "Pause"
+msgid "Montenegrin (Latin Unicode)"
+msgstr "черногорска — латиница за Уникод"
 
 #: ../rules/base.xml.in.h:563
-msgid "Persian, with Persian Keypad"
-msgstr "персийска, с персийска цифрова клавиатура"
+msgid "Montenegrin (Latin qwerty)"
+msgstr "черногорска — латиница, qwerty"
 
 #: ../rules/base.xml.in.h:564
-msgid "Phi"
-msgstr "Фил"
+msgid "Montenegrin (Latin with guillemets)"
+msgstr "черногорска — латиница с „«»“"
 
 #: ../rules/base.xml.in.h:565
-msgid "Philippines"
-msgstr "филипинска"
+msgid "NICOLA-F style Backspace"
+msgstr "Backspace на мястото определено от подредбата NICOLA-F"
 
 #: ../rules/base.xml.in.h:566
-msgid "Phonetic"
-msgstr "фонетична"
+msgid "Nepali"
+msgstr "непалска"
 
 #: ../rules/base.xml.in.h:567
-msgid "Phonetic Winkeys"
-msgstr "фонетична, клавиши Win"
+msgid "Non-breakable space character at fourth level"
+msgstr "Интервал без разделяне на четвърто ниво"
 
 #: ../rules/base.xml.in.h:568
-msgid "Pol"
-msgstr "Пол"
+msgid ""
+"Non-breakable space character at fourth level, thin non-breakable space "
+"character at sixth level"
+msgstr ""
+"Интервал без разделяне на четвърто ниво и тесен интервал без разделяне на "
+"шесто ниво"
 
 #: ../rules/base.xml.in.h:569
-msgid "Poland"
-msgstr "полска"
+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
-msgid "Polytonic"
-msgstr "политонална"
+msgid "Non-breakable space character at second level"
+msgstr "Интервал без разделяне на второ ниво"
 
 #: ../rules/base.xml.in.h:571
-msgid "Portugal"
-msgstr "португалска"
+msgid "Non-breakable space character at third level"
+msgstr "Интервал без разделяне на трето ниво"
 
 #: ../rules/base.xml.in.h:572
-msgid "Probhat"
-msgstr "пробхатска"
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Интервал без разделяне на трето ниво и нищо на четвърто ниво"
 
 #: ../rules/base.xml.in.h:573
-msgid "Programmer Dvorak"
-msgstr "Дворак за програмисти"
+msgid ""
+"Non-breakable space character at third level, thin non-breakable space "
+"character at fourth level"
+msgstr ""
+"Интервал без разделяне на трето ниво и тесен интервал без разделяне на "
+"четвърто ниво"
 
 #: ../rules/base.xml.in.h:574
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
+msgid "Northern Saami (Finland)"
+msgstr "северносамска — финландска"
 
 #: ../rules/base.xml.in.h:575
-msgid "Prt"
-msgstr "Пор"
+msgid "Northern Saami (Norway)"
+msgstr "северносамска — норвежка"
 
 #: ../rules/base.xml.in.h:576
-msgid "PrtSc"
-msgstr "PrtSc"
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "северносамска — норвежка, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:577
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+msgid "Northern Saami (Sweden)"
+msgstr "северносамска — шведска"
 
 #: ../rules/base.xml.in.h:578
-msgid "QWERTY (Baybayin)"
-msgstr "QWERTY (байбаин)"
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
 
 #: ../rules/base.xml.in.h:579
-msgid "Right Alt"
-msgstr "Десният Alt"
+msgid "Norwegian"
+msgstr "норвежка"
 
 #: ../rules/base.xml.in.h:580
-msgid "Right Alt (while pressed)"
-msgstr "Десният Alt (докато е натиснат)"
+msgid "Norwegian (Dvorak)"
+msgstr "норвежка — Дворак"
 
 #: ../rules/base.xml.in.h:581
-msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Десният Alt избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
+msgid "Norwegian (Macintosh)"
+msgstr "норвежка — за Макинтош"
 
 #: ../rules/base.xml.in.h:582
-msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "Десният Alt избира петото ниво, заключва го заедно с друг клавиш за пето ниво и го отключва при единично натискане"
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "норвежка — за Макинтош, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:583
-msgid "Right Alt key never chooses 3rd level"
-msgstr "Десният Alt никога не избира третото ниво"
+msgid "Norwegian (eliminate dead keys)"
+msgstr "норвежка — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:584
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "Десният Alt, Shift+десният Alt са Multi"
+msgid "Num Lock"
+msgstr "Num Lock"
 
 #: ../rules/base.xml.in.h:585
-msgid "Right Ctrl"
-msgstr "Десният Ctrl"
+msgid "Numeric keypad delete key behaviour"
+msgstr "Поведение на клавиша за триене на цифровата клавиатура"
 
 #: ../rules/base.xml.in.h:586
-msgid "Right Ctrl (while pressed)"
-msgstr "Десният Ctrl (докато е натиснат)"
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "Цифровата клавиатура функционира като в Макинтош"
 
 #: ../rules/base.xml.in.h:587
-msgid "Right Ctrl as Right Alt"
-msgstr "Десният Ctrl е десен Alt"
+msgid "Numeric keypad layout selection"
+msgstr "Избор на подредбата на цифровата клавиатура"
 
 #: ../rules/base.xml.in.h:588
-msgid "Right Ctrl+Right Shift"
-msgstr "Десният Ctrl+десният Shift"
+msgid "OLPC"
+msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:589
-msgid "Right Shift"
-msgstr "Десният Shift"
+msgid "Occitan"
+msgstr "провансалска"
 
 #: ../rules/base.xml.in.h:590
-msgid "Right Win"
-msgstr "Десният Win"
+msgid "Ogham"
+msgstr "огамска"
 
 #: ../rules/base.xml.in.h:591
-msgid "Right Win (while pressed)"
-msgstr "Десният Win (докато е натиснат)"
+msgid "Ogham (IS434)"
+msgstr "огамска — IS434"
 
 #: ../rules/base.xml.in.h:592
-msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Десният Win избира петото ниво и го заключва заедно с друг клавиш за пето ниво"
+msgid "Oriya"
+msgstr "орийска"
 
 #: ../rules/base.xml.in.h:593
-msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "Десният Win избира петото ниво, заключва го заедно с друг клавиш за пето ниво и го отключва при единично натискане"
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet keyboard — за Интернет"
 
 #: ../rules/base.xml.in.h:594
-msgid "Right hand"
-msgstr "за десничари"
+msgid "Ossetian (Georgia)"
+msgstr "осетинска — грузинска"
 
 #: ../rules/base.xml.in.h:595
-msgid "Right handed Dvorak"
-msgstr "Дворак за десничари"
+msgid "Ossetian (WinKeys)"
+msgstr "осетинска — с клавиши на Windows"
 
 #: ../rules/base.xml.in.h:596
-msgid "Romania"
-msgstr "румънска"
+msgid "Ossetian (legacy)"
+msgstr "осетинска — остаряла"
 
 #: ../rules/base.xml.in.h:597
-msgid "Romanian keyboard with German letters"
-msgstr "румънска клавиатура с немски букви"
+msgid "PC-98xx Series"
+msgstr "Серии PC-98xx"
 
 #: ../rules/base.xml.in.h:598
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "румънска клавиатура с немски букви, без „мъртви“ клавиши"
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "панонска русинска — еднозвучна"
 
 #: ../rules/base.xml.in.h:599
-msgid "Rou"
-msgstr "Рум"
+msgid "Pashto"
+msgstr "пащунска"
 
 #: ../rules/base.xml.in.h:600
-msgid "Rupee on 4"
-msgstr "Рупия (₨) при „4“"
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr "пащунска — афганистанска, OLPC"
 
 #: ../rules/base.xml.in.h:601
-msgid "Rus"
-msgstr "Рус"
+msgid "Pause"
+msgstr "Pause"
 
-#: ../rules/base.xml.in.h:602
-msgid "Russia"
-msgstr "руска"
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+msgid "Persian"
+msgstr "персийска"
 
 #: ../rules/base.xml.in.h:603
-msgid "Russian"
-msgstr "руска"
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr "персийска — афганистанска, дарийски OLPC"
 
 #: ../rules/base.xml.in.h:604
-msgid "Russian phonetic"
-msgstr "руска фонетична"
+msgid "Persian (with Persian Keypad)"
+msgstr "персийска — с персийска цифрова клавиатура"
 
-#: ../rules/base.xml.in.h:605
-msgid "Russian phonetic Dvorak"
-msgstr "руска фонетична, Дворак"
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+msgid "Polish"
+msgstr "палска"
 
 #: ../rules/base.xml.in.h:606
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "руска фонетична, без „мъртви“ клавиши"
+msgid "Polish (Dvorak)"
+msgstr "полска — Дворак"
 
 #: ../rules/base.xml.in.h:607
-msgid "Russian with Kazakh"
-msgstr "руска с казахски букви"
+msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgstr "полска — Дворак, «„”» при «1»"
 
 #: ../rules/base.xml.in.h:608
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard (безжична, за мултимедия)"
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr "полска — Дворак, «„”» при «'\"»"
 
 #: ../rules/base.xml.in.h:609
-msgid "SK-1300"
-msgstr "SK-1300"
+msgid "Polish (programmer Dvorak)"
+msgstr "полска — Дворак за програмисти"
 
 #: ../rules/base.xml.in.h:610
-msgid "SK-2500"
-msgstr "SK-2500"
+msgid "Polish (qwertz)"
+msgstr "полска — qwertz"
 
 #: ../rules/base.xml.in.h:611
-msgid "SK-6200"
-msgstr "SK-6200"
+msgid "Portuguese"
+msgstr "португалска"
 
 #: ../rules/base.xml.in.h:612
-msgid "SK-7100"
-msgstr "SK-7100"
+msgid "Portuguese (Brazil)"
+msgstr "португалска — бразилска"
 
-#: ../rules/base.xml.in.h:613 ../rules/base.extras.xml.in.h:9
-msgid "SRB"
-msgstr "Срб"
+#: ../rules/base.xml.in.h:613
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr "португалска — бразилска, Дворак"
 
 #: ../rules/base.xml.in.h:614
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500 (ергономична)"
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr "португалска — бразилска, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:615
-msgid "SVEN Slim 303"
-msgstr "SVEN Slim 303"
+msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgstr "португалска — бразилска, нативна за есперанто"
 
 #: ../rules/base.xml.in.h:616
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
+msgid "Portuguese (Brazil, nativo for USA keyboards)"
+msgstr "португалска — бразилска, нативна за САЩ"
 
 #: ../rules/base.xml.in.h:617
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
+msgid "Portuguese (Brazil, nativo)"
+msgstr "португалска — бразилска, нативна"
 
 #: ../rules/base.xml.in.h:618
-msgid "Scroll Lock"
-msgstr "ScrollLock"
+msgid "Portuguese (Macintosh)"
+msgstr "португалска — за Макинтош"
 
 #: ../rules/base.xml.in.h:619
-msgid "Secwepemctsin"
-msgstr "шъкуъпмъктчин"
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "португалска — за Макинтош, с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:620
-msgid "Semi-colon on third level"
-msgstr "Точка и запетая на третото ниво"
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "португалска — за Макинтош, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:621
-msgid "Sen"
-msgstr "Сен"
+msgid "Portuguese (Nativo for USA keyboards)"
+msgstr "португалска — нативна за САЩ"
 
 #: ../rules/base.xml.in.h:622
-msgid "Senegal"
-msgstr "сенегалска"
+msgid "Portuguese (Nativo)"
+msgstr "португалска — нативна"
 
-#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:10
-msgid "Serbia"
-msgstr "сръбска"
+#: ../rules/base.xml.in.h:623
+msgid "Portuguese (Sun dead keys)"
+msgstr "португалска — с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:624
-msgid "Serbian"
-msgstr "сръбска"
+msgid "Portuguese (eliminate dead keys)"
+msgstr "португалска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:625
-msgid "Serbo-Croatian"
-msgstr "сърбохърватска"
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager — KTEZ-1000"
 
 #: ../rules/base.xml.in.h:626
-msgid "Shift cancels Caps Lock"
-msgstr "Shift отменя Caps Lock"
+msgid "PrtSc"
+msgstr "PrtSc"
 
 #: ../rules/base.xml.in.h:627
-msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
-msgstr "Shift не отменя Caps Lock, а избира третото ниво"
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "панджаби — гурмуки джелум"
 
 #: ../rules/base.xml.in.h:628
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Shift за цифровата клавиатура както в MS Windows"
+msgid "Punjabi (Gurmukhi)"
+msgstr "панджаби — гурмуки"
 
 #: ../rules/base.xml.in.h:629
-msgid "Shift+Caps Lock"
-msgstr "Shift+Caps Lock"
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
 
 #: ../rules/base.xml.in.h:630
-msgid "Simple"
-msgstr "Обикновена"
+msgid "Right Alt"
+msgstr "Десният Alt"
 
 #: ../rules/base.xml.in.h:631
-msgid "Sindhi"
-msgstr "синдхи"
+msgid "Right Alt (while pressed)"
+msgstr "Десният Alt (докато е натиснат)"
 
 #: ../rules/base.xml.in.h:632
-msgid "Slovakia"
-msgstr "словашка"
+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:633
-msgid "Slovenia"
-msgstr "словенска"
+msgid ""
+"Right Alt chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser"
+msgstr ""
+"Десният Alt избира петото ниво и го заключва заедно с друг клавиш за пето "
+"ниво"
 
 #: ../rules/base.xml.in.h:634
-msgid "South Africa"
-msgstr "южноафриканска"
+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:635
-msgid "Southern Uzbek"
-msgstr "южно узбекска"
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Десният Alt никога не избира третото ниво"
 
 #: ../rules/base.xml.in.h:636
-msgid "Spain"
-msgstr "испанска"
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Десният Alt, Shift+десният Alt са Multi"
 
 #: ../rules/base.xml.in.h:637
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr "Специалните комбинации (Ctrl+Alt+&lt;клавиш&gt;) се обработват от сървъра"
+msgid "Right Ctrl"
+msgstr "Десният Ctrl"
 
 #: ../rules/base.xml.in.h:638
-msgid "Sri Lanka"
-msgstr "шриланкска"
+msgid "Right Ctrl (while pressed)"
+msgstr "Десният Ctrl (докато е натиснат)"
 
 #: ../rules/base.xml.in.h:639
-msgid "Standard"
-msgstr "стандартна"
+msgid "Right Ctrl as Right Alt"
+msgstr "Десният Ctrl е десен Alt"
 
 #: ../rules/base.xml.in.h:640
-msgid "Standard (Cedilla)"
-msgstr "стандартна (седий)"
+msgid "Right Ctrl is mapped to Menu"
+msgstr "Десният Ctrl е Meta"
+
+#: ../rules/base.xml.in.h:641
+msgid "Right Ctrl+Right Shift"
+msgstr "Десният Ctrl+десният Shift"
 
-#. RSTU 2019-91
 #: ../rules/base.xml.in.h:642
-msgid "Standard RSTU"
-msgstr "стандартна украинска"
+msgid "Right Shift"
+msgstr "Десният Shift"
+
+#: ../rules/base.xml.in.h:643
+msgid "Right Win"
+msgstr "Десният Win"
 
-#. RSTU 2019-91
 #: ../rules/base.xml.in.h:644
-msgid "Standard RSTU on Russian layout"
-msgstr "стандартна украинска, руска подредба"
+msgid "Right Win (while pressed)"
+msgstr "Десният Win (докато е натиснат)"
 
 #: ../rules/base.xml.in.h:645
-msgid "Sun Type 5/6"
-msgstr "На Sun, вид 5/6"
+msgid ""
+"Right Win chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser"
+msgstr ""
+"Десният Win избира петото ниво и го заключва заедно с друг клавиш за пето "
+"ниво"
 
 #: ../rules/base.xml.in.h:646
-msgid "Sun dead keys"
-msgstr "Sun, без „мъртви“ клавиши"
+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
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard (за мултимедия)"
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+msgid "Romanian"
+msgstr "румънска"
 
 #: ../rules/base.xml.in.h:648
-msgid "Svdvorak"
-msgstr "Свдворак"
+msgid "Romanian (Germany)"
+msgstr "румънска — немска"
 
 #: ../rules/base.xml.in.h:649
-msgid "Svk"
-msgstr "Свш"
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "немска — немска, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:650
-msgid "Svn"
-msgstr "Свн"
+msgid "Romanian (WinKeys)"
+msgstr "румънска — с клавиши на Windows"
 
 #: ../rules/base.xml.in.h:651
-msgid "Swap Ctrl and Caps Lock"
-msgstr "Размяна на Ctrl и Caps Lock"
+msgid "Romanian (cedilla)"
+msgstr "румънска — букви с „¸“"
 
 #: ../rules/base.xml.in.h:652
-msgid "Swap ESC and Caps Lock"
-msgstr "Размяна на Esc и Caps Lock"
+msgid "Romanian (standard cedilla)"
+msgstr "румънска — стандартна, букви с „¸“"
 
 #: ../rules/base.xml.in.h:653
-msgid "Swe"
-msgstr "Шве"
+msgid "Romanian (standard)"
+msgstr "румънска — стандартна"
 
 #: ../rules/base.xml.in.h:654
-msgid "Sweden"
-msgstr "шведска"
+msgid "Rupee on 4"
+msgstr "„₨“ при „4“"
 
-#: ../rules/base.xml.in.h:655
-msgid "Switzerland"
-msgstr "швейцарска"
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+msgid "Russian"
+msgstr "руска"
 
 #: ../rules/base.xml.in.h:656
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (за таблет)"
+msgid "Russian (DOS)"
+msgstr "руска — DOS"
 
 #: ../rules/base.xml.in.h:657
-msgid "Syr"
-msgstr "Сир"
+msgid "Russian (Georgia)"
+msgstr "руска — грузинска"
 
 #: ../rules/base.xml.in.h:658
-msgid "Syria"
-msgstr "сирийска"
+msgid "Russian (Germany, phonetic)"
+msgstr "руска — германска, фонетична"
 
 #: ../rules/base.xml.in.h:659
-msgid "Syriac"
-msgstr "сириакска (арамейска)"
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr "руска — казахстанска, за казахски"
 
 #: ../rules/base.xml.in.h:660
-msgid "Syriac phonetic"
-msgstr "сириакска фонетична (арамейска)"
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr "руска — полска, фонетична, Дворак"
 
 #: ../rules/base.xml.in.h:661
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
+msgid "Russian (Sweden, phonetic)"
+msgstr "руска — шведска, фонетична"
 
 #: ../rules/base.xml.in.h:662
-msgid "Tajikistan"
-msgstr "таджикска"
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgstr "руска — шведска, фонетична, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:663
-msgid "Tamil"
-msgstr "тамилска"
+msgid "Russian (US, phonetic)"
+msgstr "руска — американска, фонетична"
 
 #: ../rules/base.xml.in.h:664
-msgid "Tamil Keyboard with Numerals"
-msgstr "Тамилска клавиатура с цифри"
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "руска — украинска, републикански стандарт"
 
 #: ../rules/base.xml.in.h:665
-msgid "Tamil TAB Typewriter"
-msgstr "тамилска машинописна с табулация"
+msgid "Russian (legacy)"
+msgstr "руска — остаряла"
 
 #: ../rules/base.xml.in.h:666
-msgid "Tamil TSCII Typewriter"
-msgstr "тамилска машинописна — TSCII"
+msgid "Russian (phonetic WinKeys)"
+msgstr "руска — фонетична, с клавиши на Windows"
 
 #: ../rules/base.xml.in.h:667
-msgid "Tamil Unicode"
-msgstr "тамилска за Уникод"
+msgid "Russian (phonetic)"
+msgstr "руска — фонетична"
 
 #: ../rules/base.xml.in.h:668
-msgid "Tanzania"
-msgstr "танзанийска"
+msgid "Russian (typewriter)"
+msgstr "руска — за пишеща машина"
 
 #: ../rules/base.xml.in.h:669
-msgid "Targa Visionary 811"
-msgstr "Targa Visionary 811"
+msgid "Russian (typewriter, legacy)"
+msgstr "руска — за пишеща машина, остаряла"
 
 #: ../rules/base.xml.in.h:670
-msgid "Tatar"
-msgstr "татарска"
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard — безжична, за мултимедия"
 
 #: ../rules/base.xml.in.h:671
-msgid "Telugu"
-msgstr "телугу"
+msgid "SK-1300"
+msgstr "SK-1300"
 
 #: ../rules/base.xml.in.h:672
-msgid "Tha"
-msgstr "Тай"
+msgid "SK-2500"
+msgstr "SK-2500"
 
 #: ../rules/base.xml.in.h:673
-msgid "Thailand"
-msgstr "тайландска"
+msgid "SK-6200"
+msgstr "SK-6200"
 
 #: ../rules/base.xml.in.h:674
-msgid "Tibetan"
-msgstr "тибетска"
+msgid "SK-7100"
+msgstr "SK-7100"
 
 #: ../rules/base.xml.in.h:675
-msgid "Tibetan (with ASCII numerals)"
-msgstr "тибетска (с цифри от ASCII)"
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500 — ергономична"
 
 #: ../rules/base.xml.in.h:676
-msgid "Tifinagh"
-msgstr "тифинах"
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
 
 #: ../rules/base.xml.in.h:677
-msgid "Tifinagh alternative"
-msgstr "алтернативна за тифинах"
+msgid "Saisiyat (Taiwan)"
+msgstr "сайсиятска — тайванска"
 
 #: ../rules/base.xml.in.h:678
-msgid "Tifinagh alternative phonetic"
-msgstr "алтернативна, фонетична за тифинах"
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
 
 #: ../rules/base.xml.in.h:679
-msgid "Tifinagh extended"
-msgstr "разширена за тифинах"
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
 
 #: ../rules/base.xml.in.h:680
-msgid "Tifinagh extended phonetic"
-msgstr "разширена фонетична за тифинах"
+msgid "Sanwa Supply SKB-KG3"
+msgstr "Sanwa Supply SKB-KG3"
 
 #: ../rules/base.xml.in.h:681
-msgid "Tifinagh phonetic"
-msgstr "фонетична за тифинах"
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
 
 #: ../rules/base.xml.in.h:682
-msgid "Tilde (~) variant"
-msgstr "вариант с тилда (~)"
+msgid "Semi-colon on third level"
+msgstr "Точка и запетая на третото ниво"
 
-#: ../rules/base.xml.in.h:683
-msgid "Tjk"
-msgstr "Тдж"
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+msgid "Serbian"
+msgstr "сръбска"
 
 #: ../rules/base.xml.in.h:684
-msgid "Tkm"
-msgstr "Ткм"
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr "сръбска — латиница за Уникод, qwerty"
 
 #: ../rules/base.xml.in.h:685
-msgid "To the corresponding key in a Dvorak keyboard."
-msgstr "към съответния клавиш в Dvorak"
+msgid "Serbian (Latin Unicode)"
+msgstr "сръбска — латиница за Уникод"
 
 #: ../rules/base.xml.in.h:686
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr "към съответния клавиш Qwerty"
+msgid "Serbian (Latin qwerty)"
+msgstr "сръбска — латиница, qwerty"
 
 #: ../rules/base.xml.in.h:687
-msgid "Toggle PointerKeys with Shift + NumLock."
-msgstr "Включване на клавиши за придвижване чрез Shift+NumLock"
+msgid "Serbian (Latin with guillemets)"
+msgstr "сръбска — латиница с „«»“"
 
 #: ../rules/base.xml.in.h:688
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
+msgid "Serbian (Latin)"
+msgstr "сръбска — латиница"
 
 #: ../rules/base.xml.in.h:689
-msgid "Traditional phonetic"
-msgstr "фонетична, традиционна"
+msgid "Serbian (Russia)"
+msgstr "сръбска — руска"
 
 #: ../rules/base.xml.in.h:690
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access Keyboard"
+msgid "Serbian (Z and ZHE swapped)"
+msgstr "сръбска — разменени „З“ и „Ж“"
 
 #: ../rules/base.xml.in.h:691
-msgid "Trust Slimline"
-msgstr "Trust Slimline"
+msgid "Serbian (with guillemets)"
+msgstr "сръбска — с „«»“"
 
 #: ../rules/base.xml.in.h:692
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic (безжична)"
+msgid "Serbo-Croatian (US)"
+msgstr "сърбохърватска — американска"
 
 #: ../rules/base.xml.in.h:693
-msgid "Tur"
-msgstr "Тур"
+msgid "Shift cancels Caps Lock"
+msgstr "Shift отменя Caps Lock"
 
 #: ../rules/base.xml.in.h:694
-msgid "Turkey"
-msgstr "турска"
+msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
+msgstr "Shift не отменя Caps Lock, а избира третото ниво"
 
 #: ../rules/base.xml.in.h:695
-msgid "Turkmenistan"
-msgstr "туркменистанска"
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Shift за цифровата клавиатура както в MS Windows"
 
 #: ../rules/base.xml.in.h:696
-msgid "TypeMatrix EZ-Reach 2020"
-msgstr "TypeMatrix EZ-Reach 2020"
+msgid "Shift+Caps Lock"
+msgstr "Shift+Caps Lock"
 
 #: ../rules/base.xml.in.h:697
-msgid "TypeMatrix EZ-Reach 2030 PS2"
-msgstr "TypeMatrix EZ-Reach 2030 PS2"
+msgid "Sindhi"
+msgstr "синдхи"
 
 #: ../rules/base.xml.in.h:698
-msgid "TypeMatrix EZ-Reach 2030 USB"
-msgstr "TypeMatrix EZ-Reach 2030 USB"
+msgid "Sinhala"
+msgstr "синхала"
 
 #: ../rules/base.xml.in.h:699
-msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (режим 102/105:EU)"
+msgid "Slovak"
+msgstr "словашка"
 
 #: ../rules/base.xml.in.h:700
-msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (режим 106:JP)"
+msgid "Slovak (extended Backslash)"
+msgstr "словашка — с „\\“"
 
 #: ../rules/base.xml.in.h:701
-msgid "Typewriter"
-msgstr "машинописна"
+msgid "Slovak (qwerty)"
+msgstr "словашка — qwerty"
 
 #: ../rules/base.xml.in.h:702
-msgid "Typewriter, legacy"
-msgstr "машинописна (остаряла)"
+msgid "Slovak (qwerty, extended Backslash)"
+msgstr "словашка — qwerty, с „\\“"
 
 #: ../rules/base.xml.in.h:703
-msgid "Tza"
-msgstr "Тнз"
+msgid "Slovenian"
+msgstr "словенска"
 
 #: ../rules/base.xml.in.h:704
-msgid "UCW layout (accented letters only)"
-msgstr "Подредба UCW (само ударени букви)"
+msgid "Slovenian (US keyboard with Slovenian letters)"
+msgstr "словенска — американска със словенски букви"
 
 #: ../rules/base.xml.in.h:705
-msgid "US Dvorak with CZ UCW support"
-msgstr "US Dvorak с поддръжка на CZ UCW"
+msgid "Slovenian (use guillemets for quotes)"
+msgstr "словенска — с „«»“"
 
 #: ../rules/base.xml.in.h:706
-msgid "US keyboard with Bosnian digraphs"
-msgstr "американска с босненски диграфи"
+msgid "Spanish"
+msgstr "испанска"
 
 #: ../rules/base.xml.in.h:707
-msgid "US keyboard with Bosnian letters"
-msgstr "американска с босненски букви"
+msgid "Spanish (Dvorak)"
+msgstr "испанска — Дворак"
 
 #: ../rules/base.xml.in.h:708
-msgid "US keyboard with Croatian digraphs"
-msgstr "американска с хърватски диграфи"
+msgid "Spanish (Latin American)"
+msgstr "испанска — латиноамериканска"
 
 #: ../rules/base.xml.in.h:709
-msgid "US keyboard with Croatian letters"
-msgstr "американска с хърватски букви"
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "испанска — латиноамериканска, с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:710
-msgid "US keyboard with Estonian letters"
-msgstr "американска с естонски букви"
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr "испанска — латиноамериканска, без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:711
-msgid "US keyboard with Italian letters"
-msgstr "американска с италиански букви"
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr "испанска — латиноамериканска, с мъртва „~“"
 
 #: ../rules/base.xml.in.h:712
-msgid "US keyboard with Lithuanian letters"
-msgstr "американска с литовски букви"
+msgid "Spanish (Macintosh)"
+msgstr "испанска — за Макинтош"
 
 #: ../rules/base.xml.in.h:713
-msgid "US keyboard with Slovenian letters"
-msgstr "американска със словенски букви"
+msgid "Spanish (Sun dead keys)"
+msgstr "испанска — с „мъртви“ клавиши на Sun"
 
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:11
-msgid "USA"
-msgstr "Аме"
+#: ../rules/base.xml.in.h:714
+msgid "Spanish (eliminate dead keys)"
+msgstr "испанска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:715
-msgid "Udmurt"
-msgstr "удмурт"
+msgid "Spanish (include dead tilde)"
+msgstr "испанска — с „мъртва“ тилда"
 
 #: ../rules/base.xml.in.h:716
-msgid "Ukr"
-msgstr "Укр"
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr ""
+"Специалните комбинации (Ctrl+Alt+&lt;клавиш&gt;) се обработват от сървъра"
 
 #: ../rules/base.xml.in.h:717
-msgid "Ukraine"
-msgstr "украинска"
+msgid "Sun Type 5/6"
+msgstr "На Sun, вид 5/6"
 
 #: ../rules/base.xml.in.h:718
-msgid "Unicode additions (arrows and math operators)"
-msgstr "Допълненията от Уникод (стрелки и математически операции)"
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard — за мултимедия"
 
 #: ../rules/base.xml.in.h:719
-msgid "Unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
+msgid "Swahili (Kenya)"
+msgstr "суахили — кенийска"
 
 #: ../rules/base.xml.in.h:720
-msgid "UnicodeExpert"
-msgstr "експертна за Уникод"
+msgid "Swahili (Tanzania)"
+msgstr "суахили — танзанийска"
 
 #: ../rules/base.xml.in.h:721
-msgid "United Kingdom"
-msgstr "британска"
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Размяна на Ctrl и Caps Lock"
 
 #: ../rules/base.xml.in.h:722
-msgid "Unitek KB-1925"
-msgstr "Unitek KB-1925"
+msgid "Swap ESC and Caps Lock"
+msgstr "Размяна на Esc и Caps Lock"
 
 #: ../rules/base.xml.in.h:723
-msgid "Urdu, Alternative phonetic"
-msgstr "урду, фонетична, алтернативна"
+msgid "Swedish"
+msgstr "шведска"
 
 #: ../rules/base.xml.in.h:724
-msgid "Urdu, Phonetic"
-msgstr "урду, фонетична"
+msgid "Swedish (Dvorak)"
+msgstr "шведска — Дворак"
 
 #: ../rules/base.xml.in.h:725
-msgid "Urdu, Winkeys"
-msgstr "урду, клавиши Win"
+msgid "Swedish (Macintosh)"
+msgstr "шведска — за Макинтош"
 
 #: ../rules/base.xml.in.h:726
-msgid "Use Bosnian digraphs"
-msgstr "с босненски диграфи"
+msgid "Swedish (Svdvorak)"
+msgstr "шведска — шведски Дворак"
 
 #: ../rules/base.xml.in.h:727
-msgid "Use Croatian digraphs"
-msgstr "с хърватски диграфи"
+msgid "Swedish (eliminate dead keys)"
+msgstr "шведска — без „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:728
-msgid "Use guillemets for quotes"
-msgstr "със френски кавички"
+msgid "Swedish Sign Language"
+msgstr "шведска — жестомимична"
 
 #: ../rules/base.xml.in.h:729
-msgid "Use keyboard LED to show alternative layout"
-msgstr "Индикация чрез клавиатурен светодиод за смяна на подредбата"
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook — за таблет"
 
 #: ../rules/base.xml.in.h:730
-msgid "Using space key to input non-breakable space character"
-msgstr "Генериране на интервал без разделяне с клавишa за интервал"
+msgid "Syriac"
+msgstr "сириакска"
 
 #: ../rules/base.xml.in.h:731
-msgid "Usual space at any level"
-msgstr "Нормален интервал на всички нива"
+msgid "Syriac (phonetic)"
+msgstr "сириакска — фонетична"
 
 #: ../rules/base.xml.in.h:732
-msgid "Uzb"
-msgstr "Узб"
+msgid "Taiwanese"
+msgstr "тайванска"
 
 #: ../rules/base.xml.in.h:733
-msgid "Uzbekistan"
-msgstr "узбекистанска"
+msgid "Taiwanese (indigenous)"
+msgstr "тайванска — туземна"
 
 #: ../rules/base.xml.in.h:734
-msgid "Vietnam"
-msgstr "виетнамска"
+msgid "Tajik"
+msgstr "таджикска"
 
 #: ../rules/base.xml.in.h:735
-msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr "ViewSonic KU-306 Internet Keyboard (за Интернет)"
+msgid "Tajik (legacy)"
+msgstr "таджикска — остаряла"
 
 #: ../rules/base.xml.in.h:736
-msgid "Vnm"
-msgstr "Вие"
+msgid "Tamil"
+msgstr "тамилска"
 
 #: ../rules/base.xml.in.h:737
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Цифрова клавиатура — Wang 724, с допълненията от Уникод (стрелки и математически операции)"
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgstr "тамилска — шриланкска, за пишеща машина, кодиране TAB"
 
 #: ../rules/base.xml.in.h:738
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Цифрова клавиатура Wang 724, с допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
+msgid "Tamil (Sri Lanka, Unicode)"
+msgstr "тамилска — шриланкска, Уникод"
 
 #: ../rules/base.xml.in.h:739
-msgid "Wang model 724 azerty"
-msgstr "Wang model 724 azerty"
+msgid "Tamil (TAB typewriter)"
+msgstr "тамилска — за пишеща машина, кодиране TAB"
 
 #: ../rules/base.xml.in.h:740
-msgid "Western"
-msgstr "западна"
+msgid "Tamil (TSCII typewriter)"
+msgstr "тамилска — за пишеща машина, кодиране TSCII"
 
 #: ../rules/base.xml.in.h:741
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
+msgid "Tamil (Unicode)"
+msgstr "тамилска — Уникод"
 
 #: ../rules/base.xml.in.h:742
-msgid "Winkeys"
-msgstr "клавиши Win"
+msgid "Tamil (keyboard with numerals)"
+msgstr "тамилска — с таймилски цифри"
 
 #: ../rules/base.xml.in.h:743
-msgid "With &lt;\\|&gt; key"
-msgstr "клавиш &lt;\\|&gt;"
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
 
 #: ../rules/base.xml.in.h:744
-msgid "With EuroSign on 5"
-msgstr "Евро (€) при „5“"
+msgid "Tatar"
+msgstr "татарска"
 
 #: ../rules/base.xml.in.h:745
-msgid "With guillemets"
-msgstr "френски кавички"
+msgid "Telugu"
+msgstr "телугу"
 
 #: ../rules/base.xml.in.h:746
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet Keyboard (за Интернет)"
+msgid "Thai"
+msgstr "тайландска"
 
 #: ../rules/base.xml.in.h:747
-msgid "Yakut"
-msgstr "якутска"
+msgid "Thai (Pattachote)"
+msgstr "тайландска — патачотска"
 
 #: ../rules/base.xml.in.h:748
-msgid "Yoruba"
-msgstr "йоруба"
+msgid "Thai (TIS-820.2538)"
+msgstr "тайландска — TIS-820.2538"
 
 #: ../rules/base.xml.in.h:749
-msgid "Z and ZHE swapped"
-msgstr "разменени „З“ и „Ж“"
+msgid "Tibetan"
+msgstr "тибетска"
 
 #: ../rules/base.xml.in.h:750
-msgid "Zaf"
-msgstr "ЮАф"
+msgid "Tibetan (with ASCII numerals)"
+msgstr "тибетска — с цифри от ASCII"
 
 #: ../rules/base.xml.in.h:751
-msgid "Zero-width non-joiner character at second level"
-msgstr "Разделител с нулева широчина на второ ниво"
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "към съответния клавиш в Dvorak"
 
 #: ../rules/base.xml.in.h:752
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
-msgstr "Разделител с нулева широчина на второ ниво и интервал без разделяне на трето ниво"
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "към съответния клавиш Qwerty"
 
 #: ../rules/base.xml.in.h:753
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
-msgstr "Разделител с нулева широчина на второ ниво, интервал без разделяне на трето ниво и нищо на четвърто ниво"
+msgid "Toggle PointerKeys with Shift + NumLock."
+msgstr "Включване на клавиши за придвижване чрез Shift+Num Lock"
 
 #: ../rules/base.xml.in.h:754
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
-msgstr "Разделител с нулева широчина на второ ниво, интервал без разделяне на трето ниво и тесен интервал без разделяне на четвърто ниво"
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
 
 #: ../rules/base.xml.in.h:755
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
-msgstr "Разделител с нулева широчина на второ ниво, интервал без разделяне на трето ниво и съединител с нулева широчина на четвърто ниво"
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
 
 #: ../rules/base.xml.in.h:756
-msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
-msgstr "Разделител с нулева широчина на второ ниво и съединител с нулева широчина на трето ниво"
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
 
 #: ../rules/base.xml.in.h:757
-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 "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic — безжична"
 
 #: ../rules/base.xml.in.h:758
-msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
-msgstr "Разделител с нулева широчина на трето ниво и съединител с нулева широчина на четвърто ниво"
+msgid "Tswana"
+msgstr "тсуанска"
 
 #: ../rules/base.xml.in.h:759
-msgid "azerty"
-msgstr "azerty"
+msgid "Turkish"
+msgstr "турска"
 
 #: ../rules/base.xml.in.h:760
-msgid "azerty/digits"
-msgstr "azerty/цифри"
+msgid "Turkish (Alt-Q)"
+msgstr "турска — „Q“ горе-вляво, алтернативна"
 
 #: ../rules/base.xml.in.h:761
-msgid "digits"
-msgstr "цифри"
+msgid "Turkish (F)"
+msgstr "турска — „F“ горе-вляво"
 
 #: ../rules/base.xml.in.h:762
-msgid "displaced semicolon and quote (obsolete)"
-msgstr "разменени точка и запетая и кавички (остаряла)"
+msgid "Turkish (Sun dead keys)"
+msgstr "турска — с „мъртви“ клавиши на Sun"
 
 #: ../rules/base.xml.in.h:763
-msgid "lyx"
-msgstr "lyx"
+msgid "Turkish (international with dead keys)"
+msgstr "турска — международна, с „мъртви“ клавиши"
 
 #: ../rules/base.xml.in.h:764
-msgid "qwerty"
-msgstr "qwerty"
+msgid "Turkmen"
+msgstr "тюркменска"
 
 #: ../rules/base.xml.in.h:765
-msgid "qwerty, extended Backslash"
-msgstr "qwerty с удължен Backslash"
+msgid "Turkmen (Alt-Q)"
+msgstr "тюркменска — „Q“ горе-вляво, алтернативна"
 
 #: ../rules/base.xml.in.h:766
-msgid "qwerty/digits"
-msgstr "qwerty/цифри"
+msgid "TypeMatrix EZ-Reach 2020"
+msgstr "TypeMatrix EZ-Reach 2020"
 
 #: ../rules/base.xml.in.h:767
-msgid "qwertz"
-msgstr "qwertz"
+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 — режим 102/105:EU"
+
+#: ../rules/base.xml.in.h:770
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB — режим 106:JP"
+
+#: ../rules/base.xml.in.h:771
+msgid "Udmurt"
+msgstr "удмуртска"
+
+#: ../rules/base.xml.in.h:772
+msgid "Ukrainian"
+msgstr "украинска"
+
+#: ../rules/base.xml.in.h:773
+msgid "Ukrainian (WinKeys)"
+msgstr "украинска — с клавиши на Windows"
+
+#: ../rules/base.xml.in.h:774
+msgid "Ukrainian (homophonic)"
+msgstr "украинска — еднозвучна, алтернативна"
+
+#: ../rules/base.xml.in.h:775
+msgid "Ukrainian (legacy)"
+msgstr "украинска — остаряла"
+
+#: ../rules/base.xml.in.h:776
+msgid "Ukrainian (phonetic)"
+msgstr "украинска — фонетична"
+
+#: ../rules/base.xml.in.h:777
+msgid "Ukrainian (standard RSTU)"
+msgstr "украинска — републикански стандарт"
+
+#: ../rules/base.xml.in.h:778
+msgid "Ukrainian (typewriter)"
+msgstr "украинска — за пишеща машина"
+
+#: ../rules/base.xml.in.h:779
+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:781
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:782
+msgid "Urdu (Pakistan)"
+msgstr "урду — пакистанска"
+
+#: ../rules/base.xml.in.h:783
+msgid "Urdu (Pakistan, CRULP)"
+msgstr "урду — пакистанска, CRULP"
+
+#: ../rules/base.xml.in.h:784
+msgid "Urdu (Pakistan, NLA)"
+msgstr "урду — пакистанска, NLA"
+
+#: ../rules/base.xml.in.h:785
+msgid "Urdu (WinKeys)"
+msgstr "урду — с клавиши на Windows"
+
+#: ../rules/base.xml.in.h:786
+msgid "Urdu (alternative phonetic)"
+msgstr "урду — фонетична, алтернативна"
+
+#: ../rules/base.xml.in.h:787
+msgid "Urdu (phonetic)"
+msgstr "урду — фонетична"
+
+#: ../rules/base.xml.in.h:788
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Индикация чрез клавиатурен светодиод за смяна на подредбата"
+
+#: ../rules/base.xml.in.h:789
+msgid "Using space key to input non-breakable space character"
+msgstr "Генериране на интервал без разделяне с клавишa за интервал"
+
+#: ../rules/base.xml.in.h:790
+msgid "Usual space at any level"
+msgstr "Нормален интервал на всички нива"
+
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "уйгурска"
+
+#: ../rules/base.xml.in.h:792
+msgid "Uzbek"
+msgstr "узбекска"
+
+#: ../rules/base.xml.in.h:793
+msgid "Uzbek (Afghanistan)"
+msgstr "узбекска — афганистанска"
+
+#: ../rules/base.xml.in.h:794
+msgid "Uzbek (Afghanistan, OLPC)"
+msgstr "узбекска — афганистанска, OLPC"
+
+#: ../rules/base.xml.in.h:795
+msgid "Uzbek (Latin)"
+msgstr "узбекска — латиница"
+
+#: ../rules/base.xml.in.h:796
+msgid "Vietnamese"
+msgstr "виетнамска"
+
+#: ../rules/base.xml.in.h:797
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard — за Интернет"
+
+#: ../rules/base.xml.in.h:798
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+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:800
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:801
+msgid "Wolof"
+msgstr "Уолоф"
+
+#: ../rules/base.xml.in.h:802
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard — за Интернет"
+
+#: ../rules/base.xml.in.h:803
+msgid "Yakut"
+msgstr "якутска"
+
+#: ../rules/base.xml.in.h:804
+msgid "Yoruba"
+msgstr "йоруба"
+
+#: ../rules/base.xml.in.h:805
+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 ""
+"Разделител с нулева широчина на второ ниво, интервал без разделяне на трето "
+"ниво и съединител с нулева широчина на четвърто ниво"
+
+#: ../rules/base.xml.in.h:810
+msgid ""
+"Zero-width non-joiner character at second level, zero-width joiner character "
+"at third 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 ""
+"Разделител с нулева широчина на второ ниво, съединител с нулева широчина на "
+"трето ниво и интервал без разделяне на четвърто ниво"
+
+#: ../rules/base.xml.in.h:812
+msgid ""
+"Zero-width non-joiner character at third level, zero-width joiner at fourth "
+"level"
+msgstr ""
+"Разделител с нулева широчина на трето ниво и съединител с нулева широчина на "
+"четвърто ниво"
+
+#: ../rules/base.xml.in.h:813
+msgid "ak"
+msgstr "Акн"
+
+#: ../rules/base.xml.in.h:814
+msgid "am"
+msgstr "Амх"
+
+#: ../rules/base.xml.in.h:815
+msgid "ar"
+msgstr "Арб"
+
+#: ../rules/base.xml.in.h:816
+msgid "avn"
+msgstr "Авт"
+
+#: ../rules/base.xml.in.h:817
+msgid "az"
+msgstr "Азр"
+
+#: ../rules/base.xml.in.h:818
+msgid "be"
+msgstr "Бел"
+
+#: ../rules/base.xml.in.h:819
+msgid "ber"
+msgstr "Брб"
+
+#: ../rules/base.xml.in.h:820
+msgid "bg"
+msgstr "Бъл"
+
+#: ../rules/base.xml.in.h:821
+msgid "bm"
+msgstr "Бмб"
+
+#: ../rules/base.xml.in.h:822
+msgid "bn"
+msgstr "Бнг"
+
+#: ../rules/base.xml.in.h:823
+msgid "brl"
+msgstr "Брл"
+
+#: ../rules/base.xml.in.h:824
+msgid "bs"
+msgstr "Бсн"
+
+#: ../rules/base.xml.in.h:825
+msgid "ca"
+msgstr "Ктл"
+
+#: ../rules/base.xml.in.h:826
+msgid "chr"
+msgstr "Чрк"
+
+#: ../rules/base.xml.in.h:827
+msgid "cm"
+msgstr "Кмр"
+
+#: ../rules/base.xml.in.h:828
+msgid "crh"
+msgstr "Ттр"
+
+#: ../rules/base.xml.in.h:829
+msgid "cs"
+msgstr "Чшк"
+
+#: ../rules/base.xml.in.h:830
+msgid "da"
+msgstr "Дтс"
+
+#: ../rules/base.xml.in.h:831
+msgid "de"
+msgstr "Нмс"
+
+#: ../rules/base.xml.in.h:832
+msgid "dv"
+msgstr "Две"
+
+#: ../rules/base.xml.in.h:833
+msgid "dz"
+msgstr "Дзн"
+
+#: ../rules/base.xml.in.h:834
+msgid "ee"
+msgstr "Еве"
+
+#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
+msgid "en"
+msgstr "Анг"
+
+#: ../rules/base.xml.in.h:836
+msgid "eo"
+msgstr "Есп"
+
+#: ../rules/base.xml.in.h:837
+msgid "es"
+msgstr "Исп"
+
+#: ../rules/base.xml.in.h:838
+msgid "et"
+msgstr "Ест"
+
+#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
+msgid "fa"
+msgstr "Прс"
+
+#: ../rules/base.xml.in.h:840
+msgid "ff"
+msgstr "Фла"
+
+#: ../rules/base.xml.in.h:841
+msgid "fi"
+msgstr "Фнл"
+
+#: ../rules/base.xml.in.h:842
+msgid "fo"
+msgstr "Фрр"
+
+#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
+msgid "fr"
+msgstr "Фрн"
+
+#: ../rules/base.xml.in.h:844
+msgid "gaa"
+msgstr "Га "
+
+#: ../rules/base.xml.in.h:845
+msgid "gr"
+msgstr "Грц"
+
+#: ../rules/base.xml.in.h:846
+msgid "gu"
+msgstr "Гдж"
+
+#: ../rules/base.xml.in.h:847
+msgid "ha"
+msgstr "Хск"
+
+#: ../rules/base.xml.in.h:848
+msgid "he"
+msgstr "Ивр"
+
+#: ../rules/base.xml.in.h:849
+msgid "hi"
+msgstr "Хнд"
+
+#: ../rules/base.xml.in.h:850
+msgid "hr"
+msgstr "Хрв"
+
+#: ../rules/base.xml.in.h:851
+msgid "hu"
+msgstr "Унг"
+
+#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
+msgid "hy"
+msgstr "Арм"
+
+#: ../rules/base.xml.in.h:853
+msgid "ie"
+msgstr "Ирл"
+
+#: ../rules/base.xml.in.h:854
+msgid "ig"
+msgstr "Игб"
+
+#: ../rules/base.xml.in.h:855
+msgid "ike"
+msgstr "Еск"
+
+#: ../rules/base.xml.in.h:856
+msgid "in"
+msgstr "Инд"
+
+#: ../rules/base.xml.in.h:857
+msgid "is"
+msgstr "Еск"
+
+#: ../rules/base.xml.in.h:858
+msgid "it"
+msgstr "Итл"
+
+#: ../rules/base.xml.in.h:859
+msgid "ja"
+msgstr "Япн"
+
+#: ../rules/base.xml.in.h:860
+msgid "ka"
+msgstr "Грз"
+
+#: ../rules/base.xml.in.h:861
+msgid "ki"
+msgstr "Крг"
+
+#: ../rules/base.xml.in.h:862
+msgid "kk"
+msgstr "Кзх"
+
+#: ../rules/base.xml.in.h:863
+msgid "km"
+msgstr "Кхм"
+
+#: ../rules/base.xml.in.h:864
+msgid "kn"
+msgstr "Кнр"
+
+#: ../rules/base.xml.in.h:865
+msgid "ko"
+msgstr "Крс"
+
+#: ../rules/base.xml.in.h:866
+msgid "ku"
+msgstr "Крд"
+
+#: ../rules/base.xml.in.h:867
+msgid "lo"
+msgstr "Лск"
+
+#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
+msgid "lt"
+msgstr "Лит"
+
+#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
+msgid "lv"
+msgstr "Лат"
+
+#: ../rules/base.xml.in.h:870
+msgid "mi"
+msgstr "Мрс"
+
+#: ../rules/base.xml.in.h:871
+msgid "mk"
+msgstr "Мкд"
+
+#: ../rules/base.xml.in.h:872
+msgid "ml"
+msgstr "Млл"
+
+#: ../rules/base.xml.in.h:873
+msgid "mn"
+msgstr "Мнг"
+
+#: ../rules/base.xml.in.h:874
+msgid "mt"
+msgstr "Млт"
+
+#: ../rules/base.xml.in.h:875
+msgid "my"
+msgstr "Брм"
+
+#: ../rules/base.xml.in.h:876
+msgid "ne"
+msgstr "Нпл"
+
+#: ../rules/base.xml.in.h:877
+msgid "nl"
+msgstr "Хлн"
+
+#: ../rules/base.xml.in.h:878
+msgid "no"
+msgstr "Нрв"
+
+#: ../rules/base.xml.in.h:879
+msgid "or"
+msgstr "Ори"
+
+#: ../rules/base.xml.in.h:880
+msgid "pa"
+msgstr "Пнд"
+
+#: ../rules/base.xml.in.h:881
+msgid "ph"
+msgstr "Флп"
+
+#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
+msgid "pl"
+msgstr "Плс"
+
+#: ../rules/base.xml.in.h:883
+msgid "ps"
+msgstr "Пщн"
+
+#: ../rules/base.xml.in.h:884
+msgid "pt"
+msgstr "Прт"
+
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
+msgid "ro"
+msgstr "Рмн"
+
+#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
+msgid "ru"
+msgstr "Рск"
+
+#: ../rules/base.xml.in.h:887
+msgid "sd"
+msgstr "Снд"
+
+#: ../rules/base.xml.in.h:888
+msgid "si"
+msgstr "Снх"
+
+# славашка
+#: ../rules/base.xml.in.h:889
+msgid "sk"
+msgstr "Слш"
+
+# славенска
+#: ../rules/base.xml.in.h:890
+msgid "sl"
+msgstr "Слн"
+
+#: ../rules/base.xml.in.h:891
+msgid "sq"
+msgstr "Алб"
+
+#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
+msgid "sr"
+msgstr "Срб"
+
+#: ../rules/base.xml.in.h:893
+msgid "sv"
+msgstr "Швд"
+
+#: ../rules/base.xml.in.h:894
+msgid "sw"
+msgstr "Схл"
+
+#: ../rules/base.xml.in.h:895
+msgid "syc"
+msgstr "Срк"
+
+#: ../rules/base.xml.in.h:896
+msgid "ta"
+msgstr "Тмл"
+
+#: ../rules/base.xml.in.h:897
+msgid "te"
+msgstr "Тлг"
+
+#: ../rules/base.xml.in.h:898
+msgid "tg"
+msgstr "Тдж"
+
+#: ../rules/base.xml.in.h:899
+msgid "th"
+msgstr "Тск"
+
+#: ../rules/base.xml.in.h:900
+msgid "tk"
+msgstr "Трк"
+
+#: ../rules/base.xml.in.h:901
+msgid "tn"
+msgstr "Тсн"
+
+#: ../rules/base.xml.in.h:902
+msgid "tr"
+msgstr "Трс"
+
+#: ../rules/base.xml.in.h:903
+msgid "uk"
+msgstr "Укр"
+
+#: ../rules/base.xml.in.h:904
+msgid "ur"
+msgstr "Урд"
+
+#: ../rules/base.xml.in.h:905
+msgid "uz"
+msgstr "Узб"
+
+#: ../rules/base.xml.in.h:906
+msgid "vi"
+msgstr "Втн"
+
+#: ../rules/base.xml.in.h:907
+msgid "wo"
+msgstr "Улф"
+
+#: ../rules/base.xml.in.h:908
+msgid "xsy"
+msgstr "Сст"
+
+#: ../rules/base.xml.in.h:909
+msgid "yo"
+msgstr "Йрб"
+
+#: ../rules/base.xml.in.h:910
+msgid "zh"
+msgstr "Ктс"
 
 #: ../rules/base.extras.xml.in.h:1
-msgid "APL"
-msgstr "APL"
+msgid "APL Keyboard Symbols"
+msgstr "знаци на клавишите в APL"
 
-#: ../rules/base.extras.xml.in.h:2
+#: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
-msgstr "ацинска"
+msgstr " ацинска"
 
-#: ../rules/base.extras.xml.in.h:3
+#: ../rules/base.extras.xml.in.h:5
 msgid "Avestan"
 msgstr "авестийска"
 
-#: ../rules/base.extras.xml.in.h:4
-msgid "Combining accents instead of dead keys"
-msgstr "комбиниращи ударения вместо „мъртви“ клавиши"
-
-#: ../rules/base.extras.xml.in.h:5
+#: ../rules/base.extras.xml.in.h:6
 msgid "Couer D'alene Salish"
 msgstr "селиш на кор дален"
 
-#: ../rules/base.extras.xml.in.h:6
-msgid "International (AltGr Unicode combining)"
-msgstr "международна, с комбинации по Уникод чрез AltGr"
+#: ../rules/base.extras.xml.in.h:8
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "английска — международна, с комбинации по Уникод чрез AltGr"
+
+#: ../rules/base.extras.xml.in.h:9
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr ""
+"английска — международна, с комбинации по Уникод чрез AltGr, алтернативна"
+
+#: ../rules/base.extras.xml.in.h:11
+msgid "Kutenai"
+msgstr "кутенейска"
+
+#: ../rules/base.extras.xml.in.h:13
+msgid "Latvian (US Colemak)"
+msgstr "латвийска — американска, Коулмак"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "латвийска — американска, Коулмак, с „'“"
+
+#: ../rules/base.extras.xml.in.h:15
+msgid "Latvian (US Dvorak)"
+msgstr "латвийска — американска, Дворак"
+
+#: ../rules/base.extras.xml.in.h:16
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "латвийска — американска, Дворак, „Y“ при интервала"
+
+#: ../rules/base.extras.xml.in.h:17
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr "латвийска — американска, Дворак, „-“ при интервала"
+
+#: ../rules/base.extras.xml.in.h:18
+msgid "Latvian (programmer US Dvorak)"
+msgstr "латвийска — американска, Дворак за програмисти"
+
+#: ../rules/base.extras.xml.in.h:19
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "латвийска — американска, Дворак за програмисти, „Y“ при интервала"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "латвийска — американска, Дворак за програмисти, „-“ при интервала"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "литовска — американска, Дворак с литовски букви"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "полска — международна, с „мъртви“ клавиши"
+
+#: ../rules/base.extras.xml.in.h:27
+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:30
+msgid "Secwepemctsin"
+msgstr "шъкуъпмъктчин"
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "сръбска — комбиниращи ударения вместо „мъртви“ клавиши"
+
+#: ../rules/base.extras.xml.in.h:33
+msgid "apl"
+msgstr "APL"
+
+#: ../rules/base.extras.xml.in.h:38
+msgid "kut"
+msgstr "Ктн"
 
-#: ../rules/base.extras.xml.in.h:7
-msgid "International (AltGr Unicode combining, alternative)"
-msgstr "международна, с алтернативни комбинации по Уникод чрез AltGr"
+#: ../rules/base.extras.xml.in.h:44
+msgid "shs"
+msgstr "Шкп"
diff --git a/xorg-server/xkeyboard-config/po/ca.po b/xorg-server/xkeyboard-config/po/ca.po
index 53b0bf898..5a7d737e4 100644
--- a/xorg-server/xkeyboard-config/po/ca.po
+++ b/xorg-server/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.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-26 23:59+0100\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-05-19 21:32+0200\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "Language: ca\n"
@@ -87,153 +87,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 "Afganès"
 
-#: ../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 i Meta són a les tecles 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 s'assigna a la tecla Win dreta i Super a Menú"
 
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:23
 msgid "Alt+Caps Lock"
 msgstr "Alt+Bloq Maj"
 
-#: ../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+Maj"
 
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:26
 msgid "Alt+Space"
 msgstr "Alt+Espai"
 
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:27
 msgid "Alt/Win key behavior"
 msgstr "Comportament de la tecla Alt/Win"
 
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:28
 msgid "Amharic"
 msgstr "Amhàric"
 
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:29
 msgid "Any Alt key"
 msgstr "Qualsevol tecla Alt"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr "Qualsevol tecla Win"
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr "Qualsevol tecla Win (mentre estan premudes)"
 
-#: ../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 "Teclat Apple Aluminium (ANSI)"
 
-#: ../rules/base.xml.in.h:35
+#: ../rules/base.xml.in.h:34
 msgid "Apple Aluminium Keyboard (ISO)"
 msgstr "Teclat Apple Aluminium (ISO)"
 
-#: ../rules/base.xml.in.h:36
+#: ../rules/base.xml.in.h:35
 msgid "Apple Aluminium Keyboard (JIS)"
 msgstr "Teclat Apple Aluminium (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 "Teclat Apple Aluminium: emula les tecles del PC (Impr, Bloq Despl, Pausa, Bloq Núm)"
 
-#: ../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 "Àrab"
 
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:39
 msgid "Arabic (Buckwalter)"
 msgstr "Àrab (Buckwalter)"
 
-#: ../rules/base.xml.in.h:41
+#: ../rules/base.xml.in.h:40
 msgid "Arabic (Morocco)"
 msgstr "Àrab (Marroc)"
 
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:41
 msgid "Arabic (Pakistan)"
 msgstr "Àrab (Pakistan)"
 
-#: ../rules/base.xml.in.h:43
+#: ../rules/base.xml.in.h:42
 msgid "Arabic (Syria)"
 msgstr "Àrab (Síria)"
 
-#: ../rules/base.xml.in.h:44
+#: ../rules/base.xml.in.h:43
 msgid "Arabic (azerty)"
 msgstr "Àrab (azerty)"
 
-#: ../rules/base.xml.in.h:45
+#: ../rules/base.xml.in.h:44
 msgid "Arabic (azerty/digits)"
 msgstr "Àrab (azerty/dígits)"
 
-#: ../rules/base.xml.in.h:46
+#: ../rules/base.xml.in.h:45
 msgid "Arabic (digits)"
 msgstr "Àrab (dígits)"
 
-#: ../rules/base.xml.in.h:47
+#: ../rules/base.xml.in.h:46
 msgid "Arabic (qwerty)"
 msgstr "Àrab (qwerty)"
 
-#: ../rules/base.xml.in.h:48
+#: ../rules/base.xml.in.h:47
 msgid "Arabic (qwerty/digits)"
 msgstr "Àrab (qwerty/dígits)"
 
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
 msgid "Armenian"
 msgstr "Armeni"
 
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:49
 msgid "Armenian (alternative eastern)"
 msgstr "Armeni (oriental alternatiu)"
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
 msgid "Armenian (alternative phonetic)"
 msgstr "Armeni (fonètic alternatiu)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 msgid "Armenian (eastern)"
 msgstr "Armeni (oriental)"
 
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:52
 msgid "Armenian (phonetic)"
 msgstr "Armeni (fonètic)"
 
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:53
 msgid "Armenian (western)"
 msgstr "Armeni (occidental)"
 
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturià (Espanya, amb H punt baix i L amb punt baix)"
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "Portàtil Asus"
@@ -251,13 +251,13 @@ msgid "Avatime"
 msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijan (Cyrillic)"
-msgstr "Azerbaitjan (ciríl·lic)"
-
-#: ../rules/base.xml.in.h:60
 msgid "Azerbaijani"
 msgstr "Àzeri"
 
+#: ../rules/base.xml.in.h:60
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Àzeri (ciríl·lic)"
+
 #: ../rules/base.xml.in.h:61
 msgid "Azona RF2300 wireless Internet Keyboard"
 msgstr "Teclat Azona RF2300 wireless Internet"
@@ -303,3456 +303,3616 @@ msgid "Backslash"
 msgstr "Barra inversa"
 
 #: ../rules/base.xml.in.h:72
-msgid "Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr "La barra inversa selecciona el nivell 3r, bloqueja en prémer conjuntament amb un altre selector de nivell 3r"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Barra inversa (selecciona el nivell 3r, bloqueja en prémer conjuntament amb un altre selector de 3r nivell)"
 
 #: ../rules/base.xml.in.h:73
 msgid "Bambara"
 msgstr "Bambara"
 
 #: ../rules/base.xml.in.h:74
+msgid "Bashkirian"
+msgstr "Baixkir"
+
+#: ../rules/base.xml.in.h:75
 msgid "Belarusian"
 msgstr "Bielorús"
 
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:76
 msgid "Belarusian (Latin)"
 msgstr "Bielorús (llatí)"
 
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:77
 msgid "Belarusian (legacy)"
 msgstr "Bielorús (antic)"
 
-#: ../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 (alternatiu ISO)"
 
-#: ../rules/base.xml.in.h:79
+#: ../rules/base.xml.in.h:80
 msgid "Belgian (Sun dead keys)"
 msgstr "Belga (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belga (Wang model 724 azerty)"
 
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:82
 msgid "Belgian (alternative)"
 msgstr "Belga (alternatiu)"
 
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:83
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belga (alternatiu, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belga (alternatiu, només latin-9)"
 
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:85
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belga (elimina les tecles mortes)"
 
-#: ../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 "Berber (Marroc, Tifinagh fonètic alternatiu)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berber (Marroc, Tifinagh alternatiu)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berber (Marroc, Tifinagh fonètic ampliat)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berber (Marroc, Tifinagh ampliat)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berber (Marroc, Tifinagh fonètic)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berber (Marroc, Tifinagh)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bosnian"
 msgstr "Bosnià"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
-msgstr "Bosnià (teclat US amb dígrafs bosnians)"
+msgstr "Bosnià (teclat EUA amb dígrafs bosnians)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bosnian (US keyboard with Bosnian letters)"
-msgstr "Bosnià (teclat US amb lletres bosnianes)"
+msgstr "Bosnià (teclat EUA amb lletres bosnianes)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosnià (usa dígrafs bosnians)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosnià (usa cometes angulars per les cometes)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Both Alt keys together"
 msgstr "Les dues tecles Alt juntes"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Both Ctrl keys together"
 msgstr "Les dues tecles Ctrl juntes"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Both Shift keys together"
 msgstr "Les dues tecles Maj juntes"
 
-#: ../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 "Les dues tecles Maj juntes commuten Bloq Maj, una tecla Maj ho desactiva"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Les dues tecles Maj juntes commuten Bloq Maj"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Les dues tecles Maj juntes commuten Bloq Maj"
 
-#: ../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 (ma esquerra)"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Braille (right hand)"
 msgstr "Braille (ma dretà)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:111
 msgid "Brother Internet Keyboard"
 msgstr "Teclat Brother Internet"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:112
 msgid "Bulgarian"
 msgstr "Búlgar"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Bulgarian (new phonetic)"
 msgstr "Búlgar (fonètic nou)"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Búlgar (fonètic tradicional)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:115
 msgid "Burmese"
 msgstr "Birmà"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:116
 msgid "Canadian Multilingual"
 msgstr "Canadenc multilingüe"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Canadian Multilingual (first part)"
 msgstr "Canadenc multilingüe (primera part)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "Canadian Multilingual (second part)"
 msgstr "Canadenc multilingüe (segona part)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:119
 msgid "Caps Lock"
 msgstr "Bloq Majús"
 
-#: ../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 Maj (selecciona el nivell 3r, bloqueja en prémer conjuntament amb un altre selector de nivell 3r)"
 
-#: ../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 Maj (a la primera disposició), Maj+Bloq Maj (a la darrera disposició)"
 
-#: ../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 Maj (mentre està premuda), Alt+Bloq Maj efectua l'acció de Bloq Maj original"
 
-#: ../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 Maj actua com a Maj amb bloqueig. Maj «pausa» Bloq Maj"
 
-#: ../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 Maj actua com a Maj amb bloqueig. Maj no afecta a Bloq Maj"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock is disabled"
 msgstr "Bloq Maj està deshabilitat"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock key behavior"
 msgstr "Comportament de la tecla Bloq Maj"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:127
 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:127
+#: ../rules/base.xml.in.h:128
 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:128
+#: ../rules/base.xml.in.h:129
 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:129
+#: ../rules/base.xml.in.h:130
 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:130
+#: ../rules/base.xml.in.h:131
 msgid "Catalan"
 msgstr "Català"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:132
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Català (Espanya, L amb punt volat)"
+
+#: ../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ó 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 "Teclat Chicony Internet"
 
-#: ../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 "Xinès"
 
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "Xinès (Tibetà amb nombres ASCII)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "Xinès (Tibetà)"
-
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "Xinès (Uigur)"
+msgid "Chuvash"
+msgstr "Chuvash"
 
 #: ../rules/base.xml.in.h:147
+msgid "Chuvash (Latin)"
+msgstr "Chuvash (llatí)"
+
+#: ../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 "Teclat Compaq Easy Access"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:151
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Teclat Compaq Internet (13 tecles)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:152
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Teclat Compaq Internet (18 tecles)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Teclat Compaq Internet (7 tecles)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:154
 msgid "Compaq iPaq Keyboard"
 msgstr "Teclat Compaq iPaq"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:155
 msgid "Compose key position"
 msgstr "Posició de la tecla Compose"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:156
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Retrocés"
 
-#: ../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 s'assigna a les tecles Alt, Alt s'assigna a les tecles 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 s'assigna a les tecles Win (i a les tecles Ctrl habituals)"
 
-#: ../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àtar de Crimea (Dobruja Q)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Tàtar de Crimea (Turc Alt-Q)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Tàtar de Crimea (Turc F)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Tàtar de Crimea (Turc Q)"
+
+#: ../rules/base.xml.in.h:164
 msgid "Croatian"
 msgstr "Croat"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:165
 msgid "Croatian (US keyboard with Croatian digraphs)"
-msgstr "Croat (teclat US amb dígrafs croats)"
+msgstr "Croat (teclat EUA amb dígrafs croats)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:166
 msgid "Croatian (US keyboard with Croatian letters)"
-msgstr "Croat (teclat US amb lletres croates)"
+msgstr "Croat (teclat EUA amb lletres croates)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
+#: ../rules/base.xml.in.h:167
+msgid "Croatian (use Croatian digraphs)"
 msgstr "Croat (usa dígrafs croats)"
 
-#: ../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 "Croat (usa cometes angulars per les cometes)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Ctrl key position"
 msgstr "Posició de la tecla Ctrl"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Maj"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Czech"
 msgstr "Txec"
 
-#: ../rules/base.xml.in.h:166
-msgid "Czech (UCW layout accented letters only)"
-msgstr "Txec (disposició UCW només lletres accentuades)"
+#: ../rules/base.xml.in.h:172
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "Txec (disposició UCW, només lletres accentuades)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Czech (US Dvorak with CZ UCW support)"
-msgstr "Txec (Dvorak US que permet UCW CZ)"
-
-#: ../rules/base.xml.in.h:168
-msgid "Czech (With &lt;\\|&gt; key)"
-msgstr "Txec (amb la tecla &lt;\\|&gt;)"
+msgstr "Txec (dvorak EUA que permet UCW CZ)"
 
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:174
 msgid "Czech (qwerty)"
 msgstr "Txec (qwerty)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:175
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Txec (qwerty, barra inversa ampliada)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:176
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Txec (amb la tecla &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 "Danès"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Danish (Dvorak)"
-msgstr "Danès (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, elimina les tecles mortes)"
+#: ../rules/base.xml.in.h:181
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Danès (Macintosh, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Danish (eliminate dead keys)"
 msgstr "Danès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "Default numeric keypad keys"
 msgstr "Tecles del teclat numèric per defecte"
 
-#: ../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 tecles"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Portàtil Dell Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Portàtil Dell sèrie Precision M"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Dell Latitude series laptop"
 msgstr "Portàtil Dell sèrie 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 "Teclat Dell USB Multimedia"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Teclat Dexxa Wireless Desktop"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dhivehi"
 msgstr "Diveí"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond sèries 9801 / 9802"
 
-#: ../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 (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dutch (standard)"
 msgstr "Holandès (estàndard)"
 
-#: ../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 "Habilita els caràcters tipogràfics extres"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
+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
+msgid "English (Cameroon)"
+msgstr "Anglès (Camerun)"
+
+#: ../rules/base.xml.in.h:205
 msgid "English (Canada)"
 msgstr "Anglès (Canadà)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:206
 msgid "English (Colemak)"
 msgstr "Anglès (Colemak)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:207
 msgid "English (Dvorak alternative international no dead keys)"
-msgstr "Anglès (Dvorak internacional alternatiu sense tecles mortes)"
+msgstr "Anglès (dvorak internacional alternatiu sense tecles mortes)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:208
 msgid "English (Dvorak international with dead keys)"
-msgstr "Anglès (Dvorak internacional amb tecles mortes)"
+msgstr "Anglès (dvorak internacional amb tecles mortes)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:209
 msgid "English (Dvorak)"
-msgstr "Anglès (Dvorak)"
+msgstr "Anglès (dvorak)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:210
 msgid "English (Ghana)"
 msgstr "Anglès (Ghana)"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:211
 msgid "English (Ghana, GILLBT)"
 msgstr "Anglès (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:212
 msgid "English (Ghana, multilingual)"
 msgstr "Anglès (Ghana, multilingüe)"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:213
 msgid "English (India, with RupeeSign)"
 msgstr "Anglès (Índia, amb signe de rupia)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:214
 msgid "English (Macintosh)"
 msgstr "Anglès (Macintosh)"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
-msgstr "Anglès (Mali, Mac EUA)"
+#: ../rules/base.xml.in.h:215
+msgid "English (Mali, US Macintosh)"
+msgstr "Anglès (Mali, Macintosh EUA)"
 
-#: ../rules/base.xml.in.h:207
-msgid "English (Mali, USA international)"
+#: ../rules/base.xml.in.h:216
+msgid "English (Mali, US international)"
 msgstr "Anglès (Mali, internacional EUA)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:217
 msgid "English (Nigeria)"
 msgstr "Anglès (Nigèria)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:218
 msgid "English (South Africa)"
 msgstr "Anglès (Sud-àfrica)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:219
 msgid "English (UK)"
 msgstr "Anglès (RU)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:220
 msgid "English (UK, Colemak)"
 msgstr "Anglès (RU, Colemak)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
-msgstr "Anglès (RU, Dvorak amb puntuació RU)"
+#: ../rules/base.xml.in.h:221
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Anglès (RU, dvorak amb puntuació RU)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:222
 msgid "English (UK, Dvorak)"
-msgstr "Anglès (RU, Dvorak)"
+msgstr "Anglès (RU, dvorak)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
-msgstr "Anglès (RU, Mac internacional)"
+#: ../rules/base.xml.in.h:223
+msgid "English (UK, Macintosh international)"
+msgstr "Anglès (RU, Macintosh internacional)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
-msgstr "Anglès (RU, Mac)"
+#: ../rules/base.xml.in.h:224
+msgid "English (UK, Macintosh)"
+msgstr "Anglès (RU, Macintosh)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
-msgstr "Anglès (RU, ampliat, tecles Win)"
+#: ../rules/base.xml.in.h:225
+msgid "English (UK, extended WinKeys)"
+msgstr "Anglès (RU, tecles Win ampliades)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, international with dead keys)"
 msgstr "Anglès (RU, internacional amb tecles mortes)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
 msgid "English (US)"
-msgstr "Anglès (US)"
+msgstr "Anglès (EUA)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:228
 msgid "English (US, alternative international)"
-msgstr "Anglès (US, internacional alternatiu)"
+msgstr "Anglès (EUA, internacional alternatiu)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:229
 msgid "English (US, international with dead keys)"
-msgstr "Anglès (US, internacional amb tecles mortes)"
+msgstr "Anglès (EUA, internacional amb tecles mortes)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:230
 msgid "English (US, with euro on 5)"
-msgstr "Anglès (US, amb l'euro en el 5)"
+msgstr "Anglès (EUA, amb l'euro en el 5)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:231
 msgid "English (classic Dvorak)"
-msgstr "Anglès (Dvorak clàssic)"
+msgstr "Anglès (dvorak clàssic)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:232
 msgid "English (international AltGr dead keys)"
 msgstr "Anglès (internacional tecles mortes AltGr)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:233
 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:225
+#: ../rules/base.xml.in.h:234
 msgid "English (left handed Dvorak)"
-msgstr "Anglès (Dvorak esquerrà)"
+msgstr "Anglès (dvorak esquerrà)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:235
 msgid "English (programmer Dvorak)"
-msgstr "Anglès (Dvorak de programador)"
+msgstr "Anglès (dvorak de programador)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:236
 msgid "English (right handed Dvorak)"
-msgstr "Anglès (Dvorak dretà)"
+msgstr "Anglès (dvorak dretà)"
 
-#: ../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 "Retorn en el teclat numèric"
 
-#: ../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, natiu)"
+
+#: ../rules/base.xml.in.h:241
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (punt i coma i cometa desplaçats, obsolet)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:242
 msgid "Estonian"
 msgstr "Estonià"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:243
 msgid "Estonian (Dvorak)"
-msgstr "Estonià (Dvorak)"
+msgstr "Estonià (dvorak)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:244
 msgid "Estonian (US keyboard with Estonian letters)"
-msgstr "Estonià (teclat US amb lletres estonianes)"
+msgstr "Estonià (teclat EUA amb lletres estonianes)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:245
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estonià (elimina les tecles mortes)"
 
-#: ../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 "Feroès"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:254
 msgid "Faroese (eliminate dead keys)"
 msgstr "Feroès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:255
 msgid "Filipino"
 msgstr "Filipí"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:256
 msgid "Filipino (Capewell-Dvorak Baybayin)"
-msgstr "Filipí (Capewell-Dvorak Baybayin)"
+msgstr "Filipí (Capewell-dvorak Baybayin)"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:257
 msgid "Filipino (Capewell-Dvorak Latin)"
-msgstr "Filipí (Capewell-Dvorak llatí)"
+msgstr "Filipí (Capewell-dvorak llatí)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:258
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filipí (Capewell-QWERF 2006 Baybayin)"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:259
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filipí (Capewell-QWERF 2006 llatí)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:260
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filipí (Colemak Baybayin)"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Colemak Latin)"
 msgstr "Filipí (Colemak llatí)"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:262
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Filipí (dvorak Baybayin)"
+
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Dvorak Latin)"
-msgstr "Filipí (Dvorak llatí)"
+msgstr "Filipí (dvorak llatí)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filipí (QWERTY Baybayin)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:265
 msgid "Finnish"
 msgstr "Finès"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
-msgstr "Finès (Mac)"
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
+msgstr "Finès (Macintosh)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:267
 msgid "Finnish (classic)"
 msgstr "Finès (clàssic)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:268
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finès (clàssic, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:258
-msgid "Finnish (northern Saami)"
-msgstr "Finès (Sami del nord)"
-
 #. 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 quatre nivells amb separadors abstractes"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:272
 msgid "Four-level key with comma"
 msgstr "Tecla de quatre nivells amb coma"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:273
 msgid "Four-level key with dot"
 msgstr "Tecla de quatre nivells amb punt"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:274
 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:265
+#: ../rules/base.xml.in.h:275
 msgid "Four-level key with momayyez"
 msgstr "Tecla de quatre nivells amb 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òmic, tipus Dvorak)"
+msgstr "Francès (Bepo, ergonòmic, tipus 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òmic, tipus Dvorak, només latin-9)"
+msgstr "Francès (Bepo, ergonòmic, tipus dvorak, només latin-9)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:279
 msgid "French (Breton)"
 msgstr "Francès (Bretó)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:280
+msgid "French (Cameroon azerty)"
+msgstr "Francès (azerty del Camerun)"
+
+#: ../rules/base.xml.in.h:281
+msgid "French (Cameroon)"
+msgstr "Francès (Camerun)"
+
+#: ../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)"
+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à, antic)"
 
-#: ../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 (Georgià AZERTY Tskapo)"
+msgstr "Francès (dvorak)"
 
-#: ../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 (Mali, alternatiu)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:290
 msgid "French (Morocco)"
 msgstr "Francès (Marroc)"
 
-#: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
-msgstr "Francès (Occità)"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:291
 msgid "French (Sun dead keys)"
 msgstr "Francès (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:292
 msgid "French (Switzerland)"
 msgstr "Francès (Suïssa)"
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
-msgstr "Francès (Suïssa, Mac)"
+#: ../rules/base.xml.in.h:293
+msgid "French (Switzerland, Macintosh)"
+msgstr "Francès (Suïssa, Macintosh)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:294
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Francès (Suïssa, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:295
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Francès (Suïssa, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:296
 msgid "French (alternative)"
 msgstr "Francès (alternatiu)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:297
 msgid "French (alternative, Sun dead keys)"
 msgstr "Francès (alternatiu, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:298
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Francès (alternatiu, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:299
 msgid "French (alternative, latin-9 only)"
 msgstr "Francès (alternatiu, només latin-9)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:300
 msgid "French (eliminate dead keys)"
 msgstr "Francès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
-msgstr "Francès (alternatiu antic)"
+#: ../rules/base.xml.in.h:301
+msgid "French (legacy, alternative)"
+msgstr "Francès (antic, alternatiu)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:302
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Francès (antic, alternatiu, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:303
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Francès (antic, alternatiu, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:304
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO portàtil"
 
-#: ../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èric de 101 tecles"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:308
 msgid "Generic 102-key (Intl) PC"
 msgstr "PC genèric de 102 tecles (intl)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:309
 msgid "Generic 104-key PC"
 msgstr "PC genèric de 104 tecles"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:310
 msgid "Generic 105-key (Intl) PC"
 msgstr "PC genèric de 105 tecles (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 / Teclat Genius MM 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 "Georgià"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:317
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Georgià (França, AZERTY Tskapo)"
+
+#: ../rules/base.xml.in.h:318
+msgid "Georgian (Italy)"
+msgstr "Georgià (Itàlia)"
+
+#: ../rules/base.xml.in.h:319
 msgid "Georgian (MESS)"
 msgstr "Georgià (MESS)"
 
-#: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
-msgstr "Georgià (Osseta)"
-
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:320
 msgid "Georgian (ergonomic)"
 msgstr "Georgià (ergonòmic)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:321
 msgid "German"
 msgstr "Alemany"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:322
 msgid "German (Austria)"
 msgstr "Alemany (Àustria)"
 
-#: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
-msgstr "Alemany (Àustria, Mac)"
+#: ../rules/base.xml.in.h:323
+msgid "German (Austria, Macintosh)"
+msgstr "Alemany (Àustria, Macintosh)"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:324
 msgid "German (Austria, Sun dead keys)"
 msgstr "Alemany (Àustria, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:325
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Alemany (Àustria, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:326
 msgid "German (Dvorak)"
-msgstr "Alemany (Dvorak)"
+msgstr "Alemany (dvorak)"
 
-#: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
-msgstr "Alemany (Mac)"
+#: ../rules/base.xml.in.h:327
+msgid "German (Macintosh)"
+msgstr "Alemany (Macintosh)"
 
-#: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
-msgstr "Alemany (Mac, elimina les tecles mortes)"
+#: ../rules/base.xml.in.h:328
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Alemany (Macintosh, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:329
 msgid "German (Neo 2)"
 msgstr "Alemany (Neo 2)"
 
-#: ../rules/base.xml.in.h:319
-msgid "German (Romanian keyboard with German letters)"
-msgstr "Alemany (teclat romanès amb lletres alemanyes)"
-
-#: ../rules/base.xml.in.h:320
-msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
-msgstr "Alemany (teclat romanès amb lletres alemanyes, elimina les tecles mortes)"
-
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:330
 msgid "German (Sun dead keys)"
 msgstr "Alemany (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
-msgstr "Alemany (Suïssa, Mac)"
+#: ../rules/base.xml.in.h:331
+msgid "German (Switzerland)"
+msgstr "Alemany (Suïssa)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
+msgstr "Alemany (Suïssa, Macintosh)"
+
+#: ../rules/base.xml.in.h:333
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Alemany (Suïssa, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:334
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Alemany (Suïssa, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:335
+msgid "German (Switzerland, legacy)"
+msgstr "Alemany (Suïssa, antic)"
+
+#: ../rules/base.xml.in.h:336
 msgid "German (dead acute)"
 msgstr "Alemany (accent mort)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:337
 msgid "German (dead grave acute)"
 msgstr "Alemany (accent greu mort)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:338
 msgid "German (eliminate dead keys)"
 msgstr "Alemany (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
-msgstr "Alemany (baix sòrab qwertz)"
-
-#: ../rules/base.xml.in.h:329
-msgid "German (lower Sorbian)"
-msgstr "Alemany (baix sòrab)"
-
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:339
 msgid "German (qwerty)"
 msgstr "Alemany (qwerty)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:340
 msgid "Greek"
 msgstr "Grec"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:341
 msgid "Greek (eliminate dead keys)"
 msgstr "Grec (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:342
 msgid "Greek (extended)"
 msgstr "Grec (ampliat)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:343
 msgid "Greek (polytonic)"
 msgstr "Grec (politònic)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:344
 msgid "Greek (simple)"
 msgstr "Grec (senzill)"
 
-#: ../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 "Teclat Happy Hacking"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:349
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Teclat Happy Hacking per a Mac"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:350
 msgid "Hausa"
 msgstr "Haussa"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:351
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: ../rules/base.xml.in.h:343
-msgid "Hebrew (Phonetic)"
-msgstr "Hebreu (fonètic)"
-
-#: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
-msgstr "Hebreu (Tiro)"
+#: ../rules/base.xml.in.h:352
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Hebreu (bíblic, Tiro)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "Hebrew (lyx)"
 msgstr "Hebreu (lyx)"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
+msgid "Hebrew (phonetic)"
+msgstr "Hebreu (fonètic)"
+
+#: ../rules/base.xml.in.h:355
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Teclat Hewlett-Packard Internet"
 
-#: ../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 "Teclat Hewlett-Packard SK-250x Multimedia"
 
-#: ../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èfon HTC Dream"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:372
 msgid "Hungarian"
 msgstr "Hongarès"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:373
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Hongarès (101/qwerty/coma/tecles mortes)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:374
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Hongarès (101/qwerty/coma/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Hongarès (101/qwerty/punt/tecles mortes)"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Hongarès (101/qwerty/punt/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Hongarès (101/qwertz/coma/tecles mortes)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Hongarès (101/qwertz/coma/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Hongarès (101/qwertz/punt/tecles mortes)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Hongarès (101/qwertz/punt/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Hongarès (102/qwerty/coma/tecles mortes)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Hongarès (102/qwerty/coma/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Hongarès (102/qwerty/punt/tecles mortes)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Hongarès (102/qwerty/punt/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Hongarès (102/qwertz/coma/tecles mortes)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Hongarès (102/qwertz/coma/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Hongarès (102/qwertz/punt/tecles mortes)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Hongarès (102/qwertz/punt/elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Hongarès (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (qwerty)"
 msgstr "Hongarès (qwerty)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (standard)"
 msgstr "Hongarès (estàndard)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:392
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper s'assigna a les tecles 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 "Islandès"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:400
 msgid "Icelandic (Dvorak)"
-msgstr "Islandès (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 (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islandès (elimina les tecles mortes)"
 
-#: ../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 "Indi"
 
-#: ../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 "Iraquià"
 
-#: ../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 (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:410
 msgid "Italian"
 msgstr "Italià"
 
-#: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
-msgstr "Italià (Georgià)"
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
-msgstr "Italià (Mac)"
+#: ../rules/base.xml.in.h:411
+msgid "Italian (Macintosh)"
+msgstr "Italià (Macintosh)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:412
 msgid "Italian (US keyboard with Italian letters)"
-msgstr "Italià (teclat US amb lletres italianes)"
+msgstr "Italià (teclat EUA amb lletres italianes)"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:413
 msgid "Italian (eliminate dead keys)"
 msgstr "Italià (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:414
 msgid "Japanese"
 msgstr "Japonès"
 
-#: ../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 (sèries PC-98xx)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:420
 msgid "Japanese keyboard options"
 msgstr "Opcions del teclat japonès"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:421
+msgid "Kalmyk"
+msgstr "Calmuc"
+
+#: ../rules/base.xml.in.h:422
 msgid "Kana Lock key is locking"
 msgstr "La tecla de bloqueig Kana està blocant"
 
-#: ../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 "Caixubi"
+
+#: ../rules/base.xml.in.h:425
 msgid "Kazakh"
 msgstr "Kazakh"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:426
 msgid "Kazakh (with Russian)"
 msgstr "Kazakh (amb rus)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:427
 msgid "Key sequence to kill the X server"
 msgstr "Seqüència de tecles per a matar el servidor X"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:428
 msgid "Key to choose 3rd level"
 msgstr "Tecla per a seleccionar el 3r nivell"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:429
 msgid "Key to choose 5th level"
 msgstr "Tecla per a seleccionar el 5è nivell"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:430
 msgid "Key(s) to change layout"
 msgstr "Tecla(es) per a canviar la disposició"
 
-#: ../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 (Cambotja)"
 
-#: ../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 "Coreà"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Korean (101/104 key compatible)"
 msgstr "Coreà (compatible de 101/104 tecles)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurd (Iran, àrab-llatí)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Kurdish (Iran, F)"
 msgstr "Kurd (Iran, F)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kurd (Iran, llatí Alt-Q)"
+
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurd (Iran, llatí Q)"
 
-#: ../rules/base.xml.in.h:433
-msgid "Kurdish (Iran, latin alt-Q)"
-msgstr "Kurd (Iran, llatí Alt-Q)"
-
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurd (Iraq, àrab-llatí)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurd (Iraq, F)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurd (Iraq, llatí Alt-Q)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurd (Iraq, llatí Q)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Syria, F)"
 msgstr "Kurd (Síria, F)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurd (Síria, llatí Alt-Q)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurd (Síria, llatí Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurd (Turquia, F)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurd (Turquia, llatí Alt-Q)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurd (Turquia, llatí 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ís"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:453
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirguís (fonètic)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:454
 msgid "Lao"
 msgstr "Laosià"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:455
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Laosià (disposició estàndard proposada per STEA)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:456
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Teclat de portàtil Compaq (p.ex. Armada)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:457
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Teclat Internet de portàtil Compaq (p.ex. Presario)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:458
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Portàtil 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ó"
 
-#: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
-msgstr "Letó (variant amb apòstrof ')"
-
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:460
 msgid "Latvian (F variant)"
 msgstr "Letó (variant F)"
 
-#: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
-msgstr "Letó (variant titlla ~)"
+#: ../rules/base.xml.in.h:461
+msgid "Latvian (adapted)"
+msgstr "Letó (adaptat)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:462
+msgid "Latvian (apostrophe variant)"
+msgstr "Letó (variant amb apòstrof)"
+
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Letó (ergonòmic, ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:464
+msgid "Latvian (modern)"
+msgstr "Letó (modern)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "Letó (variant titlla)"
+
+#: ../rules/base.xml.in.h:466
 msgid "Left Alt"
 msgstr "Alt esquerra"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:467
 msgid "Left Alt (while pressed)"
 msgstr "Alt esquerra (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:468
 msgid "Left Alt is swapped with Left Win"
 msgstr "Alt esquerra està intercanviada amb la tecla Win esquerra"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:469
 msgid "Left Ctrl"
 msgstr "Ctrl esquerra"
 
-#: ../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 esquerra (a la primera disposició), Ctrl dreta (a la darrera disposició)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:471
 msgid "Left Ctrl+Left Shift"
 msgstr "Ctrl esquerra + Maj esquerra"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:472
 msgid "Left Shift"
 msgstr "Maj esquerra"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:473
 msgid "Left Win"
 msgstr "Win esquerra"
 
-#: ../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 esquerra (a la primera disposició), Win/Menú dreta (a la darrera disposició)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:475
 msgid "Left Win (while pressed)"
 msgstr "Win esquerra (mentre està premuda)"
 
-#: ../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 esquerra selecciona el nivell 5è, bloqueja en prémer conjuntament amb un altre selector de nivell 5è"
 
-#: ../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 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:468
+#: ../rules/base.xml.in.h:478
 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:469
+#: ../rules/base.xml.in.h:479
 msgid "Legacy"
 msgstr "Antic"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:480
 msgid "Legacy Wang 724"
 msgstr "Wang 724 antic"
 
 #. 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 antiga amb coma"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:483
 msgid "Legacy key with dot"
 msgstr "Tecla antiga amb punt"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
 msgid "Lithuanian"
 msgstr "Lituà"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:485
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Lituà (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:486
 msgid "Lithuanian (LEKP)"
 msgstr "Lituà (LEKP)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:487
 msgid "Lithuanian (LEKPa)"
 msgstr "Lituà (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:488
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
-msgstr "Lituà (teclat US amb lletres lituanes)"
+msgstr "Lituà (teclat EUA amb lletres lituanes)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (standard)"
 msgstr "Lituà (estàndard)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:490
 msgid "Logitech Access Keyboard"
 msgstr "Teclat Logitech Access"
 
-#: ../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 (opció 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ó 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 amb tecles extres via G15daemon"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Generic Keyboard"
 msgstr "Teclat Logitech genèric"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Teclat Logitech Internet 350"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Internet Keyboard"
 msgstr "Teclat Logitech Internet"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:504
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Teclat Logitech Internet Navigator"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Media Elite Keyboard"
 msgstr "Teclat Logitech Media Elite"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Teclat Logitech Ultra-X Cordless Media Desktop"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Teclat Logitech Ultra-X"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:508
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Teclat Logitech diNovo Edge"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:509
 msgid "Logitech diNovo Keyboard"
 msgstr "Teclat Logitech diNovo"
 
-#: ../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 "Teclat Logitech iTouch Cordless (model Y-RB6)"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:512
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Teclat Logitech iTouch Internet Navigator SE"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:513
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Teclat Logitech iTouch Internet Navigator SE (USB)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:514
+msgid "Lower Sorbian"
+msgstr "Baix sòrab"
+
+#: ../rules/base.xml.in.h:515
+msgid "Lower Sorbian (qwertz)"
+msgstr "Baix sòrab (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 "Macedoni"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:519
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macedoni (elimina les tecles mortes)"
 
-#: ../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 antic"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:522
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Converteix Bloq Maj en un Retrocés addicional"
 
-#: ../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 "Converteix Bloq Maj en un Bloq Núm addicional però manté el «keysym» «Caps_Lock»"
 
-#: ../rules/base.xml.in.h:512
+#: ../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:513
+#: ../rules/base.xml.in.h:525
 msgid "Make Caps Lock an additional ESC"
 msgstr "Converteix Bloq Maj en un Esc addicional"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Converteix Bloq Maj en un Hyper addicional"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Converteix Bloq Maj en un Bloq Núm addicional"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional Super"
 msgstr "Converteix Bloq Maj en un Super addicional"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:529
 msgid "Malayalam"
 msgstr "Malaiàlam"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:530
 msgid "Malayalam (Lalitha)"
 msgstr "Malaiàlam (Lalitha)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:531
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malaiàlam (Inscript realçat, amb el signe 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 (amb disposició US)"
+msgstr "Maltès (amb disposició EUA)"
 
-#: ../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 "Teclat Memorex MX2500 EZ-Access"
 
-#: ../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 "Meta s'assigna a la tecla Win esquerra"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:541
 msgid "Meta is mapped to Win keys"
 msgstr "Meta s'assigna a les tecles Win"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:542
 msgid "Meta on Left Ctrl"
 msgstr "Meta en el Ctrl esquerre"
 
-#: ../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 "Teclat Microsoft Internet"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:545
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Suec"
 
-#: ../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 "Teclat Microsoft Natural Elite"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Teclat Microsoft Natural Pro / Teclat Microsoft Internet Pro"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Teclat Microsoft Natural 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 "Teclat Microsoft Natural Pro USB / Teclat Microsoft Internet Pro"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "Teclat Microsoft Natural Wireless Ergonomic 4000"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "Teclat Microsoft Natural Wireless Ergonomic 7000"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:553
 msgid "Microsoft Office Keyboard"
 msgstr "Teclat Microsoft Office"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Teclat Microsoft Wireless Multimedia 1.0A"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:555
 msgid "Miscellaneous compatibility options"
 msgstr "Opcions de compatibilitat diverses"
 
-#: ../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í"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:558
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrí (ciríl·lic amb cometes angulars)"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:559
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrí (ciríl·lic)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrí (ciríl·lic, Z i ZHE intercanviades)"
 
-#: ../rules/base.xml.in.h:547
-msgid "Montenegrin (Latin qwerty)"
-msgstr "Montenegrí (llatí qwerty)"
+#: ../rules/base.xml.in.h:561
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Montenegrí (llatí Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:548
-msgid "Montenegrin (Latin unicode qwerty)"
-msgstr "Montenegrí (llatí unicode qwerty)"
+#: ../rules/base.xml.in.h:562
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Montenegrí (llatí Unicode)"
 
-#: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
-msgstr "Montenegrí (llatí unicode)"
+#: ../rules/base.xml.in.h:563
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Montenegrí (llatí qwerty)"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrí (llatí amb cometes angulars)"
 
-#: ../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 "Retrocés estil NICOLA-F"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:566
 msgid "Nepali"
 msgstr "Nepalès"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:567
 msgid "Non-breakable space character at fourth level"
 msgstr "Caràcter d'espai sense salt al nivell quart"
 
-#: ../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 d'espai sense salt al nivell quart, i un caràcter d'espai fi sense salt al nivell sisè"
 
-#: ../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 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:557
+#: ../rules/base.xml.in.h:570
 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:558
+#: ../rules/base.xml.in.h:571
 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:559
+#: ../rules/base.xml.in.h:572
 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:560
+#: ../rules/base.xml.in.h:573
 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:561
+#: ../rules/base.xml.in.h:574
+msgid "Northern Saami (Finland)"
+msgstr "Sami Nord (Finlàndia)"
+
+#: ../rules/base.xml.in.h:575
+msgid "Northern Saami (Norway)"
+msgstr "Sami Nord (Noruega)"
+
+#: ../rules/base.xml.in.h:576
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Sami Nord (Noruega, elimina les tecles mortes)"
+
+#: ../rules/base.xml.in.h:577
+msgid "Northern Saami (Sweden)"
+msgstr "Sami del nord (Suècia)"
+
+#: ../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 "Noruec"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:580
 msgid "Norwegian (Dvorak)"
-msgstr "Noruec (Dvorak)"
-
-#: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
-msgstr "Noruec (Mac)"
+msgstr "Noruec (dvorak)"
 
-#: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
-msgstr "Noruec (Mac, elimina les tecles mortes)"
+#: ../rules/base.xml.in.h:581
+msgid "Norwegian (Macintosh)"
+msgstr "Noruec (Macintosh)"
 
-#: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
-msgstr "Noruec (Sami del nord)"
+#: ../rules/base.xml.in.h:582
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Noruec (Macintosh, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Noruec (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:568
-msgid "Norwegian (northern Saami, eliminate dead keys)"
-msgstr "Noruec (Sami del nord, elimina les tecles mortes)"
-
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:584
 msgid "Num Lock"
 msgstr "Bloq Núm"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:585
 msgid "Numeric keypad delete key behaviour"
 msgstr "Comportament de la tecla de supressió del teclat numèric"
 
-#: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
-msgstr "Les tecles del teclat numèric funcionen com al Mac"
+#: ../rules/base.xml.in.h:586
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "Les tecles del teclat numèric funcionen com al Macintosh"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:587
 msgid "Numeric keypad layout selection"
 msgstr "Selecció de la disposició del teclat numèric"
 
-#: ../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 "Occità"
+
+#: ../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 "Oriya"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:593
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Teclat Ortek MCK-800 MM/Internet"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:594
+msgid "Ossetian (Georgia)"
+msgstr "Osset (Geòrgia)"
+
+#: ../rules/base.xml.in.h:595
+msgid "Ossetian (WinKeys)"
+msgstr "Osset (tecles Win)"
+
+#: ../rules/base.xml.in.h:596
+msgid "Ossetian (legacy)"
+msgstr "Osset (antic)"
+
+#: ../rules/base.xml.in.h:597
 msgid "PC-98xx Series"
 msgstr "Sèries PC-98xx"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:598
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Rutè Pannònic (homofònic)"
+
+#: ../rules/base.xml.in.h:599
 msgid "Pashto"
 msgstr "Paixtu"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:600
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Paixtu (Afganistan, 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 (Afganistan, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:604
 msgid "Persian (with Persian Keypad)"
 msgstr "Persa (amb teclat persa)"
 
-#: ../rules/base.xml.in.h:583
-msgid "Philippines - Dvorak (Baybayin)"
-msgstr "Filipines - Dvorak (Baybayin)"
-
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
 msgid "Polish"
 msgstr "Polonès"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:606
 msgid "Polish (Dvorak)"
-msgstr "Polonès (Dvorak)"
-
-#: ../rules/base.xml.in.h:586
-msgid "Polish (Dvorak, polish quotes on key 1)"
-msgstr "Polonès (Dvorak, cometes poloneses a la tecla 1)"
+msgstr "Polonès (dvorak)"
 
-#: ../rules/base.xml.in.h:587
-msgid "Polish (Dvorak, polish quotes on quotemark key)"
-msgstr "Polonès (Dvorak, cometes poloneses a la tecla cometes)"
+#: ../rules/base.xml.in.h:607
+msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgstr "Polonès (dvorak, cometes poloneses a la tecla 1)"
 
-#: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
-msgstr "Polonès (Caixubi)"
+#: ../rules/base.xml.in.h:608
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr "Polonès (dvorak, cometes poloneses a la tecla cometes)"
 
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:609
 msgid "Polish (programmer Dvorak)"
-msgstr "Polonès (Dvorak de programador)"
+msgstr "Polonès (dvorak de programador)"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:610
 msgid "Polish (qwertz)"
 msgstr "Polonès (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)"
+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, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portuguès (Brasil, natiu per a l'esperanto)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portuguès (Brasil, natiu per als teclats EUA)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portuguès (Brasil, natiu)"
 
-#: ../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, tecles mortes 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, elimina les tecles mortes)"
+#: ../rules/base.xml.in.h:619
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portuguès (Macintosh, tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr "Portuguès (natiu per a l'esperanto)"
+#: ../rules/base.xml.in.h:620
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Portuguès (Macintosh, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portuguès (natiu per als teclats EUA)"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Nativo)"
 msgstr "Portuguès (natiu)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portuguès (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portuguès (elimina les tecles mortes)"
 
-#: ../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 "ImprPant"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:627
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Panjabi (Gurmukhi Jhelum)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:628
 msgid "Punjabi (Gurmukhi)"
 msgstr "Panjabi (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 dreta"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:631
 msgid "Right Alt (while pressed)"
 msgstr "Alt dreta (mentre està premuda)"
 
-#: ../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 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:614
+#: ../rules/base.xml.in.h:633
 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: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 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:616
+#: ../rules/base.xml.in.h:635
 msgid "Right Alt key never chooses 3rd level"
 msgstr "La tecla Alt dreta mai selecciona el 3r nivell"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:636
 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:618
+#: ../rules/base.xml.in.h:637
 msgid "Right Ctrl"
 msgstr "Ctrl dreta"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:638
 msgid "Right Ctrl (while pressed)"
 msgstr "Ctrl dreta (mentre està premuda)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:639
 msgid "Right Ctrl as Right Alt"
 msgstr "Ctrl dreta com a Alt dreta"
 
-#: ../rules/base.xml.in.h:621
+#: ../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:622
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl+Right Shift"
 msgstr "Ctrl dreta+Maj dreta"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:642
 msgid "Right Shift"
 msgstr "Maj dreta"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:643
 msgid "Right Win"
 msgstr "Win dreta"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:644
 msgid "Right Win (while pressed)"
 msgstr "Win dreta (mentre està premuda)"
 
-#: ../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 dreta selecciona el nivell 5è, bloqueja en prémer conjuntament amb un altre selector de nivell 5è"
 
-#: ../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 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:628
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
 msgid "Romanian"
 msgstr "Romanès"
 
-#: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr "Romanès (Tàtar de Crimea Dobruca-1 Q)"
-
-#: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr "Romanès (Tàtar de Crimea Dobruca-2 Q)"
-
-#: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Romanès (Tàtar de Crimea Turc Alt-Q)"
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (Germany)"
+msgstr "Romanès (Alemanya)"
 
-#: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
-msgstr "Romanès (Tàtar de Crimea Turc F)"
+#: ../rules/base.xml.in.h:649
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Romanès (Alemanya, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:650
 msgid "Romanian (WinKeys)"
 msgstr "Romanès (tecles Win)"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (cedilla)"
 msgstr "Romanès (ce trencada)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (standard cedilla)"
 msgstr "Romanès (ce trencada estàndard)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (standard)"
 msgstr "Romanès (estàndard)"
 
-#: ../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 "Rus"
 
-#: ../rules/base.xml.in.h:639
-msgid "Russian (Bashkirian)"
-msgstr "Rus (Baixkir)"
-
-#: ../rules/base.xml.in.h:640
-msgid "Russian (Chuvash Latin)"
-msgstr "Rus (Chuvash llatí)"
-
-#: ../rules/base.xml.in.h:641
-msgid "Russian (Chuvash)"
-msgstr "Rus (Chuvash)"
-
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:656
 msgid "Russian (DOS)"
 msgstr "Rus (DOS)"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:657
 msgid "Russian (Georgia)"
 msgstr "Rus (Geòrgia)"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:658
 msgid "Russian (Germany, phonetic)"
 msgstr "Rus (alemany, fonètic)"
 
-#: ../rules/base.xml.in.h:645
-msgid "Russian (Kalmyk)"
-msgstr "Rus (Calmuc)"
-
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:659
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Rus (Kazakhstan amb Kazakh)"
 
-#: ../rules/base.xml.in.h:647
-msgid "Russian (Komi)"
-msgstr "Rus (Komi)"
-
-#: ../rules/base.xml.in.h:648
-msgid "Russian (Mari)"
-msgstr "Rus (Mari)"
-
-#: ../rules/base.xml.in.h:649
-msgid "Russian (Ossetian, WinKeys)"
-msgstr "Rus (Osset, tecles Win)"
-
-#: ../rules/base.xml.in.h:650
-msgid "Russian (Ossetian, legacy)"
-msgstr "Rus (Osset, antic)"
-
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Poland, phonetic Dvorak)"
-msgstr "Rus (Polònia, fonètic Dvorak)"
-
-#: ../rules/base.xml.in.h:652
-msgid "Russian (Serbian)"
-msgstr "Rus (Sèrbia)"
+msgstr "Rus (Polònia, fonètic dvorak)"
 
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Sweden, phonetic)"
 msgstr "Rus (Suècia, fonètic)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Rus (Suècia, fonètic, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:655
-msgid "Russian (Tatar)"
-msgstr "Rus (Tàtar)"
-
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:663
 msgid "Russian (US, phonetic)"
-msgstr "Rus (US, fonètic)"
+msgstr "Rus (EUA, fonètic)"
 
-#: ../rules/base.xml.in.h:657
-msgid "Russian (Udmurt)"
-msgstr "Rus (Udmurt)"
-
-#: ../rules/base.xml.in.h:658
-msgid "Russian (Yakut)"
-msgstr "Rus (Iacut)"
+#: ../rules/base.xml.in.h:664
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Rus (Ucraïna, estàndard RSTU)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:665
 msgid "Russian (legacy)"
 msgstr "Rus (antic)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:666
 msgid "Russian (phonetic WinKeys)"
 msgstr "Rus (fonètic tecles Win)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:667
 msgid "Russian (phonetic)"
 msgstr "Rus (fonètic)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:668
 msgid "Russian (typewriter)"
 msgstr "Rus (màquina d'escriure)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:669
 msgid "Russian (typewriter, legacy)"
 msgstr "Rus (màquina d'escriure, antic)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:670
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "Teclat SILVERCREST Multimedia Wireless"
 
-#: ../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 (Taiwan)"
 
-#: ../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 "Secwepemctsin"
-
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:682
 msgid "Semi-colon on third level"
 msgstr "Punt i coma al tercer nivell"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
 msgid "Serbian"
 msgstr "Serbi"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbi (llatí Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbi (llatí Unicode)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:686
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbi (llatí qwerty)"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbi (llatí amb cometes angulars)"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin)"
 msgstr "Serbi (llatí)"
 
-#: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr "Serbi (Rutè Pannònic homofònic"
+#: ../rules/base.xml.in.h:689
+msgid "Serbian (Russia)"
+msgstr "Serbi (Rússia)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Serbi (Z i ZHE intercanviades)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (with guillemets)"
 msgstr "Serbi (llatí amb cometes angulars)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:692
 msgid "Serbo-Croatian (US)"
-msgstr "Serbocroat (US)"
+msgstr "Serbocroat (EUA)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:693
 msgid "Shift cancels Caps Lock"
 msgstr "Maj cancel·la Bloq Maj"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:694
 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:690
+#: ../rules/base.xml.in.h:695
 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:691
+#: ../rules/base.xml.in.h:696
 msgid "Shift+Caps Lock"
 msgstr "Maj+Bloq Maj"
 
-#: ../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 "Singalès"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:699
 msgid "Slovak"
 msgstr "Eslovac"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:700
 msgid "Slovak (extended Backslash)"
 msgstr "Eslovac (barra inversa ampliada)"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:701
 msgid "Slovak (qwerty)"
 msgstr "Eslovac (qwerty)"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:702
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Eslovac (qwerty, barra inversa ampliada)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Slovene"
+#: ../rules/base.xml.in.h:703
+msgid "Slovenian"
 msgstr "Eslovè"
 
-#: ../rules/base.xml.in.h:699
-msgid "Slovene (US keyboard with Slovenian letters)"
-msgstr "Eslovè (teclat US amb lletres eslovenes)"
+#: ../rules/base.xml.in.h:704
+msgid "Slovenian (US keyboard with Slovenian letters)"
+msgstr "Eslovè (teclat EUA amb lletres eslovenes)"
 
-#: ../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 "Eslovè (usa cometes angulars per les cometes)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:706
 msgid "Spanish"
 msgstr "Espanyol"
 
-#: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr "Espanyol (variant asturiana amb H punt baix i L amb punt)"
-
-#: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr "Espanyol (variant catalana amb L amb punt volat)"
-
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Spanish (Dvorak)"
-msgstr "Espanyol (Dvorak)"
+msgstr "Espanyol (dvorak)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Spanish (Latin American)"
 msgstr "Espanyol (llatinoamericà)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Espanyol (llatinoamericà, tecles mortes de Sun)"
+
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Espanyol (llatinoamericà, elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Espanyol (llatinoamericà, inclou la titlla morta)"
 
-#: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, sun dead keys)"
-msgstr "Espanyol (llatinoamericà, tecles mortes de Sun)"
-
-#: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
-msgstr "Espanyol (Mac)"
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Macintosh)"
+msgstr "Espanyol (Macintosh)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Sun dead keys)"
 msgstr "Espanyol (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (eliminate dead keys)"
 msgstr "Espanyol (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (include dead tilde)"
 msgstr "Espanyol (inclou la titlla morta)"
 
-#: ../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 "Tecles especials (Ctrl+Alt+&lt;tecla&gt;) gestionades en un servidor"
 
-#: ../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 "Teclat Super Power Multimedia"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 msgid "Swahili (Kenya)"
 msgstr "Suahili (Kenya)"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Swahili (Tanzania)"
 msgstr "Suahili (Tanzània)"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Intercanvia Ctrl i Bloq Maj"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swap ESC and Caps Lock"
 msgstr "Intercanvia Esc i Bloq Maj"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swedish"
 msgstr "Suec"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swedish (Dvorak)"
-msgstr "Suec (Dvorak)"
+msgstr "Suec (dvorak)"
 
-#: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
-msgstr "Suec (Mac)"
+#: ../rules/base.xml.in.h:725
+msgid "Swedish (Macintosh)"
+msgstr "Suec (Macintosh)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish (Svdvorak)"
 msgstr "Suec (Svdvorak)"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (eliminate dead keys)"
 msgstr "Suec (elimina les tecles mortes)"
 
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
-msgstr "Suec (Sami del nord)"
-
-#: ../rules/base.xml.in.h:726
-msgid "Swiss"
-msgstr "Suís"
-
-#: ../rules/base.xml.in.h:727
-msgid "Swiss (legacy)"
-msgstr "Suís (antic)"
-
 #: ../rules/base.xml.in.h:728
+msgid "Swedish Sign Language"
+msgstr "Idioma de signes suec"
+
+#: ../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 "Siri"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:731
 msgid "Syriac (phonetic)"
 msgstr "Siríac (fonètic)"
 
-#: ../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 (indígena)"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:734
 msgid "Tajik"
 msgstr "Tadjik"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:735
 msgid "Tajik (legacy)"
 msgstr "Tadjik (antic)"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:736
 msgid "Tamil"
 msgstr "Tàmil"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:737
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tàmil (Sri Lanka, tipus d'escriptura TAB)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:738
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tàmil (Sri Lanka, Unicode)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:739
 msgid "Tamil (TAB typewriter)"
 msgstr "Tàmil (tipus d'escriptura TAB)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tàmil (tipus d'escriptura TSCII)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Unicode)"
 msgstr "Tàmil (Unicode)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tàmil (teclat amb nombres)"
 
-#: ../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 "Tàtar"
+
+#: ../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 "Tai"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Tai (Pattachote)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
 msgid "Thai (TIS-820.2538)"
 msgstr "Tai (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
+msgid "Tibetan"
+msgstr "Tibetà"
+
+#: ../rules/base.xml.in.h:750
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetà (amb nombres ASCII)"
+
+#: ../rules/base.xml.in.h:751
 msgid "To the corresponding key in a Dvorak keyboard."
-msgstr "A la tecla corresponent en un teclat Dvorak."
+msgstr "A la tecla corresponent en un teclat 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 corresponent en un teclat Qwerty."
+msgstr "A la tecla corresponent en un teclat qwerty."
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:753
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Commuta les tecles de cursor amb Maj + BloqNum."
 
-#: ../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 "Teclat Trust Direct Access"
 
-#: ../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 "Teclat Trust Wireless 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 "Turc"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:760
 msgid "Turkish (Alt-Q)"
 msgstr "Turc (Alt-Q)"
 
-#: ../rules/base.xml.in.h:757
-msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
-msgstr "Turc (Tàtar de Crimea Turc Alt-Q)"
-
-#: ../rules/base.xml.in.h:758
-msgid "Turkish (Crimean Tatar Turkish F)"
-msgstr "Turc (Tàtar de Crimea Turc F)"
-
-#: ../rules/base.xml.in.h:759
-msgid "Turkish (Crimean Tatar Turkish Q)"
-msgstr "Turc (Tàtar de Crimea Turc Q)"
-
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:761
 msgid "Turkish (F)"
 msgstr "Turc (F)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:762
 msgid "Turkish (Sun dead keys)"
 msgstr "Turc (tecles mortes de Sun)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (international with dead keys)"
 msgstr "Turc (internacional amb tecles mortes)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:764
 msgid "Turkmen"
 msgstr "Turcman"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:765
 msgid "Turkmen (Alt-Q)"
 msgstr "Turcman (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 (mode 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 (mode 106:JP)"
 
-#: ../rules/base.xml.in.h:770
-msgid "Ukrainian"
-msgstr "Ucraïnès"
-
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Ucraïnès (Tàtar de Crimea Turc Alt-Q)"
+msgid "Udmurt"
+msgstr "Udmurt"
 
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "Ucraïnès (Tàtar de Crimea Turc F)"
+msgid "Ukrainian"
+msgstr "Ucraïnès"
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "Ucraïnès (Tàtar de Crimea Turc Q)"
-
-#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (WinKeys)"
 msgstr "Ucraïnès (tecles Win)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (homophonic)"
 msgstr "Ucraïnès (homofònic)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (legacy)"
 msgstr "Ucraïnès (antic)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (phonetic)"
 msgstr "Ucraïnès (fonètic)"
 
-#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr "Ucraïnès (estàndard RSTU en una disposició russa)"
-
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ucraïnès (estàndard RSTU)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (typewriter)"
 msgstr "Ucraïnès (màquina d'escriure)"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:779
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Addicions Unicode (fletxes i operadors matemàtics)"
 
-#: ../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 "Addicions Unicode (fletxes i operadors matemàtics). Els operadors matemàtics al nivell per defecte"
 
-#: ../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 "Urdú (Pakistan)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:783
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdú (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:784
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdú (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (WinKeys)"
 msgstr "Urdú (tecles Win)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdú (fonètic alternatiu)"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (phonetic)"
 msgstr "Urdú (fonètic)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:788
 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:791
+#: ../rules/base.xml.in.h:789
 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:792
+#: ../rules/base.xml.in.h:790
 msgid "Usual space at any level"
 msgstr "Espai normal en qualsevol nivell"
 
-#: ../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 "Uzbek"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:793
 msgid "Uzbek (Afghanistan)"
 msgstr "Uzbek (Afganistan)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:794
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Uzbek (Afganistan, OLPC)"
 
-#: ../rules/base.xml.in.h:796
-msgid "Uzbek (Crimean Tatar Turkish Alt-Q)"
-msgstr "Uzbek (Tàtar de Crimea Turc Alt-Q)"
-
-#: ../rules/base.xml.in.h:797
-msgid "Uzbek (Crimean Tatar Turkish F)"
-msgstr "Uzbek (Tàtar de Crimea Turc F)"
-
-#: ../rules/base.xml.in.h:798
-msgid "Uzbek (Crimean Tatar Turkish Q)"
-msgstr "Uzbek (Tàtar de Crimea Turc Q)"
-
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek (Latin)"
 msgstr "Uzbek (llatí)"
 
-#: ../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 "Teclat ViewSonic KU-306 Internet"
 
-#: ../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 "Teclat numèric Wang 724 amb addicions Unicode (fletxes i operadors matemàtics)"
 
-#: ../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 "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: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 "Teclat Yahoo! Internet"
 
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:803
+msgid "Yakut"
+msgstr "Iacut"
+
+#: ../rules/base.xml.in.h:804
 msgid "Yoruba"
 msgstr "Ioruba"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:805
 msgid "Zero-width non-joiner character at second level"
 msgstr "Caràcter separador d'amplada zero al nivell segon"
 
-#: ../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àcter separador d'amplada zero al nivell segon, i un caràcter d'espai sense salt al nivell tercer"
 
-#: ../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à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: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à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: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à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: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àcter separador d'amplada zero al nivell segon, un caràcter d'enllaç d'amplada zero al nivell tercer"
 
-#: ../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à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:815
+#: ../rules/base.xml.in.h:812
 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: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 "Iran"
-
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr "Iran - Avèstic"
+msgid "APL Keyboard Symbols"
+msgstr "Símbols de teclat APL"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "Lituània"
+msgid "Atsina"
+msgstr "Atsina"
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
-msgstr "Lituània - Dvorak"
+msgid "Avestan"
+msgstr "Avèstic"
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "Ltu"
-
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "Romania"
+msgid "Couer D'alene Salish"
+msgstr "Couer D'alene Salish"
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr "Romania - Ergonomic Touchtype"
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Anglès (EUA, combinació internacional Unicode AltGr)"
 
 #: ../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 "Anglès (EUA, combinació internacional Unicode AltGr, alternativa)"
 
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "Rússia"
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
-msgstr "Sèrbia"
+msgid "Kutenai"
+msgstr "Kutenai"
 
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
-msgstr "Sèrbia - Combinació d'accents en lloc de tecles mortes"
+msgid "Latvian (US Colemak)"
+msgstr "Letó (Colemak EUA)"
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
-msgstr "Srb"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Letó (Colemak EUA, variant amb apòstrof)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "EUA"
+msgid "Latvian (US Dvorak)"
+msgstr "Letó (dvorak EUA)"
 
 #: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
-msgstr "EUA - Atsina"
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Letó (dvorak EUA, variant Y)"
 
 #: ../rules/base.extras.xml.in.h:17
-msgid "USA - Couer D'alene Salish"
-msgstr "EUA - Couer D'alene Salish"
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr "Letó (dvorak EUA, variant menys)"
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
-msgstr "EUA - Internacional (combinació Unicode AltGr)"
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Letó (dvorak de programador EUA)"
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
-msgstr "EUA - Internacional (combinació Unicode AltGr, alternativa)"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Letó (dvorak de programador EUA, variant Y)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Letó (dvorak de programador EUA, variant menys)"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Lituà (dvorak EUA amb lletres lituanes)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "Polonès (internacional amb tecles mortes)"
+
+#: ../rules/base.extras.xml.in.h:27
+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:30
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.extras.xml.in.h:32
+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
+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 "Xinès (Tibetà)"
+
+#~ msgid "Chinese (Uyghur)"
+#~ msgstr "Xinès (Uigur)"
+
+#~ msgid "Danish (Mac)"
+#~ msgstr "Danès (Mac)"
+
+#~ msgid "English (UK, Mac)"
+#~ msgstr "Anglès (RU, Mac)"
+
+#~ msgid "Finnish (Mac)"
+#~ msgstr "Finès (Mac)"
+
+#~ msgid "Finnish (northern Saami)"
+#~ msgstr "Finès (Sami del nord)"
+
+#~ msgid "French (Occitan)"
+#~ msgstr "Francès (Occità)"
+
+#~ 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)"
+
+#~ msgid "Irish (Ogham)"
+#~ msgstr "Irlandès (Ogham)"
+
+#~ msgid "Italian (Georgian)"
+#~ msgstr "Italià (Georgià)"
+
+#~ msgid "Kurdish (Iran, latin alt-Q)"
+#~ msgstr "Kurd (Iran, llatí Alt-Q)"
+
+#~ msgid "Māori"
+#~ msgstr "Maori"
+
+#~ msgid "Norwegian (Northern Saami"
+#~ msgstr "Noruec (Sami del nord)"
+
+#~ msgid "Philippines - Dvorak (Baybayin)"
+#~ msgstr "Filipines - Dvorak (Baybayin)"
+
+#~ msgid "Portuguese (Nativo for Esperanto)"
+#~ msgstr "Portuguès (natiu per a l'esperanto)"
+
+#~ msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
+#~ msgstr "Romanès (Tàtar de Crimea Dobruca-2 Q)"
+
+#~ msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Romanès (Tàtar de Crimea Turc Alt-Q)"
+
+#~ msgid "Romanian (Crimean Tatar Turkish F)"
+#~ msgstr "Romanès (Tàtar de Crimea Turc F)"
+
+#~ msgid "Russian (Chuvash)"
+#~ msgstr "Rus (Chuvash)"
+
+#~ msgid "Russian (Kalmyk)"
+#~ msgstr "Rus (Calmuc)"
+
+#~ msgid "Russian (Komi)"
+#~ msgstr "Rus (Komi)"
+
+#~ msgid "Russian (Mari)"
+#~ msgstr "Rus (Mari)"
+
+#~ msgid "Russian (Ossetian, legacy)"
+#~ msgstr "Rus (Osset, antic)"
+
+#~ msgid "Russian (Serbian)"
+#~ msgstr "Rus (Sèrbia)"
+
+#~ msgid "Russian (Tatar)"
+#~ msgstr "Rus (Tàtar)"
+
+#~ msgid "Russian (Udmurt)"
+#~ msgstr "Rus (Udmurt)"
+
+#~ msgid "Russian (Yakut)"
+#~ msgstr "Rus (Iacut)"
+
+#~ msgid "Spanish (Mac)"
+#~ msgstr "Espanyol (Mac)"
+
+#~ msgid "Swedish (northern Saami)"
+#~ msgstr "Suec (Sami del nord)"
+
+#~ msgid "Swiss"
+#~ msgstr "Suís"
+
+#~ msgid "Swiss (legacy)"
+#~ msgstr "Suís (antic)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Turc (Tàtar de Crimea Turc Alt-Q)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish F)"
+#~ msgstr "Turc (Tàtar de Crimea Turc F)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish Q)"
+#~ msgstr "Turc (Tàtar de Crimea Turc Q)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Ucraïnès (Tàtar de Crimea Turc Alt-Q)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish F)"
+#~ msgstr "Ucraïnès (Tàtar de Crimea Turc F)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish Q)"
+#~ msgstr "Ucraïnès (Tàtar de Crimea Turc Q)"
+
+#~ msgid "Ukrainian (standard RSTU on Russian layout)"
+#~ msgstr "Ucraïnès (estàndard RSTU en una disposició russa)"
+
+#~ msgid "irq"
+#~ msgstr "irq"
+
+#~ msgid "srp"
+#~ msgstr "srp"
+
+#~ msgid "twn"
+#~ msgstr "twn"
+
+#~ msgid "APL"
+#~ msgstr "APL"
+
+#~ msgid "Iran"
+#~ msgstr "Iran"
+
+#~ msgid "Lithuania"
+#~ msgstr "Lituània"
+
+#~ msgid "Lithuania - Dvorak"
+#~ msgstr "Lituània - Dvorak"
+
+#~ msgid "Ltu"
+#~ msgstr "Ltu"
+
+#~ msgid "Romania"
+#~ msgstr "Romania"
+
+#~ msgid "Rou"
+#~ msgstr "Rou"
+
+#~ msgid "Rus"
+#~ msgstr "Rus"
+
+#~ msgid "Russia"
+#~ msgstr "Rússia"
+
+#~ msgid "Serbia"
+#~ msgstr "Sèrbia"
+
+#~ msgid "Srb"
+#~ msgstr "Srb"
+
+#~ msgid "USA"
+#~ msgstr "EUA"
 
 #~ msgid "(F)"
 #~ msgstr "(F)"
@@ -3838,9 +3998,6 @@ msgstr "EUA - Internacional (combinació Unicode AltGr, alternativa)"
 #~ msgid "Chn"
 #~ msgstr "Chn"
 
-#~ msgid "Chuvash"
-#~ msgstr "Chuvash"
-
 #~ msgid "Classic"
 #~ msgstr "Clàssic"
 
@@ -3943,9 +4100,6 @@ msgstr "EUA - Internacional (combinació Unicode AltGr, alternativa)"
 #~ msgid "Jpn"
 #~ msgstr "Jpn"
 
-#~ msgid "Kalmyk"
-#~ msgstr "Calmuc"
-
 #~ msgid "Kana"
 #~ msgstr "Kana"
 
@@ -4003,9 +4157,6 @@ msgstr "EUA - Internacional (combinació Unicode AltGr, alternativa)"
 #~ msgid "Mao"
 #~ msgstr "Mao"
 
-#~ msgid "Maori"
-#~ msgstr "Maori"
-
 #~ msgid "Mkd"
 #~ msgstr "Mkd"
 
@@ -4054,12 +4205,6 @@ msgstr "EUA - Internacional (combinació Unicode AltGr, alternativa)"
 #~ msgid "OLPC Southern Uzbek"
 #~ msgstr "OLPC Uzbek del sud"
 
-#~ msgid "Occitan"
-#~ msgstr "Occità"
-
-#~ msgid "Ogham"
-#~ msgstr "Ogham"
-
 #~ msgid "Ossetian"
 #~ msgstr "Osset"
 
@@ -4117,15 +4262,9 @@ msgstr "EUA - Internacional (combinació Unicode AltGr, alternativa)"
 #~ msgid "Syria"
 #~ msgstr "Síria"
 
-#~ msgid "Tatar"
-#~ msgstr "Tàtar"
-
 #~ msgid "Tha"
 #~ msgstr "Tha"
 
-#~ msgid "Tibetan"
-#~ msgstr "Tibetà"
-
 #~ msgid "Tifinagh"
 #~ msgstr "Tifinagh"
 
@@ -4138,9 +4277,6 @@ msgstr "EUA - Internacional (combinació Unicode AltGr, alternativa)"
 #~ msgid "Tza"
 #~ msgstr "Tza"
 
-#~ msgid "Udmurt"
-#~ msgstr "Udmurt"
-
 #~ msgid "Ukr"
 #~ msgstr "Ukr"
 
diff --git a/xorg-server/xkeyboard-config/po/cs.po b/xorg-server/xkeyboard-config/po/cs.po
index 4d9769b87..f54aa517d 100644
--- a/xorg-server/xkeyboard-config/po/cs.po
+++ b/xorg-server/xkeyboard-config/po/cs.po
@@ -5,3095 +5,4394 @@
 # Petr Kovar <pknbe@volny.cz>, 2007, 2008, 2009, 2010, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.1-pre1\n"
+"Project-Id-Version: xkeyboard-config-2.3\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-01-12 00:16+0000\n"
-"PO-Revision-Date: 2011-01-12 23:23+0100\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-05-30 00:55+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.2\n"
 
 #: ../rules/base.xml.in.h:1
 msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;Menší než/větší než&gt;"
 
 #: ../rules/base.xml.in.h:2
-msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "&lt;Menší než/Větší než&gt; vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
+msgid "&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "&lt;Menší než/Větší než&gt; vybírá 3. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 3. úrovně"
 
 #: ../rules/base.xml.in.h:3
-msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "&lt;Menší než/Větší než&gt; vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně, jedno stisknutí ruší uzamčení"
+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;Menší než/Větší než&gt; vybírá 5. úroveň a uzamyká 5. úroveň při stisknutí společně s jinou výběrovou klávesou 5. úrovně, jedno stisknutí ruší uzamčení"
 
 #: ../rules/base.xml.in.h:4
-msgid "(F)"
-msgstr "(F)"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "&lt;Menší než/Větší než&gt; vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
 
 #: ../rules/base.xml.in.h:5
-msgid "(Legacy) Alternative"
-msgstr "(Zděděné) alternativní"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "&lt;Menší než/Větší než&gt; vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně, jedno stisknutí ruší uzamčení"
 
 #: ../rules/base.xml.in.h:6
-msgid "(Legacy) Alternative, Sun dead keys"
-msgstr "(Zděděné) alternativní, mrtvé klávesy Sun"
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
 
 #: ../rules/base.xml.in.h:7
-msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "(Zděděné) alternativní, vyloučit mrtvé klávesy"
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
 
 #: ../rules/base.xml.in.h:8
-msgid "101/104 key Compatible"
-msgstr "101/104klávesové, kompatibilní"
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
 
 #: ../rules/base.xml.in.h:9
-msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/čárka/mrtvé klávesy"
+msgid "ATM/phone-style"
+msgstr "ATM/telefonní typ"
 
 #: ../rules/base.xml.in.h:10
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/čárka/vyloučit mrtvé klávesy"
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
 
 #: ../rules/base.xml.in.h:11
-msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/tečka/mrtvé klávesy"
+msgid "Acer C300"
+msgstr "Acer C300"
 
 #: ../rules/base.xml.in.h:12
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/tečka/vyloučit mrtvé klávesy"
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
 
 #: ../rules/base.xml.in.h:13
-msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/čárka/mrtvé klávesy"
+msgid "Acer Laptop"
+msgstr "Acer Laptop"
 
 #: ../rules/base.xml.in.h:14
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwertz/čárka/vyloučit mrtvé klávesy"
+msgid "Add the standard behavior to Menu key"
+msgstr "Přidá standardní chování ke klávese Menu"
 
 #: ../rules/base.xml.in.h:15
-msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/tečka/mrtvé klávesy"
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Přidává diakritiku jazyka esperanto (supersigno)"
 
 #: ../rules/base.xml.in.h:16
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/tečka/vyloučit mrtvé klávesy"
+msgid "Adding currency signs to certain keys"
+msgstr "Přidává znaky měny k určitým klávesám"
 
 #: ../rules/base.xml.in.h:17
-msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/čárka/mrtvé klávesy"
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
 
 #: ../rules/base.xml.in.h:18
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/čárka/vyloučit mrtvé klávesy"
+msgid "Afghani"
+msgstr "Afghánské"
 
 #: ../rules/base.xml.in.h:19
-msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/tečka/mrtvé klávesy"
+msgid "Akan"
+msgstr "Akan"
 
 #: ../rules/base.xml.in.h:20
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/tečka/vyloučit mrtvé klávesy"
+msgid "Albanian"
+msgstr "Albánské"
 
 #: ../rules/base.xml.in.h:21
-msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/čárka/mrtvé klávesy"
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt a Meta na klávesách Alt"
 
 #: ../rules/base.xml.in.h:22
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/čárka/vyloučit mrtvé klávesy"
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt je přiřazena k pravé klávese Win a Super k Menu"
 
 #: ../rules/base.xml.in.h:23
-msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/tečka/mrtvé klávesy"
+msgid "Alt+Caps Lock"
+msgstr "Alt+Caps Lock"
 
 #: ../rules/base.xml.in.h:24
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/tečka/vyloučit mrtvé klávesy"
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
 
 #: ../rules/base.xml.in.h:25
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
 
 #: ../rules/base.xml.in.h:26
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
+msgid "Alt+Space"
+msgstr "Alt+Mezerník"
 
 #: ../rules/base.xml.in.h:27
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
+msgid "Alt/Win key behavior"
+msgstr "Chování klávesy Alt/Win"
 
 #: ../rules/base.xml.in.h:28
-msgid "ATM/phone-style"
-msgstr "ATM/telefonní typ"
+msgid "Amharic"
+msgstr ""
 
 #: ../rules/base.xml.in.h:29
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
+msgid "Any Alt key"
+msgstr "Libovolná klávesa Alt"
 
 #: ../rules/base.xml.in.h:30
-msgid "Acer C300"
-msgstr "Acer C300"
+msgid "Any Win key"
+msgstr "Libovolná klávesa Win"
 
 #: ../rules/base.xml.in.h:31
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
+msgid "Any Win key (while pressed)"
+msgstr "Libovolná klávesa Win (při stisknutí)"
 
 #: ../rules/base.xml.in.h:32
-msgid "Acer Laptop"
-msgstr "Acer Laptop"
+msgid "Apple"
+msgstr "Apple"
 
 #: ../rules/base.xml.in.h:33
-msgid "Add the standard behavior to Menu key"
-msgstr "Přidá standardní chování ke klávese Menu"
+msgid "Apple Aluminium Keyboard (ANSI)"
+msgstr "Apple Aluminium Keyboard (ANSI)"
 
 #: ../rules/base.xml.in.h:34
-msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr "Přidává průtažný přízvuk v esperantu (supersigno)"
+msgid "Apple Aluminium Keyboard (ISO)"
+msgstr "Apple Aluminium Keyboard (ISO)"
 
 #: ../rules/base.xml.in.h:35
-msgid "Adding currency signs to certain keys"
-msgstr "Přidává znaky měny k určitým klávesám"
+msgid "Apple Aluminium Keyboard (JIS)"
+msgstr "Apple Aluminium Keyboard (JIS)"
 
 #: ../rules/base.xml.in.h:36
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
+msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
+msgstr "Apple Aluminium Keyboard: emulovat klávesy PC (Print, Scroll Lock, Pause, Num Lock)"
 
 #: ../rules/base.xml.in.h:37
-msgid "Afg"
-msgstr "AFG"
+msgid "Apple Laptop"
+msgstr "Apple Laptop"
 
 #: ../rules/base.xml.in.h:38
-msgid "Afghanistan"
-msgstr "Afghánistán"
+msgid "Arabic"
+msgstr "Arabské"
 
 #: ../rules/base.xml.in.h:39
-msgid "Akan"
-msgstr "Akan"
+msgid "Arabic (Buckwalter)"
+msgstr "Arabské (Buckwalter)"
 
 #: ../rules/base.xml.in.h:40
-msgid "Alb"
-msgstr "ALB"
+msgid "Arabic (Morocco)"
+msgstr "Arabské (Maroko)"
 
 #: ../rules/base.xml.in.h:41
-msgid "Albania"
-msgstr "Albánie"
+msgid "Arabic (Pakistan)"
+msgstr "Arabské (Pákistán)"
 
 #: ../rules/base.xml.in.h:42
-msgid "Alt and Meta are on Alt keys"
-msgstr "Alt a Meta na klávesách Alt"
+msgid "Arabic (Syria)"
+msgstr "Arabské (Sýrie)"
 
 #: ../rules/base.xml.in.h:43
-msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr "Alt je přiřazena k pravé klávese Win a Super k Menu"
+msgid "Arabic (azerty)"
+msgstr "Arabské (azerty)"
 
 #: ../rules/base.xml.in.h:44
-msgid "Alt+Caps Lock"
-msgstr "Alt+Caps Lock"
+msgid "Arabic (azerty/digits)"
+msgstr "Arabské (azerty/číslice)"
 
 #: ../rules/base.xml.in.h:45
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
+msgid "Arabic (digits)"
+msgstr "Arabské (číslice)"
 
 #: ../rules/base.xml.in.h:46
-msgid "Alt+Shift"
-msgstr "Alt+Shift"
+msgid "Arabic (qwerty)"
+msgstr "Arabské (qwerty)"
 
 #: ../rules/base.xml.in.h:47
-msgid "Alt+Space"
-msgstr "Alt+Mezerník"
+msgid "Arabic (qwerty/digits)"
+msgstr "Arabské (qwerty/číslice)"
 
-#: ../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 "Arménské"
 
 #: ../rules/base.xml.in.h:49
-msgid "Alt/Win key behavior"
-msgstr "Chování klávesy Alt/Win"
+msgid "Armenian (alternative eastern)"
+msgstr "Arménské (alternativní východní)"
 
-#: ../rules/base.xml.in.h:50
-msgid "Alternative"
-msgstr "Alternativní"
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+msgid "Armenian (alternative phonetic)"
+msgstr "Arménské (alternativní fonetické)"
 
 #: ../rules/base.xml.in.h:51
-msgid "Alternative Eastern"
-msgstr "Alternativní východní"
+msgid "Armenian (eastern)"
+msgstr "Arménské (východní)"
 
 #: ../rules/base.xml.in.h:52
-msgid "Alternative Phonetic"
-msgstr "Alternativní fonetické"
+msgid "Armenian (phonetic)"
+msgstr "Arménské (fonetické)"
 
 #: ../rules/base.xml.in.h:53
-msgid "Alternative international"
-msgstr "Alternativní mezinárodní"
+msgid "Armenian (western)"
+msgstr "Arménské (západní)"
 
 #: ../rules/base.xml.in.h:54
-msgid "Alternative, Sun dead keys"
-msgstr "Alternativní, mrtvé klávesy Sun"
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturské (Španělsko, s H s tečkou pod a L s tečkou pod)"
 
 #: ../rules/base.xml.in.h:55
-msgid "Alternative, eliminate dead keys"
-msgstr "Alternativní, vyloučit mrtvé klávesy"
+msgid "Asus Laptop"
+msgstr "Asus Laptop"
 
 #: ../rules/base.xml.in.h:56
-msgid "Alternative, latin-9 only"
-msgstr "Alternativní, pouze Latin-9"
+msgid "At bottom left"
+msgstr "Vlevo dole"
 
 #: ../rules/base.xml.in.h:57
-msgid "And"
-msgstr "AND"
+msgid "At left of 'A'"
+msgstr "Nalevo od \"A\""
 
 #: ../rules/base.xml.in.h:58
-msgid "Andorra"
-msgstr "Andorra"
+msgid "Avatime"
+msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:59
-msgid "Any Alt key"
-msgstr "Libovolná klávesa Alt"
+#, fuzzy
+msgid "Azerbaijani"
+msgstr "Ázerbájdžán"
 
 #: ../rules/base.xml.in.h:60
-msgid "Any Win key"
-msgstr "Libovolná klávesa Win"
+#, fuzzy
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Ázerbájdžán"
 
 #: ../rules/base.xml.in.h:61
-msgid "Any Win key (while pressed)"
-msgstr "Libovolná klávesa Win (při stisknutí)"
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 Internet Keyboard, bezdrátová"
 
 #: ../rules/base.xml.in.h:62
-msgid "Apostrophe (') variant"
-msgstr "Varianta s apostrofem (')"
+msgid "BTC 5090"
+msgstr "BTC 5090"
 
 #: ../rules/base.xml.in.h:63
-msgid "Apple"
-msgstr "Apple"
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
 
 #: ../rules/base.xml.in.h:64
-msgid "Apple Aluminium Keyboard (ANSI)"
-msgstr "Apple Aluminium Keyboard (ANSI)"
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
 
 #: ../rules/base.xml.in.h:65
-msgid "Apple Aluminium Keyboard (ISO)"
-msgstr "Apple Aluminium Keyboard (ISO)"
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
 
 #: ../rules/base.xml.in.h:66
-msgid "Apple Aluminium Keyboard (JIS)"
-msgstr "Apple Aluminium Keyboard (JIS)"
+msgid "BTC 9000"
+msgstr "BTC 9000"
 
 #: ../rules/base.xml.in.h:67
-msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
-msgstr "Apple Aluminium Keyboard: emulovat klávesy PC (Print, Scroll Lock, Pause, Num Lock)"
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
 
 #: ../rules/base.xml.in.h:68
-msgid "Apple Laptop"
-msgstr "Apple Laptop"
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
 
 #: ../rules/base.xml.in.h:69
-msgid "Ara"
-msgstr "ARA"
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
 
 #: ../rules/base.xml.in.h:70
-msgid "Arabic"
-msgstr "Arabské"
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U Mini Wireless Internet and Gaming"
 
 #: ../rules/base.xml.in.h:71
-msgid "Arm"
-msgstr "ARM"
+msgid "Backslash"
+msgstr "Zpětné lomítko"
 
 #: ../rules/base.xml.in.h:72
-msgid "Armenia"
-msgstr "Arménie"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Zpětné lomítko vybírá 3. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 3. úrovně"
 
 #: ../rules/base.xml.in.h:73
-msgid "Asturian variant with bottom-dot H and bottom-dot L"
-msgstr "Asturská varianta s H s tečkou pod a L s tečkou pod"
+msgid "Bambara"
+msgstr ""
 
 #: ../rules/base.xml.in.h:74
-msgid "Asus Laptop"
-msgstr "Asus Laptop"
+msgid "Bashkirian"
+msgstr "Baškirské"
 
 #: ../rules/base.xml.in.h:75
-msgid "At bottom left"
-msgstr "Vlevo dole"
+#, fuzzy
+msgid "Belarusian"
+msgstr "Bělorusko"
 
 #: ../rules/base.xml.in.h:76
-msgid "At left of 'A'"
-msgstr "Nalevo od \"A\""
+#, fuzzy
+msgid "Belarusian (Latin)"
+msgstr "Dvorak (latinka)"
 
 #: ../rules/base.xml.in.h:77
-msgid "Austria"
-msgstr "Rakousko"
+#, fuzzy
+msgid "Belarusian (legacy)"
+msgstr "Francouzské (zděděné)"
 
 #: ../rules/base.xml.in.h:78
-msgid "Aut"
-msgstr "AUT"
+msgid "Belgian"
+msgstr "Belgické"
 
 #: ../rules/base.xml.in.h:79
-msgid "Avatime"
-msgstr "Avatime"
+msgid "Belgian (ISO alternate)"
+msgstr "Belgické (ISO alternativní)"
 
 #: ../rules/base.xml.in.h:80
-msgid "Aze"
-msgstr "AZE"
+msgid "Belgian (Sun dead keys)"
+msgstr "Belgické (mrtvé klávesy Sun)"
 
 #: ../rules/base.xml.in.h:81
-msgid "Azerbaijan"
-msgstr "Ázerbájdžán"
+msgid "Belgian (Wang model 724 azerty)"
+msgstr "Belgické (Wang, model 724 azerty)"
 
 #: ../rules/base.xml.in.h:82
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 Internet Keyboard, bezdrátová"
+msgid "Belgian (alternative)"
+msgstr "Belgické (alternativní)"
 
 #: ../rules/base.xml.in.h:83
-msgid "BTC 5090"
-msgstr "BTC 5090"
+msgid "Belgian (alternative, Sun dead keys)"
+msgstr "Belgické (alternativní, mrtvé klávesy Sun)"
 
 #: ../rules/base.xml.in.h:84
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
+msgid "Belgian (alternative, latin-9 only)"
+msgstr "Belgické (alternativní, pouze Latin-9)"
 
 #: ../rules/base.xml.in.h:85
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
+msgid "Belgian (eliminate dead keys)"
+msgstr "Belgické (vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:86
-msgid "BTC 6301URF"
-msgstr "BTC 6301URF"
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
 
 #: ../rules/base.xml.in.h:87
-msgid "BTC 9000"
-msgstr "BTC 9000"
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
 
 #: ../rules/base.xml.in.h:88
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
 
 #: ../rules/base.xml.in.h:89
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
+msgid "Bengali"
+msgstr "Bengálské"
 
 #: ../rules/base.xml.in.h:90
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
+#, fuzzy
+msgid "Bengali (Probhat)"
+msgstr "Bengálské Probhat"
 
 #: ../rules/base.xml.in.h:91
-msgid "BTC 9116U Mini Wireless Internet and Gaming"
-msgstr "BTC 9116U Mini Wireless Internet and Gaming"
+#, fuzzy
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgstr "Tifinagh alternativní fonetické"
 
 #: ../rules/base.xml.in.h:92
-msgid "Backslash"
-msgstr "Zpětné lomítko"
+#, fuzzy
+msgid "Berber (Morocco, Tifinagh alternative)"
+msgstr "Tifinagh alternativní"
 
 #: ../rules/base.xml.in.h:93
-msgid "Bangladesh"
-msgstr "Bangladéš"
+#, fuzzy
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgstr "Tifinagh rozšířené fonetické"
 
 #: ../rules/base.xml.in.h:94
-msgid "Bashkirian"
-msgstr "Baškirské"
+#, fuzzy
+msgid "Berber (Morocco, Tifinagh extended)"
+msgstr "Tifinagh rozšířené"
 
 #: ../rules/base.xml.in.h:95
-msgid "Bel"
-msgstr "BEL"
+#, fuzzy
+msgid "Berber (Morocco, Tifinagh phonetic)"
+msgstr "Tifinagh fonetické"
 
 #: ../rules/base.xml.in.h:96
-msgid "Belarus"
-msgstr "Bělorusko"
+msgid "Berber (Morocco, Tifinagh)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:97
-msgid "Belgium"
-msgstr "Belgie"
+msgid "Bosnian"
+msgstr ""
 
 #: ../rules/base.xml.in.h:98
-msgid "BenQ X-Touch"
-msgstr "BenQ X-Touch"
+#, fuzzy
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
+msgstr "Americká klávesnice s bosenskými spřežkami"
 
 #: ../rules/base.xml.in.h:99
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
+#, fuzzy
+msgid "Bosnian (US keyboard with Bosnian letters)"
+msgstr "Americká klávesnice s bosenskými znaky"
 
 #: ../rules/base.xml.in.h:100
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
+#, fuzzy
+msgid "Bosnian (use Bosnian digraphs)"
+msgstr "Používat bosenské spřežky"
 
 #: ../rules/base.xml.in.h:101
-msgid "Bengali"
-msgstr "Bengálské"
+#, fuzzy
+msgid "Bosnian (use guillemets for quotes)"
+msgstr "Používat francouzské uvozovky"
 
 #: ../rules/base.xml.in.h:102
-msgid "Bengali Probhat"
-msgstr "Bengálské Probhat"
+msgid "Both Alt keys together"
+msgstr "Obě klávesy Alt dohromady"
 
 #: ../rules/base.xml.in.h:103
-msgid "Bepo, ergonomic, Dvorak way"
-msgstr "Bepo, ergonomické, typ Dvorak"
+msgid "Both Ctrl keys together"
+msgstr "Obě klávesy Ctrl dohromady"
 
 #: ../rules/base.xml.in.h:104
-msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
-msgstr "Bepo, ergonomické, typ Dvorak, pouze Latin-9"
+msgid "Both Shift keys together"
+msgstr "Obě klávesy Shift dohromady"
 
 #: ../rules/base.xml.in.h:105
-msgid "Bgd"
-msgstr "BGD"
+#, fuzzy
+msgid "Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
+msgstr "Obě klávesy Shift dohromady přepnou Caps Lock"
 
 #: ../rules/base.xml.in.h:106
-msgid "Bgr"
-msgstr "BGR"
+msgid "Both Shift-Keys together toggle Caps Lock"
+msgstr "Obě klávesy Shift dohromady přepnou Caps Lock"
 
 #: ../rules/base.xml.in.h:107
-msgid "Bhutan"
-msgstr "Bhútán"
+#, fuzzy
+msgid "Both Shift-Keys together toggle ShiftLock"
+msgstr "Obě klávesy Shift dohromady přepnou Caps Lock"
 
 #: ../rules/base.xml.in.h:108
-msgid "Biblical Hebrew (Tiro)"
-msgstr "Biblická hebrejština (Tiro)"
+msgid "Braille"
+msgstr "Braillovo písmo"
 
 #: ../rules/base.xml.in.h:109
-msgid "Bih"
-msgstr "BIH"
+msgid "Braille (left hand)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:110
-msgid "Blr"
-msgstr "BLR"
+#, fuzzy
+msgid "Braille (right hand)"
+msgstr "Pravoruké"
 
 #: ../rules/base.xml.in.h:111
-msgid "Bosnia and Herzegovina"
-msgstr "Bosna a Hercegovina"
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
 
 #: ../rules/base.xml.in.h:112
-msgid "Both Alt keys together"
-msgstr "Obě klávesy Alt dohromady"
+#, fuzzy
+msgid "Bulgarian"
+msgstr "Bulharsko"
 
 #: ../rules/base.xml.in.h:113
-msgid "Both Ctrl keys together"
-msgstr "Obě klávesy Ctrl dohromady"
+#, fuzzy
+msgid "Bulgarian (new phonetic)"
+msgstr "Ruské fonetické"
 
 #: ../rules/base.xml.in.h:114
-msgid "Both Shift keys together"
-msgstr "Obě klávesy Shift dohromady"
+#, fuzzy
+msgid "Bulgarian (traditional phonetic)"
+msgstr "Tradiční fonetické"
 
 #: ../rules/base.xml.in.h:115
-msgid "Both Shift-Keys together toggle Caps Lock"
-msgstr "Obě klávesy Shift dohromady přepnou Caps Lock"
+msgid "Burmese"
+msgstr ""
 
 #: ../rules/base.xml.in.h:116
-msgid "Botswana"
-msgstr "Botswana"
+#, fuzzy
+msgid "Canadian Multilingual"
+msgstr "Vícejazyčné"
 
 #: ../rules/base.xml.in.h:117
-msgid "Bra"
-msgstr "BRA"
+#, fuzzy
+msgid "Canadian Multilingual (first part)"
+msgstr "Vícejazyčné, první část"
 
 #: ../rules/base.xml.in.h:118
-msgid "Braille"
-msgstr "Braillovo písmo"
+#, fuzzy
+msgid "Canadian Multilingual (second part)"
+msgstr "Vícejazyčné, druhá část"
 
 #: ../rules/base.xml.in.h:119
-msgid "Brazil"
-msgstr "Brazílie"
+msgid "Caps Lock"
+msgstr "Caps Lock"
 
 #: ../rules/base.xml.in.h:120
-msgid "Breton"
-msgstr "Bretonské"
+#, fuzzy
+msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Levá klávesa Win vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
 
 #: ../rules/base.xml.in.h:121
-msgid "Brl"
-msgstr "BRL"
+msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
+msgstr "Caps Lock (na první rozložení), Shift+Caps Lock (na poslední rozložení)"
 
 #: ../rules/base.xml.in.h:122
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internet Keyboard"
+msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
+msgstr "Caps Lock (při stisknutí), Alt+Caps Lock provádí původní akci Caps Lock"
 
 #: ../rules/base.xml.in.h:123
-msgid "Btn"
-msgstr "BTN"
+msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
+msgstr "Caps Lock funguje jako Shift s uzamčením. Shift přerušuje Caps Lock"
 
 #: ../rules/base.xml.in.h:124
-msgid "Buckwalter"
-msgstr "Buckwalter"
+msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
+msgstr "Caps Lock funguje jako Shift s uzamčením. Shift neovlivňuje Caps Lock"
 
 #: ../rules/base.xml.in.h:125
-msgid "Bulgaria"
-msgstr "Bulharsko"
+msgid "Caps Lock is disabled"
+msgstr "Klávesa Caps Lock je vypnuta"
 
 #: ../rules/base.xml.in.h:126
-msgid "Bwa"
-msgstr "BWA"
+msgid "Caps Lock key behavior"
+msgstr "Chování klávesy Caps Lock"
 
 #: ../rules/base.xml.in.h:127
-msgid "COD"
-msgstr "COD"
+msgid "Caps Lock toggles Shift so all keys are affected"
+msgstr "Caps Lock přepne Shift, takže budou dotčeny všechny klávesy"
 
 #: ../rules/base.xml.in.h:128
-msgid "CRULP"
-msgstr "CRULP"
+msgid "Caps Lock toggles normal capitalization of alphabetic characters"
+msgstr "Caps Lock přepne běžný převod abecedních znaků na verzálky"
 
 #: ../rules/base.xml.in.h:129
-msgid "Cambodia"
-msgstr "Kambodža"
+msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
+msgstr "Caps Lock používá vnitřní převod na verzálky. Shift přerušuje Caps Lock"
 
 #: ../rules/base.xml.in.h:130
-msgid "Can"
-msgstr "CAN"
+msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
+msgstr "Caps Lock používá vnitřní převod na verzálky. Shift neovlivňuje Caps Lock"
 
 #: ../rules/base.xml.in.h:131
-msgid "Canada"
-msgstr "Kanada"
+msgid "Catalan"
+msgstr ""
 
 #: ../rules/base.xml.in.h:132
-msgid "Capewell-Dvorak (Baybayin)"
-msgstr "Capewell-Dvorak (baybayin)"
+#, fuzzy
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Katalánská varianta s ela geminada"
 
 #: ../rules/base.xml.in.h:133
-msgid "Capewell-Dvorak (Latin)"
-msgstr "Capewell-Dvorak (latinka)"
+msgid "Cherokee"
+msgstr "Čerokí"
 
 #: ../rules/base.xml.in.h:134
-msgid "Capewell-QWERF 2006 (Baybayin)"
-msgstr "Capewell-QWERF 2006 (baybayin)"
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
 
 #: ../rules/base.xml.in.h:135
-msgid "Capewell-QWERF 2006 (Latin)"
-msgstr "Capewell-QWERF 2006 (latinka)"
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
 
 #: ../rules/base.xml.in.h:136
-msgid "Caps Lock"
-msgstr "Caps Lock"
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternativní volba)"
 
 #: ../rules/base.xml.in.h:137
-msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
-msgstr "Caps Lock (na první rozložení), Shift+Caps Lock (na poslední rozložení)"
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
 
 #: ../rules/base.xml.in.h:138
-msgid "Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
-msgstr "Caps Lock (při stisknutí), Alt+Caps Lock provádí původní akci Caps Lock"
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
 
 #: ../rules/base.xml.in.h:139
-msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
-msgstr "Caps Lock funguje jako Shift s uzamčením. Shift přerušuje Caps Lock"
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
 
 #: ../rules/base.xml.in.h:140
-msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
-msgstr "Caps Lock funguje jako Shift s uzamčením. Shift neovlivňuje Caps Lock"
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
 
 #: ../rules/base.xml.in.h:141
-msgid "Caps Lock is disabled"
-msgstr "Klávesa Caps Lock je vypnuta"
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
 
 #: ../rules/base.xml.in.h:142
-msgid "Caps Lock key behavior"
-msgstr "Chování klávesy Caps Lock"
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
 
 #: ../rules/base.xml.in.h:143
-msgid "Caps Lock toggles Shift so all keys are affected"
-msgstr "Caps Lock přepne Shift, takže budou dotčeny všechny klávesy"
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
 
 #: ../rules/base.xml.in.h:144
-msgid "Caps Lock toggles normal capitalization of alphabetic characters"
-msgstr "Caps Lock přepne běžný převod abecedních znaků na verzálky"
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
 
 #: ../rules/base.xml.in.h:145
-msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
-msgstr "Caps Lock používá vnitřní převod na verzálky. Shift přerušuje Caps Lock"
+#, fuzzy
+msgid "Chinese"
+msgstr "Čína"
 
 #: ../rules/base.xml.in.h:146
-msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
-msgstr "Caps Lock používá vnitřní převod na verzálky. Shift neovlivňuje Caps Lock"
+msgid "Chuvash"
+msgstr "Čuvašské"
 
 #: ../rules/base.xml.in.h:147
-msgid "Catalan variant with middle-dot L"
-msgstr "Katalánská varianta s ela geminada"
+#, fuzzy
+msgid "Chuvash (Latin)"
+msgstr "Čuvašské latinské"
 
 #: ../rules/base.xml.in.h:148
-msgid "Cedilla"
-msgstr "Cédille"
+msgid "Classmate PC"
+msgstr "Classmate PC"
 
 #: ../rules/base.xml.in.h:149
-msgid "Che"
-msgstr "CHE"
+msgid "CloGaelach"
+msgstr "CloGaelach"
 
 #: ../rules/base.xml.in.h:150
-msgid "Cherokee"
-msgstr "Čerokí"
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
 
 #: ../rules/base.xml.in.h:151
-msgid "Cherry B.UNLIMITED"
-msgstr "Cherry B.UNLIMITED"
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 kláves)"
 
 #: ../rules/base.xml.in.h:152
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 kláves)"
 
 #: ../rules/base.xml.in.h:153
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (alternativní volba)"
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 kláves)"
 
 #: ../rules/base.xml.in.h:154
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
 
 #: ../rules/base.xml.in.h:155
-msgid "Cherry CyMotion Expert"
-msgstr "Cherry CyMotion Expert"
+msgid "Compose key position"
+msgstr "Umístění klávesy Compose"
 
 #: ../rules/base.xml.in.h:156
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
+msgid "Control + Alt + Backspace"
+msgstr "Ctrl + Alt + Backspace"
 
 #: ../rules/base.xml.in.h:157
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Ctrl je přiřazena ke klávesám Alt, Alt je přiřazena ke klávesám Win"
 
 #: ../rules/base.xml.in.h:158
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internet Keyboard"
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr "Ctrl je přiřazena ke klávesám Win (a obvyklým klávesám Ctrl)"
 
 #: ../rules/base.xml.in.h:159
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
+msgid "Creative Desktop Wireless 7000"
+msgstr "Creative Desktop Wireless 7000"
 
 #: ../rules/base.xml.in.h:160
-msgid "Chicony KU-0108"
-msgstr "Chicony KU-0108"
+#, fuzzy
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Krymskotatarské (Dobruca-1 Q)"
 
 #: ../rules/base.xml.in.h:161
-msgid "Chicony KU-0420"
-msgstr "Chicony KU-0420"
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krymskotatarské (turecké Alt-Q)"
 
 #: ../rules/base.xml.in.h:162
-msgid "China"
-msgstr "Čína"
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krymskotatarské (turecké F)"
 
 #: ../rules/base.xml.in.h:163
-msgid "Chn"
-msgstr "CHN"
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krymskotatarské (turecké Q)"
 
 #: ../rules/base.xml.in.h:164
-msgid "Chuvash"
-msgstr "Čuvašské"
+#, fuzzy
+msgid "Croatian"
+msgstr "Chorvatsko"
 
 #: ../rules/base.xml.in.h:165
-msgid "Chuvash Latin"
-msgstr "Čuvašské latinské"
+#, fuzzy
+msgid "Croatian (US keyboard with Croatian digraphs)"
+msgstr "Americká klávesnice s chorvatskými spřežkami"
 
 #: ../rules/base.xml.in.h:166
-msgid "Classic"
-msgstr "Klasické"
+#, fuzzy
+msgid "Croatian (US keyboard with Croatian letters)"
+msgstr "Americká klávesnice s chorvatskými znaky"
 
 #: ../rules/base.xml.in.h:167
-msgid "Classic Dvorak"
-msgstr "Klasické Dvorak"
+#, fuzzy
+msgid "Croatian (use Croatian digraphs)"
+msgstr "Používat chorvatské spřežky"
 
 #: ../rules/base.xml.in.h:168
-msgid "Classic, eliminate dead keys"
-msgstr "Klasické, vyloučit mrtvé klávesy"
+#, fuzzy
+msgid "Croatian (use guillemets for quotes)"
+msgstr "Používat francouzské uvozovky"
 
 #: ../rules/base.xml.in.h:169
-msgid "Classmate PC"
-msgstr "Classmate PC"
+msgid "Ctrl key position"
+msgstr "Umístění klávesy Ctrl"
 
 #: ../rules/base.xml.in.h:170
-msgid "CloGaelach"
-msgstr "CloGaelach"
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
 
 #: ../rules/base.xml.in.h:171
-msgid "Colemak"
-msgstr "Colemak"
+msgid "Czech"
+msgstr "České"
 
 #: ../rules/base.xml.in.h:172
-msgid "Colemak (Baybayin)"
-msgstr "Colemak (baybayin)"
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "České (rozložení UCW, pouze znaky s diakritikou)"
 
 #: ../rules/base.xml.in.h:173
-msgid "Colemak (Latin)"
-msgstr "Colemak (latinka)"
+msgid "Czech (US Dvorak with CZ UCW support)"
+msgstr "České (americké Dvorak s podporou CZ UCW)"
 
 #: ../rules/base.xml.in.h:174
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access Keyboard"
+msgid "Czech (qwerty)"
+msgstr "České (qwerty)"
 
 #: ../rules/base.xml.in.h:175
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet Keyboard (13 kláves)"
+msgid "Czech (qwerty, extended Backslash)"
+msgstr "České (qwerty, rozšířená klávesa zpětného lomítka)"
 
 #: ../rules/base.xml.in.h:176
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet Keyboard (18 kláves)"
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "České (s klávesou &lt;\\|&gt;)"
 
 #: ../rules/base.xml.in.h:177
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet Keyboard (7 kláves)"
+msgid "DTK2000"
+msgstr "DTK2000"
 
 #: ../rules/base.xml.in.h:178
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Keyboard"
+msgid "Danish"
+msgstr "Dánské"
 
 #: ../rules/base.xml.in.h:179
-msgid "Compose key position"
-msgstr "Umístění klávesy Compose"
+msgid "Danish (Dvorak)"
+msgstr "Dánské (Dvorak)"
 
 #: ../rules/base.xml.in.h:180
-msgid "Congo, Democratic Republic of the"
-msgstr "Konžská demokratická republika"
+msgid "Danish (Macintosh)"
+msgstr "Dánské (Macintosh)"
 
 #: ../rules/base.xml.in.h:181
-msgid "Control + Alt + Backspace"
-msgstr "Ctrl + Alt + Backspace"
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Dánské (Macintosh, vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:182
-msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
-msgstr "Ctrl je přiřazena ke klávesám Alt, Alt je přiřazena ke klávesám Win"
+msgid "Danish (eliminate dead keys)"
+msgstr "Dánské (vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:183
-msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
-msgstr "Ctrl je přiřazena ke klávesám Win (a obvyklým klávesám Ctrl)"
+msgid "Default numeric keypad keys"
+msgstr "Výchozí numerická klávesnice"
 
 #: ../rules/base.xml.in.h:184
-msgid "Creative Desktop Wireless 7000"
-msgstr "Creative Desktop Wireless 7000"
+msgid "Dell"
+msgstr "Dell"
 
 #: ../rules/base.xml.in.h:185
-msgid "Crimean Tatar (Dobruca-1 Q)"
-msgstr "Krymskotatarské (Dobruca-1 Q)"
+msgid "Dell 101-key PC"
+msgstr "Dell PC 101klávesové"
 
 #: ../rules/base.xml.in.h:186
-msgid "Crimean Tatar (Dobruca-2 Q)"
-msgstr "Krymskotatarské (Dobruca-2 Q)"
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Notebook Dell Inspiron 6xxx/8xxx"
 
 #: ../rules/base.xml.in.h:187
-msgid "Crimean Tatar (Turkish Alt-Q)"
-msgstr "Krymskotatarské (turecké Alt-Q)"
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Notebook Dell řady Precision M"
 
 #: ../rules/base.xml.in.h:188
-msgid "Crimean Tatar (Turkish F)"
-msgstr "Krymskotatarské (turecké F)"
+msgid "Dell Latitude series laptop"
+msgstr "Notebook řady Dell Latitude"
 
 #: ../rules/base.xml.in.h:189
-msgid "Crimean Tatar (Turkish Q)"
-msgstr "Krymskotatarské (turecké Q)"
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
 
 #: ../rules/base.xml.in.h:190
-msgid "Croatia"
-msgstr "Chorvatsko"
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
 
 #: ../rules/base.xml.in.h:191
-msgid "Ctrl key position"
-msgstr "Umístění klávesy Ctrl"
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
 
 #: ../rules/base.xml.in.h:192
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Shift"
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia Keyboard"
 
 #: ../rules/base.xml.in.h:193
-msgid "Cyrillic"
-msgstr "Cyrilice"
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
 
 #: ../rules/base.xml.in.h:194
-msgid "Cyrillic with guillemets"
-msgstr "Cyrilice s francouzskými uvozovkami"
+msgid "Dhivehi"
+msgstr ""
 
 #: ../rules/base.xml.in.h:195
-msgid "Cyrillic, Z and ZHE swapped"
-msgstr "Cyrilice, prohozené Z a Ž"
+msgid "Diamond 9801 / 9802 series"
+msgstr "Řada Diamond 9801 / 9802"
 
 #: ../rules/base.xml.in.h:196
-msgid "Cze"
-msgstr "CZE"
+msgid "Dutch"
+msgstr ""
 
 #: ../rules/base.xml.in.h:197
-msgid "Czechia"
-msgstr "Česko"
+#, fuzzy
+msgid "Dutch (Macintosh)"
+msgstr "Francouzské (Macintosh)"
 
 #: ../rules/base.xml.in.h:198
-msgid "DOS"
-msgstr "DOS"
+#, fuzzy
+msgid "Dutch (Sun dead keys)"
+msgstr "Mrtvé klávesy Sun"
 
 #: ../rules/base.xml.in.h:199
-msgid "DTK2000"
-msgstr "DTK2000"
+msgid "Dutch (standard)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:200
-msgid "Dead acute"
-msgstr "Mrtvá čárka"
+msgid "Dzongkha"
+msgstr ""
 
 #: ../rules/base.xml.in.h:201
-msgid "Dead grave acute"
-msgstr "Mrtvá opačná čárka (gravis)"
+msgid "Enable extra typographic characters"
+msgstr "Povolit přídavné znaky hladké sazby"
 
 #: ../rules/base.xml.in.h:202
-msgid "Default numeric keypad keys"
-msgstr "Výchozí numerická klávesnice"
+msgid "English (Cameroon Dvorak)"
+msgstr "Anglické (Kamerun Dvorak)"
 
 #: ../rules/base.xml.in.h:203
-msgid "Dell"
-msgstr "Dell"
+msgid "English (Cameroon qwerty)"
+msgstr "Anglické (Kamerun qwerty)"
 
 #: ../rules/base.xml.in.h:204
-msgid "Dell 101-key PC"
-msgstr "Dell PC 101klávesové"
+msgid "English (Cameroon)"
+msgstr "Anglické (Kamerun)"
 
 #: ../rules/base.xml.in.h:205
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Notebook Dell Inspiron 6xxx/8xxx"
+msgid "English (Canada)"
+msgstr "Anglické (Kanada)"
 
 #: ../rules/base.xml.in.h:206
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Notebook Dell řady Precision M"
+msgid "English (Colemak)"
+msgstr "Anglické (Colemak)"
 
 #: ../rules/base.xml.in.h:207
-msgid "Dell Latitude series laptop"
-msgstr "Notebook řady Dell Latitude"
+msgid "English (Dvorak alternative international no dead keys)"
+msgstr "Anglické (alternativní mezinárodní Dvorak bez mrtvých kláves)"
 
 #: ../rules/base.xml.in.h:208
-msgid "Dell Precision M65"
-msgstr "Dell Precision M65"
+msgid "English (Dvorak international with dead keys)"
+msgstr "Anglické (mezinárodní Dvorak s mrtvými klávesami)"
 
 #: ../rules/base.xml.in.h:209
-msgid "Dell SK-8125"
-msgstr "Dell SK-8125"
+msgid "English (Dvorak)"
+msgstr "Anglické (Dvorak)"
 
 #: ../rules/base.xml.in.h:210
-msgid "Dell SK-8135"
-msgstr "Dell SK-8135"
+msgid "English (Ghana)"
+msgstr "Anglické (Ghana)"
 
 #: ../rules/base.xml.in.h:211
-msgid "Dell USB Multimedia Keyboard"
-msgstr "Dell USB Multimedia Keyboard"
+msgid "English (Ghana, GILLBT)"
+msgstr "Anglické (Ghana, GILLBT)"
 
 #: ../rules/base.xml.in.h:212
-msgid "Denmark"
-msgstr "Dánsko"
+msgid "English (Ghana, multilingual)"
+msgstr "Anglické (Ghana, vícejazyčné)"
 
 #: ../rules/base.xml.in.h:213
-msgid "Deu"
-msgstr "DEU"
+msgid "English (India, with RupeeSign)"
+msgstr "Anglické (Indie, s RupeeSign)"
 
 #: ../rules/base.xml.in.h:214
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop Keyboard"
+msgid "English (Macintosh)"
+msgstr "Anglické (Macintosh)"
 
 #: ../rules/base.xml.in.h:215
-msgid "Diamond 9801 / 9802 series"
-msgstr "Řada Diamond 9801 / 9802"
+msgid "English (Mali, US Macintosh)"
+msgstr "Anglické (Mali, americké Macintosh)"
 
 #: ../rules/base.xml.in.h:216
-msgid "Dnk"
-msgstr "DNK"
+msgid "English (Mali, US international)"
+msgstr "Anglické (Mali, americké mezinárodní)"
 
 #: ../rules/base.xml.in.h:217
-msgid "Dvorak"
-msgstr "Dvorak"
+msgid "English (Nigeria)"
+msgstr "Anglické (Nigérie)"
 
 #: ../rules/base.xml.in.h:218
-msgid "Dvorak (Baybayin)"
-msgstr "Dvorak (baybayin)"
+msgid "English (South Africa)"
+msgstr "Anglické (Jižní Afrika)"
 
 #: ../rules/base.xml.in.h:219
-msgid "Dvorak (Latin)"
-msgstr "Dvorak (latinka)"
+msgid "English (UK)"
+msgstr "Anglické (Británie)"
 
 #: ../rules/base.xml.in.h:220
-msgid "Dvorak (UK Punctuation)"
-msgstr "Dvorak (britská interpunkce)"
+msgid "English (UK, Colemak)"
+msgstr "Anglické (Británie, Colemak)"
 
 #: ../rules/base.xml.in.h:221
-msgid "Dvorak alternative international (no dead keys)"
-msgstr "Alternativní mezinárodní Dvorak (bez mrtvých kláves)"
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Anglické (Británie, Dvorak s britskou interpunkcí)"
 
 #: ../rules/base.xml.in.h:222
-msgid "Dvorak international (with dead keys)"
-msgstr "Mezinárodní Dvorak (s mrtvými klávesami)"
+msgid "English (UK, Dvorak)"
+msgstr "Anglické (Británie, Dvorak)"
 
 #: ../rules/base.xml.in.h:223
-msgid "Dvorak, Polish quotes on key 1"
-msgstr "Dvorak, polské uvozovky na klávese 1"
+msgid "English (UK, Macintosh international)"
+msgstr "Anglické (Británie, mezinárodní Macintosh)"
 
 #: ../rules/base.xml.in.h:224
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "Dvorak, polské uvozovky na klávese uvozovky"
+msgid "English (UK, Macintosh)"
+msgstr "Anglické (Británie, Macintosh)"
 
 #: ../rules/base.xml.in.h:225
-msgid "Eastern"
-msgstr "Východní"
+msgid "English (UK, extended WinKeys)"
+msgstr "Anglické (Británie, rozšířené - klávesy Win)"
 
 #: ../rules/base.xml.in.h:226
-msgid "Eliminate dead keys"
-msgstr "Vyloučit mrtvé klávesy"
+msgid "English (UK, international with dead keys)"
+msgstr "Anglické (Británie, mezinárodní s mrtvými klávesami)"
 
-#: ../rules/base.xml.in.h:227
-msgid "Enable extra typographic characters"
-msgstr "Povolit přídavné znaky hladké sazby"
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+msgid "English (US)"
+msgstr "Anglické (USA)"
 
 #: ../rules/base.xml.in.h:228
-msgid "English"
-msgstr "Anglické"
+msgid "English (US, alternative international)"
+msgstr "Anglické (USA, alternativní mezinárodní)"
 
 #: ../rules/base.xml.in.h:229
-msgid "English (USA International)"
-msgstr "Anglické (americké mezinárodní)"
+msgid "English (US, international with dead keys)"
+msgstr "Anglické (USA, mezinárodní s mrtvými klávesami)"
 
 #: ../rules/base.xml.in.h:230
-msgid "English (USA Macintosh)"
-msgstr "Anglické (americké Macintosh)"
+msgid "English (US, with euro on 5)"
+msgstr "Anglické (USA, Euro na 5)"
 
 #: ../rules/base.xml.in.h:231
-msgid "English with RupeeSign"
-msgstr "Anglické s RupeeSign"
+msgid "English (classic Dvorak)"
+msgstr "Anglické (klasické Dvorak)"
 
 #: ../rules/base.xml.in.h:232
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
+msgid "English (international AltGr dead keys)"
+msgstr "Anglické (mezinárodní mrtvé klávesy AltGr)"
 
 #: ../rules/base.xml.in.h:233
-msgid "Enter on keypad"
-msgstr "Enter na numerické klávesnici"
+msgid "English (layout toggle on multiply/divide key)"
+msgstr "Anglické (přepínání rozložení klávesou násobení/dělení)"
 
 #: ../rules/base.xml.in.h:234
-msgid "Epo"
-msgstr "EPO"
+msgid "English (left handed Dvorak)"
+msgstr "Anglické (levoruké Dvorak)"
 
 #: ../rules/base.xml.in.h:235
-msgid "Ergonomic"
-msgstr "Ergonomické"
+msgid "English (programmer Dvorak)"
+msgstr "Anglické (programátorské Dvorak)"
 
 #: ../rules/base.xml.in.h:236
-msgid "Esp"
-msgstr "ESP"
+msgid "English (right handed Dvorak)"
+msgstr "Anglické (pravoruké Dvorak)"
 
 #: ../rules/base.xml.in.h:237
-msgid "Esperanto"
-msgstr "Esperanto"
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
 
 #: ../rules/base.xml.in.h:238
-msgid "Est"
-msgstr "EST"
+msgid "Enter on keypad"
+msgstr "Enter na numerické klávesnici"
 
 #: ../rules/base.xml.in.h:239
-msgid "Estonia"
-msgstr "Estonsko"
+msgid "Esperanto"
+msgstr "Esperanto"
 
 #: ../rules/base.xml.in.h:240
-msgid "Eth"
-msgstr "ETH"
+msgid "Esperanto (Portugal, Nativo)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:241
-msgid "Ethiopia"
-msgstr "Etiopie"
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr "Esperanto (posunutý středník a uvozovka, zastaralé)"
 
 #: ../rules/base.xml.in.h:242
-msgid "Euro on 2"
-msgstr "Euro na 2"
+#, fuzzy
+msgid "Estonian"
+msgstr "Estonsko"
 
 #: ../rules/base.xml.in.h:243
-msgid "Euro on 4"
-msgstr "Euro na 4"
+msgid "Estonian (Dvorak)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:244
-msgid "Euro on 5"
-msgstr "Euro na 5"
+#, fuzzy
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr "Americká klávesnice s estonskými znaky"
 
 #: ../rules/base.xml.in.h:245
-msgid "Euro on E"
-msgstr "Euro na E"
+#, fuzzy
+msgid "Estonian (eliminate dead keys)"
+msgstr "Vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:246
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
+msgid "Euro on 2"
+msgstr "Euro na 2"
 
 #: ../rules/base.xml.in.h:247
-msgid "Ewe"
-msgstr "Ewe"
+msgid "Euro on 4"
+msgstr "Euro na 4"
 
 #: ../rules/base.xml.in.h:248
-msgid "Extended"
-msgstr "Rozšířené"
+msgid "Euro on 5"
+msgstr "Euro na 5"
 
 #: ../rules/base.xml.in.h:249
-msgid "Extended - Winkeys"
-msgstr "Rozšířené - klávesy Win"
+msgid "Euro on E"
+msgstr "Euro na E"
 
 #: ../rules/base.xml.in.h:250
-msgid "Extended Backslash"
-msgstr "Rozšířená klávesa zpětného lomítka"
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
 
 #: ../rules/base.xml.in.h:251
-msgid "F-letter (F) variant"
-msgstr "Varianta se znakem F"
+msgid "Ewe"
+msgstr "Ewe"
 
 #: ../rules/base.xml.in.h:252
 msgid "FL90"
 msgstr "FL90"
 
 #: ../rules/base.xml.in.h:253
-msgid "Faroe Islands"
+#, fuzzy
+msgid "Faroese"
 msgstr "Faerské ostrovy"
 
 #: ../rules/base.xml.in.h:254
-msgid "Fin"
-msgstr "FIN"
+#, fuzzy
+msgid "Faroese (eliminate dead keys)"
+msgstr "Francouzské, vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:255
-msgid "Finland"
-msgstr "Finsko"
+#, fuzzy
+msgid "Filipino"
+msgstr "Filipíny"
+
+#: ../rules/base.xml.in.h:256
+#, fuzzy
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr "Capewell-Dvorak (baybayin)"
+
+#: ../rules/base.xml.in.h:257
+#, fuzzy
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr "Capewell-Dvorak (latinka)"
 
-#. This assumes the KP_ abstract symbols are actually useful for some apps
-#. The description needs to be rewritten
 #: ../rules/base.xml.in.h:258
-msgid "Four-level key with abstract separators"
-msgstr "Klávesa čtvrté úrovně s abstraktními oddělovači"
+#, fuzzy
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr "Capewell-QWERF 2006 (baybayin)"
 
 #: ../rules/base.xml.in.h:259
-msgid "Four-level key with comma"
-msgstr "Klávesa čtvrté úrovně s čárkou"
+#, fuzzy
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr "Capewell-QWERF 2006 (latinka)"
 
 #: ../rules/base.xml.in.h:260
-msgid "Four-level key with dot"
-msgstr "Klávesa čtvrté úrovně s tečkou"
+#, fuzzy
+msgid "Filipino (Colemak Baybayin)"
+msgstr "Colemak (baybayin)"
 
 #: ../rules/base.xml.in.h:261
-msgid "Four-level key with dot, latin-9 restriction"
-msgstr "Klávesa čtvrté úrovně s tečkou, omezení Latin-9"
+#, fuzzy
+msgid "Filipino (Colemak Latin)"
+msgstr "Colemak (latinka)"
 
 #: ../rules/base.xml.in.h:262
-msgid "Four-level key with momayyez"
-msgstr "Klávesa čtvrté úrovně se znakem momajjez"
+#, fuzzy
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Dvorak (baybayin)"
 
 #: ../rules/base.xml.in.h:263
-msgid "Fra"
-msgstr "FRA"
+#, fuzzy
+msgid "Filipino (Dvorak Latin)"
+msgstr "Dvorak (latinka)"
 
 #: ../rules/base.xml.in.h:264
-msgid "France"
-msgstr "Francie"
+#, fuzzy
+msgid "Filipino (QWERTY Baybayin)"
+msgstr "QWERTY (baybayin)"
 
 #: ../rules/base.xml.in.h:265
-msgid "Français (France Alternative)"
-msgstr "Français (francouzské alternativní)"
+msgid "Finnish"
+msgstr ""
 
 #: ../rules/base.xml.in.h:266
-msgid "French"
-msgstr "Francouzské"
+#, fuzzy
+msgid "Finnish (Macintosh)"
+msgstr "Francouzské (Macintosh)"
 
 #: ../rules/base.xml.in.h:267
-msgid "French (Macintosh)"
-msgstr "Francouzské (Macintosh)"
+msgid "Finnish (classic)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:268
-msgid "French (legacy)"
-msgstr "Francouzské (zděděné)"
-
-#: ../rules/base.xml.in.h:269
-msgid "French Dvorak"
-msgstr "Francouzské Dvorak"
-
-#: ../rules/base.xml.in.h:270
-msgid "French, Sun dead keys"
-msgstr "Francouzské, mrtvé klávesy Sun"
+#, fuzzy
+msgid "Finnish (classic, eliminate dead keys)"
+msgstr "Klasické, vyloučit mrtvé klávesy"
 
+#. 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 "French, eliminate dead keys"
-msgstr "Francouzské, vyloučit mrtvé klávesy"
+msgid "Four-level key with abstract separators"
+msgstr "Klávesa čtvrté úrovně s abstraktními oddělovači"
 
 #: ../rules/base.xml.in.h:272
-msgid "Fro"
-msgstr "FRO"
+msgid "Four-level key with comma"
+msgstr "Klávesa čtvrté úrovně s čárkou"
 
 #: ../rules/base.xml.in.h:273
-msgid "Fujitsu-Siemens Computers AMILO laptop"
-msgstr "Notebook Fujitsu-Siemens Computers AMILO"
+msgid "Four-level key with dot"
+msgstr "Klávesa čtvrté úrovně s tečkou"
 
 #: ../rules/base.xml.in.h:274
-msgid "Fula"
-msgstr "Fula"
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Klávesa čtvrté úrovně s tečkou, omezení Latin-9"
 
 #: ../rules/base.xml.in.h:275
-msgid "GBr"
-msgstr "GBR"
+msgid "Four-level key with momayyez"
+msgstr "Klávesa čtvrté úrovně se znakem momajjez"
 
 #: ../rules/base.xml.in.h:276
-msgid "GILLBT"
-msgstr "GILLBT"
+msgid "French"
+msgstr "Francouzské"
 
 #: ../rules/base.xml.in.h:277
-msgid "Ga"
-msgstr "GA"
+msgid "French (Bepo, ergonomic, Dvorak way)"
+msgstr "Francouzské (Bepo, ergonomické, typ Dvorak)"
 
 #: ../rules/base.xml.in.h:278
-msgid "Generic 101-key PC"
-msgstr "Obecné PC 101klávesové"
+msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
+msgstr "Francouzské (Bepo, ergonomické, typ Dvorak, pouze Latin-9)"
 
 #: ../rules/base.xml.in.h:279
-msgid "Generic 102-key (Intl) PC"
-msgstr "Obecné PC 102klávesové (mez.)"
+msgid "French (Breton)"
+msgstr "Francouzské (bretonština)"
 
 #: ../rules/base.xml.in.h:280
-msgid "Generic 104-key PC"
-msgstr "Obecné PC 104klávesové"
+msgid "French (Cameroon azerty)"
+msgstr "Francouzské (Kamerun azerty)"
 
 #: ../rules/base.xml.in.h:281
-msgid "Generic 105-key (Intl) PC"
-msgstr "Obecné PC 105klávesové (mez.)"
+msgid "French (Cameroon)"
+msgstr "Francouzské (Kamerun)"
 
-#: ../rules/base.xml.in.h:282
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "Francouzské (Kanada)"
 
 #: ../rules/base.xml.in.h:283
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgid "French (Canada, Dvorak)"
+msgstr "Francouzské (Kanada, Dvorak)"
 
 #: ../rules/base.xml.in.h:284
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
+msgid "French (Canada, legacy)"
+msgstr "Francouzské (Kanada, zděděné)"
 
 #: ../rules/base.xml.in.h:285
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
+msgid "French (Democratic Republic of the Congo)"
+msgstr "Francouzské (Konžská demokratická republika)"
 
 #: ../rules/base.xml.in.h:286
-msgid "Genius KKB-2050HS"
-msgstr "Genius KKB-2050HS"
+msgid "French (Dvorak)"
+msgstr "Francouzské (Dvorak)"
 
 #: ../rules/base.xml.in.h:287
-msgid "Geo"
-msgstr "GEO"
+msgid "French (Guinea)"
+msgstr "Francouzské (Guinea)"
 
 #: ../rules/base.xml.in.h:288
-msgid "Georgia"
-msgstr "Gruzie"
+msgid "French (Macintosh)"
+msgstr "Francouzské (Macintosh)"
 
 #: ../rules/base.xml.in.h:289
-msgid "Georgian"
-msgstr "Gruzínské"
+msgid "French (Mali, alternative)"
+msgstr "Francouzské (Mali, alternativní)"
 
 #: ../rules/base.xml.in.h:290
-msgid "Georgian AZERTY Tskapo"
-msgstr "Gruzínské AZERTY Tskapo"
+msgid "French (Morocco)"
+msgstr "Francouzské (Maroko)"
 
 #: ../rules/base.xml.in.h:291
-msgid "German (Macintosh)"
-msgstr "Německé (Macintosh)"
+msgid "French (Sun dead keys)"
+msgstr "Francouzské (mrtvé klávesy Sun)"
 
 #: ../rules/base.xml.in.h:292
-msgid "German, Sun dead keys"
-msgstr "Německé, mrtvé klávesy Sun"
+msgid "French (Switzerland)"
+msgstr "Francouzské (Švýcarsko)"
 
 #: ../rules/base.xml.in.h:293
-msgid "German, eliminate dead keys"
-msgstr "Německé, vyloučit mrtvé klávesy"
+msgid "French (Switzerland, Macintosh)"
+msgstr "Francouzské (Švýcarsko, Macintosh)"
 
 #: ../rules/base.xml.in.h:294
-msgid "Germany"
-msgstr "Německo"
+msgid "French (Switzerland, Sun dead keys)"
+msgstr "Francouzské (Švýcarsko, mrtvé klávesy Sun)"
 
 #: ../rules/base.xml.in.h:295
-msgid "Gha"
-msgstr "GHA"
+msgid "French (Switzerland, eliminate dead keys)"
+msgstr "Francouzské (Švýcarsko, vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:296
-msgid "Ghana"
-msgstr "Ghana"
+msgid "French (alternative)"
+msgstr "Francouzské (alternativní)"
 
 #: ../rules/base.xml.in.h:297
-msgid "Gin"
-msgstr "GIN"
+msgid "French (alternative, Sun dead keys)"
+msgstr "Francouzské (alternativní, mrtvé klávesy Sun)"
 
 #: ../rules/base.xml.in.h:298
-msgid "Grc"
-msgstr "GRC"
+msgid "French (alternative, eliminate dead keys)"
+msgstr "Francouzské (alternativní, vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:299
-msgid "Greece"
-msgstr "Řecko"
+msgid "French (alternative, latin-9 only)"
+msgstr "Francouzské (alternativní, pouze Latin-9)"
 
 #: ../rules/base.xml.in.h:300
-msgid "Guinea"
-msgstr "Guinea"
+msgid "French (eliminate dead keys)"
+msgstr "Francouzské (vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:301
-msgid "Gujarati"
-msgstr "Gudžarátské"
+msgid "French (legacy, alternative)"
+msgstr "Francouzské (zděděné, alternativní)"
 
 #: ../rules/base.xml.in.h:302
-msgid "Gurmukhi"
-msgstr "Gurmuchské"
+msgid "French (legacy, alternative, Sun dead keys)"
+msgstr "Francouzské (zděděné, alternativní, mrtvé klávesy Sun)"
 
 #: ../rules/base.xml.in.h:303
-msgid "Gurmukhi Jhelum"
-msgstr "Gurmuchské (Jhelum)"
+msgid "French (legacy, alternative, eliminate dead keys)"
+msgstr "Francouzské (zděděné, alternativní, vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:304
-msgid "Gyration"
-msgstr "Gyration"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Notebook Fujitsu-Siemens Computers AMILO"
 
 #: ../rules/base.xml.in.h:305
-msgid "HTC Dream"
-msgstr "HTC Dream"
+msgid "Fula"
+msgstr "Fula"
 
 #: ../rules/base.xml.in.h:306
-msgid "Happy Hacking Keyboard"
-msgstr "Happy Hacking Keyboard"
+msgid "Ga"
+msgstr "GA"
 
 #: ../rules/base.xml.in.h:307
-msgid "Happy Hacking Keyboard for Mac"
-msgstr "Happy Hacking Keyboard for Mac"
+msgid "Generic 101-key PC"
+msgstr "Obecné PC 101klávesové"
 
 #: ../rules/base.xml.in.h:308
-msgid "Hausa"
-msgstr "Hausa"
+msgid "Generic 102-key (Intl) PC"
+msgstr "Obecné PC 102klávesové (mez.)"
 
 #: ../rules/base.xml.in.h:309
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet Keyboard"
+msgid "Generic 104-key PC"
+msgstr "Obecné PC 104klávesové"
 
 #: ../rules/base.xml.in.h:310
-msgid "Hewlett-Packard Mini 110 Notebook"
-msgstr "Hewlett-Packard Mini 110 Notebook"
+msgid "Generic 105-key (Intl) PC"
+msgstr "Obecné PC 105klávesové (mez.)"
 
 #: ../rules/base.xml.in.h:311
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
 
 #: ../rules/base.xml.in.h:312
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
+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
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
 
 #: ../rules/base.xml.in.h:314
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
 
 #: ../rules/base.xml.in.h:315
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
 
 #: ../rules/base.xml.in.h:316
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
+msgid "Georgian"
+msgstr "Gruzínské"
 
 #: ../rules/base.xml.in.h:317
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
+#, fuzzy
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Gruzínské AZERTY Tskapo"
 
 #: ../rules/base.xml.in.h:318
-msgid "Hewlett-Packard Pavilion dv5"
-msgstr "Hewlett-Packard Pavilion dv5"
+#, fuzzy
+msgid "Georgian (Italy)"
+msgstr "Gruzínské"
 
 #: ../rules/base.xml.in.h:319
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
+#, fuzzy
+msgid "Georgian (MESS)"
+msgstr "Gruzínské"
 
 #: ../rules/base.xml.in.h:320
-msgid "Hewlett-Packard nx9020"
-msgstr "Hewlett-Packard nx9020"
+msgid "Georgian (ergonomic)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:321
-msgid "Hexadecimal"
-msgstr "Hexadecimální"
+msgid "German"
+msgstr "Německé"
 
 #: ../rules/base.xml.in.h:322
-msgid "Hindi Bolnagri"
-msgstr "Hindské bolnagri"
+msgid "German (Austria)"
+msgstr "Německé (Rakousko)"
 
 #: ../rules/base.xml.in.h:323
-msgid "Hindi Wx"
-msgstr "Hindské Wx"
+msgid "German (Austria, Macintosh)"
+msgstr "Německé (Rakousko, Macintosh)"
 
 #: ../rules/base.xml.in.h:324
-msgid "Homophonic"
-msgstr "Stejně znějící"
+msgid "German (Austria, Sun dead keys)"
+msgstr "Německé (Rakousko, mrtvé klávesy Sun)"
 
 #: ../rules/base.xml.in.h:325
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
+msgid "German (Austria, eliminate dead keys)"
+msgstr "Německé (Rakousko, vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:326
-msgid "Hrv"
-msgstr "HRV"
+msgid "German (Dvorak)"
+msgstr "Německé (Dvorak)"
 
 #: ../rules/base.xml.in.h:327
-msgid "Htc Dream phone"
-msgstr "Telefon HTC Dream"
+msgid "German (Macintosh)"
+msgstr "Německé (Macintosh)"
 
 #: ../rules/base.xml.in.h:328
-msgid "Hun"
-msgstr "HUN"
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Německé (Macintosh, vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:329
-msgid "Hungary"
-msgstr "Maďarsko"
+msgid "German (Neo 2)"
+msgstr "Německé (Neo 2)"
 
 #: ../rules/base.xml.in.h:330
-msgid "Hyper is mapped to Win-keys"
-msgstr "Hyper je přiřazena ke klávesám Win"
+msgid "German (Sun dead keys)"
+msgstr "Německé (mrtvé klávesy Sun)"
 
 #: ../rules/base.xml.in.h:331
-msgid "IBM (LST 1205-92)"
-msgstr "IBM (LST 1205-92)"
+msgid "German (Switzerland)"
+msgstr "Německé (Švýcarsko)"
 
 #: ../rules/base.xml.in.h:332
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
+msgid "German (Switzerland, Macintosh)"
+msgstr "Německé (Švýcarsko, Macintosh)"
 
 #: ../rules/base.xml.in.h:333
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
+msgid "German (Switzerland, Sun dead keys)"
+msgstr "Německé (Švýcarsko, mrtvé klávesy Sun)"
 
 #: ../rules/base.xml.in.h:334
-msgid "IBM Space Saver"
-msgstr "IBM Space Saver"
+msgid "German (Switzerland, eliminate dead keys)"
+msgstr "Německé (Švýcarsko, vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:335
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+msgid "German (Switzerland, legacy)"
+msgstr "Německé (Švýcarsko, zděděné)"
 
 #: ../rules/base.xml.in.h:336
-msgid "IBM ThinkPad R60/T60/R61/T61"
-msgstr "IBM ThinkPad R60/T60/R61/T61"
+msgid "German (dead acute)"
+msgstr "Německé (mrtvá čárka)"
 
 #: ../rules/base.xml.in.h:337
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgid "German (dead grave acute)"
+msgstr "Německé (mrtvá opačná čárka - gravis)"
 
 #: ../rules/base.xml.in.h:338
-msgid "ISO Alternate"
-msgstr "ISO alternativní"
+msgid "German (eliminate dead keys)"
+msgstr "Německé (vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:339
-msgid "Iceland"
-msgstr "Island"
+msgid "German (qwerty)"
+msgstr "Německé (qwerty)"
 
 #: ../rules/base.xml.in.h:340
-msgid "Igbo"
-msgstr "Igbo"
+#, fuzzy
+msgid "Greek"
+msgstr "Řecko"
 
 #: ../rules/base.xml.in.h:341
-msgid "Include dead tilde"
-msgstr "Zahrnout mrtvou klávesu vlnovky"
+#, fuzzy
+msgid "Greek (eliminate dead keys)"
+msgstr "Francouzské, vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:342
-msgid "Ind"
-msgstr "IND"
+msgid "Greek (extended)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:343
-msgid "India"
-msgstr "Indie"
+#, fuzzy
+msgid "Greek (polytonic)"
+msgstr "Polytonické"
 
 #: ../rules/base.xml.in.h:344
-msgid "International (AltGr dead keys)"
-msgstr "Mezinárodní (mrtvé klávesy AltGr)"
+msgid "Greek (simple)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:345
-msgid "International (with dead keys)"
-msgstr "Mezinárodní (s mrtvými klávesami)"
+msgid "Gujarati"
+msgstr "Gudžarátské"
 
 #: ../rules/base.xml.in.h:346
-msgid "Inuktitut"
-msgstr "Inuktitut"
+msgid "Gyration"
+msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:347 ../rules/base.extras.xml.in.h:8
-msgid "Iran"
-msgstr "Írán"
+#: ../rules/base.xml.in.h:347
+msgid "HTC Dream"
+msgstr "HTC Dream"
 
 #: ../rules/base.xml.in.h:348
-msgid "Iraq"
-msgstr "Irák"
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking Keyboard"
 
 #: ../rules/base.xml.in.h:349
-msgid "Ireland"
-msgstr "Irsko"
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking Keyboard for Mac"
 
 #: ../rules/base.xml.in.h:350
-msgid "Irl"
-msgstr "IRL"
+msgid "Hausa"
+msgstr "Hausa"
 
 #: ../rules/base.xml.in.h:351
-msgid "Irn"
-msgstr "IRN"
+msgid "Hebrew"
+msgstr ""
 
 #: ../rules/base.xml.in.h:352
-msgid "Irq"
-msgstr "IRQ"
+#, fuzzy
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Biblická hebrejština (Tiro)"
 
 #: ../rules/base.xml.in.h:353
-msgid "Isl"
-msgstr "ISL"
+msgid "Hebrew (lyx)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:354
-msgid "Isr"
-msgstr "ISR"
+#, fuzzy
+msgid "Hebrew (phonetic)"
+msgstr "Nové fonetické"
 
 #: ../rules/base.xml.in.h:355
-msgid "Israel"
-msgstr "Izrael"
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
 
 #: ../rules/base.xml.in.h:356
-msgid "Ita"
-msgstr "ITA"
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook"
 
 #: ../rules/base.xml.in.h:357
-msgid "Italy"
-msgstr "Itálie"
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
 
 #: ../rules/base.xml.in.h:358
-msgid "Japan"
-msgstr "Japonsko"
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
 
 #: ../rules/base.xml.in.h:359
-msgid "Japan (PC-98xx Series)"
-msgstr "Japonsko (řada PC-98xx)"
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
 
 #: ../rules/base.xml.in.h:360
-msgid "Japanese keyboard options"
-msgstr "Volby japonské klávesnice"
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
 
 #: ../rules/base.xml.in.h:361
-msgid "Jpn"
-msgstr "JPN"
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
 
 #: ../rules/base.xml.in.h:362
-msgid "Kalmyk"
-msgstr "Kalmycké"
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
 
 #: ../rules/base.xml.in.h:363
-msgid "Kana"
-msgstr "Kana"
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
 
 #: ../rules/base.xml.in.h:364
-msgid "Kana 86"
-msgstr "Kana 86"
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
 
 #: ../rules/base.xml.in.h:365
-msgid "Kana Lock key is locking"
-msgstr "Klávesa Kana Lock uzamyká"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
 
 #: ../rules/base.xml.in.h:366
-msgid "Kannada"
-msgstr "Kannadské"
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
 
 #: ../rules/base.xml.in.h:367
-msgid "Kashubian"
-msgstr "Kašubské"
+msgid "Hexadecimal"
+msgstr "Hexadecimální"
 
 #: ../rules/base.xml.in.h:368
-msgid "Kaz"
-msgstr "KAZ"
+#, fuzzy
+msgid "Hindi (Bolnagri)"
+msgstr "Hindské bolnagri"
 
 #: ../rules/base.xml.in.h:369
-msgid "Kazakh with Russian"
-msgstr "Kazašská s ruštinou"
+#, fuzzy
+msgid "Hindi (Wx)"
+msgstr "Hindské Wx"
 
 #: ../rules/base.xml.in.h:370
-msgid "Kazakhstan"
-msgstr "Kazachstán"
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
 
 #: ../rules/base.xml.in.h:371
-msgid "Ken"
-msgstr "KEN"
+msgid "Htc Dream phone"
+msgstr "Telefon HTC Dream"
 
 #: ../rules/base.xml.in.h:372
-msgid "Kenya"
-msgstr "Keňa"
+msgid "Hungarian"
+msgstr "Maďarské"
 
 #: ../rules/base.xml.in.h:373
-msgid "Key sequence to kill the X server"
-msgstr "Pořadí kláves zabíjející server X"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr "Maďarské (101/qwerty/čárka/mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:374
-msgid "Key to choose 3rd level"
-msgstr "Klávesa umožňující výběr 3. úrovně"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr "Maďarské (101/qwerty/čárka/vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:375
-msgid "Key to choose 5th level"
-msgstr "Klávesa umožňující výběr 5. úrovně"
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr "Maďarské (101/qwerty/tečka/mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:376
-msgid "Key(s) to change layout"
-msgstr "Klávesa měnící rozložení"
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr "Maďarské (101/qwerty/tečka/vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:377
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
+msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgstr "Maďarské (101/qwertz/čárka/mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:378
-msgid "Kgz"
-msgstr "KGZ"
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr "Maďarské (101/qwertz/čárka/vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:379
-msgid "Khm"
-msgstr "KHM"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgstr "Maďarské (101/qwertz/tečka/mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:380
-msgid "Kikuyu"
-msgstr "Kukujské"
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr "Maďarské (101/qwertz/tečka/vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:381
-msgid "Kinesis"
-msgstr "Kinesis"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgstr "Maďarské (102/qwerty/čárka/mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:382
-msgid "Komi"
-msgstr "Komi"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgstr "Maďarské (102/qwerty/čárka/vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:383
-msgid "Kor"
-msgstr "KOR"
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr "Maďarské (102/qwerty/tečka/mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:384
-msgid "Korea, Republic of"
-msgstr "Korejská republika"
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgstr "Maďarské (102/qwerty/tečka/vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:385
-msgid "Ktunaxa"
-msgstr "Ktunaxa"
+msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgstr "Maďarské (102/qwertz/čárka/mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:386
-msgid "Kurdish, (F)"
-msgstr "Kurdské, (F)"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgstr "Maďarské (102/qwertz/čárka/vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:387
-msgid "Kurdish, Arabic-Latin"
-msgstr "Kurdské, arabsko-latinské"
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr "Maďarské (102/qwertz/tečka/mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:388
-msgid "Kurdish, Latin Alt-Q"
-msgstr "Kurdské, latinské Alt-Q"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr "Maďarské (102/qwertz/tečka/vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:389
-msgid "Kurdish, Latin Q"
-msgstr "Kurdské, latinské Q"
+msgid "Hungarian (eliminate dead keys)"
+msgstr "Maďarské (vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:390
-msgid "Kyrgyzstan"
-msgstr "Kyrgyzstán"
+msgid "Hungarian (qwerty)"
+msgstr "Maďarské (qwerty)"
 
 #: ../rules/base.xml.in.h:391
-msgid "LEKP"
-msgstr "LEKP"
+msgid "Hungarian (standard)"
+msgstr "Maďarské (standardní)"
 
 #: ../rules/base.xml.in.h:392
-msgid "LEKPa"
-msgstr "LEKPa"
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper je přiřazena ke klávesám Win"
 
 #: ../rules/base.xml.in.h:393
-msgid "Lao"
-msgstr "LAO"
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
 
 #: ../rules/base.xml.in.h:394
-msgid "Laos"
-msgstr "Laos"
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
 
 #: ../rules/base.xml.in.h:395
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Laptop Keyboard pro notebook Compaq (např. Armada)"
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
 
 #: ../rules/base.xml.in.h:396
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Internet Keyboard pro notebook Compaq (např. Presario)"
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:397
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "Notebook eMachines m68xx"
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
 
 #: ../rules/base.xml.in.h:398
-msgid "Latin"
-msgstr "Latinské"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
 #: ../rules/base.xml.in.h:399
-msgid "Latin American"
-msgstr "Latinskoamerické"
+#, fuzzy
+msgid "Icelandic"
+msgstr "Island"
 
 #: ../rules/base.xml.in.h:400
-msgid "Latin Unicode"
-msgstr "Latinské Unicode"
+#, fuzzy
+msgid "Icelandic (Dvorak)"
+msgstr "Klasické Dvorak"
 
 #: ../rules/base.xml.in.h:401
-msgid "Latin Unicode qwerty"
-msgstr "Latinské Unicode qwerty"
+#, fuzzy
+msgid "Icelandic (Macintosh)"
+msgstr "Francouzské (Macintosh)"
 
 #: ../rules/base.xml.in.h:402
-msgid "Latin qwerty"
-msgstr "Latinské qwerty"
+#, fuzzy
+msgid "Icelandic (Sun dead keys)"
+msgstr "Francouzské, mrtvé klávesy Sun"
 
 #: ../rules/base.xml.in.h:403
-msgid "Latin unicode"
-msgstr "Latinské Unicode"
+#, fuzzy
+msgid "Icelandic (eliminate dead keys)"
+msgstr "Klasické, vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:404
-msgid "Latin unicode qwerty"
-msgstr "Latinské Unicode qwerty"
+msgid "Igbo"
+msgstr "Igbo"
 
 #: ../rules/base.xml.in.h:405
-msgid "Latin with guillemets"
-msgstr "Latinské s francouzskými uvozovkami"
+#, fuzzy
+msgid "Indian"
+msgstr "Indie"
 
 #: ../rules/base.xml.in.h:406
-msgid "Latvia"
-msgstr "Lotyšsko"
+msgid "Inuktitut"
+msgstr "Inuktitut"
 
 #: ../rules/base.xml.in.h:407
-msgid "Layout toggle on multiply/divide key"
-msgstr "Přepínání rozložení klávesou násobení/dělení"
+#, fuzzy
+msgid "Iraqi"
+msgstr "Irák"
 
 #: ../rules/base.xml.in.h:408
-msgid "Left Alt"
-msgstr "Levá klávesa Alt"
+msgid "Irish"
+msgstr ""
 
 #: ../rules/base.xml.in.h:409
-msgid "Left Alt (while pressed)"
-msgstr "Levá klávesa Alt (při stisknutí)"
+#, fuzzy
+msgid "Irish (UnicodeExpert)"
+msgstr "UnicodeExpert"
 
 #: ../rules/base.xml.in.h:410
-msgid "Left Alt is swapped with Left Win"
-msgstr "Levá klávesa Alt je prohozena s levou klávesou Win"
+msgid "Italian"
+msgstr "Italské"
 
 #: ../rules/base.xml.in.h:411
-msgid "Left Ctrl"
-msgstr "Levá klávesa Ctrl"
+msgid "Italian (Macintosh)"
+msgstr "Italské (Macintosh)"
 
 #: ../rules/base.xml.in.h:412
-msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
-msgstr "Levá klávesa Ctrl (na první rozložení), pravá klávesa Ctrl (na poslední rozložení)"
+msgid "Italian (US keyboard with Italian letters)"
+msgstr "Italské (americká klávesnice s italskými znaky)"
 
 #: ../rules/base.xml.in.h:413
-msgid "Left Ctrl+Left Shift"
-msgstr "Levá klávesa Ctrl + levá klávesa Shift"
+msgid "Italian (eliminate dead keys)"
+msgstr "Italské (vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:414
-msgid "Left Shift"
-msgstr "Levá klávesa Shift"
+#, fuzzy
+msgid "Japanese"
+msgstr "Japonsko"
 
 #: ../rules/base.xml.in.h:415
-msgid "Left Win"
-msgstr "Levá klávesa Win"
+msgid "Japanese (Kana 86)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:416
-msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
-msgstr "Levá klávesa Win (na první rozložení), pravá klávesa Win/Menu (na poslední rozložení)"
+msgid "Japanese (Kana)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:417
-msgid "Left Win (while pressed)"
-msgstr "Levá klávesa Win (při stisknutí)"
+#, fuzzy
+msgid "Japanese (Macintosh)"
+msgstr "Německé (Macintosh)"
 
 #: ../rules/base.xml.in.h:418
-msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Levá klávesa Win vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
+#, fuzzy
+msgid "Japanese (OADG 109A)"
+msgstr "OADG 109A"
 
 #: ../rules/base.xml.in.h:419
-msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "Levá klávesa Win vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně, jedno stisknutí ruší uzamčení"
+#, fuzzy
+msgid "Japanese (PC-98xx Series)"
+msgstr "Japonsko (řada PC-98xx)"
 
 #: ../rules/base.xml.in.h:420
-msgid "Left hand"
-msgstr "Levoruké"
+msgid "Japanese keyboard options"
+msgstr "Volby japonské klávesnice"
 
 #: ../rules/base.xml.in.h:421
-msgid "Left handed Dvorak"
-msgstr "Levoruké Dvorak"
+msgid "Kalmyk"
+msgstr "Kalmycké"
 
 #: ../rules/base.xml.in.h:422
-msgid "Legacy"
-msgstr "Zděděné"
+msgid "Kana Lock key is locking"
+msgstr "Klávesa Kana Lock uzamyká"
 
 #: ../rules/base.xml.in.h:423
-msgid "Legacy Wang 724"
-msgstr "Zděděná Wang 724"
+msgid "Kannada"
+msgstr "Kannadské"
+
+#: ../rules/base.xml.in.h:424
+msgid "Kashubian"
+msgstr "Kašubské"
 
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:425
-msgid "Legacy key with comma"
-msgstr "Zděděná klávesa s čárkou"
+#, fuzzy
+msgid "Kazakh"
+msgstr "Kazachstán"
 
 #: ../rules/base.xml.in.h:426
-msgid "Legacy key with dot"
-msgstr "Zděděná klávesa s tečkou"
+#, fuzzy
+msgid "Kazakh (with Russian)"
+msgstr "Kazašská s ruštinou"
 
 #: ../rules/base.xml.in.h:427
-msgid "Lithuania"
-msgstr "Litva"
+msgid "Key sequence to kill the X server"
+msgstr "Pořadí kláves zabíjející server X"
 
 #: ../rules/base.xml.in.h:428
-msgid "Lka"
-msgstr "LKA"
+msgid "Key to choose 3rd level"
+msgstr "Klávesa umožňující výběr 3. úrovně"
 
 #: ../rules/base.xml.in.h:429
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Keyboard"
+msgid "Key to choose 5th level"
+msgstr "Klávesa umožňující výběr 5. úrovně"
 
 #: ../rules/base.xml.in.h:430
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
+msgid "Key(s) to change layout"
+msgstr "Klávesa měnící rozložení"
 
 #: ../rules/base.xml.in.h:431
-msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "Logitech Cordless Desktop (alternativní volba)"
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
 
 #: ../rules/base.xml.in.h:432
-msgid "Logitech Cordless Desktop EX110"
-msgstr "Logitech Cordless Desktop EX110"
+#, fuzzy
+msgid "Khmer (Cambodia)"
+msgstr "Kambodža"
 
 #: ../rules/base.xml.in.h:433
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300"
+msgid "Kikuyu"
+msgstr "Kukujské"
 
 #: ../rules/base.xml.in.h:434
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
+msgid "Kinesis"
+msgstr "Kinesis"
 
 #: ../rules/base.xml.in.h:435
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
+msgid "Komi"
+msgstr "Komi"
 
 #: ../rules/base.xml.in.h:436
-msgid "Logitech Cordless Desktop Pro (alternate option 2)"
-msgstr "Logitech Cordless Desktop Pro (alternativní volba 2)"
+msgid "Korean"
+msgstr ""
 
 #: ../rules/base.xml.in.h:437
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
+#, fuzzy
+msgid "Korean (101/104 key compatible)"
+msgstr "101/104klávesové, kompatibilní"
 
 #: ../rules/base.xml.in.h:438
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
+#, fuzzy
+msgid "Kurdish (Iran, Arabic-Latin)"
+msgstr "Kurdské, arabsko-latinské"
 
 #: ../rules/base.xml.in.h:439
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Přídavné klávesy Logitech G15 pomocí G15daemon"
+#, fuzzy
+msgid "Kurdish (Iran, F)"
+msgstr "Kurdské, (F)"
 
 #: ../rules/base.xml.in.h:440
-msgid "Logitech Generic Keyboard"
-msgstr "Logitech Generic Keyboard"
+#, fuzzy
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kurdské, latinské Alt-Q"
 
 #: ../rules/base.xml.in.h:441
-msgid "Logitech Internet 350 Keyboard"
-msgstr "Logitech Internet 350 Keyboard"
+#, fuzzy
+msgid "Kurdish (Iran, Latin Q)"
+msgstr "Kurdské, latinské Q"
 
 #: ../rules/base.xml.in.h:442
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Keyboard"
+#, fuzzy
+msgid "Kurdish (Iraq, Arabic-Latin)"
+msgstr "Kurdské, arabsko-latinské"
 
 #: ../rules/base.xml.in.h:443
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator Keyboard"
+#, fuzzy
+msgid "Kurdish (Iraq, F)"
+msgstr "Kurdské, (F)"
 
 #: ../rules/base.xml.in.h:444
-msgid "Logitech Media Elite Keyboard"
-msgstr "Logitech Media Elite Keyboard"
+#, fuzzy
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr "Kurdské, latinské Alt-Q"
 
 #: ../rules/base.xml.in.h:445
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
-msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+#, fuzzy
+msgid "Kurdish (Iraq, Latin Q)"
+msgstr "Kurdské, latinské Q"
 
 #: ../rules/base.xml.in.h:446
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X Keyboard"
+#, fuzzy
+msgid "Kurdish (Syria, F)"
+msgstr "Kurdské, (F)"
 
 #: ../rules/base.xml.in.h:447
-msgid "Logitech diNovo Edge Keyboard"
-msgstr "Logitech diNovo Edge Keyboard"
+#, fuzzy
+msgid "Kurdish (Syria, Latin Alt-Q)"
+msgstr "Kurdské, latinské Alt-Q"
 
 #: ../rules/base.xml.in.h:448
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech diNovo Keyboard"
+#, fuzzy
+msgid "Kurdish (Syria, Latin Q)"
+msgstr "Kurdské, latinské Q"
 
 #: ../rules/base.xml.in.h:449
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
+#, fuzzy
+msgid "Kurdish (Turkey, F)"
+msgstr "Kurdské, (F)"
 
 #: ../rules/base.xml.in.h:450
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+#, fuzzy
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr "Kurdské, latinské Alt-Q"
 
 #: ../rules/base.xml.in.h:451
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+#, fuzzy
+msgid "Kurdish (Turkey, Latin Q)"
+msgstr "Kurdské, latinské Q"
 
 #: ../rules/base.xml.in.h:452
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+#, fuzzy
+msgid "Kyrgyz"
+msgstr "Kyrgyzstán"
 
 #: ../rules/base.xml.in.h:453
-msgid "Lower Sorbian"
-msgstr "Dolnolužické"
+#, fuzzy
+msgid "Kyrgyz (phonetic)"
+msgstr "Syrské fonetické"
 
 #: ../rules/base.xml.in.h:454
-msgid "Lower Sorbian (qwertz)"
-msgstr "Dolnolužické (qwertz)"
+msgid "Lao"
+msgstr "LAO"
 
 #: ../rules/base.xml.in.h:455
-msgid "Ltu"
-msgstr "LTU"
+msgid "Lao (STEA proposed standard layout)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:456
-msgid "Lva"
-msgstr "LVA"
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop Keyboard pro notebook Compaq (např. Armada)"
 
 #: ../rules/base.xml.in.h:457
-msgid "MESS"
-msgstr "MESS"
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Internet Keyboard pro notebook Compaq (např. Presario)"
 
 #: ../rules/base.xml.in.h:458
-msgid "MNE"
-msgstr "MNE"
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Notebook eMachines m68xx"
 
-#: ../rules/base.xml.in.h:459
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+#, fuzzy
+msgid "Latvian"
+msgstr "Lotyšsko"
 
 #: ../rules/base.xml.in.h:460
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (mez.)"
+#, fuzzy
+msgid "Latvian (F variant)"
+msgstr "Varianta se znakem F"
 
 #: ../rules/base.xml.in.h:461
-msgid "Macedonia"
-msgstr "Makedonie"
+msgid "Latvian (adapted)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:462
-msgid "Macintosh"
-msgstr "Macintosh"
+#, fuzzy
+msgid "Latvian (apostrophe variant)"
+msgstr "Varianta s apostrofem (')"
 
 #: ../rules/base.xml.in.h:463
-msgid "Macintosh (International)"
-msgstr "Macintosh (mezinárodní)"
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:464
-msgid "Macintosh Old"
-msgstr "Macintosh staré"
+msgid "Latvian (modern)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:465
-msgid "Macintosh, Sun dead keys"
-msgstr "Macintosh, mrtvé klávesy Sun"
+#, fuzzy
+msgid "Latvian (tilde variant)"
+msgstr "Varianta s vlnovkou (~)"
 
 #: ../rules/base.xml.in.h:466
-msgid "Macintosh, eliminate dead keys"
-msgstr "Macintosh, vyloučit mrtvé klávesy"
+msgid "Left Alt"
+msgstr "Levá klávesa Alt"
 
 #: ../rules/base.xml.in.h:467
-msgid "Make Caps Lock an additional Backspace"
-msgstr "Vytvořit z klávesy Caps Lock další Backspace"
+msgid "Left Alt (while pressed)"
+msgstr "Levá klávesa Alt (při stisknutí)"
 
 #: ../rules/base.xml.in.h:468
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Vytvořit z klávesy Caps Lock další Ctrl"
+msgid "Left Alt is swapped with Left Win"
+msgstr "Levá klávesa Alt je prohozena s levou klávesou Win"
 
 #: ../rules/base.xml.in.h:469
-msgid "Make Caps Lock an additional ESC"
-msgstr "Vytvořit z klávesy Caps Lock další Esc"
+msgid "Left Ctrl"
+msgstr "Levá klávesa Ctrl"
 
 #: ../rules/base.xml.in.h:470
-msgid "Make Caps Lock an additional Hyper"
-msgstr "Vytvořit z klávesy Caps Lock další Hyper"
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr "Levá klávesa Ctrl (na první rozložení), pravá klávesa Ctrl (na poslední rozložení)"
 
 #: ../rules/base.xml.in.h:471
-msgid "Make Caps Lock an additional Num Lock"
-msgstr "Vytvořit z klávesy Caps Lock další Num Lock"
+msgid "Left Ctrl+Left Shift"
+msgstr "Levá klávesa Ctrl + levá klávesa Shift"
 
 #: ../rules/base.xml.in.h:472
-msgid "Make Caps Lock an additional Super"
-msgstr "Vytvořit z klávesy Caps Lock další Super"
+msgid "Left Shift"
+msgstr "Levá klávesa Shift"
 
 #: ../rules/base.xml.in.h:473
-msgid "Malayalam"
-msgstr "Malajálamské"
+msgid "Left Win"
+msgstr "Levá klávesa Win"
 
 #: ../rules/base.xml.in.h:474
-msgid "Malayalam Lalitha"
-msgstr "Malajálamské lalitha"
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr "Levá klávesa Win (na první rozložení), pravá klávesa Win/Menu (na poslední rozložení)"
 
 #: ../rules/base.xml.in.h:475
-msgid "Maldives"
-msgstr "Maledivy"
+msgid "Left Win (while pressed)"
+msgstr "Levá klávesa Win (při stisknutí)"
 
 #: ../rules/base.xml.in.h:476
-msgid "Mali"
-msgstr "Mali"
+msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Levá klávesa Win vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
 
 #: ../rules/base.xml.in.h:477
-msgid "Malta"
-msgstr "Malta"
+msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "Levá klávesa Win vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně, jedno stisknutí ruší uzamčení"
 
 #: ../rules/base.xml.in.h:478
-msgid "Maltese keyboard with US layout"
-msgstr "Maltézská klávesnice s americkým rozložením"
+#, fuzzy
+msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
+msgstr "Levá klávesa Ctrl (na první rozložení), pravá klávesa Ctrl (na poslední rozložení)"
 
 #: ../rules/base.xml.in.h:479
-msgid "Mao"
-msgstr "MAO"
+msgid "Legacy"
+msgstr "Zděděné"
 
 #: ../rules/base.xml.in.h:480
-msgid "Maori"
-msgstr "Maorské"
-
-#: ../rules/base.xml.in.h:481
-msgid "Mari"
-msgstr "Marijské"
+msgid "Legacy Wang 724"
+msgstr "Zděděná Wang 724"
 
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:482
-msgid "Mdv"
-msgstr "MDV"
+msgid "Legacy key with comma"
+msgstr "Zděděná klávesa s čárkou"
 
 #: ../rules/base.xml.in.h:483
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
+msgid "Legacy key with dot"
+msgstr "Zděděná klávesa s tečkou"
 
-#: ../rules/base.xml.in.h:484
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access Keyboard"
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+#, fuzzy
+msgid "Lithuanian"
+msgstr "Litva"
 
 #: ../rules/base.xml.in.h:485
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
+#, fuzzy
+msgid "Lithuanian (IBM LST 1205-92)"
+msgstr "IBM (LST 1205-92)"
 
 #: ../rules/base.xml.in.h:486
-msgid "Menu"
-msgstr "Menu"
+#, fuzzy
+msgid "Lithuanian (LEKP)"
+msgstr "Litva"
 
 #: ../rules/base.xml.in.h:487
-msgid "Meta is mapped to Left Win"
-msgstr "Meta je přiřazena k levé klávese Win"
+#, fuzzy
+msgid "Lithuanian (LEKPa)"
+msgstr "Litva"
 
 #: ../rules/base.xml.in.h:488
-msgid "Meta is mapped to Win keys"
-msgstr "Meta je přiřazena ke klávesám Win"
+#, fuzzy
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgstr "Americká klávesnice s litevskými znaky"
 
 #: ../rules/base.xml.in.h:489
-msgid "Meta on Left Ctrl"
-msgstr "Meta na levé klávese Ctrl"
+#, fuzzy
+msgid "Lithuanian (standard)"
+msgstr "Litva"
 
 #: ../rules/base.xml.in.h:490
-msgid "Microsoft Comfort Curve Keyboard 2000"
-msgstr "Microsoft Comfort Curve Keyboard 2000"
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
 
 #: ../rules/base.xml.in.h:491
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internet Keyboard"
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
 
 #: ../rules/base.xml.in.h:492
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, švédská"
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (alternativní volba)"
 
 #: ../rules/base.xml.in.h:493
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
 
 #: ../rules/base.xml.in.h:494
-msgid "Microsoft Natural Keyboard Elite"
-msgstr "Microsoft Natural Keyboard Elite"
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
 
 #: ../rules/base.xml.in.h:495
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
 
 #: ../rules/base.xml.in.h:496
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
 
 #: ../rules/base.xml.in.h:497
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (alternativní volba 2)"
 
 #: ../rules/base.xml.in.h:498
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
 
 #: ../rules/base.xml.in.h:499
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office Keyboard"
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
 #: ../rules/base.xml.in.h:500
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Přídavné klávesy Logitech G15 pomocí G15daemon"
 
 #: ../rules/base.xml.in.h:501
-msgid "Miscellaneous compatibility options"
-msgstr "Dodatečné volby kompatibility"
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech Generic Keyboard"
 
 #: ../rules/base.xml.in.h:502
-msgid "Mkd"
-msgstr "MKD"
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
 
 #: ../rules/base.xml.in.h:503
-msgid "Mli"
-msgstr "MLI"
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
 
 #: ../rules/base.xml.in.h:504
-msgid "Mlt"
-msgstr "MLT"
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
 
 #: ../rules/base.xml.in.h:505
-msgid "Mmr"
-msgstr "MMR"
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
 
 #: ../rules/base.xml.in.h:506
-msgid "Mng"
-msgstr "MNG"
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
 
 #: ../rules/base.xml.in.h:507
-msgid "Mongolia"
-msgstr "Mongolsko"
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
 
 #: ../rules/base.xml.in.h:508
-msgid "Montenegro"
-msgstr "Černá Hora"
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
 
 #: ../rules/base.xml.in.h:509
-msgid "Morocco"
-msgstr "Maroko"
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
 
 #: ../rules/base.xml.in.h:510
-msgid "Multilingual"
-msgstr "Vícejazyčné"
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
 
 #: ../rules/base.xml.in.h:511
-msgid "Multilingual, first part"
-msgstr "Vícejazyčné, první část"
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
 #: ../rules/base.xml.in.h:512
-msgid "Multilingual, second part"
-msgstr "Vícejazyčné, druhá část"
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
 #: ../rules/base.xml.in.h:513
-msgid "Myanmar"
-msgstr "Myanmar"
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
 #: ../rules/base.xml.in.h:514
-msgid "NICOLA-F style Backspace"
-msgstr "Backspace typu NICOLA-F"
+msgid "Lower Sorbian"
+msgstr "Dolnolužické"
 
 #: ../rules/base.xml.in.h:515
-msgid "NLA"
-msgstr "NLA"
+msgid "Lower Sorbian (qwertz)"
+msgstr "Dolnolužické (qwertz)"
 
 #: ../rules/base.xml.in.h:516
-msgid "Nativo"
-msgstr "Nativo"
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
 
 #: ../rules/base.xml.in.h:517
-msgid "Nativo for Esperanto"
-msgstr "Nativo pro esperanto"
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (mez.)"
 
 #: ../rules/base.xml.in.h:518
-msgid "Nativo for USA keyboards"
-msgstr "Nativo pro americké klávesnice"
+#, fuzzy
+msgid "Macedonian"
+msgstr "Makedonie"
 
 #: ../rules/base.xml.in.h:519
-msgid "Neo 2"
-msgstr "Neo 2"
+#, fuzzy
+msgid "Macedonian (eliminate dead keys)"
+msgstr "Macintosh, vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:520
-msgid "Nepal"
-msgstr "Nepál"
+msgid "Macintosh"
+msgstr "Macintosh"
 
 #: ../rules/base.xml.in.h:521
-msgid "Netherlands"
-msgstr "Nizozemsko"
+msgid "Macintosh Old"
+msgstr "Macintosh staré"
 
 #: ../rules/base.xml.in.h:522
-msgid "New phonetic"
-msgstr "Nové fonetické"
+msgid "Make Caps Lock an additional Backspace"
+msgstr "Vytvořit z klávesy Caps Lock další Backspace"
 
 #: ../rules/base.xml.in.h:523
-msgid "Nga"
-msgstr "NGA"
+#, fuzzy
+msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
+msgstr "Vytvořit z klávesy Caps Lock další Num Lock"
 
 #: ../rules/base.xml.in.h:524
-msgid "Nigeria"
-msgstr "Nigérie"
+msgid "Make Caps Lock an additional Ctrl"
+msgstr "Vytvořit z klávesy Caps Lock další Ctrl"
 
 #: ../rules/base.xml.in.h:525
-msgid "Nld"
-msgstr "NLD"
+msgid "Make Caps Lock an additional ESC"
+msgstr "Vytvořit z klávesy Caps Lock další Esc"
 
 #: ../rules/base.xml.in.h:526
-msgid "Non-breakable space character at fourth level"
-msgstr "Na čtvrté úrovni znak nedělitelné mezery"
+msgid "Make Caps Lock an additional Hyper"
+msgstr "Vytvořit z klávesy Caps Lock další Hyper"
 
 #: ../rules/base.xml.in.h:527
-msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Na čtvrté úrovni znak nedělitelné mezery, tenká nedělitelná mezera na šesté úrovni"
+msgid "Make Caps Lock an additional Num Lock"
+msgstr "Vytvořit z klávesy Caps Lock další Num Lock"
 
 #: ../rules/base.xml.in.h:528
-msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
-msgstr "Na čtvrté úrovni znak nedělitelné mezery, tenká nedělitelná mezera na šesté úrovni (přes Ctrl+Shift)"
+msgid "Make Caps Lock an additional Super"
+msgstr "Vytvořit z klávesy Caps Lock další Super"
 
 #: ../rules/base.xml.in.h:529
-msgid "Non-breakable space character at second level"
-msgstr "Na druhé úrovni znak nedělitelné mezery"
+msgid "Malayalam"
+msgstr "Malajálamské"
 
 #: ../rules/base.xml.in.h:530
-msgid "Non-breakable space character at third level"
-msgstr "Na třetí úrovni znak nedělitelné mezery"
+#, fuzzy
+msgid "Malayalam (Lalitha)"
+msgstr "Malajálamské lalitha"
 
 #: ../rules/base.xml.in.h:531
-msgid "Non-breakable space character at third level, nothing at fourth level"
-msgstr "Na třetí úrovni znak nedělitelné mezery, nic na úrovni čtvrté"
+msgid "Malayalam (enhanced Inscript with Rupee Sign)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:532
-msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Na třetí úrovni znak nedělitelné mezery, tenká nedělitelná mezera na čtvrté úrovni"
+#, fuzzy
+msgid "Maltese"
+msgstr "Malta"
 
 #: ../rules/base.xml.in.h:533
-msgid "Nor"
-msgstr "NOR"
+#, fuzzy
+msgid "Maltese (with US layout)"
+msgstr "Maltézská klávesnice s americkým rozložením"
 
 #: ../rules/base.xml.in.h:534
-msgid "Northern Saami"
-msgstr "Severolaponské"
+msgid "Maori"
+msgstr "Maorské"
 
 #: ../rules/base.xml.in.h:535
-msgid "Northern Saami, eliminate dead keys"
-msgstr "Severolaponské, vyloučit mrtvé klávesy"
+msgid "Mari"
+msgstr "Marijské"
 
 #: ../rules/base.xml.in.h:536
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
 
 #: ../rules/base.xml.in.h:537
-msgid "Norway"
-msgstr "Norsko"
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
 
 #: ../rules/base.xml.in.h:538
-msgid "Npl"
-msgstr "NPL"
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
 
 #: ../rules/base.xml.in.h:539
-msgid "Num Lock"
-msgstr "Num Lock"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../rules/base.xml.in.h:540
-msgid "Numeric keypad delete key behaviour"
-msgstr "Chování klávesy Delete na numerické klávesnici"
+msgid "Meta is mapped to Left Win"
+msgstr "Meta je přiřazena k levé klávese Win"
 
 #: ../rules/base.xml.in.h:541
-msgid "Numeric keypad keys work as with Mac"
-msgstr "Klávesy numerické klávesnice fungují stejně jako u počítače Mac"
+msgid "Meta is mapped to Win keys"
+msgstr "Meta je přiřazena ke klávesám Win"
 
 #: ../rules/base.xml.in.h:542
-msgid "Numeric keypad layout selection"
-msgstr "Výběr rozložení numerické klávesnice"
+msgid "Meta on Left Ctrl"
+msgstr "Meta na levé klávese Ctrl"
 
 #: ../rules/base.xml.in.h:543
-msgid "OADG 109A"
-msgstr "OADG 109A"
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
 
 #: ../rules/base.xml.in.h:544
-msgid "OLPC"
-msgstr "OLPC"
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
 
 #: ../rules/base.xml.in.h:545
-msgid "OLPC Dari"
-msgstr "OLPC, darí"
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, švédská"
 
 #: ../rules/base.xml.in.h:546
-msgid "OLPC Pashto"
-msgstr "OLPC, paštó"
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
 
 #: ../rules/base.xml.in.h:547
-msgid "OLPC Southern Uzbek"
-msgstr "OLPC, jihouzbecké"
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
 
 #: ../rules/base.xml.in.h:548
-msgid "Occitan"
-msgstr "Okcitánské"
+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 "Ogham"
-msgstr "Ogam"
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
 
 #: ../rules/base.xml.in.h:550
-msgid "Ogham IS434"
-msgstr "Ogham IS434"
+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 "Oriya"
-msgstr "Urijské"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
 #: ../rules/base.xml.in.h:552
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Internet keyboard pro Ortek MCK-800 MM"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
 #: ../rules/base.xml.in.h:553
-msgid "Ossetian"
-msgstr "Osetinské"
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
 
 #: ../rules/base.xml.in.h:554
-msgid "Ossetian, Winkeys"
-msgstr "Osetinské, klávesy Win"
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
 #: ../rules/base.xml.in.h:555
-msgid "Ossetian, legacy"
-msgstr "Osetinské, zděděné"
+msgid "Miscellaneous compatibility options"
+msgstr "Dodatečné volby kompatibility"
 
 #: ../rules/base.xml.in.h:556
-msgid "PC-98xx Series"
-msgstr "Řada PC-98xx"
+#, fuzzy
+msgid "Mongolian"
+msgstr "Mongolsko"
 
 #: ../rules/base.xml.in.h:557
-msgid "Pak"
-msgstr "PAK"
+#, fuzzy
+msgid "Montenegrin"
+msgstr "Černá Hora"
 
 #: ../rules/base.xml.in.h:558
-msgid "Pakistan"
-msgstr "Pákistán"
+#, fuzzy
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr "Cyrilice s francouzskými uvozovkami"
 
 #: ../rules/base.xml.in.h:559
-msgid "Pannonian Rusyn Homophonic"
-msgstr "Panonsko-rusínské stejně znějící"
+msgid "Montenegrin (Cyrillic)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:560
-msgid "Pashto"
-msgstr "Paštské"
+#, fuzzy
+msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
+msgstr "Cyrilice, prohozené Z a Ž"
 
 #: ../rules/base.xml.in.h:561
-msgid "Pattachote"
-msgstr "Pattachote"
+#, fuzzy
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Latinské Unicode qwerty"
 
 #: ../rules/base.xml.in.h:562
-msgid "Pause"
-msgstr "Pause (Pauza)"
+#, fuzzy
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Latinské Unicode"
 
 #: ../rules/base.xml.in.h:563
-msgid "Persian, with Persian Keypad"
-msgstr "Perské, s perskou numerickou klávesnicí"
+#, fuzzy
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Latinské qwerty"
 
 #: ../rules/base.xml.in.h:564
-msgid "Phi"
-msgstr "PHI"
+#, fuzzy
+msgid "Montenegrin (Latin with guillemets)"
+msgstr "Latinské s francouzskými uvozovkami"
 
 #: ../rules/base.xml.in.h:565
-msgid "Philippines"
-msgstr "Filipíny"
+msgid "NICOLA-F style Backspace"
+msgstr "Backspace typu NICOLA-F"
 
 #: ../rules/base.xml.in.h:566
-msgid "Phonetic"
-msgstr "Fonetické"
+#, fuzzy
+msgid "Nepali"
+msgstr "Nepál"
 
 #: ../rules/base.xml.in.h:567
-msgid "Phonetic Winkeys"
-msgstr "Fonetické klávesy Win"
+msgid "Non-breakable space character at fourth level"
+msgstr "Na čtvrté úrovni znak nedělitelné mezery"
 
 #: ../rules/base.xml.in.h:568
-msgid "Pol"
-msgstr "POL"
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
+msgstr "Na čtvrté úrovni znak nedělitelné mezery, tenká nedělitelná mezera na šesté úrovni"
 
 #: ../rules/base.xml.in.h:569
-msgid "Poland"
-msgstr "Polsko"
+msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"
+msgstr "Na čtvrté úrovni znak nedělitelné mezery, tenká nedělitelná mezera na šesté úrovni (přes Ctrl+Shift)"
 
 #: ../rules/base.xml.in.h:570
-msgid "Polytonic"
-msgstr "Polytonické"
+msgid "Non-breakable space character at second level"
+msgstr "Na druhé úrovni znak nedělitelné mezery"
 
 #: ../rules/base.xml.in.h:571
-msgid "Portugal"
-msgstr "Portugalsko"
+msgid "Non-breakable space character at third level"
+msgstr "Na třetí úrovni znak nedělitelné mezery"
 
 #: ../rules/base.xml.in.h:572
-msgid "Probhat"
-msgstr "Prt"
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Na třetí úrovni znak nedělitelné mezery, nic na úrovni čtvrté"
 
 #: ../rules/base.xml.in.h:573
-msgid "Programmer Dvorak"
-msgstr "Programátorské Dvorak"
+msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
+msgstr "Na třetí úrovni znak nedělitelné mezery, tenká nedělitelná mezera na čtvrté úrovni"
 
 #: ../rules/base.xml.in.h:574
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
+#, fuzzy
+msgid "Northern Saami (Finland)"
+msgstr "Severolaponské"
 
 #: ../rules/base.xml.in.h:575
-msgid "Prt"
-msgstr "PRT"
+#, fuzzy
+msgid "Northern Saami (Norway)"
+msgstr "Severolaponské"
 
 #: ../rules/base.xml.in.h:576
-msgid "PrtSc"
-msgstr "PrtSc"
+#, fuzzy
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Severolaponské, vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:577
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+#, fuzzy
+msgid "Northern Saami (Sweden)"
+msgstr "Severolaponské"
 
 #: ../rules/base.xml.in.h:578
-msgid "QWERTY (Baybayin)"
-msgstr "QWERTY (baybayin)"
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
 
 #: ../rules/base.xml.in.h:579
-msgid "Right Alt"
-msgstr "Pravá klávesa Alt"
+#, fuzzy
+msgid "Norwegian"
+msgstr "Gruzínské"
 
 #: ../rules/base.xml.in.h:580
-msgid "Right Alt (while pressed)"
-msgstr "Pravá klávesa Alt (při stisknutí)"
+#, fuzzy
+msgid "Norwegian (Dvorak)"
+msgstr "Francouzské Dvorak"
 
 #: ../rules/base.xml.in.h:581
-msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Pravá klávesa Alt vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
+#, fuzzy
+msgid "Norwegian (Macintosh)"
+msgstr "Německé (Macintosh)"
 
 #: ../rules/base.xml.in.h:582
-msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "Pravá klávesa Alt vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně, jedno stisknutí ruší uzamčení"
+#, fuzzy
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Macintosh, vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:583
-msgid "Right Alt key never chooses 3rd level"
-msgstr "Pravá klávesa Alt nikdy neumožní výběr 3. úrovně"
+#, fuzzy
+msgid "Norwegian (eliminate dead keys)"
+msgstr "Francouzské, vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:584
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "Pravá klávesa Alt, Shift a pravá klávesa Alt je Multi_Key"
+msgid "Num Lock"
+msgstr "Num Lock"
 
 #: ../rules/base.xml.in.h:585
-msgid "Right Ctrl"
-msgstr "Pravá klávesa Ctrl"
+msgid "Numeric keypad delete key behaviour"
+msgstr "Chování klávesy Delete na numerické klávesnici"
 
 #: ../rules/base.xml.in.h:586
-msgid "Right Ctrl (while pressed)"
-msgstr "Pravá klávesa Ctrl (při stisknutí)"
+#, fuzzy
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "Klávesy numerické klávesnice fungují stejně jako u počítače Mac"
 
 #: ../rules/base.xml.in.h:587
-msgid "Right Ctrl as Right Alt"
-msgstr "Pravá klávesa Ctrl funguje jako pravá klávesa Alt"
+msgid "Numeric keypad layout selection"
+msgstr "Výběr rozložení numerické klávesnice"
 
 #: ../rules/base.xml.in.h:588
-msgid "Right Ctrl+Right Shift"
-msgstr "Pravá klávesa Ctrl + pravá klávesa Shift"
+msgid "OLPC"
+msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:589
-msgid "Right Shift"
-msgstr "Pravá klávesa Shift"
+msgid "Occitan"
+msgstr "Okcitánské"
 
 #: ../rules/base.xml.in.h:590
-msgid "Right Win"
-msgstr "Pravá klávesa Win"
+msgid "Ogham"
+msgstr "Ogam"
 
 #: ../rules/base.xml.in.h:591
-msgid "Right Win (while pressed)"
-msgstr "Pravá klávesa Win (při stisknutí)"
+#, fuzzy
+msgid "Ogham (IS434)"
+msgstr "Ogham IS434"
 
 #: ../rules/base.xml.in.h:592
-msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Pravá klávesa Win vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
+msgid "Oriya"
+msgstr "Urijské"
 
 #: ../rules/base.xml.in.h:593
-msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "Pravá klávesa Win vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně, jedno stisknutí ruší uzamčení"
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Internet keyboard pro Ortek MCK-800 MM"
 
 #: ../rules/base.xml.in.h:594
-msgid "Right hand"
-msgstr "Pravoruké"
+#, fuzzy
+msgid "Ossetian (Georgia)"
+msgstr "Osetinské, zděděné"
 
 #: ../rules/base.xml.in.h:595
-msgid "Right handed Dvorak"
-msgstr "Pravoruké Dvorak"
+#, fuzzy
+msgid "Ossetian (WinKeys)"
+msgstr "Osetinské, klávesy Win"
 
 #: ../rules/base.xml.in.h:596
-msgid "Romania"
-msgstr "Rumunsko"
+#, fuzzy
+msgid "Ossetian (legacy)"
+msgstr "Osetinské, zděděné"
 
 #: ../rules/base.xml.in.h:597
-msgid "Romanian keyboard with German letters"
-msgstr "Rumunská klávesnice s německými znaky"
+msgid "PC-98xx Series"
+msgstr "Řada PC-98xx"
 
 #: ../rules/base.xml.in.h:598
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Rumunská klávesnice s německými znaky, vyloučit mrtvé klávesy"
+#, fuzzy
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Panonsko-rusínské stejně znějící"
 
 #: ../rules/base.xml.in.h:599
-msgid "Rou"
-msgstr "ROU"
+msgid "Pashto"
+msgstr "Paštské"
 
 #: ../rules/base.xml.in.h:600
-msgid "Rupee on 4"
-msgstr "Rupie na 4"
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:601
-msgid "Rus"
-msgstr "RUS"
+msgid "Pause"
+msgstr "Pause (Pauza)"
 
-#: ../rules/base.xml.in.h:602
-msgid "Russia"
-msgstr "Rusko"
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+msgid "Persian"
+msgstr ""
 
 #: ../rules/base.xml.in.h:603
-msgid "Russian"
-msgstr "Ruské"
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:604
-msgid "Russian phonetic"
-msgstr "Ruské fonetické"
+#, fuzzy
+msgid "Persian (with Persian Keypad)"
+msgstr "Perské, s perskou numerickou klávesnicí"
 
-#: ../rules/base.xml.in.h:605
-msgid "Russian phonetic Dvorak"
-msgstr "Ruské fonetické Dvorak"
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+msgid "Polish"
+msgstr "Polské"
 
 #: ../rules/base.xml.in.h:606
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "Ruské fonetické, vyloučit mrtvé klávesy"
+msgid "Polish (Dvorak)"
+msgstr "Polské (Dvorak)"
 
 #: ../rules/base.xml.in.h:607
-msgid "Russian with Kazakh"
-msgstr "Ruská s kazaštinou"
+msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgstr "Polské (Dvorak, polské uvozovky na klávese 1)"
 
 #: ../rules/base.xml.in.h:608
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard"
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr "Polské (Dvorak, polské uvozovky na klávese uvozovky)"
 
 #: ../rules/base.xml.in.h:609
-msgid "SK-1300"
-msgstr "SK-1300"
+msgid "Polish (programmer Dvorak)"
+msgstr "Polské (programátorské Dvorak)"
 
 #: ../rules/base.xml.in.h:610
-msgid "SK-2500"
-msgstr "SK-2500"
+msgid "Polish (qwertz)"
+msgstr "Polské (qwertz)"
 
 #: ../rules/base.xml.in.h:611
-msgid "SK-6200"
-msgstr "SK-6200"
+#, fuzzy
+msgid "Portuguese"
+msgstr "Portugalsko"
 
 #: ../rules/base.xml.in.h:612
-msgid "SK-7100"
-msgstr "SK-7100"
+msgid "Portuguese (Brazil)"
+msgstr ""
 
-#: ../rules/base.xml.in.h:613 ../rules/base.extras.xml.in.h:9
-msgid "SRB"
-msgstr "SRB"
+#: ../rules/base.xml.in.h:613
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:614
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
+#, fuzzy
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr "Severolaponské, vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:615
-msgid "SVEN Slim 303"
-msgstr "SVEN Slim 303"
+#, fuzzy
+msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgstr "Nativo pro esperanto"
 
 #: ../rules/base.xml.in.h:616
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
+#, fuzzy
+msgid "Portuguese (Brazil, nativo for USA keyboards)"
+msgstr "Nativo pro americké klávesnice"
 
 #: ../rules/base.xml.in.h:617
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
+msgid "Portuguese (Brazil, nativo)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:618
-msgid "Scroll Lock"
-msgstr "Scroll Lock"
+#, fuzzy
+msgid "Portuguese (Macintosh)"
+msgstr "Francouzské (Macintosh)"
 
 #: ../rules/base.xml.in.h:619
-msgid "Secwepemctsin"
-msgstr "Secwepemctsin"
+#, fuzzy
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Macintosh, mrtvé klávesy Sun"
 
 #: ../rules/base.xml.in.h:620
-msgid "Semi-colon on third level"
-msgstr "Středník na třetí úrovni"
+#, fuzzy
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Macintosh, vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:621
-msgid "Sen"
-msgstr "SEN"
+#, fuzzy
+msgid "Portuguese (Nativo for USA keyboards)"
+msgstr "Nativo pro americké klávesnice"
 
 #: ../rules/base.xml.in.h:622
-msgid "Senegal"
-msgstr "Senegal"
+msgid "Portuguese (Nativo)"
+msgstr ""
 
-#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:10
-msgid "Serbia"
-msgstr "Srbsko"
+#: ../rules/base.xml.in.h:623
+#, fuzzy
+msgid "Portuguese (Sun dead keys)"
+msgstr "Francouzské, mrtvé klávesy Sun"
 
 #: ../rules/base.xml.in.h:624
-msgid "Serbian"
-msgstr "Srbské"
+#, fuzzy
+msgid "Portuguese (eliminate dead keys)"
+msgstr "Francouzské, vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:625
-msgid "Serbo-Croatian"
-msgstr "Srbochorvatské"
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
 
 #: ../rules/base.xml.in.h:626
-msgid "Shift cancels Caps Lock"
-msgstr "Shift ruší Caps Lock"
+msgid "PrtSc"
+msgstr "PrtSc"
 
 #: ../rules/base.xml.in.h:627
-msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
-msgstr "Shift neruší Num Lock, namísto toho vybírá 3. úroveň"
+#, fuzzy
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "Gurmuchské (Jhelum)"
 
 #: ../rules/base.xml.in.h:628
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Shift s numerickými klávesami funguje jako v MS Windows"
+#, fuzzy
+msgid "Punjabi (Gurmukhi)"
+msgstr "Gurmuchské"
 
 #: ../rules/base.xml.in.h:629
-msgid "Shift+Caps Lock"
-msgstr "Shift+Caps Lock"
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
 
 #: ../rules/base.xml.in.h:630
-msgid "Simple"
-msgstr "Jednoduché"
+msgid "Right Alt"
+msgstr "Pravá klávesa Alt"
 
 #: ../rules/base.xml.in.h:631
-msgid "Sindhi"
-msgstr "Sindhské"
+msgid "Right Alt (while pressed)"
+msgstr "Pravá klávesa Alt (při stisknutí)"
 
 #: ../rules/base.xml.in.h:632
-msgid "Slovakia"
-msgstr "Slovensko"
+#, fuzzy
+msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "Pravá klávesa Alt vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně, jedno stisknutí ruší uzamčení"
 
 #: ../rules/base.xml.in.h:633
-msgid "Slovenia"
-msgstr "Slovinsko"
+msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Pravá klávesa Alt vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
 
 #: ../rules/base.xml.in.h:634
-msgid "South Africa"
-msgstr "Jihoafrická republika"
+msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "Pravá klávesa Alt vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně, jedno stisknutí ruší uzamčení"
 
 #: ../rules/base.xml.in.h:635
-msgid "Southern Uzbek"
-msgstr "Jihouzbecké"
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Pravá klávesa Alt nikdy neumožní výběr 3. úrovně"
 
 #: ../rules/base.xml.in.h:636
-msgid "Spain"
-msgstr "Španělsko"
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Pravá klávesa Alt, Shift a pravá klávesa Alt je Multi_Key"
 
 #: ../rules/base.xml.in.h:637
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr "Speciální klávesy (Ctrl+Alt+&lt;klávesa&gt;) zpracovány v serveru"
+msgid "Right Ctrl"
+msgstr "Pravá klávesa Ctrl"
 
 #: ../rules/base.xml.in.h:638
-msgid "Sri Lanka"
-msgstr "Srí Lanka"
+msgid "Right Ctrl (while pressed)"
+msgstr "Pravá klávesa Ctrl (při stisknutí)"
 
 #: ../rules/base.xml.in.h:639
-msgid "Standard"
-msgstr "Standardní"
+msgid "Right Ctrl as Right Alt"
+msgstr "Pravá klávesa Ctrl funguje jako pravá klávesa Alt"
 
 #: ../rules/base.xml.in.h:640
-msgid "Standard (Cedilla)"
-msgstr "Standardní (cédille)"
+#, fuzzy
+msgid "Right Ctrl is mapped to Menu"
+msgstr "Meta je přiřazena k levé klávese Win"
+
+#: ../rules/base.xml.in.h:641
+msgid "Right Ctrl+Right Shift"
+msgstr "Pravá klávesa Ctrl + pravá klávesa Shift"
 
-#. RSTU 2019-91
 #: ../rules/base.xml.in.h:642
-msgid "Standard RSTU"
-msgstr "Standardní RSTU"
+msgid "Right Shift"
+msgstr "Pravá klávesa Shift"
+
+#: ../rules/base.xml.in.h:643
+msgid "Right Win"
+msgstr "Pravá klávesa Win"
 
-#. RSTU 2019-91
 #: ../rules/base.xml.in.h:644
-msgid "Standard RSTU on Russian layout"
-msgstr "Standardní RSTU s ruským rozložením"
+msgid "Right Win (while pressed)"
+msgstr "Pravá klávesa Win (při stisknutí)"
 
 #: ../rules/base.xml.in.h:645
-msgid "Sun Type 5/6"
-msgstr "Sun Type 5/6"
+msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "Pravá klávesa Win vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně"
 
 #: ../rules/base.xml.in.h:646
-msgid "Sun dead keys"
-msgstr "Mrtvé klávesy Sun"
+msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "Pravá klávesa Win vybírá 5. úroveň, uzamyká při stisknutí společně s jinou výběrovou klávesou 5. úrovně, jedno stisknutí ruší uzamčení"
 
-#: ../rules/base.xml.in.h:647
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard"
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+#, fuzzy
+msgid "Romanian"
+msgstr "Rumunsko"
 
 #: ../rules/base.xml.in.h:648
-msgid "Svdvorak"
-msgstr "Svdvorak"
+msgid "Romanian (Germany)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:649
-msgid "Svk"
-msgstr "SVK"
+#, fuzzy
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Německé, vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:650
-msgid "Svn"
-msgstr "SVN"
+msgid "Romanian (WinKeys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:651
-msgid "Swap Ctrl and Caps Lock"
-msgstr "Zaměnit Ctrl a Caps Lock"
+#, fuzzy
+msgid "Romanian (cedilla)"
+msgstr "Standardní (cédille)"
 
 #: ../rules/base.xml.in.h:652
-msgid "Swap ESC and Caps Lock"
-msgstr "Zaměnit Esc a Caps Lock"
+#, fuzzy
+msgid "Romanian (standard cedilla)"
+msgstr "Standardní (cédille)"
 
 #: ../rules/base.xml.in.h:653
-msgid "Swe"
-msgstr "SWE"
+msgid "Romanian (standard)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:654
-msgid "Sweden"
-msgstr "Švédsko"
+msgid "Rupee on 4"
+msgstr "Rupie na 4"
 
-#: ../rules/base.xml.in.h:655
-msgid "Switzerland"
-msgstr "Švýcarsko"
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+msgid "Russian"
+msgstr "Ruské"
 
 #: ../rules/base.xml.in.h:656
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
+msgid "Russian (DOS)"
+msgstr "Ruské (DOS)"
 
 #: ../rules/base.xml.in.h:657
-msgid "Syr"
-msgstr "SYR"
+msgid "Russian (Georgia)"
+msgstr "Ruské (Gruzie)"
 
 #: ../rules/base.xml.in.h:658
-msgid "Syria"
-msgstr "Sýrie"
+msgid "Russian (Germany, phonetic)"
+msgstr "Ruské (Německo, fonetické)"
 
 #: ../rules/base.xml.in.h:659
-msgid "Syriac"
-msgstr "Syrské"
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr "Ruské (Kazachstán, s kazaštinou)"
 
 #: ../rules/base.xml.in.h:660
-msgid "Syriac phonetic"
-msgstr "Syrské fonetické"
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr "Ruské (Polsko, fonetické Dvorak)"
 
 #: ../rules/base.xml.in.h:661
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
+msgid "Russian (Sweden, phonetic)"
+msgstr "Ruské (Švédsko, fonetické)"
 
 #: ../rules/base.xml.in.h:662
-msgid "Tajikistan"
-msgstr "Tádžikistán"
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgstr "Ruské (Švédsko, fonetické, vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:663
-msgid "Tamil"
-msgstr "Tamilské"
+msgid "Russian (US, phonetic)"
+msgstr "Ruské (USA, fonetické)"
 
 #: ../rules/base.xml.in.h:664
-msgid "Tamil Keyboard with Numerals"
-msgstr "Tamilská klávesnice s číselnými znaky"
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Ruské (Ukrajina, standardní RSTU)"
 
 #: ../rules/base.xml.in.h:665
-msgid "Tamil TAB Typewriter"
-msgstr "Tamil TAB Typewriter"
+msgid "Russian (legacy)"
+msgstr "Ruské (zděděné)"
 
 #: ../rules/base.xml.in.h:666
-msgid "Tamil TSCII Typewriter"
-msgstr "Tamil TSCII Typewriter"
+msgid "Russian (phonetic WinKeys)"
+msgstr "Ruské (fonetické klávesy Win)"
 
 #: ../rules/base.xml.in.h:667
-msgid "Tamil Unicode"
-msgstr "Tamilské Unicode"
+msgid "Russian (phonetic)"
+msgstr "Ruské (fonetické)"
 
 #: ../rules/base.xml.in.h:668
-msgid "Tanzania"
-msgstr "Tanzanie"
+msgid "Russian (typewriter)"
+msgstr "Ruské (psací stroj)"
 
 #: ../rules/base.xml.in.h:669
-msgid "Targa Visionary 811"
-msgstr "Targa Visionary 811"
+msgid "Russian (typewriter, legacy)"
+msgstr "Ruské (psací stroj, zděděné)"
 
 #: ../rules/base.xml.in.h:670
-msgid "Tatar"
-msgstr "Tatarské"
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
 #: ../rules/base.xml.in.h:671
-msgid "Telugu"
-msgstr "Tegulské"
+msgid "SK-1300"
+msgstr "SK-1300"
 
 #: ../rules/base.xml.in.h:672
-msgid "Tha"
-msgstr "THA"
+msgid "SK-2500"
+msgstr "SK-2500"
 
 #: ../rules/base.xml.in.h:673
-msgid "Thailand"
-msgstr "Thajsko"
+msgid "SK-6200"
+msgstr "SK-6200"
 
 #: ../rules/base.xml.in.h:674
-msgid "Tibetan"
-msgstr "Tibetské"
+msgid "SK-7100"
+msgstr "SK-7100"
 
 #: ../rules/base.xml.in.h:675
-msgid "Tibetan (with ASCII numerals)"
-msgstr "Tibetské (s číslicemi ASCII)"
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
 
 #: ../rules/base.xml.in.h:676
-msgid "Tifinagh"
-msgstr "Tifinagh"
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
 
 #: ../rules/base.xml.in.h:677
-msgid "Tifinagh alternative"
-msgstr "Tifinagh alternativní"
+msgid "Saisiyat (Taiwan)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:678
-msgid "Tifinagh alternative phonetic"
-msgstr "Tifinagh alternativní fonetické"
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
 
 #: ../rules/base.xml.in.h:679
-msgid "Tifinagh extended"
-msgstr "Tifinagh rozšířené"
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
 
 #: ../rules/base.xml.in.h:680
-msgid "Tifinagh extended phonetic"
-msgstr "Tifinagh rozšířené fonetické"
+msgid "Sanwa Supply SKB-KG3"
+msgstr "Sanwa Supply SKB-KG3"
 
 #: ../rules/base.xml.in.h:681
-msgid "Tifinagh phonetic"
-msgstr "Tifinagh fonetické"
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
 
 #: ../rules/base.xml.in.h:682
-msgid "Tilde (~) variant"
-msgstr "Varianta s vlnovkou (~)"
+msgid "Semi-colon on third level"
+msgstr "Středník na třetí úrovni"
 
-#: ../rules/base.xml.in.h:683
-msgid "Tjk"
-msgstr "TJK"
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+msgid "Serbian"
+msgstr "Srbské"
 
 #: ../rules/base.xml.in.h:684
-msgid "Tkm"
-msgstr "TKM"
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr "Srbské (latinka Unicode qwerty)"
 
 #: ../rules/base.xml.in.h:685
-msgid "To the corresponding key in a Dvorak keyboard."
-msgstr "K odpovídající klávese na klávesnici Dvorak."
+msgid "Serbian (Latin Unicode)"
+msgstr "Srbské (latinka Unicode)"
 
 #: ../rules/base.xml.in.h:686
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr "K odpovídající klávese na klávesnici Qwerty."
+msgid "Serbian (Latin qwerty)"
+msgstr "Srbské (latinka qwerty)"
 
 #: ../rules/base.xml.in.h:687
-msgid "Toggle PointerKeys with Shift + NumLock."
-msgstr "Přepnout PointerKeys klávesou Shift + Num Lock."
+msgid "Serbian (Latin with guillemets)"
+msgstr "Srbské (latinka s francouzskými uvozovkami)"
 
 #: ../rules/base.xml.in.h:688
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
+msgid "Serbian (Latin)"
+msgstr "Srbské (latinka)"
 
 #: ../rules/base.xml.in.h:689
-msgid "Traditional phonetic"
-msgstr "Tradiční fonetické"
+msgid "Serbian (Russia)"
+msgstr "Srbské (Rusko)"
 
 #: ../rules/base.xml.in.h:690
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access Keyboard"
+msgid "Serbian (Z and ZHE swapped)"
+msgstr "Srbské (prohozené Z a Ž)"
 
 #: ../rules/base.xml.in.h:691
-msgid "Trust Slimline"
-msgstr "Trust Slimline"
+msgid "Serbian (with guillemets)"
+msgstr "Srbské (s francouzskými uvozovkami)"
 
 #: ../rules/base.xml.in.h:692
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
+msgid "Serbo-Croatian (US)"
+msgstr "Srbochorvatské (USA)"
 
 #: ../rules/base.xml.in.h:693
-msgid "Tur"
-msgstr "TUR"
+msgid "Shift cancels Caps Lock"
+msgstr "Shift ruší Caps Lock"
 
 #: ../rules/base.xml.in.h:694
-msgid "Turkey"
-msgstr "Turecko"
+msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
+msgstr "Shift neruší Num Lock, namísto toho vybírá 3. úroveň"
 
 #: ../rules/base.xml.in.h:695
-msgid "Turkmenistan"
-msgstr "Turkmenistán"
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Shift s numerickými klávesami funguje jako v MS Windows"
 
 #: ../rules/base.xml.in.h:696
-msgid "TypeMatrix EZ-Reach 2020"
-msgstr "TypeMatrix EZ-Reach 2020"
+msgid "Shift+Caps Lock"
+msgstr "Shift+Caps Lock"
 
 #: ../rules/base.xml.in.h:697
-msgid "TypeMatrix EZ-Reach 2030 PS2"
-msgstr "TypeMatrix EZ-Reach 2030 PS2"
+msgid "Sindhi"
+msgstr "Sindhské"
 
 #: ../rules/base.xml.in.h:698
-msgid "TypeMatrix EZ-Reach 2030 USB"
-msgstr "TypeMatrix EZ-Reach 2030 USB"
+msgid "Sinhala"
+msgstr ""
 
 #: ../rules/base.xml.in.h:699
-msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (režim 102/105:EU)"
+msgid "Slovak"
+msgstr "Slovenské"
 
 #: ../rules/base.xml.in.h:700
-msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (režim 106:JP)"
+msgid "Slovak (extended Backslash)"
+msgstr "Slovenské (rozšířená klávesa zpětného lomítka)"
 
 #: ../rules/base.xml.in.h:701
-msgid "Typewriter"
-msgstr "Psací stroj"
+msgid "Slovak (qwerty)"
+msgstr "Slovenské (qwerty)"
 
 #: ../rules/base.xml.in.h:702
-msgid "Typewriter, legacy"
-msgstr "Psací stroj, zděděné"
+msgid "Slovak (qwerty, extended Backslash)"
+msgstr "Slovenské (qwerty, rozšířená klávesa zpětného lomítka)"
 
 #: ../rules/base.xml.in.h:703
-msgid "Tza"
-msgstr "TZA"
+#, fuzzy
+msgid "Slovenian"
+msgstr "Slovinsko"
 
 #: ../rules/base.xml.in.h:704
-msgid "UCW layout (accented letters only)"
-msgstr "Rozložení UCW (pouze znaky s diakritikou)"
+#, fuzzy
+msgid "Slovenian (US keyboard with Slovenian letters)"
+msgstr "Americká klávesnice se slovinskými znaky"
 
 #: ../rules/base.xml.in.h:705
-msgid "US Dvorak with CZ UCW support"
-msgstr "Americké Dvorak s podporou CZ UCW"
+#, fuzzy
+msgid "Slovenian (use guillemets for quotes)"
+msgstr "Používat francouzské uvozovky"
 
 #: ../rules/base.xml.in.h:706
-msgid "US keyboard with Bosnian digraphs"
-msgstr "Americká klávesnice s bosenskými spřežkami"
+msgid "Spanish"
+msgstr "Španělské"
 
 #: ../rules/base.xml.in.h:707
-msgid "US keyboard with Bosnian letters"
-msgstr "Americká klávesnice s bosenskými znaky"
+msgid "Spanish (Dvorak)"
+msgstr "Španělské (Dvorak)"
 
 #: ../rules/base.xml.in.h:708
-msgid "US keyboard with Croatian digraphs"
-msgstr "Americká klávesnice s chorvatskými spřežkami"
+msgid "Spanish (Latin American)"
+msgstr "Španělské (latinskoamerické)"
 
 #: ../rules/base.xml.in.h:709
-msgid "US keyboard with Croatian letters"
-msgstr "Americká klávesnice s chorvatskými znaky"
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Španělské (latinskoamerické, mrtvé klávesy Sun)"
 
 #: ../rules/base.xml.in.h:710
-msgid "US keyboard with Estonian letters"
-msgstr "Americká klávesnice s estonskými znaky"
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr "Španělské (latinskoamerické, vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:711
-msgid "US keyboard with Italian letters"
-msgstr "Americká klávesnice s italskými znaky"
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr "Španělské (latinskoamerické, zahrnout mrtvou klávesu vlnovky)"
 
 #: ../rules/base.xml.in.h:712
-msgid "US keyboard with Lithuanian letters"
-msgstr "Americká klávesnice s litevskými znaky"
+msgid "Spanish (Macintosh)"
+msgstr "Španělské (Macintosh)"
 
 #: ../rules/base.xml.in.h:713
-msgid "US keyboard with Slovenian letters"
-msgstr "Americká klávesnice se slovinskými znaky"
+msgid "Spanish (Sun dead keys)"
+msgstr "Španělské (mrtvé klávesy Sun)"
 
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:11
-msgid "USA"
-msgstr "USA"
+#: ../rules/base.xml.in.h:714
+msgid "Spanish (eliminate dead keys)"
+msgstr "Španělské (vyloučit mrtvé klávesy)"
 
 #: ../rules/base.xml.in.h:715
-msgid "Udmurt"
-msgstr "Udmurtské"
+msgid "Spanish (include dead tilde)"
+msgstr "Španělské (zahrnout mrtvou klávesu vlnovky)"
 
 #: ../rules/base.xml.in.h:716
-msgid "Ukr"
-msgstr "UKR"
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr "Speciální klávesy (Ctrl+Alt+&lt;klávesa&gt;) zpracovány v serveru"
 
 #: ../rules/base.xml.in.h:717
-msgid "Ukraine"
-msgstr "Ukrajina"
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
 
 #: ../rules/base.xml.in.h:718
-msgid "Unicode additions (arrows and math operators)"
-msgstr "Doplňky Unicode (šipky a matematické operátory)"
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
 
 #: ../rules/base.xml.in.h:719
-msgid "Unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Doplňky Unicode (šipky a matematické operátory). Matematické operátory na výchozí úrovni"
+msgid "Swahili (Kenya)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:720
-msgid "UnicodeExpert"
-msgstr "UnicodeExpert"
+#, fuzzy
+msgid "Swahili (Tanzania)"
+msgstr "Tanzanie"
 
 #: ../rules/base.xml.in.h:721
-msgid "United Kingdom"
-msgstr "Spojené království"
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Zaměnit Ctrl a Caps Lock"
 
 #: ../rules/base.xml.in.h:722
-msgid "Unitek KB-1925"
-msgstr "Unitek KB-1925"
+msgid "Swap ESC and Caps Lock"
+msgstr "Zaměnit Esc a Caps Lock"
 
 #: ../rules/base.xml.in.h:723
-msgid "Urdu, Alternative phonetic"
-msgstr "Urdské, alternativní fonetické"
+#, fuzzy
+msgid "Swedish"
+msgstr "Švédsko"
 
 #: ../rules/base.xml.in.h:724
-msgid "Urdu, Phonetic"
-msgstr "Urdské, fonetické"
+#, fuzzy
+msgid "Swedish (Dvorak)"
+msgstr "Francouzské Dvorak"
 
 #: ../rules/base.xml.in.h:725
-msgid "Urdu, Winkeys"
-msgstr "Urdské, klávesy Win"
+#, fuzzy
+msgid "Swedish (Macintosh)"
+msgstr "Francouzské (Macintosh)"
 
 #: ../rules/base.xml.in.h:726
-msgid "Use Bosnian digraphs"
-msgstr "Používat bosenské spřežky"
+#, fuzzy
+msgid "Swedish (Svdvorak)"
+msgstr "Svdvorak"
 
 #: ../rules/base.xml.in.h:727
-msgid "Use Croatian digraphs"
-msgstr "Používat chorvatské spřežky"
+#, fuzzy
+msgid "Swedish (eliminate dead keys)"
+msgstr "Francouzské, vyloučit mrtvé klávesy"
 
 #: ../rules/base.xml.in.h:728
-msgid "Use guillemets for quotes"
-msgstr "Používat francouzské uvozovky"
+msgid "Swedish Sign Language"
+msgstr ""
 
 #: ../rules/base.xml.in.h:729
-msgid "Use keyboard LED to show alternative layout"
-msgstr "Použít LED klávesnice k zobrazení alternativního rozložení"
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
 
 #: ../rules/base.xml.in.h:730
-msgid "Using space key to input non-breakable space character"
-msgstr "Používání mezerníku k zadávání znaku nedělitelné mezery"
+msgid "Syriac"
+msgstr "Syrské"
 
 #: ../rules/base.xml.in.h:731
-msgid "Usual space at any level"
-msgstr "Na jakékoliv úrovni znak běžné mezery"
+#, fuzzy
+msgid "Syriac (phonetic)"
+msgstr "Syrské fonetické"
 
 #: ../rules/base.xml.in.h:732
-msgid "Uzb"
-msgstr "UZB"
+msgid "Taiwanese"
+msgstr ""
 
 #: ../rules/base.xml.in.h:733
-msgid "Uzbekistan"
-msgstr "Uzbekistán"
+msgid "Taiwanese (indigenous)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:734
-msgid "Vietnam"
-msgstr "Vietnam"
+#, fuzzy
+msgid "Tajik"
+msgstr "Tádžikistán"
 
 #: ../rules/base.xml.in.h:735
-msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr "ViewSonic KU-306 Internet Keyboard"
+#, fuzzy
+msgid "Tajik (legacy)"
+msgstr "Francouzské (zděděné)"
 
 #: ../rules/base.xml.in.h:736
-msgid "Vnm"
-msgstr "VNM"
+msgid "Tamil"
+msgstr "Tamilské"
 
 #: ../rules/base.xml.in.h:737
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Numerická klávesnice Wang 724 s doplňky Unicode (šipky a matematické operátory)"
+#, fuzzy
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgstr "Tamil TAB Typewriter"
 
 #: ../rules/base.xml.in.h:738
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Numerická klávesnice Wang 724 s doplňky Unicode (šipky a matematické operátory). Matematické operátory na výchozí úrovni"
+#, fuzzy
+msgid "Tamil (Sri Lanka, Unicode)"
+msgstr "Tamilské Unicode"
 
 #: ../rules/base.xml.in.h:739
-msgid "Wang model 724 azerty"
-msgstr "Wang, model 724 azerty"
+#, fuzzy
+msgid "Tamil (TAB typewriter)"
+msgstr "Tamil TAB Typewriter"
 
 #: ../rules/base.xml.in.h:740
-msgid "Western"
-msgstr "Západní"
+#, fuzzy
+msgid "Tamil (TSCII typewriter)"
+msgstr "Tamil TSCII Typewriter"
 
 #: ../rules/base.xml.in.h:741
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
+#, fuzzy
+msgid "Tamil (Unicode)"
+msgstr "Tamilské Unicode"
 
 #: ../rules/base.xml.in.h:742
-msgid "Winkeys"
-msgstr "Klávesy Win"
+#, fuzzy
+msgid "Tamil (keyboard with numerals)"
+msgstr "Tamilská klávesnice s číselnými znaky"
 
 #: ../rules/base.xml.in.h:743
-msgid "With &lt;\\|&gt; key"
-msgstr "S klávesou &lt;\\|&gt;"
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
 
 #: ../rules/base.xml.in.h:744
-msgid "With EuroSign on 5"
-msgstr "Se znakem eura na klávese 5"
+msgid "Tatar"
+msgstr "Tatarské"
 
 #: ../rules/base.xml.in.h:745
-msgid "With guillemets"
-msgstr "S francouzskými uvozovkami"
+msgid "Telugu"
+msgstr "Tegulské"
 
 #: ../rules/base.xml.in.h:746
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet Keyboard"
+#, fuzzy
+msgid "Thai"
+msgstr "Thajsko"
 
 #: ../rules/base.xml.in.h:747
-msgid "Yakut"
-msgstr "jakutské"
+#, fuzzy
+msgid "Thai (Pattachote)"
+msgstr "Pattachote"
 
 #: ../rules/base.xml.in.h:748
-msgid "Yoruba"
-msgstr "Jorubské"
+#, fuzzy
+msgid "Thai (TIS-820.2538)"
+msgstr "TIS-820.2538"
 
 #: ../rules/base.xml.in.h:749
-msgid "Z and ZHE swapped"
-msgstr "Prohozené Z a Ž"
+msgid "Tibetan"
+msgstr "Tibetské"
 
 #: ../rules/base.xml.in.h:750
-msgid "Zaf"
-msgstr "ZAF"
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetské (s číslicemi ASCII)"
 
 #: ../rules/base.xml.in.h:751
-msgid "Zero-width non-joiner character at second level"
-msgstr "Na druhé úrovni znak nespojovače nulové šířky"
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "K odpovídající klávese na klávesnici Dvorak."
 
 #: ../rules/base.xml.in.h:752
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
-msgstr "Na druhé úrovni znak nespojovače nulové šířky, nedělitelná mezera na třetí úrovni"
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "K odpovídající klávese na klávesnici Qwerty."
 
 #: ../rules/base.xml.in.h:753
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
-msgstr "Na druhé úrovni znak nespojovače nulové šířky, na třetí úrovni nedělitelná mezera, nic na úrovni čtvrté"
+msgid "Toggle PointerKeys with Shift + NumLock."
+msgstr "Přepnout PointerKeys klávesou Shift + Num Lock."
 
 #: ../rules/base.xml.in.h:754
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
-msgstr "Na druhé úrovni znak nespojovače nulové šířky, nedělitelná mezera na třetí úrovni, tenká nedělitelná mezera na čtvrté úrovni"
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
 
 #: ../rules/base.xml.in.h:755
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
-msgstr "Na druhé úrovni znak nespojovače nulové šířky, nedělitelná mezera na třetí úrovni, spojovač nulové šířky na úrovni čtvrté"
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
 
 #: ../rules/base.xml.in.h:756
-msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
-msgstr "Na druhé úrovni znak nespojovače nulové šířky, znak spojovače nulové šířky na třetí úrovni"
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
 
 #: ../rules/base.xml.in.h:757
-msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
-msgstr "Na druhé úrovni znak nespojovače nulové šířky, znak spojovače nulové šířky na třetí úrovni, nedělitelná mezera na čtvrté úrovni"
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
 
 #: ../rules/base.xml.in.h:758
-msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
-msgstr "Na třetí úrovni znak nespojovače nulové šířky, znak spojovače nulové šířky na úrovni čtvrté"
+#, fuzzy
+msgid "Tswana"
+msgstr "Botswana"
 
 #: ../rules/base.xml.in.h:759
-msgid "azerty"
-msgstr "azerty"
+#, fuzzy
+msgid "Turkish"
+msgstr "Turkmenistán"
 
 #: ../rules/base.xml.in.h:760
-msgid "azerty/digits"
-msgstr "azerty/číslice"
+#, fuzzy
+msgid "Turkish (Alt-Q)"
+msgstr "Krymskotatarské (turecké Alt-Q)"
 
 #: ../rules/base.xml.in.h:761
-msgid "digits"
-msgstr "číslice"
+#, fuzzy
+msgid "Turkish (F)"
+msgstr "Kurdské, (F)"
 
 #: ../rules/base.xml.in.h:762
-msgid "displaced semicolon and quote (obsolete)"
-msgstr "posunutý středník a uvozovka (zastaralé)"
+#, fuzzy
+msgid "Turkish (Sun dead keys)"
+msgstr "Francouzské, mrtvé klávesy Sun"
 
 #: ../rules/base.xml.in.h:763
-msgid "lyx"
-msgstr "lyx"
+#, fuzzy
+msgid "Turkish (international with dead keys)"
+msgstr "Mezinárodní Dvorak (s mrtvými klávesami)"
 
 #: ../rules/base.xml.in.h:764
-msgid "qwerty"
-msgstr "qwerty"
+#, fuzzy
+msgid "Turkmen"
+msgstr "Turecko"
 
 #: ../rules/base.xml.in.h:765
-msgid "qwerty, extended Backslash"
-msgstr "qwerty, rozšířená klávesa zpětného lomítka"
+msgid "Turkmen (Alt-Q)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:766
-msgid "qwerty/digits"
-msgstr "qwerty/číslice"
+msgid "TypeMatrix EZ-Reach 2020"
+msgstr "TypeMatrix EZ-Reach 2020"
 
 #: ../rules/base.xml.in.h:767
-msgid "qwertz"
-msgstr "qwertz"
+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 (režim 102/105:EU)"
+
+#: ../rules/base.xml.in.h:770
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (režim 106:JP)"
+
+#: ../rules/base.xml.in.h:771
+msgid "Udmurt"
+msgstr "Udmurtské"
+
+#: ../rules/base.xml.in.h:772
+msgid "Ukrainian"
+msgstr "Ukrajinské"
+
+#: ../rules/base.xml.in.h:773
+msgid "Ukrainian (WinKeys)"
+msgstr "Ukrajinské (klávesy Win)"
+
+#: ../rules/base.xml.in.h:774
+#, fuzzy
+msgid "Ukrainian (homophonic)"
+msgstr "Ukrajinské (stejně znějící)"
+
+#: ../rules/base.xml.in.h:775
+msgid "Ukrainian (legacy)"
+msgstr "Ukrajinské (zděděné)"
+
+#: ../rules/base.xml.in.h:776
+msgid "Ukrainian (phonetic)"
+msgstr "Ukrajinské (fonetické)"
+
+#: ../rules/base.xml.in.h:777
+msgid "Ukrainian (standard RSTU)"
+msgstr "Ukrajinské (standardní RSTU)"
+
+#: ../rules/base.xml.in.h:778
+msgid "Ukrainian (typewriter)"
+msgstr "Ukrajinské (psací stroj)"
+
+#: ../rules/base.xml.in.h:779
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Doplňky Unicode (šipky a matematické operátory)"
+
+#: ../rules/base.xml.in.h:780
+msgid "Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Doplňky Unicode (šipky a matematické operátory). Matematické operátory na výchozí úrovni"
+
+#: ../rules/base.xml.in.h:781
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:782
+#, fuzzy
+msgid "Urdu (Pakistan)"
+msgstr "Pákistán"
+
+#: ../rules/base.xml.in.h:783
+msgid "Urdu (Pakistan, CRULP)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:784
+msgid "Urdu (Pakistan, NLA)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:785
+#, fuzzy
+msgid "Urdu (WinKeys)"
+msgstr "Urdské, klávesy Win"
+
+#: ../rules/base.xml.in.h:786
+#, fuzzy
+msgid "Urdu (alternative phonetic)"
+msgstr "Urdské, alternativní fonetické"
+
+#: ../rules/base.xml.in.h:787
+#, fuzzy
+msgid "Urdu (phonetic)"
+msgstr "Urdské, fonetické"
+
+#: ../rules/base.xml.in.h:788
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Použít LED klávesnice k zobrazení alternativního rozložení"
+
+#: ../rules/base.xml.in.h:789
+msgid "Using space key to input non-breakable space character"
+msgstr "Používání mezerníku k zadávání znaku nedělitelné mezery"
+
+#: ../rules/base.xml.in.h:790
+msgid "Usual space at any level"
+msgstr "Na jakékoliv úrovni znak běžné mezery"
+
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr ""
+
+#: ../rules/base.xml.in.h:792
+#, fuzzy
+msgid "Uzbek"
+msgstr "Uzbekistán"
+
+#: ../rules/base.xml.in.h:793
+#, fuzzy
+msgid "Uzbek (Afghanistan)"
+msgstr "Afghánistán"
+
+#: ../rules/base.xml.in.h:794
+#, fuzzy
+msgid "Uzbek (Afghanistan, OLPC)"
+msgstr "Afghánistán"
+
+#: ../rules/base.xml.in.h:795
+#, fuzzy
+msgid "Uzbek (Latin)"
+msgstr "Colemak (latinka)"
+
+#: ../rules/base.xml.in.h:796
+msgid "Vietnamese"
+msgstr "Vietnamské"
+
+#: ../rules/base.xml.in.h:797
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
+
+#: ../rules/base.xml.in.h:798
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+msgstr "Numerická klávesnice Wang 724 s doplňky Unicode (šipky a matematické operátory)"
+
+#: ../rules/base.xml.in.h:799
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Numerická klávesnice Wang 724 s doplňky Unicode (šipky a matematické operátory). Matematické operátory na výchozí úrovni"
+
+#: ../rules/base.xml.in.h:800
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:801
+msgid "Wolof"
+msgstr ""
+
+#: ../rules/base.xml.in.h:802
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:803
+msgid "Yakut"
+msgstr "jakutské"
+
+#: ../rules/base.xml.in.h:804
+msgid "Yoruba"
+msgstr "Jorubské"
+
+#: ../rules/base.xml.in.h:805
+msgid "Zero-width non-joiner character at second level"
+msgstr "Na druhé úrovni znak nespojovače nulové šířky"
+
+#: ../rules/base.xml.in.h:806
+msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
+msgstr "Na druhé úrovni znak nespojovače nulové šířky, nedělitelná mezera na třetí úrovni"
+
+#: ../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 "Na druhé úrovni znak nespojovače nulové šířky, na třetí úrovni nedělitelná mezera, nic na úrovni čtvrté"
+
+#: ../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 "Na druhé úrovni znak nespojovače nulové šířky, nedělitelná mezera na třetí úrovni, tenká nedělitelná mezera na čtvrté úrovni"
+
+#: ../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 "Na druhé úrovni znak nespojovače nulové šířky, nedělitelná mezera na třetí úrovni, spojovač nulové šířky na úrovni čtvrté"
+
+#: ../rules/base.xml.in.h:810
+msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
+msgstr "Na druhé úrovni znak nespojovače nulové šířky, znak spojovače nulové šířky na třetí úrovni"
+
+#: ../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 "Na druhé úrovni znak nespojovače nulové šířky, znak spojovače nulové šířky na třetí úrovni, nedělitelná mezera na čtvrté úrovni"
+
+#: ../rules/base.xml.in.h:812
+msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
+msgstr "Na třetí úrovni znak nespojovače nulové šířky, znak spojovače nulové šířky na úrovni čtvrté"
+
+#: ../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"
-msgstr "APL"
+msgid "APL Keyboard Symbols"
+msgstr ""
 
-#: ../rules/base.extras.xml.in.h:2
+#: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
 msgstr "Atsina"
 
-#: ../rules/base.extras.xml.in.h:3
+#: ../rules/base.extras.xml.in.h:5
 msgid "Avestan"
 msgstr "Avestské"
 
-#: ../rules/base.extras.xml.in.h:4
-msgid "Combining accents instead of dead keys"
-msgstr "Místo mrtvých kláves kombinovaná diakritika"
-
-#: ../rules/base.extras.xml.in.h:5
+#: ../rules/base.extras.xml.in.h:6
 msgid "Couer D'alene Salish"
 msgstr "Salishské (Coeur d'Alene)"
 
-#: ../rules/base.extras.xml.in.h:6
-msgid "International (AltGr Unicode combining)"
+#: ../rules/base.extras.xml.in.h:8
+#, fuzzy
+msgid "English (US, international AltGr Unicode combining)"
 msgstr "Mezinárodní (AltGr kombinované Unicode)"
 
-#: ../rules/base.extras.xml.in.h:7
-msgid "International (AltGr Unicode combining, alternative)"
+#: ../rules/base.extras.xml.in.h:9
+#, fuzzy
+msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr "Mezinárodní (AltGr kombinované Unicode, alternativní)"
+
+#: ../rules/base.extras.xml.in.h:11
+msgid "Kutenai"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:13
+msgid "Latvian (US Colemak)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:15
+msgid "Latvian (US Dvorak)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:16
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:17
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:18
+#, fuzzy
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Programátorské Dvorak"
+
+#: ../rules/base.extras.xml.in.h:19
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:22
+#, fuzzy
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Americká klávesnice s litevskými znaky"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "Polské (mezinárodní s mrtvými klávesami)"
+
+#: ../rules/base.extras.xml.in.h:27
+msgid "Romanian (ergonomic Touchtype)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:29
+msgid "Russian (with UKR and BEL layout)"
+msgstr "Ruské (s rozloženími UKR a 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 "Srbské (místo mrtvých kláves kombinovaná diakritika)"
+
+#: ../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 "(F)"
+#~ msgstr "(F)"
+
+#~ msgid "Afg"
+#~ msgstr "AFG"
+
+#~ msgid "Alb"
+#~ msgstr "ALB"
+
+#~ msgid "Alt-Q"
+#~ msgstr "Alt-Q"
+
+#~ msgid "Alternative"
+#~ msgstr "Alternativní"
+
+#~ msgid "Alternative Phonetic"
+#~ msgstr "Alternativní fonetické"
+
+#~ msgid "Alternative international"
+#~ msgstr "Alternativní mezinárodní"
+
+#~ msgid "And"
+#~ msgstr "AND"
+
+#~ msgid "Andorra"
+#~ msgstr "Andorra"
+
+#~ msgid "Ara"
+#~ msgstr "ARA"
+
+#~ msgid "Arm"
+#~ msgstr "ARM"
+
+#~ msgid "Aut"
+#~ msgstr "AUT"
+
+#~ msgid "Aze"
+#~ msgstr "AZE"
+
+#~ msgid "Bangladesh"
+#~ msgstr "Bangladéš"
+
+#~ msgid "Bel"
+#~ msgstr "BEL"
+
+#~ msgid "Bgd"
+#~ msgstr "BGD"
+
+#~ msgid "Bhutan"
+#~ msgstr "Bhútán"
+
+#~ msgid "Bih"
+#~ msgstr "BIH"
+
+#~ msgid "Blr"
+#~ msgstr "BLR"
+
+#~ msgid "Bosnia and Herzegovina"
+#~ msgstr "Bosna a Hercegovina"
+
+#~ msgid "Bra"
+#~ msgstr "BRA"
+
+#~ msgid "Brazil"
+#~ msgstr "Brazílie"
+
+#~ msgid "Breton"
+#~ msgstr "Bretonské"
+
+#~ msgid "Bwa"
+#~ msgstr "BWA"
+
+#~ msgid "COD"
+#~ msgstr "COD"
+
+#~ msgid "CRULP"
+#~ msgstr "CRULP"
+
+#~ msgid "Canada"
+#~ msgstr "Kanada"
+
+#~ msgid "Cedilla"
+#~ msgstr "Cédille"
+
+#~ msgid "Chn"
+#~ msgstr "CHN"
+
+#~ msgid "Classic"
+#~ msgstr "Klasické"
+
+#~ msgid "Colemak"
+#~ msgstr "Colemak"
+
+#~ msgid "Crimean Tatar (Dobruca-2 Q)"
+#~ msgstr "Krymskotatarské (Dobruca-2 Q)"
+
+#~ msgid "Cyrillic"
+#~ msgstr "Cyrilice"
+
+#~ msgid "Cze"
+#~ msgstr "CZE"
+
+#~ msgid "DOS"
+#~ msgstr "DOS"
+
+#~ msgid "Dead acute"
+#~ msgstr "Mrtvá čárka"
+
+#~ msgid "Denmark"
+#~ msgstr "Dánsko"
+
+#~ msgid "Deu"
+#~ msgstr "DEU"
+
+#~ msgid "Dnk"
+#~ msgstr "DNK"
+
+#~ msgid "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid "Eastern"
+#~ msgstr "Východní"
+
+#~ msgid "Epo"
+#~ msgstr "EPO"
+
+#~ msgid "Ergonomic"
+#~ msgstr "Ergonomické"
+
+#~ msgid "Esp"
+#~ msgstr "ESP"
+
+#~ msgid "Est"
+#~ msgstr "EST"
+
+#~ msgid "Ethiopia"
+#~ msgstr "Etiopie"
+
+#~ msgid "Extended"
+#~ msgstr "Rozšířené"
+
+#~ msgid "Finland"
+#~ msgstr "Finsko"
+
+#~ msgid "Fra"
+#~ msgstr "FRA"
+
+#~ msgid "France"
+#~ msgstr "Francie"
+
+#~ msgid "GBr"
+#~ msgstr "GBR"
+
+#~ msgid "GILLBT"
+#~ msgstr "GILLBT"
+
+#~ msgid "Georgia"
+#~ msgstr "Gruzie"
+
+#~ msgid "Ghana"
+#~ msgstr "Ghana"
+
+#~ msgid "Gin"
+#~ msgstr "GIN"
+
+#~ msgid "Grc"
+#~ msgstr "GRC"
+
+#~ msgid "Guinea"
+#~ msgstr "Guinea"
+
+#~ msgid "Homophonic"
+#~ msgstr "Stejně znějící"
+
+#~ msgid "Hrv"
+#~ msgstr "HRV"
+
+#~ msgid "Hun"
+#~ msgstr "HUN"
+
+#~ msgid "Ind"
+#~ msgstr "IND"
+
+#~ msgid "Iran"
+#~ msgstr "Írán"
+
+#~ msgid "Ireland"
+#~ msgstr "Irsko"
+
+#~ msgid "Irl"
+#~ msgstr "IRL"
+
+#~ msgid "Irn"
+#~ msgstr "IRN"
+
+#~ msgid "Irq"
+#~ msgstr "IRQ"
+
+#~ msgid "Israel"
+#~ msgstr "Izrael"
+
+#~ msgid "Jpn"
+#~ msgstr "JPN"
+
+#~ msgid "Kana"
+#~ msgstr "Kana"
+
+#~ msgid "Kana 86"
+#~ msgstr "Kana 86"
+
+#~ msgid "Kenya"
+#~ msgstr "Keňa"
+
+#~ msgid "Kgz"
+#~ msgstr "KGZ"
+
+#~ msgid "Khm"
+#~ msgstr "KHM"
+
+#~ msgid "Korea, Republic of"
+#~ msgstr "Korejská republika"
+
+#~ msgid "Ktunaxa"
+#~ msgstr "Ktunaxa"
+
+#~ msgid "LEKP"
+#~ msgstr "LEKP"
+
+#~ msgid "LEKPa"
+#~ msgstr "LEKPa"
+
+#~ msgid "Laos"
+#~ msgstr "Laos"
+
+#~ msgid "Latin"
+#~ msgstr "Latinské"
+
+#~ msgid "Latin unicode"
+#~ msgstr "Latinské Unicode"
+
+#~ msgid "Latin unicode qwerty"
+#~ msgstr "Latinské Unicode qwerty"
+
+#~ msgid "Left hand"
+#~ msgstr "Levoruké"
+
+#~ msgid "Ltu"
+#~ msgstr "LTU"
+
+#~ msgid "Lva"
+#~ msgstr "LVA"
+
+#~ msgid "MESS"
+#~ msgstr "MESS"
+
+#~ msgid "MNE"
+#~ msgstr "MNE"
+
+#~ msgid "Macintosh (International)"
+#~ msgstr "Macintosh (mezinárodní)"
+
+#~ msgid "Maldives"
+#~ msgstr "Maledivy"
+
+#~ msgid "Mali"
+#~ msgstr "Mali"
+
+#~ msgid "Mao"
+#~ msgstr "MAO"
+
+#~ msgid "Mkd"
+#~ msgstr "MKD"
+
+#~ msgid "Mli"
+#~ msgstr "MLI"
+
+#~ msgid "Mmr"
+#~ msgstr "MMR"
+
+#~ msgid "Mng"
+#~ msgstr "MNG"
+
+#~ msgid "Myanmar"
+#~ msgstr "Myanmar"
+
+#~ msgid "NLA"
+#~ msgstr "NLA"
+
+#~ msgid "Nativo"
+#~ msgstr "Nativo"
+
+#~ msgid "Neo 2"
+#~ msgstr "Neo 2"
+
+#~ msgid "Netherlands"
+#~ msgstr "Nizozemsko"
+
+#~ msgid "Nigeria"
+#~ msgstr "Nigérie"
+
+#~ msgid "Nld"
+#~ msgstr "NLD"
+
+#~ msgid "Nor"
+#~ msgstr "NOR"
+
+#~ msgid "Norway"
+#~ msgstr "Norsko"
+
+#~ msgid "OLPC Dari"
+#~ msgstr "OLPC, darí"
+
+#~ msgid "OLPC Pashto"
+#~ msgstr "OLPC, paštó"
+
+#~ msgid "OLPC Southern Uzbek"
+#~ msgstr "OLPC, jihouzbecké"
+
+#~ msgid "Ossetian"
+#~ msgstr "Osetinské"
+
+#~ msgid "Phonetic"
+#~ msgstr "Fonetické"
+
+#~ msgid "Phonetic Winkeys"
+#~ msgstr "Fonetické klávesy Win"
+
+#~ msgid "Pol"
+#~ msgstr "POL"
+
+#~ msgid "Poland"
+#~ msgstr "Polsko"
+
+#~ msgid "Probhat"
+#~ msgstr "Prt"
+
+#~ msgid "Prt"
+#~ msgstr "PRT"
+
+#~ msgid "Romanian keyboard with German letters"
+#~ msgstr "Rumunská klávesnice s německými znaky"
+
+#~ msgid "Romanian keyboard with German letters, eliminate dead keys"
+#~ msgstr "Rumunská klávesnice s německými znaky, vyloučit mrtvé klávesy"
+
+#~ msgid "Rou"
+#~ msgstr "ROU"
+
+#~ msgid "Rus"
+#~ msgstr "RUS"
+
+#~ msgid "Russia"
+#~ msgstr "Rusko"
+
+#~ msgid "SRB"
+#~ msgstr "SRB"
+
+#~ msgid "Sen"
+#~ msgstr "SEN"
+
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
+
+#~ msgid "Serbia"
+#~ msgstr "Srbsko"
+
+#~ msgid "Simple"
+#~ msgstr "Jednoduché"
+
+#~ msgid "Southern Uzbek"
+#~ msgstr "Jihouzbecké"
+
+#~ msgid "Spain"
+#~ msgstr "Španělsko"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "Srí Lanka"
+
+#~ msgid "Standard"
+#~ msgstr "Standardní"
+
+#~ msgid "Standard RSTU on Russian layout"
+#~ msgstr "Standardní RSTU s ruským rozložením"
+
+#~ msgid "Svk"
+#~ msgstr "SVK"
+
+#~ msgid "Svn"
+#~ msgstr "SVN"
+
+#~ msgid "Swe"
+#~ msgstr "SWE"
+
+#~ msgid "Syr"
+#~ msgstr "SYR"
+
+#~ msgid "Syria"
+#~ msgstr "Sýrie"
+
+#~ msgid "Tha"
+#~ msgstr "THA"
+
+#~ msgid "Tifinagh"
+#~ msgstr "Tifinagh"
+
+#~ msgid "Tjk"
+#~ msgstr "TJK"
+
+#~ msgid "Typewriter"
+#~ msgstr "Psací stroj"
+
+#~ msgid "Tza"
+#~ msgstr "TZA"
+
+#~ msgid "USA"
+#~ msgstr "USA"
+
+#~ msgid "Ukr"
+#~ msgstr "UKR"
+
+#~ msgid "United Kingdom"
+#~ msgstr "Spojené království"
+
+#~ msgid "Uzb"
+#~ msgstr "UZB"
+
+#~ msgid "Vnm"
+#~ msgstr "VNM"
+
+#~ msgid "Western"
+#~ msgstr "Západní"
+
+#~ msgid "With EuroSign on 5"
+#~ msgstr "Se znakem eura na klávese 5"
+
+#~ msgid "With guillemets"
+#~ msgstr "S francouzskými uvozovkami"
+
+#~ msgid "Zaf"
+#~ msgstr "ZAF"
+
+#~ msgid "azerty"
+#~ msgstr "azerty"
+
+#~ msgid "digits"
+#~ msgstr "číslice"
+
+#~ msgid "lyx"
+#~ msgstr "lyx"
+
+#~ msgid "qwertz"
+#~ msgstr "qwertz"
+
+#~ msgid "APL"
+#~ msgstr "APL"
diff --git a/xorg-server/xkeyboard-config/po/da.po b/xorg-server/xkeyboard-config/po/da.po
index d4300acea..de1e7f96a 100644
--- a/xorg-server/xkeyboard-config/po/da.po
+++ b/xorg-server/xkeyboard-config/po/da.po
@@ -31,10 +31,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-01 23:06+0100\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-05-24 23:06+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -112,154 +112,158 @@ 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 "Afghansk"
 
-#: ../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 "Albansk"
 
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:21
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt og Meta er på Alt-tasterne"
 
-#: ../rules/base.xml.in.h:23
+#: ../rules/base.xml.in.h:22
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Alt ligger på den højre Win-tast og Super på 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+Skift"
 
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:26
 msgid "Alt+Space"
 msgstr "Alt+Mellemrum"
 
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:27
 msgid "Alt/Win key behavior"
 msgstr "Alt/Win-tasteopførsel"
 
 # http://da.wikipedia.org/wiki/Amharisk
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:28
 msgid "Amharic"
 msgstr "Amharisk"
 
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:29
 msgid "Any Alt key"
 msgstr "Enhver Alt-tast"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr "Enhver Win-tast"
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr "Enhver Win-tast (mens trykket ned)"
 
-#: ../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 "Apples aluminiumstastatur (ANSI)"
 
-#: ../rules/base.xml.in.h:35
+#: ../rules/base.xml.in.h:34
 msgid "Apple Aluminium Keyboard (ISO)"
 msgstr "Apples aluminiumstastatur (ISO)"
 
-#: ../rules/base.xml.in.h:36
+#: ../rules/base.xml.in.h:35
 msgid "Apple Aluminium Keyboard (JIS)"
 msgstr "Apples aluminiumstastatur (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 "Apples aluminiumstastatur: Emuler PC-taster (Udskriv, Scroll Lock, Pause, NumLock)"
 
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
 msgstr "Apple bærbar"
 
-#: ../rules/base.xml.in.h:39
+#: ../rules/base.xml.in.h:38
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:39
 msgid "Arabic (Buckwalter)"
 msgstr "Arabisk (Buckwalter)"
 
-#: ../rules/base.xml.in.h:41
+#: ../rules/base.xml.in.h:40
 msgid "Arabic (Morocco)"
 msgstr "Arabisk (Marokko)"
 
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:41
 msgid "Arabic (Pakistan)"
 msgstr "Arabisk (Pakistan)"
 
-#: ../rules/base.xml.in.h:43
+#: ../rules/base.xml.in.h:42
 msgid "Arabic (Syria)"
 msgstr "Arabisk (Syrien)"
 
-#: ../rules/base.xml.in.h:44
+#: ../rules/base.xml.in.h:43
 msgid "Arabic (azerty)"
 msgstr "Arabisk (azerty)"
 
-#: ../rules/base.xml.in.h:45
+#: ../rules/base.xml.in.h:44
 msgid "Arabic (azerty/digits)"
 msgstr "Arabisk (azerty/cifre)"
 
-#: ../rules/base.xml.in.h:46
+#: ../rules/base.xml.in.h:45
 msgid "Arabic (digits)"
 msgstr "Arabisk (cifre)"
 
-#: ../rules/base.xml.in.h:47
+#: ../rules/base.xml.in.h:46
 msgid "Arabic (qwerty)"
 msgstr "Arabisk (qwerty)"
 
-#: ../rules/base.xml.in.h:48
+#: ../rules/base.xml.in.h:47
 msgid "Arabic (qwerty/digits)"
 msgstr "Arabisk (qwerty/cifre)"
 
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
 msgid "Armenian"
 msgstr "Armensk"
 
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:49
 msgid "Armenian (alternative eastern)"
 msgstr "Armensk (alternativ østlig)"
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
 msgid "Armenian (alternative phonetic)"
 msgstr "Armensk (alternativ fonetisk)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 msgid "Armenian (eastern)"
 msgstr "Armensk (østlig)"
 
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:52
 msgid "Armenian (phonetic)"
 msgstr "Armensk (fonetisk)"
 
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:53
 msgid "Armenian (western)"
 msgstr "Armensk (vestlig)"
 
+# Asturian (Asturian: Asturianu or Bable) is a Romance 
+# language of the West Iberian group, Astur-Leonese 
+# Subgroup, spoken in the Spanish province of Asturias 
+# by the Asturian people.
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturisk (Spanien, med bundpunktum H og bundpunktum L)"
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "Asus bærbar"
@@ -279,13 +283,13 @@ msgid "Avatime"
 msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijan (Cyrillic)"
-msgstr "Aserbajdsjansk (kyrillisk)"
-
-#: ../rules/base.xml.in.h:60
 msgid "Azerbaijani"
 msgstr "Aserbajdsjansk"
 
+#: ../rules/base.xml.in.h:60
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Aserbajdsjansk (kyrillisk)"
+
 #: ../rules/base.xml.in.h:61
 msgid "Azona RF2300 wireless Internet Keyboard"
 msgstr "Azona RF2300 wireless Internet Keyboard"
@@ -330,662 +334,701 @@ msgstr "BTC 9116U minitrådløst internet og spil"
 msgid "Backslash"
 msgstr "Omvendt skråstreg"
 
-# engelsk fejl )
 #: ../rules/base.xml.in.h:72
-msgid "Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr "Omvendt skråstreg vælger tredje niveau, låser når trykket ned sammen med en anden tredje niveauvælger"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Omvendt skråstreg (vælger tredje niveau, låser når trykket ned sammen med en anden tredje niveauvælger)"
 
 #: ../rules/base.xml.in.h:73
 msgid "Bambara"
 msgstr "Bambara"
 
 #: ../rules/base.xml.in.h:74
+msgid "Bashkirian"
+msgstr "Bashkirisk"
+
+#: ../rules/base.xml.in.h:75
 msgid "Belarusian"
 msgstr "Hviderussisk"
 
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:76
 msgid "Belarusian (Latin)"
 msgstr "Hviderussisk (latin)"
 
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:77
 msgid "Belarusian (legacy)"
 msgstr "Hviderussisk (forældet)"
 
-#: ../rules/base.xml.in.h:77
+#: ../rules/base.xml.in.h:78
 msgid "Belgian"
 msgstr "Belgisk"
 
-#: ../rules/base.xml.in.h:78
+#: ../rules/base.xml.in.h:79
 msgid "Belgian (ISO alternate)"
 msgstr "Belgisk (ISO-alternativ)"
 
-#: ../rules/base.xml.in.h:79
+#: ../rules/base.xml.in.h:80
 msgid "Belgian (Sun dead keys)"
 msgstr "Belgisk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belgisk (Wang model 724 azerty)"
 
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:82
 msgid "Belgian (alternative)"
 msgstr "Belgisk (alternativ)"
 
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:83
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belgisk (alternativ, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belgisk (alternativ, kun latin-9)"
 
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:85
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belgisk (slå døde taster fra)"
 
-#: ../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 "Bengali"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:90
 msgid "Bengali (Probhat)"
 msgstr "Bengali (probhat)"
 
 # http://retskrivningsordbogen.dk/ro/ro.htm?q=berb
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:91
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berbisk (Marokko, tifinagh alternativ fonetisk)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berbisk (Marokko, Tifinagh alternativ)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berbisk (Marokko, Tifinagh udvidet fonetisk)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berbisk (Marokko, Tifinagh udvidet)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berbisk (Marokko, Tifinagh fonetisk)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berbisk (Marokko, Tifinagh)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bosnian"
 msgstr "Bosnisk"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosnisk (US-tastatur med bosniske digrafer)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosnisk (US-tastatur med bosniske bogstaver)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosnisk (anvend bosniske digrafer)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosnisk (anvend »« som anførelsestegn)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Both Alt keys together"
 msgstr "Begge Alt-taster sammen"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Both Ctrl keys together"
 msgstr "Begge Ctrl-taster sammen"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Both Shift keys together"
 msgstr "Begge skift-taster sammen"
 
-#: ../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 "Begge skift-taster sammen aktiverer Caps Lock, en Skift-tast deaktiverer"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Begge skift-taster sammen skifter Caps Lock"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Begge skift-taster sammen skifter SkiftLock"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:108
 msgid "Braille"
 msgstr "Blindeskrift"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:109
 msgid "Braille (left hand)"
 msgstr "Blindeskrift (venstre hånd)"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Braille (right hand)"
 msgstr "Blindeskrift (højre hånd)"
 
-#: ../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 "Bulgarsk"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Bulgarian (new phonetic)"
 msgstr "Bulgarsk (ny fonetisk)"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bulgarsk (traditionel fonetisk)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:115
 msgid "Burmese"
 msgstr "Burmesisk"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:116
 msgid "Canadian Multilingual"
 msgstr "Canadisk flersproget"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Canadian Multilingual (first part)"
 msgstr "Canadisk flersproget (første del)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "Canadian Multilingual (second part)"
 msgstr "Canadisk flersproget (anden del)"
 
-#: ../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ælger tredje niveau, låser når trykket ned sammen med en anden tredje niveauvælger)"
 
-#: ../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 (skifter til første layout), Skift+Caps Lock (skifter til sidste layout)"
 
-#: ../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 (mens presset ned), Alt+Caps Lock udfører den oprindleige capslockhandling"
 
-#: ../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 agerer som skiftetasten med lås. Skift »pauser« 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 agerer som skiftetasten med lås. Skift påvirker ikke Caps Lock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock er slået fra"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock key behavior"
 msgstr "Opførsel for Caps Lock-tast"
 
-#: ../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 ændrer Skift så alle taster bliver påvirket"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock slår små/store bogstaver til/fra"
 
-#: ../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 bruger intern forstørrelse af bogstaver. Skift sætter Caps Lock »på hold«"
 
-#: ../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 bruger intern forstørrelse af bogstaver. Skift påvirker ikke Caps Lock"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:131
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:132
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Catalansk (Spanien, med midterpunktum L)"
+
+#: ../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.UBEGRÆNSET"
 
-#: ../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 (alternativ)"
 
-#: ../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 "Kinesisk"
 
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "Kinesisk (tibetansk med ASCII-numre)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "Kinesisk (tibetansk)"
-
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "Kinesisk (uyghur)"
+msgid "Chuvash"
+msgstr "Chuvash"
 
 #: ../rules/base.xml.in.h:147
+msgid "Chuvash (Latin)"
+msgstr "Chuvash (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 Keyboard"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:151
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 taster)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:152
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 taster)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 taster)"
 
-#: ../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 "Placering af Composetast"
 
 # Backspace kunne også være Slet tilbage
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:156
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Rettelsestast"
 
-#: ../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 "Kontrol ligger på Alt-tasterne, Alt ligger på Win-tasterne"
 
-#: ../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 "Kontrol ligger på Win-tasterne (og de normale Ctrl-taster)"
 
-#: ../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 "Krimtatarsk (Dobruja Q)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krimtatarsk (tyrkisk Alt-Q)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krimtatarsk (tyrkisk F)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krimtatarsk (tyrkisk Q)"
+
+#: ../rules/base.xml.in.h:164
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:165
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Kroatisk (US-tastatur med kroatiske digrafer)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:166
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Kroatisk (US-tastatur med kroatiske bogstaver)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
+#: ../rules/base.xml.in.h:167
+msgid "Croatian (use Croatian digraphs)"
 msgstr "Kroatisk (anvend kroatiske digrafer)"
 
-#: ../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 "Kroatisk (anvend »« som anførelsestegn)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Ctrl key position"
 msgstr "Ctrl-tast placering"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Skift"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: ../rules/base.xml.in.h:166
-msgid "Czech (UCW layout accented letters only)"
-msgstr "Tjekkisk (UCW-layout kun bogstaver med accent)"
+#: ../rules/base.xml.in.h:172
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "Tjekkisk (UCW-layout, kun bogstaver med accent)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Tjekkisk (US Dvorak med CZ UCW-understøttelse)"
 
-#: ../rules/base.xml.in.h:168
-msgid "Czech (With &lt;\\|&gt; key)"
-msgstr "Tjekkisk (med &lt;\\|&gt;-tast)"
-
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:174
 msgid "Czech (qwerty)"
 msgstr "Tjekkisk (qwerty)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:175
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Tjekkisk (qwerty, udvidet omvendt skråstreg)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:176
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Tjekkisk (med &lt;\\|&gt;-tast)"
+
+#: ../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 "Dansk"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Danish (Dvorak)"
 msgstr "Dansk (dvorak)"
 
-#: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
-msgstr "Dansk (Mac)"
+#: ../rules/base.xml.in.h:180
+msgid "Danish (Macintosh)"
+msgstr "Dansk (Macintosh)"
 
-#: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
-msgstr "Dansk (Mac, slå døde taster fra)"
+#: ../rules/base.xml.in.h:181
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Dansk (Macintosh, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Danish (eliminate dead keys)"
 msgstr "Dansk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "Default numeric keypad keys"
 msgstr "Standard numerisk tastatur taster"
 
-#: ../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-taster PC"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell bærbar/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 bærbar/notebook Precision M serie"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Dell Latitude series laptop"
 msgstr "Dell Latitude serie bærbar"
 
-#: ../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 tastatur"
 
-#: ../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-serie"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dutch"
 msgstr "Hollandsk"
 
-#: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
-msgstr "Hollandsk (Mac)"
+#: ../rules/base.xml.in.h:197
+msgid "Dutch (Macintosh)"
+msgstr "Hollandsk (Macintosh)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dutch (Sun dead keys)"
 msgstr "Hollandsk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dutch (standard)"
 msgstr "Hollandsk (standard)"
 
-#: ../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 "Slå ekstra typografiske karakterer til"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
+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
+msgid "English (Cameroon)"
+msgstr "Engelsk (camerounsk)"
+
+#: ../rules/base.xml.in.h:205
 msgid "English (Canada)"
 msgstr "Engelsk (Canada)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:206
 msgid "English (Colemak)"
 msgstr "Engelsk (Colemak)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:207
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Engelsk (Dvorak alternativ international ingen døde taster)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:208
 msgid "English (Dvorak international with dead keys)"
 msgstr "Engelsk (Dvorak international med døde taster)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:209
 msgid "English (Dvorak)"
 msgstr "Engelsk (Dvorak)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:210
 msgid "English (Ghana)"
 msgstr "Engelsk (Ghana)"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:211
 msgid "English (Ghana, GILLBT)"
 msgstr "Engelsk (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:212
 msgid "English (Ghana, multilingual)"
 msgstr "Engelsk (Ghana, flersproget)"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:213
 msgid "English (India, with RupeeSign)"
 msgstr "Engelsk (Indien, med rupeetegn)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:214
 msgid "English (Macintosh)"
 msgstr "Engelsk (Macintosh)"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
-msgstr "Engelsk (Mali, USA Mac)"
+#: ../rules/base.xml.in.h:215
+msgid "English (Mali, US Macintosh)"
+msgstr "Engelsk (Mali, US Macintosh)"
 
-#: ../rules/base.xml.in.h:207
-msgid "English (Mali, USA international)"
-msgstr "Engelsk (Mali, USA international)"
+#: ../rules/base.xml.in.h:216
+msgid "English (Mali, US international)"
+msgstr "Engelsk (Mali, US international)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:217
 msgid "English (Nigeria)"
 msgstr "Engelsk (Nigeria)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:218
 msgid "English (South Africa)"
 msgstr "Engelsk (Sydafrika)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:219
 msgid "English (UK)"
 msgstr "Engelsk (UK)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:220
 msgid "English (UK, Colemak)"
 msgstr "Engelsk (UK, Colemak)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
-msgstr "Engelsk (UK, Dvoraktegnsætning)"
+#: ../rules/base.xml.in.h:221
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Engelsk (UK, Dvorak med UK-tegnsætning)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:222
 msgid "English (UK, Dvorak)"
 msgstr "Engelsk (UK, Dvorak)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
-msgstr "Engelsk (UK, Mac international)"
+#: ../rules/base.xml.in.h:223
+msgid "English (UK, Macintosh international)"
+msgstr "Engelsk (UK, Macintosh international)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
-msgstr "Engelsk (UK, Mac)"
+#: ../rules/base.xml.in.h:224
+msgid "English (UK, Macintosh)"
+msgstr "Engelsk (UK, Macintosh)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
-msgstr "Engelsk (UK, udvidet, Wintaster)"
+#: ../rules/base.xml.in.h:225
+msgid "English (UK, extended WinKeys)"
+msgstr "Engelsk (UK, udvidede Wintaster)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, international with dead keys)"
 msgstr "Engelsk (UK, international med døde taster)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
 msgid "English (US)"
 msgstr "Engelsk (US)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:228
 msgid "English (US, alternative international)"
 msgstr "Engelsk (US, alternativ international)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:229
 msgid "English (US, international with dead keys)"
 msgstr "Engelsk (US, international med døde taster)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:230
 msgid "English (US, with euro on 5)"
 msgstr "Engelsk (US, med euro på 5)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:231
 msgid "English (classic Dvorak)"
 msgstr "Engelsk (klassisk dvorak)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:232
 msgid "English (international AltGr dead keys)"
 msgstr "Engelsk (international AltGr døde taster)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:233
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Engelsk (skift layout på gange-/divideretast)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:234
 msgid "English (left handed Dvorak)"
 msgstr "Engelsk (venstrehåndet dvorak)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:235
 msgid "English (programmer Dvorak)"
 msgstr "Engelsk (programmørdvorak)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:236
 msgid "English (right handed Dvorak)"
 msgstr "Engelsk (højrehåndet 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 "Retur på numerisk tastatur"
 
-#: ../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 "Esperanto (forkert placeret semikolon og anførelsestegn, forældet)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:242
 msgid "Estonian"
 msgstr "Estisk"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:243
 msgid "Estonian (Dvorak)"
 msgstr "Estisk (dvorak)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:244
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estisk (US-tastatur med estiske bogstaver)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:245
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estisk (slå døde taster fra)"
 
@@ -994,2301 +1037,2244 @@ 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:236
+#: ../rules/base.xml.in.h:246
 msgid "Euro on 2"
 msgstr "Euro på 2"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:247
 msgid "Euro on 4"
 msgstr "Euro på 4"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:248
 msgid "Euro on 5"
 msgstr "Euro på 5"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:249
 msgid "Euro on E"
 msgstr "Euro på 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 "Færøsk"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:254
 msgid "Faroese (eliminate dead keys)"
 msgstr "Færøsk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:255
 msgid "Filipino"
 msgstr "Filippinsk"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:256
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filippinsk (Capewell-dvorak baybayin)"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:257
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filippinsk (Capewell-dvorak latin)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:258
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filippinsk (Capewell-QWERF 2006 baybayin)"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:259
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filippinsk (Capewell-QWERF 2006 latin)"
 
 # http://en.wikipedia.org/wiki/Baybayin
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:260
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filippinsk (Colemak baybayin)"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Colemak Latin)"
 msgstr "Filippinsk (Colemak latin)"
 
-#: ../rules/base.xml.in.h:252
+# http://en.wikipedia.org/wiki/Baybayin
+#: ../rules/base.xml.in.h:262
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Filippinsk (Dvorak baybayin)"
+
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filippinsk (Dvorak latin)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filippinsk (QWERTY baybayin)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:265
 msgid "Finnish"
 msgstr "Finsk"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
-msgstr "Finsk (Mac)"
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
+msgstr "Finsk (Macintosh)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:267
 msgid "Finnish (classic)"
 msgstr "Finsk (klassisk)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:268
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finsk (klassisk, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:258
-msgid "Finnish (northern Saami)"
-msgstr "Finsk (nordligt samisk)"
-
 #. 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 "Niveau fire tast med abstrakt adskillelser"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:272
 msgid "Four-level key with comma"
 msgstr "Niveau fire tast med komma"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:273
 msgid "Four-level key with dot"
 msgstr "Niveau fire tast med punktum"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:274
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Niveau fire tast med punktum, latin-9 begrænsning"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:275
 msgid "Four-level key with momayyez"
 msgstr "Niveau fire tast med momayyez"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:276
 msgid "French"
 msgstr "Fransk"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:277
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Fransk (Bepo, ergonomisk, dvorakmåde)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:278
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Fransk (Bepo, ergonomisk, dvorakmåde, kun latin-9)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:279
 msgid "French (Breton)"
 msgstr "Fransk (bretonsk)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:280
+msgid "French (Cameroon azerty)"
+msgstr "Fransk (camerounsk azerty)"
+
+#: ../rules/base.xml.in.h:281
+msgid "French (Cameroon)"
+msgstr "Fransk (camerounsk)"
+
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "Fransk (Canada)"
+
+#: ../rules/base.xml.in.h:283
 msgid "French (Canada, Dvorak)"
 msgstr "Fransk (Canada, dvorak)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:284
 msgid "French (Canada, legacy)"
 msgstr "Fransk (Canada, forældet)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:285
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Fransk (Congo, Den Demokratiske Republik)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:286
 msgid "French (Dvorak)"
 msgstr "Fransk (dvorak)"
 
-#: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
-msgstr "Fransk (georgisk AZERTY Tskapo)"
-
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:287
 msgid "French (Guinea)"
 msgstr "Fransk (Guinea)"
 
-#: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
-msgstr "Fransk (Mac)"
+#: ../rules/base.xml.in.h:288
+msgid "French (Macintosh)"
+msgstr "Fransk (Macintosh)"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:289
 msgid "French (Mali, alternative)"
 msgstr "Fransk (Mali, alternativ)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:290
 msgid "French (Morocco)"
 msgstr "Fransk (Marokko)"
 
-#: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
-msgstr "Fransk (Occitansk)"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:291
 msgid "French (Sun dead keys)"
 msgstr "Fransk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:292
 msgid "French (Switzerland)"
 msgstr "Fransk (Schweiz)"
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
-msgstr "Fransk (Schweiz, Mac)"
+#: ../rules/base.xml.in.h:293
+msgid "French (Switzerland, Macintosh)"
+msgstr "Fransk (Schweiz, Macintosh)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:294
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Fransk (Schweiz, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:295
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Fransk (Schweiz, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:296
 msgid "French (alternative)"
 msgstr "Fransk (alternativ)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:297
 msgid "French (alternative, Sun dead keys)"
 msgstr "Fransk (alternativ, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:298
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Fransk (alternativ, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:299
 msgid "French (alternative, latin-9 only)"
 msgstr "Fransk (alternativ, kun latin-9)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:300
 msgid "French (eliminate dead keys)"
 msgstr "Fransk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
-msgstr "Fransk (forældet alternativ)"
+#: ../rules/base.xml.in.h:301
+msgid "French (legacy, alternative)"
+msgstr "Fransk (forældet, alternativ)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:302
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Fransk (forældet, alternativ, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:303
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Fransk (forældet, alternativ, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:304
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO bærbar"
 
-#: ../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 "Generisk 101-taster PC"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:308
 msgid "Generic 102-key (Intl) PC"
 msgstr "Generisk 102-taster (Intl) PC"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:309
 msgid "Generic 104-key PC"
 msgstr "Generisk 104-taster PC"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:310
 msgid "Generic 105-key (Intl) PC"
 msgstr "Generisk 105-taster (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 "Georgisk"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:317
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Geogrisk (Frankrig, AZERTY Tskapo)"
+
+#: ../rules/base.xml.in.h:318
+msgid "Georgian (Italy)"
+msgstr "Georgisk (Italien)"
+
+#: ../rules/base.xml.in.h:319
 msgid "Georgian (MESS)"
 msgstr "Georgisk (MESS)"
 
-#: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
-msgstr "Georgisk (ossetisk)"
-
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:320
 msgid "Georgian (ergonomic)"
 msgstr "Georgisk (ergonomisk)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:321
 msgid "German"
 msgstr "Tysk"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:322
 msgid "German (Austria)"
 msgstr "Tysk (Østrig)"
 
-#: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
-msgstr "Tysk (Østrig, Mac)"
+#: ../rules/base.xml.in.h:323
+msgid "German (Austria, Macintosh)"
+msgstr "Tysk (Østrig, Macintosh)"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:324
 msgid "German (Austria, Sun dead keys)"
 msgstr "Tysk (Østrig, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:325
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Tysk (Østrig, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:326
 msgid "German (Dvorak)"
 msgstr "Tysk (dvorak)"
 
-#: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
-msgstr "Tysk (Mac)"
+#: ../rules/base.xml.in.h:327
+msgid "German (Macintosh)"
+msgstr "Tysk (Macintosh)"
 
-#: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
-msgstr "Tysk (Mac, slå døde taster fra)"
+#: ../rules/base.xml.in.h:328
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Tysk (Macintosh, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:329
 msgid "German (Neo 2)"
 msgstr "Tysk (Neo 2)"
 
-#: ../rules/base.xml.in.h:319
-msgid "German (Romanian keyboard with German letters)"
-msgstr "Tysk (rumænsk tastatur med tyske bogstaver)"
-
-#: ../rules/base.xml.in.h:320
-msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
-msgstr "Tysk (rumænsk tastatur med tyske bogstaver, eliminer døde taster)"
-
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:330
 msgid "German (Sun dead keys)"
 msgstr "Tysk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
-msgstr "Tysk (Schweiz, Mac)"
+#: ../rules/base.xml.in.h:331
+msgid "German (Switzerland)"
+msgstr "Tysk (Schweiz)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
+msgstr "Tysk (Schweiz, Macintosh)"
+
+#: ../rules/base.xml.in.h:333
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Tysk (Schweiz, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:334
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Tysk (Schweiz, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:335
+msgid "German (Switzerland, legacy)"
+msgstr "Tysk (Schweiz, forældet)"
+
+#: ../rules/base.xml.in.h:336
 msgid "German (dead acute)"
 msgstr "Tysk (død accent)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:337
 msgid "German (dead grave acute)"
 msgstr "Tysk (død accent grave)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:338
 msgid "German (eliminate dead keys)"
 msgstr "Tysk (slå døde taster fra)"
 
-# nedersorbisk, tror jeg
-# (el. nedre Lausitz)
-#: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
-msgstr "Tysk (nedersorbisk qwertz)"
-
-#: ../rules/base.xml.in.h:329
-msgid "German (lower Sorbian)"
-msgstr "Tysk (nedersorbisk)"
-
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:339
 msgid "German (qwerty)"
 msgstr "Tysk (qwerty)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:340
 msgid "Greek"
 msgstr "Græsk"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:341
 msgid "Greek (eliminate dead keys)"
 msgstr "Græsk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:342
 msgid "Greek (extended)"
 msgstr "Græsk (udvidet)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:343
 msgid "Greek (polytonic)"
 msgstr "Græsk (polytonisk)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:344
 msgid "Greek (simple)"
 msgstr "Græsk (simpel)"
 
-#: ../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 "Roteren"
 
 # http://en.wikipedia.org/wiki/HTC_Dream
-#: ../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 "Glædelig hacking tastatur"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:349
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "Glædelig hacking tastatur til 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 "Hebraisk"
 
-#: ../rules/base.xml.in.h:343
-msgid "Hebrew (Phonetic)"
-msgstr "Hebraisk (fonetisk)"
-
-#: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
-msgstr "Hebraisk (Tiro)"
+#: ../rules/base.xml.in.h:352
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Hebraisk (bibelsk, Tiro)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "Hebrew (lyx)"
 msgstr "Hebraisk (lyx)"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
+msgid "Hebrew (phonetic)"
+msgstr "Hebraisk (fonetisk)"
+
+#: ../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 tastatur"
 
-#: ../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 "Sekstentals"
 
-#: ../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 "Ungarsk"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:373
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Ungarsk (101/qwerty/komma/døde taster)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:374
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Ungarsk (101/qwerty/komma/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Ungarsk (101/qwerty/punktum/døde taster)"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Ungarsk (101/qwerty/punktum/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Ungarsk (101/qwertz/komma/døde taster)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Ungarsk (101/qwertz/komma/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Ungarsk (101/qwertz/punktum/døde taster)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Ungarsk (101/qwertz/punktum/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Ungarsk (102/qwerty/komma/døde taster)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Ungarsk (102/qwerty/komma/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Ungarsk (102/qwerty/punktum/døde taster)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Ungarsk (102/qwerty/punktum/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Ungarsk (102/qwertz/komma/døde taster)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Ungarsk (102/qwertz/komma/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Ungarsk (102/qwertz/punktum/døde taster)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Ungarsk (102/qwertz/punktum/slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Ungarsk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (qwerty)"
 msgstr "Ungarsk (qwerty)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (standard)"
 msgstr "Ungarsk (standard)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:392
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper ligger på Win-tasterne"
 
-#: ../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 "Islandsk"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:400
 msgid "Icelandic (Dvorak)"
 msgstr "Islandsk (Dvorak)"
 
-#: ../rules/base.xml.in.h:392
-msgid "Icelandic (Mac)"
-msgstr "Islandsk (Mac)"
+#: ../rules/base.xml.in.h:401
+msgid "Icelandic (Macintosh)"
+msgstr "Islandsk (Macintosh)"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islandsk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islandsk (slå døde taster fra)"
 
-#: ../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 "Indisk"
 
-#: ../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 "Irakisk"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:408
 msgid "Irish"
 msgstr "Irsk"
 
-#: ../rules/base.xml.in.h:400
-msgid "Irish (CloGaelach)"
-msgstr "Irsk (CloGaelach)"
-
-#: ../rules/base.xml.in.h:401
-msgid "Irish (Ogham IS434)"
-msgstr "Irsk (Ogham IS434)"
-
-#: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
-msgstr "Irsk (Ogham)"
-
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:409
 msgid "Irish (UnicodeExpert)"
 msgstr "Irsk (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:410
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
-msgstr "Italiensk (georgisk)"
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
-msgstr "Italiensk (Mac)"
+#: ../rules/base.xml.in.h:411
+msgid "Italian (Macintosh)"
+msgstr "Italiensk (Macintosh)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:412
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Italiensk (US-tastatur med italienske bogstaver)"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:413
 msgid "Italian (eliminate dead keys)"
 msgstr "Italiensk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:414
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:415
 msgid "Japanese (Kana 86)"
 msgstr "Japansk (Kana 86)"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:416
 msgid "Japanese (Kana)"
 msgstr "Japansk (Kana)"
 
-#: ../rules/base.xml.in.h:412
-msgid "Japanese (Mac)"
-msgstr "Japansk (Mac)"
+#: ../rules/base.xml.in.h:417
+msgid "Japanese (Macintosh)"
+msgstr "Japansk (Macintosh)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (OADG 109A)"
 msgstr "Japansk (OADG 109A)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japansk (pc-98xx-serie)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:420
 msgid "Japanese keyboard options"
 msgstr "Japanske tastaturvalg"
 
-#: ../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 "Kana låsetast låser"
 
-#: ../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 "Kashubian"
+
+#: ../rules/base.xml.in.h:425
 msgid "Kazakh"
 msgstr "Kasakhisk"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:426
 msgid "Kazakh (with Russian)"
 msgstr "Kasakhisk (med russisk)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:427
 msgid "Key sequence to kill the X server"
 msgstr "Tastsekvens for at slå X-serveren ned"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:428
 msgid "Key to choose 3rd level"
 msgstr "Tast for at vælge tredje niveau"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:429
 msgid "Key to choose 5th level"
 msgstr "Tast for at vælge femte niveau"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:430
 msgid "Key(s) to change layout"
 msgstr "Tast(er) for at skifte layout"
 
-#: ../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 "Khmerisk (cambodiansk)"
+#: ../rules/base.xml.in.h:432
+msgid "Khmer (Cambodia)"
+msgstr "Khmerisk (Cambodja)"
 
-#: ../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 "Koreansk"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Korean (101/104 key compatible)"
 msgstr "Koreansk (101/104 tastkompatibel)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurdisk (Iran, arabisk-latin)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Kurdish (Iran, F)"
 msgstr "Kurdisk (Iran, F)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kurdisk (Iran, latin Alt-Q)"
+
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurdisk (Iran, latin Q)"
 
-#: ../rules/base.xml.in.h:433
-msgid "Kurdish (Iran, latin alt-Q)"
-msgstr "Kurdisk (Iran, latin Alt-Q)"
-
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurdisk (Irak, arabisk-latin)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurdisk (Irak, F)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurdisk (Irak, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurdisk (Irak, latin Q)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Syria, F)"
 msgstr "Kurdisk (Syrien, F)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurdisk (Syrien, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurdisk (Syrien, latin Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurdisk (Tyrkiet, F)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurdisk (Tyrkiet, latin Alt-Q)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurdisk (Tyrkiet, 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 "Kirgisisk"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:453
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgisisk (fonetisk)"
 
-#: ../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-foreslået standardlayout)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:456
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Bærbar Compaq (fx Armada) Laptop Keyboard"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:457
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Bærbar/notebook Compaq (fx Presario) Internet Keyboard"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:458
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Bærbar/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 "Lettisk"
 
-#: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
-msgstr "Lettisk (apostrofvariant ')"
-
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:460
 msgid "Latvian (F variant)"
 msgstr "Lettisk (F-variant)"
 
-#: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
-msgstr "Lettisk (tildevariant ~)"
+#: ../rules/base.xml.in.h:461
+msgid "Latvian (adapted)"
+msgstr "Lettisk (adapteret)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:462
+msgid "Latvian (apostrophe variant)"
+msgstr "Lettisk (apostrofvariant)"
+
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Lettisk (ergonomisk, ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:464
+msgid "Latvian (modern)"
+msgstr "Lettisk (moderne)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "Lettisk (tildevariant)"
+
+#: ../rules/base.xml.in.h:466
 msgid "Left Alt"
 msgstr "Venstre Alt"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:467
 msgid "Left Alt (while pressed)"
 msgstr "Venstre Alt (mens trykket ned)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:468
 msgid "Left Alt is swapped with Left Win"
 msgstr "Venstre Alt ombyttes med venstre Win-tast"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:469
 msgid "Left Ctrl"
 msgstr "Venstre 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 "Venstre Ctrl (skifter til første layout), Højre Ctrl (skifter til sidste layout)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:471
 msgid "Left Ctrl+Left Shift"
 msgstr "Venstre Ctrl+Venstre Skift"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:472
 msgid "Left Shift"
 msgstr "Venstre Skift"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:473
 msgid "Left Win"
 msgstr "Venstre 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 "Venstre Win (skifter til første layout), Højre Win/Menu (skifter til sidste layout)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:475
 msgid "Left Win (while pressed)"
 msgstr "Venstre Win-tast (mens trykket ned)"
 
-#: ../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 "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: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 "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:468
+#: ../rules/base.xml.in.h:478
 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:469
+#: ../rules/base.xml.in.h:479
 msgid "Legacy"
 msgstr "Forældet"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:480
 msgid "Legacy Wang 724"
 msgstr "Forældet 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 "Forældet tast med komma"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:483
 msgid "Legacy key with dot"
 msgstr "Forældet tast med punktum"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:485
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litauisk (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:486
 msgid "Lithuanian (LEKP)"
 msgstr "Litauisk (LEKP)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:487
 msgid "Lithuanian (LEKPa)"
 msgstr "Litauisk (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:488
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litauisk (US-tastatur med litauiske bogstaver)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (standard)"
 msgstr "Litauisk (standard)"
 
-#: ../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 (alternativ valg)"
 
-#: ../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 (alternativ tilvalg 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 ekstra taster via G15daemon"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech Generic Keyboard"
 
-#: ../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 "Nedersorbisk"
+
+# nedersorbisk, tror jeg
+# (el. nedre Lausitz)
+#: ../rules/base.xml.in.h:515
+msgid "Lower Sorbian (qwertz)"
+msgstr "Nedersorbisk (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 "Makedonsk"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:519
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Makedonsk (slå døde taster fra)"
 
-#: ../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 gammel"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:522
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Gør Caps Lock til en ekstra rettelsestast"
 
-#: ../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 "Gør Caps Lock til en ekstra Control men behold Caps_Lock keysym"
 
-#: ../rules/base.xml.in.h:512
+#: ../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:513
+#: ../rules/base.xml.in.h:525
 msgid "Make Caps Lock an additional ESC"
 msgstr "Gør Caps Lock til en ekstra Esc"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Gør Caps Lock til en ekstra Hyper"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Gør Caps Lock til en ekstra NumLock"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional Super"
 msgstr "Gør Caps Lock til en ekstra Super"
 
-#: ../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 "Malayalamsk (Lalitha)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:531
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Malayalamsk (udvidet inscript med Rupeetegn)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:532
 msgid "Maltese"
 msgstr "Maltesisk"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:533
 msgid "Maltese (with US layout)"
 msgstr "Maltesisk (med US-layout)"
 
-#: ../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 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 ligger på venstre Win-tast"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:541
 msgid "Meta is mapped to Win keys"
 msgstr "Meta ligger på Win-tasterne"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:542
 msgid "Meta on Left Ctrl"
 msgstr "Meta på venstre 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, svensk"
 
-#: ../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 "Diverse kompatibilitetsvalg"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:556
 msgid "Mongolian"
 msgstr "Mongolsk"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:557
 msgid "Montenegrin"
 msgstr "Montenegrinsk"
 
 # guillemets er dem her: »«
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:558
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrinsk (kyrillisk med anførelsestegnene »«)"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:559
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrinsk (kyrillisk)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrinsk (kyrillisk, Z og ZHE ombyttet)"
 
-#: ../rules/base.xml.in.h:547
-msgid "Montenegrin (Latin qwerty)"
-msgstr "Montenegrinsk (latin qwerty)"
+#: ../rules/base.xml.in.h:561
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Montenegrinsk (latin Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:548
-msgid "Montenegrin (Latin unicode qwerty)"
-msgstr "Montenegrinsk (latin unicode qwerty)"
+#: ../rules/base.xml.in.h:562
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Montenegrinsk (latin Unicode)"
 
-#: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
-msgstr "Montenegrinsk (latin unicode)"
+#: ../rules/base.xml.in.h:563
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Montenegrinsk (latin qwerty)"
 
 # guillemets er dem her: »«
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrinsk (latin med anførelsestegnene »«)"
 
-#: ../rules/base.xml.in.h:551
-msgid "Māori"
-msgstr "Māori"
-
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:565
 msgid "NICOLA-F style Backspace"
 msgstr "NICOLA-F-stil rettelsestast"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:566
 msgid "Nepali"
 msgstr "Nepalesisk"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:567
 msgid "Non-breakable space character at fourth level"
 msgstr "Ubrydelig mellemrumskarakter på fjerde niveau"
 
-#: ../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 "Ubrydelig mellemrumskarakter på fjerde niveau, tynd ubrydelige mellemrumskarakter på sjette niveau"
 
-#: ../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 "Ubrydelig mellemrumskarakter på fjerde niveau, tynd ubrydelige mellemrumskarakter på sjette niveau (via Ctrl+Skift)"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at second level"
 msgstr "Ubrydelig mellemrumskarakter på andet niveau"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at third level"
 msgstr "Ubrydelig mellemrumskarakter på tredje niveau"
 
-#: ../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 "Ubrydelig mellemrumskarakter på tredje niveau, intet på fjerde niveau"
 
-#: ../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 "Ubrydelig mellemrumskarakter på tredje niveau, tynd ubrydelig mellemrumskarakter på fjerde niveau"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:574
+msgid "Northern Saami (Finland)"
+msgstr "Nordligt samisk (Finland)"
+
+#: ../rules/base.xml.in.h:575
+msgid "Northern Saami (Norway)"
+msgstr "Nordligt samisk (Norge)"
+
+#: ../rules/base.xml.in.h:576
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Nordligt samisk (Norge, slå døde taster fra)"
+
+#: ../rules/base.xml.in.h:577
+msgid "Northern Saami (Sweden)"
+msgstr "Nordligt samisk (Sverige)"
+
+#: ../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 "Norsk"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:580
 msgid "Norwegian (Dvorak)"
 msgstr "Norsk (dvorak)"
 
-#: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
-msgstr "Norsk (Mac)"
-
-#: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
-msgstr "Norsk (Mac, slå døde taster fra)"
+#: ../rules/base.xml.in.h:581
+msgid "Norwegian (Macintosh)"
+msgstr "Norsk (Macintosh)"
 
-# engelsk fejl
-#: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
-msgstr "Norsk (nordligt samisk)"
+#: ../rules/base.xml.in.h:582
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Norsk (Macintosh, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norsk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:568
-msgid "Norwegian (northern Saami, eliminate dead keys)"
-msgstr "Norsk (nordligt samisk, slå døde taster fra)"
-
-#: ../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 "Numerisk tastatur slettetast opførsel"
 
-#: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
-msgstr "Numerisk tastatur taster fungerer som med Mac"
+#: ../rules/base.xml.in.h:586
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "Numerisk tastatur taster fungerer som med Macintosh"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:587
 msgid "Numeric keypad layout selection"
 msgstr "Numerisk tastatur layout udvælgelse"
 
-#: ../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 "Occitansk"
+
+#: ../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 "Oriya"
 
-#: ../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 "Occitansk (Georgien)"
+
+#: ../rules/base.xml.in.h:595
+msgid "Ossetian (WinKeys)"
+msgstr "Occitansk (Wintaster)"
+
+#: ../rules/base.xml.in.h:596
+msgid "Ossetian (legacy)"
+msgstr "Occitansk (forældet)"
+
+#: ../rules/base.xml.in.h:597
 msgid "PC-98xx Series"
 msgstr "PC-98xx-serie"
 
-#: ../rules/base.xml.in.h:577
+# 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
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Pannonisk rusyn (homofonisk)"
+
+#: ../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 (Afghanistan, 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 "Persisk"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:603
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persisk (Afghanistan, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:604
 msgid "Persian (with Persian Keypad)"
 msgstr "Persisk (med persisk numerisk tastatur)"
 
-#: ../rules/base.xml.in.h:583
-msgid "Philippines - Dvorak (Baybayin)"
-msgstr "Filippinsk - dvorak (baybarin)"
-
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:606
 msgid "Polish (Dvorak)"
 msgstr "Polsk (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 "Polsk (dvorak, polske anførelsestegn på tast 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 "Polsk (dvorak, polske anførelsestegn på anførelsestast)"
 
-#: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
-msgstr "Polsk (kashubian)"
-
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:609
 msgid "Polish (programmer Dvorak)"
 msgstr "Polsk (programmørdvorak)"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:610
 msgid "Polish (qwertz)"
 msgstr "Polsk (qwertz)"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:611
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:612
 msgid "Portuguese (Brazil)"
 msgstr "Portugisisk (brasiliansk)"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:613
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugisisk (brasiliansk, dvorak)"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugisisk (brasiliansk, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugisisk (brasiliansk, nativo for esperanto)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugisisk (brasiliansk, nativo for USA-tastaturer)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugisisk (brasiliansk, nativo)"
 
-#: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
-msgstr "Portugisisk (Mac)"
-
-#: ../rules/base.xml.in.h:599
-msgid "Portuguese (Mac, Sun dead keys)"
-msgstr "Portugisisk (Mac, Sun døde taster)"
+#: ../rules/base.xml.in.h:618
+msgid "Portuguese (Macintosh)"
+msgstr "Portugisisk (Macintosh)"
 
-#: ../rules/base.xml.in.h:600
-msgid "Portuguese (Mac, eliminate dead keys)"
-msgstr "Portugisisk (Mac, slå døde taster fra)"
+#: ../rules/base.xml.in.h:619
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portugisisk (Macintosh, Sun døde taster)"
 
-#: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr "Portugisisk (nativo for esperanto)"
+#: ../rules/base.xml.in.h:620
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Portugisisk (Macintosh, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugisisk (nativo for USA-tastaturer)"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Nativo)"
 msgstr "Portugisisk (nativo)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugisisk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugisisk (slå døde taster fra)"
 
-#: ../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 "Punjabi (Gurmukhi Jhelum)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:628
 msgid "Punjabi (Gurmukhi)"
 msgstr "Punjabi (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 "Højre Alt"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:631
 msgid "Right Alt (while pressed)"
 msgstr "Højre Alt (mens trykket ned)"
 
-#: ../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 "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:614
+#: ../rules/base.xml.in.h:633
 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: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 "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:616
+#: ../rules/base.xml.in.h:635
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Højre Alt-tast vælger aldrig tredje niveau"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:636
 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:618
+#: ../rules/base.xml.in.h:637
 msgid "Right Ctrl"
 msgstr "Højre Ctrl"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:638
 msgid "Right Ctrl (while pressed)"
 msgstr "Højre Ctrl-tast (mens trykket ned)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:639
 msgid "Right Ctrl as Right Alt"
 msgstr "Højre Ctrl-tast virker som højre Alt"
 
-#: ../rules/base.xml.in.h:621
+#: ../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:622
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl+Right Shift"
 msgstr "Højre Ctrl+Højre Skift"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:642
 msgid "Right Shift"
 msgstr "Højre Skift"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:643
 msgid "Right Win"
 msgstr "Højre Win"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:644
 msgid "Right Win (while pressed)"
 msgstr "Højre Win-tast (mens trykket ned)"
 
-#: ../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 "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: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 "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:628
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
 msgid "Romanian"
 msgstr "Rumænsk"
 
-#: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr "Rumænsk (krimtatarsk Dobruca-1 Q)"
-
-#: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr "Rumænsk (krimtatarsk Dobruca-2 Q)"
-
-#: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Rumænsk (krimtatarsk tyrkisk Alt-Q)"
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (Germany)"
+msgstr "Rumænsk (Tyskland)"
 
-#: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
-msgstr "Rumænsk (krimtatarsk tyrkisk F)"
+#: ../rules/base.xml.in.h:649
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Rumænsk (Tyskland, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:650
 msgid "Romanian (WinKeys)"
 msgstr "Rumænsk (Wintaster)"
 
 # http://da.wikipedia.org/wiki/%C3%87
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (cedilla)"
 msgstr "Rumænsk (cedille)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (standard cedilla)"
 msgstr "Rumænsk (standardcedille)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (standard)"
 msgstr "Rumænsk (standard)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:654
 msgid "Rupee on 4"
 msgstr "Rupee på 4"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../rules/base.xml.in.h:639
-msgid "Russian (Bashkirian)"
-msgstr "Russisk (bashkirisk)"
-
-#: ../rules/base.xml.in.h:640
-msgid "Russian (Chuvash Latin)"
-msgstr "Russisk (chuvash latin)"
-
-#: ../rules/base.xml.in.h:641
-msgid "Russian (Chuvash)"
-msgstr "Russisk (chuvash)"
-
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:656
 msgid "Russian (DOS)"
 msgstr "Russisk (DOS)"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:657
 msgid "Russian (Georgia)"
 msgstr "Russisk (georgisk)"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:658
 msgid "Russian (Germany, phonetic)"
 msgstr "Russisk (Tyskland, fonetisk)"
 
-#: ../rules/base.xml.in.h:645
-msgid "Russian (Kalmyk)"
-msgstr "Russisk (kalmykisk)"
-
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:659
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Russisk (Kasakhstan, med kazakhisk)"
 
-#: ../rules/base.xml.in.h:647
-msgid "Russian (Komi)"
-msgstr "Russisk (komi)"
-
-#: ../rules/base.xml.in.h:648
-msgid "Russian (Mari)"
-msgstr "Russisk (mari)"
-
-#: ../rules/base.xml.in.h:649
-msgid "Russian (Ossetian, WinKeys)"
-msgstr "Russisk (ossetisk, Wintaster)"
-
-#: ../rules/base.xml.in.h:650
-msgid "Russian (Ossetian, legacy)"
-msgstr "Russisk (ossetisk, forældet)"
-
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Russisk (Polen, fonetisk dvorak)"
 
-#: ../rules/base.xml.in.h:652
-msgid "Russian (Serbian)"
-msgstr "Russisk (Serbisk)"
-
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Sweden, phonetic)"
 msgstr "Russisk (Sverige, fonetisk)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Russisk (Sverige, fonetisk, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:655
-msgid "Russian (Tatar)"
-msgstr "Russisk (tatarsk)"
-
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:663
 msgid "Russian (US, phonetic)"
 msgstr "Russisk (US, fonetisk)"
 
-#: ../rules/base.xml.in.h:657
-msgid "Russian (Udmurt)"
-msgstr "Russisk (udmurt)"
-
-#: ../rules/base.xml.in.h:658
-msgid "Russian (Yakut)"
-msgstr "Russisk (yakut)"
+#: ../rules/base.xml.in.h:664
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Russisk (Ukraine, standard RSTU)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:665
 msgid "Russian (legacy)"
 msgstr "Russisk (forældet)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:666
 msgid "Russian (phonetic WinKeys)"
 msgstr "Russisk (fonetisk Wintaster)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:667
 msgid "Russian (phonetic)"
 msgstr "Russisk (fonetisk)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:668
 msgid "Russian (typewriter)"
 msgstr "Russisk (skrivemaskine)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:669
 msgid "Russian (typewriter, legacy)"
 msgstr "Russisk (skrivemaskine, forældet)"
 
-#: ../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 (Taiwan)"
 
-#: ../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 "Semikolon på tredje niveau"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbisk (latin unicode qwerty)"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbisk (latin unicode)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:686
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbisk (latin qwerty)"
 
 # guillemets er dem her: »«
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbisk (latin med anførelsestegnene »«)"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin)"
 msgstr "Serbisk (latin)"
 
-# 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:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr "Serbisk (pannonisk rusyn homofonisk)"
+#: ../rules/base.xml.in.h:689
+msgid "Serbian (Russia)"
+msgstr "Serbisk (Rusland)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Serbisk (Z og ZHE ombyttet)"
 
 # guillemets er dem her: »«
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (with guillemets)"
 msgstr "Serbisk (med anførelsestegnene »«)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:692
 msgid "Serbo-Croatian (US)"
 msgstr "Serbisk-kroatisk (US)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:693
 msgid "Shift cancels Caps Lock"
 msgstr "Skift afbryder 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 "Skift afbryder ikke Num Lock, vælger tredje niveau i steden for"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:695
 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:691
+#: ../rules/base.xml.in.h:696
 msgid "Shift+Caps Lock"
 msgstr "Skift+Caps Lock"
 
-#: ../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 "Slovakisk"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:700
 msgid "Slovak (extended Backslash)"
 msgstr "Slovakisk (udvidet omvendt skråstreg)"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:701
 msgid "Slovak (qwerty)"
 msgstr "Slovakisk (qwerty)"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:702
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Slovakisk (qwerty, udvidet omvendt skråstreg)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Slovene"
+#: ../rules/base.xml.in.h:703
+msgid "Slovenian"
 msgstr "Slovensk"
 
-#: ../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 "Slovensk (US-tastatur med slovenske bogstaver)"
 
-#: ../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 "Slovensk (anvend »« som anførelsestegn)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:706
 msgid "Spanish"
 msgstr "Spansk"
 
-# Asturian (Asturian: Asturianu or Bable) is a Romance 
-# language of the West Iberian group, Astur-Leonese 
-# Subgroup, spoken in the Spanish province of Asturias 
-# by the Asturian people.
-#: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr "Spansk (asturisk variant med bundpunktum H og bundpunktum L)"
-
-#: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr "Spansk (katalansk variant med midterpunktum L)"
-
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Spanish (Dvorak)"
 msgstr "Spansk (dvorak)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Spanish (Latin American)"
 msgstr "Spansk (latinamerikansk)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Spansk (latinamerikansk, Sun døde taster)"
+
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Spansk (latinamerikansk, slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Spansk (latinamerikansk, inkluder død tilde)"
 
-#: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, sun dead keys)"
-msgstr "Spansk (latinamerikansk, sun døde taster)"
-
-#: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
-msgstr "Spansk (Mac)"
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Macintosh)"
+msgstr "Spansk (Macintosh)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Sun dead keys)"
 msgstr "Spansk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (eliminate dead keys)"
 msgstr "Spansk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (include dead tilde)"
 msgstr "Spansk (inkluder død tilde)"
 
-#: ../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 "Specialtaster (Ctrl+Alt+&lt;key&gt;) håndteret i en server"
 
-#: ../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 "Swahili (Kenya)"
 
-#: ../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 "Ombyt Ctrl og Caps Lock"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swap ESC and Caps Lock"
 msgstr "Ombyt ESC og Caps Lock"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swedish (Dvorak)"
 msgstr "Svensk (dvorak)"
 
-#: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
-msgstr "Svensk (Mac)"
+#: ../rules/base.xml.in.h:725
+msgid "Swedish (Macintosh)"
+msgstr "Svensk (Macintosh)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish (Svdvorak)"
 msgstr "Svensk (svdvorak)"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (eliminate dead keys)"
 msgstr "Svensk (slå døde taster fra)"
 
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
-msgstr "Svensk (nordligt samisk)"
-
-# der er da ikke noget sprog der hedder det her!!!
-#: ../rules/base.xml.in.h:726
-msgid "Swiss"
-msgstr "Schweiz"
-
-#: ../rules/base.xml.in.h:727
-msgid "Swiss (legacy)"
-msgstr "Schweiz (forældet)"
-
 #: ../rules/base.xml.in.h:728
+msgid "Swedish Sign Language"
+msgstr "Svensk tegnsprog"
+
+#: ../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 "Syrisk"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:731
 msgid "Syriac (phonetic)"
 msgstr "Syrisk (fonetisk)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:732
 msgid "Taiwanese"
 msgstr "Taiwanesisk"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:733
 msgid "Taiwanese (indigenous)"
 msgstr "Taiwanesisk (indfødte)"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:734
 msgid "Tajik"
 msgstr "Tadsjikisk"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:735
 msgid "Tajik (legacy)"
 msgstr "Tadsjikisk (forældet)"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:736
 msgid "Tamil"
 msgstr "Tamilsk"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:737
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamilsk (Sri Lanka, TAB-skrivemaskine)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:738
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamilsk (Sri Lanka, unicode)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:739
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamilsk (TAB-skrivemaskine)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamilsk (TSCII-skrivemaskine)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Unicode)"
 msgstr "Tamilsk (unicode)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamilsk (tastatur med numre)"
 
-#: ../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 "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 "Tibetansk"
+
+#: ../rules/base.xml.in.h:750
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetansk (med ASCII-numre)"
+
+#: ../rules/base.xml.in.h:751
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Til den tilsvarende tast i et Dvoraktastatur."
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:752
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Til den tilsvarende tast på et Qwertytastatur."
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:753
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Skift pegetaster med Skift + 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 "Tswana"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:759
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:760
 msgid "Turkish (Alt-Q)"
 msgstr "Tyrkisk (Alt-Q)"
 
-#: ../rules/base.xml.in.h:757
-msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
-msgstr "Tyrkisk (krimtatarsk tyrkisk Alt-Q)"
-
-#: ../rules/base.xml.in.h:758
-msgid "Turkish (Crimean Tatar Turkish F)"
-msgstr "Tyrkisk (krimtatarsk tyrkisk F)"
-
-#: ../rules/base.xml.in.h:759
-msgid "Turkish (Crimean Tatar Turkish Q)"
-msgstr "Tyrkisk (krimtatarsk tyrkisk Q)"
-
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:761
 msgid "Turkish (F)"
 msgstr "Tyrkisk (F)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:762
 msgid "Turkish (Sun dead keys)"
 msgstr "Tyrkisk (Sun døde taster)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (international with dead keys)"
 msgstr "Tyrkisk (international med døde taster)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:764
 msgid "Turkmen"
 msgstr "Turkmensk"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:765
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmensk (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-tilstand)"
 
-#: ../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-tilstand)"
 
-#: ../rules/base.xml.in.h:770
-msgid "Ukrainian"
-msgstr "Ukrainsk"
-
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Ukrainsk (krimtatarsk tyrkisk Alt-Q)"
+msgid "Udmurt"
+msgstr "Udmurt"
 
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "Ukrainsk (krimtatarsk tyrkisk F)"
+msgid "Ukrainian"
+msgstr "Ukrainsk"
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "Ukrainsk (krimtatarsk tyrkisk Q)"
-
-#: ../rules/base.xml.in.h:774
 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:775
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (homophonic)"
 msgstr "Ukrainsk (homofonisk)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (legacy)"
 msgstr "Ukrainsk (forældet)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (phonetic)"
 msgstr "Ukrainsk (fonetisk)"
 
-#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr "Ukrainsk (standard-RSTU på russisk layout)"
-
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukrainsk (standard RSTU)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (typewriter)"
 msgstr "Ukrainsk (skrivemaskine)"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:779
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode tilføjelser (pile og matematiske tegn)"
 
-#: ../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 tilføjelser (pile og matematiske tegn). Matematiske tegn på standardniveau"
 
-#: ../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 (Pakistan)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:783
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:784
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (Win-taster)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (alternativ fonetisk)"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (phonetic)"
 msgstr "Urdu (fonetisk)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:788
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Brug tastatur-LED til at vise alternativ layout"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:789
 msgid "Using space key to input non-breakable space character"
 msgstr "Brug mellemrum for at indtaste ubrydelig mellemrumskarakter"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:790
 msgid "Usual space at any level"
 msgstr "Normal mellemrum på alle niveauer"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "Uyghur"
+
+#: ../rules/base.xml.in.h:792
 msgid "Uzbek"
 msgstr "Usbekisk"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:793
 msgid "Uzbek (Afghanistan)"
 msgstr "Usbekisk (Afghanistan)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:794
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Usbekisk (Afghanistan, OLPC)"
 
-#: ../rules/base.xml.in.h:796
-msgid "Uzbek (Crimean Tatar Turkish Alt-Q)"
-msgstr "Usbekisk (krimtatarsk tyrkisk Alt-Q)"
-
-#: ../rules/base.xml.in.h:797
-msgid "Uzbek (Crimean Tatar Turkish F)"
-msgstr "Usbekisk (krimtatarsk tyrkisk F)"
-
-#: ../rules/base.xml.in.h:798
-msgid "Uzbek (Crimean Tatar Turkish Q)"
-msgstr "Usbekisk (krimtatarsk tyrkisk Q)"
-
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek (Latin)"
 msgstr "Usbekisk (latin)"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:796
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../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 numerisk tastatur med unicode tilføjelser (pile og matematiske tegn)"
+#: ../rules/base.xml.in.h:798
+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:803
-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:799
+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: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 "Yakut"
+
+#: ../rules/base.xml.in.h:804
 msgid "Yoruba"
 msgstr "Yoruba"
 
@@ -3300,521 +3286,525 @@ 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:808
+#: ../rules/base.xml.in.h:805
 msgid "Zero-width non-joiner character at second level"
 msgstr "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau"
 
-#: ../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 "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt mellemrumstegn på tredje niveau"
 
-#: ../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 "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt på mellemrum på tredje niveau"
 
-#: ../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 "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt mellemrumstegn på tredje niveau"
 
-#: ../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 "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ubrydeligt mellemrumstegn på tredje niveau, ubrydeligt mellemrumstegn (ZWNJ) på fjerde niveau"
 
-#: ../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 "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ombrydeligt mellemrumstegn på tredje niveau"
 
-#: ../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 "Ubrydeligt mellemrumstegn (ZWNJ) på andet niveau, ombrydeligt mellemrumstegn på tredje niveau, ubrydeligt mellemrumsteng på fjerde niveau"
 
-#: ../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 "Ubrydeligt mellemrumstegn (ZWNJ) på tredje niveau, ombrydeligt mellemrumstegn på fjerde niveau"
 
-#: ../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 "Iran"
-
-# Avestisk er et uddødt iransk sprog
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr "Iran - avestisk"
+msgid "APL Keyboard Symbols"
+msgstr "APL-tastatursymboler"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "Litauen"
+msgid "Atsina"
+msgstr "Atsina"
 
+# Avestisk er et uddødt iransk sprog
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
-msgstr "Litauisk - dvorak"
+msgid "Avestan"
+msgstr "Avestisk"
 
+# http://en.wikipedia.org/wiki/Interior_Salish_languages
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "Lit"
-
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "Rumænien"
+msgid "Couer D'alene Salish"
+msgstr "Couer D'alene Salish"
 
-# touchtype = blindskrift (altså at skrive uden at kigge)
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr "Rumænien - ergonomisk maskinskrivning"
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Engelsk (US, international AltGr Unicode-sammensætning)"
 
 #: ../rules/base.extras.xml.in.h:9
-msgid "Rou"
-msgstr "Rum"
-
-#: ../rules/base.extras.xml.in.h:10
-msgid "Rus"
-msgstr "Rus"
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "Engelsk (US, international AltGr Unicode-sammensætning, alternativ)"
 
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "Rusland"
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
-msgstr "Serbien"
+msgid "Kutenai"
+msgstr "Kutenai"
 
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
-msgstr "Serbien - sammensætte accenter frem for døde taster"
+msgid "Latvian (US Colemak)"
+msgstr "Lettisk (US Colemak)"
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
-msgstr "Srb"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Lettisk (US Colemak, apostrofvariant)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "USA"
+msgid "Latvian (US Dvorak)"
+msgstr "Lettisk (US dvorak)"
 
 #: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
-msgstr "USA - Atsina"
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Lettisk (US dvorak, Y-variant)"
 
-# http://en.wikipedia.org/wiki/Interior_Salish_languages
 #: ../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 "Lettisk (US dvorak, minus variant)"
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
-msgstr "USA - International (AltGr Unicode sammensætning)"
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Lettisk (programmør US dvorak)"
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
-msgstr "USA - International (AltGr Unicode sammensætning, alternativ)"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Lettisk (programmør US dvorak, Y-variant)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Lettisk (programmør US dvorak, minus variant)"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Litauisk (US dvorak med litauiske bogstaver)"
+
+#: ../rules/base.extras.xml.in.h:25
+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
+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:30
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.extras.xml.in.h:32
+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
+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/xorg-server/xkeyboard-config/po/de.po b/xorg-server/xkeyboard-config/po/de.po
index 2d36d3416..4de8c47dd 100644
--- a/xorg-server/xkeyboard-config/po/de.po
+++ b/xorg-server/xkeyboard-config/po/de.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-03-26 20:56+0100\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-05-19 20:11+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -87,153 +87,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 "Afghani"
 
-#: ../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 "Albanisch"
 
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:21
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt und Meta befinden sich auf den Alt-Tasten."
 
-#: ../rules/base.xml.in.h:23
+#: ../rules/base.xml.in.h:22
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Alt ist der rechten Win-Taste zugeordnet und Super der Menü-Taste."
 
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:23
 msgid "Alt+Caps Lock"
 msgstr "Alt+Feststelltaste"
 
-#: ../rules/base.xml.in.h:25
+#: ../rules/base.xml.in.h:24
 msgid "Alt+Ctrl"
 msgstr "Alt+Strg"
 
-#: ../rules/base.xml.in.h:26
+#: ../rules/base.xml.in.h:25
 msgid "Alt+Shift"
 msgstr "Alt+Umschalttaste"
 
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:26
 msgid "Alt+Space"
 msgstr "Alt+Leertaste"
 
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:27
 msgid "Alt/Win key behavior"
 msgstr "Verhalten der Alt/Windows-Tasten"
 
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:28
 msgid "Amharic"
 msgstr "Amharisch"
 
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:29
 msgid "Any Alt key"
 msgstr "Beliebige Alt-Taste"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr "Beliebige Windows-Taste"
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr "Beliebige Windows-Taste (gedrückt halten)"
 
-#: ../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: PC-Tasten emulieren (Druck, Scroll_Lock, Pause, NumLock)"
 
-#: ../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 "Arabisch"
 
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:39
 msgid "Arabic (Buckwalter)"
 msgstr "Arabisch (Buckwalter)"
 
-#: ../rules/base.xml.in.h:41
+#: ../rules/base.xml.in.h:40
 msgid "Arabic (Morocco)"
 msgstr "Arabisch (Marokko)"
 
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:41
 msgid "Arabic (Pakistan)"
 msgstr "Arabisch (Pakistan)"
 
-#: ../rules/base.xml.in.h:43
+#: ../rules/base.xml.in.h:42
 msgid "Arabic (Syria)"
 msgstr "Arabisch (Syrien)"
 
-#: ../rules/base.xml.in.h:44
+#: ../rules/base.xml.in.h:43
 msgid "Arabic (azerty)"
 msgstr "Arabisch (azerty)"
 
-#: ../rules/base.xml.in.h:45
+#: ../rules/base.xml.in.h:44
 msgid "Arabic (azerty/digits)"
 msgstr "Arabisch (azerty/Ziffern)"
 
-#: ../rules/base.xml.in.h:46
+#: ../rules/base.xml.in.h:45
 msgid "Arabic (digits)"
 msgstr "Arabisch (Ziffern)"
 
-#: ../rules/base.xml.in.h:47
+#: ../rules/base.xml.in.h:46
 msgid "Arabic (qwerty)"
 msgstr "Arabisch (qwerty)"
 
-#: ../rules/base.xml.in.h:48
+#: ../rules/base.xml.in.h:47
 msgid "Arabic (qwerty/digits)"
 msgstr "Arabisch (qwerty/Ziffern)"
 
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
 msgid "Armenian"
 msgstr "Armenisch"
 
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:49
 msgid "Armenian (alternative eastern)"
 msgstr "Armenisch (Alternative, östlich)"
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
 msgid "Armenian (alternative phonetic)"
 msgstr "Armenisch (alternativ, phonetisch)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 msgid "Armenian (eastern)"
 msgstr "Armenisch (östlich)"
 
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:52
 msgid "Armenian (phonetic)"
 msgstr "Armenisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:53
 msgid "Armenian (western)"
 msgstr "Armenisch (westlich)"
 
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturisch (Spanien, mit unterpunktetem L und H)"
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "Asus-Laptop"
@@ -251,13 +251,13 @@ msgid "Avatime"
 msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijan (Cyrillic)"
-msgstr "Aserbaidschanisch (kyrillisch)"
-
-#: ../rules/base.xml.in.h:60
 msgid "Azerbaijani"
 msgstr "Aserbaidschanisch"
 
+#: ../rules/base.xml.in.h:60
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Aserbaidschanisch (kyrillisch)"
+
 #: ../rules/base.xml.in.h:61
 msgid "Azona RF2300 wireless Internet Keyboard"
 msgstr "Azona RF2300 wireless Internet Keyboard"
@@ -303,7 +303,7 @@ msgid "Backslash"
 msgstr "Backslash"
 
 #: ../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 "Backslash 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:73
@@ -311,3445 +311,3602 @@ msgid "Bambara"
 msgstr "Bambara"
 
 #: ../rules/base.xml.in.h:74
+msgid "Bashkirian"
+msgstr "Baschkirisch"
+
+#: ../rules/base.xml.in.h:75
 msgid "Belarusian"
 msgstr "Weißrussisch"
 
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:76
 msgid "Belarusian (Latin)"
 msgstr "Weißrussisch (Lateinisch)"
 
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:77
 msgid "Belarusian (legacy)"
 msgstr "Weißrussisch (veraltet)"
 
-#: ../rules/base.xml.in.h:77
+#: ../rules/base.xml.in.h:78
 msgid "Belgian"
 msgstr "Belgisch"
 
-#: ../rules/base.xml.in.h:78
+#: ../rules/base.xml.in.h:79
 msgid "Belgian (ISO alternate)"
 msgstr "Belgisch (ISO-Alternative)"
 
-#: ../rules/base.xml.in.h:79
+#: ../rules/base.xml.in.h:80
 msgid "Belgian (Sun dead keys)"
 msgstr "Belgisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belgisch (Wang Modell 724, azerty)"
 
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:82
 msgid "Belgian (alternative)"
 msgstr "Belgisch (Alternative)"
 
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:83
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belgisch (Alternative, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belgisch (Alternative, nur latin-9)"
 
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:85
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belgisch (ohne Akzenttasten)"
 
-#: ../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 "Bengalisch"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:90
 msgid "Bengali (Probhat)"
 msgstr "Bengalisch (Probhat)"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:91
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berber (Marokko, Tifinagh alternativ, phonetisch)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "TBerber (Marokko, Tifinagh alternativ)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berber (Marokko, Tifinagh erweitert, phonetisch)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berber (Marokko, Tifinagh erweitert)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berber (Marokko, Tifinagh phonetisch)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berber (Marokko, Tifinagh)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosnisch (US-Tastatur mit bosnischen Digraphen)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosnisch (US-Tastatur mit bosnischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosnisch (Bosnische Digraphen verwenden)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosnisch (Anführungszeichen für Zitate verwenden)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Both Alt keys together"
 msgstr "Beide Alt-Tasten gleichzeitig"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Both Ctrl keys together"
 msgstr "Beide Steuerungstasten gleichzeitig"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Both Shift keys together"
 msgstr "Beide Umschalttasten gleichzeitig"
 
-#: ../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 "Beide Umschalttasten gleichzeitig schalten CapsLock ein und aus, eine Umschalttaste deaktiviert"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Beide Umschalttasten gleichzeitig schalten CapsLock ein und aus"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Beide Umschalttasten gleichzeitig schalten ShiftLock ein und aus"
 
-#: ../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 (linkshändig)"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Braille (right hand)"
 msgstr "Braille (rechtshändig)"
 
-#: ../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 "Bulgarisch"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Bulgarian (new phonetic)"
 msgstr "Bulgarisch (neu phonetisch)"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bulgarisch (traditionell phonetisch)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:115
 msgid "Burmese"
 msgstr "Burmesisch"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:116
 msgid "Canadian Multilingual"
 msgstr "Kanadisch, mehrsprachig"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Canadian Multilingual (first part)"
 msgstr "Kanadisch, mehrsprachig (erster Teil)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "Canadian Multilingual (second part)"
 msgstr "Kanadisch, mehrsprachig (zweiter Teil)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:119
 msgid "Caps Lock"
 msgstr "Feststelltaste"
 
-#: ../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 "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:120
+#: ../rules/base.xml.in.h:121
 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:121
+#: ../rules/base.xml.in.h:122
 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:122
+#: ../rules/base.xml.in.h:123
 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:123
+#: ../rules/base.xml.in.h:124
 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:124
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock is disabled"
 msgstr "Feststelltaste ist deaktiviert"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock key behavior"
 msgstr "Verhalten der Feststelltaste"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:127
 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:127
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Feststelltaste kehrt die normale Großschreibung alphabetischer Zeichen um"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "Feststelltaste verwendet interne Großschreibung. Umschalttaste »unterbricht« Feststelltaste"
 
-#: ../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 "Feststelltaste verwendet interne Großschreibung. Umschalttaste beeinflusst Feststelltaste nicht"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:131
 msgid "Catalan"
 msgstr "Katalanisch"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:132
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Katalanisch (Spanische Variante mit mittelpunktiertem L)"
+
+#: ../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 (alternative Option)"
 
-#: ../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 "Chinesisch"
 
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "Chinesisch (Tibetanisch, mit ASCII-Ziffern)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "Chinesisch (Tibetanisch)"
-
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "Chinesisch (Uigurisch)"
+msgid "Chuvash"
+msgstr "Tschuwaschisch"
 
 #: ../rules/base.xml.in.h:147
+msgid "Chuvash (Latin)"
+msgstr "Tschuwaschisch (lateinische Schrift)"
+
+#: ../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 Tasten)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:152
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 Tasten)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 Tasten)"
 
-#: ../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 "Position der Compose-Taste"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:156
 msgid "Control + Alt + Backspace"
 msgstr "Strg + Alt + Löschtaste"
 
-#: ../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 "Strg ist den Alt-Tasten zugeordnet, Alt ist den Windows-Tasten zugeordnet"
 
-#: ../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 "Strg ist den Win-Tasten zugeordnet (und den üblichen Strg-Tasten)"
 
-#: ../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 "Krimtatarisch (Dobruja Q)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krimtatarisch (Türkisch Alt-Q)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krimtatarisch (Türkisch F)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krimtatarisch (Türkisch Q)"
+
+#: ../rules/base.xml.in.h:164
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:165
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Kroatisch (US-Tastatur mit kroatischen Digraphen)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:166
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Kroatisch (US-Tastatur mit kroatischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
+#: ../rules/base.xml.in.h:167
+msgid "Croatian (use Croatian digraphs)"
 msgstr "Kroatisch (Kroatische Digraphen verwenden)"
 
-#: ../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 "Kroatisch (Anführungszeichen für Zitate verwenden)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Ctrl key position"
 msgstr "Position der Strg-Taste"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Ctrl+Shift"
 msgstr "Strg+Umschalttaste"
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../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 "Tschechisch (UCW-Belegung, nur akzentuierte Buchstaben)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Tschechisch (US Dvorak mit CZ-UCW-Unterstützung)"
 
-#: ../rules/base.xml.in.h:168
-msgid "Czech (With &lt;\\|&gt; key)"
-msgstr "Tschechisch (mit &lt;\\|&gt;-Taste)"
-
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:174
 msgid "Czech (qwerty)"
 msgstr "Tschechisch (qwerty)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:175
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Tschechisch (qwerty, erweiterter Backslash)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:176
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Tschechisch (mit &lt;\\|&gt;-Taste)"
+
+#: ../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änisch"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Danish (Dvorak)"
 msgstr "Dänisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
+#: ../rules/base.xml.in.h:180
+msgid "Danish (Macintosh)"
 msgstr "Dänisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
+#: ../rules/base.xml.in.h:181
+msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Dänisch (Macintosh, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Danish (eliminate dead keys)"
 msgstr "Dänisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "Default numeric keypad keys"
 msgstr "Vorgegebene Nummernblocktasten"
 
-#: ../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-Tastatur mit 101 Tasten"
 
-#: ../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-Serie"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Dell Latitude series laptop"
 msgstr "Dell Latitude-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 Keybard"
 
-#: ../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-Serie"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
-msgstr "Niederländisch (Mac)"
+#: ../rules/base.xml.in.h:197
+msgid "Dutch (Macintosh)"
+msgstr "Niederländisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dutch (Sun dead keys)"
 msgstr "Niederländisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dutch (standard)"
 msgstr "Niederländisch (Standard)"
 
-#: ../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 "Typographische Sonderzeichen aktivieren"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
+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
+msgid "English (Cameroon)"
+msgstr "Englisch (Kamerun)"
+
+#: ../rules/base.xml.in.h:205
 msgid "English (Canada)"
 msgstr "Englisch (Kanada)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:206
 msgid "English (Colemak)"
 msgstr "Englisch (Colemak)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:207
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Englisch (Dvorak Alternative international, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:208
 msgid "English (Dvorak international with dead keys)"
 msgstr "Englisch (Dvorak International, mit Akzenttasten)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:209
 msgid "English (Dvorak)"
 msgstr "Englisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:210
 msgid "English (Ghana)"
 msgstr "Englisch (Ghana)"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:211
 msgid "English (Ghana, GILLBT)"
 msgstr "Englisch (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:212
 msgid "English (Ghana, multilingual)"
 msgstr "Englisch (Ghana, mehrsprachig)"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:213
 msgid "English (India, with RupeeSign)"
 msgstr "Englisch (Indien, mit Rupie-Symbol)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:214
 msgid "English (Macintosh)"
 msgstr "Englisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
+#: ../rules/base.xml.in.h:215
+msgid "English (Mali, US Macintosh)"
 msgstr "Englisch (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 "Englisch (Mali, USA International)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:217
 msgid "English (Nigeria)"
 msgstr "Englisch (Nigeria)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:218
 msgid "English (South Africa)"
 msgstr "Englisch (Südafrika)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:219
 msgid "English (UK)"
 msgstr "Englisch (Britisch)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:220
 msgid "English (UK, Colemak)"
 msgstr "English (Britisch, Colemak)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
-msgstr "Englisch (britische Dvorak-Punktierung)"
+#: ../rules/base.xml.in.h:221
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Englisch (Dvorak mit britischer Punktierung)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:222
 msgid "English (UK, Dvorak)"
 msgstr "Englisch (Britisch, Dvorak)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
+#: ../rules/base.xml.in.h:223
+msgid "English (UK, Macintosh international)"
 msgstr "Englisch (Britisch, Macintosh international)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
+#: ../rules/base.xml.in.h:224
+msgid "English (UK, Macintosh)"
 msgstr "Englisch (Britisch, Macintosh)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
+#: ../rules/base.xml.in.h:225
+msgid "English (UK, extended WinKeys)"
 msgstr "Englisch (Britisch erweitert, Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, international with dead keys)"
 msgstr "Englisch (Britisch international, mit Akzenttasten)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
 msgid "English (US)"
 msgstr "English (USA)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:228
 msgid "English (US, alternative international)"
 msgstr "Englisch (USA, international alternativ)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:229
 msgid "English (US, international with dead keys)"
 msgstr "Englisch (USA International, mit Akzenttasten)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:230
 msgid "English (US, with euro on 5)"
 msgstr "Englisch (USA, mit Euro-Symbol auf 5)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:231
 msgid "English (classic Dvorak)"
 msgstr "Englisch (Dvorak, klassisch)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:232
 msgid "English (international AltGr dead keys)"
 msgstr "Englisch (international, AltGr-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:233
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Englisch (Belegungsumschalter auf der Multiplikations-/Divisionstaste)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:234
 msgid "English (left handed Dvorak)"
 msgstr "Englisch (Dvorak, linkshändig)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:235
 msgid "English (programmer Dvorak)"
 msgstr "Englisch (Dvorak für Programmierer)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:236
 msgid "English (right handed Dvorak)"
 msgstr "Englisch (Dvorak, rechtshändig)"
 
-#: ../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 "Eingabetaste im Nummernblock"
 
-#: ../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 "Esperanto (falsch platziertes Semikolon und Anführungszeichen, veraltet)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:242
 msgid "Estonian"
 msgstr "Estnisch"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:243
 msgid "Estonian (Dvorak)"
 msgstr "Estnisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:244
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estnisch (US-Tastatur mit estnischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:245
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estnisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:246
 msgid "Euro on 2"
 msgstr "Euro auf 2"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:247
 msgid "Euro on 4"
 msgstr "Euro auf 4"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:248
 msgid "Euro on 5"
 msgstr "Euro auf 5"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:249
 msgid "Euro on E"
 msgstr "Euro auf 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 "Färöisch"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:254
 msgid "Faroese (eliminate dead keys)"
 msgstr "Färöisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:255
 msgid "Filipino"
 msgstr "Philippinisch"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:256
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Philippinisch (Capewell-Dvorak, Baybayin)"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:257
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Philippinisch (Capewell-Dvorak, Lateinisch)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:258
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Philippinisch (Capewell-QWERF 2006, Baybayin)"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:259
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Philippinisch (Capewell-QWERF 2006, lateinisch)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:260
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Philippinisch (Colemak, Baybayin)"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Colemak Latin)"
 msgstr "Philippinisch (Colemak, lateinisch)"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:262
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Philippinisch (Dvorak, Baybayin)"
+
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Dvorak Latin)"
 msgstr "Philippinisch (Dvorak, lateinisch)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Philippinisch (QWERTY, Baybayin)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:265
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
 msgstr "Finnisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:267
 msgid "Finnish (classic)"
 msgstr "Finnisch (klassisch)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:268
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finnisch (klassisch, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:258
-msgid "Finnish (northern Saami)"
-msgstr "Finnisch (ördliches Saami)"
-
 #. 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 "Taste der vierten Ebene mit abstrakten Trennern"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:272
 msgid "Four-level key with comma"
 msgstr "Taste der vierten Ebene mit Komma"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:273
 msgid "Four-level key with dot"
 msgstr "Taste der vierten Ebene mit Punkt"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:274
 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:265
+#: ../rules/base.xml.in.h:275
 msgid "Four-level key with momayyez"
 msgstr "Taste der vierten Ebene mit »momayyez«"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:276
 msgid "French"
 msgstr "Französisch"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:277
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Französich (Bepo, ergonomisch, Dvorak-ähnlich)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:278
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Französisch (Bepo, ergonomisch, Dvorak-ähnlich, nur latin-9)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:279
 msgid "French (Breton)"
 msgstr "Französisch (Bretonisch)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:280
+msgid "French (Cameroon azerty)"
+msgstr "Französisch (Kamerun, azerty)"
+
+#: ../rules/base.xml.in.h:281
+msgid "French (Cameroon)"
+msgstr "Französisch (Kamerun)"
+
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "Französisch (Kanada)"
+
+#: ../rules/base.xml.in.h:283
 msgid "French (Canada, Dvorak)"
 msgstr "Französisch (Kanada, Dvorak)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:284
 msgid "French (Canada, legacy)"
 msgstr "Französisch (Kanada, veraltet)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:285
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Französisch (Demokratische Republik Kongo)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:286
 msgid "French (Dvorak)"
 msgstr "Französisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
-msgstr "Französich (Georgisch, AZERTY Tskapo)"
-
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:287
 msgid "French (Guinea)"
 msgstr "Französisch (Guinea)"
 
-#: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
+#: ../rules/base.xml.in.h:288
+msgid "French (Macintosh)"
 msgstr "Französisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:289
 msgid "French (Mali, alternative)"
 msgstr "Französisch (Mali, Alternative)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:290
 msgid "French (Morocco)"
 msgstr "Französisch (Marokko)"
 
-#: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
-msgstr "Französisch (Okzitanisch)"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:291
 msgid "French (Sun dead keys)"
 msgstr "Französisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:292
 msgid "French (Switzerland)"
 msgstr "Französisch (Schweiz)"
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
+#: ../rules/base.xml.in.h:293
+msgid "French (Switzerland, Macintosh)"
 msgstr "Französisch (Schweiz, Macintosh)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:294
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Französisch (Schweiz, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:295
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Französisch (Schweiz, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:296
 msgid "French (alternative)"
 msgstr "Französisch (alternativ)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:297
 msgid "French (alternative, Sun dead keys)"
 msgstr "Französisch (Alternative, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:298
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Französisch (Alternative, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:299
 msgid "French (alternative, latin-9 only)"
 msgstr "Französisch (Alternative, nur latin-9)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:300
 msgid "French (eliminate dead keys)"
 msgstr "Französisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
+#: ../rules/base.xml.in.h:301
+msgid "French (legacy, alternative)"
 msgstr "Französisch (Alternative, veraltet)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:302
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Französisch (Alternative, veraltet, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:303
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Französisch (Alternative, veraltet, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:304
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Fujitsu-Siemens Computers AMILO Laptop"
 
-#: ../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 "Generische PC-Tastatur mit 101 Tasten"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:308
 msgid "Generic 102-key (Intl) PC"
 msgstr "Generische PC-Tastatur mit 102 Tasten (Intl)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:309
 msgid "Generic 104-key PC"
 msgstr "Generische PC-Tastatur mit 104 Tasten"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:310
 msgid "Generic 105-key (Intl) PC"
 msgstr "Generische PC-Tastatur mit 105 Tasten (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 "Georgisch"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:317
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Georgisch (Frankreich, AZERTY Tskapo)"
+
+#: ../rules/base.xml.in.h:318
+msgid "Georgian (Italy)"
+msgstr "Georgisch (Italien)"
+
+#: ../rules/base.xml.in.h:319
 msgid "Georgian (MESS)"
 msgstr "Georgisch (MESS)"
 
-#: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
-msgstr "Georgisch (Ossetisch)"
-
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:320
 msgid "Georgian (ergonomic)"
 msgstr "Georgisch (ergonomisch)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:321
 msgid "German"
 msgstr "Deutsch"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:322
 msgid "German (Austria)"
 msgstr "Deutsch (Österreich)"
 
-#: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
-msgstr "DDeutsch (Österreich, Macintosh)"
+#: ../rules/base.xml.in.h:323
+msgid "German (Austria, Macintosh)"
+msgstr "Deutsch (Österreich, Macintosh)"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:324
 msgid "German (Austria, Sun dead keys)"
 msgstr "Deutsch (Österreich, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:325
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Deutsch (Österreich, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:326
 msgid "German (Dvorak)"
 msgstr "Deutsch (Dvorak)"
 
-#: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
+#: ../rules/base.xml.in.h:327
+msgid "German (Macintosh)"
 msgstr "Deutsch (Macintosh)"
 
-#: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
+#: ../rules/base.xml.in.h:328
+msgid "German (Macintosh, eliminate dead keys)"
 msgstr "Deutsch (Macintosh, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:329
 msgid "German (Neo 2)"
 msgstr "Deutsch (Neo 2)"
 
-#: ../rules/base.xml.in.h:319
-msgid "German (Romanian keyboard with German letters)"
-msgstr "Deutsch (Rumänische Tastatur mit deutschen Buchstaben)"
-
-#: ../rules/base.xml.in.h:320
-msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
-msgstr "Deutsch (Rumänische Tastatur mit deutschen Buchstaben, ohne Akzenttasten)"
-
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:330
 msgid "German (Sun dead keys)"
 msgstr "Deutsch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
+#: ../rules/base.xml.in.h:331
+msgid "German (Switzerland)"
+msgstr "Deutsch (Schweiz)"
+
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
 msgstr "Deutsch (Schweiz, Macintosh)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:333
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Deutsch (Schweiz, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:334
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Deutsch (Schweiz, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:335
+msgid "German (Switzerland, legacy)"
+msgstr "Deutsch (Schweiz, veraltet)"
+
+#: ../rules/base.xml.in.h:336
 msgid "German (dead acute)"
-msgstr "Deutsch (Ohne Acute-(')Akzentzeichen)"
+msgstr "Deutsch (Nur Acute-(')Akzentzeichen)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:337
 msgid "German (dead grave acute)"
-msgstr "Deutsch (Ohne Grave-(`) und Acute-(')Akzentzeichen)"
+msgstr "Deutsch (Nur Grave-(`) und Acute-(')Akzentzeichen)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:338
 msgid "German (eliminate dead keys)"
 msgstr "Deutsch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
-msgstr "Deutsch (Niedersorbisch, qwertz)"
-
-#: ../rules/base.xml.in.h:329
-msgid "German (lower Sorbian)"
-msgstr "Deutsch (Niedersorbisch)"
-
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:339
 msgid "German (qwerty)"
 msgstr "Deutsch (qwerty)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:340
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:341
 msgid "Greek (eliminate dead keys)"
 msgstr "Griechisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:342
 msgid "Greek (extended)"
 msgstr "Griechisch (erweitert)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:343
 msgid "Greek (polytonic)"
 msgstr "Griechisch (polytonisch)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:344
 msgid "Greek (simple)"
 msgstr "Griechisch (vereinfacht)"
 
-#: ../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« für Mac"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:350
 msgid "Hausa"
 msgstr "Haussa"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:351
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: ../rules/base.xml.in.h:343
-msgid "Hebrew (Phonetic)"
-msgstr "Hebräisch (phonetisch)"
-
-#: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
-msgstr "Hebräisch (Tiro)"
+#: ../rules/base.xml.in.h:352
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Hebräisch (Biblisch, Tiro)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "Hebrew (lyx)"
 msgstr "Hebräisch (lyx)"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
+msgid "Hebrew (phonetic)"
+msgstr "Hebräisch (phonetisch)"
+
+#: ../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 "Hexadezimal"
 
-#: ../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 Mobiltelefon"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:372
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:373
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Ungarisch (101/qwerty/Komma/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:374
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Ungarisch (101/qwerty/Komma/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Ungarisch (101/qwerty/Punkt/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Ungarisch (101/qwerty/Punkt/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Ungarisch (101/qwertz/Komma/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Ungarisch (101/qwertz/Komma/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Ungarisch (101/qwertz/Punkt/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Ungarisch (101/qwertz/Punkt/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Ungarisch (102/qwerty/Komma/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Ungarisch (102/qwerty/Komma/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Ungarisch (102/qwerty/Punkt/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Ungarisch (102/qwerty/Punkt/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Ungarisch (102/qwertz/Komma/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Ungarisch (102/qwertz/Komma/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Ungarisch (102/qwertz/Punkt/Akzenttasten)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Ungarisch (102/qwertz/Punkt/ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Ungarisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (qwerty)"
 msgstr "Ungarisch (qwerty)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (standard)"
 msgstr "Ungarisch (Standard)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:392
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper ist den Win-Tasten zugeordnet"
 
-#: ../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 "Isländisch"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:400
 msgid "Icelandic (Dvorak)"
 msgstr "Isländisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:392
-msgid "Icelandic (Mac)"
+#: ../rules/base.xml.in.h:401
+msgid "Icelandic (Macintosh)"
 msgstr "Isländisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic (Sun dead keys)"
 msgstr "Isländisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Isländisch (ohne Akzenttasten)"
 
-#: ../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 "Indisch"
 
-#: ../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 "Irakisch"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:408
 msgid "Irish"
 msgstr "Irisch"
 
-#: ../rules/base.xml.in.h:400
-msgid "Irish (CloGaelach)"
-msgstr "Irisch (CloGaelach)"
-
-#: ../rules/base.xml.in.h:401
-msgid "Irish (Ogham IS434)"
-msgstr "Irisch (Ogham IS434)"
-
-#: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
-msgstr "Irisch (Ogham)"
-
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:409
 msgid "Irish (UnicodeExpert)"
 msgstr "Irisch (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:410
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
-msgstr "Italienisch (Georgisch)"
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
+#: ../rules/base.xml.in.h:411
+msgid "Italian (Macintosh)"
 msgstr "Italienisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:412
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Italienisch (US-Tastatur mit italienischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:413
 msgid "Italian (eliminate dead keys)"
 msgstr "Italienisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:414
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:415
 msgid "Japanese (Kana 86)"
 msgstr "Japanisch (Kana 86)"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:416
 msgid "Japanese (Kana)"
 msgstr "Japanisch (Kana)"
 
-#: ../rules/base.xml.in.h:412
-msgid "Japanese (Mac)"
+#: ../rules/base.xml.in.h:417
+msgid "Japanese (Macintosh)"
 msgstr "Japanisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (OADG 109A)"
 msgstr "Japanisch (OADG 109A)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japanisch (PC-98xx-Serie)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:420
 msgid "Japanese keyboard options"
 msgstr "Japanische Tastaturoptionen"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:421
+msgid "Kalmyk"
+msgstr "Kalmykisch"
+
+#: ../rules/base.xml.in.h:422
 msgid "Kana Lock key is locking"
 msgstr "Kana-Sperrtaste ist gesperrt"
 
-#: ../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 "Kaschubisch"
+
+#: ../rules/base.xml.in.h:425
 msgid "Kazakh"
 msgstr "Kasachisch"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:426
 msgid "Kazakh (with Russian)"
 msgstr "Kasachisch (mit russischer Belegung)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:427
 msgid "Key sequence to kill the X server"
 msgstr "Tastenkombination zum erzwungenen Beenden des X-Servers"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:428
 msgid "Key to choose 3rd level"
 msgstr "Taste zum Wechsel in die dritte Tastaturebene"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:429
 msgid "Key to choose 5th level"
 msgstr "Taste zum Wechsel in die fünfte Tastaturebene"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:430
 msgid "Key(s) to change layout"
 msgstr "Taste(n) zum Wechseln der Belegung"
 
-#: ../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 (Kambodschanisch)"
+#: ../rules/base.xml.in.h:432
+msgid "Khmer (Cambodia)"
+msgstr "Khmer (Kambodscha)"
 
-#: ../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 "Koreanisch"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Korean (101/104 key compatible)"
 msgstr "Koreanisch (101/104-Tasten kompatibel)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurdisch (Iran, Arabisch-Lateinisch)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Kurdish (Iran, F)"
 msgstr "Kurdisch (Iran, F)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kurdisch (Iran, Lateinisches Alt-Q)"
+
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurdisch (Iran, Lateinisches Q)"
 
-#: ../rules/base.xml.in.h:433
-msgid "Kurdish (Iran, latin alt-Q)"
-msgstr "Kurdisch (Iran, Lateinisches Alt-Q)"
-
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurdisch (Irak, Arabisch-Lateinisch)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurdisch (Irak, F)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurdisch (Irak, Lateinisches Alt-Q)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurdisch (Irak, lateinisches Q)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Syria, F)"
 msgstr "Kurdisch (Syrien, F)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurdisch (Syrien, lateinisches Alt-Q)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurdisch (Syrien, lateinisches Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurdisch (Türkei, F)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurdisch (Türkei, lateinisches Alt-Q)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurdisch (Türkei, lateinisches 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 "Kirgisisch"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:453
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgisisch (phonetisch)"
 
-#: ../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 "Laotisch (durch STEA vorgeschlagene Standardbelegung)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:456
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Compaq Laptop/Notebook-Tastatur (z.B. Armada) Laptop-Tastatur"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:457
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Compaq Laptop/Notebook-Tastatur (z.B. Presario) Laptop-Tastatur"
 
-#: ../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 "Lettisch"
 
-#: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
-msgstr "Lettisch, (Apostroph-Variante ('))"
-
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:460
 msgid "Latvian (F variant)"
 msgstr "Lettisch (F-Variante)"
 
-#: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
-msgstr "Lettisch (Tilde-Variante (~))"
+#: ../rules/base.xml.in.h:461
+msgid "Latvian (adapted)"
+msgstr "Lettisch (angepasst)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:462
+msgid "Latvian (apostrophe variant)"
+msgstr "Lettisch, (Apostroph-Variante)"
+
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Georgisch (ergonomisch, ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:464
+msgid "Latvian (modern)"
+msgstr "Lettisch (modern)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "Lettisch (Tilde-Variante)"
+
+#: ../rules/base.xml.in.h:466
 msgid "Left Alt"
 msgstr "Linke Alt-Taste"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:467
 msgid "Left Alt (while pressed)"
 msgstr "Linke Alt-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:468
 msgid "Left Alt is swapped with Left Win"
 msgstr "Linke Alt-Taste ist gegen linke Windows-Taste vertauscht"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:469
 msgid "Left Ctrl"
 msgstr "Linke Strg-Taste"
 
-#: ../rules/base.xml.in.h:460
+#: ../rules/base.xml.in.h:470
 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:461
+#: ../rules/base.xml.in.h:471
 msgid "Left Ctrl+Left Shift"
 msgstr "Linke Strg-Taste+Linke Umschalttaste"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:472
 msgid "Left Shift"
 msgstr "Linke Umschalttaste"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:473
 msgid "Left Win"
 msgstr "Linke Windows-Taste"
 
-#: ../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 "Linke Windows-Taste (zur ersten Belegung), rechte Windows/Menütaste (zur letzten Belegung)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:475
 msgid "Left Win (while pressed)"
 msgstr "Linke Windows-Taste (gedrückt halten)"
 
-#: ../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 "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: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 "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:468
+#: ../rules/base.xml.in.h:478
 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:469
+#: ../rules/base.xml.in.h:479
 msgid "Legacy"
 msgstr "Veraltet"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:480
 msgid "Legacy Wang 724"
 msgstr "Wang 724 (veraltet)"
 
 #. 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 "Veraltete Taste mit Komma"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:483
 msgid "Legacy key with dot"
 msgstr "Veraltete Taste mit Punkt"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:485
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litauisch (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:486
 msgid "Lithuanian (LEKP)"
 msgstr "Litauisch (LEKP)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:487
 msgid "Lithuanian (LEKPa)"
 msgstr "Litauisch (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:488
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litauisch (US-Tastatur mit litauischen Buchstaben)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (standard)"
 msgstr "Litauisch (Standard)"
 
-#: ../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 (alternative Option)"
 
-#: ../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 (alternative Option 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-Sondertasten über den G1-Daemon"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Generic Keyboard"
 msgstr "Generische Logitech-Tastatur"
 
-#: ../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 (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 "Niedersorbisch"
+
+#: ../rules/base.xml.in.h:515
+msgid "Lower Sorbian (qwertz)"
+msgstr "Niedersorbisch (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 "Mazedonisch"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:519
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Mazedonisch (ohne Akzenttasten)"
 
-#: ../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 (Alt)"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:522
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Feststelltaste als zusätzliche Löschtaste verwenden"
 
-#: ../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 "Feststelltaste als zusätzliche Strg-Taste verwenden, aber Caps_Lock als Schnellzugriff erhalten"
 
-#: ../rules/base.xml.in.h:512
+#: ../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:513
+#: ../rules/base.xml.in.h:525
 msgid "Make Caps Lock an additional ESC"
 msgstr "Feststelltaste als zusätzliche Esc-Taste verwenden"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Feststelltaste als zusätzliche Hyper-Taste verwenden"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Feststelltaste als zusätzliche NumLock-Taste verwenden"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional Super"
 msgstr "Feststelltaste als zusätzliche Super-Taste verwenden"
 
-#: ../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 "Malayalam (verbessertes Inscript mit Rupie-Symbol)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:532
 msgid "Maltese"
 msgstr "Maltesisch"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:533
 msgid "Maltese (with US layout)"
 msgstr "Maltesisch (mit US-Belegung)"
 
-#: ../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 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 "Menü"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:540
 msgid "Meta is mapped to Left Win"
 msgstr "Meta ist der linken Windows-Taste zugeordnet"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:541
 msgid "Meta is mapped to Win keys"
 msgstr "Meta ist den Windows-Tasten zugeordnet"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:542
 msgid "Meta on Left Ctrl"
 msgstr "Meta auf linker Strg-Taste"
 
-#: ../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, Schwedisch"
 
-#: ../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 "Verschiedene Optionen zur Kompatibilität"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:556
 msgid "Mongolian"
 msgstr "Mongolisch"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:557
 msgid "Montenegrin"
 msgstr "Montenegrinisch"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:558
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrinisch (Kyrillisch mit Anführungszeichen)"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:559
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrinisch (kyrillisch)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrinisch, (Kyrillisch, »З« und »Ж« vertauscht)"
 
-#: ../rules/base.xml.in.h:547
-msgid "Montenegrin (Latin qwerty)"
-msgstr "Montenegrinisch (lateinische qwerty-Tastatur)"
-
-#: ../rules/base.xml.in.h:548
-msgid "Montenegrin (Latin unicode qwerty)"
+#: ../rules/base.xml.in.h:561
+msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Montenegrinisch (lateinische qwerty-Tastatur, Unicode)"
 
-#: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
+#: ../rules/base.xml.in.h:562
+msgid "Montenegrin (Latin Unicode)"
 msgstr "Montenegrinisch (lateinisch, Unicode)"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:563
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Montenegrinisch (lateinische qwerty-Tastatur)"
+
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrinisch (lateinisch mit Anführungszeichen)"
 
-#: ../rules/base.xml.in.h:551
-msgid "Māori"
-msgstr "Māori"
-
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:565
 msgid "NICOLA-F style Backspace"
 msgstr "Löschtaste wie NICOLA-F"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:566
 msgid "Nepali"
 msgstr "Nepalesisch"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:567
 msgid "Non-breakable space character at fourth level"
 msgstr "Nicht umbrechbares Leerzeichen in der vierten Tastaturebene"
 
-#: ../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 "Nicht umbrechbares Leerzeichen in der vierten Tastaturebene, schmales nicht umbrechbares Leerzeichen in der sechsten Ebene"
 
-#: ../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 "Nicht umbrechbares Leerzeichen in der vierten Tastaturebene, schmales nicht umbrechbares Leerzeichen in der sechsten Ebene (mit Strg + Umschalttaste)"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at second level"
 msgstr "Nicht umbrechbares Leerzeichen in der zweiten Tastaturebene"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at third level"
 msgstr "Nicht umbrechbares Leerzeichen in der dritten Tastaturebene"
 
-#: ../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 "Nicht umbrechbares Leerzeichen in der dritten Tastaturebene, nichts in der vierten Ebene"
 
-#: ../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 "Nicht umbrechbares Leerzeichen in der dritten Tastaturebene, schmales nicht umbrechbares Leerzeichen in der vierten Ebene"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:574
+msgid "Northern Saami (Finland)"
+msgstr "Nördliches Saami (Finnland)"
+
+#: ../rules/base.xml.in.h:575
+msgid "Northern Saami (Norway)"
+msgstr "Nördliches Saami (Norwegen)"
+
+#: ../rules/base.xml.in.h:576
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Nördliches Saami (Norwegen, ohne Akzenttasten)"
+
+#: ../rules/base.xml.in.h:577
+msgid "Northern Saami (Sweden)"
+msgstr "Nördliches Saami (Schweden)"
+
+#: ../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 "Norwegisch"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:580
 msgid "Norwegian (Dvorak)"
 msgstr "Norwegisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
+#: ../rules/base.xml.in.h:581
+msgid "Norwegian (Macintosh)"
 msgstr "Norwegisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
+#: ../rules/base.xml.in.h:582
+msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr "Norwegisch (Macintosh, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
-msgstr "Norwegisch (Nördliches Saami)"
-
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norwegisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:568
-msgid "Norwegian (northern Saami, eliminate dead keys)"
-msgstr "Norwegisch (Nördliches Saami, ohne Akzenttasten)"
-
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:584
 msgid "Num Lock"
 msgstr "NumLock"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:585
 msgid "Numeric keypad delete key behaviour"
 msgstr "Verhalten der Löschtaste des Nummernblocks"
 
-#: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
+#: ../rules/base.xml.in.h:586
+msgid "Numeric keypad keys work as with Macintosh"
 msgstr "Tasten des Nummernblocks arbeiten wie bei Mac"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:587
 msgid "Numeric keypad layout selection"
 msgstr "Belegungsauswahl des Nummernblocks"
 
-#: ../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 "Okzitanisch"
+
+#: ../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 "Oriya"
 
-#: ../rules/base.xml.in.h:575
+#: ../rules/base.xml.in.h:593
 msgid "Ortek MCK-800 MM/Internet keyboard"
 msgstr "Ortek MCK-800 MM/Internettastatur"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:594
+msgid "Ossetian (Georgia)"
+msgstr "Ossetisch (Georgien)"
+
+#: ../rules/base.xml.in.h:595
+msgid "Ossetian (WinKeys)"
+msgstr "Ossetisch (Windows-Tasten)"
+
+#: ../rules/base.xml.in.h:596
+msgid "Ossetian (legacy)"
+msgstr "Ossetisch (veraltet)"
+
+#: ../rules/base.xml.in.h:597
 msgid "PC-98xx Series"
 msgstr "PC-98xx-Serie"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:598
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Pannonisches Russinisch (homophon)"
+
+#: ../rules/base.xml.in.h:599
 msgid "Pashto"
 msgstr "Paschtunisch"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:600
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Paschtunisch (Afghanistan, 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 "Persisch"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:603
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persisch (Afghanistan, Dari-OLPC)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:604
 msgid "Persian (with Persian Keypad)"
 msgstr "Persisch (mit persischem Nummernblock)"
 
-#: ../rules/base.xml.in.h:583
-msgid "Philippines - Dvorak (Baybayin)"
-msgstr "Philippinen - Dvorak (Baybayin)"
-
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:606
 msgid "Polish (Dvorak)"
 msgstr "Polnisch (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 "Polnisch (Dvorak, polnische Anführungszeichen auf Taste 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 "Polnisch (Dvorak, polnische Anführungszeichen auf Taste mit Zitatzeichen)"
 
-#: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
-msgstr "Polnisch (Kaschubisch)"
-
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:609
 msgid "Polish (programmer Dvorak)"
 msgstr "Polnisch (Dvorak für Programmierer)"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:610
 msgid "Polish (qwertz)"
 msgstr "Polnisch (qwertz)"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:611
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:612
 msgid "Portuguese (Brazil)"
 msgstr "Portugiesisch (Brasilien)"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:613
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugiesisch (Brasilien, Dvorak)"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugiesisch (Brasilien, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugiesisch (Brasilien, Nativo für Esperanto)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugiesisch (Brasilien, Nativo für US-Tastaturen)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugiesisch (Brasilien, nativo)"
 
-#: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
+#: ../rules/base.xml.in.h:618
+msgid "Portuguese (Macintosh)"
 msgstr "Portugiesisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:599
-msgid "Portuguese (Mac, Sun dead keys)"
+#: ../rules/base.xml.in.h:619
+msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr "Portugiesisch (Macintosh, Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:600
-msgid "Portuguese (Mac, eliminate dead keys)"
+#: ../rules/base.xml.in.h:620
+msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr "Portugiesisch (Macintosh, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr "Portugiesisch (Nativo für Esperanto)"
-
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugiesisch (Nativo für US-Tastaturen)"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Nativo)"
 msgstr "Portugiesisch (Nativo)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugiesisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugiesisch (ohne Akzenttasten)"
 
-#: ../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 "Druck"
 
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:627
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Punjabi (Gurmukhi Jhelum)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:628
 msgid "Punjabi (Gurmukhi)"
 msgstr "Punjabi (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 "Rechte Alt-Taste"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:631
 msgid "Right Alt (while pressed)"
 msgstr "Rechte Alt-Taste (gedrückt halten)"
 
-#: ../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 "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:614
+#: ../rules/base.xml.in.h:633
 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: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 "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:616
+#: ../rules/base.xml.in.h:635
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Rechte Alt-Taste wählt niemals die dritte Tastaturebene."
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:636
 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:618
+#: ../rules/base.xml.in.h:637
 msgid "Right Ctrl"
 msgstr "Rechte Strg-Taste"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:638
 msgid "Right Ctrl (while pressed)"
 msgstr "Rechte Strg-Taste (gedrückt halten)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:639
 msgid "Right Ctrl as Right Alt"
 msgstr "Rechte Strg-Taste wie rechte Alt-Taste"
 
-#: ../rules/base.xml.in.h:621
+#: ../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:622
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl+Right Shift"
 msgstr "Rechte Strg-Taste und rechte Umschalttaste"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:642
 msgid "Right Shift"
 msgstr "Rechte Umschalttaste"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:643
 msgid "Right Win"
 msgstr "Rechte Windows-Taste"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:644
 msgid "Right Win (while pressed)"
 msgstr "Rechte Windows-Taste (gedrückt halten)"
 
-#: ../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 "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: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 "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:628
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr "Rumänisch (Krimtatarisch, Dobruca-1 Q)"
-
-#: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr "Rumänisch (Krimtatarisch, Dobruca-2 Q)"
-
-#: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Rumänisch (Krimtatarisch, Türkisch Alt-Q)"
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (Germany)"
+msgstr "Rumänisch (Deutschland)"
 
-#: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
-msgstr "Rumänisch (Krimtatarisch, Türkisch F)"
+#: ../rules/base.xml.in.h:649
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Rumänisch (Deutschland, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:650
 msgid "Romanian (WinKeys)"
 msgstr "Rumänisch (Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (cedilla)"
 msgstr "Rumänisch (Cedilla)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (standard cedilla)"
 msgstr "Rumänisch (Standard Cedilla)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (standard)"
 msgstr "Rumänisch (Standard)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:654
 msgid "Rupee on 4"
 msgstr "Rupie-Symbol auf 4"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../rules/base.xml.in.h:639
-msgid "Russian (Bashkirian)"
-msgstr "Russisch (Baschkirisch)"
-
-#: ../rules/base.xml.in.h:640
-msgid "Russian (Chuvash Latin)"
-msgstr "Russisch (Tschuwaschisch, lateinische Schrift)"
-
-#: ../rules/base.xml.in.h:641
-msgid "Russian (Chuvash)"
-msgstr "Russisch (Tschuwaschisch)"
-
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:656
 msgid "Russian (DOS)"
 msgstr "Russisch (DOS)"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:657
 msgid "Russian (Georgia)"
 msgstr "Russisch (Georgien)"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:658
 msgid "Russian (Germany, phonetic)"
 msgstr "Russisch (Deutschland, phonetisch)"
 
-#: ../rules/base.xml.in.h:645
-msgid "Russian (Kalmyk)"
-msgstr "Russisch (Kalmykisch)"
-
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:659
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Russisch (Kasachstan, mit Kasachisch)"
 
-#: ../rules/base.xml.in.h:647
-msgid "Russian (Komi)"
-msgstr "Russisch (Komi)"
-
-#: ../rules/base.xml.in.h:648
-msgid "Russian (Mari)"
-msgstr "Russisch (Mari)"
-
-#: ../rules/base.xml.in.h:649
-msgid "Russian (Ossetian, WinKeys)"
-msgstr "Russisch (Ossetisch, Windows-Tasten)"
-
-#: ../rules/base.xml.in.h:650
-msgid "Russian (Ossetian, legacy)"
-msgstr "Russisch (Ossetisch, veraltet)"
-
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Russisch (Polen, phonetisch, Dvorak)"
 
-#: ../rules/base.xml.in.h:652
-msgid "Russian (Serbian)"
-msgstr "Russisch (Serbisch)"
-
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Sweden, phonetic)"
 msgstr "Russisch (Schweden, phonetisch)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Russisch (Schweden, phonetisch, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:655
-msgid "Russian (Tatar)"
-msgstr "Russisch (Tatarisch)"
-
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:663
 msgid "Russian (US, phonetic)"
 msgstr "Russisch (USA, phonetisch)"
 
-#: ../rules/base.xml.in.h:657
-msgid "Russian (Udmurt)"
-msgstr "Russisch (Udmurtisch)"
-
-#: ../rules/base.xml.in.h:658
-msgid "Russian (Yakut)"
-msgstr "Russisch (Jakutisch)"
+#: ../rules/base.xml.in.h:664
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Russisch (Ukraine, Standard-RSTU)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:665
 msgid "Russian (legacy)"
 msgstr "Russisch (veraltet)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:666
 msgid "Russian (phonetic WinKeys)"
 msgstr "Russisch (phonetisch mit Win-Tasten)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:667
 msgid "Russian (phonetic)"
 msgstr "Russisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:668
 msgid "Russian (typewriter)"
 msgstr "Russisch (Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:669
 msgid "Russian (typewriter, legacy)"
 msgstr "Russisch (Schreibmaschine, veraltet)"
 
-#: ../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 (Taiwan)"
 
-#: ../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 "Rollen"
 
-#: ../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 "Semikolon in der dritten Tastaturebene"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbisch (lateinische qwerty-Tastatur, Unicode)"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbisch (Lateinisch Unicode)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:686
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbisch (Lateinische qwerty-Tastatur)"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbisch (Lateinisch mit Anführungszeichen)"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin)"
 msgstr "Serbisch (Lateinisch)"
 
-#: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr "Serbisch (Pannonian Rusyn Homophonic)"
+#: ../rules/base.xml.in.h:689
+msgid "Serbian (Russia)"
+msgstr "Serbisch (Russland)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Serbisch (»З« und »Ж« sind vertauscht)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (with guillemets)"
 msgstr "Serbisch (mit Anführungszeichen)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:692
 msgid "Serbo-Croatian (US)"
 msgstr "Serbokroatisch (US)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:693
 msgid "Shift cancels Caps Lock"
 msgstr "Umschalttaste deaktiviert Feststelltaste"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:694
 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:690
+#: ../rules/base.xml.in.h:695
 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:691
+#: ../rules/base.xml.in.h:696
 msgid "Shift+Caps Lock"
 msgstr "Umschalt-+Feststelltaste"
 
-#: ../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 "Singhalesisch"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:699
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:700
 msgid "Slovak (extended Backslash)"
 msgstr "Slowakisch (erweiterter Backslash)"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:701
 msgid "Slovak (qwerty)"
 msgstr "Slowakisch (qwerty)"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:702
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Slowakisch (qwerty, erweiterter Backslash)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Slovene"
+#: ../rules/base.xml.in.h:703
+msgid "Slovenian"
 msgstr "Slowenisch"
 
-#: ../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 "Slowenisch (US-Tastatur mit slowenischen Buchstaben)"
 
-#: ../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 "Slowenisch (Anführungszeichen für Zitate verwenden)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:706
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr "Spanisch (Asturische Variante mit unterpunktetem L und H)"
-
-#: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr "Spanisch (Katalanische Variante mit mittelpunktiertem L)"
-
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Spanish (Dvorak)"
 msgstr "Spanisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Spanish (Latin American)"
 msgstr "Spabisch (Lateinamerikanisch)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Spanisch (Lateinamerikanisch, Sun-Akzenttasten)"
+
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Spanisch (Lateinamerikanisch, ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Spanisch (Lateinamerikanisch, Akzent-Tilde einschließen)"
 
-#: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, sun dead keys)"
-msgstr "Spanisch (Lateinamerikanisch, Sun-Akzenttasten)"
-
-#: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Macintosh)"
 msgstr "Spanisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Sun dead keys)"
 msgstr "Spanisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (eliminate dead keys)"
 msgstr "Spanisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (include dead tilde)"
 msgstr "Spanisch (Akzent-Tilde einschließen)"
 
-#: ../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 "Spezialtasten für Server (Strg+Alt+&lt;Taste&gt;)"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Sun Type 5/6"
 msgstr "Sun Typ 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 (Tansania)"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Strg-Taste und Feststelltaste vertauschen"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swap ESC and Caps Lock"
 msgstr "Esc und Feststelltaste vertauschen"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swedish (Dvorak)"
 msgstr "Schwedisch (Dvorak)"
 
-#: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
+#: ../rules/base.xml.in.h:725
+msgid "Swedish (Macintosh)"
 msgstr "Schwedisch (Macintosh)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish (Svdvorak)"
 msgstr "Schwedisch (Svdvorak)"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (eliminate dead keys)"
 msgstr "Schwedisch (ohne Akzenttasten)"
 
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
-msgstr "Schwedisch (Nördliches Saami)"
-
-#: ../rules/base.xml.in.h:726
-msgid "Swiss"
-msgstr "Schweizerdeutsch"
-
-#: ../rules/base.xml.in.h:727
-msgid "Swiss (legacy)"
-msgstr "Schweiz (veraltet)"
-
 #: ../rules/base.xml.in.h:728
+msgid "Swedish Sign Language"
+msgstr "Schwedische Gebärdensprache"
+
+#: ../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 "Syrisch"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:731
 msgid "Syriac (phonetic)"
 msgstr "Syrisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:732
 msgid "Taiwanese"
 msgstr "Taiwanesisch"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:733
 msgid "Taiwanese (indigenous)"
 msgstr "Taiwanesisch (indigen)"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:734
 msgid "Tajik"
 msgstr "Tadschikisch"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:735
 msgid "Tajik (legacy)"
 msgstr "Tadschikisch (veraltet)"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:736
 msgid "Tamil"
 msgstr "Tamilisch"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:737
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamilisch (Sri Lanka, TAB Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:738
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamilisch (Sri Lanka, Unicode)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:739
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamilisch (TAB Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamilisch (TSCII Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Unicode)"
 msgstr "Tamilisch (Unicode)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamilisch (Tastatur mit Ziffern)"
 
-#: ../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 "Tatarisch"
+
+#: ../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 "Thailändisch"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Thailändisch (Pattachote)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
 msgid "Thai (TIS-820.2538)"
 msgstr "Thailändisch (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
+msgid "Tibetan"
+msgstr "Tibetanisch"
+
+#: ../rules/base.xml.in.h:750
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetanisch (mit ASCII-Ziffern)"
+
+#: ../rules/base.xml.in.h:751
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Zur entsprechenden Taste einer Dvorak-Tastatur."
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:752
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Zur entsprechenden Taste einer Qwerty-Tastatur."
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:753
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Zeigertasten mit Umschalttaste + NumLock umschalten"
 
-#: ../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 "Türkisch"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:760
 msgid "Turkish (Alt-Q)"
 msgstr "Türkisch (Alt-Q)"
 
-#: ../rules/base.xml.in.h:757
-msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
-msgstr "Türkisch (Krimtatarisch, türkisches Alt-Q)"
-
-#: ../rules/base.xml.in.h:758
-msgid "Turkish (Crimean Tatar Turkish F)"
-msgstr "Türkisch (Krimtatarisch, türkisches F)"
-
-#: ../rules/base.xml.in.h:759
-msgid "Turkish (Crimean Tatar Turkish Q)"
-msgstr "KTürkisch (Krimtatarisch, türkisches Q)"
-
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:761
 msgid "Turkish (F)"
 msgstr "Türkisch, (F)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:762
 msgid "Turkish (Sun dead keys)"
 msgstr "Türkisch (Sun-Akzenttasten)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (international with dead keys)"
 msgstr "Türkisch (International, mit Akzenttasten)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:764
 msgid "Turkmen"
 msgstr "Turkmenisch"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:765
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmenisch (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-Modus)"
 
-#: ../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-Modus)"
 
-#: ../rules/base.xml.in.h:770
-msgid "Ukrainian"
-msgstr "Ukrainisch"
-
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Ukrainisch (Krimtatarisch, Türkisch Alt-Q)"
+msgid "Udmurt"
+msgstr "Udmurtisch"
 
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "Ukrainisch (Krimtatarisch, Türkisch F)"
+msgid "Ukrainian"
+msgstr "Ukrainisch"
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "Ukrainisch (Krimtatarisch, Türkisch Q)"
-
-#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukrainisch (Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (homophonic)"
 msgstr "Ukrainisch (homophon)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (legacy)"
 msgstr "Ukrainisch (veraltet)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (phonetic)"
 msgstr "Ukrainisch (phonetisch)"
 
-#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr "Ukrainisch (Standard-RSTU mit russischer Belegung)"
-
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukrainisch (Standard-RSTU)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (typewriter)"
 msgstr "Ukrainisch (Schreibmaschine)"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:779
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode-Ergänzungen (Pfeile und mathematische Operatoren)"
 
-#: ../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-Ergänzungen (Pfeile und mathematische Operatoren). Mathematische Operatoren befinden sich in der Standardebene."
 
-#: ../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 (Pakistan)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:783
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:784
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (Windows-Tasten)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (Alternative, phonetisch)"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (phonetic)"
 msgstr "Urdu (phonetisch)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:788
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Tastatur-LED zur Anzeige der alternativen Belegung verwenden"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:789
 msgid "Using space key to input non-breakable space character"
 msgstr "Leertaste zur Eingabe nicht umbrechbarer Zeichen verwenden"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:790
 msgid "Usual space at any level"
 msgstr "Leertaste gibt in jeder Ebene stets Leerzeichen aus"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "Uigurisch"
+
+#: ../rules/base.xml.in.h:792
 msgid "Uzbek"
 msgstr "Usbekisch"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:793
 msgid "Uzbek (Afghanistan)"
 msgstr "Usbekisch (Afghanistan)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:794
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Usbekisch (Afghanistan, OLPC)"
 
-#: ../rules/base.xml.in.h:796
-msgid "Uzbek (Crimean Tatar Turkish Alt-Q)"
-msgstr "Usbekisch (Krimtatarisch, Türkisch Alt-Q)"
-
-#: ../rules/base.xml.in.h:797
-msgid "Uzbek (Crimean Tatar Turkish F)"
-msgstr "Usbekisch (Krimtatarisch, Türkisch F)"
-
-#: ../rules/base.xml.in.h:798
-msgid "Uzbek (Crimean Tatar Turkish Q)"
-msgstr "Usbekisch (Krimtatarisch, Türkisch Q)"
-
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek (Latin)"
 msgstr "Usbekisch (lateinische Schrift)"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:796
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: ../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)"
+#: ../rules/base.xml.in.h:798
+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: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 mit Unicode-Ergänzungen (Pfeile und mathematische Operatoren). Mathematische Operatoren in der Standardebene"
 
-#: ../rules/base.xml.in.h:804
+#: ../rules/base.xml.in.h:800
 msgid "Winbook Model XP5"
 msgstr "Winbook Modell 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 "Jakutisch"
+
+#: ../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 "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene"
 
-#: ../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 "Nicht verbindendes Zeichen der Breite Null in der zweiten Ebene, nicht umbrechbares Leerzeichen in der dritten Ebene"
 
-#: ../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 "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: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 "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: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 "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:813
+#: ../rules/base.xml.in.h:810
 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: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 "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:815
+#: ../rules/base.xml.in.h:812
 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: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 "Iran"
-
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr "Iran - Avestisch"
+msgid "APL Keyboard Symbols"
+msgstr "APL-Tastatursymbole"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "Litauen"
+msgid "Atsina"
+msgstr "Atsina"
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
-msgstr "Litauen - Dvorak"
+msgid "Avestan"
+msgstr "Avestisch"
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "Ltu"
-
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "Rumänien"
+msgid "Couer D'alene Salish"
+msgstr "Couer D'alene Salish"
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr "Rumänisch - Ergonomische Bedienung"
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Englisch (USA international, AltGr-Unicode-Kombination)"
 
 #: ../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 "Englisch (USA international, AltGr-Unicode-Kombination, alternativ)"
 
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "Russland"
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
-msgstr "Serbien"
+msgid "Kutenai"
+msgstr "Kutenai"
 
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
-msgstr "Serbisch - Akzente kombinieren, anstelle von Akzenttasten"
+msgid "Latvian (US Colemak)"
+msgstr "Lettisch (US-Colemak)"
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
-msgstr "Srb"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Lettisch (US-Colemak, Apostroph-Variante)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "USA"
+msgid "Latvian (US Dvorak)"
+msgstr "LLettisch (US-Dvorak)"
 
 #: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
-msgstr "USA - Atsina"
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Lettisch (US-Dvorak, Y-Variante)"
 
 #: ../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 "Lettisch (US-Dvorak, Minus-Variante)"
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
-msgstr "USA - International (AltGr-Unicode-Kombination)"
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Lettisch (Dvorak für Programmierer)"
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
-msgstr "USA - International (AltGr-Unicode-Kombination, alternativ)"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Lettisch (US-Dvorak für Programmierer, Y-Variante)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Lettisch (US-Dvorak für Programmierer, Minus-Variante)"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Litauisch (US-Tastatur mit litauischen Buchstaben)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "Polnisch (International, mit Akzenttasten)"
+
+#: ../rules/base.extras.xml.in.h:27
+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:30
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "Serbisch (Akzente kombinieren anstelle von Akzenttasten)"
+
+#: ../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 "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/xorg-server/xkeyboard-config/po/eo.po b/xorg-server/xkeyboard-config/po/eo.po
index 45ca56f00..b0088e195 100644
--- a/xorg-server/xkeyboard-config/po/eo.po
+++ b/xorg-server/xkeyboard-config/po/eo.po
@@ -1,3100 +1,4179 @@
 # Esperanta traduko por 'xkeyboard-config'
-# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010, 2011 The Free Software Foundation, Inc.
 # This file is distributed under the same license as the xkeyboard-config package.
 # Felipe Castro <fefcas@gmail.com>, 2008, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.1-pre1\n"
+"Project-Id-Version: xkeyboard-config 2.1.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-01-12 00:16+0000\n"
-"PO-Revision-Date: 2011-01-23 19:04-0300\n"
+"POT-Creation-Date: 2011-03-25 22:27+0000\n"
+"PO-Revision-Date: 2011-04-17 14:19-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../rules/base.xml.in.h:1
 msgid "&lt;Less/Greater&gt;"
-msgstr "&lt;Pli-signo/Malpli-signo&gt;"
+msgstr "&lt;Malpli-signo/Pli-signo&gt;"
 
 #: ../rules/base.xml.in.h:2
-msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "&lt;Pli-signo/Malpli-signo&gt; elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo"
+msgid "&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "&lt;Malpli-signo/Pli-signo&gt; (elektas 3-an nivelon, ŝlosas kiam premite kun alia 3-nivela elektilo)"
 
 #: ../rules/base.xml.in.h:3
-msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "&lt;Pli-signo/Malpli-signo&gt; elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo, unu premo malfaras la ŝloson"
+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;Malpli-signo/Pli-signo&gt; elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo, unu premo malfaras la ŝloson"
 
 #: ../rules/base.xml.in.h:4
-msgid "(F)"
-msgstr "(F)"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "&lt;Malpli-signo/Pli-signo&gt; elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo"
 
 #: ../rules/base.xml.in.h:5
-msgid "(Legacy) Alternative"
-msgstr "(Malmoderna) Alternativa"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "&lt;Malpli-signo/Pli-signo&gt; elektas 5-an nivelon, ŝlosas kiam premite kun alia 5-nivela elektilo, unu premo malfaras la ŝloson"
 
 #: ../rules/base.xml.in.h:6
-msgid "(Legacy) Alternative, Sun dead keys"
-msgstr "(Malmoderna) Alternativa, senpaŝaj klavoj de 'Sun'"
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
 
 #: ../rules/base.xml.in.h:7
-msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "(Malmoderna) Alternativa, forigi senpaŝajn klavojn"
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
 
 #: ../rules/base.xml.in.h:8
-msgid "101/104 key Compatible"
-msgstr "Kongrua al 101/104 klavoj"
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
 
 #: ../rules/base.xml.in.h:9
-msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/komo/Senpaŝaj klavoj"
+msgid "ATM/phone-style"
+msgstr "ATM/telefon-stilo"
 
 #: ../rules/base.xml.in.h:10
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/komo/Forigi senpaŝajn klavojn"
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
 
 #: ../rules/base.xml.in.h:11
-msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/punkto/Senpaŝaj klavoj"
+msgid "Acer C300"
+msgstr "Acer C300"
 
 #: ../rules/base.xml.in.h:12
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/punkto/Forigi senpaŝajn klavojn"
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
 
 #: ../rules/base.xml.in.h:13
-msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/komo/Senpaŝaj klavoj"
+msgid "Acer Laptop"
+msgstr "Acer Laptop"
 
 #: ../rules/base.xml.in.h:14
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwertz/komo/Forigi senpaŝajn klavojn"
+msgid "Add the standard behavior to Menu key"
+msgstr "Aldoni laŭnorman funkciadon al la klavo Menu"
 
 #: ../rules/base.xml.in.h:15
-msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/punkto/Senpaŝaj klavoj"
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Aldonado de Esperantaj supersignoj"
 
 #: ../rules/base.xml.in.h:16
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/punkto/Forigi senpaŝajn klavojn"
+msgid "Adding currency signs to certain keys"
+msgstr "Aldonado de valut-signoj al iuj klavoj"
 
 #: ../rules/base.xml.in.h:17
-msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/komo/Senpaŝaj klavoj"
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
 
 #: ../rules/base.xml.in.h:18
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/komo/Forigi senpaŝajn klavojn"
+msgid "Afg"
+msgstr "Afg"
 
 #: ../rules/base.xml.in.h:19
-msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/punkto/Senpaŝaj klavoj"
+msgid "Afghani"
+msgstr "Paŝtoa"
 
 #: ../rules/base.xml.in.h:20
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/punkto/Forigi senpaŝajn klavojn"
+msgid "Akan"
+msgstr "Akan"
 
 #: ../rules/base.xml.in.h:21
-msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/komo/Senpaŝaj klavoj"
+msgid "Albanian"
+msgstr "Albana"
 
 #: ../rules/base.xml.in.h:22
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/komo/Forigi senpaŝajn klavojn"
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt kaj Meta estas ĉe la klavoj Alt"
 
 #: ../rules/base.xml.in.h:23
-msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/punkto/Senpaŝaj klavoj"
+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
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/punkto/Forigi senpaŝajn klavojn"
+msgid "Alt+Caps Lock"
+msgstr "Alt+Caps Lock"
 
 #: ../rules/base.xml.in.h:25
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
 
 #: ../rules/base.xml.in.h:26
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
 
 #: ../rules/base.xml.in.h:27
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
+msgid "Alt+Space"
+msgstr "Alt+Space"
 
 #: ../rules/base.xml.in.h:28
-msgid "ATM/phone-style"
-msgstr "ATM/telefon-stilo"
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win, klava funkciado"
 
 #: ../rules/base.xml.in.h:29
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
+msgid "Amharic"
+msgstr "Amhara"
 
 #: ../rules/base.xml.in.h:30
-msgid "Acer C300"
-msgstr "Acer C300"
+msgid "Any Alt key"
+msgstr "Iu ajn klavo Alt"
 
 #: ../rules/base.xml.in.h:31
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
+msgid "Any Win key"
+msgstr "Iu ajn klavo Win"
 
 #: ../rules/base.xml.in.h:32
-msgid "Acer Laptop"
-msgstr "Acer Laptop"
+msgid "Any Win key (while pressed)"
+msgstr "Iu ajn klavo Win (dum premata)"
 
 #: ../rules/base.xml.in.h:33
-msgid "Add the standard behavior to Menu key"
-msgstr "Aldoni laŭnorman funkciadon al la klavo Menu"
+msgid "Apple"
+msgstr "Apple"
 
 #: ../rules/base.xml.in.h:34
-msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr "Aldonado de Esperantaj supersignoj"
+msgid "Apple Aluminium Keyboard (ANSI)"
+msgstr "Apple Aluminium Keyboard (ANSI)"
 
 #: ../rules/base.xml.in.h:35
-msgid "Adding currency signs to certain keys"
-msgstr "Aldonado de valut-signoj al iuj klavoj"
+msgid "Apple Aluminium Keyboard (ISO)"
+msgstr "Apple Aluminium Keyboard (ISO)"
 
 #: ../rules/base.xml.in.h:36
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
+msgid "Apple Aluminium Keyboard (JIS)"
+msgstr "Apple Aluminium Keyboard (JIS)"
 
 #: ../rules/base.xml.in.h:37
-msgid "Afg"
-msgstr "Afg"
+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
-msgid "Afghanistan"
-msgstr "Afganujo"
+msgid "Apple Laptop"
+msgstr "Apple Laptop"
 
 #: ../rules/base.xml.in.h:39
-msgid "Akan"
-msgstr "Akan"
+msgid "Arabic"
+msgstr "Araba"
 
 #: ../rules/base.xml.in.h:40
-msgid "Alb"
-msgstr "Alb"
+msgid "Arabic (Buckwalter)"
+msgstr "Araba (Buckwalter)"
 
 #: ../rules/base.xml.in.h:41
-msgid "Albania"
-msgstr "Albanujo"
+msgid "Arabic (Morocco)"
+msgstr "Araba (Maroko)"
 
 #: ../rules/base.xml.in.h:42
-msgid "Alt and Meta are on Alt keys"
-msgstr "Alt kaj Meta estas ĉe la klavoj Alt"
+msgid "Arabic (Pakistan)"
+msgstr "Araba (Pakistano)"
 
 #: ../rules/base.xml.in.h:43
-msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr "Alt estas mapita al la dekstra klavo Win kaj Super al Menu"
+msgid "Arabic (Syria)"
+msgstr "Araba (Sirio)"
 
 #: ../rules/base.xml.in.h:44
-msgid "Alt+Caps Lock"
-msgstr "Alt+Caps Lock"
+msgid "Arabic (azerty)"
+msgstr "Araba (azerty)"
 
 #: ../rules/base.xml.in.h:45
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
+msgid "Arabic (azerty/digits)"
+msgstr "Araba (azerty/ciferoj)"
 
 #: ../rules/base.xml.in.h:46
-msgid "Alt+Shift"
-msgstr "Alt+Shift"
+msgid "Arabic (digits)"
+msgstr "Araba (ciferoj)"
 
 #: ../rules/base.xml.in.h:47
-msgid "Alt+Space"
-msgstr "Alt+Space"
+msgid "Arabic (qwerty)"
+msgstr "Araba (qwerty)"
 
 #: ../rules/base.xml.in.h:48
-msgid "Alt-Q"
-msgstr "Alt-Q"
+msgid "Arabic (qwerty/digits)"
+msgstr "Araba (qwerty/ciferoj)"
 
 #: ../rules/base.xml.in.h:49
-msgid "Alt/Win key behavior"
-msgstr "Alt/Win, klava funkciado"
+msgid "Armenian"
+msgstr "Armena"
 
 #: ../rules/base.xml.in.h:50
-msgid "Alternative"
-msgstr "Alternativa"
+msgid "Armenian (alternative eastern)"
+msgstr "Armena (alternativa orienta)"
 
 #: ../rules/base.xml.in.h:51
-msgid "Alternative Eastern"
-msgstr "Alternativa Orienta"
+msgid "Armenian (alternative phonetic)"
+msgstr "Armena (alternativa fonetika)"
 
 #: ../rules/base.xml.in.h:52
-msgid "Alternative Phonetic"
-msgstr "Alternativa Fonetika"
+msgid "Armenian (eastern)"
+msgstr "Armena (oriento)"
 
 #: ../rules/base.xml.in.h:53
-msgid "Alternative international"
-msgstr "Alternativa internacia"
+msgid "Armenian (phonetic)"
+msgstr "Armena (fonetika)"
 
 #: ../rules/base.xml.in.h:54
-msgid "Alternative, Sun dead keys"
-msgstr "Alternava, senpaŝaj klavoj de 'Sun'"
+msgid "Armenian (western)"
+msgstr "Armena (okcidenta)"
 
 #: ../rules/base.xml.in.h:55
-msgid "Alternative, eliminate dead keys"
-msgstr "Alternativa, forigi senpaŝajn klavojn"
+msgid "Asus Laptop"
+msgstr "Asus Laptop"
 
 #: ../rules/base.xml.in.h:56
-msgid "Alternative, latin-9 only"
-msgstr "Alternativa, nur latin-9"
+msgid "At bottom left"
+msgstr "Malsupre maldekstre"
 
 #: ../rules/base.xml.in.h:57
-msgid "And"
-msgstr "And"
+msgid "At left of 'A'"
+msgstr "Maldekstre de 'A'"
 
 #: ../rules/base.xml.in.h:58
-msgid "Andorra"
-msgstr "Andoro"
+msgid "Avatime"
+msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:59
-msgid "Any Alt key"
-msgstr "Iu ajn klavo Alt"
+msgid "Azerbaijan (Cyrillic)"
+msgstr "Azerbajĝano (Cirila)"
 
 #: ../rules/base.xml.in.h:60
-msgid "Any Win key"
-msgstr "Iu ajn klavo Win"
+msgid "Azerbaijani"
+msgstr "Azerbajĝana"
 
 #: ../rules/base.xml.in.h:61
-msgid "Any Win key (while pressed)"
-msgstr "Iu ajn klavo Win (dum premata)"
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 sendrata Internet Keyboard"
 
 #: ../rules/base.xml.in.h:62
-msgid "Apostrophe (') variant"
-msgstr "Variaĵo de citilo (')"
+msgid "BTC 5090"
+msgstr "BTC 5090"
 
 #: ../rules/base.xml.in.h:63
-msgid "Apple"
-msgstr "Apple"
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
 
 #: ../rules/base.xml.in.h:64
-msgid "Apple Aluminium Keyboard (ANSI)"
-msgstr "Apple Aluminium Keyboard (ANSI)"
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
 
 #: ../rules/base.xml.in.h:65
-msgid "Apple Aluminium Keyboard (ISO)"
-msgstr "Apple Aluminium Keyboard (ISO)"
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
 
 #: ../rules/base.xml.in.h:66
-msgid "Apple Aluminium Keyboard (JIS)"
-msgstr "Apple Aluminium Keyboard (JIS)"
+msgid "BTC 9000"
+msgstr "BTC 9000"
 
 #: ../rules/base.xml.in.h:67
-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)"
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
 
 #: ../rules/base.xml.in.h:68
-msgid "Apple Laptop"
-msgstr "Apple Laptop"
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
 
 #: ../rules/base.xml.in.h:69
-msgid "Ara"
-msgstr "Ara"
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
 
 #: ../rules/base.xml.in.h:70
-msgid "Arabic"
-msgstr "Araba"
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U Mini Wireless Internet and Gaming"
 
 #: ../rules/base.xml.in.h:71
-msgid "Arm"
-msgstr "Arm"
+msgid "Backslash"
+msgstr "Retroklino"
 
 #: ../rules/base.xml.in.h:72
-msgid "Armenia"
-msgstr "Armenujo"
+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 "Asturian variant with bottom-dot H and bottom-dot L"
-msgstr "Asturia variaĵo kun subpunktita H kaj subpunktita L"
+msgid "Bambara"
+msgstr "Bambara"
 
 #: ../rules/base.xml.in.h:74
-msgid "Asus Laptop"
-msgstr "Asus Laptop"
+msgid "Belarusian"
+msgstr "Belorusa"
 
 #: ../rules/base.xml.in.h:75
-msgid "At bottom left"
-msgstr "Malsupre maldekstre"
+msgid "Belarusian (Latin)"
+msgstr "Belorusa (Latina)"
 
 #: ../rules/base.xml.in.h:76
-msgid "At left of 'A'"
-msgstr "Maldekstre de 'A'"
+msgid "Belarusian (legacy)"
+msgstr "Belorusa (malmoderna)"
 
 #: ../rules/base.xml.in.h:77
-msgid "Austria"
-msgstr "Aŭstrujo"
+msgid "Belgian"
+msgstr "Belga"
 
 #: ../rules/base.xml.in.h:78
-msgid "Aut"
-msgstr "Aut"
+msgid "Belgian (ISO alternate)"
+msgstr "Belga (Alternativa ISO)"
 
 #: ../rules/base.xml.in.h:79
-msgid "Avatime"
-msgstr "Avatime"
+msgid "Belgian (Sun dead keys)"
+msgstr "Belga (senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:80
-msgid "Aze"
-msgstr "Aze"
+msgid "Belgian (Wang model 724 azerty)"
+msgstr "Belga (Wang modelo 724 azerty)"
 
 #: ../rules/base.xml.in.h:81
-msgid "Azerbaijan"
-msgstr "Azerbajĝano"
+msgid "Belgian (alternative)"
+msgstr "Belga (alternativa)"
 
 #: ../rules/base.xml.in.h:82
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 sendrata Internet Keyboard"
+msgid "Belgian (alternative, Sun dead keys)"
+msgstr "Belga (alternativa, senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:83
-msgid "BTC 5090"
-msgstr "BTC 5090"
+msgid "Belgian (alternative, latin-9 only)"
+msgstr "Belga (alternativa, nur latin-9)"
 
 #: ../rules/base.xml.in.h:84
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
+msgid "Belgian (eliminate dead keys)"
+msgstr "Belga (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:85
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
 
 #: ../rules/base.xml.in.h:86
-msgid "BTC 6301URF"
-msgstr "BTC 6301URF"
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
 
 #: ../rules/base.xml.in.h:87
-msgid "BTC 9000"
-msgstr "BTC 9000"
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
 
 #: ../rules/base.xml.in.h:88
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
+msgid "Bengali"
+msgstr "Bengala"
 
 #: ../rules/base.xml.in.h:89
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
+msgid "Bengali (Probhat)"
+msgstr "Bengala (Probhat)"
 
 #: ../rules/base.xml.in.h:90
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgstr "Berbera (Maroko, Tifinagh alternativa fonetika)"
 
 #: ../rules/base.xml.in.h:91
-msgid "BTC 9116U Mini Wireless Internet and Gaming"
-msgstr "BTC 9116U Mini Wireless Internet and Gaming"
+msgid "Berber (Morocco, Tifinagh alternative)"
+msgstr "Berbera (Maroko, Tifinagh alternativa)"
 
 #: ../rules/base.xml.in.h:92
-msgid "Backslash"
-msgstr "Retroklino"
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgstr "Berbera (Maroko, Tifinagh etendita fonetika)"
 
 #: ../rules/base.xml.in.h:93
-msgid "Bangladesh"
-msgstr "Bangladeŝo"
+msgid "Berber (Morocco, Tifinagh extended)"
+msgstr "Berbera (Maroko, Tifinagh etendita)"
 
 #: ../rules/base.xml.in.h:94
-msgid "Bashkirian"
-msgstr "Baŝkira"
+msgid "Berber (Morocco, Tifinagh phonetic)"
+msgstr "Berbera (Maroko, Tifinagh fonetika)"
 
 #: ../rules/base.xml.in.h:95
-msgid "Bel"
-msgstr "Bel"
+msgid "Berber (Morocco, Tifinagh)"
+msgstr "Berbera (Maroko, Tifinagh)"
 
 #: ../rules/base.xml.in.h:96
-msgid "Belarus"
-msgstr "Belorusujo"
+msgid "Bosnian"
+msgstr "Bosna"
 
 #: ../rules/base.xml.in.h:97
-msgid "Belgium"
-msgstr "Belgujo"
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
+msgstr "Bosna (usona klavaro kun bosnaj duliteraĵoj)"
 
 #: ../rules/base.xml.in.h:98
-msgid "BenQ X-Touch"
-msgstr "BenQ X-Touch"
+msgid "Bosnian (US keyboard with Bosnian letters)"
+msgstr "Bosna (usona klavaro kun bosnaj literoj)"
 
 #: ../rules/base.xml.in.h:99
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
+msgid "Bosnian (use Bosnian digraphs)"
+msgstr "Bosna (uzi bosnajn duliteraĵojn)"
 
 #: ../rules/base.xml.in.h:100
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
+msgid "Bosnian (use guillemets for quotes)"
+msgstr "Bosna (uzi angul-citilojn por citiloj)"
 
 #: ../rules/base.xml.in.h:101
-msgid "Bengali"
-msgstr "Bengala"
+msgid "Both Alt keys together"
+msgstr "Ambaŭ klavoj Alt kune"
 
 #: ../rules/base.xml.in.h:102
-msgid "Bengali Probhat"
-msgstr "Bengala Probhat"
+msgid "Both Ctrl keys together"
+msgstr "Ambaŭ klavoj Ctrl kune"
 
 #: ../rules/base.xml.in.h:103
-msgid "Bepo, ergonomic, Dvorak way"
-msgstr "Bepo, komforteca, Dvorake"
+msgid "Both Shift keys together"
+msgstr "Ambaŭ klavoj Shift kune"
 
 #: ../rules/base.xml.in.h:104
-msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
-msgstr "Bepo, komforteca, Dvorake, nur latin-9"
+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
-msgid "Bgd"
-msgstr "Bgd"
+msgid "Both Shift-Keys together toggle Caps Lock"
+msgstr "Ambaŭ klavoj Shift kune alternigas Caps Lock"
 
 #: ../rules/base.xml.in.h:106
-msgid "Bgr"
-msgstr "Bgr"
+msgid "Both Shift-Keys together toggle ShiftLock"
+msgstr "Ambaŭ klavoj Shift kune (mal)ŝaltas ShiftLock"
 
 #: ../rules/base.xml.in.h:107
-msgid "Bhutan"
-msgstr "Bhutano"
+msgid "Braille"
+msgstr "Brajla"
 
 #: ../rules/base.xml.in.h:108
-msgid "Biblical Hebrew (Tiro)"
-msgstr "Biblia Hebrea (Tiro)"
+msgid "Braille (left hand)"
+msgstr "Brajla (maldekstra mano)"
 
 #: ../rules/base.xml.in.h:109
-msgid "Bih"
-msgstr "Bih"
+msgid "Braille (right hand)"
+msgstr "Brajla (dekstra mano)"
 
 #: ../rules/base.xml.in.h:110
-msgid "Blr"
-msgstr "Blr"
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
 
 #: ../rules/base.xml.in.h:111
-msgid "Bosnia and Herzegovina"
-msgstr "Bosnujo kaj Hercegovino"
+msgid "Bulgarian"
+msgstr "Bulgara"
 
 #: ../rules/base.xml.in.h:112
-msgid "Both Alt keys together"
-msgstr "Ambaŭ klavoj Alt kune"
+msgid "Bulgarian (new phonetic)"
+msgstr "Bulgara (nova fonetika)"
 
 #: ../rules/base.xml.in.h:113
-msgid "Both Ctrl keys together"
-msgstr "Ambaŭ klavoj Ctrl kune"
+msgid "Bulgarian (traditional phonetic)"
+msgstr "Bulgara (tradicia fonetika)"
 
 #: ../rules/base.xml.in.h:114
-msgid "Both Shift keys together"
-msgstr "Ambaŭ klavoj Shift kune"
+msgid "Burmese"
+msgstr "Birma"
 
 #: ../rules/base.xml.in.h:115
-msgid "Both Shift-Keys together toggle Caps Lock"
-msgstr "Ambaŭ klavoj Shift kune alternigas Caps Lock"
+msgid "Canadian Multilingual"
+msgstr "Kanada Plurlingva"
 
 #: ../rules/base.xml.in.h:116
-msgid "Botswana"
-msgstr "Bocvano"
+msgid "Canadian Multilingual (first part)"
+msgstr "Kanada Plurlingva (unua parto)"
 
 #: ../rules/base.xml.in.h:117
-msgid "Bra"
-msgstr "Bra"
+msgid "Canadian Multilingual (second part)"
+msgstr "Kanada Plurlingva (dua parto)"
 
 #: ../rules/base.xml.in.h:118
-msgid "Braille"
-msgstr "Brajla"
+msgid "Caps Lock"
+msgstr "Caps Lock"
 
 #: ../rules/base.xml.in.h:119
-msgid "Brazil"
-msgstr "Brazilo"
+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
-msgid "Breton"
-msgstr "Bretona"
+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
-msgid "Brl"
-msgstr "Brl"
+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
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internet Keyboard"
+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
-msgid "Btn"
-msgstr "Btn"
+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
-msgid "Buckwalter"
-msgstr "Buckwalter"
+msgid "Caps Lock is disabled"
+msgstr "Caps Lock estas malebligita"
 
 #: ../rules/base.xml.in.h:125
-msgid "Bulgaria"
-msgstr "Bulgarujo"
+msgid "Caps Lock key behavior"
+msgstr "Funkciado de la klavo Caps Lock"
 
 #: ../rules/base.xml.in.h:126
-msgid "Bwa"
-msgstr "Bwa"
+msgid "Caps Lock toggles Shift so all keys are affected"
+msgstr "Caps Lock alternigas Shift, influante ĉiujn klavojn"
 
 #: ../rules/base.xml.in.h:127
-msgid "COD"
-msgstr "COD"
+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
-msgid "CRULP"
-msgstr "CRULP"
+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
-msgid "Cambodia"
-msgstr "Kamboĝo"
+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
-msgid "Can"
-msgstr "Can"
+msgid "Catalan"
+msgstr "Kataluna"
 
 #: ../rules/base.xml.in.h:131
-msgid "Canada"
-msgstr "Kanado"
+msgid "Cherokee"
+msgstr "Ĉeroka"
 
 #: ../rules/base.xml.in.h:132
-msgid "Capewell-Dvorak (Baybayin)"
-msgstr "Capewell-Dvorako (Baybayin)"
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
 
 #: ../rules/base.xml.in.h:133
-msgid "Capewell-Dvorak (Latin)"
-msgstr "Capewell-Dvorako (Latina)"
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
 
 #: ../rules/base.xml.in.h:134
-msgid "Capewell-QWERF 2006 (Baybayin)"
-msgstr "Capewell-QWERF 2006 (Baybayin)"
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternativa opcio)"
 
 #: ../rules/base.xml.in.h:135
-msgid "Capewell-QWERF 2006 (Latin)"
-msgstr "Capewell-QWERF 2006 (Latina)"
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
 
 #: ../rules/base.xml.in.h:136
-msgid "Caps Lock"
-msgstr "Caps Lock"
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
 
 #: ../rules/base.xml.in.h:137
-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)"
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
 
 #: ../rules/base.xml.in.h:138
-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"
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
 
 #: ../rules/base.xml.in.h:139
-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"
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
 
 #: ../rules/base.xml.in.h:140
-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"
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
 
 #: ../rules/base.xml.in.h:141
-msgid "Caps Lock is disabled"
-msgstr "Caps Lock estas malebligita"
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
 
 #: ../rules/base.xml.in.h:142
-msgid "Caps Lock key behavior"
-msgstr "Funkciado de la klavo Caps Lock"
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
 
 #: ../rules/base.xml.in.h:143
-msgid "Caps Lock toggles Shift so all keys are affected"
-msgstr "Caps Lock alternigas Shift, influante ĉiujn klavojn"
+msgid "Chinese"
+msgstr "Ĉina"
 
 #: ../rules/base.xml.in.h:144
-msgid "Caps Lock toggles normal capitalization of alphabetic characters"
-msgstr "Caps Lock alternigas la ordinaran uskligon de alfabetaj signoj"
+msgid "Chinese (Tibetan with ASCII numerals)"
+msgstr "Ĉina (Tibeta kun ciferoj ASCII)"
 
 #: ../rules/base.xml.in.h:145
-msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
-msgstr "Caps Lock uzas internan uskligon. Shift \"paŭzigas\" Caps Lock"
+msgid "Chinese (Tibetan)"
+msgstr "Ĉina (Tibeta)"
 
 #: ../rules/base.xml.in.h:146
-msgid "Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
-msgstr "Caps Lock uzas internan uskligon. Shift ne influas Cap sLock"
+msgid "Chinese (Uyghur)"
+msgstr "Ĉina (Ujgura)"
 
 #: ../rules/base.xml.in.h:147
-msgid "Catalan variant with middle-dot L"
-msgstr "Kataluna variaĵo kun centro-punktita L"
+msgid "Classmate PC"
+msgstr "Classmate PC"
 
 #: ../rules/base.xml.in.h:148
-msgid "Cedilla"
-msgstr "Subhoketo"
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
 
 #: ../rules/base.xml.in.h:149
-msgid "Che"
-msgstr "Che"
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 klavoj)"
 
 #: ../rules/base.xml.in.h:150
-msgid "Cherokee"
-msgstr "Ĉeroka"
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 klavoj)"
 
 #: ../rules/base.xml.in.h:151
-msgid "Cherry B.UNLIMITED"
-msgstr "Cherry B.UNLIMITED"
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 klavoj)"
 
 #: ../rules/base.xml.in.h:152
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
 
 #: ../rules/base.xml.in.h:153
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (alternativa opcio)"
+msgid "Compose key position"
+msgstr "Pozicio de la klavo 'Compose'"
 
 #: ../rules/base.xml.in.h:154
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
+msgid "Control + Alt + Backspace"
+msgstr "Control + Alt + Backspace"
 
 #: ../rules/base.xml.in.h:155
-msgid "Cherry CyMotion Expert"
-msgstr "Cherry CyMotion Expert"
+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
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
+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
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
+msgid "Creative Desktop Wireless 7000"
+msgstr "Creative Desktop Wireless 7000"
 
 #: ../rules/base.xml.in.h:158
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internet Keyboard"
+msgid "Croatian"
+msgstr "Kroata"
 
 #: ../rules/base.xml.in.h:159
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
+msgid "Croatian (US keyboard with Croatian digraphs)"
+msgstr "Kroata (Usona klavaro kun kroataj duliteraĵoj)"
 
 #: ../rules/base.xml.in.h:160
-msgid "Chicony KU-0108"
-msgstr "Chicony KU-0108"
+msgid "Croatian (US keyboard with Croatian letters)"
+msgstr "Kroata (Usona klavaro kun kroataj literoj)"
 
 #: ../rules/base.xml.in.h:161
-msgid "Chicony KU-0420"
-msgstr "Chicony KU-0420"
+msgid "Croatian (Use Croatian digraphs)"
+msgstr "Kroata (Uzi kroatajn duliteraĵojn)"
 
 #: ../rules/base.xml.in.h:162
-msgid "China"
-msgstr "Ĉinujo"
+msgid "Croatian (Use guillemets for quotes)"
+msgstr "Kroata (Uzi angul-citilojn por citiloj)"
 
 #: ../rules/base.xml.in.h:163
-msgid "Chn"
-msgstr "Chn"
+msgid "Ctrl key position"
+msgstr "Pozicio de la klavo 'Ctrl'"
 
 #: ../rules/base.xml.in.h:164
-msgid "Chuvash"
-msgstr "Ĉuvaŝa"
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
 
 #: ../rules/base.xml.in.h:165
-msgid "Chuvash Latin"
-msgstr "Ĉuvaŝa Latine"
+msgid "Czech"
+msgstr "Ĉeĥa"
 
 #: ../rules/base.xml.in.h:166
-msgid "Classic"
-msgstr "Klasike"
+msgid "Czech (UCW layout accented letters only)"
+msgstr "Ĉeĥa (Aranĝo UCW, nur diakritaĵoj)"
 
 #: ../rules/base.xml.in.h:167
-msgid "Classic Dvorak"
-msgstr "Klasika Dvorako"
+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 "Classic, eliminate dead keys"
-msgstr "Klasika, forigi senpaŝajn klavojn"
+msgid "Czech (With &lt;\\|&gt; key)"
+msgstr "Ĉeĥa (Kun klavo &lt;\\|&gt;)"
 
 #: ../rules/base.xml.in.h:169
-msgid "Classmate PC"
-msgstr "Classmate PC"
+msgid "Czech (qwerty)"
+msgstr "Ĉeĥa (qwerty)"
 
 #: ../rules/base.xml.in.h:170
-msgid "CloGaelach"
-msgstr "CloGaelach"
+msgid "Czech (qwerty, extended Backslash)"
+msgstr "Ĉeĥa (qwerty, etendita Retroklino)"
 
 #: ../rules/base.xml.in.h:171
-msgid "Colemak"
-msgstr "Colemak"
+msgid "DTK2000"
+msgstr "DTK2000"
 
 #: ../rules/base.xml.in.h:172
-msgid "Colemak (Baybayin)"
-msgstr "Colemak (Baybayin)"
+msgid "Danish"
+msgstr "Dana"
 
 #: ../rules/base.xml.in.h:173
-msgid "Colemak (Latin)"
-msgstr "Colemak (Latina)"
+msgid "Danish (Dvorak)"
+msgstr "Dana (Dvorako)"
 
 #: ../rules/base.xml.in.h:174
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access Keyboard"
+msgid "Danish (Mac)"
+msgstr "Dana (Mac)"
 
 #: ../rules/base.xml.in.h:175
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet Keyboard (13 klavoj)"
+msgid "Danish (Mac, eliminate dead keys)"
+msgstr "Dana (Mac, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:176
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet Keyboard (18 klavoj)"
+msgid "Danish (eliminate dead keys)"
+msgstr "Dana (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:177
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet Keyboard (7 klavoj)"
+msgid "Default numeric keypad keys"
+msgstr "Implicitaj ciferoj en cifer-klavaro"
 
 #: ../rules/base.xml.in.h:178
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Keyboard"
+msgid "Dell"
+msgstr "Dell"
 
 #: ../rules/base.xml.in.h:179
-msgid "Compose key position"
-msgstr "Pozicio de la klavo 'Compose'"
+msgid "Dell 101-key PC"
+msgstr "Dell 101-klava PC"
 
 #: ../rules/base.xml.in.h:180
-msgid "Congo, Democratic Republic of the"
-msgstr "Kongo, Demokratia Respubliko de"
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 
 #: ../rules/base.xml.in.h:181
-msgid "Control + Alt + Backspace"
-msgstr "Control + Alt + Backspace"
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Laptop/notebook Precision M series"
 
 #: ../rules/base.xml.in.h:182
-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'"
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude series laptop"
 
 #: ../rules/base.xml.in.h:183
-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')"
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
 
 #: ../rules/base.xml.in.h:184
-msgid "Creative Desktop Wireless 7000"
-msgstr "Creative Desktop Wireless 7000"
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
 
 #: ../rules/base.xml.in.h:185
-msgid "Crimean Tatar (Dobruca-1 Q)"
-msgstr "Krime-tatara (Dobruca-1 Q)"
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
 
 #: ../rules/base.xml.in.h:186
-msgid "Crimean Tatar (Dobruca-2 Q)"
-msgstr "Krime-tatara (Dobruca-2 Q)"
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB Multimedia Keyboard"
 
 #: ../rules/base.xml.in.h:187
-msgid "Crimean Tatar (Turkish Alt-Q)"
-msgstr "Krime-tatara (Turka Alt-Q)"
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
 
 #: ../rules/base.xml.in.h:188
-msgid "Crimean Tatar (Turkish F)"
-msgstr "Krime-tatara (Turka F)"
+msgid "Dhivehi"
+msgstr "Mahla"
 
 #: ../rules/base.xml.in.h:189
-msgid "Crimean Tatar (Turkish Q)"
-msgstr "Krime-tatara (Turka Q)"
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 serio"
 
 #: ../rules/base.xml.in.h:190
-msgid "Croatia"
-msgstr "Kroata"
+msgid "Dutch"
+msgstr "Nederlanda"
 
 #: ../rules/base.xml.in.h:191
-msgid "Ctrl key position"
-msgstr "Pozicio de la klavo 'Ctrl'"
+msgid "Dutch (Mac)"
+msgstr "Nederlanda (Mac)"
 
 #: ../rules/base.xml.in.h:192
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Shift"
+msgid "Dutch (Sun dead keys)"
+msgstr "Nederlanda (Senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:193
-msgid "Cyrillic"
-msgstr "Cirila"
+msgid "Dutch (standard)"
+msgstr "Nederlanda (norma)"
 
 #: ../rules/base.xml.in.h:194
-msgid "Cyrillic with guillemets"
-msgstr "Cirila kun angul-citiloj"
+msgid "Dzongkha"
+msgstr "Dzonka"
 
 #: ../rules/base.xml.in.h:195
-msgid "Cyrillic, Z and ZHE swapped"
-msgstr "Cirila, Z kaj ZHE interŝanĝita"
+msgid "Enable extra typographic characters"
+msgstr "Ebligi kromajn tipografiajn signojn"
 
 #: ../rules/base.xml.in.h:196
-msgid "Cze"
-msgstr "Cze"
+msgid "English (Canada)"
+msgstr "Angla (Kanado)"
 
 #: ../rules/base.xml.in.h:197
-msgid "Czechia"
-msgstr "Ĉeĥa"
+msgid "English (Colemak)"
+msgstr "Angla (Colemak)"
 
 #: ../rules/base.xml.in.h:198
-msgid "DOS"
-msgstr "DOS"
+msgid "English (Dvorak alternative international no dead keys)"
+msgstr "Angla (Dvoraka alternativa internacia, neniu senpaŝa klavo)"
 
 #: ../rules/base.xml.in.h:199
-msgid "DTK2000"
-msgstr "DTK2000"
+msgid "English (Dvorak international with dead keys)"
+msgstr "Angla (Dvorak internacia kun senpaŝaj klavoj)"
 
 #: ../rules/base.xml.in.h:200
-msgid "Dead acute"
-msgstr "Senpaŝa dekstra korno"
+msgid "English (Dvorak)"
+msgstr "Angla (Dvorako)"
 
 #: ../rules/base.xml.in.h:201
-msgid "Dead grave acute"
-msgstr "Senpaŝa maldekstra korno"
+msgid "English (Ghana)"
+msgstr "Angla (Ganao)"
 
 #: ../rules/base.xml.in.h:202
-msgid "Default numeric keypad keys"
-msgstr "Implicitaj ciferoj en cifer-klavaro"
+msgid "English (Ghana, GILLBT)"
+msgstr "Angla (Ganao, GILLBT)"
 
 #: ../rules/base.xml.in.h:203
-msgid "Dell"
-msgstr "Dell"
+msgid "English (Ghana, multilingual)"
+msgstr "Angla (Ganao, plurlingva)"
 
 #: ../rules/base.xml.in.h:204
-msgid "Dell 101-key PC"
-msgstr "Dell 101-klava PC"
+msgid "English (India, with RupeeSign)"
+msgstr "Angla (Hindujo, kun RupiSigno)"
 
 #: ../rules/base.xml.in.h:205
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgid "English (Macintosh)"
+msgstr "Angla (Macintosh)"
 
 #: ../rules/base.xml.in.h:206
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Dell Laptop/notebook Precision M series"
+msgid "English (Mali, USA Mac)"
+msgstr "Angla (Malio , usona Mac)"
 
 #: ../rules/base.xml.in.h:207
-msgid "Dell Latitude series laptop"
-msgstr "Dell Latitude series laptop"
+msgid "English (Mali, USA international)"
+msgstr "Angla (Malio, usona internacia)"
 
 #: ../rules/base.xml.in.h:208
-msgid "Dell Precision M65"
-msgstr "Dell Precision M65"
+msgid "English (Nigeria)"
+msgstr "Angla (Niĝerio)"
 
 #: ../rules/base.xml.in.h:209
-msgid "Dell SK-8125"
-msgstr "Dell SK-8125"
+msgid "English (South Africa)"
+msgstr "Angla (Sud-Afriko)"
 
 #: ../rules/base.xml.in.h:210
-msgid "Dell SK-8135"
-msgstr "Dell SK-8135"
+msgid "English (UK)"
+msgstr "Angla (UK)"
 
 #: ../rules/base.xml.in.h:211
-msgid "Dell USB Multimedia Keyboard"
-msgstr "Dell USB Multimedia Keyboard"
+msgid "English (UK, Colemak)"
+msgstr "Angla (UK, Colemak)"
 
 #: ../rules/base.xml.in.h:212
-msgid "Denmark"
-msgstr "Danujo"
+msgid "English (UK, Dvorak UK punctuation)"
+msgstr "Angla (UK, Dvoraka interpunkcio de UK)"
 
 #: ../rules/base.xml.in.h:213
-msgid "Deu"
-msgstr "Deu"
+msgid "English (UK, Dvorak)"
+msgstr "Angla (UK, Dvoraka)"
 
 #: ../rules/base.xml.in.h:214
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop Keyboard"
+msgid "English (UK, Mac international)"
+msgstr "Angla (UK, internacia Mac)"
 
 #: ../rules/base.xml.in.h:215
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802 serio"
+msgid "English (UK, Mac)"
+msgstr "Angla (UK, Macintosh)"
 
 #: ../rules/base.xml.in.h:216
-msgid "Dnk"
-msgstr "Dnk"
+msgid "English (UK, extended, WinKeys)"
+msgstr "Angla (UK, etendite, Win-klavoj"
 
 #: ../rules/base.xml.in.h:217
-msgid "Dvorak"
-msgstr "Dvorako"
+msgid "English (UK, international with dead keys)"
+msgstr "Angla (UK, internacia kun senpaŝaj klavoj)"
 
 #: ../rules/base.xml.in.h:218
-msgid "Dvorak (Baybayin)"
-msgstr "Dvorako (Baybayin)"
+msgid "English (US)"
+msgstr "Angla (US)"
 
 #: ../rules/base.xml.in.h:219
-msgid "Dvorak (Latin)"
-msgstr "Dvorako (Latina)"
+msgid "English (US, alternative international)"
+msgstr "Angla (US, alternativa internacia)"
 
 #: ../rules/base.xml.in.h:220
-msgid "Dvorak (UK Punctuation)"
-msgstr "Dvorako (Interpunkcio de UK)"
+msgid "English (US, international with dead keys)"
+msgstr "Angla (US, internacia kun senpaŝaj klavoj)"
 
 #: ../rules/base.xml.in.h:221
-msgid "Dvorak alternative international (no dead keys)"
-msgstr "Dvoraka alternativa internacia (neniu senpaŝa klavo)"
+msgid "English (US, with euro on 5)"
+msgstr "Angla (US, kun eŭro ĉe 5)"
 
 #: ../rules/base.xml.in.h:222
-msgid "Dvorak international (with dead keys)"
-msgstr "Dvorak internacia (kun senpaŝaj klavoj)"
+msgid "English (classic Dvorak)"
+msgstr "Angla (klasika Dvorako)"
 
 #: ../rules/base.xml.in.h:223
-msgid "Dvorak, Polish quotes on key 1"
-msgstr "Dvorako, Polaj citiloj ĉe klavo 1"
+msgid "English (international AltGr dead keys)"
+msgstr "Angla (internacia kun senpaŝaj klavoj per AltGr)"
 
 #: ../rules/base.xml.in.h:224
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "Dvorako, Polaj citiloj ĉe citila klavo"
+msgid "English (layout toggle on multiply/divide key)"
+msgstr "Angla (baskuli aranĝon per la klavo multipliko/divido"
 
 #: ../rules/base.xml.in.h:225
-msgid "Eastern"
-msgstr "Orienta"
+msgid "English (left handed Dvorak)"
+msgstr "Angla (maldekstreca Dvorako)"
 
 #: ../rules/base.xml.in.h:226
-msgid "Eliminate dead keys"
-msgstr "Forigi senpaŝajn klavojn"
+msgid "English (programmer Dvorak)"
+msgstr "Angla (Dvorako por programistoj)"
 
 #: ../rules/base.xml.in.h:227
-msgid "Enable extra typographic characters"
-msgstr "Ebligi kromajn tipografiajn signojn"
+msgid "English (right handed Dvorak)"
+msgstr "Angla (dekstreca Dvorako)"
 
 #: ../rules/base.xml.in.h:228
-msgid "English"
-msgstr "Angla"
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
 
 #: ../rules/base.xml.in.h:229
-msgid "English (USA International)"
-msgstr "Angla (Usona internacia)"
+msgid "Enter on keypad"
+msgstr "Enen-klavo en ciferklavaro"
 
 #: ../rules/base.xml.in.h:230
-msgid "English (USA Macintosh)"
-msgstr "Angla (Usona Macintosh)"
+msgid "Esperanto"
+msgstr "Esperanto"
 
 #: ../rules/base.xml.in.h:231
-msgid "English with RupeeSign"
-msgstr "Angla kun RupiSigno"
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr "Esperanto (translokitaj punktokomo kaj citilo, malaktuale)"
 
 #: ../rules/base.xml.in.h:232
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
+msgid "Estonian"
+msgstr "Estona"
 
 #: ../rules/base.xml.in.h:233
-msgid "Enter on keypad"
-msgstr "Enen-klavo en ciferklavaro"
+msgid "Estonian (Dvorak)"
+msgstr "Estona (Dvorako)"
 
 #: ../rules/base.xml.in.h:234
-msgid "Epo"
-msgstr "Epo"
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr "Estona (Usona klavaro kun estonaj literoj)"
 
 #: ../rules/base.xml.in.h:235
-msgid "Ergonomic"
-msgstr "Ergonomia"
+msgid "Estonian (eliminate dead keys)"
+msgstr "Estona (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:236
-msgid "Esp"
-msgstr "Esp"
+msgid "Euro on 2"
+msgstr "EŭroSigno ĉe 2"
 
 #: ../rules/base.xml.in.h:237
-msgid "Esperanto"
-msgstr "Esperanto"
+msgid "Euro on 4"
+msgstr "EŭroSigno ĉe 4"
 
 #: ../rules/base.xml.in.h:238
-msgid "Est"
-msgstr "Est"
+msgid "Euro on 5"
+msgstr "EŭroSigno ĉe 5"
 
 #: ../rules/base.xml.in.h:239
-msgid "Estonia"
-msgstr "Estonujo"
+msgid "Euro on E"
+msgstr "EŭroSigno ĉe E"
 
 #: ../rules/base.xml.in.h:240
-msgid "Eth"
-msgstr "Eth"
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
 
 #: ../rules/base.xml.in.h:241
-msgid "Ethiopia"
-msgstr "Etiopujo"
+msgid "Ewe"
+msgstr "Ewe"
 
 #: ../rules/base.xml.in.h:242
-msgid "Euro on 2"
-msgstr "EŭroSigno ĉe 2"
+msgid "FL90"
+msgstr "FL90"
 
 #: ../rules/base.xml.in.h:243
-msgid "Euro on 4"
-msgstr "EŭroSigno ĉe 4"
+msgid "Faroese"
+msgstr "Feroa"
 
 #: ../rules/base.xml.in.h:244
-msgid "Euro on 5"
-msgstr "EŭroSigno ĉe 5"
+msgid "Faroese (eliminate dead keys)"
+msgstr "Feroa (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:245
-msgid "Euro on E"
-msgstr "EŭroSigno ĉe E"
+msgid "Filipino"
+msgstr "Filipina"
 
 #: ../rules/base.xml.in.h:246
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr "Filipina (Capewell-Dvorako, Baybayin)"
 
 #: ../rules/base.xml.in.h:247
-msgid "Ewe"
-msgstr "Ewe"
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr "Filipina (Capewell-Dvorako, Latina)"
 
 #: ../rules/base.xml.in.h:248
-msgid "Extended"
-msgstr "Etendite"
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr "Filipina (Capewell-QWERF 2006, Baybayin)"
 
 #: ../rules/base.xml.in.h:249
-msgid "Extended - Winkeys"
-msgstr "Etendite - Win-klavoj"
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr "Filipina (Capewell-QWERF 2006, Latina)"
 
 #: ../rules/base.xml.in.h:250
-msgid "Extended Backslash"
-msgstr "Etendita Retroklino"
+msgid "Filipino (Colemak Baybayin)"
+msgstr "Filipina (Colemak, Baybayin)"
 
 #: ../rules/base.xml.in.h:251
-msgid "F-letter (F) variant"
-msgstr "F-litero (F) variaĵo"
+msgid "Filipino (Colemak Latin)"
+msgstr "Filipina (Colemak, latina)"
 
 #: ../rules/base.xml.in.h:252
-msgid "FL90"
-msgstr "FL90"
+msgid "Filipino (Dvorak Latin)"
+msgstr "Filipina (Dvorako, latina)"
 
 #: ../rules/base.xml.in.h:253
-msgid "Faroe Islands"
-msgstr "Ferooj"
+msgid "Filipino (QWERTY Baybayin)"
+msgstr "Filipina (QWERTY, Baybayin)"
 
 #: ../rules/base.xml.in.h:254
-msgid "Fin"
-msgstr "Fin"
+msgid "Finnish"
+msgstr "Finna"
 
 #: ../rules/base.xml.in.h:255
-msgid "Finland"
-msgstr "Finlando"
+msgid "Finnish (Mac)"
+msgstr "Finna (Mac)"
+
+#: ../rules/base.xml.in.h:256
+msgid "Finnish (classic)"
+msgstr "Finna (klasika)"
+
+#: ../rules/base.xml.in.h:257
+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:258
+#: ../rules/base.xml.in.h:261
 msgid "Four-level key with abstract separators"
 msgstr "Kvar-nivela klavo kun abstraktaj apartigiloj"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:262
 msgid "Four-level key with comma"
 msgstr "Kvar-nivela klavo kun komo"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:263
 msgid "Four-level key with dot"
 msgstr "Kvar-nivela klavo kun punkto"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:264
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Kvar-nivela klavo kun punkto, limigite al latin-9"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:265
 msgid "Four-level key with momayyez"
 msgstr "Kvar-nivela klavo kun 'momayyez'"
 
-#: ../rules/base.xml.in.h:263
-msgid "Fra"
-msgstr "Fra"
-
-#: ../rules/base.xml.in.h:264
-msgid "France"
-msgstr "Francujo"
-
-#: ../rules/base.xml.in.h:265
-msgid "Français (France Alternative)"
-msgstr "Français (Franca Alternativa)"
-
 #: ../rules/base.xml.in.h:266
 msgid "French"
 msgstr "Franca"
 
 #: ../rules/base.xml.in.h:267
-msgid "French (Macintosh)"
-msgstr "Franca (Macintosh)"
+msgid "French (Bepo, ergonomic, Dvorak way)"
+msgstr "Franca (Bepo, komforteca, Dvorake)"
 
 #: ../rules/base.xml.in.h:268
-msgid "French (legacy)"
-msgstr "Franca (malmoderna)"
+msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
+msgstr "Franca (Bepo, komforteca, Dvorake, nur latin-9)"
 
 #: ../rules/base.xml.in.h:269
-msgid "French Dvorak"
-msgstr "Franca Dvorako"
+msgid "French (Breton)"
+msgstr "Franca (Bretona)"
 
 #: ../rules/base.xml.in.h:270
-msgid "French, Sun dead keys"
-msgstr "Franca, senpaŝaj klavoj de 'Sun'"
+msgid "French (Canada, Dvorak)"
+msgstr "Franca (Kanado, Dvorako)"
 
 #: ../rules/base.xml.in.h:271
-msgid "French, eliminate dead keys"
-msgstr "Franca, forigi senpaŝajn klavojn"
+msgid "French (Canada, legacy)"
+msgstr "Franca (Kanado, malmoderna)"
 
 #: ../rules/base.xml.in.h:272
-msgid "Fro"
-msgstr "Fro"
+msgid "French (Democratic Republic of the Congo)"
+msgstr "Franca (Demokratia Respubliko de Kongo)"
 
 #: ../rules/base.xml.in.h:273
-msgid "Fujitsu-Siemens Computers AMILO laptop"
-msgstr "Tekokomputilo Fujitsu-Siemens Computers AMILO"
+msgid "French (Dvorak)"
+msgstr "Franca (Dvorako)"
 
 #: ../rules/base.xml.in.h:274
-msgid "Fula"
-msgstr "Fula"
+msgid "French (Georgian AZERTY Tskapo)"
+msgstr "Franca (Kartvela AZERTY Tskapo)"
 
 #: ../rules/base.xml.in.h:275
-msgid "GBr"
-msgstr "GBr"
+msgid "French (Guinea)"
+msgstr "Franca (Gvineo)"
 
 #: ../rules/base.xml.in.h:276
-msgid "GILLBT"
-msgstr "GILLBT"
+msgid "French (Mac)"
+msgstr "Franca (Mac)"
 
 #: ../rules/base.xml.in.h:277
-msgid "Ga"
-msgstr "Ga"
+msgid "French (Mali, alternative)"
+msgstr "Franca (Malio, alternativa)"
 
 #: ../rules/base.xml.in.h:278
-msgid "Generic 101-key PC"
-msgstr "Ĝenerala 101-klava PC"
+msgid "French (Morocco)"
+msgstr "Franca (Maroko)"
 
 #: ../rules/base.xml.in.h:279
-msgid "Generic 102-key (Intl) PC"
-msgstr "Ĝenerala 102-klava (Intl) PC"
+msgid "French (Occitan)"
+msgstr "Franca (Okcitana)"
 
 #: ../rules/base.xml.in.h:280
-msgid "Generic 104-key PC"
-msgstr "Ĝenerala 104-klava PC"
+msgid "French (Sun dead keys)"
+msgstr "Franca (senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:281
-msgid "Generic 105-key (Intl) PC"
-msgstr "Ĝenerala 105-klava (Intl) PC"
+msgid "French (Switzerland)"
+msgstr "Franca (Svislando)"
 
 #: ../rules/base.xml.in.h:282
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+msgid "French (Switzerland, Mac)"
+msgstr "Franca (Svislando, Mac)"
 
 #: ../rules/base.xml.in.h:283
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgid "French (Switzerland, Sun dead keys)"
+msgstr "Franca (Svislando, senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:284
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
+msgid "French (Switzerland, eliminate dead keys)"
+msgstr "Franca (Svislando, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:285
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
+msgid "French (alternative)"
+msgstr "Franca (alternativa)"
 
 #: ../rules/base.xml.in.h:286
-msgid "Genius KKB-2050HS"
-msgstr "Genius KKB-2050HS"
+msgid "French (alternative, Sun dead keys)"
+msgstr "Franca (alternava, senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:287
-msgid "Geo"
-msgstr "Geo"
+msgid "French (alternative, eliminate dead keys)"
+msgstr "Franca (alternativa, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:288
-msgid "Georgia"
-msgstr "Kartvelujo"
+msgid "French (alternative, latin-9 only)"
+msgstr "Franca (alternativa, nur latin-9)"
 
 #: ../rules/base.xml.in.h:289
-msgid "Georgian"
-msgstr "Kartvela"
+msgid "French (eliminate dead keys)"
+msgstr "Franca (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:290
-msgid "Georgian AZERTY Tskapo"
-msgstr "Kartvela AZERTY Tskapo"
+msgid "French (legacy alternative)"
+msgstr "Franca (malmoderna alternativa)"
 
 #: ../rules/base.xml.in.h:291
-msgid "German (Macintosh)"
-msgstr "Germana (Macintosh)"
+msgid "French (legacy, alternative, Sun dead keys)"
+msgstr "Franca (malmoderna, alternativa, senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:292
-msgid "German, Sun dead keys"
-msgstr "Germana, senpaŝaj klavoj de 'Sun'"
+msgid "French (legacy, alternative, eliminate dead keys)"
+msgstr "Franca (malmoderna, alternativa, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:293
-msgid "German, eliminate dead keys"
-msgstr "Germana, forigi senpaŝajn klavojn"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Tekokomputilo Fujitsu-Siemens Computers AMILO"
 
 #: ../rules/base.xml.in.h:294
-msgid "Germany"
-msgstr "Germanujo"
+msgid "Fula"
+msgstr "Fula"
 
 #: ../rules/base.xml.in.h:295
-msgid "Gha"
-msgstr "Gha"
+msgid "GBr"
+msgstr "GBr"
 
 #: ../rules/base.xml.in.h:296
-msgid "Ghana"
-msgstr "Ganao"
+msgid "Ga"
+msgstr "Ga"
 
 #: ../rules/base.xml.in.h:297
-msgid "Gin"
-msgstr "Gin"
+msgid "Generic 101-key PC"
+msgstr "Ĝenerala 101-klava PC"
 
 #: ../rules/base.xml.in.h:298
-msgid "Grc"
-msgstr "Grc"
+msgid "Generic 102-key (Intl) PC"
+msgstr "Ĝenerala 102-klava (Intl) PC"
 
 #: ../rules/base.xml.in.h:299
-msgid "Greece"
-msgstr "Grekujo"
+msgid "Generic 104-key PC"
+msgstr "Ĝenerala 104-klava PC"
 
 #: ../rules/base.xml.in.h:300
-msgid "Guinea"
-msgstr "Gvineo"
+msgid "Generic 105-key (Intl) PC"
+msgstr "Ĝenerala 105-klava (Intl) PC"
 
 #: ../rules/base.xml.in.h:301
-msgid "Gujarati"
-msgstr "Guĝarata"
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
 
 #: ../rules/base.xml.in.h:302
-msgid "Gurmukhi"
-msgstr "Gurmukia"
+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
-msgid "Gurmukhi Jhelum"
-msgstr "Gurmukia de Jhelum"
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
 
 #: ../rules/base.xml.in.h:304
-msgid "Gyration"
-msgstr "Gyration"
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
 
 #: ../rules/base.xml.in.h:305
-msgid "HTC Dream"
-msgstr "HTC Dream"
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
 
 #: ../rules/base.xml.in.h:306
-msgid "Happy Hacking Keyboard"
-msgstr "Happy Hacking Keyboard"
+msgid "Georgian"
+msgstr "Kartvela"
 
 #: ../rules/base.xml.in.h:307
-msgid "Happy Hacking Keyboard for Mac"
-msgstr "Happy Hacking Keyboard por Mac"
+msgid "Georgian (MESS)"
+msgstr "Kartvela (MESS)"
 
 #: ../rules/base.xml.in.h:308
-msgid "Hausa"
-msgstr "Haŭsa"
+msgid "Georgian (Ossetian)"
+msgstr "Kartvela (Oseta)"
 
 #: ../rules/base.xml.in.h:309
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet Keyboard"
+msgid "Georgian (ergonomic)"
+msgstr "Kartvela (komforteca)"
 
 #: ../rules/base.xml.in.h:310
-msgid "Hewlett-Packard Mini 110 Notebook"
-msgstr "Hewlett-Packard Mini 110 Notebook"
+msgid "German"
+msgstr "Germana"
 
 #: ../rules/base.xml.in.h:311
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
+msgid "German (Austria)"
+msgstr "Germana (Aŭstrujo)"
 
 #: ../rules/base.xml.in.h:312
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
+msgid "German (Austria, Mac)"
+msgstr "Germana (Aŭstrujo, Mac)"
 
 #: ../rules/base.xml.in.h:313
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
+msgid "German (Austria, Sun dead keys)"
+msgstr "Germana (Aŭstrujo, senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:314
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
+msgid "German (Austria, eliminate dead keys)"
+msgstr "Germana (Aŭstrujo, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:315
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
+msgid "German (Dvorak)"
+msgstr "Germana (Dvorako)"
 
 #: ../rules/base.xml.in.h:316
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
+msgid "German (Mac)"
+msgstr "Germana (Mac)"
 
 #: ../rules/base.xml.in.h:317
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
+msgid "German (Mac, eliminate dead keys)"
+msgstr "Germana (Mac, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:318
-msgid "Hewlett-Packard Pavilion dv5"
-msgstr "Hewlett-Packard Pavilion dv5"
+msgid "German (Neo 2)"
+msgstr "Germana (Neo 2)"
 
 #: ../rules/base.xml.in.h:319
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgid "German (Romanian keyboard with German letters)"
+msgstr "Germana (Rumana klavaro kun germanaj literoj)"
 
 #: ../rules/base.xml.in.h:320
-msgid "Hewlett-Packard nx9020"
-msgstr "Hewlett-Packard nx9020"
+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
-msgid "Hexadecimal"
-msgstr "Deksesume"
+msgid "German (Sun dead keys)"
+msgstr "Germana (senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:322
-msgid "Hindi Bolnagri"
-msgstr "Hinda per Bolnagri"
+msgid "German (Switzerland, Mac)"
+msgstr "Germana (Svislando, Mac)"
 
 #: ../rules/base.xml.in.h:323
-msgid "Hindi Wx"
-msgstr "Hinda Wx"
+msgid "German (Switzerland, Sun dead keys)"
+msgstr "Germana (Svislando, senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:324
-msgid "Homophonic"
-msgstr "Homofonia"
+msgid "German (Switzerland, eliminate dead keys)"
+msgstr "Germana (Svislando, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:325
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
+msgid "German (dead acute)"
+msgstr "Germana (senpaŝa dekstra korno)"
 
 #: ../rules/base.xml.in.h:326
-msgid "Hrv"
-msgstr "Hrv"
+msgid "German (dead grave acute)"
+msgstr "Germana (senpaŝa maldekstra/dekstra korno)"
 
 #: ../rules/base.xml.in.h:327
-msgid "Htc Dream phone"
-msgstr "Htc Dream - telefono"
+msgid "German (eliminate dead keys)"
+msgstr "Germana (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:328
-msgid "Hun"
-msgstr "Hun"
+msgid "German (lower Sorbian qwertz)"
+msgstr "Germana (malsupra Soraba qwertz)"
 
 #: ../rules/base.xml.in.h:329
-msgid "Hungary"
-msgstr "Hungarujo"
+msgid "German (lower Sorbian)"
+msgstr "Germana (malsupra Soraba)"
 
 #: ../rules/base.xml.in.h:330
-msgid "Hyper is mapped to Win-keys"
-msgstr "'Hyper' estas mapita al la klavoj 'Win'"
+msgid "German (qwerty)"
+msgstr "Germana (qwerty)"
 
 #: ../rules/base.xml.in.h:331
-msgid "IBM (LST 1205-92)"
-msgstr "IBM (LST 1205-92)"
+msgid "Greek"
+msgstr "Greka"
 
 #: ../rules/base.xml.in.h:332
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
+msgid "Greek (eliminate dead keys)"
+msgstr "Greka (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:333
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
+msgid "Greek (extended)"
+msgstr "Greka (etendite)"
 
 #: ../rules/base.xml.in.h:334
-msgid "IBM Space Saver"
-msgstr "IBM Space Saver"
+msgid "Greek (polytonic)"
+msgstr "Greka (plurtona)"
 
 #: ../rules/base.xml.in.h:335
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+msgid "Greek (simple)"
+msgstr "Greka (simpla)"
 
 #: ../rules/base.xml.in.h:336
-msgid "IBM ThinkPad R60/T60/R61/T61"
-msgstr "IBM ThinkPad R60/T60/R61/T61"
+msgid "Gujarati"
+msgstr "Guĝarata"
 
 #: ../rules/base.xml.in.h:337
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgid "Gyration"
+msgstr "Gyration"
 
 #: ../rules/base.xml.in.h:338
-msgid "ISO Alternate"
-msgstr "Alternativa ISO"
+msgid "HTC Dream"
+msgstr "HTC Dream"
 
 #: ../rules/base.xml.in.h:339
-msgid "Iceland"
-msgstr "Islando"
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking Keyboard"
 
 #: ../rules/base.xml.in.h:340
-msgid "Igbo"
-msgstr "Igbo"
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking Keyboard por Mac"
 
 #: ../rules/base.xml.in.h:341
-msgid "Include dead tilde"
-msgstr "Inkluzivi senpaŝan tildon"
+msgid "Hausa"
+msgstr "Haŭsa"
 
 #: ../rules/base.xml.in.h:342
-msgid "Ind"
-msgstr "Ind"
+msgid "Hebrew"
+msgstr "Hebrea"
 
 #: ../rules/base.xml.in.h:343
-msgid "India"
-msgstr "Bharato"
+msgid "Hebrew (Phonetic)"
+msgstr "Hebrea (Fonetika)"
 
 #: ../rules/base.xml.in.h:344
-msgid "International (AltGr dead keys)"
-msgstr "Internacia (senpaŝaj klavoj per 'AltGr')"
+msgid "Hebrew (Tiro)"
+msgstr "Hebrea (Tiro)"
 
 #: ../rules/base.xml.in.h:345
-msgid "International (with dead keys)"
-msgstr "Internacia (senpaŝaj klavoj)"
+msgid "Hebrew (lyx)"
+msgstr "Hebrea (lyx)"
 
 #: ../rules/base.xml.in.h:346
-msgid "Inuktitut"
-msgstr "Inuita"
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
 
-#: ../rules/base.xml.in.h:347 ../rules/base.extras.xml.in.h:8
-msgid "Iran"
-msgstr "Irano"
+#: ../rules/base.xml.in.h:347
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook"
 
 #: ../rules/base.xml.in.h:348
-msgid "Iraq"
-msgstr "Irako"
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
 
 #: ../rules/base.xml.in.h:349
-msgid "Ireland"
-msgstr "Irlando"
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
 
 #: ../rules/base.xml.in.h:350
-msgid "Irl"
-msgstr "Irl"
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
 
 #: ../rules/base.xml.in.h:351
-msgid "Irn"
-msgstr "Irn"
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
 
 #: ../rules/base.xml.in.h:352
-msgid "Irq"
-msgstr "Irq"
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
 
 #: ../rules/base.xml.in.h:353
-msgid "Isl"
-msgstr "Isl"
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
 
 #: ../rules/base.xml.in.h:354
-msgid "Isr"
-msgstr "Isr"
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
 
 #: ../rules/base.xml.in.h:355
-msgid "Israel"
-msgstr "Israelo"
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
 
 #: ../rules/base.xml.in.h:356
-msgid "Ita"
-msgstr "Ita"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x Multimedia Keyboard"
 
 #: ../rules/base.xml.in.h:357
-msgid "Italy"
-msgstr "Italujo"
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
 
 #: ../rules/base.xml.in.h:358
-msgid "Japan"
-msgstr "Nipono"
+msgid "Hexadecimal"
+msgstr "Deksesume"
 
 #: ../rules/base.xml.in.h:359
-msgid "Japan (PC-98xx Series)"
-msgstr "Nipono (Serio PC-98xx)"
+msgid "Hindi (Bolnagri)"
+msgstr "Hinda (Bolnagri)"
 
 #: ../rules/base.xml.in.h:360
-msgid "Japanese keyboard options"
-msgstr "Opcioj de nipona klavaro"
+msgid "Hindi (Wx)"
+msgstr "Hinda (Wx)"
 
 #: ../rules/base.xml.in.h:361
-msgid "Jpn"
-msgstr "Jpn"
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
 
 #: ../rules/base.xml.in.h:362
-msgid "Kalmyk"
-msgstr "Kalmyk"
+msgid "Htc Dream phone"
+msgstr "Htc Dream - telefono"
 
 #: ../rules/base.xml.in.h:363
-msgid "Kana"
-msgstr "Kanao"
+msgid "Hungarian"
+msgstr "Hungara"
 
 #: ../rules/base.xml.in.h:364
-msgid "Kana 86"
-msgstr "Kanao 86"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr "Hungara (101/qwerty/komo/senpaŝaj klavoj)"
 
 #: ../rules/base.xml.in.h:365
-msgid "Kana Lock key is locking"
-msgstr "Kanaa klavo 'Lock' ŝlosigas"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr "Hungara (101/qwerty/komo/forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:366
-msgid "Kannada"
-msgstr "Kanara"
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr "Hungara (101/qwerty/punkto/senpaŝaj klavoj)"
 
 #: ../rules/base.xml.in.h:367
-msgid "Kashubian"
-msgstr "Kaŝuba"
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr "Hungara (101/qwerty/punkto/forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:368
-msgid "Kaz"
-msgstr "Kaz"
+msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgstr "Hungara (101/qwertz/komo/senpaŝaj klavoj)"
 
 #: ../rules/base.xml.in.h:369
-msgid "Kazakh with Russian"
-msgstr "Kazaĥa kaj Rusa"
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr "Hungara (101/qwertz/komo/forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:370
-msgid "Kazakhstan"
-msgstr "Kazaĥujo"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgstr "Hungara (101/qwertz/punkto/senpaŝaj klavoj)"
 
 #: ../rules/base.xml.in.h:371
-msgid "Ken"
-msgstr "Ken"
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr "Hungara (101/qwertz/punkto/forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:372
-msgid "Kenya"
-msgstr "Kenjo"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgstr "Hungara (102/qwerty/komo/senpaŝaj klavoj)"
 
 #: ../rules/base.xml.in.h:373
-msgid "Key sequence to kill the X server"
-msgstr "Klav-sekvo por formortigi la X-servilon"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgstr "Hungara (102/qwerty/komo/forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:374
-msgid "Key to choose 3rd level"
-msgstr "Klavo por elekti 3-an nivelon"
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr "Hungara (102/qwerty/punkto/senpaŝaj klavoj)"
 
 #: ../rules/base.xml.in.h:375
-msgid "Key to choose 5th level"
-msgstr "Klavo por elekti 5-an nivelon"
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgstr "Hungara (102/qwerty/punkto/forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:376
-msgid "Key(s) to change layout"
-msgstr "Klavo(j) por ŝanĝi la aranĝon"
+msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgstr "Hungara (102/qwertz/komo/senpaŝaj klavoj)"
 
 #: ../rules/base.xml.in.h:377
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgstr "Hungara (102/qwertz/komo/forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:378
-msgid "Kgz"
-msgstr "Kgz"
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr "Hungara (102/qwertz/punkto/senpaŝaj klavoj)"
 
 #: ../rules/base.xml.in.h:379
-msgid "Khm"
-msgstr "Khm"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr "Hungara (102/qwertz/punkto/forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:380
-msgid "Kikuyu"
-msgstr "Kikuyu"
+msgid "Hungarian (eliminate dead keys)"
+msgstr "Hungara (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:381
-msgid "Kinesis"
-msgstr "Kinesis"
+msgid "Hungarian (qwerty)"
+msgstr "Hungara (qwerty)"
 
 #: ../rules/base.xml.in.h:382
-msgid "Komi"
-msgstr "Komia"
+msgid "Hungarian (standard)"
+msgstr "Hungara (norma)"
 
 #: ../rules/base.xml.in.h:383
-msgid "Kor"
-msgstr "Kor"
+msgid "Hyper is mapped to Win-keys"
+msgstr "'Hyper' estas mapita al la klavoj 'Win'"
 
 #: ../rules/base.xml.in.h:384
-msgid "Korea, Republic of"
-msgstr "Koreujo, Respubliko de"
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
 
 #: ../rules/base.xml.in.h:385
-msgid "Ktunaxa"
-msgstr "Ktunaxa"
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
 
 #: ../rules/base.xml.in.h:386
-msgid "Kurdish, (F)"
-msgstr "Kurda, (F)"
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
 
 #: ../rules/base.xml.in.h:387
-msgid "Kurdish, Arabic-Latin"
-msgstr "Kurda, Araba-Latina"
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:388
-msgid "Kurdish, Latin Alt-Q"
-msgstr "Kurda, Latina Alt-Q"
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
 
 #: ../rules/base.xml.in.h:389
-msgid "Kurdish, Latin Q"
-msgstr "Kurda, Lania Q"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
 #: ../rules/base.xml.in.h:390
-msgid "Kyrgyzstan"
-msgstr "Kirgizujo"
+msgid "Icelandic"
+msgstr "Islanda"
 
 #: ../rules/base.xml.in.h:391
-msgid "LEKP"
-msgstr "LEKP"
+msgid "Icelandic (Dvorak)"
+msgstr "Islanda (Dvorako)"
 
 #: ../rules/base.xml.in.h:392
-msgid "LEKPa"
-msgstr "LEKPa"
+msgid "Icelandic (Mac)"
+msgstr "Islanda (Mac)"
 
 #: ../rules/base.xml.in.h:393
-msgid "Lao"
-msgstr "Lao"
+msgid "Icelandic (Sun dead keys)"
+msgstr "Islanda (senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:394
-msgid "Laos"
-msgstr "Laoso"
+msgid "Icelandic (eliminate dead keys)"
+msgstr "Islanda (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:395
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgid "Igbo"
+msgstr "Igbo"
 
 #: ../rules/base.xml.in.h:396
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgid "Indian"
+msgstr "Hinda"
 
 #: ../rules/base.xml.in.h:397
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "Laptop/notebook eMachines m68xx"
+msgid "Inuktitut"
+msgstr "Inuita"
 
 #: ../rules/base.xml.in.h:398
-msgid "Latin"
-msgstr "Latineca"
+msgid "Iraqi"
+msgstr "Iraka"
 
 #: ../rules/base.xml.in.h:399
-msgid "Latin American"
-msgstr "Latin-amerika"
+msgid "Irish"
+msgstr "Irlanda"
 
 #: ../rules/base.xml.in.h:400
-msgid "Latin Unicode"
-msgstr "Latineca Unikoda"
+msgid "Irish (CloGaelach)"
+msgstr "Irlanda (CloGaelach)"
 
 #: ../rules/base.xml.in.h:401
-msgid "Latin Unicode qwerty"
-msgstr "Latineca Unikoda qwerty"
+msgid "Irish (Ogham IS434)"
+msgstr "Irlanda (Ogamo IS434)"
 
 #: ../rules/base.xml.in.h:402
-msgid "Latin qwerty"
-msgstr "Latineca qwerty"
+msgid "Irish (Ogham)"
+msgstr "Irlanda (Ogamo)"
 
 #: ../rules/base.xml.in.h:403
-msgid "Latin unicode"
-msgstr "Latineca unikoda"
+msgid "Irish (UnicodeExpert)"
+msgstr "Irlanda (UnicodeExpert)"
 
 #: ../rules/base.xml.in.h:404
-msgid "Latin unicode qwerty"
-msgstr "Latineca unikoda qwerty"
+msgid "Italian"
+msgstr "Itala"
 
 #: ../rules/base.xml.in.h:405
-msgid "Latin with guillemets"
-msgstr "Latineca kun angul-citiloj"
+msgid "Italian (Georgian)"
+msgstr "Itala (Kartvela)"
 
 #: ../rules/base.xml.in.h:406
-msgid "Latvia"
-msgstr "Latvujo"
+msgid "Italian (Mac)"
+msgstr "Itala (Mac)"
 
 #: ../rules/base.xml.in.h:407
-msgid "Layout toggle on multiply/divide key"
-msgstr "Aranĝ-alternado en la klavo multipliko/divido"
+msgid "Italian (US keyboard with Italian letters)"
+msgstr "Itala (usona klavaro kun italaj literoj)"
 
 #: ../rules/base.xml.in.h:408
-msgid "Left Alt"
-msgstr "Maldekstra Alt"
+msgid "Italian (eliminate dead keys)"
+msgstr "Itala (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:409
-msgid "Left Alt (while pressed)"
-msgstr "Maldekstra 'Alt' (dum premata)"
+msgid "Japanese"
+msgstr "Nipona"
 
 #: ../rules/base.xml.in.h:410
-msgid "Left Alt is swapped with Left Win"
-msgstr "La maldekstra 'Alt' estas permutita kun la maldekstra klavo 'Win'"
+msgid "Japanese (Kana 86)"
+msgstr "Nipona (Kanao 86)"
 
 #: ../rules/base.xml.in.h:411
-msgid "Left Ctrl"
-msgstr "Maldekstra Ctrl"
+msgid "Japanese (Kana)"
+msgstr "Nipona (Kanao)"
 
 #: ../rules/base.xml.in.h:412
-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)"
+msgid "Japanese (Mac)"
+msgstr "Nipono (Mac)"
 
 #: ../rules/base.xml.in.h:413
-msgid "Left Ctrl+Left Shift"
-msgstr "Maldekstra Ctrl+Maldekstra Shift"
+msgid "Japanese (OADG 109A)"
+msgstr "Nipona (OADG 109A)"
 
 #: ../rules/base.xml.in.h:414
-msgid "Left Shift"
-msgstr "Maldekstra Shift"
+msgid "Japanese (PC-98xx Series)"
+msgstr "Nipona (Serio PC-98xx)"
 
 #: ../rules/base.xml.in.h:415
-msgid "Left Win"
-msgstr "Maldekstra Win"
+msgid "Japanese keyboard options"
+msgstr "Opcioj de nipona klavaro"
 
 #: ../rules/base.xml.in.h:416
-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)"
+msgid "Kana Lock key is locking"
+msgstr "Kanaa klavo 'Lock' ŝlosigas"
 
 #: ../rules/base.xml.in.h:417
-msgid "Left Win (while pressed)"
-msgstr "Maldekstra Win (dum premata)"
+msgid "Kannada"
+msgstr "Kanara"
 
 #: ../rules/base.xml.in.h:418
-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"
+msgid "Kazakh"
+msgstr "Kazaĥa"
 
 #: ../rules/base.xml.in.h:419
-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"
+msgid "Kazakh (with Russian)"
+msgstr "Kazaĥa (kun Rusa)"
 
 #: ../rules/base.xml.in.h:420
-msgid "Left hand"
-msgstr "Maldekstra mano"
+msgid "Key sequence to kill the X server"
+msgstr "Klav-sekvo por formortigi la X-servilon"
 
 #: ../rules/base.xml.in.h:421
-msgid "Left handed Dvorak"
-msgstr "Maldekstreca Dvorako"
+msgid "Key to choose 3rd level"
+msgstr "Klavo por elekti 3-an nivelon"
 
 #: ../rules/base.xml.in.h:422
-msgid "Legacy"
-msgstr "Malmoderna"
+msgid "Key to choose 5th level"
+msgstr "Klavo por elekti 5-an nivelon"
 
 #: ../rules/base.xml.in.h:423
-msgid "Legacy Wang 724"
-msgstr "Malmoderna Wang 724"
+msgid "Key(s) to change layout"
+msgstr "Klavo(j) por ŝanĝi la aranĝon"
+
+#: ../rules/base.xml.in.h:424
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
 
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:425
-msgid "Legacy key with comma"
-msgstr "Malmoderna klavo kun komo"
+msgid "Khmer (Cambodian)"
+msgstr "Kmera (Kamboĝa)"
 
 #: ../rules/base.xml.in.h:426
-msgid "Legacy key with dot"
-msgstr "Malmoderna klavo kun punkto"
+msgid "Kikuyu"
+msgstr "Kikuyu"
 
 #: ../rules/base.xml.in.h:427
-msgid "Lithuania"
-msgstr "Litovujo"
+msgid "Kinesis"
+msgstr "Kinesis"
 
 #: ../rules/base.xml.in.h:428
-msgid "Lka"
-msgstr "Lka"
+msgid "Korean"
+msgstr "Korea"
 
 #: ../rules/base.xml.in.h:429
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Keyboard"
+msgid "Korean (101/104 key compatible)"
+msgstr "Korea (kongrua al 101/104 klavoj)"
 
 #: ../rules/base.xml.in.h:430
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
+msgid "Kurdish (Iran, Arabic-Latin)"
+msgstr "Kurda (Irano, Araba-Latina)"
 
 #: ../rules/base.xml.in.h:431
-msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "Logitech Cordless Desktop (alternativa opcio)"
+msgid "Kurdish (Iran, F)"
+msgstr "Kurda, (Irano, F)"
 
 #: ../rules/base.xml.in.h:432
-msgid "Logitech Cordless Desktop EX110"
-msgstr "Logitech Cordless Desktop EX110"
+msgid "Kurdish (Iran, Latin Q)"
+msgstr "Kurda, (Irano, Latina Q)"
 
 #: ../rules/base.xml.in.h:433
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300"
+msgid "Kurdish (Iran, latin alt-Q)"
+msgstr "Kurda (Iran, Latina Alt-Q)"
 
 #: ../rules/base.xml.in.h:434
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
+msgid "Kurdish (Iraq, Arabic-Latin)"
+msgstr "Kurda (Irako, Araba-Latina)"
 
 #: ../rules/base.xml.in.h:435
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
+msgid "Kurdish (Iraq, F)"
+msgstr "Kurda, (Irako, F)"
 
 #: ../rules/base.xml.in.h:436
-msgid "Logitech Cordless Desktop Pro (alternate option 2)"
-msgstr "Logitech Cordless Desktop Pro (alternativa opcio 2)"
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr "Kurda (Irako, Latina Alt-Q)"
 
 #: ../rules/base.xml.in.h:437
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
+msgid "Kurdish (Iraq, Latin Q)"
+msgstr "Kurda (Irako, Latina Q)"
 
 #: ../rules/base.xml.in.h:438
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
+msgid "Kurdish (Syria, F)"
+msgstr "Kurda (Sirio, F)"
 
 #: ../rules/base.xml.in.h:439
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15 extra keys via G15daemon"
+msgid "Kurdish (Syria, Latin Alt-Q)"
+msgstr "Kurda (Sirio, Latina Alt-Q)"
 
 #: ../rules/base.xml.in.h:440
-msgid "Logitech Generic Keyboard"
-msgstr "Logitech - Ĝenerala Klavaro"
+msgid "Kurdish (Syria, Latin Q)"
+msgstr "Kurda, (Sirio, Latina Q)"
 
 #: ../rules/base.xml.in.h:441
-msgid "Logitech Internet 350 Keyboard"
-msgstr "Logitech Internet 350 Keyboard"
+msgid "Kurdish (Turkey, F)"
+msgstr "Kurda, (Turkujo, F)"
 
 #: ../rules/base.xml.in.h:442
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Keyboard"
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr "Kurda (Turkujo, Latina Alt-Q)"
 
 #: ../rules/base.xml.in.h:443
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator Keyboard"
+msgid "Kurdish (Turkey, Latin Q)"
+msgstr "Kurda (Turkujo, Latina Q)"
 
 #: ../rules/base.xml.in.h:444
-msgid "Logitech Media Elite Keyboard"
-msgstr "Logitech Media Elite Keyboard"
+msgid "Kutenai"
+msgstr "Kutenai"
 
 #: ../rules/base.xml.in.h:445
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
-msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgid "Kyrgyz"
+msgstr "Kirgiza"
 
 #: ../rules/base.xml.in.h:446
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X Keyboard"
+msgid "Kyrgyz (phonetic)"
+msgstr "Kirgiza (fonetika)"
 
 #: ../rules/base.xml.in.h:447
-msgid "Logitech diNovo Edge Keyboard"
-msgstr "Logitech diNovo Edge Keyboard"
+msgid "Lao"
+msgstr "Lao"
 
 #: ../rules/base.xml.in.h:448
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech diNovo Keyboard"
+msgid "Lao (STEA proposed standard layout)"
+msgstr "Lao (norma aranĝo proponita de STEA)"
 
 #: ../rules/base.xml.in.h:449
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 
 #: ../rules/base.xml.in.h:450
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 
 #: ../rules/base.xml.in.h:451
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx"
 
 #: ../rules/base.xml.in.h:452
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgid "Latvian"
+msgstr "Latva"
 
 #: ../rules/base.xml.in.h:453
-msgid "Lower Sorbian"
-msgstr "Malsupra Soraba"
+msgid "Latvian (Apostrophe ' variant)"
+msgstr "Latva (variaĵo ' de citilo)"
 
 #: ../rules/base.xml.in.h:454
-msgid "Lower Sorbian (qwertz)"
-msgstr "Malsupra Soraba (qwertz)"
+msgid "Latvian (F variant)"
+msgstr "Latva (variaĵo F)"
 
 #: ../rules/base.xml.in.h:455
-msgid "Ltu"
-msgstr "Ltu"
+msgid "Latvian (Tilde ~ variant)"
+msgstr "Latva (Tilda ~ variaĵo)"
 
 #: ../rules/base.xml.in.h:456
-msgid "Lva"
-msgstr "Lva"
+msgid "Left Alt"
+msgstr "Maldekstra Alt"
 
 #: ../rules/base.xml.in.h:457
-msgid "MESS"
-msgstr "MESS"
+msgid "Left Alt (while pressed)"
+msgstr "Maldekstra 'Alt' (dum premata)"
 
 #: ../rules/base.xml.in.h:458
-msgid "MNE"
-msgstr "MNE"
+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
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
+msgid "Left Ctrl"
+msgstr "Maldekstra Ctrl"
 
 #: ../rules/base.xml.in.h:460
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (Intl)"
+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
-msgid "Macedonia"
-msgstr "Makedonujo"
+msgid "Left Ctrl+Left Shift"
+msgstr "Maldekstra Ctrl+Maldekstra Shift"
 
 #: ../rules/base.xml.in.h:462
-msgid "Macintosh"
-msgstr "Macintosh"
+msgid "Left Shift"
+msgstr "Maldekstra Shift"
 
 #: ../rules/base.xml.in.h:463
-msgid "Macintosh (International)"
-msgstr "Macintosh (Internacia)"
+msgid "Left Win"
+msgstr "Maldekstra Win"
 
 #: ../rules/base.xml.in.h:464
-msgid "Macintosh Old"
-msgstr "Macintosh 'Malnova'"
+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
-msgid "Macintosh, Sun dead keys"
-msgstr "Macintosh, senpaŝaj klavoj de 'Sun'"
+msgid "Left Win (while pressed)"
+msgstr "Maldekstra Win (dum premata)"
 
 #: ../rules/base.xml.in.h:466
-msgid "Macintosh, eliminate dead keys"
-msgstr "Macintosh, forigi senpaŝajn klavojn"
+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
-msgid "Make Caps Lock an additional Backspace"
-msgstr "Igi Caps Lock kroman Retroklavon"
+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
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Igi Caps Lock kroman Ctrl"
+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
-msgid "Make Caps Lock an additional ESC"
-msgstr "Igi Caps Lock kroman ESC"
+msgid "Legacy"
+msgstr "Malmoderna"
 
 #: ../rules/base.xml.in.h:470
-msgid "Make Caps Lock an additional Hyper"
-msgstr "Igi Caps Lock kroman Hyper"
-
-#: ../rules/base.xml.in.h:471
-msgid "Make Caps Lock an additional Num Lock"
-msgstr "Igi Caps Lock kroman Num Lock"
+msgid "Legacy Wang 724"
+msgstr "Malmoderna Wang 724"
 
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:472
-msgid "Make Caps Lock an additional Super"
-msgstr "Igi Caps Lock kroman Super"
+msgid "Legacy key with comma"
+msgstr "Malmoderna klavo kun komo"
 
 #: ../rules/base.xml.in.h:473
-msgid "Malayalam"
-msgstr "Malajala"
+msgid "Legacy key with dot"
+msgstr "Malmoderna klavo kun punkto"
 
 #: ../rules/base.xml.in.h:474
-msgid "Malayalam Lalitha"
-msgstr "Malajala 'Lalitha'"
+msgid "Lithuanian"
+msgstr "Litova"
 
 #: ../rules/base.xml.in.h:475
-msgid "Maldives"
-msgstr "Maldivoj"
+msgid "Lithuanian (IBM LST 1205-92)"
+msgstr "Litova (IBM LST 1205-92)"
 
 #: ../rules/base.xml.in.h:476
-msgid "Mali"
-msgstr "Malio"
+msgid "Lithuanian (LEKP)"
+msgstr "Litova (LEKP)"
 
 #: ../rules/base.xml.in.h:477
-msgid "Malta"
-msgstr "Maltolando"
+msgid "Lithuanian (LEKPa)"
+msgstr "Litova (LEKPa)"
 
 #: ../rules/base.xml.in.h:478
-msgid "Maltese keyboard with US layout"
-msgstr "Malta klavaro kun usona aranĝo"
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgstr "Litova (Usona klavaro kun litovaj literoj)"
 
 #: ../rules/base.xml.in.h:479
-msgid "Mao"
-msgstr "Mao"
+msgid "Lithuanian (standard)"
+msgstr "Litova (norma)"
 
 #: ../rules/base.xml.in.h:480
-msgid "Maori"
-msgstr "Maoria"
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
 
 #: ../rules/base.xml.in.h:481
-msgid "Mari"
-msgstr "Maria"
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
 
 #: ../rules/base.xml.in.h:482
-msgid "Mdv"
-msgstr "Mdv"
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (alternativa opcio)"
 
 #: ../rules/base.xml.in.h:483
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
 
 #: ../rules/base.xml.in.h:484
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access Keyboard"
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
 
 #: ../rules/base.xml.in.h:485
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
 
 #: ../rules/base.xml.in.h:486
-msgid "Menu"
-msgstr "Menu"
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
 
 #: ../rules/base.xml.in.h:487
-msgid "Meta is mapped to Left Win"
-msgstr "Meta estas mapita al la Maldekstra Win"
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (alternativa opcio 2)"
 
 #: ../rules/base.xml.in.h:488
-msgid "Meta is mapped to Win keys"
-msgstr "Meta estas mapita al la klavoj Win"
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
 
 #: ../rules/base.xml.in.h:489
-msgid "Meta on Left Ctrl"
-msgstr "Meta ĉe Maldekstra Ctrl"
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
 #: ../rules/base.xml.in.h:490
-msgid "Microsoft Comfort Curve Keyboard 2000"
-msgstr "Microsoft Comfort Curve Keyboard 2000"
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 extra keys via G15daemon"
 
 #: ../rules/base.xml.in.h:491
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internet Keyboard"
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech - Ĝenerala Klavaro"
 
 #: ../rules/base.xml.in.h:492
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, Sveda"
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 Keyboard"
 
 #: ../rules/base.xml.in.h:493
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
 
 #: ../rules/base.xml.in.h:494
-msgid "Microsoft Natural Keyboard Elite"
-msgstr "Microsoft Natural Keyboard Elite"
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
 
 #: ../rules/base.xml.in.h:495
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite Keyboard"
 
 #: ../rules/base.xml.in.h:496
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop Keyboard"
 
 #: ../rules/base.xml.in.h:497
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
 
 #: ../rules/base.xml.in.h:498
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge Keyboard"
 
 #: ../rules/base.xml.in.h:499
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office Keyboard"
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
 
 #: ../rules/base.xml.in.h:500
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
 
 #: ../rules/base.xml.in.h:501
-msgid "Miscellaneous compatibility options"
-msgstr "Ceteraj kongruaj opcioj"
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
 #: ../rules/base.xml.in.h:502
-msgid "Mkd"
-msgstr "Mkd"
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
 #: ../rules/base.xml.in.h:503
-msgid "Mli"
-msgstr "Mli"
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
 #: ../rules/base.xml.in.h:504
-msgid "Mlt"
-msgstr "Mlt"
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
 
 #: ../rules/base.xml.in.h:505
-msgid "Mmr"
-msgstr "Mmr"
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
 
 #: ../rules/base.xml.in.h:506
-msgid "Mng"
-msgstr "Mng"
+msgid "Macedonian"
+msgstr "Makedona"
 
 #: ../rules/base.xml.in.h:507
-msgid "Mongolia"
-msgstr "Mongolujo"
+msgid "Macedonian (eliminate dead keys)"
+msgstr "Makedona (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:508
-msgid "Montenegro"
-msgstr "Montenegro"
+msgid "Macintosh"
+msgstr "Macintosh"
 
 #: ../rules/base.xml.in.h:509
-msgid "Morocco"
-msgstr "Maroko"
+msgid "Macintosh Old"
+msgstr "Macintosh 'Malnova'"
 
 #: ../rules/base.xml.in.h:510
-msgid "Multilingual"
-msgstr "Plurlingva"
+msgid "Make Caps Lock an additional Backspace"
+msgstr "Igi Caps Lock kroman Retroklavon"
 
 #: ../rules/base.xml.in.h:511
-msgid "Multilingual, first part"
-msgstr "Plurlingva, unua parto"
+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
-msgid "Multilingual, second part"
-msgstr "Plurlingva, dua parto"
+msgid "Make Caps Lock an additional Ctrl"
+msgstr "Igi Caps Lock kroman Ctrl"
 
 #: ../rules/base.xml.in.h:513
-msgid "Myanmar"
-msgstr "Birmo"
+msgid "Make Caps Lock an additional ESC"
+msgstr "Igi Caps Lock kroman ESC"
 
 #: ../rules/base.xml.in.h:514
-msgid "NICOLA-F style Backspace"
-msgstr "Retropaŝo laŭ estilo NICOLA-F"
+msgid "Make Caps Lock an additional Hyper"
+msgstr "Igi Caps Lock kroman Hyper"
 
 #: ../rules/base.xml.in.h:515
-msgid "NLA"
-msgstr "NLA"
+msgid "Make Caps Lock an additional Num Lock"
+msgstr "Igi Caps Lock kroman Num Lock"
 
 #: ../rules/base.xml.in.h:516
-msgid "Nativo"
-msgstr "Nativo"
+msgid "Make Caps Lock an additional Super"
+msgstr "Igi Caps Lock kroman Super"
 
 #: ../rules/base.xml.in.h:517
-msgid "Nativo for Esperanto"
-msgstr "Nativo por Esperanto"
+msgid "Malayalam"
+msgstr "Malajala"
 
 #: ../rules/base.xml.in.h:518
-msgid "Nativo for USA keyboards"
-msgstr "Nativo por usonaj klavaroj"
+msgid "Malayalam (Lalitha)"
+msgstr "Malajala (Lalitha)"
 
 #: ../rules/base.xml.in.h:519
-msgid "Neo 2"
-msgstr "Neo 2"
+msgid "Malayalam (enhanced Inscript with Rupee Sign)"
+msgstr "Malajala (plibonigita Inscript kun Rupi-Signo)"
 
 #: ../rules/base.xml.in.h:520
-msgid "Nepal"
-msgstr "Nepalo"
+msgid "Maltese"
+msgstr "Malta"
 
 #: ../rules/base.xml.in.h:521
-msgid "Netherlands"
-msgstr "Nederlando"
+msgid "Maltese (with US layout)"
+msgstr "Malta (kun usona aranĝo)"
 
 #: ../rules/base.xml.in.h:522
-msgid "New phonetic"
-msgstr "Nova fonetika"
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
 
 #: ../rules/base.xml.in.h:523
-msgid "Nga"
-msgstr "Nga"
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
 
 #: ../rules/base.xml.in.h:524
-msgid "Nigeria"
-msgstr "Niĝerujo"
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
 
 #: ../rules/base.xml.in.h:525
-msgid "Nld"
-msgstr "Nld"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../rules/base.xml.in.h:526
-msgid "Non-breakable space character at fourth level"
-msgstr "Ne-rompebla spaco-signo ĉe la 4-a nivelo"
+msgid "Meta is mapped to Left Win"
+msgstr "Meta estas mapita al la Maldekstra Win"
 
 #: ../rules/base.xml.in.h:527
-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"
+msgid "Meta is mapped to Win keys"
+msgstr "Meta estas mapita al la klavoj Win"
 
 #: ../rules/base.xml.in.h:528
-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)"
+msgid "Meta on Left Ctrl"
+msgstr "Meta ĉe Maldekstra Ctrl"
 
 #: ../rules/base.xml.in.h:529
-msgid "Non-breakable space character at second level"
-msgstr "Ne-rompebla spaco-signo ĉe la 2-a nivelo"
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
 
 #: ../rules/base.xml.in.h:530
-msgid "Non-breakable space character at third level"
-msgstr "Ne-rompebla spaco-signo ĉe la 3-a nivelo"
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
 
 #: ../rules/base.xml.in.h:531
-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"
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Sveda"
 
 #: ../rules/base.xml.in.h:532
-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"
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
 
 #: ../rules/base.xml.in.h:533
-msgid "Nor"
-msgstr "Nor"
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
 
 #: ../rules/base.xml.in.h:534
-msgid "Northern Saami"
-msgstr "Norda Samea"
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
 #: ../rules/base.xml.in.h:535
-msgid "Northern Saami, eliminate dead keys"
-msgstr "Norda Samea, forigi senpaŝajn klavojn"
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
 
 #: ../rules/base.xml.in.h:536
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
+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
-msgid "Norway"
-msgstr "Norvegujo"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgstr "Microsoft Natura Sendrata Komforteca Klavaro 4000"
 
 #: ../rules/base.xml.in.h:538
-msgid "Npl"
-msgstr "Npl"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natura Sendrata Komforteca Klavaro 7000"
 
 #: ../rules/base.xml.in.h:539
-msgid "Num Lock"
-msgstr "Num Lock"
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
 
 #: ../rules/base.xml.in.h:540
-msgid "Numeric keypad delete key behaviour"
-msgstr "Funkciado de la forig-klavo de la ciferklavaro"
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
 #: ../rules/base.xml.in.h:541
-msgid "Numeric keypad keys work as with Mac"
-msgstr "La klavoj de la ciferklavaro funkcias same kiel en Mac"
+msgid "Miscellaneous compatibility options"
+msgstr "Ceteraj kongruaj opcioj"
 
 #: ../rules/base.xml.in.h:542
-msgid "Numeric keypad layout selection"
-msgstr "Elektado de aranĝo por la ciferklavaro"
+msgid "Mongolian"
+msgstr "Mongola"
 
 #: ../rules/base.xml.in.h:543
-msgid "OADG 109A"
-msgstr "OADG 109A"
+msgid "Montenegrin"
+msgstr "Montenegra"
 
 #: ../rules/base.xml.in.h:544
-msgid "OLPC"
-msgstr "OLPC"
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr "Montenegra (Cirila kun angul-citiloj)"
 
 #: ../rules/base.xml.in.h:545
-msgid "OLPC Dari"
-msgstr "OLPC Daria"
+msgid "Montenegrin (Cyrillic)"
+msgstr "Montenegra (Cirila)"
 
 #: ../rules/base.xml.in.h:546
-msgid "OLPC Pashto"
-msgstr "OLPC Paŝtoa"
+msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
+msgstr "Montenegra (Cirila, Z kaj ZHE interŝanĝita)"
 
 #: ../rules/base.xml.in.h:547
-msgid "OLPC Southern Uzbek"
-msgstr "OLPC Suda Uzbekujo"
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Montenegra (Latina qwerty)"
 
 #: ../rules/base.xml.in.h:548
-msgid "Occitan"
-msgstr "Okcitana"
+msgid "Montenegrin (Latin unicode qwerty)"
+msgstr "Montenegra (Latina unikoda qwerty)"
 
 #: ../rules/base.xml.in.h:549
-msgid "Ogham"
-msgstr "Ogamo"
+msgid "Montenegrin (Latin unicode)"
+msgstr "Montenegra (Latina unikoda)"
 
 #: ../rules/base.xml.in.h:550
-msgid "Ogham IS434"
-msgstr "Ogamo IS434"
+msgid "Montenegrin (Latin with guillemets)"
+msgstr "Montenegra (Latina kun angul-citiloj)"
 
 #: ../rules/base.xml.in.h:551
-msgid "Oriya"
-msgstr "Orija"
+msgid "Māori"
+msgstr "Maoria"
 
 #: ../rules/base.xml.in.h:552
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Ortek MCK-800 MM/Internet keyboard"
+msgid "NICOLA-F style Backspace"
+msgstr "Retropaŝo laŭ estilo NICOLA-F"
 
 #: ../rules/base.xml.in.h:553
-msgid "Ossetian"
-msgstr "Oseta"
+msgid "Nepali"
+msgstr "Nepala"
 
 #: ../rules/base.xml.in.h:554
-msgid "Ossetian, Winkeys"
-msgstr "Oseta, klavoj 'Win'"
+msgid "Non-breakable space character at fourth level"
+msgstr "Ne-rompebla spaco-signo ĉe la 4-a nivelo"
 
 #: ../rules/base.xml.in.h:555
-msgid "Ossetian, legacy"
-msgstr "Oseta, malmoderna"
+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
-msgid "PC-98xx Series"
-msgstr "PC-98xx Series"
+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
-msgid "Pak"
-msgstr "Pak"
+msgid "Non-breakable space character at second level"
+msgstr "Ne-rompebla spaco-signo ĉe la 2-a nivelo"
 
 #: ../rules/base.xml.in.h:558
-msgid "Pakistan"
-msgstr "Pakistano"
+msgid "Non-breakable space character at third level"
+msgstr "Ne-rompebla spaco-signo ĉe la 3-a nivelo"
 
 #: ../rules/base.xml.in.h:559
-msgid "Pannonian Rusyn Homophonic"
-msgstr "Panona Rusina Homofonia"
+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
-msgid "Pashto"
-msgstr "Paŝtoa"
+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
-msgid "Pattachote"
-msgstr "Pattachote"
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
 
 #: ../rules/base.xml.in.h:562
-msgid "Pause"
-msgstr "Paŭso"
+msgid "Norwegian"
+msgstr "Norvega"
 
 #: ../rules/base.xml.in.h:563
-msgid "Persian, with Persian Keypad"
-msgstr "Persa, kun Persa Ciferklavaro"
+msgid "Norwegian (Dvorak)"
+msgstr "Norvega (Dvorako)"
 
 #: ../rules/base.xml.in.h:564
-msgid "Phi"
-msgstr "Phi"
+msgid "Norwegian (Mac)"
+msgstr "Norvega (Mac)"
 
 #: ../rules/base.xml.in.h:565
-msgid "Philippines"
-msgstr "Filipinoj"
+msgid "Norwegian (Mac, eliminate dead keys)"
+msgstr "Norvega (Mac, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:566
-msgid "Phonetic"
-msgstr "Fonetika"
+msgid "Norwegian (Northern Saami"
+msgstr "Norvega (Norda Samea)"
 
 #: ../rules/base.xml.in.h:567
-msgid "Phonetic Winkeys"
-msgstr "Fonetikaj Win-klavoj"
+msgid "Norwegian (eliminate dead keys)"
+msgstr "Norvega (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:568
-msgid "Pol"
-msgstr "Pol"
+msgid "Norwegian (northern Saami, eliminate dead keys)"
+msgstr "Norvega (Norda Samea, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:569
-msgid "Poland"
-msgstr "Polujo"
+msgid "Num Lock"
+msgstr "Num Lock"
 
 #: ../rules/base.xml.in.h:570
-msgid "Polytonic"
-msgstr "Plurtona"
+msgid "Numeric keypad delete key behaviour"
+msgstr "Funkciado de la forig-klavo de la ciferklavaro"
 
 #: ../rules/base.xml.in.h:571
-msgid "Portugal"
-msgstr "Portugalujo"
+msgid "Numeric keypad keys work as with Mac"
+msgstr "La klavoj de la ciferklavaro funkcias same kiel en Mac"
 
 #: ../rules/base.xml.in.h:572
-msgid "Probhat"
-msgstr "Probhat"
+msgid "Numeric keypad layout selection"
+msgstr "Elektado de aranĝo por la ciferklavaro"
 
 #: ../rules/base.xml.in.h:573
-msgid "Programmer Dvorak"
-msgstr "Dvorako por programistoj"
+msgid "OLPC"
+msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:574
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
+msgid "Oriya"
+msgstr "Orija"
 
 #: ../rules/base.xml.in.h:575
-msgid "Prt"
-msgstr "Prt"
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet keyboard"
 
 #: ../rules/base.xml.in.h:576
-msgid "PrtSc"
-msgstr "PrtSc"
+msgid "PC-98xx Series"
+msgstr "PC-98xx Series"
 
 #: ../rules/base.xml.in.h:577
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+msgid "Pashto"
+msgstr "Paŝtoa"
 
 #: ../rules/base.xml.in.h:578
-msgid "QWERTY (Baybayin)"
-msgstr "QWERTY (Baybayin)"
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr "Paŝtoa (Afganujo, OLPC)"
 
 #: ../rules/base.xml.in.h:579
-msgid "Right Alt"
-msgstr "Dekstra Alt"
+msgid "Pause"
+msgstr "Paŭso"
 
 #: ../rules/base.xml.in.h:580
-msgid "Right Alt (while pressed)"
-msgstr "Dekstra Alt (dum premata)"
+msgid "Persian"
+msgstr "Persa"
 
 #: ../rules/base.xml.in.h:581
-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"
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr "Persa (Afganujo, Dari OLPC)"
 
 #: ../rules/base.xml.in.h:582
-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"
+msgid "Persian (with Persian Keypad)"
+msgstr "Persa (kun Persa Ciferklavaro)"
 
 #: ../rules/base.xml.in.h:583
-msgid "Right Alt key never chooses 3rd level"
-msgstr "Dekstra Alt neniam elektas la 3-an nivelon"
+msgid "Philippines - Dvorak (Baybayin)"
+msgstr "Filipinoj - Dvorako (Baybayin)"
 
 #: ../rules/base.xml.in.h:584
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "Dekstra Alt, Shift+Dekstra Alt estas Multi_Key"
+msgid "Polish"
+msgstr "Pola"
 
 #: ../rules/base.xml.in.h:585
-msgid "Right Ctrl"
-msgstr "Dekstra Ctrl"
+msgid "Polish (Dvorak)"
+msgstr "Pola (Dvorako)"
 
 #: ../rules/base.xml.in.h:586
-msgid "Right Ctrl (while pressed)"
-msgstr "Dekstra Ctrl (dum premata)"
+msgid "Polish (Dvorak, polish quotes on key 1)"
+msgstr "Pola (Dvorako, polaj citiloj ĉe klavo 1)"
 
 #: ../rules/base.xml.in.h:587
-msgid "Right Ctrl as Right Alt"
-msgstr "Dekstra Ctrl kiel Dekstran Alt"
+msgid "Polish (Dvorak, polish quotes on quotemark key)"
+msgstr "Pola (Dvorako, polaj citiloj ĉe citila klavo)"
 
 #: ../rules/base.xml.in.h:588
-msgid "Right Ctrl+Right Shift"
-msgstr "Dekstra Ctrl+Dekstra Shift"
+msgid "Polish (Kashubian)"
+msgstr "Pola (Kaŝuba)"
 
 #: ../rules/base.xml.in.h:589
-msgid "Right Shift"
-msgstr "Dekstra Shift"
+msgid "Polish (programmer Dvorak)"
+msgstr "Pola (Dvorako por programistoj)"
 
 #: ../rules/base.xml.in.h:590
-msgid "Right Win"
-msgstr "Dekstra Win"
+msgid "Polish (qwertz)"
+msgstr "Pola (qwertz)"
 
 #: ../rules/base.xml.in.h:591
-msgid "Right Win (while pressed)"
-msgstr "Dekstra Win (dum premata)"
+msgid "Portuguese"
+msgstr "Portugala"
 
 #: ../rules/base.xml.in.h:592
-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"
+msgid "Portuguese (Brazil)"
+msgstr "Portugala (Brazilo)"
 
 #: ../rules/base.xml.in.h:593
-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"
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr "Portugala (Brazilo, Dvorak)"
 
 #: ../rules/base.xml.in.h:594
-msgid "Right hand"
-msgstr "Dekstra mano"
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr "Portugala (Brazilo, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:595
-msgid "Right handed Dvorak"
-msgstr "Dekstreca Dvorako"
+msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgstr "Portugala (Brazilo, nativo por Esperanto)"
 
 #: ../rules/base.xml.in.h:596
-msgid "Romania"
-msgstr "Rumanujo"
+msgid "Portuguese (Brazil, nativo for USA keyboards)"
+msgstr "Portugala (Brazilo, nativo por usonaj klavaroj)"
 
 #: ../rules/base.xml.in.h:597
-msgid "Romanian keyboard with German letters"
-msgstr "Rumana klavaro kun germanaj literoj"
+msgid "Portuguese (Brazil, nativo)"
+msgstr "Portugala (Brazilo, Nativo)"
 
 #: ../rules/base.xml.in.h:598
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Rumana klavaro kun germanaj literoj, forigi senpaŝajn klavojn"
+msgid "Portuguese (Mac)"
+msgstr "Portugala (Mac)"
 
 #: ../rules/base.xml.in.h:599
-msgid "Rou"
-msgstr "Rou"
+msgid "Portuguese (Mac, Sun dead keys)"
+msgstr "Portugala (Mac, senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:600
-msgid "Rupee on 4"
-msgstr "Rupio ĉe 4"
+msgid "Portuguese (Mac, eliminate dead keys)"
+msgstr "Portugala (Mac, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:601
-msgid "Rus"
-msgstr "Rus"
+msgid "Portuguese (Nativo for Esperanto)"
+msgstr "Portugala (Nativo por Esperanto)"
 
 #: ../rules/base.xml.in.h:602
-msgid "Russia"
-msgstr "Rusujo"
+msgid "Portuguese (Nativo for USA keyboards)"
+msgstr "Portugala (Nativo por usonaj klavaroj)"
 
 #: ../rules/base.xml.in.h:603
-msgid "Russian"
-msgstr "Rusa"
+msgid "Portuguese (Nativo)"
+msgstr "Portugala (Nativo)"
 
 #: ../rules/base.xml.in.h:604
-msgid "Russian phonetic"
-msgstr "Rusa fonetika"
+msgid "Portuguese (Sun dead keys)"
+msgstr "Portugala (senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:605
-msgid "Russian phonetic Dvorak"
-msgstr "Rusa fonetika Dvorako"
+msgid "Portuguese (eliminate dead keys)"
+msgstr "Portugala (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:606
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "Rusa fonetika, forigi senpaŝajn klavojn"
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
 
 #: ../rules/base.xml.in.h:607
-msgid "Russian with Kazakh"
-msgstr "Rusa kun Kazaĥa"
+msgid "PrtSc"
+msgstr "PrtSc"
 
 #: ../rules/base.xml.in.h:608
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard"
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "Panĝaba (Gurmukia de Jhelum)"
 
 #: ../rules/base.xml.in.h:609
-msgid "SK-1300"
-msgstr "SK-1300"
+msgid "Punjabi (Gurmukhi)"
+msgstr "Panĝaba (Gurmukia)"
 
 #: ../rules/base.xml.in.h:610
-msgid "SK-2500"
-msgstr "SK-2500"
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
 
 #: ../rules/base.xml.in.h:611
-msgid "SK-6200"
-msgstr "SK-6200"
+msgid "Right Alt"
+msgstr "Dekstra Alt"
 
 #: ../rules/base.xml.in.h:612
-msgid "SK-7100"
-msgstr "SK-7100"
+msgid "Right Alt (while pressed)"
+msgstr "Dekstra Alt (dum premata)"
 
-#: ../rules/base.xml.in.h:613 ../rules/base.extras.xml.in.h:9
-msgid "SRB"
-msgstr "SRB"
+#: ../rules/base.xml.in.h:613
+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
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
+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
-msgid "SVEN Slim 303"
-msgstr "SVEN Slim 303"
+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
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Dekstra Alt neniam elektas la 3-an nivelon"
 
 #: ../rules/base.xml.in.h:617
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
+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
-msgid "Scroll Lock"
-msgstr "Ruluma Baskulo"
+msgid "Right Ctrl"
+msgstr "Dekstra Ctrl"
 
 #: ../rules/base.xml.in.h:619
-msgid "Secwepemctsin"
-msgstr "Secwepemctsin"
+msgid "Right Ctrl (while pressed)"
+msgstr "Dekstra Ctrl (dum premata)"
 
 #: ../rules/base.xml.in.h:620
-msgid "Semi-colon on third level"
-msgstr "Punkto-komo ĉe la 3-a nivelo"
+msgid "Right Ctrl as Right Alt"
+msgstr "Dekstra Ctrl kiel Dekstran Alt"
 
 #: ../rules/base.xml.in.h:621
-msgid "Sen"
-msgstr "Sen"
+msgid "Right Ctrl is mapped to Menu"
+msgstr "Dekstra Ctrl estas mapita al Menu"
 
 #: ../rules/base.xml.in.h:622
-msgid "Senegal"
-msgstr "Senegalo"
+msgid "Right Ctrl+Right Shift"
+msgstr "Dekstra Ctrl+Dekstra Shift"
 
-#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:10
-msgid "Serbia"
-msgstr "Serbujo"
+#: ../rules/base.xml.in.h:623
+msgid "Right Shift"
+msgstr "Dekstra Shift"
 
 #: ../rules/base.xml.in.h:624
-msgid "Serbian"
-msgstr "Serba"
+msgid "Right Win"
+msgstr "Dekstra Win"
 
 #: ../rules/base.xml.in.h:625
-msgid "Serbo-Croatian"
-msgstr "Serb-Kroata"
+msgid "Right Win (while pressed)"
+msgstr "Dekstra Win (dum premata)"
 
 #: ../rules/base.xml.in.h:626
-msgid "Shift cancels Caps Lock"
-msgstr "Shift nuligas Caps Lock"
+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
-msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
-msgstr "Shift ne nuligas Num Lock, elektas 3-an nivelon anstataŭe"
+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
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Shift kun la ciferklavaro funkcias same kiel en MS Windows"
+msgid "Romanian"
+msgstr "Rumana"
 
 #: ../rules/base.xml.in.h:629
-msgid "Shift+Caps Lock"
-msgstr "Shift+Caps Lock"
+msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
+msgstr "Rumana (Krime-tatara, Dobruca-1 Q)"
 
 #: ../rules/base.xml.in.h:630
-msgid "Simple"
-msgstr "Simpla"
+msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
+msgstr "Rumana (Krime-tatara, Dobruca-2 Q)"
 
 #: ../rules/base.xml.in.h:631
-msgid "Sindhi"
-msgstr "Sinda"
+msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
+msgstr "Rumana (Krime-tatara, Turka Alt-Q)"
 
 #: ../rules/base.xml.in.h:632
-msgid "Slovakia"
-msgstr "Slovakujo"
+msgid "Romanian (Crimean Tatar Turkish F)"
+msgstr "Rumana (Krime-tatara, Turka F)"
 
 #: ../rules/base.xml.in.h:633
-msgid "Slovenia"
-msgstr "Slovenujo"
+msgid "Romanian (WinKeys)"
+msgstr "Rumana (WinKeys)"
 
 #: ../rules/base.xml.in.h:634
-msgid "South Africa"
-msgstr "Sud-Afriko"
+msgid "Romanian (cedilla)"
+msgstr "Rumana (Subhoko)"
 
 #: ../rules/base.xml.in.h:635
-msgid "Southern Uzbek"
-msgstr "Suda Uzbekujo"
+msgid "Romanian (standard cedilla)"
+msgstr "Rumana (norma subhoko)"
 
 #: ../rules/base.xml.in.h:636
-msgid "Spain"
-msgstr "Hispanio"
+msgid "Romanian (standard)"
+msgstr "Rumana (norma)"
 
 #: ../rules/base.xml.in.h:637
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr "Specialaj klavoj (Ctrl+Alt+&lt;klavo&gt;) traktotaj en servilo"
+msgid "Rupee on 4"
+msgstr "Rupio ĉe 4"
 
 #: ../rules/base.xml.in.h:638
-msgid "Sri Lanka"
-msgstr "Sri-Lanko"
+msgid "Russian"
+msgstr "Rusa"
 
 #: ../rules/base.xml.in.h:639
-msgid "Standard"
-msgstr "Laŭnorma"
+msgid "Russian (Bashkirian)"
+msgstr "Rusa (Baŝkira)"
 
 #: ../rules/base.xml.in.h:640
-msgid "Standard (Cedilla)"
-msgstr "Laŭnorma (Subhoko)"
+msgid "Russian (Chuvash Latin)"
+msgstr "Rusa (Ĉuvaŝa Latina)"
+
+#: ../rules/base.xml.in.h:641
+msgid "Russian (Chuvash)"
+msgstr "Rusa (Ĉuvaŝa)"
 
-#. RSTU 2019-91
 #: ../rules/base.xml.in.h:642
-msgid "Standard RSTU"
-msgstr "Laŭnorma RSTU"
+msgid "Russian (DOS)"
+msgstr "Rusa (DOS)"
+
+#: ../rules/base.xml.in.h:643
+msgid "Russian (Georgia)"
+msgstr "Rusa (Kartvela)"
 
-#. RSTU 2019-91
 #: ../rules/base.xml.in.h:644
-msgid "Standard RSTU on Russian layout"
-msgstr "Laŭnorma RSTU en Rusa aranĝo"
+msgid "Russian (Germany, phonetic)"
+msgstr "Rusa (Germana, fonetika)"
 
 #: ../rules/base.xml.in.h:645
-msgid "Sun Type 5/6"
-msgstr "Sun Type 5/6"
+msgid "Russian (Kalmyk)"
+msgstr "Rusa (Kalmuka)"
 
 #: ../rules/base.xml.in.h:646
-msgid "Sun dead keys"
-msgstr "Senpaŝaj klavoj de 'Sun'"
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr "Rusa (Kazaĥujo, kun Kazaĥa)"
 
 #: ../rules/base.xml.in.h:647
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard"
+msgid "Russian (Komi)"
+msgstr "Rusa (Komi)"
 
 #: ../rules/base.xml.in.h:648
-msgid "Svdvorak"
-msgstr "Svdvorak"
+msgid "Russian (Mari)"
+msgstr "Rusa (Maria)"
 
 #: ../rules/base.xml.in.h:649
-msgid "Svk"
-msgstr "Svk"
+msgid "Russian (Ossetian, WinKeys)"
+msgstr "Rusa (Oseta, WinKeys)"
 
 #: ../rules/base.xml.in.h:650
-msgid "Svn"
-msgstr "Svn"
+msgid "Russian (Ossetian, legacy)"
+msgstr "Rusa (Oseta, malmoderna)"
 
 #: ../rules/base.xml.in.h:651
-msgid "Swap Ctrl and Caps Lock"
-msgstr "Permuti Ctrl kaj Caps Lock"
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr "Rusa (Polujo, fonetika Dvorako)"
 
 #: ../rules/base.xml.in.h:652
-msgid "Swap ESC and Caps Lock"
-msgstr "Permuti ESC kaj Caps Lock"
+msgid "Russian (Serbian)"
+msgstr "Rusa (Serba)"
 
 #: ../rules/base.xml.in.h:653
-msgid "Swe"
-msgstr "Swe"
+msgid "Russian (Sweden, phonetic)"
+msgstr "Rusa (Svedujo, fonetika)"
 
 #: ../rules/base.xml.in.h:654
-msgid "Sweden"
-msgstr "Svedujo"
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgstr "Rusa (Svedujo, fonetika, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:655
-msgid "Switzerland"
-msgstr "Svislando"
+msgid "Russian (Tatar)"
+msgstr "Rusa (Tatara)"
 
 #: ../rules/base.xml.in.h:656
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tabuleta PC)"
+msgid "Russian (US, phonetic)"
+msgstr "Rusa (Usono, fonetika)"
 
 #: ../rules/base.xml.in.h:657
-msgid "Syr"
-msgstr "Syr"
+msgid "Russian (Udmurt)"
+msgstr "Rusa (Udmurta)"
 
 #: ../rules/base.xml.in.h:658
-msgid "Syria"
-msgstr "Sirio"
+msgid "Russian (Yakut)"
+msgstr "Rusa (Jakuta)"
 
 #: ../rules/base.xml.in.h:659
-msgid "Syriac"
-msgstr "Siria"
+msgid "Russian (legacy)"
+msgstr "Rusa (malmoderna)"
 
 #: ../rules/base.xml.in.h:660
-msgid "Syriac phonetic"
-msgstr "Siria fonetika"
+msgid "Russian (phonetic WinKeys)"
+msgstr "Rusa (fonetika WinKeys)"
 
 #: ../rules/base.xml.in.h:661
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
+msgid "Russian (phonetic)"
+msgstr "Rusa (fonetika)"
 
 #: ../rules/base.xml.in.h:662
-msgid "Tajikistan"
-msgstr "Taĝikujo"
+msgid "Russian (typewriter)"
+msgstr "Rusa (skribmaŝina)"
 
 #: ../rules/base.xml.in.h:663
-msgid "Tamil"
-msgstr "Tamila"
+msgid "Russian (typewriter, legacy)"
+msgstr "Rusa (skribmaŝina, malmoderna)"
 
 #: ../rules/base.xml.in.h:664
-msgid "Tamil Keyboard with Numerals"
-msgstr "Tamila Klavaro kun Ciferoj"
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
 #: ../rules/base.xml.in.h:665
-msgid "Tamil TAB Typewriter"
-msgstr "Tamila TAB Typewriter"
+msgid "SK-1300"
+msgstr "SK-1300"
 
 #: ../rules/base.xml.in.h:666
-msgid "Tamil TSCII Typewriter"
-msgstr "Tamila TSCII Typewriter"
+msgid "SK-2500"
+msgstr "SK-2500"
 
 #: ../rules/base.xml.in.h:667
-msgid "Tamil Unicode"
-msgstr "Tamila Unikodo"
+msgid "SK-6200"
+msgstr "SK-6200"
 
 #: ../rules/base.xml.in.h:668
-msgid "Tanzania"
-msgstr "Tanzanio"
+msgid "SK-7100"
+msgstr "SK-7100"
 
 #: ../rules/base.xml.in.h:669
-msgid "Targa Visionary 811"
-msgstr "Targa Visionary 811"
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
 
 #: ../rules/base.xml.in.h:670
-msgid "Tatar"
-msgstr "Tatara"
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
 
 #: ../rules/base.xml.in.h:671
-msgid "Telugu"
-msgstr "Telugua"
+msgid "Saisiyat (Taiwan)"
+msgstr "Saisiyat (Tajvano)"
 
 #: ../rules/base.xml.in.h:672
-msgid "Tha"
-msgstr "Tha"
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
 
 #: ../rules/base.xml.in.h:673
-msgid "Thailand"
-msgstr "Tajlando"
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
 
 #: ../rules/base.xml.in.h:674
-msgid "Tibetan"
-msgstr "Tibeta"
+msgid "Sanwa Supply SKB-KG3"
+msgstr "Sanwa Supply SKB-KG3"
 
 #: ../rules/base.xml.in.h:675
-msgid "Tibetan (with ASCII numerals)"
-msgstr "Tibeta (kun ASCII ciferoj)"
+msgid "Scroll Lock"
+msgstr "Ruluma Baskulo"
 
 #: ../rules/base.xml.in.h:676
-msgid "Tifinagh"
-msgstr "Tifinagh"
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
 
 #: ../rules/base.xml.in.h:677
-msgid "Tifinagh alternative"
-msgstr "Tifinagh alternativa"
+msgid "Semi-colon on third level"
+msgstr "Punkto-komo ĉe la 3-a nivelo"
 
 #: ../rules/base.xml.in.h:678
-msgid "Tifinagh alternative phonetic"
-msgstr "Tifinagh alternativa fonetika"
+msgid "Serbian"
+msgstr "Serba"
 
 #: ../rules/base.xml.in.h:679
-msgid "Tifinagh extended"
-msgstr "Tifinagh etendita"
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr "Serba (Latina Unikoda qwerty)"
 
 #: ../rules/base.xml.in.h:680
-msgid "Tifinagh extended phonetic"
-msgstr "Tifinagh etendita fonetika"
+msgid "Serbian (Latin Unicode)"
+msgstr "Serba (Latina Unikoda)"
 
 #: ../rules/base.xml.in.h:681
-msgid "Tifinagh phonetic"
-msgstr "Tifinagh fonetika"
+msgid "Serbian (Latin qwerty)"
+msgstr "Serba (Latina qwerty)"
 
 #: ../rules/base.xml.in.h:682
-msgid "Tilde (~) variant"
-msgstr "Tilda (~) variaĵo"
+msgid "Serbian (Latin with guillemets)"
+msgstr "Serba (Latina kun angul-citiloj)"
 
 #: ../rules/base.xml.in.h:683
-msgid "Tjk"
-msgstr "Tjk"
+msgid "Serbian (Latin)"
+msgstr "Serba (Latina)"
 
 #: ../rules/base.xml.in.h:684
-msgid "Tkm"
-msgstr "Tkm"
+msgid "Serbian (Pannonian Rusyn Homophonic)"
+msgstr "Serba (Panona Rusina Homofonia)"
 
 #: ../rules/base.xml.in.h:685
-msgid "To the corresponding key in a Dvorak keyboard."
-msgstr "Al la ekvivalenta klavo en Dvoraka klavaro."
+msgid "Serbian (Z and ZHE swapped)"
+msgstr "Serba (Z kaj ZHE permutitaj)"
 
 #: ../rules/base.xml.in.h:686
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr "Al la ekvivalenta klavo en klavaro Qwerty."
+msgid "Serbian (with guillemets)"
+msgstr "Serba (kun angul-citiloj)"
 
 #: ../rules/base.xml.in.h:687
-msgid "Toggle PointerKeys with Shift + NumLock."
-msgstr "Alterni Mus-Klavojn per Shift + NumLock."
+msgid "Serbo-Croatian (US)"
+msgstr "Serb-Kroata (Usona)"
 
 #: ../rules/base.xml.in.h:688
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
+msgid "Shift cancels Caps Lock"
+msgstr "Shift nuligas Caps Lock"
 
 #: ../rules/base.xml.in.h:689
-msgid "Traditional phonetic"
-msgstr "Tradicia fonetika"
+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
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access Keyboard"
+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
-msgid "Trust Slimline"
-msgstr "Trust Slimline"
+msgid "Shift+Caps Lock"
+msgstr "Shift+Caps Lock"
 
 #: ../rules/base.xml.in.h:692
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
+msgid "Sindhi"
+msgstr "Sinda"
 
 #: ../rules/base.xml.in.h:693
-msgid "Tur"
-msgstr "Tur"
+msgid "Sinhala"
+msgstr "Sinhala"
 
 #: ../rules/base.xml.in.h:694
-msgid "Turkey"
-msgstr "Turkujo"
+msgid "Slovak"
+msgstr "Slovaka"
 
 #: ../rules/base.xml.in.h:695
-msgid "Turkmenistan"
-msgstr "Turkmenujo"
+msgid "Slovak (extended Backslash)"
+msgstr "Slovaka (etendita Retroklino)"
 
 #: ../rules/base.xml.in.h:696
-msgid "TypeMatrix EZ-Reach 2020"
-msgstr "TypeMatrix EZ-Reach 2020"
+msgid "Slovak (qwerty)"
+msgstr "Slovaka (qwerty)"
 
 #: ../rules/base.xml.in.h:697
-msgid "TypeMatrix EZ-Reach 2030 PS2"
-msgstr "TypeMatrix EZ-Reach 2030 PS2"
+msgid "Slovak (qwerty, extended Backslash)"
+msgstr "Slovaka (qwerty, etendita Retroklino)"
 
 #: ../rules/base.xml.in.h:698
-msgid "TypeMatrix EZ-Reach 2030 USB"
-msgstr "TypeMatrix EZ-Reach 2030 USB"
+msgid "Slovene"
+msgstr "Slovena"
 
 #: ../rules/base.xml.in.h:699
-msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (reĝimo 102/105:EU)"
+msgid "Slovene (US keyboard with Slovenian letters)"
+msgstr "Slovena (Usona klavaro kun slovenaj literoj)"
 
 #: ../rules/base.xml.in.h:700
-msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (reĝimo 106:JP)"
+msgid "Slovene (use guillemets for quotes)"
+msgstr "Slovena (uzi angul-citilojn por citiloj)"
 
 #: ../rules/base.xml.in.h:701
-msgid "Typewriter"
-msgstr "Skribmaŝino"
+msgid "Spanish"
+msgstr "Hispana"
 
 #: ../rules/base.xml.in.h:702
-msgid "Typewriter, legacy"
-msgstr "Skribmaŝino, malmoderna"
+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 "Tza"
-msgstr "Tza"
+msgid "Spanish (Catalan variant with middle-dot L)"
+msgstr "Hispana (Kataluna variaĵo kun centro-punktita L)"
 
 #: ../rules/base.xml.in.h:704
-msgid "UCW layout (accented letters only)"
-msgstr "Aranĝo UCW (nur diakritaĵoj)"
+msgid "Spanish (Dvorak)"
+msgstr "Hispana (Dvorako)"
 
 #: ../rules/base.xml.in.h:705
-msgid "US Dvorak with CZ UCW support"
-msgstr "Usona Dvorak kun subteno al CZ UCW"
+msgid "Spanish (Latin American)"
+msgstr "Hispana (Latin-amerika)"
 
 #: ../rules/base.xml.in.h:706
-msgid "US keyboard with Bosnian digraphs"
-msgstr "Usona klavaro kun bosnaj duliteraĵoj"
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr "Hispana (Latin-amerika, forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:707
-msgid "US keyboard with Bosnian letters"
-msgstr "Usona klavaro kun bosnaj literoj"
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr "Hispana (Latin-amerika, inkluzive senpaŝa tildo)"
 
 #: ../rules/base.xml.in.h:708
-msgid "US keyboard with Croatian digraphs"
-msgstr "Usona klavaro kun kroataj duliteraĵoj"
+msgid "Spanish (Latin American, sun dead keys)"
+msgstr "Hispana (Latin-amerika, senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:709
-msgid "US keyboard with Croatian letters"
-msgstr "Usona klavaro kun kroataj literoj"
+msgid "Spanish (Mac)"
+msgstr "Hispana (Mac)"
 
 #: ../rules/base.xml.in.h:710
-msgid "US keyboard with Estonian letters"
-msgstr "Usona klavaro kun estonaj literoj"
+msgid "Spanish (Sun dead keys)"
+msgstr "Hispana (senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:711
-msgid "US keyboard with Italian letters"
-msgstr "Usona klavaro kun italaj literoj"
+msgid "Spanish (eliminate dead keys)"
+msgstr "Hispana (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:712
-msgid "US keyboard with Lithuanian letters"
-msgstr "Usona klavaro kun litovaj literoj"
+msgid "Spanish (include dead tilde)"
+msgstr "Hispana (inkluzive senpaŝa tildo)"
 
 #: ../rules/base.xml.in.h:713
-msgid "US keyboard with Slovenian letters"
-msgstr "Usona klavaro kun slovenaj literoj"
+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.extras.xml.in.h:11
-msgid "USA"
-msgstr "Usono"
+#: ../rules/base.xml.in.h:714
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
 
 #: ../rules/base.xml.in.h:715
-msgid "Udmurt"
-msgstr "Udmurta"
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
 
 #: ../rules/base.xml.in.h:716
-msgid "Ukr"
-msgstr "Ukr"
+msgid "Swahili (Kenya)"
+msgstr "Svahila (Kenjo)"
 
 #: ../rules/base.xml.in.h:717
-msgid "Ukraine"
-msgstr "Ukrajnujo"
+msgid "Swahili (Tanzania)"
+msgstr "Svahila (Tanzanio)"
 
 #: ../rules/base.xml.in.h:718
-msgid "Unicode additions (arrows and math operators)"
-msgstr "Unikodaj aldonoj (sagoj kaj operaci-simboloj)"
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Permuti Ctrl kaj Caps Lock"
 
 #: ../rules/base.xml.in.h:719
-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."
+msgid "Swap ESC and Caps Lock"
+msgstr "Permuti ESC kaj Caps Lock"
 
 #: ../rules/base.xml.in.h:720
-msgid "UnicodeExpert"
-msgstr "UnicodeExpert"
+msgid "Swedish"
+msgstr "Sveda"
 
 #: ../rules/base.xml.in.h:721
-msgid "United Kingdom"
-msgstr "Unuiĝinta Reĝlando"
+msgid "Swedish (Dvorak)"
+msgstr "Sveda (Dvorako)"
 
 #: ../rules/base.xml.in.h:722
-msgid "Unitek KB-1925"
-msgstr "Unitek KB-1925"
+msgid "Swedish (Mac)"
+msgstr "Sveda (Mac)"
 
 #: ../rules/base.xml.in.h:723
-msgid "Urdu, Alternative phonetic"
-msgstr "Urdu, Alternativa fonetika"
+msgid "Swedish (Svdvorak)"
+msgstr "Sveda (Svdvorak)"
 
 #: ../rules/base.xml.in.h:724
-msgid "Urdu, Phonetic"
-msgstr "Urdu, Fonetike"
+msgid "Swedish (eliminate dead keys)"
+msgstr "Sveda (forigi senpaŝajn klavojn)"
 
 #: ../rules/base.xml.in.h:725
-msgid "Urdu, Winkeys"
-msgstr "Urdu, Win-klavoj"
+msgid "Swedish (northern Saami)"
+msgstr "Sveda (norda samea)"
 
 #: ../rules/base.xml.in.h:726
-msgid "Use Bosnian digraphs"
-msgstr "Uzi bosnajn duliteraĵojn"
+msgid "Swiss"
+msgstr "Svisa"
 
 #: ../rules/base.xml.in.h:727
-msgid "Use Croatian digraphs"
-msgstr "Uzi kroatajn duliteraĵojn"
+msgid "Swiss (legacy)"
+msgstr "Svisa (malmoderna)"
 
 #: ../rules/base.xml.in.h:728
-msgid "Use guillemets for quotes"
-msgstr "Uzi angul-citilojn por citiloj"
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tabuleta PC)"
 
 #: ../rules/base.xml.in.h:729
-msgid "Use keyboard LED to show alternative layout"
-msgstr "Uzi la LED de klavaro por indiki alternativan aranĝon"
+msgid "Syriac"
+msgstr "Siria"
 
 #: ../rules/base.xml.in.h:730
-msgid "Using space key to input non-breakable space character"
-msgstr "Uzado de spac-klavo por enmeti ne-rompeblan spaco-signon"
+msgid "Syriac (phonetic)"
+msgstr "Siria (fonetika)"
 
 #: ../rules/base.xml.in.h:731
-msgid "Usual space at any level"
-msgstr "Kutima spaco-signo ĉe iu ajn nivelo"
+msgid "Taiwanese"
+msgstr "Tajvana"
 
 #: ../rules/base.xml.in.h:732
-msgid "Uzb"
-msgstr "Uzb"
+msgid "Taiwanese (indigenous)"
+msgstr "Tajvana (indiĝena)"
 
 #: ../rules/base.xml.in.h:733
-msgid "Uzbekistan"
-msgstr "Uzbekujo"
+msgid "Tajik"
+msgstr "Taĝika"
 
 #: ../rules/base.xml.in.h:734
-msgid "Vietnam"
-msgstr "Vjetnamujo"
+msgid "Tajik (legacy)"
+msgstr "Taĝika (malmoderna)"
 
 #: ../rules/base.xml.in.h:735
-msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr "ViewSonic KU-306 Internet Keyboard"
+msgid "Tamil"
+msgstr "Tamila"
 
+# Parou aqui !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #: ../rules/base.xml.in.h:736
-msgid "Vnm"
-msgstr "Vnm"
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgstr "Tamila (Sri-lanko, Skribmaŝino TAB)"
 
 #: ../rules/base.xml.in.h:737
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Wang 724 ciferklavaro kun unikodaj aldonoj (sagoj kaj operaci-simboloj)"
+msgid "Tamil (Sri Lanka, Unicode)"
+msgstr "Tamila (Sri-lanko, Unikodo)"
 
 #: ../rules/base.xml.in.h:738
-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"
+msgid "Tamil (TAB typewriter)"
+msgstr "Tamila (Skribmaŝino TAB)"
 
 #: ../rules/base.xml.in.h:739
-msgid "Wang model 724 azerty"
-msgstr "Wang modelo 724 azerty"
+msgid "Tamil (TSCII typewriter)"
+msgstr "Tamila (Skribmaŝino TSCII)"
 
 #: ../rules/base.xml.in.h:740
-msgid "Western"
-msgstr "Okcidenta"
+msgid "Tamil (Unicode)"
+msgstr "Tamila (Unikodo)"
 
 #: ../rules/base.xml.in.h:741
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
+msgid "Tamil (keyboard with numerals)"
+msgstr "Tamila (klavaro kun ciferoj)"
 
 #: ../rules/base.xml.in.h:742
-msgid "Winkeys"
-msgstr "Win-klavoj"
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
 
 #: ../rules/base.xml.in.h:743
-msgid "With &lt;\\|&gt; key"
-msgstr "Kun klavo &lt;\\|&gt;"
+msgid "Telugu"
+msgstr "Telugua"
 
 #: ../rules/base.xml.in.h:744
-msgid "With EuroSign on 5"
-msgstr "Kun EŭroSigno ĉe 5"
+msgid "Thai"
+msgstr "Taja"
 
 #: ../rules/base.xml.in.h:745
-msgid "With guillemets"
-msgstr "Kun angul-citiloj"
+msgid "Thai (Pattachote)"
+msgstr "Taja (Pattachote)"
 
 #: ../rules/base.xml.in.h:746
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet Keyboard"
+msgid "Thai (TIS-820.2538)"
+msgstr "Taja (TIS-820.2538)"
 
 #: ../rules/base.xml.in.h:747
-msgid "Yakut"
-msgstr "Yakut"
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Al la ekvivalenta klavo en Dvoraka klavaro."
 
 #: ../rules/base.xml.in.h:748
-msgid "Yoruba"
-msgstr "Joruba"
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Al la ekvivalenta klavo en klavaro Qwerty."
 
 #: ../rules/base.xml.in.h:749
-msgid "Z and ZHE swapped"
-msgstr "Z kaj ZHE permutitaj"
+msgid "Toggle PointerKeys with Shift + NumLock."
+msgstr "Alterni Mus-Klavojn per Shift + NumLock."
 
 #: ../rules/base.xml.in.h:750
-msgid "Zaf"
-msgstr "Zaf"
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
 
 #: ../rules/base.xml.in.h:751
-msgid "Zero-width non-joiner character at second level"
-msgstr "Nul-larĝa ne-kuniga signo ĉe dua nivelo"
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
 
 #: ../rules/base.xml.in.h:752
-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"
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
 
 #: ../rules/base.xml.in.h:753
-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"
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
 
 #: ../rules/base.xml.in.h:754
-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"
+msgid "Tswana"
+msgstr "Cvana"
 
 #: ../rules/base.xml.in.h:755
-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"
+msgid "Turkish"
+msgstr "Turka"
 
 #: ../rules/base.xml.in.h:756
-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"
+msgid "Turkish (Alt-Q)"
+msgstr "Turka (Alt-Q)"
 
 #: ../rules/base.xml.in.h:757
-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"
+msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
+msgstr "Turka (Krime-tatara Turka Alt-Q)"
 
 #: ../rules/base.xml.in.h:758
-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"
+msgid "Turkish (Crimean Tatar Turkish F)"
+msgstr "Turka (Krime-tatara Turka F)"
 
 #: ../rules/base.xml.in.h:759
-msgid "azerty"
-msgstr "azerty"
+msgid "Turkish (Crimean Tatar Turkish Q)"
+msgstr "Turka (Krime-tatara Turka Q)"
 
 #: ../rules/base.xml.in.h:760
-msgid "azerty/digits"
-msgstr "azerty/ciferoj"
+msgid "Turkish (F)"
+msgstr "Turka (F)"
 
 #: ../rules/base.xml.in.h:761
-msgid "digits"
-msgstr "ciferoj"
+msgid "Turkish (Sun dead keys)"
+msgstr "Turka (senpaŝaj klavoj de Sun)"
 
 #: ../rules/base.xml.in.h:762
-msgid "displaced semicolon and quote (obsolete)"
-msgstr "translokitaj punktokomo kaj citilo (malaktuale)"
+msgid "Turkish (international with dead keys)"
+msgstr "Turka (internacia kun senpaŝaj klavoj)"
 
 #: ../rules/base.xml.in.h:763
-msgid "lyx"
-msgstr "lyx"
+msgid "Turkmen"
+msgstr "Turkmena"
 
 #: ../rules/base.xml.in.h:764
-msgid "qwerty"
-msgstr "qwerty"
+msgid "Turkmen (Alt-Q)"
+msgstr "Turkmena (Alt-Q)"
 
 #: ../rules/base.xml.in.h:765
-msgid "qwerty, extended Backslash"
-msgstr "qwerty, etendita Retroklino"
+msgid "TypeMatrix EZ-Reach 2020"
+msgstr "TypeMatrix EZ-Reach 2020"
 
 #: ../rules/base.xml.in.h:766
-msgid "qwerty/digits"
-msgstr "qwerty/ciferoj"
+msgid "TypeMatrix EZ-Reach 2030 PS2"
+msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
 #: ../rules/base.xml.in.h:767
-msgid "qwertz"
-msgstr "qwertz"
+msgid "TypeMatrix EZ-Reach 2030 USB"
+msgstr "TypeMatrix EZ-Reach 2030 USB"
+
+#: ../rules/base.xml.in.h:768
+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
+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)"
+
+#: ../rules/base.xml.in.h:772
+msgid "Ukrainian (Crimean Tatar Turkish F)"
+msgstr "Ukrajna (Krime-tatara Turka F)"
+
+#: ../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
+msgid "Ukrainian (homophonic)"
+msgstr "Ukrajna (homofonia)"
+
+#: ../rules/base.xml.in.h:776
+msgid "Ukrainian (legacy)"
+msgstr "Ukrajna (malmoderna)"
+
+#: ../rules/base.xml.in.h:777
+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
+msgid "Ukrainian (standard RSTU)"
+msgstr "Ukrajna (norma RSTU)"
+
+#: ../rules/base.xml.in.h:780
+msgid "Ukrainian (typewriter)"
+msgstr "Ukrajna (skribmaŝino)"
+
+#: ../rules/base.xml.in.h:781
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unikodaj aldonoj (sagoj kaj operaci-simboloj)"
+
+#: ../rules/base.xml.in.h:782
+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
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:784
+msgid "Urdu (Pakistan)"
+msgstr "Urdua (Pakistano)"
+
+#: ../rules/base.xml.in.h:785
+msgid "Urdu (Pakistan, CRULP)"
+msgstr "Urdua (Pakistano, CRULP)"
+
+#: ../rules/base.xml.in.h:786
+msgid "Urdu (Pakistan, NLA)"
+msgstr "Urdua (Pakistano, NLA)"
+
+#: ../rules/base.xml.in.h:787
+msgid "Urdu (WinKeys)"
+msgstr "Urdua (WinKeys)"
+
+#: ../rules/base.xml.in.h:788
+msgid "Urdu (alternative phonetic)"
+msgstr "Urdua (alternativa fonetika)"
+
+#: ../rules/base.xml.in.h:789
+msgid "Urdu (phonetic)"
+msgstr "Urdua (fonetika)"
+
+#: ../rules/base.xml.in.h:790
+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
+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
+msgid "Usual space at any level"
+msgstr "Kutima spaco-signo ĉe iu ajn nivelo"
+
+#: ../rules/base.xml.in.h:793
+msgid "Uzbek"
+msgstr "Uzbeka"
+
+#: ../rules/base.xml.in.h:794
+msgid "Uzbek (Afghanistan)"
+msgstr "Uzbeka (Afganujo)"
+
+#: ../rules/base.xml.in.h:795
+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
+msgid "Uzbek (Latin)"
+msgstr "Uzbeka (Latina)"
+
+#: ../rules/base.xml.in.h:800
+msgid "Vietnamese"
+msgstr "Vjetnama"
+
+#: ../rules/base.xml.in.h:801
+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: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:804
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:805
+msgid "Wolof"
+msgstr "Volofa"
+
+#: ../rules/base.xml.in.h:806
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
+
+#: ../rules/base.xml.in.h:807
+msgid "Yoruba"
+msgstr "Joruba"
+
+#: ../rules/base.xml.in.h:808
+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
+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
+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
+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
+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
+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
+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
+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
+msgid "ak"
+msgstr "ak"
+
+#: ../rules/base.xml.in.h:817
+msgid "am"
+msgstr "am"
+
+#: ../rules/base.xml.in.h:818
+msgid "ar"
+msgstr "ar"
+
+#: ../rules/base.xml.in.h:819
+msgid "avn"
+msgstr "avn"
+
+#: ../rules/base.xml.in.h:820
+msgid "az"
+msgstr "az"
+
+#: ../rules/base.xml.in.h:821
+msgid "be"
+msgstr "be"
+
+#: ../rules/base.xml.in.h:822
+msgid "ber"
+msgstr "ber"
+
+#: ../rules/base.xml.in.h:823
+msgid "bg"
+msgstr "bg"
+
+#: ../rules/base.xml.in.h:824
+msgid "bm"
+msgstr "bm"
+
+#: ../rules/base.xml.in.h:825
+msgid "bn"
+msgstr "bn"
+
+#: ../rules/base.xml.in.h:826
+msgid "brl"
+msgstr "brl"
+
+#: ../rules/base.xml.in.h:827
+msgid "bs"
+msgstr "bs"
+
+#: ../rules/base.xml.in.h:828
+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
+msgid "cs"
+msgstr "cs"
+
+#: ../rules/base.xml.in.h:832
+msgid "da"
+msgstr "da"
+
+#: ../rules/base.xml.in.h:833
+msgid "de"
+msgstr "de"
+
+#: ../rules/base.xml.in.h:834
+msgid "dv"
+msgstr "dv"
+
+#: ../rules/base.xml.in.h:835
+msgid "dz"
+msgstr "dz"
+
+#: ../rules/base.xml.in.h:836
+msgid "ee"
+msgstr "ee"
+
+#: ../rules/base.xml.in.h:837
+msgid "en"
+msgstr "en"
+
+#: ../rules/base.xml.in.h:838
+msgid "eo"
+msgstr "eo"
+
+#: ../rules/base.xml.in.h:839
+msgid "es"
+msgstr "es"
+
+#: ../rules/base.xml.in.h:840
+msgid "et"
+msgstr "et"
+
+#: ../rules/base.xml.in.h:841
+msgid "fa"
+msgstr "fa"
+
+#: ../rules/base.xml.in.h:842
+msgid "ff"
+msgstr "ff"
+
+#: ../rules/base.xml.in.h:843
+msgid "fi"
+msgstr "fi"
+
+#: ../rules/base.xml.in.h:844
+msgid "fo"
+msgstr "fo"
+
+#: ../rules/base.xml.in.h:845
+msgid "fr"
+msgstr "fr"
+
+#: ../rules/base.xml.in.h:846
+msgid "gaa"
+msgstr "gaa"
+
+#: ../rules/base.xml.in.h:847
+msgid "gr"
+msgstr "gr"
+
+#: ../rules/base.xml.in.h:848
+msgid "gu"
+msgstr "gu"
+
+#: ../rules/base.xml.in.h:849
+msgid "ha"
+msgstr "ha"
+
+#: ../rules/base.xml.in.h:850
+msgid "he"
+msgstr "he"
+
+#: ../rules/base.xml.in.h:851
+msgid "hi"
+msgstr "hi"
+
+#: ../rules/base.xml.in.h:852
+msgid "hr"
+msgstr "hr"
+
+#: ../rules/base.xml.in.h:853
+msgid "hu"
+msgstr "hu"
+
+#: ../rules/base.xml.in.h:854
+msgid "hy"
+msgstr "hy"
+
+#: ../rules/base.xml.in.h:855
+msgid "ie"
+msgstr "ie"
+
+#: ../rules/base.xml.in.h:856
+msgid "ig"
+msgstr "ig"
+
+#: ../rules/base.xml.in.h:857
+msgid "ike"
+msgstr "ike"
+
+#: ../rules/base.xml.in.h:858
+msgid "in"
+msgstr "in"
+
+#: ../rules/base.xml.in.h:859
+msgid "irq"
+msgstr "irq"
+
+#: ../rules/base.xml.in.h:860
+msgid "is"
+msgstr "is"
+
+#: ../rules/base.xml.in.h:861
+msgid "it"
+msgstr "it"
+
+#: ../rules/base.xml.in.h:862
+msgid "ja"
+msgstr "ja"
+
+#: ../rules/base.xml.in.h:863
+msgid "ka"
+msgstr "ka"
+
+#: ../rules/base.xml.in.h:864
+msgid "ki"
+msgstr "ki"
+
+#: ../rules/base.xml.in.h:865
+msgid "kk"
+msgstr "kk"
+
+#: ../rules/base.xml.in.h:866
+msgid "km"
+msgstr "km"
+
+#: ../rules/base.xml.in.h:867
+msgid "kn"
+msgstr "kn"
+
+#: ../rules/base.xml.in.h:868
+msgid "ko"
+msgstr "ko"
+
+#: ../rules/base.xml.in.h:869
+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
+msgid "lt"
+msgstr "lt"
+
+#: ../rules/base.xml.in.h:873
+msgid "lv"
+msgstr "lv"
+
+#: ../rules/base.xml.in.h:874
+msgid "mi"
+msgstr "mi"
+
+#: ../rules/base.xml.in.h:875
+msgid "mk"
+msgstr "mk"
+
+#: ../rules/base.xml.in.h:876
+msgid "ml"
+msgstr "ml"
+
+#: ../rules/base.xml.in.h:877
+msgid "mn"
+msgstr "mn"
+
+#: ../rules/base.xml.in.h:878
+msgid "mt"
+msgstr "mt"
+
+#: ../rules/base.xml.in.h:879
+msgid "my"
+msgstr "my"
+
+#: ../rules/base.xml.in.h:880
+msgid "ne"
+msgstr "ne"
+
+#: ../rules/base.xml.in.h:881
+msgid "nl"
+msgstr "nl"
+
+#: ../rules/base.xml.in.h:882
+msgid "no"
+msgstr "no"
+
+#: ../rules/base.xml.in.h:883
+msgid "or"
+msgstr "or"
+
+#: ../rules/base.xml.in.h:884
+msgid "pa"
+msgstr "pa"
+
+#: ../rules/base.xml.in.h:885
+msgid "ph"
+msgstr "ph"
+
+#: ../rules/base.xml.in.h:886
+msgid "pl"
+msgstr "pl"
+
+#: ../rules/base.xml.in.h:887
+msgid "ps"
+msgstr "ps"
+
+#: ../rules/base.xml.in.h:888
+msgid "pt"
+msgstr "pt"
+
+#: ../rules/base.xml.in.h:889
+msgid "ro"
+msgstr "ro"
+
+#: ../rules/base.xml.in.h:890
+msgid "ru"
+msgstr "ru"
+
+#: ../rules/base.xml.in.h:891
+msgid "sd"
+msgstr "sd"
+
+#: ../rules/base.xml.in.h:892
+msgid "shs"
+msgstr "shs"
+
+#: ../rules/base.xml.in.h:893
+msgid "si"
+msgstr "si"
+
+#: ../rules/base.xml.in.h:894
+msgid "sk"
+msgstr "sk"
+
+#: ../rules/base.xml.in.h:895
+msgid "sl"
+msgstr "sl"
+
+#: ../rules/base.xml.in.h:896
+msgid "sq"
+msgstr "sq"
+
+#: ../rules/base.xml.in.h:897
+msgid "sr"
+msgstr "sr"
+
+#: ../rules/base.xml.in.h:898
+msgid "srp"
+msgstr "srp"
+
+#: ../rules/base.xml.in.h:899
+msgid "sv"
+msgstr "sv"
+
+#: ../rules/base.xml.in.h:900
+msgid "sw"
+msgstr "sw"
+
+#: ../rules/base.xml.in.h:901
+msgid "syc"
+msgstr "syc"
+
+#: ../rules/base.xml.in.h:902
+msgid "ta"
+msgstr "ta"
+
+#: ../rules/base.xml.in.h:903
+msgid "te"
+msgstr "te"
+
+#: ../rules/base.xml.in.h:904
+msgid "tg"
+msgstr "tg"
+
+#: ../rules/base.xml.in.h:905
+msgid "th"
+msgstr "th"
+
+#: ../rules/base.xml.in.h:906
+msgid "tk"
+msgstr "tk"
+
+#: ../rules/base.xml.in.h:907
+msgid "tn"
+msgstr "tn"
+
+#: ../rules/base.xml.in.h:908
+msgid "tr"
+msgstr "tr"
+
+#: ../rules/base.xml.in.h:909
+msgid "twn"
+msgstr "twn"
+
+#: ../rules/base.xml.in.h:910
+msgid "uk"
+msgstr "uk"
+
+#: ../rules/base.xml.in.h:911
+msgid "ur"
+msgstr "ur"
+
+#: ../rules/base.xml.in.h:912
+msgid "uz"
+msgstr "uz"
+
+#: ../rules/base.xml.in.h:913
+msgid "vi"
+msgstr "vi"
+
+#: ../rules/base.xml.in.h:914
+msgid "wo"
+msgstr "wo"
+
+#: ../rules/base.xml.in.h:915
+msgid "xsy"
+msgstr "xsy"
+
+#: ../rules/base.xml.in.h:916
+msgid "yo"
+msgstr "yo"
+
+#: ../rules/base.xml.in.h:917
+msgid "zh"
+msgstr "zh"
 
 #: ../rules/base.extras.xml.in.h:1
 msgid "APL"
 msgstr "APL"
 
 #: ../rules/base.extras.xml.in.h:2
-msgid "Atsina"
-msgstr "Atsina"
+msgid "Iran"
+msgstr "Irano"
 
 #: ../rules/base.extras.xml.in.h:3
-msgid "Avestan"
-msgstr "Avesta"
+msgid "Iran - Avestan"
+msgstr "Irano - Avesta"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Combining accents instead of dead keys"
-msgstr "Kunmiksado de diakritaĵoj anstataŭ senpaŝaj klavoj"
+msgid "Lithuania"
+msgstr "Litovujo"
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Couer D'alene Salish"
-msgstr "Couer D'alene Salish"
+msgid "Lithuania - Dvorak"
+msgstr "Litovujo - Dvorako"
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "International (AltGr Unicode combining)"
-msgstr "Internacia (AltGr-Unikodo kunmiksado)"
+msgid "Ltu"
+msgstr "Ltu"
 
 #: ../rules/base.extras.xml.in.h:7
-msgid "International (AltGr Unicode combining, alternative)"
-msgstr "Internacia (AltGr-Unikodo kunmiksado, alternativa)"
+msgid "Romania"
+msgstr "Rumanujo"
+
+#: ../rules/base.extras.xml.in.h:8
+msgid "Romania - Ergonomic Touchtype"
+msgstr "Rumanujo - Komforteca Touchtype"
+
+#: ../rules/base.extras.xml.in.h:9
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.extras.xml.in.h:10
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.extras.xml.in.h:11
+msgid "Russia"
+msgstr "Rusujo"
+
+#: ../rules/base.extras.xml.in.h:12
+msgid "Serbia"
+msgstr "Serbujo"
+
+#: ../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"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "Srb"
+msgstr "Srb"
+
+#: ../rules/base.extras.xml.in.h:15
+msgid "USA"
+msgstr "Usono"
+
+#: ../rules/base.extras.xml.in.h:16
+msgid "USA - Atsina"
+msgstr "Usono - Atsina"
+
+#: ../rules/base.extras.xml.in.h:17
+msgid "USA - Couer D'alene Salish"
+msgstr "Usono - Couer D'alene Salish"
+
+#: ../rules/base.extras.xml.in.h:18
+msgid "USA - International (AltGr Unicode combining)"
+msgstr "Usono - Internacia (AltGr-Unikoda kunmiksado)"
+
+#: ../rules/base.extras.xml.in.h:19
+msgid "USA - International (AltGr Unicode combining, alternative)"
+msgstr "Usono - Internacia (AltGr-Unikoda kunmiksado, alternativa)"
+
+#~ msgid "(F)"
+#~ msgstr "(F)"
+
+#~ msgid "Alb"
+#~ msgstr "Alb"
+
+#~ msgid "Alt-Q"
+#~ msgstr "Alt-Q"
+
+#~ msgid "Alternative"
+#~ msgstr "Alternativa"
+
+#~ msgid "Alternative Phonetic"
+#~ msgstr "Alternativa Fonetika"
+
+#~ msgid "Alternative international"
+#~ msgstr "Alternativa internacia"
+
+#~ msgid "And"
+#~ msgstr "And"
+
+#~ msgid "Andorra"
+#~ msgstr "Andoro"
+
+#~ msgid "Ara"
+#~ msgstr "Ara"
+
+#~ msgid "Arm"
+#~ msgstr "Arm"
+
+#~ msgid "Aut"
+#~ msgstr "Aut"
+
+#~ msgid "Aze"
+#~ msgstr "Aze"
+
+#~ msgid "Bangladesh"
+#~ msgstr "Bangladeŝo"
+
+#~ msgid "Bel"
+#~ msgstr "Bel"
+
+#~ msgid "Bgd"
+#~ msgstr "Bgd"
+
+#~ msgid "Bhutan"
+#~ msgstr "Bhutano"
+
+#~ msgid "Bih"
+#~ msgstr "Bih"
+
+#~ msgid "Blr"
+#~ msgstr "Blr"
+
+#~ msgid "Bosnia and Herzegovina"
+#~ msgstr "Bosnujo kaj Hercegovino"
+
+#~ msgid "Bra"
+#~ msgstr "Bra"
+
+#~ msgid "Brazil"
+#~ msgstr "Brazilo"
+
+#~ msgid "Breton"
+#~ msgstr "Bretona"
+
+#~ msgid "Bwa"
+#~ msgstr "Bwa"
+
+#~ msgid "COD"
+#~ msgstr "COD"
+
+#~ msgid "CRULP"
+#~ msgstr "CRULP"
+
+#~ msgid "Canada"
+#~ msgstr "Kanado"
+
+#~ msgid "Cedilla"
+#~ msgstr "Subhoketo"
+
+#~ msgid "Chn"
+#~ msgstr "Chn"
+
+#~ msgid "Chuvash"
+#~ msgstr "Ĉuvaŝa"
+
+#~ msgid "Classic"
+#~ msgstr "Klasike"
+
+#~ msgid "Colemak"
+#~ msgstr "Colemak"
+
+#~ msgid "Cyrillic"
+#~ msgstr "Cirila"
+
+#~ msgid "Cze"
+#~ msgstr "Cze"
+
+#~ msgid "DOS"
+#~ msgstr "DOS"
+
+#~ msgid "Dead acute"
+#~ msgstr "Senpaŝa dekstra korno"
+
+#~ msgid "Denmark"
+#~ msgstr "Danujo"
+
+#~ msgid "Deu"
+#~ msgstr "Deu"
+
+#~ msgid "Dnk"
+#~ msgstr "Dnk"
+
+#~ msgid "Dvorak"
+#~ msgstr "Dvorako"
+
+#~ msgid "Eastern"
+#~ msgstr "Orienta"
+
+#~ msgid "Epo"
+#~ msgstr "Epo"
+
+#~ msgid "Ergonomic"
+#~ msgstr "Ergonomia"
+
+#~ msgid "Est"
+#~ msgstr "Est"
+
+#~ msgid "Ethiopia"
+#~ msgstr "Etiopujo"
+
+#~ msgid "Extended"
+#~ msgstr "Etendite"
+
+#~ msgid "Finland"
+#~ msgstr "Finlando"
+
+#~ msgid "Fra"
+#~ msgstr "Fra"
+
+#~ msgid "France"
+#~ msgstr "Francujo"
+
+#~ msgid "GILLBT"
+#~ msgstr "GILLBT"
+
+#~ msgid "Georgia"
+#~ msgstr "Kartvelujo"
+
+#~ msgid "Ghana"
+#~ msgstr "Ganao"
+
+#~ msgid "Gin"
+#~ msgstr "Gin"
+
+#~ msgid "Grc"
+#~ msgstr "Grc"
+
+#~ msgid "Guinea"
+#~ msgstr "Gvineo"
+
+#~ msgid "Homophonic"
+#~ msgstr "Homofonia"
+
+#~ msgid "Hrv"
+#~ msgstr "Hrv"
+
+#~ msgid "Hun"
+#~ msgstr "Hun"
+
+#~ msgid "Ind"
+#~ msgstr "Ind"
+
+#~ msgid "Ireland"
+#~ msgstr "Irlando"
+
+#~ msgid "Irl"
+#~ msgstr "Irl"
+
+#~ msgid "Irn"
+#~ msgstr "Irn"
+
+#~ msgid "Israel"
+#~ msgstr "Israelo"
+
+#~ msgid "Jpn"
+#~ msgstr "Jpn"
+
+#~ msgid "Kalmyk"
+#~ msgstr "Kalmyk"
+
+#~ msgid "Kana"
+#~ msgstr "Kanao"
+
+#~ msgid "Kana 86"
+#~ msgstr "Kanao 86"
+
+#~ msgid "Kenya"
+#~ msgstr "Kenjo"
+
+#~ msgid "Kgz"
+#~ msgstr "Kgz"
+
+#~ msgid "Khm"
+#~ msgstr "Khm"
+
+#~ msgid "Korea, Republic of"
+#~ msgstr "Koreujo, Respubliko de"
+
+#~ msgid "Ktunaxa"
+#~ msgstr "Ktunaxa"
+
+#~ msgid "LEKP"
+#~ msgstr "LEKP"
+
+#~ msgid "LEKPa"
+#~ msgstr "LEKPa"
+
+#~ msgid "Laos"
+#~ msgstr "Laoso"
+
+#~ msgid "Latin"
+#~ msgstr "Latineca"
+
+#~ msgid "Left hand"
+#~ msgstr "Maldekstra mano"
+
+#~ msgid "Lva"
+#~ msgstr "Lva"
+
+#~ msgid "MESS"
+#~ msgstr "MESS"
+
+#~ msgid "MNE"
+#~ msgstr "MNE"
+
+#~ msgid "Macintosh (International)"
+#~ msgstr "Macintosh (Internacia)"
+
+#~ msgid "Maldives"
+#~ msgstr "Maldivoj"
+
+#~ msgid "Mali"
+#~ msgstr "Malio"
+
+#~ msgid "Mao"
+#~ msgstr "Mao"
+
+#~ msgid "Maori"
+#~ msgstr "Maoria"
+
+#~ msgid "Mkd"
+#~ msgstr "Mkd"
+
+#~ msgid "Mli"
+#~ msgstr "Mli"
+
+#~ msgid "Mmr"
+#~ msgstr "Mmr"
+
+#~ msgid "Mng"
+#~ msgstr "Mng"
+
+#~ msgid "Myanmar"
+#~ msgstr "Birmo"
+
+#~ msgid "NLA"
+#~ msgstr "NLA"
+
+#~ msgid "Nativo"
+#~ msgstr "Nativo"
+
+#~ msgid "Neo 2"
+#~ msgstr "Neo 2"
+
+#~ msgid "Netherlands"
+#~ msgstr "Nederlando"
+
+#~ msgid "Nigeria"
+#~ msgstr "Niĝerujo"
+
+#~ msgid "Nld"
+#~ msgstr "Nld"
+
+#~ msgid "Nor"
+#~ msgstr "Nor"
+
+#~ msgid "Norway"
+#~ msgstr "Norvegujo"
+
+#~ msgid "OLPC Dari"
+#~ msgstr "OLPC Daria"
+
+#~ msgid "OLPC Pashto"
+#~ msgstr "OLPC Paŝtoa"
+
+#~ msgid "OLPC Southern Uzbek"
+#~ msgstr "OLPC Suda Uzbekujo"
+
+#~ msgid "Occitan"
+#~ msgstr "Okcitana"
+
+#~ msgid "Ogham"
+#~ msgstr "Ogamo"
+
+#~ msgid "Ossetian"
+#~ msgstr "Oseta"
+
+#~ msgid "Phonetic"
+#~ msgstr "Fonetika"
+
+#~ msgid "Phonetic Winkeys"
+#~ msgstr "Fonetikaj Win-klavoj"
+
+#~ msgid "Pol"
+#~ msgstr "Pol"
+
+#~ msgid "Poland"
+#~ msgstr "Polujo"
+
+#~ msgid "Probhat"
+#~ msgstr "Probhat"
+
+#~ msgid "Prt"
+#~ msgstr "Prt"
+
+#~ msgid "SRB"
+#~ msgstr "SRB"
+
+#~ msgid "Sen"
+#~ msgstr "Sen"
+
+#~ msgid "Senegal"
+#~ msgstr "Senegalo"
+
+#~ msgid "Simple"
+#~ msgstr "Simpla"
+
+#~ msgid "Southern Uzbek"
+#~ msgstr "Suda Uzbekujo"
+
+#~ msgid "Spain"
+#~ msgstr "Hispanio"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "Sri-Lanko"
+
+#~ msgid "Standard"
+#~ msgstr "Laŭnorma"
+
+#~ msgid "Svk"
+#~ msgstr "Svk"
+
+#~ msgid "Svn"
+#~ msgstr "Svn"
+
+#~ msgid "Swe"
+#~ msgstr "Swe"
+
+#~ msgid "Syria"
+#~ msgstr "Sirio"
+
+#~ msgid "Tatar"
+#~ msgstr "Tatara"
+
+#~ msgid "Tha"
+#~ msgstr "Tha"
+
+#~ msgid "Tibetan"
+#~ msgstr "Tibeta"
+
+#~ msgid "Tifinagh"
+#~ msgstr "Tifinagh"
+
+#~ msgid "Tjk"
+#~ msgstr "Tjk"
+
+#~ msgid "Typewriter"
+#~ msgstr "Skribmaŝino"
+
+#~ msgid "Tza"
+#~ msgstr "Tza"
+
+#~ msgid "Udmurt"
+#~ msgstr "Udmurta"
+
+#~ msgid "Ukr"
+#~ msgstr "Ukr"
+
+#~ msgid "United Kingdom"
+#~ msgstr "Unuiĝinta Reĝlando"
+
+#~ msgid "Uzb"
+#~ msgstr "Uzb"
+
+#~ msgid "Vnm"
+#~ msgstr "Vnm"
+
+#~ msgid "Western"
+#~ msgstr "Okcidenta"
+
+#~ msgid "With EuroSign on 5"
+#~ msgstr "Kun EŭroSigno ĉe 5"
+
+#~ msgid "With guillemets"
+#~ msgstr "Kun angul-citiloj"
+
+#~ msgid "Zaf"
+#~ msgstr "Zaf"
+
+#~ msgid "azerty"
+#~ msgstr "azerty"
+
+#~ msgid "digits"
+#~ msgstr "ciferoj"
+
+#~ msgid "lyx"
+#~ msgstr "lyx"
+
+#~ msgid "qwertz"
+#~ msgstr "qwertz"
 
 #~ msgid "2"
 #~ msgstr "2"
@@ -3120,9 +4199,6 @@ msgstr "Internacia (AltGr-Unikodo kunmiksado, alternativa)"
 #~ msgid "ACPI Standard"
 #~ msgstr "ACPI Laŭnorma"
 
-#~ msgid "Bhu"
-#~ msgstr "Bhu"
-
 #~ msgid "DRC"
 #~ msgstr "DRC"
 
@@ -3165,15 +4241,9 @@ msgstr "Internacia (AltGr-Unikodo kunmiksado, alternativa)"
 #~ msgid "Brazilian ABNT2"
 #~ msgstr "Brazila ABNT2"
 
-#~ msgid "Japanese 106-key"
-#~ msgstr "Nipono 106-klava"
-
 #~ msgid "Kir"
 #~ msgstr "Kir"
 
-#~ msgid "Korean 106-key"
-#~ msgstr "Korea 106-klava"
-
 #~ msgid "Super is mapped to Win keys"
 #~ msgstr "'Super' estas mapita al la klavoj Win"
 
@@ -3311,6 +4381,3 @@ msgstr "Internacia (AltGr-Unikodo kunmiksado, alternativa)"
 
 #~ msgid "Third level choosers"
 #~ msgstr "Elektiloj por 3-a nivelo"
-
-#~ msgid "Urdu"
-#~ msgstr "Urdua"
diff --git a/xorg-server/xkeyboard-config/po/fr.po b/xorg-server/xkeyboard-config/po/fr.po
index 8fd2c6c17..0779f4f95 100644
--- a/xorg-server/xkeyboard-config/po/fr.po
+++ b/xorg-server/xkeyboard-config/po/fr.po
@@ -9,10 +9,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-02 00:44+0200\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-05-18 23:39+0200\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -35,7 +35,7 @@ msgstr "&lt;Plus petit/Plus grand&gt; sélectionne le 5e niveau ; verrouille le
 
 #: ../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;Plus petit/Plus grand&gt; sélectionne le 5e niveau ; verrouille le 5e niveau par un appui simultané avec un autre sélecteur de 5e niveau"
+msgstr "&lt;Plus petit/Plus grand&gt; sélectionne le 5e niveau ; se verrouille par un appui simultané avec un autre sélecteur de 5e niveau"
 
 #: ../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"
@@ -90,153 +90,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 "Afghan"
 
-#: ../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 "Albanais"
 
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:21
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt et Meta sont sur les touches 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 sur la touche Windows de droite, Super sur Menu"
+msgstr "Alt. est placé sur Windows droite, Super sur Menu"
 
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:23
 msgid "Alt+Caps Lock"
 msgstr "Alt+Verr. maj."
 
-#: ../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+Maj."
 
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:26
 msgid "Alt+Space"
 msgstr "Alt+Espace"
 
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:27
 msgid "Alt/Win key behavior"
 msgstr "Comportement des touches Alt et Windows"
 
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:28
 msgid "Amharic"
 msgstr "Amharique"
 
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:29
 msgid "Any Alt key"
 msgstr "N'importe quelle touche Alt"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr "N'importe quelle touche Windows"
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr "N'importe quelle touche Windows (enfoncée)"
 
-#: ../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 "Clavier aluminium Apple (ANSI)"
 
-#: ../rules/base.xml.in.h:35
+#: ../rules/base.xml.in.h:34
 msgid "Apple Aluminium Keyboard (ISO)"
 msgstr "Clavier aluminium Apple (ISO)"
 
-#: ../rules/base.xml.in.h:36
+#: ../rules/base.xml.in.h:35
 msgid "Apple Aluminium Keyboard (JIS)"
 msgstr "Clavier aluminium 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 "Clavier aluminium Apple : émulation des touches PC (Impr. écr. ; défil. ; pause ; verr. num.)"
+msgstr "Clavier aluminium Apple : émulation des touches PC (Impr. écr. ; défil. ; pause ; Verr. Num.)"
 
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
 msgstr "Apple : Portable"
 
-#: ../rules/base.xml.in.h:39
+#: ../rules/base.xml.in.h:38
 msgid "Arabic"
 msgstr "Arabe"
 
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:39
 msgid "Arabic (Buckwalter)"
 msgstr "Arabe (Buckwalter)"
 
-#: ../rules/base.xml.in.h:41
+#: ../rules/base.xml.in.h:40
 msgid "Arabic (Morocco)"
 msgstr "Arabe (Maroc)"
 
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:41
 msgid "Arabic (Pakistan)"
 msgstr "Arabe (Pakistan)"
 
-#: ../rules/base.xml.in.h:43
+#: ../rules/base.xml.in.h:42
 msgid "Arabic (Syria)"
 msgstr "Arabe (Syrie)"
 
-#: ../rules/base.xml.in.h:44
+#: ../rules/base.xml.in.h:43
 msgid "Arabic (azerty)"
 msgstr "Arabe (azerty)"
 
-#: ../rules/base.xml.in.h:45
+#: ../rules/base.xml.in.h:44
 msgid "Arabic (azerty/digits)"
 msgstr "Arabe (azerty/chiffres)"
 
-#: ../rules/base.xml.in.h:46
+#: ../rules/base.xml.in.h:45
 msgid "Arabic (digits)"
 msgstr "Arabe (chiffres)"
 
-#: ../rules/base.xml.in.h:47
+#: ../rules/base.xml.in.h:46
 msgid "Arabic (qwerty)"
 msgstr "Arabe (qwerty)"
 
-#: ../rules/base.xml.in.h:48
+#: ../rules/base.xml.in.h:47
 msgid "Arabic (qwerty/digits)"
 msgstr "Arabe (qwerty/chiffres)"
 
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
 msgid "Armenian"
 msgstr "Arménien"
 
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:49
 msgid "Armenian (alternative eastern)"
 msgstr "Arménien (variante, orientale)"
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
 msgid "Armenian (alternative phonetic)"
 msgstr "Arménien (variante, phonétique)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 msgid "Armenian (eastern)"
 msgstr "Arménien (orientale)"
 
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:52
 msgid "Armenian (phonetic)"
 msgstr "Arménien (phonétique)"
 
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:53
 msgid "Armenian (western)"
 msgstr "Arménien (occidentale)"
 
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturien (Espagne, avec H point bas et L point bas)"
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "Asus : portable"
@@ -254,13 +254,13 @@ msgid "Avatime"
 msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijan (Cyrillic)"
-msgstr "Azéri (cyrillique)"
-
-#: ../rules/base.xml.in.h:60
 msgid "Azerbaijani"
 msgstr "Azéri"
 
+#: ../rules/base.xml.in.h:60
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Azéri (cyrillique)"
+
 #: ../rules/base.xml.in.h:61
 msgid "Azona RF2300 wireless Internet Keyboard"
 msgstr "Azona RF2300 clavier internet sans fil"
@@ -306,4384 +306,3556 @@ msgid "Backslash"
 msgstr "Barre oblique inverse"
 
 #: ../rules/base.xml.in.h:72
-msgid "Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr "La barre oblique inverse sélectionne le 3e niveau ; enclenche le 3e niveau par un appui simultané avec un autre sélecteur de 3e niveau"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Barre oblique inverse (sélectionne le 3e niveau ; enclenche le 3e niveau par un appui simultané avec un autre sélecteur de 3e niveau)"
 
 #: ../rules/base.xml.in.h:73
 msgid "Bambara"
 msgstr "Bambara"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Bachkir
 #: ../rules/base.xml.in.h:74
+msgid "Bashkirian"
+msgstr "Bachkir"
+
+#: ../rules/base.xml.in.h:75
 msgid "Belarusian"
 msgstr "Biélorusse"
 
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:76
 msgid "Belarusian (Latin)"
-msgstr "Biélorusse (Latin)"
+msgstr "Biélorusse (latin)"
 
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:77
 msgid "Belarusian (legacy)"
 msgstr "Biélorusse (obsolète)"
 
-#: ../rules/base.xml.in.h:77
+#: ../rules/base.xml.in.h:78
 msgid "Belgian"
 msgstr "Belge"
 
-#: ../rules/base.xml.in.h:78
+#: ../rules/base.xml.in.h:79
 msgid "Belgian (ISO alternate)"
 msgstr "Belge (variante ISO)"
 
-#: ../rules/base.xml.in.h:79
+#: ../rules/base.xml.in.h:80
 msgid "Belgian (Sun dead keys)"
 msgstr "Belge (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belge (Wang modèle 724 azerty)"
 
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:82
 msgid "Belgian (alternative)"
 msgstr "Belge (variante)"
 
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:83
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belge (variante, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belge (variante, latin-9 uniquement)"
 
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:85
 msgid "Belgian (eliminate dead keys)"
-msgstr "Belge (sans touches mortes)"
+msgstr "Belge (sans touche morte)"
 
-#: ../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 "Bengali"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:90
 msgid "Bengali (Probhat)"
 msgstr "Bengali (Probhat)"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:91
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berbère (Maroc, variante Tifinagh phonétique)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berbère (Maroc, variante Tifinagh)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berbère (Maroc, Tifinagh étendu phonétique)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berbère (Maroc, Tifinagh étendu)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berbère (Maroc, Tifinagh phonétique)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berbère (Maroc, Tifinagh)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bosnian"
 msgstr "Bosniaque"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosniaque (clavier US avec digraphes bosniaques)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosniaque (clavier US avec lettres bosniaques)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosniaque (utilise les digraphes bosniaques)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosniaque (utilise des guillemets typographiques à la place des guillemets simples)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Both Alt keys together"
 msgstr "Les deux Alt ensemble"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Both Ctrl keys together"
 msgstr "Les deux Ctrl ensemble"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Both Shift keys together"
 msgstr "Les deux Maj. ensemble"
 
-#: ../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 "Les deux touches majuscule activent le verrouillage majuscule, une le désactive"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Both Shift-Keys together toggle Caps Lock"
-msgstr "Les deux touches majuscule font basculer le verrouillage majuscule"
+msgstr "Les deux touches Maj. activent ou désactivent Verr. maj."
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Shift-Keys together toggle ShiftLock"
-msgstr "Les deux touches majuscule font basculer le blocage majuscule"
+msgstr "Les deux touches Maj. activent ou désactivent le blocage majuscule"
 
-#: ../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 (main gauche)"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Braille (right hand)"
 msgstr "Braille (main droite)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:111
 msgid "Brother Internet Keyboard"
 msgstr "Brother : Clavier internet"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:112
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Bulgarian (new phonetic)"
 msgstr "Bulgare (phonétique, nouveau)"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bulgare (phonétique, traditionnel)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:115
 msgid "Burmese"
 msgstr "Birman"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:116
 msgid "Canadian Multilingual"
 msgstr "Canadien multilingue"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Canadian Multilingual (first part)"
 msgstr "Canadien multilingue (première partie)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "Canadian Multilingual (second part)"
 msgstr "Canadien multilingue (seconde partie)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:119
 msgid "Caps Lock"
 msgstr "Verr. maj."
 
-#: ../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 "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:120
+#: ../rules/base.xml.in.h:121
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
-msgstr "Verr. maj. (vers la première disposition), Maj.+verr. maj. (vers la dernière disposition)"
+msgstr "Verr. maj. (première disposition), Maj.+Verr. maj. (dernière disposition)"
 
-#: ../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 "Verr. maj. (si enfoncé), Alt+verr. maj. joue le rôle original de verr. maj."
+msgstr "Verr. maj. (si enfoncé), Alt+Verr. maj. joue le rôle original de Verr. maj."
 
-#: ../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 "Verr. maj. agit comme un verrouillage de maj. Maj. l'annule temporairement"
 
-#: ../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 "Verr. maj. agit comme maj. quand il est verrouillé. Maj. n'a pas d'effet sur verr. Maj."
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock is disabled"
 msgstr "Verr. maj. est désactivé"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock key behavior"
-msgstr "Comportement de la touche verr. maj."
+msgstr "Comportement de la touche Verr. maj."
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock toggles Shift so all keys are affected"
-msgstr "Verr. maj. bascule maj., ce qui affecte toutes les touches"
+msgstr "Verr. maj. active ou désactive maj., ce qui affecte toutes les touches"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
-msgstr "Verr. maj. bascule la mise en majuscule usuelle des caractères alphabétiques"
+msgstr "Verr. maj. active ou désactive la mise en majuscule usuelle des caractères alphabétiques"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
-msgstr "Verr. maj. utilise la mise en majuscule interne. Maj. annule temporairement verr. maj."
+msgstr "Verr. maj. utilise la mise en majuscule interne. Maj. annule temporairement Verr. maj."
 
-#: ../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 "Verr. maj. utilise la mise en majuscule interne. Maj. n'a pas d'effet sur verr. maj."
+msgstr "Verr. maj. utilise la mise en majuscule interne. Maj. n'a pas d'effet sur Verr. maj."
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:131
 msgid "Catalan"
 msgstr "Catalan"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:132
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Catalan (Espagne, avec L point médian)"
+
+#: ../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 (variante)"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:137
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "Cherry CyBo@rd concentrateur USB"
 
-#: ../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 clavier internet"
 
-#: ../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-0108"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:145
 msgid "Chinese"
 msgstr "Chinois"
 
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "Chinois (Tibétain avec nombres ASCII)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "Chinois (Tibétain)"
-
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "Chinois (Ouïghour)"
+msgid "Chuvash"
+msgstr "Chuvash"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Tchouvache
 #: ../rules/base.xml.in.h:147
+msgid "Chuvash (Latin)"
+msgstr "Tchouvache (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 "Cló Gaelach"
+
+#: ../rules/base.xml.in.h:150
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:151
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet (13 touches)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:152
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet (18 touches)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet (7 touches)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:154
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:155
 msgid "Compose key position"
 msgstr "Position de la touche Compose"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:156
 msgid "Control + Alt + Backspace"
 msgstr "Control + Alt + Eff. arrière"
 
-#: ../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 "Ctrl s'obtient avec Alt, Alt s'obtient les touches Windows"
+msgstr "Ctrl est placé sur les touches Alt., Alt. sur les touches 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 "Ctrl s'obtient avec les touches Windows (et les touches Ctrl habituelles)"
+msgstr "Ctrl est placé sur les touches Windows (et les touches Ctrl habituelles)"
 
-#: ../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 "Tatar de Crimée (Q dobroudja)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Tatar de Crimée (Alt.-Q turc)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Tatar de Crimée (F turc)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Tatar de Crimée (Q turc)"
+
+#: ../rules/base.xml.in.h:164
 msgid "Croatian"
 msgstr "Croate"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:165
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Croate (clavier US avec digraphes croates)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:166
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Croate (clavier US avec lettres croates)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
+#: ../rules/base.xml.in.h:167
+msgid "Croatian (use Croatian digraphs)"
 msgstr "Croate (utilise les digraphes croates)"
 
-#: ../rules/base.xml.in.h:162
-msgid "Croatian (Use guillemets for quotes)"
-msgstr "Croate (utilise des guillemets typographiques à la place des guillemets simples)"
+#: ../rules/base.xml.in.h:168
+msgid "Croatian (use guillemets for quotes)"
+msgstr "Croate (utilise des guillemets typo. au lieu des guillemets simples)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Ctrl key position"
 msgstr "Position de la touche Ctrl"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Maj."
 
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 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:166
-msgid "Czech (UCW layout accented letters only)"
+#: ../rules/base.xml.in.h:172
+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:167
+#: ../rules/base.xml.in.h:173
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Tchèque (Dvorak US avec support UCW CZ)"
 
-#: ../rules/base.xml.in.h:168
-msgid "Czech (With &lt;\\|&gt; key)"
-msgstr "Tchèque (avec la touche &lt;\\|&gt;)"
-
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:174
 msgid "Czech (qwerty)"
 msgstr "Tchèque (qwerty)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:175
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Tchèque (qwerty, barre oblique inverse étendue)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:176
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Tchèque (avec la touche &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 "Danois"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Danish (Dvorak)"
 msgstr "Danois (Dvorak)"
 
-#: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
-msgstr "Danois (Mac)"
+#: ../rules/base.xml.in.h:180
+msgid "Danish (Macintosh)"
+msgstr "Danois (Macintosh)"
 
-#: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
-msgstr "Danois (Mac, sans touche morte)"
+#: ../rules/base.xml.in.h:181
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Danois (Macintosh, sans touche morte)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Danish (eliminate dead keys)"
 msgstr "Danois (sans touche morte)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "Default numeric keypad keys"
 msgstr "Touches du pavé numérique par défaut"
 
-#: ../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 touches"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell portable Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell portable Precision série M"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Dell Latitude series laptop"
 msgstr "Dell portable de la série 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 clavier multimédia USB"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa clavier sans fil"
 
-#: ../rules/base.xml.in.h:188
+#: ../rules/base.xml.in.h:194
 msgid "Dhivehi"
 msgstr "Divehi"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond séries 9801 / 9802"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dutch"
 msgstr "Néerlandais"
 
-#: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
-msgstr "Néerlandais (Mac)"
+#: ../rules/base.xml.in.h:197
+msgid "Dutch (Macintosh)"
+msgstr "Néerlandais (Macintosh)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dutch (Sun dead keys)"
 msgstr "Néerlandais (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dutch (standard)"
 msgstr "Néerlandais (standard)"
 
-#: ../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 "Active des caractères typographiques supplémentaires"
 
-#: ../rules/base.xml.in.h:196
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Cameroun
+#: ../rules/base.xml.in.h:202
+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
+msgid "English (Cameroon)"
+msgstr "Anglais (Cameroun)"
+
+#: ../rules/base.xml.in.h:205
 msgid "English (Canada)"
 msgstr "Anglais (Canada)"
 
 # http://colemak.com/
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:206
 msgid "English (Colemak)"
 msgstr "Anglais (Colemak)"
 
 # https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:207
 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:199
+#: ../rules/base.xml.in.h:208
 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:200
+#: ../rules/base.xml.in.h:209
 msgid "English (Dvorak)"
 msgstr "Anglais (Dvorak)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:210
 msgid "English (Ghana)"
 msgstr "Anglais (Ghana)"
 
 # http://www.gillbt.org/
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:211
 msgid "English (Ghana, GILLBT)"
 msgstr "Anglais (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:212
 msgid "English (Ghana, multilingual)"
 msgstr "Anglais (Ghana, multilingue)"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:213
 msgid "English (India, with RupeeSign)"
 msgstr "Anglais (Inde, avec le symbole Roupie)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:214
 msgid "English (Macintosh)"
 msgstr "Anglais (Macintosh)"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
-msgstr "Anglais (Mali, Mac USA)"
+#: ../rules/base.xml.in.h:215
+msgid "English (Mali, US Macintosh)"
+msgstr "Anglais (Mali, Macintosh USA)"
 
-#: ../rules/base.xml.in.h:207
-msgid "English (Mali, USA international)"
+#: ../rules/base.xml.in.h:216
+msgid "English (Mali, US international)"
 msgstr "Anglais (Mali, USA international)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:217
 msgid "English (Nigeria)"
 msgstr "Anglais (Nigeria)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:218
 msgid "English (South Africa)"
 msgstr "Anglais (Afrique du Sud)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:219
 msgid "English (UK)"
 msgstr "Anglais (Royaume-Uni)"
 
 # http://colemak.com/
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:220
 msgid "English (UK, Colemak)"
 msgstr "Anglais (Royaume-Uni, Colemak)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
+#: ../rules/base.xml.in.h:221
+msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Anglais (Royaume-Uni, Dvorak, ponctuation britannique)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:222
 msgid "English (UK, Dvorak)"
 msgstr "Anglais (Royaume-Uni, Dvorak)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
-msgstr "Anglais (Royaume-Uni, Mac international)"
+#: ../rules/base.xml.in.h:223
+msgid "English (UK, Macintosh international)"
+msgstr "Anglais (Royaume-Uni, Macintosh international)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
-msgstr "Anglais (Royaume-Uni, Mac)"
+#: ../rules/base.xml.in.h:224
+msgid "English (UK, Macintosh)"
+msgstr "Anglais (Royaume-Uni, Macintosh)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
-msgstr "Anglais (Royaume-Uni, étendu, touche Windows)"
+#: ../rules/base.xml.in.h:225
+msgid "English (UK, extended WinKeys)"
+msgstr "Anglais (Royaume-Uni, touche Windows étendue)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, international with dead keys)"
 msgstr "Anglais (Royaume-Uni, international, avec touches mortes)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
 msgid "English (US)"
 msgstr "Anglais (USA)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:228
 msgid "English (US, alternative international)"
 msgstr "Anglais (USA, variante internationale)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:229
 msgid "English (US, international with dead keys)"
 msgstr "Anglais (USA, variante internationale, avec touches mortes)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:230
 msgid "English (US, with euro on 5)"
 msgstr "Anglais (USA, avec l'Euro sur le 5)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:231
 msgid "English (classic Dvorak)"
 msgstr "Anglais (Dvorak classique)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:232
 msgid "English (international AltGr dead keys)"
 msgstr "Anglais (international, AltGr, touches mortes)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:233
 msgid "English (layout toggle on multiply/divide key)"
-msgstr "Anglais (la touche multiplier/diviser bascule la disposition)"
+msgstr "Anglais (la touche multiplier/diviser modifie la disposition clavier)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:234
 msgid "English (left handed Dvorak)"
 msgstr "Anglais (Dvorak pour gaucher)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:235
 msgid "English (programmer Dvorak)"
 msgstr "Anglais (Dvorak pour programmeur)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:236
 msgid "English (right handed Dvorak)"
 msgstr "Anglais (Dvorak pour droitier)"
 
-#: ../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 "Entrée sur le pavé numérique"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:239
 msgid "Esperanto"
-msgstr "Esperanto"
+msgstr "Espéranto"
 
-#: ../rules/base.xml.in.h:231
-#, fuzzy
+# http://tecladobrasileiro.com.br/index.php?option=com_content&task=view&id=20&Itemid=62
+#: ../rules/base.xml.in.h:240
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Espéranto (Portugal, PT-Nativo)"
+
+#: ../rules/base.xml.in.h:241
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
-msgstr "(Obsolète) Point-virgule et guillemets droits déplacés"
+msgstr "Espéranto (point-virgule et guillemets simples déplacés, obsolète)"
 
-#: ../rules/base.xml.in.h:232
-#, fuzzy
+#: ../rules/base.xml.in.h:242
 msgid "Estonian"
-msgstr "Estonie"
+msgstr "Estonien"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:243
 msgid "Estonian (Dvorak)"
-msgstr ""
+msgstr "Estonien (Dvorak)"
 
-#: ../rules/base.xml.in.h:234
-#, fuzzy
+#: ../rules/base.xml.in.h:244
 msgid "Estonian (US keyboard with Estonian letters)"
-msgstr "Clavier US avec lettres estoniennes"
+msgstr "Estonien (clavier US avec lettres estoniennes)"
 
-#: ../rules/base.xml.in.h:235
-#, fuzzy
+#: ../rules/base.xml.in.h:245
 msgid "Estonian (eliminate dead keys)"
-msgstr "Éliminer les touches mortes"
+msgstr "Estonien (sans touche morte)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:246
 msgid "Euro on 2"
 msgstr "Euro sur le 2"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:247
 msgid "Euro on 4"
 msgstr "Euro sur le 4"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:248
 msgid "Euro on 5"
 msgstr "Euro sur le 5"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:249
 msgid "Euro on E"
 msgstr "Euro sur le 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"
+msgstr "Éwé"
 
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:252
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:243
-#, fuzzy
+#: ../rules/base.xml.in.h:253
 msgid "Faroese"
-msgstr "Féroé, Îles"
+msgstr "Féroïen"
 
-#: ../rules/base.xml.in.h:244
-#, fuzzy
+#: ../rules/base.xml.in.h:254
 msgid "Faroese (eliminate dead keys)"
-msgstr "Français, sans touches mortes"
+msgstr "Féroïen (sans touche morte)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:255
 msgid "Filipino"
-msgstr ""
+msgstr "Filipino"
 
-#: ../rules/base.xml.in.h:246
+# http://www.michaelcapewell.com/projects/keyboard/#The_Capewell-Dvorak_Layout
+#: ../rules/base.xml.in.h:256
 msgid "Filipino (Capewell-Dvorak Baybayin)"
-msgstr ""
+msgstr "Filipino (Capewell-Dvorak, baybayin)"
 
-#: ../rules/base.xml.in.h:247
+# http://www.michaelcapewell.com/projects/keyboard/#The_Capewell-Dvorak_Layout
+#: ../rules/base.xml.in.h:257
 msgid "Filipino (Capewell-Dvorak Latin)"
-msgstr ""
+msgstr "Filipino (Capewell-Dvorak, latin)"
 
-#: ../rules/base.xml.in.h:248
+# http://www.michaelcapewell.com/projects/keyboard/#The_QWERF_Layout
+#: ../rules/base.xml.in.h:258
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
-msgstr ""
+msgstr "Filipino (Capewell-QWERF 2006, baybayin)"
 
-#: ../rules/base.xml.in.h:249
+# http://www.michaelcapewell.com/projects/keyboard/#The_QWERF_Layout
+#: ../rules/base.xml.in.h:259
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
-msgstr ""
+msgstr "Filipino (Capewell-QWERF 2006, latin)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:260
 msgid "Filipino (Colemak Baybayin)"
-msgstr ""
+msgstr "Filipino (Colemak, baybayin)"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Colemak Latin)"
-msgstr ""
+msgstr "Filipino (Colemak, latin)"
 
-#: ../rules/base.xml.in.h:252
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Baybayin
+#: ../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 ""
+msgstr "Filipino (Dvorak, latin)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (QWERTY Baybayin)"
-msgstr ""
+msgstr "Filipino (baybayin, qwerty)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:265
 msgid "Finnish"
-msgstr ""
+msgstr "Finnois"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
-msgstr ""
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
+msgstr "Finnois (Macintosh)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:267
 msgid "Finnish (classic)"
-msgstr ""
+msgstr "Finnois (classique)"
 
-#: ../rules/base.xml.in.h:257
-#, fuzzy
+#: ../rules/base.xml.in.h:268
 msgid "Finnish (classic, eliminate dead keys)"
-msgstr "Français, sans touches mortes"
-
-#: ../rules/base.xml.in.h:258
-#, fuzzy
-msgid "Finnish (northern Saami)"
-msgstr "Sami du Nord"
+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:261
+#: ../rules/base.xml.in.h:271
 msgid "Four-level key with abstract separators"
-msgstr "Touches à quatre niveaux avec séparateurs abstraits"
+msgstr "Touche à quatre niveaux avec le séparateur décimal abstrait"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:272
 msgid "Four-level key with comma"
-msgstr "Touches à quatre niveaux avec virgule"
+msgstr "Touche à quatre niveaux avec virgule"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:273
 msgid "Four-level key with dot"
-msgstr "Touches à quatre niveaux avec point"
+msgstr "Touche à quatre niveaux avec point"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:274
 msgid "Four-level key with dot, latin-9 restriction"
-msgstr "Touches à quatre niveaux avec point, avec restrinction Latin-9"
+msgstr "Touche à quatre niveaux avec point, latin-9 uniquement"
 
-#: ../rules/base.xml.in.h:265
+# Le momayyez est le séparateur décimal perse.
+#: ../rules/base.xml.in.h:275
 msgid "Four-level key with momayyez"
-msgstr "Touches à quatre niveaux avec momayyez"
+msgstr "Touche à quatre niveaux avec le séparateur décimal momayyez"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:276
 msgid "French"
 msgstr "Français"
 
 # http://bepo.fr
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:277
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Français (Bépo, ergonomique, façon Dvorak)"
 
 # http://bepo.fr
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:278
 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:269
+#: ../rules/base.xml.in.h:279
 msgid "French (Breton)"
-msgstr "Français (Breton)"
+msgstr "Français (breton)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:280
+msgid "French (Cameroon azerty)"
+msgstr "Français (Cameroun, azerty)"
+
+#: ../rules/base.xml.in.h:281
+msgid "French (Cameroon)"
+msgstr "Français (Cameroun)"
+
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "Français (Canada)"
+
+#: ../rules/base.xml.in.h:283
 msgid "French (Canada, Dvorak)"
 msgstr "Français (Canada, Dvorak)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:284
 msgid "French (Canada, legacy)"
 msgstr "Français (Canada, obsolète)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:285
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Français (République démocratique du Congo)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:286
 msgid "French (Dvorak)"
 msgstr "Français (Dvorak)"
 
-#: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
-msgstr "Français (azerty géorgien Tskapo)"
-
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:287
 msgid "French (Guinea)"
 msgstr "Français (Guinée)"
 
-#: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
-msgstr "Français (Mac)"
+#: ../rules/base.xml.in.h:288
+msgid "French (Macintosh)"
+msgstr "Français (Macintosh)"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:289
 msgid "French (Mali, alternative)"
 msgstr "Français (Mali, variante)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:290
 msgid "French (Morocco)"
 msgstr "Français (Maroc)"
 
-#: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
-msgstr "Français (Occitan)"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:291
 msgid "French (Sun dead keys)"
 msgstr "Français (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:292
 msgid "French (Switzerland)"
 msgstr "Français (Suisse)"
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
-msgstr "Français (Suisse, Mac)"
+#: ../rules/base.xml.in.h:293
+msgid "French (Switzerland, Macintosh)"
+msgstr "Français (Suisse, Macintosh)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:294
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Français (Suisse, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:295
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Français (Suisse, sans touche morte)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:296
 msgid "French (alternative)"
 msgstr "Français (variante)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:297
 msgid "French (alternative, Sun dead keys)"
 msgstr "Français (variante, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:298
 msgid "French (alternative, eliminate dead keys)"
-msgstr "Français (variante, sans touches mortes)"
+msgstr "Français (variante, sans touche morte)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:299
 msgid "French (alternative, latin-9 only)"
 msgstr "Français (variante, latin-9 uniquement)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:300
 msgid "French (eliminate dead keys)"
 msgstr "Français (sans touche morte)"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
+#: ../rules/base.xml.in.h:301
+msgid "French (legacy, alternative)"
 msgstr "Français (variante obsolète)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:302
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Français (variante obsolète, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:303
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Français (variante obsolète, sans touche morte)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:304
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Portable Fujitsu-Siemens Computers AMILO"
 
-#: ../rules/base.xml.in.h:294
+# https://secure.wikimedia.org/wikipedia/en/wiki/Fula_language
+#: ../rules/base.xml.in.h:305
 msgid "Fula"
 msgstr "Peul"
 
-#: ../rules/base.xml.in.h:295
-msgid "GBr"
-msgstr "GBr"
-
-#: ../rules/base.xml.in.h:296
+# Langue du Ghana.
+#: ../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 générique 101 touches"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:308
 msgid "Generic 102-key (Intl) PC"
 msgstr "PC générique 102 touches (intl)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:309
 msgid "Generic 104-key PC"
 msgstr "PC générique 104 touches"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:310
 msgid "Generic 105-key (Intl) PC"
 msgstr "PC générique 105 touches (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 KWD-910"
+msgstr "Genius Comfy KB-16M / MM 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 "Géorgien"
 
-#: ../rules/base.xml.in.h:307
-#, fuzzy
-msgid "Georgian (MESS)"
-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
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Géorgien (France, azerty Tskapo)"
 
-#: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
-msgstr ""
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Oss%C3%A8te
+#: ../rules/base.xml.in.h:318
+msgid "Georgian (Italy)"
+msgstr "Géorgien (Italie)"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:319
+msgid "Georgian (MESS)"
+msgstr "Géorgien (MESS)"
+
+#: ../rules/base.xml.in.h:320
 msgid "Georgian (ergonomic)"
-msgstr ""
+msgstr "Géorgien (ergonomique)"
 
-#: ../rules/base.xml.in.h:310
-#, fuzzy
+#: ../rules/base.xml.in.h:321
 msgid "German"
-msgstr "Allemagne"
+msgstr "Allemand"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:322
 msgid "German (Austria)"
-msgstr ""
+msgstr "Allemand (Autriche)"
 
-#: ../rules/base.xml.in.h:312
-#, fuzzy
-msgid "German (Austria, Mac)"
-msgstr "Allemand (Apple-Macintosh)"
+#: ../rules/base.xml.in.h:323
+msgid "German (Austria, Macintosh)"
+msgstr "Allemand (Autriche, Macintosh)"
 
-#: ../rules/base.xml.in.h:313
-#, fuzzy
+#: ../rules/base.xml.in.h:324
 msgid "German (Austria, Sun dead keys)"
-msgstr "Allemand, touches mortes Sun"
+msgstr "Allemand (Autriche, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:314
-#, fuzzy
+#: ../rules/base.xml.in.h:325
 msgid "German (Austria, eliminate dead keys)"
-msgstr "Allemand, sans touches mortes"
+msgstr "Allemand (Autriche, sans touche morte)"
 
-#: ../rules/base.xml.in.h:315
-#, fuzzy
+#: ../rules/base.xml.in.h:326
 msgid "German (Dvorak)"
-msgstr "Dvorak français"
+msgstr "Allemand (Dvorak)"
 
-#: ../rules/base.xml.in.h:316
-#, fuzzy
-msgid "German (Mac)"
-msgstr "Allemand (Apple-Macintosh)"
+#: ../rules/base.xml.in.h:327
+msgid "German (Macintosh)"
+msgstr "Allemand (Macintosh)"
 
-#: ../rules/base.xml.in.h:317
-#, fuzzy
-msgid "German (Mac, eliminate dead keys)"
-msgstr "Allemand, sans touches mortes"
+#: ../rules/base.xml.in.h:328
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Allemand (Macintosh, sans touche morte)"
 
-#: ../rules/base.xml.in.h:318
-#, fuzzy
+# https://secure.wikimedia.org/wikipedia/en/wiki/Keyboard_layout#Neo
+#: ../rules/base.xml.in.h:329
 msgid "German (Neo 2)"
-msgstr "Allemand (Apple-Macintosh)"
+msgstr "Allemand (Neo 2)"
 
-#: ../rules/base.xml.in.h:319
-#, fuzzy
-msgid "German (Romanian keyboard with German letters)"
-msgstr "Clavier roumain avec lettres allemandes"
-
-#: ../rules/base.xml.in.h:320
-#, fuzzy
-msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
-msgstr "Clavier roumain avec lettres allemandes, sans touches mortes"
-
-#: ../rules/base.xml.in.h:321
-#, fuzzy
+#: ../rules/base.xml.in.h:330
 msgid "German (Sun dead keys)"
-msgstr "Allemand, touches mortes Sun"
+msgstr "Allemand (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:322
-#, fuzzy
-msgid "German (Switzerland, Mac)"
-msgstr "Suisse"
+#: ../rules/base.xml.in.h:331
+msgid "German (Switzerland)"
+msgstr "Allemand (Suisse)"
 
-#: ../rules/base.xml.in.h:323
-#, fuzzy
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
+msgstr "Allemand (Suisse, Macintosh)"
+
+#: ../rules/base.xml.in.h:333
 msgid "German (Switzerland, Sun dead keys)"
-msgstr "Allemand, touches mortes Sun"
+msgstr "Allemand (Suisse, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:324
-#, fuzzy
+#: ../rules/base.xml.in.h:334
 msgid "German (Switzerland, eliminate dead keys)"
-msgstr "Allemand, sans touches mortes"
+msgstr "Allemand (Suisse, sans touche morte)"
 
-#: ../rules/base.xml.in.h:325
-#, fuzzy
+#: ../rules/base.xml.in.h:335
+msgid "German (Switzerland, legacy)"
+msgstr "Allemand (Suisse, obsolète)"
+
+#: ../rules/base.xml.in.h:336
 msgid "German (dead acute)"
-msgstr "Allemand, touches mortes Sun"
+msgstr "Allemand (accent aigu en touche morte)"
 
-#: ../rules/base.xml.in.h:326
-#, fuzzy
+#: ../rules/base.xml.in.h:337
 msgid "German (dead grave acute)"
-msgstr "Touche morte d'accent grave"
+msgstr "Allemand (accents aigu et grave en touches mortes)"
 
-#: ../rules/base.xml.in.h:327
-#, fuzzy
+#: ../rules/base.xml.in.h:338
 msgid "German (eliminate dead keys)"
-msgstr "Allemand, sans touches mortes"
-
-#: ../rules/base.xml.in.h:328
-#, fuzzy
-msgid "German (lower Sorbian qwertz)"
-msgstr "Serbe minuscule (qwertz)"
-
-#: ../rules/base.xml.in.h:329
-#, fuzzy
-msgid "German (lower Sorbian)"
-msgstr "Serbe minuscule"
+msgstr "Allemand (sans touche morte)"
 
-#: ../rules/base.xml.in.h:330
-#, fuzzy
+#: ../rules/base.xml.in.h:339
 msgid "German (qwerty)"
-msgstr "Latin qwerty"
+msgstr "Allemand (qwerty)"
 
-#: ../rules/base.xml.in.h:331
-#, fuzzy
+#: ../rules/base.xml.in.h:340
 msgid "Greek"
-msgstr "Grèce"
+msgstr "Grec"
 
-#: ../rules/base.xml.in.h:332
-#, fuzzy
+#: ../rules/base.xml.in.h:341
 msgid "Greek (eliminate dead keys)"
-msgstr "Français, sans touches mortes"
+msgstr "Grec (sans touche morte)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:342
 msgid "Greek (extended)"
-msgstr ""
+msgstr "Grec (étendu)"
 
-#: ../rules/base.xml.in.h:334
-#, fuzzy
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Diacritiques_de_l%27alphabet_grec
+#: ../rules/base.xml.in.h:343
 msgid "Greek (polytonic)"
-msgstr "Polytonique"
+msgstr "Grec (polytonique)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:344
 msgid "Greek (simple)"
-msgstr ""
+msgstr "Grec (simple)"
 
-#: ../rules/base.xml.in.h:336
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Gujar%C3%A2t%C3%AE
+#: ../rules/base.xml.in.h:345
 msgid "Gujarati"
-msgstr "Gujarati"
+msgstr "Gujarâtî"
 
-#: ../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 "Clavier Happy Hacking"
+msgstr "Happy Hacking"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:349
 msgid "Happy Hacking Keyboard for Mac"
-msgstr "Clavier Happy Hacking pour Mac"
+msgstr "Happy Hacking pour Mac"
 
-#: ../rules/base.xml.in.h:341
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Haoussa
+#: ../rules/base.xml.in.h:350
 msgid "Hausa"
 msgstr "Haoussa"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:351
 msgid "Hebrew"
-msgstr ""
+msgstr "Hébreu"
 
-#: ../rules/base.xml.in.h:343
-#, fuzzy
-msgid "Hebrew (Phonetic)"
-msgstr "Nouveau phonétique"
-
-#: ../rules/base.xml.in.h:344
-#, fuzzy
-msgid "Hebrew (Tiro)"
-msgstr "Hébreu biblique (Tiro)"
+# http://wiki.jewishliturgy.org/Hebrew_Font_and_Keyboard_Layout_Setup
+#: ../rules/base.xml.in.h:352
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Hébreu (biblique, Tiro)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "Hebrew (lyx)"
-msgstr ""
+msgstr "Hébreu (lyx)"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
+msgid "Hebrew (phonetic)"
+msgstr "Hébreu (phonétique)"
+
+#: ../rules/base.xml.in.h:355
 msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet"
+msgstr "Hewlett-Packard clavier internet"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:356
 msgid "Hewlett-Packard Mini 110 Notebook"
-msgstr "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard portable Mini 110"
 
-#: ../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, clavier multimedia"
 
-#: ../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 "Hexadécimal"
 
-#: ../rules/base.xml.in.h:359
-#, fuzzy
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Hindi
+# http://indlinux.org/wiki/index.php/BolNagri
+#: ../rules/base.xml.in.h:368
 msgid "Hindi (Bolnagri)"
-msgstr "Hindi Bolnagri"
+msgstr "Hindi (bolnagri)"
 
-#: ../rules/base.xml.in.h:360
-#, fuzzy
+#: ../rules/base.xml.in.h:369
 msgid "Hindi (Wx)"
-msgstr "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"
 
-#: ../rules/base.xml.in.h:363
-#, fuzzy
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Hongrois
+#: ../rules/base.xml.in.h:372
 msgid "Hungarian"
-msgstr "Hongrie"
+msgstr "Hongrois"
 
-#: ../rules/base.xml.in.h:364
-#, fuzzy
+#: ../rules/base.xml.in.h:373
 msgid "Hungarian (101/qwerty/comma/dead keys)"
-msgstr "101/qwerty/virgule/touches mortes"
+msgstr "Hongrois (101, qwerty, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:365
-#, fuzzy
+#: ../rules/base.xml.in.h:374
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
-msgstr "101/qwerty/virgule/sans touches mortes"
+msgstr "Hongrois (101, qwerty, virgule, sans touche morte)"
 
-#: ../rules/base.xml.in.h:366
-#, fuzzy
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian (101/qwerty/dot/dead keys)"
-msgstr "101/qwerty/point/touches mortes"
+msgstr "Hongrois (101, qwerty, point, touches mortes)"
 
-#: ../rules/base.xml.in.h:367
-#, fuzzy
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
-msgstr "101/qwerty/point/sans touches mortes"
+msgstr "Hongrois (101, qwerty, point, sans touche morte)"
 
-#: ../rules/base.xml.in.h:368
-#, fuzzy
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwertz/comma/dead keys)"
-msgstr "101/qwertz/virgule/touches mortes"
+msgstr "Hongrois (101, qwertz, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:369
-#, fuzzy
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
-msgstr "101/qwertz/virgule/sans touches mortes"
+msgstr "Hongrois (101, qwertz, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:370
-#, fuzzy
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwertz/dot/dead keys)"
-msgstr "101/qwertz/point/touches mortes"
+msgstr "Hongrois (101, qwertz, point,  touches mortes)"
 
-#: ../rules/base.xml.in.h:371
-#, fuzzy
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
-msgstr "101/qwertz/point/sans touches mortes"
+msgstr "Hongrois (101, qwertz, point, sans touche morte)"
 
-#: ../rules/base.xml.in.h:372
-#, fuzzy
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (102/qwerty/comma/dead keys)"
-msgstr "102/qwerty/virgule/touches mortes"
+msgstr "Hongrois (102, qwerty, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:373
-#, fuzzy
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
-msgstr "102/qwerty/virgule/sans touches mortes"
+msgstr "Hongrois (102, qwerty, virgule, sans touche morte)"
 
-#: ../rules/base.xml.in.h:374
-#, fuzzy
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (102/qwerty/dot/dead keys)"
-msgstr "102/qwerty/point/touches mortes"
+msgstr "Hongrois (102, qwerty, point, touches mortes)"
 
-#: ../rules/base.xml.in.h:375
-#, fuzzy
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
-msgstr "102/qwerty/point/sans touches mortes"
+msgstr "Hongrois (102, qwerty, point, sans touche morte)"
 
-#: ../rules/base.xml.in.h:376
-#, fuzzy
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwertz/comma/dead keys)"
-msgstr "102/qwertz/virgule/touches mortes"
+msgstr "Hongrois (102, qwertz, virgule, touches mortes)"
 
-#: ../rules/base.xml.in.h:377
-#, fuzzy
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
-msgstr "102/qwertz/virgule/sans touches mortes"
+msgstr "Hongrois (102, qwertz, virgule, sans touche morte)"
 
-#: ../rules/base.xml.in.h:378
-#, fuzzy
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwertz/dot/dead keys)"
-msgstr "102/qwertz/point/touches mortes"
+msgstr "Hongrois (102, qwertz, point, touches mortes)"
 
-#: ../rules/base.xml.in.h:379
-#, fuzzy
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
-msgstr "102/qwertz/point/sans touches mortes"
+msgstr "Hongrois (102, qwertz, point, sans touche morte)"
 
-#: ../rules/base.xml.in.h:380
-#, fuzzy
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (eliminate dead keys)"
-msgstr "Allemand, sans touches mortes"
+msgstr "Hongrois (sans touche morte)"
 
-#: ../rules/base.xml.in.h:381
-#, fuzzy
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (qwerty)"
-msgstr "Latin qwerty"
+msgstr "Hongrois (qwerty)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (standard)"
-msgstr ""
+msgstr "Hongrois (standard)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:392
 msgid "Hyper is mapped to Win-keys"
-msgstr "Hyper est obtenu avec n'importe quelle touche Logo"
+msgstr "Hyper est placé sur les touches 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
-#, fuzzy
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Islandais
+#: ../rules/base.xml.in.h:399
 msgid "Icelandic"
-msgstr "Islande"
+msgstr "Islandais"
 
-#: ../rules/base.xml.in.h:391
-#, fuzzy
+#: ../rules/base.xml.in.h:400
 msgid "Icelandic (Dvorak)"
-msgstr "Dvorak classique"
+msgstr "Islandais (Dvorak)"
 
-#: ../rules/base.xml.in.h:392
-#, fuzzy
-msgid "Icelandic (Mac)"
-msgstr "Islande"
+#: ../rules/base.xml.in.h:401
+msgid "Icelandic (Macintosh)"
+msgstr "Islandais (Macintosh)"
 
-#: ../rules/base.xml.in.h:393
-#, fuzzy
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic (Sun dead keys)"
-msgstr "Français, touches mortes Sun"
+msgstr "Islandais (touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:394
-#, fuzzy
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (eliminate dead keys)"
-msgstr "Français, sans touches mortes"
+msgstr "Islandais (sans touche morte)"
 
-#: ../rules/base.xml.in.h:395
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Igbo
+#: ../rules/base.xml.in.h:404
 msgid "Igbo"
 msgstr "Igbo"
 
-#: ../rules/base.xml.in.h:396
-#, fuzzy
+#: ../rules/base.xml.in.h:405
 msgid "Indian"
-msgstr "Inde"
+msgstr "Indien"
 
-#: ../rules/base.xml.in.h:397
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Inuktitut
+#: ../rules/base.xml.in.h:406
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../rules/base.xml.in.h:398
-#, fuzzy
+#: ../rules/base.xml.in.h:407
 msgid "Iraqi"
-msgstr "Irak"
+msgstr "Irakien"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:408
 msgid "Irish"
-msgstr ""
-
-#: ../rules/base.xml.in.h:400
-#, fuzzy
-msgid "Irish (CloGaelach)"
-msgstr "CloGaelach"
-
-#: ../rules/base.xml.in.h:401
-#, fuzzy
-msgid "Irish (Ogham IS434)"
-msgstr "Ogham IS434"
+msgstr "Irlandais"
 
-#: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:403
-#, fuzzy
+#: ../rules/base.xml.in.h:409
 msgid "Irish (UnicodeExpert)"
-msgstr "UnicodeExpert"
+msgstr "Irlandais (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:404
-#, fuzzy
+#: ../rules/base.xml.in.h:410
 msgid "Italian"
-msgstr "Italie"
+msgstr "Italien"
 
-#: ../rules/base.xml.in.h:405
-#, fuzzy
-msgid "Italian (Georgian)"
-msgstr "Géorgien"
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
-msgstr ""
+#: ../rules/base.xml.in.h:411
+msgid "Italian (Macintosh)"
+msgstr "Italien (Macintosh)"
 
-#: ../rules/base.xml.in.h:407
-#, fuzzy
+#: ../rules/base.xml.in.h:412
 msgid "Italian (US keyboard with Italian letters)"
-msgstr "Clavier US avec lettres italiennes"
+msgstr "Italien (clavier US avec lettres italiennes)"
 
-#: ../rules/base.xml.in.h:408
-#, fuzzy
+#: ../rules/base.xml.in.h:413
 msgid "Italian (eliminate dead keys)"
-msgstr "Allemand, sans touches mortes"
+msgstr "Italien (sans touche morte)"
 
-#: ../rules/base.xml.in.h:409
-#, fuzzy
+#: ../rules/base.xml.in.h:414
 msgid "Japanese"
-msgstr "Japon"
+msgstr "Japonais"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:415
 msgid "Japanese (Kana 86)"
-msgstr ""
+msgstr "Japonais (Kana 86)"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:416
 msgid "Japanese (Kana)"
-msgstr ""
+msgstr "Japonais (Kana)"
 
-#: ../rules/base.xml.in.h:412
-#, fuzzy
-msgid "Japanese (Mac)"
-msgstr "Japonais 106 touches"
+#: ../rules/base.xml.in.h:417
+msgid "Japanese (Macintosh)"
+msgstr "Japonais (Macintosh)"
 
-#: ../rules/base.xml.in.h:413
-#, fuzzy
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (OADG 109A)"
-msgstr "OADG 109A"
+msgstr "Japonais (OADG 109A)"
 
-#: ../rules/base.xml.in.h:414
-#, fuzzy
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (PC-98xx Series)"
-msgstr "PC-98xx japonais"
+msgstr "Japonais (PC-98xx)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:420
 msgid "Japanese keyboard options"
-msgstr "Options de clavier japonais"
+msgstr "Options des claviers japonais"
 
-#: ../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 "La touche de verrouillage Kana agit comme touche de verrouillage"
+msgstr "La touche « verrouillage Kana » verrouille"
 
-#: ../rules/base.xml.in.h:417
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Kannada
+#: ../rules/base.xml.in.h:423
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:418
-#, fuzzy
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Cachoube
+#: ../rules/base.xml.in.h:424
+msgid "Kashubian"
+msgstr "Cachoube"
+
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakh
+#: ../rules/base.xml.in.h:425
 msgid "Kazakh"
-msgstr "Kazakhstan"
+msgstr "Kazakh"
 
-#: ../rules/base.xml.in.h:419
-#, fuzzy
+#: ../rules/base.xml.in.h:426
 msgid "Kazakh (with Russian)"
-msgstr "Kazakh avec russe"
+msgstr "Kazakh (avec russe)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:427
 msgid "Key sequence to kill the X server"
-msgstr "Séquence de touches pour fermer le serveur X"
+msgstr "Séquence de touches pour tuer le serveur X"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:428
 msgid "Key to choose 3rd level"
 msgstr "Touche sélectionnant le 3e niveau"
 
-#: ../rules/base.xml.in.h:422
-#, fuzzy
+#: ../rules/base.xml.in.h:429
 msgid "Key to choose 5th level"
-msgstr "Touche sélectionnant le 3e niveau"
+msgstr "Touche sélectionnant le 5e niveau"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:430
 msgid "Key(s) to change layout"
-msgstr "Touche(s) changeant de disposition."
+msgstr "Touches modifiant la disposition du clavier"
 
-#: ../rules/base.xml.in.h:424
+#: ../rules/base.xml.in.h:431
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:425
-#, fuzzy
-msgid "Khmer (Cambodian)"
-msgstr "Cambodge"
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Khmer
+#: ../rules/base.xml.in.h:432
+msgid "Khmer (Cambodia)"
+msgstr "Khmer (Cambodge)"
 
-#: ../rules/base.xml.in.h:426
+# Langue bantoue.
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Kikuyu_%28langue%29
+#: ../rules/base.xml.in.h:433
 msgid "Kikuyu"
-msgstr ""
+msgstr "Kikuyu"
 
-#: ../rules/base.xml.in.h:427
+# Claviers.
+# http://www.kinesis-ergo.com/keyboards.htm
+#: ../rules/base.xml.in.h:434
 msgid "Kinesis"
-msgstr ""
+msgstr "Kinesis"
 
-#: ../rules/base.xml.in.h:428
-#, fuzzy
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Komi_%28langue%29
+#: ../rules/base.xml.in.h:435
+msgid "Komi"
+msgstr "Komi"
+
+#: ../rules/base.xml.in.h:436
 msgid "Korean"
-msgstr "Coréen 106 touches"
+msgstr "Coréen"
 
-#: ../rules/base.xml.in.h:429
-#, fuzzy
+#: ../rules/base.xml.in.h:437
 msgid "Korean (101/104 key compatible)"
-msgstr "Compatible 101/104 touches"
+msgstr "Coréen (compatible 101/104 touches)"
 
-#: ../rules/base.xml.in.h:430
-#, fuzzy
+#: ../rules/base.xml.in.h:438
 msgid "Kurdish (Iran, Arabic-Latin)"
-msgstr "Kurde, Arabe-latin"
+msgstr "Kurde (Iran, arabe-latin)"
 
-#: ../rules/base.xml.in.h:431
-#, fuzzy
+#: ../rules/base.xml.in.h:439
 msgid "Kurdish (Iran, F)"
-msgstr "Kurde, (F)"
+msgstr "Kurde (Iran, F)"
 
-#: ../rules/base.xml.in.h:432
-#, fuzzy
-msgid "Kurdish (Iran, Latin Q)"
-msgstr "Kurde, Latin Q"
+#: ../rules/base.xml.in.h:440
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kurde (Iran, Alt-Q latin)"
 
-#: ../rules/base.xml.in.h:433
-#, fuzzy
-msgid "Kurdish (Iran, latin alt-Q)"
-msgstr "Kurde, Latin Alt-Q"
+#: ../rules/base.xml.in.h:441
+msgid "Kurdish (Iran, Latin Q)"
+msgstr "Kurde (Iran, Q latin)"
 
-#: ../rules/base.xml.in.h:434
-#, fuzzy
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iraq, Arabic-Latin)"
-msgstr "Kurde, Arabe-latin"
+msgstr "Kurde (Irak, arabe-latin)"
 
-#: ../rules/base.xml.in.h:435
-#, fuzzy
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iraq, F)"
-msgstr "Kurde, (F)"
+msgstr "Kurde (Irak, F)"
 
-#: ../rules/base.xml.in.h:436
-#, fuzzy
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iraq, Latin Alt-Q)"
-msgstr "Kurde, Latin Alt-Q"
+msgstr "Kurde (Irak, Alt-Q latin)"
 
-#: ../rules/base.xml.in.h:437
-#, fuzzy
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Latin Q)"
-msgstr "Kurde, Latin Q"
+msgstr "Kurde (Irak, Q latin)"
 
-#: ../rules/base.xml.in.h:438
-#, fuzzy
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Syria, F)"
-msgstr "Kurde, (F)"
+msgstr "Kurde (Syrie, F)"
 
-#: ../rules/base.xml.in.h:439
-#, fuzzy
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Syria, Latin Alt-Q)"
-msgstr "Kurde, Latin Alt-Q"
+msgstr "Kurde (Syrie, Alt-Q latin)"
 
-#: ../rules/base.xml.in.h:440
-#, fuzzy
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Syria, Latin Q)"
-msgstr "Kurde, Latin Q"
+msgstr "Kurde (Syrie, Q latin)"
 
-#: ../rules/base.xml.in.h:441
-#, fuzzy
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Turkey, F)"
-msgstr "Kurde, (F)"
+msgstr "Kurde (Turquie, F)"
 
-#: ../rules/base.xml.in.h:442
-#, fuzzy
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Turkey, Latin Alt-Q)"
-msgstr "Kurde, Latin Alt-Q"
+msgstr "Kurde (Turquie, Alt-Q latin)"
 
-#: ../rules/base.xml.in.h:443
-#, fuzzy
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Turkey, Latin Q)"
-msgstr "Kurde, Latin Q"
+msgstr "Kurde (Turquie, Q latin)"
 
-#: ../rules/base.xml.in.h:444
-msgid "Kutenai"
-msgstr ""
-
-#: ../rules/base.xml.in.h:445
-#, fuzzy
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Kirghize_%28langue%29
+#: ../rules/base.xml.in.h:452
 msgid "Kyrgyz"
-msgstr "Kirghizistan"
+msgstr "Kirghize"
 
-#: ../rules/base.xml.in.h:446
-#, fuzzy
+#: ../rules/base.xml.in.h:453
 msgid "Kyrgyz (phonetic)"
-msgstr "Phonétique syriaque"
+msgstr "Kirghize (phonétique)"
 
-#: ../rules/base.xml.in.h:447
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Lao_%28langue%29
+#: ../rules/base.xml.in.h:454
 msgid "Lao"
 msgstr "Lao"
 
-#: ../rules/base.xml.in.h:448
+# 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
 msgid "Lao (STEA proposed standard layout)"
-msgstr ""
+msgstr "Lao (disposition proposée par la STEA)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:456
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Compaq portable (p.e. Armada)"
+msgstr "Compaq portable (p.ex. Armada)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:457
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Compaq portable Internet (p.e. Presario)"
+msgstr "Compaq portable clavier Internet (p.ex. Presario)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:458
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "eMachines m68xx"
 
-#: ../rules/base.xml.in.h:452
-#, fuzzy
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
 msgid "Latvian"
-msgstr "Lettonie"
-
-#: ../rules/base.xml.in.h:453
-#, fuzzy
-msgid "Latvian (Apostrophe ' variant)"
-msgstr "Variante apostrophe"
+msgstr "Letton"
 
-#: ../rules/base.xml.in.h:454
-#, fuzzy
+#: ../rules/base.xml.in.h:460
 msgid "Latvian (F variant)"
-msgstr "Variante (F)"
+msgstr "Letton (variante F)"
 
-#: ../rules/base.xml.in.h:455
-#, fuzzy
-msgid "Latvian (Tilde ~ variant)"
-msgstr "Variante avec tilde"
+#: ../rules/base.xml.in.h:461
+msgid "Latvian (adapted)"
+msgstr "Letton (adapté)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:462
+msgid "Latvian (apostrophe variant)"
+msgstr "Letton (variante apostrophe)"
+
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Letton (ergonomique, ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:464
+msgid "Latvian (modern)"
+msgstr "Letton (moderne)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "Letton (variante tilde)"
+
+#: ../rules/base.xml.in.h:466
 msgid "Left Alt"
 msgstr "Alt gauche"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:467
 msgid "Left Alt (while pressed)"
-msgstr "Alt de gauche (lorsque pressée)"
+msgstr "Alt gauche (si enfoncé)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:468
 msgid "Left Alt is swapped with Left Win"
-msgstr "La touche Alt de gauche est échangée avec la touche Logo de gauche"
+msgstr "Alt. gauche échangé avec Windows droit"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:469
 msgid "Left Ctrl"
 msgstr "Ctrl gauche"
 
-#: ../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 gauche (première disposition), Ctrl droi (dernière disposition)"
+msgstr "Ctrl gauche (première disposition), Ctrl droit (dernière disposition)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:471
 msgid "Left Ctrl+Left Shift"
 msgstr "Ctrl gauche+Maj. gauche"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:472
 msgid "Left Shift"
 msgstr "Maj. gauche"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:473
 msgid "Left Win"
-msgstr "Touche Logo gauche"
+msgstr "Touche Windows gauche"
 
-#: ../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 "Touche Logo de gauche (première disposition), touche Logo de droite (dernière disposition)"
+msgstr "Touche Windows gauche (première disposition), touche Windows droite (dernière disposition)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:475
 msgid "Left Win (while pressed)"
-msgstr "Logo de gauche (lorsque pressée)"
+msgstr "Windows gauche (si enfoncé)"
 
-#: ../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 ""
+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: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 ""
+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:468
-#, fuzzy
+#: ../rules/base.xml.in.h:478
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
-msgstr "Ctrl gauche (première disposition), Ctrl droi (dernière disposition)"
+msgstr "Ctrl gauche + Windows gauche (première disposition), Ctrl droit + Menu (seconde disposition)"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:479
 msgid "Legacy"
 msgstr "Obsolète"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:480
 msgid "Legacy Wang 724"
-msgstr "Clavier Wang 724 obsolète"
+msgstr "Wang 724 (clavier obsolète)"
 
 #. 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 "Touche obsolète avec virgule"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:483
 msgid "Legacy key with dot"
 msgstr "Touche obsolète avec point"
 
-#: ../rules/base.xml.in.h:474
-#, fuzzy
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Lituanien
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
 msgid "Lithuanian"
-msgstr "Lituanie"
+msgstr "Lituanien"
 
-#: ../rules/base.xml.in.h:475
-#, fuzzy
+#: ../rules/base.xml.in.h:485
 msgid "Lithuanian (IBM LST 1205-92)"
-msgstr "IBM (LST 1205-92)"
+msgstr "Lituanien (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:476
-#, fuzzy
+# http://lekp.info/LithuanianErgonomic
+#: ../rules/base.xml.in.h:486
 msgid "Lithuanian (LEKP)"
-msgstr "Lituanie"
+msgstr "Lituanien (LEKP)"
 
-#: ../rules/base.xml.in.h:477
-#, fuzzy
+#: ../rules/base.xml.in.h:487
 msgid "Lithuanian (LEKPa)"
-msgstr "Lituanie"
+msgstr "Lituanien (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
-#, fuzzy
+#: ../rules/base.xml.in.h:488
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
-msgstr "Clavier US avec lettres lituaniennes"
+msgstr "Lituanien (clavier US avec lettres lituaniennes)"
 
-#: ../rules/base.xml.in.h:479
-#, fuzzy
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (standard)"
-msgstr "Lituanie"
+msgstr "Lituanien (standard)"
 
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:490
 msgid "Logitech Access Keyboard"
 msgstr "Clavier Logitech Access"
 
-#: ../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 (autre option)"
+msgstr "Logitech Cordless Desktop (variante)"
 
-#: ../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 (option alt 2)"
+msgstr "Logitech Cordless Desktop Pro (variante 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 "Touches supplémentaires pour Logitech G15 via le démon G15"
+msgstr "Touches supplémentaires Logitech G15 via le démon G15"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Generic Keyboard"
 msgstr "Clavier Logitech générique"
 
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Internet 350 Keyboard"
 msgstr "Clavier Logitech Internet 350"
 
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Internet Keyboard"
 msgstr "Clavier Logitech Internet"
 
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:504
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Clavier Logitech Internet Navigator"
 
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Media Elite Keyboard"
 msgstr "Clavier Logitech Media Elite"
 
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "Clavier Logitech sans-fil Ultra-X Media"
 
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Ultra-X Keyboard"
 msgstr "Clavier Logitech Ultra-X"
 
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:508
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "Clavier Logitech diNovo Edge"
 
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:509
 msgid "Logitech diNovo Keyboard"
 msgstr "Clavier Logitech diNovo"
 
-#: ../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 (modèle Y-RB6)"
 
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:512
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "Logitech Internet Navigator iTouch SE"
 
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:513
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "Logitech Internet Navigator iTouch SE (USB)"
 
-#: ../rules/base.xml.in.h:504
+#: ../rules/base.xml.in.h:514
+msgid "Lower Sorbian"
+msgstr "Bas-sorabe"
+
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Bas-sorabe
+#: ../rules/base.xml.in.h:515
+msgid "Lower Sorbian (qwertz)"
+msgstr "Bas-sorabe (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
-#, fuzzy
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Mac%C3%A9donien
+#: ../rules/base.xml.in.h:518
 msgid "Macedonian"
-msgstr "Macédoine"
+msgstr "Macédonien"
 
-#: ../rules/base.xml.in.h:507
-#, fuzzy
+#: ../rules/base.xml.in.h:519
 msgid "Macedonian (eliminate dead keys)"
-msgstr "Macintosh, sans touches mortes"
+msgstr "Macédonien (sans touche morte)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:520
 msgid "Macintosh"
-msgstr "Apple-Macintosh"
+msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:521
 msgid "Macintosh Old"
-msgstr "Apple-Macintosh ancien"
+msgstr "Macintosh (ancien)"
 
-#: ../rules/base.xml.in.h:510
-#, fuzzy
+#: ../rules/base.xml.in.h:522
 msgid "Make Caps Lock an additional Backspace"
-msgstr "Faire de la touche Verr. maj. une touche Ret. arr. supplémentaire."
+msgstr "Faire de Verr. maj. un Effacement. arriière supplémentaire."
 
-#: ../rules/base.xml.in.h:511
-#, fuzzy
+# http://www.x.org/wiki/KeySyms
+#: ../rules/base.xml.in.h:523
 msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
-msgstr "Faire de la touche Verr. maj. une touche Verr. num. supplémentaire"
+msgstr "Faire de Verr. maj. un Contrôle supplémentaire, mais garder le même nom symbolique (Caps_Lock)"
 
-#: ../rules/base.xml.in.h:512
-#, fuzzy
+#: ../rules/base.xml.in.h:524
 msgid "Make Caps Lock an additional Ctrl"
-msgstr "Faire de la touche Verr. maj. une touche Ctrl supplémentaire"
+msgstr "Faire de Verr. maj. un Contrôle supplémentaire"
 
-#: ../rules/base.xml.in.h:513
-#, fuzzy
+#: ../rules/base.xml.in.h:525
 msgid "Make Caps Lock an additional ESC"
-msgstr "Faire de la touche Verr. maj. une touche Esc. supplémentaire."
+msgstr "Faire de Verr. maj. un Échap. supplémentaire."
 
-#: ../rules/base.xml.in.h:514
-#, fuzzy
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Hyper"
-msgstr "Faire de la touche Verr. maj. une touche Hyper supplémentaire"
+msgstr "Faire de Verr. maj. un Hyper supplémentaire"
 
-#: ../rules/base.xml.in.h:515
-#, fuzzy
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Num Lock"
-msgstr "Faire de la touche Verr. maj. une touche Verr. num. supplémentaire"
+msgstr "Faire de Verr. maj. un Verr. Num. supplémentaire"
 
-#: ../rules/base.xml.in.h:516
-#, fuzzy
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional Super"
-msgstr "Faire de la touche Verr. maj. une touche Super supplémentaire."
+msgstr "Faire de Verr. maj. un Super supplémentaire."
 
-#: ../rules/base.xml.in.h:517
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Malay%C3%A2lam
+#: ../rules/base.xml.in.h:529
 msgid "Malayalam"
-msgstr "Malayalam"
+msgstr "Malayâlam"
 
-#: ../rules/base.xml.in.h:518
-#, fuzzy
+#: ../rules/base.xml.in.h:530
 msgid "Malayalam (Lalitha)"
-msgstr "Malayalam Lalitha"
+msgstr "Malayâlam (lalitha)"
 
-#: ../rules/base.xml.in.h:519
+# https://secure.wikimedia.org/wikipedia/en/wiki/InScript_keyboard
+#: ../rules/base.xml.in.h:531
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
-msgstr ""
+msgstr "Malayâlam (Inscript amélioré avec le symbole monétaire Roupie)"
 
-#: ../rules/base.xml.in.h:520
-#, fuzzy
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Maltais
+#: ../rules/base.xml.in.h:532
 msgid "Maltese"
-msgstr "Malte"
+msgstr "Maltais"
 
-#: ../rules/base.xml.in.h:521
-#, fuzzy
+#: ../rules/base.xml.in.h:533
 msgid "Maltese (with US layout)"
-msgstr "Clavier maltais avec disposition US"
+msgstr "Maltais (avec disposition US)"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:534
+msgid "Maori"
+msgstr "Maori"
+
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Mari_%28langue%29
+#: ../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"
 
-#: ../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 "Méta est obtenu avec la touche Logo de gauche"
+msgstr "Méta est placé sur Windows gauche"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:541
 msgid "Meta is mapped to Win keys"
-msgstr "Méta est obtenu avec n'importe quelle touche Logo"
+msgstr "Méta est placé sur les touches Windows"
 
-#: ../rules/base.xml.in.h:528
-#, fuzzy
+#: ../rules/base.xml.in.h:542
 msgid "Meta on Left Ctrl"
-msgstr "Ctrl gauche"
+msgstr "Méta s'obtient avec Ctrl gauche"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:543
 msgid "Microsoft Comfort Curve Keyboard 2000"
-msgstr "Clavier Microsoft Comfort Curve 2000"
+msgstr "Microsoft Clavier Comfort Curve 2000"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:544
 msgid "Microsoft Internet Keyboard"
-msgstr "Clavier Microsoft Internet"
+msgstr "Microsoft Clavier internet"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:545
 msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Clavier Microsoft Internet Pro, suédois"
+msgstr "Microsoft Clavier Internet Pro, suédois"
 
-#: ../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 "Clavier Microsoft Natural Elite"
+msgstr "Microsoft Natural Elite"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Clavier Microsoft Natural Pro / Clavier Microsoft Internet Pro"
+msgstr "Microsoft Natural Pro / Internet Pro"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Clavier Microsoft Natural Pro OEM"
+msgstr "Microsoft Natural 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 "Clavier Microsoft Natural Pro USB / Clavier Microsoft Internet Pro"
+msgstr "Microsoft Natural Pro USB / Internet Pro"
 
-#: ../rules/base.xml.in.h:537
-#, fuzzy
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-msgstr "Clavier Microsoft ergonomique naturel sans fil 7000"
+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 "Clavier Microsoft ergonomique naturel sans fil 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 "Clavier Microsoft Office"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Clavier Microsoft Multimedia sans fil 1.0A"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:555
 msgid "Miscellaneous compatibility options"
 msgstr "Diverses options de compatibilité"
 
-#: ../rules/base.xml.in.h:542
-#, fuzzy
-msgid "Mongolian"
-msgstr "Mongolie"
-
-#: ../rules/base.xml.in.h:543
-#, fuzzy
-msgid "Montenegrin"
-msgstr "Monténégro"
-
-#: ../rules/base.xml.in.h:544
-#, fuzzy
-msgid "Montenegrin (Cyrillic with guillemets)"
-msgstr "Cyrillique avec guillemets"
-
-#: ../rules/base.xml.in.h:545
-msgid "Montenegrin (Cyrillic)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:546
-#, fuzzy
-msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
-msgstr "Cyrillique, Z et ZHE permutés"
-
-#: ../rules/base.xml.in.h:547
-#, fuzzy
-msgid "Montenegrin (Latin qwerty)"
-msgstr "Latin qwerty"
-
-#: ../rules/base.xml.in.h:548
-#, fuzzy
-msgid "Montenegrin (Latin unicode qwerty)"
-msgstr "Unicode Latin QWERTY"
-
-#: ../rules/base.xml.in.h:549
-#, fuzzy
-msgid "Montenegrin (Latin unicode)"
-msgstr "Unicode Latin"
-
-#: ../rules/base.xml.in.h:550
-#, fuzzy
-msgid "Montenegrin (Latin with guillemets)"
-msgstr "Latin avec guillemets"
-
-#: ../rules/base.xml.in.h:551
-msgid "Māori"
-msgstr ""
-
-#: ../rules/base.xml.in.h:552
-msgid "NICOLA-F style Backspace"
-msgstr "Ret. Arr. de style NICOLA-F"
-
-#: ../rules/base.xml.in.h:553
-#, fuzzy
-msgid "Nepali"
-msgstr "Népal"
-
-#: ../rules/base.xml.in.h:554
-msgid "Non-breakable space character at fourth level"
-msgstr "Espace insécable au 4e niveau."
-
-#: ../rules/base.xml.in.h:555
-msgid "Non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Espace insécable au 4e niveau et une espace fine insécable au 6e niveau"
-
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Mongol
 #: ../rules/base.xml.in.h:556
-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 et une espace fine insécable au 6e niveau (par les touches Ctrl+Maj.)"
+msgid "Mongolian"
+msgstr "Mongol"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Mont%C3%A9n%C3%A9grin
 #: ../rules/base.xml.in.h:557
-msgid "Non-breakable space character at second level"
-msgstr "Espace insécable au 2e niveau"
+msgid "Montenegrin"
+msgstr "Monténégrin"
 
 #: ../rules/base.xml.in.h:558
-msgid "Non-breakable space character at third level"
-msgstr "Espace insécable au 3e niveau"
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr "Monténégrin (cyrillique avec guillemets)"
 
 #: ../rules/base.xml.in.h:559
-msgid "Non-breakable space character at third level, nothing at fourth level"
-msgstr "Espace insécable au 3e niveau et rien au 4e niveau"
+msgid "Montenegrin (Cyrillic)"
+msgstr "Monténégrin (cyrillique)"
 
 #: ../rules/base.xml.in.h:560
-msgid "Non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Espace insécable au 3e niveau et une espace fine insécable au 4e niveau"
+msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
+msgstr "Monténégrin (cyrillique, Z et ZHE intervertis)"
 
 #: ../rules/base.xml.in.h:561
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Monténégrin (qwerty Unicode latin)"
 
 #: ../rules/base.xml.in.h:562
-msgid "Norwegian"
-msgstr "Norvégien"
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Monténégrin (Unicode latin)"
 
 #: ../rules/base.xml.in.h:563
-msgid "Norwegian (Dvorak)"
-msgstr "Norvégien (Dvorak)"
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Monténégrin (qwerty latin)"
 
 #: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
-msgstr "Norvégien (Mac)"
+msgid "Montenegrin (Latin with guillemets)"
+msgstr "Monténégrin (latin avec guillemets)"
 
 #: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
-msgstr "Norvégien (Mac, sans touche morte)"
+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
-msgid "Norwegian (Northern Saami"
-msgstr "Norvégien (Sami du Nord)"
+msgid "Nepali"
+msgstr "Népalais"
 
 #: ../rules/base.xml.in.h:567
-msgid "Norwegian (eliminate dead keys)"
-msgstr "Norvégien (sans touche morte)"
+msgid "Non-breakable space character at fourth level"
+msgstr "Espace insécable au 4e niveau"
 
 #: ../rules/base.xml.in.h:568
-msgid "Norwegian (northern Saami, eliminate dead keys)"
-msgstr "Norvégien (Sami du Nord, sans touche morte)"
+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
-msgid "Num Lock"
-msgstr "Verr. Num."
+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
-msgid "Numeric keypad delete key behaviour"
-msgstr "Comportement de la touche de suppression du clavier numérique"
+msgid "Non-breakable space character at second level"
+msgstr "Espace insécable au 2e niveau"
 
 #: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
-msgstr "Les touches du pavé numérique se comportent comme sur MacIntosh"
+msgid "Non-breakable space character at third level"
+msgstr "Espace insécable au 3e niveau"
 
 #: ../rules/base.xml.in.h:572
-msgid "Numeric keypad layout selection"
-msgstr "Sélection de groupe du clavier numérique"
+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
-msgid "OLPC"
-msgstr "OLPC"
+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
-msgid "Oriya"
-msgstr "Oriya"
+msgid "Northern Saami (Finland)"
+msgstr "Sami du Nord (Finlande)"
 
 #: ../rules/base.xml.in.h:575
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Clavier Internet Ortek MCK-800 MM"
+msgid "Northern Saami (Norway)"
+msgstr "Sami du Nord (Norvège)"
 
 #: ../rules/base.xml.in.h:576
-msgid "PC-98xx Series"
-msgstr "PC-98xx Series"
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Sami du Nord (Norvège, sans touche morte)"
 
 #: ../rules/base.xml.in.h:577
-msgid "Pashto"
-msgstr "Pashto"
+msgid "Northern Saami (Sweden)"
+msgstr "Sami du Nord (Suède)"
 
 #: ../rules/base.xml.in.h:578
-msgid "Pashto (Afghanistan, OLPC)"
-msgstr ""
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Norv%C3%A9gien
 #: ../rules/base.xml.in.h:579
-msgid "Pause"
-msgstr "Pause"
+msgid "Norwegian"
+msgstr "Norvégien"
 
 #: ../rules/base.xml.in.h:580
-msgid "Persian"
-msgstr ""
+msgid "Norwegian (Dvorak)"
+msgstr "Norvégien (Dvorak)"
 
 #: ../rules/base.xml.in.h:581
-msgid "Persian (Afghanistan, Dari OLPC)"
-msgstr ""
+msgid "Norwegian (Macintosh)"
+msgstr "Norvégien (Macintosh)"
 
 #: ../rules/base.xml.in.h:582
-#, fuzzy
-msgid "Persian (with Persian Keypad)"
-msgstr "Perse, avec clavier numérique perse"
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Norvégien (Macintosh, sans touche morte)"
 
 #: ../rules/base.xml.in.h:583
-msgid "Philippines - Dvorak (Baybayin)"
-msgstr ""
+msgid "Norwegian (eliminate dead keys)"
+msgstr "Norvégien (sans touche morte)"
 
 #: ../rules/base.xml.in.h:584
-#, fuzzy
-msgid "Polish"
-msgstr "Anglais"
+msgid "Num Lock"
+msgstr "Verr. Num."
 
 #: ../rules/base.xml.in.h:585
-#, fuzzy
-msgid "Polish (Dvorak)"
-msgstr "Dvorak classique"
+msgid "Numeric keypad delete key behaviour"
+msgstr "Comportement de la touche de Suppr. du pavé numérique"
 
 #: ../rules/base.xml.in.h:586
-#, fuzzy
-msgid "Polish (Dvorak, polish quotes on key 1)"
-msgstr "Dvorak, guillemets polonais sur la touche « 1 »"
+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
-#, fuzzy
-msgid "Polish (Dvorak, polish quotes on quotemark key)"
-msgstr "Dvorak, guillemets polonais sur la touche des guillemets"
+msgid "Numeric keypad layout selection"
+msgstr "Disposition du pavé numérique"
 
 #: ../rules/base.xml.in.h:588
-#, fuzzy
-msgid "Polish (Kashubian)"
-msgstr "Kachoube"
+msgid "OLPC"
+msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:589
-#, fuzzy
-msgid "Polish (programmer Dvorak)"
-msgstr "Programmeur Dvorak"
+msgid "Occitan"
+msgstr "Occitan"
 
 #: ../rules/base.xml.in.h:590
-msgid "Polish (qwertz)"
-msgstr ""
+msgid "Ogham"
+msgstr "Ogham"
 
 #: ../rules/base.xml.in.h:591
-#, fuzzy
-msgid "Portuguese"
-msgstr "Portugal"
+msgid "Ogham (IS434)"
+msgstr "Ogham (IS434)"
 
 #: ../rules/base.xml.in.h:592
-msgid "Portuguese (Brazil)"
-msgstr ""
+msgid "Oriya"
+msgstr "Oriya"
 
 #: ../rules/base.xml.in.h:593
-msgid "Portuguese (Brazil, Dvorak)"
-msgstr ""
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek Clavier internet / MCK-800 MM"
 
 #: ../rules/base.xml.in.h:594
-#, fuzzy
-msgid "Portuguese (Brazil, eliminate dead keys)"
-msgstr "Sami du Nord, sans touches mortes"
+msgid "Ossetian (Georgia)"
+msgstr "Ossète (Géorgie)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Oss%C3%A8te
 #: ../rules/base.xml.in.h:595
-#, fuzzy
-msgid "Portuguese (Brazil, nativo for Esperanto)"
-msgstr "Native pour Espéranto"
+msgid "Ossetian (WinKeys)"
+msgstr "Ossète (touches Windows)"
 
 #: ../rules/base.xml.in.h:596
-#, fuzzy
-msgid "Portuguese (Brazil, nativo for USA keyboards)"
-msgstr "Nativo pour claviers américains"
+msgid "Ossetian (legacy)"
+msgstr "Ossète (obsolète)"
 
 #: ../rules/base.xml.in.h:597
-msgid "Portuguese (Brazil, nativo)"
-msgstr ""
+msgid "PC-98xx Series"
+msgstr "PC-98xx"
 
 #: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
-msgstr ""
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Ruthène pannonien (homophonique)"
 
 #: ../rules/base.xml.in.h:599
-#, fuzzy
-msgid "Portuguese (Mac, Sun dead keys)"
-msgstr "Français, touches mortes Sun"
+msgid "Pashto"
+msgstr "Pachto"
 
 #: ../rules/base.xml.in.h:600
-#, fuzzy
-msgid "Portuguese (Mac, eliminate dead keys)"
-msgstr "Français, sans touches mortes"
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr "Pachto (Afghanistan, OLPC)"
 
 #: ../rules/base.xml.in.h:601
-#, fuzzy
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr "Native pour Espéranto"
+msgid "Pause"
+msgstr "Pause"
 
-#: ../rules/base.xml.in.h:602
-#, fuzzy
-msgid "Portuguese (Nativo for USA keyboards)"
-msgstr "Nativo pour claviers américains"
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Persan
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+msgid "Persian"
+msgstr "Persan"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Dari
 #: ../rules/base.xml.in.h:603
-msgid "Portuguese (Nativo)"
-msgstr ""
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr "Persan (Afghanistan, Dari, OLPC)"
 
 #: ../rules/base.xml.in.h:604
-#, fuzzy
-msgid "Portuguese (Sun dead keys)"
-msgstr "Français, touches mortes Sun"
+msgid "Persian (with Persian Keypad)"
+msgstr "Persan (avec pavé numérique persan)"
 
-#: ../rules/base.xml.in.h:605
-#, fuzzy
-msgid "Portuguese (eliminate dead keys)"
-msgstr "Français, sans touches mortes"
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Polonais
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+msgid "Polish"
+msgstr "Polonais"
 
 #: ../rules/base.xml.in.h:606
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
+msgid "Polish (Dvorak)"
+msgstr "Polonais (Dvorak)"
 
 #: ../rules/base.xml.in.h:607
-msgid "PrtSc"
-msgstr ""
+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
-#, fuzzy
-msgid "Punjabi (Gurmukhi Jhelum)"
-msgstr "Gurmukhi Jhelum"
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr "Polonais (Dvorak, guillemets polonais sur la touche guillemets)"
 
 #: ../rules/base.xml.in.h:609
-#, fuzzy
-msgid "Punjabi (Gurmukhi)"
-msgstr "Gurmukhi"
+msgid "Polish (programmer Dvorak)"
+msgstr "Polonais (Dvorak pour le programmeur)"
 
 #: ../rules/base.xml.in.h:610
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+msgid "Polish (qwertz)"
+msgstr "Polonais (qwertz)"
 
 #: ../rules/base.xml.in.h:611
-msgid "Right Alt"
-msgstr "Alt. droite"
+msgid "Portuguese"
+msgstr "Portugais"
 
 #: ../rules/base.xml.in.h:612
-msgid "Right Alt (while pressed)"
-msgstr "Alt de droite (lorsque pressée)"
+msgid "Portuguese (Brazil)"
+msgstr "Portugais (Brésil)"
 
 #: ../rules/base.xml.in.h:613
-msgid "Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr ""
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr "Portugais (Brésil, Dvorak)"
 
 #: ../rules/base.xml.in.h:614
-msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr ""
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr "Portugais (Brésil, sans touche morte)"
 
 #: ../rules/base.xml.in.h:615
-msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr ""
+msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgstr "Portugais (Brésil, BR-Nativo pour l'Espéranto)"
 
 #: ../rules/base.xml.in.h:616
-msgid "Right Alt key never chooses 3rd level"
-msgstr "Alt de droite ne sélectionne jamais le 3e niveau"
+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
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "Alt de droite, Maj.+Alt de droite est une touche multiple"
+msgid "Portuguese (Brazil, nativo)"
+msgstr "Portugais (Brésil, BR-Nativo)"
 
 #: ../rules/base.xml.in.h:618
-msgid "Right Ctrl"
-msgstr "Crtl de droite"
+msgid "Portuguese (Macintosh)"
+msgstr "Portugais (Macintosh)"
 
 #: ../rules/base.xml.in.h:619
-msgid "Right Ctrl (while pressed)"
-msgstr "Ctrl de droite (lorsque pressée)"
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portugais (Macintosh, touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:620
-msgid "Right Ctrl as Right Alt"
-msgstr "Ctrl de droite comme Alt de droite"
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Portugais (Macintosh, sans touche morte)"
 
 #: ../rules/base.xml.in.h:621
-#, fuzzy
-msgid "Right Ctrl is mapped to Menu"
-msgstr "Méta est obtenu avec la touche Logo de gauche"
+msgid "Portuguese (Nativo for USA keyboards)"
+msgstr "Portugais (PT-Nativo pour claviers US)"
 
 #: ../rules/base.xml.in.h:622
-msgid "Right Ctrl+Right Shift"
-msgstr "Ctrl de droite + Majuscule de droite"
+msgid "Portuguese (Nativo)"
+msgstr "Portugais (PT-Nativo)"
 
 #: ../rules/base.xml.in.h:623
-msgid "Right Shift"
-msgstr "Maj. droite"
+msgid "Portuguese (Sun dead keys)"
+msgstr "Portugais (touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:624
-msgid "Right Win"
-msgstr "Touche Logo droite"
+msgid "Portuguese (eliminate dead keys)"
+msgstr "Portugais (sans touche morte)"
 
 #: ../rules/base.xml.in.h:625
-msgid "Right Win (while pressed)"
-msgstr "Touche Logo de  (lorsque pressée)"
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
 
 #: ../rules/base.xml.in.h:626
-msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr ""
+msgid "PrtSc"
+msgstr "Impr. Écr."
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Penjabi
 #: ../rules/base.xml.in.h:627
-msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr ""
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "Penjabi (Gurmukhî, Jhelum)"
 
 #: ../rules/base.xml.in.h:628
-#, fuzzy
-msgid "Romanian"
-msgstr "Roumanie"
+msgid "Punjabi (Gurmukhi)"
+msgstr "Penjabi (Gurmukhî)"
 
 #: ../rules/base.xml.in.h:629
-#, fuzzy
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr "Tatar de Crimée (Q Dobruca-1)"
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
 
 #: ../rules/base.xml.in.h:630
-#, fuzzy
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr "Tatar de Crimée (Q Dobruca-2)"
+msgid "Right Alt"
+msgstr "Alt. droite"
 
 #: ../rules/base.xml.in.h:631
-#, fuzzy
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Tatar de Crimée (Alt-Q turc)"
+msgid "Right Alt (while pressed)"
+msgstr "Alt. droite (si enfoncé)"
 
 #: ../rules/base.xml.in.h:632
-#, fuzzy
-msgid "Romanian (Crimean Tatar Turkish F)"
-msgstr "Tatar de Crimée (F turc)"
+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
-msgid "Romanian (WinKeys)"
-msgstr ""
+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
-#, fuzzy
-msgid "Romanian (cedilla)"
-msgstr "Standard (cédille)"
+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
-#, fuzzy
-msgid "Romanian (standard cedilla)"
-msgstr "Standard (cédille)"
+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
-msgid "Romanian (standard)"
-msgstr ""
+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
-msgid "Rupee on 4"
-msgstr ""
+msgid "Right Ctrl"
+msgstr "Crtl droite"
 
 #: ../rules/base.xml.in.h:638
-msgid "Russian"
-msgstr "Russe"
+msgid "Right Ctrl (while pressed)"
+msgstr "Ctrl droite (si enfoncé)"
 
 #: ../rules/base.xml.in.h:639
-#, fuzzy
-msgid "Russian (Bashkirian)"
-msgstr "Bashkirien"
+msgid "Right Ctrl as Right Alt"
+msgstr "Ctrl droite comme Alt. droite"
 
 #: ../rules/base.xml.in.h:640
-#, fuzzy
-msgid "Russian (Chuvash Latin)"
-msgstr "Latin Chuvash"
+msgid "Right Ctrl is mapped to Menu"
+msgstr "Méta est placé sur Menu"
 
 #: ../rules/base.xml.in.h:641
-#, fuzzy
-msgid "Russian (Chuvash)"
-msgstr "Russe avec kazakh"
+msgid "Right Ctrl+Right Shift"
+msgstr "Ctrl  droite + Maj. droite"
 
 #: ../rules/base.xml.in.h:642
-#, fuzzy
-msgid "Russian (DOS)"
-msgstr "Russe"
+msgid "Right Shift"
+msgstr "Maj. droite"
 
 #: ../rules/base.xml.in.h:643
-#, fuzzy
-msgid "Russian (Georgia)"
-msgstr "Phonétique russe"
+msgid "Right Win"
+msgstr "Windows droite"
 
 #: ../rules/base.xml.in.h:644
-#, fuzzy
-msgid "Russian (Germany, phonetic)"
-msgstr "Phonétique russe"
+msgid "Right Win (while pressed)"
+msgstr "Windows droite (si enfoncé)"
 
 #: ../rules/base.xml.in.h:645
-#, fuzzy
-msgid "Russian (Kalmyk)"
-msgstr "Russe avec kazakh"
+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
-#, fuzzy
-msgid "Russian (Kazakhstan, with Kazakh)"
-msgstr "Russe avec kazakh"
+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"
 
-#: ../rules/base.xml.in.h:647
-#, fuzzy
-msgid "Russian (Komi)"
-msgstr "Phonétique russe"
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Roumain
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+msgid "Romanian"
+msgstr "Roumain"
 
 #: ../rules/base.xml.in.h:648
-#, fuzzy
-msgid "Russian (Mari)"
-msgstr "Russe"
+msgid "Romanian (Germany)"
+msgstr "Roumain (Allemagne)"
 
 #: ../rules/base.xml.in.h:649
-#, fuzzy
-msgid "Russian (Ossetian, WinKeys)"
-msgstr "Ossétie avec touches Logo"
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Roumain (Allemagne, sans touche morte)"
 
 #: ../rules/base.xml.in.h:650
-#, fuzzy
-msgid "Russian (Ossetian, legacy)"
-msgstr "(Obsolète) Ossétie"
+msgid "Romanian (WinKeys)"
+msgstr "Roumain (touche Windows)"
 
 #: ../rules/base.xml.in.h:651
-#, fuzzy
-msgid "Russian (Poland, phonetic Dvorak)"
-msgstr "Dvorak phonétique russe"
+msgid "Romanian (cedilla)"
+msgstr "Roumain (cédille)"
 
 #: ../rules/base.xml.in.h:652
-#, fuzzy
-msgid "Russian (Serbian)"
-msgstr "Phonétique russe"
+msgid "Romanian (standard cedilla)"
+msgstr "Roumain (standard, cédille)"
 
 #: ../rules/base.xml.in.h:653
-#, fuzzy
-msgid "Russian (Sweden, phonetic)"
-msgstr "Phonétique russe"
+msgid "Romanian (standard)"
+msgstr "Roumain (standard)"
 
 #: ../rules/base.xml.in.h:654
-#, fuzzy
-msgid "Russian (Sweden, phonetic, eliminate dead keys)"
-msgstr "Phonétique russe, sans lettres mortes"
+msgid "Rupee on 4"
+msgstr "Roupie sur le 4"
 
-#: ../rules/base.xml.in.h:655
-#, fuzzy
-msgid "Russian (Tatar)"
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+msgid "Russian"
 msgstr "Russe"
 
 #: ../rules/base.xml.in.h:656
-#, fuzzy
-msgid "Russian (US, phonetic)"
-msgstr "Phonétique russe"
+msgid "Russian (DOS)"
+msgstr "Russe (DOS)"
 
 #: ../rules/base.xml.in.h:657
-#, fuzzy
-msgid "Russian (Udmurt)"
-msgstr "Russe"
+msgid "Russian (Georgia)"
+msgstr "Russe (Géorgie)"
 
 #: ../rules/base.xml.in.h:658
-#, fuzzy
-msgid "Russian (Yakut)"
-msgstr "Russe"
+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
-#, fuzzy
-msgid "Russian (legacy)"
-msgstr "(Obsolète) Ossétie"
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr "Russe (Kazakhstan, avec kazakh)"
 
 #: ../rules/base.xml.in.h:660
-#, fuzzy
-msgid "Russian (phonetic WinKeys)"
-msgstr "Phonétique russe"
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr "Russe (Pologne, Dvorak phonétique)"
 
 #: ../rules/base.xml.in.h:661
-#, fuzzy
-msgid "Russian (phonetic)"
-msgstr "Phonétique russe"
+msgid "Russian (Sweden, phonetic)"
+msgstr "Russe (Suède, phonétique)"
 
 #: ../rules/base.xml.in.h:662
-#, fuzzy
-msgid "Russian (typewriter)"
-msgstr "Phonétique russe"
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgstr "Russe (Suède, phonétique, sans touche morte)"
 
 #: ../rules/base.xml.in.h:663
-#, fuzzy
-msgid "Russian (typewriter, legacy)"
-msgstr "Machine à écrire"
+msgid "Russian (US, phonetic)"
+msgstr "Russe (US, phonétique)"
 
 #: ../rules/base.xml.in.h:664
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia sans fil"
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Russe (Ukraine, RSTU standard)"
 
 #: ../rules/base.xml.in.h:665
-msgid "SK-1300"
-msgstr "SK-1300"
+msgid "Russian (legacy)"
+msgstr "Russe (obsolète)"
 
 #: ../rules/base.xml.in.h:666
-msgid "SK-2500"
-msgstr "SK-2500"
+msgid "Russian (phonetic WinKeys)"
+msgstr "Russe (phonétique, touches Windows)"
 
 #: ../rules/base.xml.in.h:667
-msgid "SK-6200"
-msgstr "SK-6200"
+msgid "Russian (phonetic)"
+msgstr "Russe (phonétique)"
 
 #: ../rules/base.xml.in.h:668
-msgid "SK-7100"
-msgstr "SK-7100"
+msgid "Russian (typewriter)"
+msgstr "Russe (machine à écrire)"
 
 #: ../rules/base.xml.in.h:669
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
+msgid "Russian (typewriter, legacy)"
+msgstr "Russe (machine à écrire, obsolète)"
 
 #: ../rules/base.xml.in.h:670
-msgid "SVEN Slim 303"
-msgstr "SVEN Slim 303"
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
 #: ../rules/base.xml.in.h:671
-msgid "Saisiyat (Taiwan)"
-msgstr ""
+msgid "SK-1300"
+msgstr "SK-1300"
 
 #: ../rules/base.xml.in.h:672
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
+msgid "SK-2500"
+msgstr "SK-2500"
 
 #: ../rules/base.xml.in.h:673
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
+msgid "SK-6200"
+msgstr "SK-6200"
 
 #: ../rules/base.xml.in.h:674
-msgid "Sanwa Supply SKB-KG3"
-msgstr ""
+msgid "SK-7100"
+msgstr "SK-7100"
 
 #: ../rules/base.xml.in.h:675
-msgid "Scroll Lock"
-msgstr "Arrêt défilement"
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
 
 #: ../rules/base.xml.in.h:676
-msgid "Secwepemctsin"
-msgstr "Secwepemctsin"
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
 
 #: ../rules/base.xml.in.h:677
-msgid "Semi-colon on third level"
-msgstr "Point virgule au 3e niveau"
+msgid "Saisiyat (Taiwan)"
+msgstr "Saisiyat (Taïwan)"
 
 #: ../rules/base.xml.in.h:678
-#, fuzzy
-msgid "Serbian"
-msgstr "Serbie"
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
 
 #: ../rules/base.xml.in.h:679
-#, fuzzy
-msgid "Serbian (Latin Unicode qwerty)"
-msgstr "Latin Unicode qwerty"
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
 
 #: ../rules/base.xml.in.h:680
-#, fuzzy
-msgid "Serbian (Latin Unicode)"
-msgstr "Latin Unicode"
+msgid "Sanwa Supply SKB-KG3"
+msgstr "Sanwa Supply SKB-KG3"
 
 #: ../rules/base.xml.in.h:681
-#, fuzzy
-msgid "Serbian (Latin qwerty)"
-msgstr "Latin qwerty"
+msgid "Scroll Lock"
+msgstr "Arrêt défilement"
 
 #: ../rules/base.xml.in.h:682
-#, fuzzy
-msgid "Serbian (Latin with guillemets)"
-msgstr "Latin avec guillemets"
+msgid "Semi-colon on third level"
+msgstr "Point-virgule au 3e niveau"
 
-#: ../rules/base.xml.in.h:683
-#, fuzzy
-msgid "Serbian (Latin)"
-msgstr "Allemand (Apple-Macintosh)"
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+msgid "Serbian"
+msgstr "Serbe"
 
 #: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr ""
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr "Serbe (latin, Unicode, qwerty)"
 
 #: ../rules/base.xml.in.h:685
-#, fuzzy
-msgid "Serbian (Z and ZHE swapped)"
-msgstr "Z et ZHE permutés"
+msgid "Serbian (Latin Unicode)"
+msgstr "Serbe (latin, Unicode)"
 
 #: ../rules/base.xml.in.h:686
-#, fuzzy
-msgid "Serbian (with guillemets)"
-msgstr "Latin avec guillemets"
+msgid "Serbian (Latin qwerty)"
+msgstr "Serbe (latin, qwerty)"
 
 #: ../rules/base.xml.in.h:687
-msgid "Serbo-Croatian (US)"
-msgstr ""
+msgid "Serbian (Latin with guillemets)"
+msgstr "Serbe (Latin avec guillemets)"
 
 #: ../rules/base.xml.in.h:688
-#, fuzzy
-msgid "Shift cancels Caps Lock"
-msgstr "Maj. annule le verrouillage majuscule"
+msgid "Serbian (Latin)"
+msgstr "Serbe (Latin)"
 
 #: ../rules/base.xml.in.h:689
-#, fuzzy
-msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
-msgstr "Maj. n'annule pas le verrouillage numérique; choisir le 3e niveau"
+msgid "Serbian (Russia)"
+msgstr "Serbe (Russe)"
 
 #: ../rules/base.xml.in.h:690
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "La touche Maj. avec le pavé numérique se comporte comme dans MS Windows"
+msgid "Serbian (Z and ZHE swapped)"
+msgstr "Serbe (Z et ZHE intervertis)"
 
 #: ../rules/base.xml.in.h:691
-#, fuzzy
-msgid "Shift+Caps Lock"
-msgstr "Maj.+ Verr. maj."
+msgid "Serbian (with guillemets)"
+msgstr "Serbe (avec guillemets)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Serbo-croate
 #: ../rules/base.xml.in.h:692
-msgid "Sindhi"
-msgstr ""
+msgid "Serbo-Croatian (US)"
+msgstr "Serbo-Croate (US)"
 
 #: ../rules/base.xml.in.h:693
-msgid "Sinhala"
-msgstr ""
+msgid "Shift cancels Caps Lock"
+msgstr "Maj. annule Verr. maj."
 
 #: ../rules/base.xml.in.h:694
-#, fuzzy
-msgid "Slovak"
-msgstr "Slovaquie"
+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
-#, fuzzy
-msgid "Slovak (extended Backslash)"
-msgstr "Barre contre-oblique étendue"
+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
-msgid "Slovak (qwerty)"
-msgstr ""
+msgid "Shift+Caps Lock"
+msgstr "Maj.+ Verr. maj."
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Sindhi
 #: ../rules/base.xml.in.h:697
-#, fuzzy
-msgid "Slovak (qwerty, extended Backslash)"
-msgstr "qwerty, contre-oblique étendue"
+msgid "Sindhi"
+msgstr "Sindhî"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Cingalais
 #: ../rules/base.xml.in.h:698
-#, fuzzy
-msgid "Slovene"
-msgstr "Slovénie"
+msgid "Sinhala"
+msgstr "Cingalais"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Slovaque
 #: ../rules/base.xml.in.h:699
-#, fuzzy
-msgid "Slovene (US keyboard with Slovenian letters)"
-msgstr "Clavier US avec lettres slovènes"
+msgid "Slovak"
+msgstr "Slovaque"
 
 #: ../rules/base.xml.in.h:700
-#, fuzzy
-msgid "Slovene (use guillemets for quotes)"
-msgstr "Remplacer les guillemets droits avec les guillements français"
+msgid "Slovak (extended Backslash)"
+msgstr "Slovaque (barre oblique inverse étendue)"
 
 #: ../rules/base.xml.in.h:701
-msgid "Spanish"
-msgstr ""
+msgid "Slovak (qwerty)"
+msgstr "Slovaque (qwerty)"
 
 #: ../rules/base.xml.in.h:702
-#, fuzzy
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr "Variante asturienne avec H point bas et L point bas"
+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
-#, fuzzy
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr "Catalan avec L point médian"
+msgid "Slovenian"
+msgstr "Slovène"
 
 #: ../rules/base.xml.in.h:704
-#, fuzzy
-msgid "Spanish (Dvorak)"
-msgstr "Dvorak français"
+msgid "Slovenian (US keyboard with Slovenian letters)"
+msgstr "Slovène (clavier US avec lettres slovènes)"
 
 #: ../rules/base.xml.in.h:705
-#, fuzzy
-msgid "Spanish (Latin American)"
-msgstr "Amérique latine"
+msgid "Slovenian (use guillemets for quotes)"
+msgstr "Slovène (utilise des guillemets typographiques au lieu des guillemets simples)"
 
 #: ../rules/base.xml.in.h:706
-#, fuzzy
-msgid "Spanish (Latin American, eliminate dead keys)"
-msgstr "Allemand, sans touches mortes"
+msgid "Spanish"
+msgstr "Espagnol"
 
 #: ../rules/base.xml.in.h:707
-msgid "Spanish (Latin American, include dead tilde)"
-msgstr ""
+msgid "Spanish (Dvorak)"
+msgstr "Espagnol (Dvorak)"
 
 #: ../rules/base.xml.in.h:708
-#, fuzzy
-msgid "Spanish (Latin American, sun dead keys)"
-msgstr "Allemand, touches mortes Sun"
+msgid "Spanish (Latin American)"
+msgstr "Espagnol (Amérique latine)"
 
 #: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
-msgstr ""
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Espagnol (Amérique latine, touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:710
-#, fuzzy
-msgid "Spanish (Sun dead keys)"
-msgstr "Macintosh, touches mortes Sun"
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr "Espagnol (Amérique latine, sans touche morte)"
 
 #: ../rules/base.xml.in.h:711
-#, fuzzy
-msgid "Spanish (eliminate dead keys)"
-msgstr "Macintosh, sans touches mortes"
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr "Espagnol (Amérique latine, y compris la touche morte tilde)"
 
 #: ../rules/base.xml.in.h:712
-#, fuzzy
-msgid "Spanish (include dead tilde)"
-msgstr "Inclut le tilde"
+msgid "Spanish (Macintosh)"
+msgstr "Espagnol (Macintosh)"
 
 #: ../rules/base.xml.in.h:713
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr "Les combinaisons spéciales (Ctrl+Alt+&lt;touche&gt;) sont traitées par un serveur"
+msgid "Spanish (Sun dead keys)"
+msgstr "Espagnol (touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:714
-msgid "Sun Type 5/6"
-msgstr "Sun Type 5/6"
+msgid "Spanish (eliminate dead keys)"
+msgstr "Espagnol (sans touche morte)"
 
 #: ../rules/base.xml.in.h:715
-msgid "Super Power Multimedia Keyboard"
-msgstr "Multimedia Super Power"
+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
-msgid "Swahili (Kenya)"
-msgstr ""
+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
-msgid "Swahili (Tanzania)"
-msgstr ""
+msgid "Sun Type 5/6"
+msgstr "Sun type 5/6"
 
 #: ../rules/base.xml.in.h:718
-#, fuzzy
-msgid "Swap Ctrl and Caps Lock"
-msgstr "Permuter Ctrl et Verr. maj."
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Swahili
 #: ../rules/base.xml.in.h:719
-#, fuzzy
-msgid "Swap ESC and Caps Lock"
-msgstr "Permuter ESC et Verr. maj."
+msgid "Swahili (Kenya)"
+msgstr "Swahili (Kenya)"
 
 #: ../rules/base.xml.in.h:720
-#, fuzzy
-msgid "Swedish"
-msgstr "Suède"
+msgid "Swahili (Tanzania)"
+msgstr "Swahili (Tanzanie)"
 
 #: ../rules/base.xml.in.h:721
-#, fuzzy
-msgid "Swedish (Dvorak)"
-msgstr "Dvorak français"
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Intervertir Ctrl et Verr. maj."
 
 #: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
-msgstr ""
+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
-#, fuzzy
-msgid "Swedish (Svdvorak)"
-msgstr "Svdvorak"
+msgid "Swedish"
+msgstr "Suédois"
 
 #: ../rules/base.xml.in.h:724
-#, fuzzy
-msgid "Swedish (eliminate dead keys)"
-msgstr "Français, sans touches mortes"
+msgid "Swedish (Dvorak)"
+msgstr "Suédois (Dvorak)"
 
 #: ../rules/base.xml.in.h:725
-#, fuzzy
-msgid "Swedish (northern Saami)"
-msgstr "Sami du Nord"
+msgid "Swedish (Macintosh)"
+msgstr "Suédois (Macintosh)"
 
 #: ../rules/base.xml.in.h:726
-msgid "Swiss"
-msgstr ""
+msgid "Swedish (Svdvorak)"
+msgstr "Suédois (Svdvorak)"
 
 #: ../rules/base.xml.in.h:727
-#, fuzzy
-msgid "Swiss (legacy)"
-msgstr "Français (obsolète)"
+msgid "Swedish (eliminate dead keys)"
+msgstr "Suédois (sans touche morte)"
 
 #: ../rules/base.xml.in.h:728
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
+msgid "Swedish Sign Language"
+msgstr "Langue des signes suédoise"
 
 #: ../rules/base.xml.in.h:729
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablette tactile)"
+
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Syriaque
+#: ../rules/base.xml.in.h:730
 msgid "Syriac"
 msgstr "Syriaque"
 
-#: ../rules/base.xml.in.h:730
-#, fuzzy
+#: ../rules/base.xml.in.h:731
 msgid "Syriac (phonetic)"
-msgstr "Phonétique syriaque"
+msgstr "Syriaque (phonétique)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:732
 msgid "Taiwanese"
-msgstr ""
+msgstr "Taïwanais"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:733
 msgid "Taiwanese (indigenous)"
-msgstr ""
+msgstr "Taïwanais (indigène)"
 
-#: ../rules/base.xml.in.h:733
-#, fuzzy
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Tadjik
+#: ../rules/base.xml.in.h:734
 msgid "Tajik"
-msgstr "Tadjikistan"
+msgstr "Tadjik"
 
-#: ../rules/base.xml.in.h:734
-#, fuzzy
+#: ../rules/base.xml.in.h:735
 msgid "Tajik (legacy)"
-msgstr "Français (obsolète)"
+msgstr "Tadjik (obsolète)"
 
-#: ../rules/base.xml.in.h:735
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Tamoul
+#: ../rules/base.xml.in.h:736
 msgid "Tamil"
 msgstr "Tamoul"
 
-#: ../rules/base.xml.in.h:736
-#, fuzzy
+#: ../rules/base.xml.in.h:737
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
-msgstr "Machine à écrire tamoule TAB"
+msgstr "Tamoul (Sri Lanka, machine à écrire, TAB)"
 
-#: ../rules/base.xml.in.h:737
-#, fuzzy
+#: ../rules/base.xml.in.h:738
 msgid "Tamil (Sri Lanka, Unicode)"
-msgstr "Unicode tamoul"
+msgstr "Tamoul (Sri Lanka, Unicode)"
 
-#: ../rules/base.xml.in.h:738
-#, fuzzy
+# TAB et TSCII sont des codages tamouls.
+#: ../rules/base.xml.in.h:739
 msgid "Tamil (TAB typewriter)"
-msgstr "Machine à écrire tamoule TAB"
+msgstr "Tamoul (machine à écrire, TAB)"
 
-#: ../rules/base.xml.in.h:739
-#, fuzzy
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (TSCII typewriter)"
-msgstr "Machine à écrire tamoule TSCII"
+msgstr "Tamoul (machine à écrire, TSCII)"
 
-#: ../rules/base.xml.in.h:740
-#, fuzzy
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Unicode)"
-msgstr "Unicode tamoul"
+msgstr "Tamoul (Unicode)"
 
-#: ../rules/base.xml.in.h:741
-#, fuzzy
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (keyboard with numerals)"
-msgstr "Clavier roumain avec lettres allemandes"
+msgstr "Tamoul (clavier avec chiffres)"
 
-#: ../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
-msgid "Telugu"
-msgstr "Telugu"
-
 #: ../rules/base.xml.in.h:744
-#, fuzzy
-msgid "Thai"
-msgstr "Thaïlande"
+msgid "Tatar"
+msgstr "Tatar"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/T%C3%A9lougou
 #: ../rules/base.xml.in.h:745
-#, fuzzy
-msgid "Thai (Pattachote)"
-msgstr "Pattachote"
+msgid "Telugu"
+msgstr "Télougou"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Tha%C3%AF_%28langue%29
 #: ../rules/base.xml.in.h:746
-#, fuzzy
-msgid "Thai (TIS-820.2538)"
-msgstr "TIS-820.2538"
+msgid "Thai"
+msgstr "Thaï"
 
 #: ../rules/base.xml.in.h:747
-msgid "To the corresponding key in a Dvorak keyboard."
-msgstr "Mène à la touche correspondante sur un clavier Dvorak."
+msgid "Thai (Pattachote)"
+msgstr "Thaï (Pattachote)"
 
 #: ../rules/base.xml.in.h:748
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr "Mène à la touche correspondante sur un clavier Qwerty."
+msgid "Thai (TIS-820.2538)"
+msgstr "Thaï (TIS-820.2538)"
 
 #: ../rules/base.xml.in.h:749
-msgid "Toggle PointerKeys with Shift + NumLock."
-msgstr ""
+msgid "Tibetan"
+msgstr "Tibétain"
 
 #: ../rules/base.xml.in.h:750
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibétain (avec chiffres ASCII)"
 
 #: ../rules/base.xml.in.h:751
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access"
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Vers la touche correspondante sur un clavier Dvorak."
 
 #: ../rules/base.xml.in.h:752
-msgid "Trust Slimline"
-msgstr "Trust Slimline"
+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
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Classic"
+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
-msgid "Tswana"
-msgstr ""
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
 
 #: ../rules/base.xml.in.h:755
-#, fuzzy
-msgid "Turkish"
-msgstr "Turkmenistan"
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access"
 
 #: ../rules/base.xml.in.h:756
-#, fuzzy
-msgid "Turkish (Alt-Q)"
-msgstr "Tatar de Crimée (Alt-Q turc)"
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
 
 #: ../rules/base.xml.in.h:757
-#, fuzzy
-msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
-msgstr "Tatar de Crimée (Alt-Q turc)"
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Classic"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Tswana
 #: ../rules/base.xml.in.h:758
-#, fuzzy
-msgid "Turkish (Crimean Tatar Turkish F)"
-msgstr "Tatar de Crimée (F turc)"
+msgid "Tswana"
+msgstr "Tswana"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Turc
 #: ../rules/base.xml.in.h:759
-#, fuzzy
-msgid "Turkish (Crimean Tatar Turkish Q)"
-msgstr "Tatar de Crimée (Q turc)"
+msgid "Turkish"
+msgstr "Turc"
 
 #: ../rules/base.xml.in.h:760
-#, fuzzy
-msgid "Turkish (F)"
-msgstr "Kurde, (F)"
+msgid "Turkish (Alt-Q)"
+msgstr "Turc (Alt-Q)"
 
 #: ../rules/base.xml.in.h:761
-#, fuzzy
-msgid "Turkish (Sun dead keys)"
-msgstr "Français, touches mortes Sun"
+msgid "Turkish (F)"
+msgstr "Turc (F)"
 
 #: ../rules/base.xml.in.h:762
-#, fuzzy
-msgid "Turkish (international with dead keys)"
-msgstr "International (avec touches mortes)"
+msgid "Turkish (Sun dead keys)"
+msgstr "Turc (touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:763
-#, fuzzy
-msgid "Turkmen"
-msgstr "Turquie"
+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
-msgid "Turkmen (Alt-Q)"
-msgstr ""
+msgid "Turkmen"
+msgstr "Turkmène"
 
 #: ../rules/base.xml.in.h:765
-msgid "TypeMatrix EZ-Reach 2020"
-msgstr ""
+msgid "Turkmen (Alt-Q)"
+msgstr "Turkmène (Alt-Q)"
 
 #: ../rules/base.xml.in.h:766
-msgid "TypeMatrix EZ-Reach 2030 PS2"
-msgstr ""
+msgid "TypeMatrix EZ-Reach 2020"
+msgstr "TypeMatrix EZ-Reach 2020"
 
 #: ../rules/base.xml.in.h:767
-msgid "TypeMatrix EZ-Reach 2030 USB"
-msgstr ""
+msgid "TypeMatrix EZ-Reach 2030 PS2"
+msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
 #: ../rules/base.xml.in.h:768
-msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
-msgstr ""
+msgid "TypeMatrix EZ-Reach 2030 USB"
+msgstr "TypeMatrix EZ-Reach 2030 USB"
 
 #: ../rules/base.xml.in.h:769
-msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
-msgstr ""
+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
-#, fuzzy
-msgid "Ukrainian"
-msgstr "Ukraine"
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (mode 106:JP)"
 
 #: ../rules/base.xml.in.h:771
-#, fuzzy
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Tatar de Crimée (Alt-Q turc)"
+msgid "Udmurt"
+msgstr "Oudmourte"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Ukrainien
 #: ../rules/base.xml.in.h:772
-#, fuzzy
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "Tatar de Crimée (F turc)"
+msgid "Ukrainian"
+msgstr "Ukrainien"
 
 #: ../rules/base.xml.in.h:773
-#, fuzzy
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "Tatar de Crimée (Q turc)"
+msgid "Ukrainian (WinKeys)"
+msgstr "Ukrainien (touches Windows)"
 
 #: ../rules/base.xml.in.h:774
-msgid "Ukrainian (WinKeys)"
-msgstr ""
+msgid "Ukrainian (homophonic)"
+msgstr "Ukrainien (homophonique)"
 
 #: ../rules/base.xml.in.h:775
-msgid "Ukrainian (homophonic)"
-msgstr ""
+msgid "Ukrainian (legacy)"
+msgstr "Ukrainien (obsolète)"
 
 #: ../rules/base.xml.in.h:776
-#, fuzzy
-msgid "Ukrainian (legacy)"
-msgstr "Français (obsolète)"
+msgid "Ukrainian (phonetic)"
+msgstr "Ukrainien (phonétique)"
 
 #: ../rules/base.xml.in.h:777
-#, fuzzy
-msgid "Ukrainian (phonetic)"
-msgstr "Phonétique traditionnel"
+msgid "Ukrainian (standard RSTU)"
+msgstr "Ukrainien (RSTU standard)"
 
 #: ../rules/base.xml.in.h:778
-#, fuzzy
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr "Standard RSTU avec une disposition russe"
+msgid "Ukrainian (typewriter)"
+msgstr "Ukrainien (machine à écrire)"
 
 #: ../rules/base.xml.in.h:779
-#, fuzzy
-msgid "Ukrainian (standard RSTU)"
-msgstr "Standard RSTU"
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Ajouts Unicode (opérateurs mathématiques et flèches)"
 
 #: ../rules/base.xml.in.h:780
-msgid "Ukrainian (typewriter)"
-msgstr ""
+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
-msgid "Unicode additions (arrows and math operators)"
-msgstr "Ajouts Unicode (touches fléchées et opérateurs mathématiques)"
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Ourdou
 #: ../rules/base.xml.in.h:782
-msgid "Unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Ajouts Unicode (touches fléchées et opérateurs mathématiques). Les opérateurs mathématiques se trouvent sur le niveau par défaut"
+msgid "Urdu (Pakistan)"
+msgstr "Ourdou (Pakistan)"
 
 #: ../rules/base.xml.in.h:783
-msgid "Unitek KB-1925"
-msgstr "Unitek KB-1925"
+msgid "Urdu (Pakistan, CRULP)"
+msgstr "Ourdou (Pakistan, CRULP)"
 
 #: ../rules/base.xml.in.h:784
-#, fuzzy
-msgid "Urdu (Pakistan)"
-msgstr "Pakistan"
+msgid "Urdu (Pakistan, NLA)"
+msgstr "Ourdou (Pakistan, NLA)"
 
 #: ../rules/base.xml.in.h:785
-msgid "Urdu (Pakistan, CRULP)"
-msgstr ""
+msgid "Urdu (WinKeys)"
+msgstr "Ourdou (touches Windows)"
 
 #: ../rules/base.xml.in.h:786
-msgid "Urdu (Pakistan, NLA)"
-msgstr ""
+msgid "Urdu (alternative phonetic)"
+msgstr "Ourdou (variante, phonétique)"
 
 #: ../rules/base.xml.in.h:787
-#, fuzzy
-msgid "Urdu (WinKeys)"
-msgstr "Ourdou, touches Logo"
+msgid "Urdu (phonetic)"
+msgstr "Ourdou (phonétique)"
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=518156
 #: ../rules/base.xml.in.h:788
-#, fuzzy
-msgid "Urdu (alternative phonetic)"
-msgstr "Ourdou, phonétique alternatif"
+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
-#, fuzzy
-msgid "Urdu (phonetic)"
-msgstr "Ourdou, phonétique"
+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
-msgid "Use keyboard LED to show alternative layout"
-msgstr "Utiliser les voyants lumineux du clavier pour afficher une disposition alternative"
+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
-msgid "Using space key to input non-breakable space character"
-msgstr "Utiliser la barre d'espacement pour insérer un espace insécable"
+msgid "Uyghur"
+msgstr "Ouïghour"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Ouzbek
 #: ../rules/base.xml.in.h:792
-msgid "Usual space at any level"
-msgstr "La barre d'espacement renvoie une espace ordinaire à tous les niveaux"
+msgid "Uzbek"
+msgstr "Ouzbek"
 
 #: ../rules/base.xml.in.h:793
-#, fuzzy
-msgid "Uzbek"
-msgstr "Ouzbékistan"
+msgid "Uzbek (Afghanistan)"
+msgstr "Ouzbek (Afghanistan)"
 
 #: ../rules/base.xml.in.h:794
-#, fuzzy
-msgid "Uzbek (Afghanistan)"
-msgstr "Afghanistan"
+msgid "Uzbek (Afghanistan, OLPC)"
+msgstr "Ouzbek (Afghanistan, OLPC)"
 
 #: ../rules/base.xml.in.h:795
-#, fuzzy
-msgid "Uzbek (Afghanistan, OLPC)"
-msgstr "Afghanistan"
+msgid "Uzbek (Latin)"
+msgstr "Ouzbek (latin)"
 
 #: ../rules/base.xml.in.h:796
-#, fuzzy
-msgid "Uzbek (Crimean Tatar Turkish Alt-Q)"
-msgstr "Tatar de Crimée (Alt-Q turc)"
+msgid "Vietnamese"
+msgstr "Vietnamien"
 
 #: ../rules/base.xml.in.h:797
-#, fuzzy
-msgid "Uzbek (Crimean Tatar Turkish F)"
-msgstr "Tatar de Crimée (F turc)"
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
 
 #: ../rules/base.xml.in.h:798
-#, fuzzy
-msgid "Uzbek (Crimean Tatar Turkish Q)"
-msgstr "Tatar de Crimée (Q turc)"
+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
-#, fuzzy
-msgid "Uzbek (Latin)"
-msgstr "Ouzbékistan"
+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
-#, fuzzy
-msgid "Vietnamese"
-msgstr "Viêt Nam"
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Wolof_%28langue%29
 #: ../rules/base.xml.in.h:801
-msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr "Clavier Internet ViewSonic KU-306"
+msgid "Wolof"
+msgstr "Wolof"
 
 #: ../rules/base.xml.in.h:802
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Clavier Wang 724 avec ajouts Unicode (touches fléchées et opérateurs mathématiques)"
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Iakoute
 #: ../rules/base.xml.in.h:803
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Clavier Wang 724 avec ajouts Unicode (touches fléchées et opérateurs mathématiques). Les opérateurs mathématiques se trouvent sur le niveau par défaut"
+msgid "Yakut"
+msgstr "Iakute"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Yoruba
 #: ../rules/base.xml.in.h:804
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
+msgid "Yoruba"
+msgstr "Yoruba"
 
+# http://hapax.qc.ca/glossaire.htm
 #: ../rules/base.xml.in.h:805
-msgid "Wolof"
-msgstr ""
+msgid "Zero-width non-joiner character at second level"
+msgstr "Antiliant à chasse nulle au 2e niveau"
 
 #: ../rules/base.xml.in.h:806
-msgid "Yahoo! Internet Keyboard"
-msgstr "Clavier Yahoo! Internet"
+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
-msgid "Yoruba"
-msgstr "Yoruba"
+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
-#, fuzzy
-msgid "Zero-width non-joiner character at second level"
-msgstr "Espace insécable au 2e niveau"
+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
-#, fuzzy
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level"
-msgstr "Espace insécable au 3e niveau et une espace fine insécable au 4e niveau"
+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
-#, fuzzy
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"
-msgstr "Espace insécable au 3e niveau et rien au 4e niveau"
+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
-#, fuzzy
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"
-msgstr "Espace insécable au 3e niveau et une espace fine insécable au 4e niveau"
+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
-#, fuzzy
-msgid "Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"
-msgstr "Espace insécable au 3e niveau et rien au 4e niveau"
+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
-msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level"
-msgstr ""
+msgid "ak"
+msgstr "ak"
 
 #: ../rules/base.xml.in.h:814
-#, fuzzy
-msgid "Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"
-msgstr "Espace insécable au 3e niveau et une espace fine insécable au 4e niveau"
+msgid "am"
+msgstr "am"
 
 #: ../rules/base.xml.in.h:815
-#, fuzzy
-msgid "Zero-width non-joiner character at third level, zero-width joiner at fourth level"
-msgstr "Espace insécable au 3e niveau et rien au 4e niveau"
+msgid "ar"
+msgstr "ar"
 
 #: ../rules/base.xml.in.h:816
-#, fuzzy
-msgid "ak"
-msgstr "Pak"
+msgid "avn"
+msgstr "avn"
 
 #: ../rules/base.xml.in.h:817
-msgid "am"
-msgstr ""
+msgid "az"
+msgstr "az"
 
 #: ../rules/base.xml.in.h:818
-#, fuzzy
-msgid "ar"
-msgstr "Zar"
+msgid "be"
+msgstr "be"
 
 #: ../rules/base.xml.in.h:819
-#, fuzzy
-msgid "avn"
-msgstr "Ban"
+msgid "ber"
+msgstr "ber"
 
 #: ../rules/base.xml.in.h:820
-#, fuzzy
-msgid "az"
-msgstr "Kaz"
+msgid "bg"
+msgstr "bg"
 
 #: ../rules/base.xml.in.h:821
-msgid "be"
-msgstr ""
+msgid "bm"
+msgstr "bm"
 
 #: ../rules/base.xml.in.h:822
-msgid "ber"
-msgstr ""
+msgid "bn"
+msgstr "bn"
 
 #: ../rules/base.xml.in.h:823
-msgid "bg"
-msgstr ""
+msgid "brl"
+msgstr "brl"
 
 #: ../rules/base.xml.in.h:824
-msgid "bm"
-msgstr ""
+msgid "bs"
+msgstr "bs"
 
 #: ../rules/base.xml.in.h:825
-msgid "bn"
-msgstr ""
+msgid "ca"
+msgstr "cb"
 
 #: ../rules/base.xml.in.h:826
-#, fuzzy
-msgid "brl"
-msgstr "Brl"
+msgid "chr"
+msgstr "chr"
 
 #: ../rules/base.xml.in.h:827
-msgid "bs"
-msgstr ""
+msgid "cm"
+msgstr "cm"
 
 #: ../rules/base.xml.in.h:828
-msgid "ca"
-msgstr ""
+msgid "crh"
+msgstr "crh"
 
 #: ../rules/base.xml.in.h:829
-#, fuzzy
-msgid "che"
-msgstr "Che"
-
-#: ../rules/base.xml.in.h:830
-msgid "chr"
-msgstr ""
-
-#: ../rules/base.xml.in.h:831
 msgid "cs"
-msgstr ""
+msgstr "cs"
 
-#: ../rules/base.xml.in.h:832
+#: ../rules/base.xml.in.h:830
 msgid "da"
-msgstr ""
+msgstr "da"
 
-#: ../rules/base.xml.in.h:833
+#: ../rules/base.xml.in.h:831
 msgid "de"
-msgstr ""
+msgstr "de"
 
-#: ../rules/base.xml.in.h:834
+#: ../rules/base.xml.in.h:832
 msgid "dv"
-msgstr ""
+msgstr "dv"
 
-#: ../rules/base.xml.in.h:835
+#: ../rules/base.xml.in.h:833
 msgid "dz"
-msgstr ""
+msgstr "dz"
 
-#: ../rules/base.xml.in.h:836
+#: ../rules/base.xml.in.h:834
 msgid "ee"
-msgstr ""
+msgstr "ee"
 
-#: ../rules/base.xml.in.h:837
-#, fuzzy
+#: ../rules/base.xml.in.h:835 ../rules/base.extras.xml.in.h:34
 msgid "en"
-msgstr "Menu"
+msgstr "en"
 
-#: ../rules/base.xml.in.h:838
-#, fuzzy
+#: ../rules/base.xml.in.h:836
 msgid "eo"
-msgstr "Geo"
+msgstr "eo"
 
-#: ../rules/base.xml.in.h:839
+#: ../rules/base.xml.in.h:837
 msgid "es"
-msgstr ""
+msgstr "es"
 
-#: ../rules/base.xml.in.h:840
+#: ../rules/base.xml.in.h:838
 msgid "et"
-msgstr ""
+msgstr "et"
 
-#: ../rules/base.xml.in.h:841
+#: ../rules/base.xml.in.h:839 ../rules/base.extras.xml.in.h:35
 msgid "fa"
-msgstr ""
+msgstr "fa"
 
-#: ../rules/base.xml.in.h:842
+#: ../rules/base.xml.in.h:840
 msgid "ff"
-msgstr ""
+msgstr "ff"
 
-#: ../rules/base.xml.in.h:843
+#: ../rules/base.xml.in.h:841
 msgid "fi"
-msgstr ""
+msgstr "fi"
 
-#: ../rules/base.xml.in.h:844
+#: ../rules/base.xml.in.h:842
 msgid "fo"
-msgstr ""
+msgstr "fo"
 
-#: ../rules/base.xml.in.h:845
+#: ../rules/base.xml.in.h:843 ../rules/base.extras.xml.in.h:36
 msgid "fr"
-msgstr ""
+msgstr "fr"
 
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:844
 msgid "gaa"
-msgstr ""
+msgstr "gaa"
 
-#: ../rules/base.xml.in.h:847
-#, fuzzy
+#: ../rules/base.xml.in.h:845
 msgid "gr"
-msgstr "Bgr"
+msgstr "gr"
 
-#: ../rules/base.xml.in.h:848
+#: ../rules/base.xml.in.h:846
 msgid "gu"
-msgstr ""
+msgstr "gu"
 
-#: ../rules/base.xml.in.h:849
-#, fuzzy
+#: ../rules/base.xml.in.h:847
 msgid "ha"
-msgstr "Gha"
+msgstr "ha"
 
-#: ../rules/base.xml.in.h:850
-#, fuzzy
+#: ../rules/base.xml.in.h:848
 msgid "he"
-msgstr "Che"
+msgstr "he"
 
-#: ../rules/base.xml.in.h:851
+#: ../rules/base.xml.in.h:849
 msgid "hi"
-msgstr ""
+msgstr "hi"
 
-#: ../rules/base.xml.in.h:852
+#: ../rules/base.xml.in.h:850
 msgid "hr"
-msgstr ""
+msgstr "hr"
 
-#: ../rules/base.xml.in.h:853
-#, fuzzy
+#: ../rules/base.xml.in.h:851
 msgid "hu"
-msgstr "Bhu"
+msgstr "hu"
 
-#: ../rules/base.xml.in.h:854
+#: ../rules/base.xml.in.h:852 ../rules/base.extras.xml.in.h:37
 msgid "hy"
-msgstr ""
+msgstr "hy"
 
-#: ../rules/base.xml.in.h:855
+#: ../rules/base.xml.in.h:853
 msgid "ie"
-msgstr ""
+msgstr "ie"
 
-#: ../rules/base.xml.in.h:856
-#, fuzzy
+#: ../rules/base.xml.in.h:854
 msgid "ig"
-msgstr "Nig"
+msgstr "ig"
 
-#: ../rules/base.xml.in.h:857
-#, fuzzy
+#: ../rules/base.xml.in.h:855
 msgid "ike"
-msgstr "Touches Logo"
+msgstr "ike"
 
-#: ../rules/base.xml.in.h:858
-#, fuzzy
+#: ../rules/base.xml.in.h:856
 msgid "in"
-msgstr "Fin"
-
-#: ../rules/base.xml.in.h:859
-#, fuzzy
-msgid "irq"
-msgstr "Irq"
+msgstr "in"
 
-#: ../rules/base.xml.in.h:860
+#: ../rules/base.xml.in.h:857
 msgid "is"
-msgstr ""
+msgstr "is"
 
-#: ../rules/base.xml.in.h:861
+#: ../rules/base.xml.in.h:858
 msgid "it"
-msgstr ""
+msgstr "it"
 
-#: ../rules/base.xml.in.h:862
+#: ../rules/base.xml.in.h:859
 msgid "ja"
-msgstr ""
+msgstr "ja"
 
-#: ../rules/base.xml.in.h:863
-#, fuzzy
+#: ../rules/base.xml.in.h:860
 msgid "ka"
-msgstr "Akan"
+msgstr "ka"
 
-#: ../rules/base.xml.in.h:864
+#: ../rules/base.xml.in.h:861
 msgid "ki"
-msgstr ""
+msgstr "ki"
 
-#: ../rules/base.xml.in.h:865
+#: ../rules/base.xml.in.h:862
 msgid "kk"
-msgstr ""
+msgstr "kk"
 
-#: ../rules/base.xml.in.h:866
+#: ../rules/base.xml.in.h:863
 msgid "km"
-msgstr ""
+msgstr "km"
 
-#: ../rules/base.xml.in.h:867
-#, fuzzy
+#: ../rules/base.xml.in.h:864
 msgid "kn"
-msgstr "Akan"
+msgstr "kn"
 
-#: ../rules/base.xml.in.h:868
+#: ../rules/base.xml.in.h:865
 msgid "ko"
-msgstr ""
+msgstr "ko"
 
-#: ../rules/base.xml.in.h:869
+#: ../rules/base.xml.in.h:866
 msgid "ku"
-msgstr ""
-
-#: ../rules/base.xml.in.h:870
-#, fuzzy
-msgid "kut"
-msgstr "Yacoute"
+msgstr "ku"
 
-#: ../rules/base.xml.in.h:871
+#: ../rules/base.xml.in.h:867
 msgid "lo"
-msgstr ""
+msgstr "lo"
 
-#: ../rules/base.xml.in.h:872
-#, fuzzy
+#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:39
 msgid "lt"
-msgstr "Mlt"
+msgstr "lt"
 
-#: ../rules/base.xml.in.h:873
+#: ../rules/base.xml.in.h:869 ../rules/base.extras.xml.in.h:40
 msgid "lv"
-msgstr ""
+msgstr "lv"
 
-#: ../rules/base.xml.in.h:874
-#, fuzzy
+#: ../rules/base.xml.in.h:870
 msgid "mi"
-msgstr "Komi"
+msgstr "mi"
 
-#: ../rules/base.xml.in.h:875
+#: ../rules/base.xml.in.h:871
 msgid "mk"
-msgstr ""
+msgstr "mk"
 
-#: ../rules/base.xml.in.h:876
+#: ../rules/base.xml.in.h:872
 msgid "ml"
-msgstr ""
+msgstr "ml"
 
-#: ../rules/base.xml.in.h:877
+#: ../rules/base.xml.in.h:873
 msgid "mn"
-msgstr ""
+msgstr "mn"
 
-#: ../rules/base.xml.in.h:878
+#: ../rules/base.xml.in.h:874
 msgid "mt"
-msgstr ""
+msgstr "mt"
 
-#: ../rules/base.xml.in.h:879
+#: ../rules/base.xml.in.h:875
 msgid "my"
-msgstr ""
+msgstr "my"
 
-#: ../rules/base.xml.in.h:880
+#: ../rules/base.xml.in.h:876
 msgid "ne"
-msgstr ""
+msgstr "ne"
 
-#: ../rules/base.xml.in.h:881
+#: ../rules/base.xml.in.h:877
 msgid "nl"
-msgstr ""
+msgstr "nl"
 
-#: ../rules/base.xml.in.h:882
+#: ../rules/base.xml.in.h:878
 msgid "no"
-msgstr ""
+msgstr "no"
 
-#: ../rules/base.xml.in.h:883
-#, fuzzy
+#: ../rules/base.xml.in.h:879
 msgid "or"
-msgstr "Kor"
+msgstr "or"
 
-#: ../rules/base.xml.in.h:884
+#: ../rules/base.xml.in.h:880
 msgid "pa"
-msgstr ""
+msgstr "pa"
 
-#: ../rules/base.xml.in.h:885
+#: ../rules/base.xml.in.h:881
 msgid "ph"
-msgstr ""
+msgstr "ph"
 
-#: ../rules/base.xml.in.h:886
+#: ../rules/base.xml.in.h:882 ../rules/base.extras.xml.in.h:41
 msgid "pl"
-msgstr ""
+msgstr "pl"
 
-#: ../rules/base.xml.in.h:887
+#: ../rules/base.xml.in.h:883
 msgid "ps"
-msgstr ""
+msgstr "ps"
 
-#: ../rules/base.xml.in.h:888
+#: ../rules/base.xml.in.h:884
 msgid "pt"
-msgstr ""
+msgstr "pt"
 
-#: ../rules/base.xml.in.h:889
-#, fuzzy
+#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:42
 msgid "ro"
-msgstr "Pro"
+msgstr "ro"
 
-#: ../rules/base.xml.in.h:890
-#, fuzzy
+#: ../rules/base.xml.in.h:886 ../rules/base.extras.xml.in.h:43
 msgid "ru"
-msgstr "Ourdou"
+msgstr "ru"
 
-#: ../rules/base.xml.in.h:891
+#: ../rules/base.xml.in.h:887
 msgid "sd"
-msgstr ""
-
-#: ../rules/base.xml.in.h:892
-msgid "shs"
-msgstr ""
+msgstr "sd"
 
-#: ../rules/base.xml.in.h:893
+#: ../rules/base.xml.in.h:888
 msgid "si"
-msgstr ""
+msgstr "si"
 
-#: ../rules/base.xml.in.h:894
+#: ../rules/base.xml.in.h:889
 msgid "sk"
-msgstr ""
+msgstr "sk"
 
-#: ../rules/base.xml.in.h:895
-#, fuzzy
+#: ../rules/base.xml.in.h:890
 msgid "sl"
-msgstr "Isl"
+msgstr "sl"
 
-#: ../rules/base.xml.in.h:896
+#: ../rules/base.xml.in.h:891
 msgid "sq"
-msgstr ""
+msgstr "sq"
 
-#: ../rules/base.xml.in.h:897
-#, fuzzy
+#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
 msgid "sr"
-msgstr "Isr"
+msgstr "sr"
 
-#: ../rules/base.xml.in.h:898
-#, fuzzy
-msgid "srp"
-msgstr "Esp"
-
-#: ../rules/base.xml.in.h:899
+#: ../rules/base.xml.in.h:893
 msgid "sv"
-msgstr ""
+msgstr "sv"
 
-#: ../rules/base.xml.in.h:900
+#: ../rules/base.xml.in.h:894
 msgid "sw"
-msgstr ""
+msgstr "sw"
 
-#: ../rules/base.xml.in.h:901
+#: ../rules/base.xml.in.h:895
 msgid "syc"
-msgstr ""
+msgstr "syc"
 
-#: ../rules/base.xml.in.h:902
-#, fuzzy
+#: ../rules/base.xml.in.h:896
 msgid "ta"
-msgstr "Ita"
+msgstr "ta"
 
-#: ../rules/base.xml.in.h:903
+#: ../rules/base.xml.in.h:897
 msgid "te"
-msgstr ""
+msgstr "te"
 
-#: ../rules/base.xml.in.h:904
+#: ../rules/base.xml.in.h:898
 msgid "tg"
-msgstr ""
+msgstr "tg"
 
-#: ../rules/base.xml.in.h:905
-#, fuzzy
+#: ../rules/base.xml.in.h:899
 msgid "th"
-msgstr "Eth"
+msgstr "th"
 
-#: ../rules/base.xml.in.h:906
+#: ../rules/base.xml.in.h:900
 msgid "tk"
-msgstr ""
+msgstr "tk"
 
-#: ../rules/base.xml.in.h:907
+#: ../rules/base.xml.in.h:901
 msgid "tn"
-msgstr ""
+msgstr "tn"
 
-#: ../rules/base.xml.in.h:908
+#: ../rules/base.xml.in.h:902
 msgid "tr"
-msgstr ""
+msgstr "tr"
 
-#: ../rules/base.xml.in.h:909
-msgid "twn"
-msgstr ""
-
-#: ../rules/base.xml.in.h:910
+#: ../rules/base.xml.in.h:903
 msgid "uk"
-msgstr ""
+msgstr "uk"
 
-#: ../rules/base.xml.in.h:911
-#, fuzzy
+#: ../rules/base.xml.in.h:904
 msgid "ur"
-msgstr "Tur"
+msgstr "ur"
 
-#: ../rules/base.xml.in.h:912
+#: ../rules/base.xml.in.h:905
 msgid "uz"
-msgstr ""
+msgstr "uz"
 
-#: ../rules/base.xml.in.h:913
+#: ../rules/base.xml.in.h:906
 msgid "vi"
-msgstr ""
+msgstr "vi"
 
-#: ../rules/base.xml.in.h:914
+#: ../rules/base.xml.in.h:907
 msgid "wo"
-msgstr ""
+msgstr "wo"
 
-#: ../rules/base.xml.in.h:915
+#: ../rules/base.xml.in.h:908
 msgid "xsy"
-msgstr ""
+msgstr "xsy"
 
-#: ../rules/base.xml.in.h:916
+#: ../rules/base.xml.in.h:909
 msgid "yo"
-msgstr ""
+msgstr "yo"
 
-#: ../rules/base.xml.in.h:917
+#: ../rules/base.xml.in.h:910
 msgid "zh"
-msgstr ""
+msgstr "zh"
 
+# https://secure.wikimedia.org/wikipedia/en/wiki/APL_%28programming_language%29
 #: ../rules/base.extras.xml.in.h:1
-msgid "APL"
-msgstr "APL"
-
-#: ../rules/base.extras.xml.in.h:2
-msgid "Iran"
-msgstr "Iran"
-
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr ""
+msgid "APL Keyboard Symbols"
+msgstr "Symboles APL"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "Lituanie"
+msgid "Atsina"
+msgstr "Atsina"
 
 #: ../rules/base.extras.xml.in.h:5
-#, fuzzy
-msgid "Lithuania - Dvorak"
-msgstr "Lituanie"
+msgid "Avestan"
+msgstr "Avestique"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/C%C5%93ur_d%27Al%C3%A8ne_%28langue%29
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "Ltu"
-
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "Roumanie"
+msgid "Couer D'alene Salish"
+msgstr "Salish Cœur d'Alène"
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr ""
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Anglais (USA, international, AltGr combinatoire 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 "Anglais (USA, international, AltGr combinatoire Unicode, variante)"
 
+# http://www.thecanadianencyclopedia.com/index.cfm?PgNm=TCE&Params=f1ARTf0004367
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "Russie"
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
-msgstr "Serbie"
+msgid "Kutenai"
+msgstr "kutenai"
 
+# http://colemak.com/
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
-msgstr "Serbie - Touches mortes remplacées par des accents combinatoires"
+msgid "Latvian (US Colemak)"
+msgstr "Letton (Colemak USA)"
 
 #: ../rules/base.extras.xml.in.h:14
-#, fuzzy
-msgid "Srb"
-msgstr "SrL"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Letton (Colemak USA, variante apostrophe)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "USA"
+msgid "Latvian (US Dvorak)"
+msgstr "Letton (Dvorak USA)"
 
 #: ../rules/base.extras.xml.in.h:16
-#, fuzzy
-msgid "USA - Atsina"
-msgstr "Atsina"
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Letton (Dvorak USA, variante Y)"
 
 #: ../rules/base.extras.xml.in.h:17
-#, fuzzy
-msgid "USA - Couer D'alene Salish"
-msgstr "Coeur d'Alene Salish"
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr "Letton (Dvorak USA, variante moins)"
 
 #: ../rules/base.extras.xml.in.h:18
-#, fuzzy
-msgid "USA - International (AltGr Unicode combining)"
-msgstr "International (AltCar et Unicode)"
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Letton (Dvorak pour le programmeur USA)"
 
 #: ../rules/base.extras.xml.in.h:19
-#, fuzzy
-msgid "USA - International (AltGr Unicode combining, alternative)"
-msgstr "International (AltCar et Unicode, alternatif))"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "ACPI Standard"
-#~ msgstr "ACPI standard"
-
-#~ msgid "Alb"
-#~ msgstr "Alb"
-
-#~ msgid "Alt-Q"
-#~ msgstr "Alt-Q"
-
-#~ msgid "Alternative"
-#~ msgstr "Autre"
-
-#~ msgid "And"
-#~ msgstr "And"
-
-#~ msgid "Andorra"
-#~ msgstr "Andorre"
-
-#~ msgid "Ara"
-#~ msgstr "Ara"
-
-#~ msgid "Arm"
-#~ msgstr "Arm"
-
-#~ msgid "Aze"
-#~ msgstr "Aze"
-
-#~ msgid "Bangladesh"
-#~ msgstr "Bangladesh"
-
-#~ msgid "Bel"
-#~ msgstr "Bel"
-
-#~ msgid "Bhutan"
-#~ msgstr "Bhoutan"
-
-#~ msgid "Bih"
-#~ msgstr "Bih"
-
-#~ msgid "Blr"
-#~ msgstr "Blr"
-
-#~ msgid "Bosnia and Herzegovina"
-#~ msgstr "Bosnie-Herzégovine"
-
-#~ msgid "Bra"
-#~ msgstr "Bra"
-
-#~ msgid "Brazil"
-#~ msgstr "Brésil"
-
-#~ msgid "Breton"
-#~ msgstr "Breton"
-
-#~ msgid "CRULP"
-#~ msgstr "CRULP"
-
-#~ msgid "Can"
-#~ msgstr "Can"
-
-#~ msgid "Canada"
-#~ msgstr "Canada"
-
-#~ msgid "CapsLock"
-#~ msgstr "Verr. Maj."
-
-#~ msgid "Cedilla"
-#~ msgstr "Cédille"
-
-#~ msgid "Chuvash"
-#~ msgstr "Chuvash"
-
-#~ msgid "Classic"
-#~ msgstr "Classique"
-
-#~ msgid "Colemak"
-#~ msgstr "Colemak"
-
-#~ msgid "Cyrillic"
-#~ msgstr "Cyrillique"
-
-#~ msgid "Cze"
-#~ msgstr "Cze"
-
-#~ msgid "DOS"
-#~ msgstr "DOS"
-
-#~ msgid "DRC"
-#~ msgstr "RDC"
-
-#~ msgid "Dan"
-#~ msgstr "Dan"
-
-#~ msgid "Dead acute"
-#~ msgstr "Touche morte d'accent aigu"
-
-#~ msgid "Denmark"
-#~ msgstr "Danemark"
-
-#~ msgid "Deu"
-#~ msgstr "Deu"
-
-#~ msgid "Dvorak"
-#~ msgstr "Dvorak"
-
-#~ msgid "Dvorak international"
-#~ msgstr "Dvorak international"
-
-#~ msgid "E"
-#~ msgstr "E"
-
-#~ msgid "Eastern"
-#~ msgstr "Orientale"
-
-#~ msgid "Epo"
-#~ msgstr "Epo"
-
-#~ msgid "Ergonomic"
-#~ msgstr "Ergonomique"
-
-#~ msgid "Est"
-#~ msgstr "Est"
-
-#~ msgid "Ethiopia"
-#~ msgstr "Éthiopie"
-
-#~ msgid "Evdev-managed keyboard"
-#~ msgstr "Clavier piloté par evdev"
-
-#~ msgid "Extended"
-#~ msgstr "Étendue"
-
-#~ msgid "Fao"
-#~ msgstr "Fao"
-
-#~ msgid "Finland"
-#~ msgstr "Finlande"
-
-#~ msgid "Fra"
-#~ msgstr "Fra"
-
-#~ msgid "France"
-#~ msgstr "France"
-
-#~ msgid "Georgia"
-#~ msgstr "Géorgie"
-
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
-
-#~ msgid "Gre"
-#~ msgstr "Gre"
-
-#~ msgid "Gui"
-#~ msgstr "Gui"
-
-#~ msgid "Guinea"
-#~ msgstr "Guinée"
-
-#~ msgid "Homophonic"
-#~ msgstr "Homophone"
-
-#~ msgid "Hrv"
-#~ msgstr "Hrv"
-
-#~ msgid "Hun"
-#~ msgstr "Hun"
-
-#~ msgid "Ind"
-#~ msgstr "Ind"
-
-#~ msgid "Ireland"
-#~ msgstr "Irlande"
-
-#~ msgid "Irl"
-#~ msgstr "Irl"
-
-#~ msgid "Irn"
-#~ msgstr "Irn"
-
-#~ msgid "Israel"
-#~ msgstr "Israël"
-
-#~ msgid "Jpn"
-#~ msgstr "Jpn"
-
-#~ msgid "Kalmyk"
-#~ msgstr "Kalmyk"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Letton (Dvorak pour le programmeur USA, variante Y)"
 
-#~ msgid "Kana"
-#~ msgstr "Kana"
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Letton (Dvorak pour le programmeur USA, variante moins)"
 
-#~ msgid "Kgz"
-#~ msgstr "Kgz"
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Lituanien (Dvorak USA avec lettres lituaniennes)"
 
-#~ msgid "Khm"
-#~ msgstr "Khm"
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "Polonais (international avec touches mortes)"
 
-#~ msgid "Korea, Republic of"
-#~ msgstr "Corée, République de"
+#: ../rules/base.extras.xml.in.h:27
+msgid "Romanian (ergonomic Touchtype)"
+msgstr "Roumain (ergonomique dactylographique)"
 
-#~ msgid "Ktunaxa"
-#~ msgstr "Ktunaxa"
+#: ../rules/base.extras.xml.in.h:29
+msgid "Russian (with UKR and BEL layout)"
+msgstr "Russe (avec dispositions UKR et BEL)"
 
-#~ msgid "LAm"
-#~ msgstr "LAm"
-
-#~ msgid "LEKP"
-#~ msgstr "LEKP"
-
-#~ msgid "LEKPa"
-#~ msgstr "LEKPa"
-
-#~ msgid "Laos"
-#~ msgstr "Laos"
-
-#~ msgid "Latin"
-#~ msgstr "Latin"
-
-#~ msgid "Lav"
-#~ msgstr "Lav"
-
-#~ msgid "Left hand"
-#~ msgstr "Main gauche"
-
-#~ msgid "MESS"
-#~ msgstr "MESS"
-
-#~ msgid "MNE"
-#~ msgstr "MNE"
-
-#~ msgid "Mal"
-#~ msgstr "Mal"
-
-#~ msgid "Maldives"
-#~ msgstr "Maldives"
-
-#~ msgid "Mao"
-#~ msgstr "Mao"
-
-#~ msgid "Maori"
-#~ msgstr "Maori"
-
-#~ msgid "Mkd"
-#~ msgstr "Mkd"
-
-#~ msgid "Mmr"
-#~ msgstr "Mmr"
-
-#~ msgid "Mng"
-#~ msgstr "Mng"
-
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
-
-#~ msgid "NLA"
-#~ msgstr "NLA"
-
-#~ msgid "Nativo"
-#~ msgstr "Nativo"
-
-#~ msgid "Neo 2"
-#~ msgstr "Neo 2"
-
-#~ msgid "Nep"
-#~ msgstr "Nep"
-
-#~ msgid "Netherlands"
-#~ msgstr "Pays-Bas"
-
-#~ msgid "Nigeria"
-#~ msgstr "Nigeria"
-
-#~ msgid "Nld"
-#~ msgstr "Nld"
-
-#~ msgid "Nor"
-#~ msgstr "Nor"
-
-#~ msgid "Norway"
-#~ msgstr "Norvège"
-
-#~ msgid "OLPC Dari"
-#~ msgstr "OLPC Dari"
-
-#~ msgid "OLPC Pashto"
-#~ msgstr "OLPC Pashto"
-
-#~ msgid "OLPC Southern Uzbek"
-#~ msgstr "OLPC Ouzbek du Sud"
-
-#~ msgid "Occitan"
-#~ msgstr "Occitan"
-
-#~ msgid "Ogham"
-#~ msgstr "Ogham"
-
-#~ msgid "Ossetian"
-#~ msgstr "Ossétie"
-
-#~ msgid "Phonetic"
-#~ msgstr "Phonétique"
-
-#~ msgid "Phonetic Winkeys"
-#~ msgstr "Touches Logo phonétiques"
-
-#~ msgid "Pol"
-#~ msgstr "Pol"
-
-#~ msgid "Poland"
-#~ msgstr "Pologne"
-
-#~ msgid "Probhat"
-#~ msgstr "Probhat"
-
-#~ msgid "Prt"
-#~ msgstr "Prt"
-
-#~ msgid "SRB"
-#~ msgstr "SRB"
-
-#~ msgid "ScrollLock"
-#~ msgstr "Arrêt défil."
-
-#~ msgid "Simple"
-#~ msgstr "Simple"
-
-#~ msgid "Southern Uzbek"
-#~ msgstr "Ouzbek du Sud"
-
-#~ msgid "Spain"
-#~ msgstr "Espagne"
-
-#~ msgid "Sri Lanka"
-#~ msgstr "Sri Lanka"
-
-#~ msgid "Standard"
-#~ msgstr "Standard"
-
-#~ msgid "Svk"
-#~ msgstr "Svk"
-
-#~ msgid "Svn"
-#~ msgstr "Svn"
-
-#~ msgid "Swe"
-#~ msgstr "Sué"
-
-#~ msgid "Syr"
-#~ msgstr "Syr"
-
-#~ msgid "Syria"
-#~ msgstr "Syrie"
-
-#~ msgid "Tatar"
-#~ msgstr "Tatar"
-
-#~ msgid "Tha"
-#~ msgstr "Tha"
-
-#~ msgid "Tibetan"
-#~ msgstr "Tibétain"
-
-#~ msgid "Tifinagh"
-#~ msgstr "Tifinagh"
-
-#~ msgid "Tjk"
-#~ msgstr "Tjk"
-
-#~ msgid "Typewriter"
-#~ msgstr "Machine à écrire"
-
-#~ msgid "Udmurt"
-#~ msgstr "Oudmourte"
-
-#~ msgid "Ukr"
-#~ msgstr "Ukr"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Royaume-Uni"
-
-#~ msgid "Uzb"
-#~ msgstr "Uzb"
-
-#~ msgid "Vnm"
-#~ msgstr "Vnm"
-
-#~ msgid "Western"
-#~ msgstr "Occidentale"
-
-#~ msgid "With guillemets"
-#~ msgstr "Avec guillemets"
-
-#~ msgid "azerty"
-#~ msgstr "azerty"
-
-#~ msgid "digits"
-#~ msgstr "chiffres"
-
-#~ msgid "lyx"
-#~ msgstr "lyx"
-
-#~ msgid "qwertz"
-#~ msgstr "qwertz"
-
-#~ msgid "Baltic+"
-#~ msgstr "Baltic+"
-
-#~ msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-#~ msgstr "IBM ThinkPad 560Z/600/600E/A22E (Intl)"
-
-#~ msgid "Keypad"
-#~ msgstr "Pavé numérique"
-
-#~ msgid "Pro Keypad"
-#~ msgstr "Pavé Pro"
-
-#~ msgid "Standard Phonetic"
-#~ msgstr "Phonétique standard"
-
-#~ msgid "Brazilian ABNT2"
-#~ msgstr "ABNT2 brésilien"
-
-#~ msgid "Kir"
-#~ msgstr "Kir"
-
-#~ msgid "Super is mapped to Win keys"
-#~ msgstr "Super est obtenu avec n'importe quelle touche Logo"
-
-#~ msgid "US keyboard with Slovenian digraphs"
-#~ msgstr "Clavier US avec digraphes slovènes"
-
-#~ msgid "Unicode"
-#~ msgstr "Unicode"
-
-#~ msgid "Use Slovenian digraphs"
-#~ msgstr "Avec digraphes slovènes"
-
-#~ msgid "Add the EuroSign to the 2 key."
-#~ msgstr "Ajouter le signe Euro sur la touche 2."
-
-#~ msgid "Add the EuroSign to the 4 key."
-#~ msgstr "Ajouter le signe Euro sur la touche 4."
-
-#~ msgid "Add the EuroSign to the 5 key."
-#~ msgstr "Ajouter le signe Euro sur la touche 5."
-
-#~ msgid "Add the EuroSign to the E key."
-#~ msgstr "Ajouter le signe Euro sur la touche E."
-
-#~ msgid "Alt+Ctrl change layout."
-#~ msgstr "Alt+Ctrl change de configuration."
-
-#~ msgid "Alt+Shift change layout."
-#~ msgstr "Alt+Maj. change de configuration."
-
-#~ msgid "CapsLock LED shows alternative layout."
-#~ msgstr "Le témoins lumineux du Verr. maj. indique un groupe autre que le premier."
-
-#~ msgid "CapsLock just locks the Shift modifier."
-#~ msgstr "Verr. maj. verrouille le modificateur de majuscules."
-
-#~ msgid "CapsLock key changes layout."
-#~ msgstr "La touche Verr. maj. change de disposition."
-
-#~ msgid "Ctrl+Shift change layout."
-#~ msgstr "Ctrl+Maj. change de disposition."
-
-#~ msgid "Hewlett-Packard Internet Keyboard 5181"
-#~ msgstr "Hewlett-Packard avec clavier Internet 5181"
-
-#~ msgid "Hewlett-Packard Internet Keyboard 5185"
-#~ msgstr "Hewlett-Packard avec clavier Internet 5185"
-
-#~ msgid "Hewlett-Packard SK-2505 Internet Keyboard"
-#~ msgstr "Hewlett-Packard SK-2505 Internet"
-
-#~ msgid "IBM Rapid Access II (alternate option)"
-#~ msgstr "IBM Rapid Access II (autre option)"
-
-#~ msgid "LCtrl+LShift change layout."
-#~ msgstr "Ctrl gauche+Maj. gauche change de disposition."
-
-#~ msgid "Layout switching"
-#~ msgstr "Changement de disposition"
-
-#~ msgid "Left Alt key changes layout."
-#~ msgstr "La touche Alt de gauche change de disposition."
-
-#~ msgid "Left Ctrl key changes layout."
-#~ msgstr "La touche Ctrl de gauche change de disposition."
-
-#~ msgid "Left Shift key changes layout."
-#~ msgstr "La touche Maj. de gauche change de disposition."
-
-#~ msgid "Left Win-key changes layout."
-#~ msgstr "La touche Logo de gauche change de disposition."
-
-#~ msgid "Left Win-key is Compose."
-#~ msgstr "La touche Logo de gauche est Compose."
-
-#~ msgid "Legacy keypad"
-#~ msgstr "Clavier obsolète"
-
-#~ msgid "Menu is Compose."
-#~ msgstr "Menu est Compose."
-
-#~ msgid "Neostyle"
-#~ msgstr "Neostyle"
-
-#~ msgid "NumLock LED shows alternative layout."
-#~ msgstr "Le témoin lumineux de verrouillage numérique indique une disposition alternative."
-
-#~ msgid "Press Left Alt key to choose 3rd level."
-#~ msgstr "La touche Alt de gauche sélectionne le 3e niveau."
-
-#~ msgid "Press Left Win-key to choose 3rd level."
-#~ msgstr "La touche Logo de gauche sélectionne le 3e niveau."
-
-#~ msgid "Press Right Alt key to choose 3rd level."
-#~ msgstr "La touche Alt de droite (AltGr) sélectionne le 3e niveau."
-
-#~ msgid "Press Right Ctrl to choose 3rd level."
-#~ msgstr "La touche Ctrl de droite sélectionne le 3e niveau."
-
-#~ msgid "Press Right Win-key to choose 3rd level."
-#~ msgstr "La touche Logo de droite sélectionne le 3e niveau."
-
-#~ msgid "Press any of Alt keys to choose 3rd level."
-#~ msgstr "N'importe quelle touche Alt sélectionne le 3e niveau."
-
-#~ msgid "Press any of Win-keys to choose 3rd level."
-#~ msgstr "N'importe quelle touche Logo sélectionne le 3e niveau."
-
-#~ msgid "Right Alt is Compose."
-#~ msgstr "La touche Alt de droite est Compose."
-
-#~ msgid "Right Alt key changes layout."
-#~ msgstr "La touche Alt de droite change de disposition."
-
-#~ msgid "Right Ctrl key changes layout."
-#~ msgstr "La touche Ctrl de droite change de disposition."
-
-#~ msgid "Right Shift key changes layout."
-#~ msgstr "La touche Maj. de droite change de disposition."
-
-#~ msgid "Right Win-key changes layout."
-#~ msgstr "La touche Logo de droite change de disposition."
-
-#~ msgid "Right Win-key is Compose."
-#~ msgstr "La touche Logo de droite est Compose."
-
-#~ msgid "ScrollLock LED shows alternative layout."
-#~ msgstr "Le témoin lumineux d'Arrêt défil. indique une disposition différente."
-
-#~ msgid "Shift+CapsLock changes layout."
-#~ msgstr "Les touches Maj.+Verr. maj. changent de disposition."
-
-#~ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-#~ msgstr "Échange les codes de deux touches pour les claviers Mac mal reconnus par le noyau."
-
-#~ msgid "Third level choosers"
-#~ msgstr "Sélecteur du 3e niveau"
-
-#~ msgid "(Legacy) Dvorak"
-#~ msgstr "(Obsolète) Dvorak"
-
-#~ msgid "Acer TravelMate 800"
-#~ msgstr "Acer TravelMate 800"
-
-#~ msgid "Adding the nobreakspace keysym to space key"
-#~ msgstr "Ajout de l'espace insécable sur la barre d'espace"
-
-#~ msgid "Dnk"
-#~ msgstr "Dnk"
-
-#~ msgid "Group Shift/Lock behavior"
-#~ msgstr "Combinaisons pour changer de groupe"
-
-#~ msgid "Kotoistus"
-#~ msgstr "Kotoistus"
-
-#~ msgid "Kyr"
-#~ msgstr "Kyr"
-
-#~ msgid "Lva"
-#~ msgstr "Lva"
-
-#~ msgid "PowerPC PS/2"
-#~ msgstr "PowerPC PS/2"
-
-#~ msgid "SCG"
-#~ msgstr "SCG"
-
-#~ msgid "Macintosh layout"
-#~ msgstr "Disposition Apple-Macintosh"
+#: ../rules/base.extras.xml.in.h:30
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
 
-#~ msgid "Logitech Deluxe Access Keyboard"
-#~ msgstr "Logitech Deluxe Access"
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "Serbe (accents combinatoires à la place des touches mortes)"
 
-#~ msgid "Logitech iTouch keyboard Internet Navigator"
-#~ msgstr "Logitech iTouch Internet Navigator"
+#: ../rules/base.extras.xml.in.h:33
+msgid "apl"
+msgstr "apl"
 
-#~ msgid "Power G5"
-#~ msgstr "Power G5"
+#: ../rules/base.extras.xml.in.h:38
+msgid "kut"
+msgstr "kut"
 
-#~ msgid "si1452"
-#~ msgstr "si1452"
+#: ../rules/base.extras.xml.in.h:44
+msgid "shs"
+msgstr "shs"
diff --git a/xorg-server/xkeyboard-config/po/hu.po b/xorg-server/xkeyboard-config/po/hu.po
index d57de715c..9557c71b7 100644
--- a/xorg-server/xkeyboard-config/po/hu.po
+++ b/xorg-server/xkeyboard-config/po/hu.po
@@ -7,3094 +7,3750 @@
 # Gabor Kelemen <kelemeng@gnome.hu>, 2006, 2007, 2008, 2009, 2010, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config 2.1-pre1\n"
+"Project-Id-Version: xkeyboard-config 2.1.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-01-12 00:16+0000\n"
-"PO-Revision-Date: 2011-01-12 22:57+0100\n"
+"POT-Creation-Date: 2011-03-25 22:27+0000\n"
+"PO-Revision-Date: 2011-04-04 01:36+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../rules/base.xml.in.h:1
 msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;Kisebb/nagyobb&gt;"
 
 #: ../rules/base.xml.in.h:2
-msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "&lt;Kisebb/nagyobb&gt; választja az 5. szintet, másik 5. szintet választóval együtt lenyomva zárol"
+msgid "&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "&lt;Kisebb/nagyobb&gt; (választja a 3. szintet, másik 3. szintet választóval együtt lenyomva zárol)"
 
 #: ../rules/base.xml.in.h:3
-msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "&lt;Kisebb/nagyobb&gt; 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"
+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;Kisebb/nagyobb&gt; választja az 5. szintet, másik 5. szintet választóval együtt lenyomva az 5. szinten zárol, egy lenyomása feloldja a zárolást"
 
 #: ../rules/base.xml.in.h:4
-msgid "(F)"
-msgstr "(F)"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "&lt;Kisebb/nagyobb&gt; választja az 5. szintet, másik 5. szintet választóval együtt lenyomva zárol"
 
 #: ../rules/base.xml.in.h:5
-msgid "(Legacy) Alternative"
-msgstr "(Hagyományos) Alternatív"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "&lt;Kisebb/nagyobb&gt; 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:6
-msgid "(Legacy) Alternative, Sun dead keys"
-msgstr "(Hagyományos) Alternatív, Sun halott billentyűk"
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
 
 #: ../rules/base.xml.in.h:7
-msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "(Hagyományos) Alternatív, halott billentyűk tiltása"
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
 
 #: ../rules/base.xml.in.h:8
-msgid "101/104 key Compatible"
-msgstr "101/104 gomb kompatibilis"
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
 
 #: ../rules/base.xml.in.h:9
-msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/vessző/Halott billentyűk"
+msgid "ATM/phone-style"
+msgstr "ATM/telefon stílusú"
 
 #: ../rules/base.xml.in.h:10
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/vessző/Halott billentyűk tiltása"
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
 
 #: ../rules/base.xml.in.h:11
-msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/pont/Halott billentyűk"
+msgid "Acer C300"
+msgstr "Acer C300"
 
 #: ../rules/base.xml.in.h:12
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/pont/Halott billentyűk tiltása"
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
 
 #: ../rules/base.xml.in.h:13
-msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/vessző/Halott billentyűk"
+msgid "Acer Laptop"
+msgstr "Acer noteszgép"
 
 #: ../rules/base.xml.in.h:14
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwertz/vessző/Halott billentyűk tiltása"
+msgid "Add the standard behavior to Menu key"
+msgstr "A szabványos funkcionalitás hozzáadása a Menü billentyűhöz"
 
 #: ../rules/base.xml.in.h:15
-msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/pont/Halott billentyűk"
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Eszperantó circumflexek hozzáadása"
 
 #: ../rules/base.xml.in.h:16
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/pont/Halott billentyűk tiltása"
+msgid "Adding currency signs to certain keys"
+msgstr "Pénznem jelek hozzáadása bizonyos billentyűkhöz"
 
 #: ../rules/base.xml.in.h:17
-msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/vessző/Halott billentyűk"
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
 
 #: ../rules/base.xml.in.h:18
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/vessző/Halott billentyűk tiltása"
+msgid "Afg"
+msgstr "Afg"
 
 #: ../rules/base.xml.in.h:19
-msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/pont/Halott billentyűk"
+msgid "Afghani"
+msgstr "Afgáni"
 
 #: ../rules/base.xml.in.h:20
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/pont/Halott billentyűk tiltása"
+msgid "Akan"
+msgstr "akan"
 
 #: ../rules/base.xml.in.h:21
-msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/vessző/Halott billentyűk"
+msgid "Albanian"
+msgstr "Albán"
 
 #: ../rules/base.xml.in.h:22
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/vessző/Halott billentyűk tiltása"
+msgid "Alt and Meta are on Alt keys"
+msgstr "Az Alt és Meta az Alt billentyűkön"
 
 #: ../rules/base.xml.in.h:23
-msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/pont/Halott billentyűk"
+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
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/pont/Halott billentyűk tiltása"
+msgid "Alt+Caps Lock"
+msgstr "Alt+Caps Lock"
 
 #: ../rules/base.xml.in.h:25
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
 
 #: ../rules/base.xml.in.h:26
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
 
 #: ../rules/base.xml.in.h:27
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
+msgid "Alt+Space"
+msgstr "Alt+Szóköz"
 
 #: ../rules/base.xml.in.h:28
-msgid "ATM/phone-style"
-msgstr "ATM/telefon stílusú"
+msgid "Alt/Win key behavior"
+msgstr "Az Alt/Win billentyűk viselkedése"
 
 #: ../rules/base.xml.in.h:29
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
+msgid "Amharic"
+msgstr "Amhara"
 
 #: ../rules/base.xml.in.h:30
-msgid "Acer C300"
-msgstr "Acer C300"
+msgid "Any Alt key"
+msgstr "Bármely Alt billentyű"
 
 #: ../rules/base.xml.in.h:31
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
+msgid "Any Win key"
+msgstr "Bármely Win billentyű"
 
 #: ../rules/base.xml.in.h:32
-msgid "Acer Laptop"
-msgstr "Acer noteszgép"
+msgid "Any Win key (while pressed)"
+msgstr "Bármely Win billentyű (lenyomva tartva)"
 
 #: ../rules/base.xml.in.h:33
-msgid "Add the standard behavior to Menu key"
-msgstr "A standard funkcionalitás hozzáadása a Menü billentyűhöz"
+msgid "Apple"
+msgstr "Apple"
 
 #: ../rules/base.xml.in.h:34
-msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr "Eszperantó circumflexek hozzáadása"
+msgid "Apple Aluminium Keyboard (ANSI)"
+msgstr "Apple alumínium billentyűzet (ANSI)"
 
 #: ../rules/base.xml.in.h:35
-msgid "Adding currency signs to certain keys"
-msgstr "Pénznem jelek hozzáadása bizonyos billentyűkhöz"
+msgid "Apple Aluminium Keyboard (ISO)"
+msgstr "Apple alumínium billentyűzet (ISO)"
 
 #: ../rules/base.xml.in.h:36
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
+msgid "Apple Aluminium Keyboard (JIS)"
+msgstr "Apple alumínium billentyűzet (JIS)"
 
 #: ../rules/base.xml.in.h:37
-msgid "Afg"
-msgstr "Afg"
+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
-msgid "Afghanistan"
-msgstr "Afganisztán"
+msgid "Apple Laptop"
+msgstr "Apple noteszgép"
 
 #: ../rules/base.xml.in.h:39
-msgid "Akan"
-msgstr "akan"
+msgid "Arabic"
+msgstr "Arab"
 
 #: ../rules/base.xml.in.h:40
-msgid "Alb"
-msgstr "Alb"
+msgid "Arabic (Buckwalter)"
+msgstr "Arab (Buckwalter)"
 
 #: ../rules/base.xml.in.h:41
-msgid "Albania"
-msgstr "Albánia"
+msgid "Arabic (Morocco)"
+msgstr "Arab (Marokkó)"
 
 #: ../rules/base.xml.in.h:42
-msgid "Alt and Meta are on Alt keys"
-msgstr "Az Alt és Meta az Alt billentyűkön"
+msgid "Arabic (Pakistan)"
+msgstr "Arab (Pakisztán)"
 
 #: ../rules/base.xml.in.h:43
-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"
+msgid "Arabic (Syria)"
+msgstr "Arab (Szíria)"
 
 #: ../rules/base.xml.in.h:44
-msgid "Alt+Caps Lock"
-msgstr "Alt+Caps Lock"
+msgid "Arabic (azerty)"
+msgstr "Arab (azerty)"
 
 #: ../rules/base.xml.in.h:45
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
+msgid "Arabic (azerty/digits)"
+msgstr "Arab (azerty/számjegyek)"
 
 #: ../rules/base.xml.in.h:46
-msgid "Alt+Shift"
-msgstr "Alt+Shift"
+msgid "Arabic (digits)"
+msgstr "Arab (számjegyek)"
 
 #: ../rules/base.xml.in.h:47
-msgid "Alt+Space"
-msgstr "Alt+Szóköz"
+msgid "Arabic (qwerty)"
+msgstr "Arab (qwerty)"
 
 #: ../rules/base.xml.in.h:48
-msgid "Alt-Q"
-msgstr "Alt-Q"
+msgid "Arabic (qwerty/digits)"
+msgstr "Arab (qwerty/számjegyek)"
 
 #: ../rules/base.xml.in.h:49
-msgid "Alt/Win key behavior"
-msgstr "Az Alt/Win billentyűk viselkedése"
+msgid "Armenian"
+msgstr "Örmény"
 
 #: ../rules/base.xml.in.h:50
-msgid "Alternative"
-msgstr "Alternatív"
+msgid "Armenian (alternative eastern)"
+msgstr "Örmény (Alternatív keleti)"
 
 #: ../rules/base.xml.in.h:51
-msgid "Alternative Eastern"
-msgstr "Alternatív keleti"
+msgid "Armenian (alternative phonetic)"
+msgstr "Örmény (Alternatív fonetikus)"
 
 #: ../rules/base.xml.in.h:52
-msgid "Alternative Phonetic"
-msgstr "Alternatív fonetikus"
+msgid "Armenian (eastern)"
+msgstr "Örmény (keleti)"
 
 #: ../rules/base.xml.in.h:53
-msgid "Alternative international"
-msgstr "Alternatív nemzetközi"
+msgid "Armenian (phonetic)"
+msgstr "Örmény (fonetikus)"
 
 #: ../rules/base.xml.in.h:54
-msgid "Alternative, Sun dead keys"
-msgstr "Alternatív, Sun halott billentyűk"
+msgid "Armenian (western)"
+msgstr "Örmény (nyugati)"
 
 #: ../rules/base.xml.in.h:55
-msgid "Alternative, eliminate dead keys"
-msgstr "Alternatív, halott billentyűk tiltása"
+msgid "Asus Laptop"
+msgstr "Asus noteszgép"
 
 #: ../rules/base.xml.in.h:56
-msgid "Alternative, latin-9 only"
-msgstr "Alternatív, csak latin-9"
+msgid "At bottom left"
+msgstr "Bal oldalt, alul"
 
 #: ../rules/base.xml.in.h:57
-msgid "And"
-msgstr "And"
+msgid "At left of 'A'"
+msgstr "Az „A”-tól balra"
 
 #: ../rules/base.xml.in.h:58
-msgid "Andorra"
-msgstr "Andorra"
+msgid "Avatime"
+msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:59
-msgid "Any Alt key"
-msgstr "Bármely Alt billentyű"
+msgid "Azerbaijan (Cyrillic)"
+msgstr "Azerbajdzsán (cirill)"
 
 #: ../rules/base.xml.in.h:60
-msgid "Any Win key"
-msgstr "Bármely Win billentyű"
+msgid "Azerbaijani"
+msgstr "Azeri"
 
 #: ../rules/base.xml.in.h:61
-msgid "Any Win key (while pressed)"
-msgstr "Bármely Win billentyű (lenyomva tartva)"
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 wireless Internet billentyűzet"
 
 #: ../rules/base.xml.in.h:62
-msgid "Apostrophe (') variant"
-msgstr "Aposztróf (') változat"
+msgid "BTC 5090"
+msgstr "BTC 5090"
 
 #: ../rules/base.xml.in.h:63
-msgid "Apple"
-msgstr "Apple"
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
 
 #: ../rules/base.xml.in.h:64
-msgid "Apple Aluminium Keyboard (ANSI)"
-msgstr "Apple alumínium billentyűzet (ANSI)"
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
 
 #: ../rules/base.xml.in.h:65
-msgid "Apple Aluminium Keyboard (ISO)"
-msgstr "Apple alumínium billentyűzet (ISO)"
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
 
 #: ../rules/base.xml.in.h:66
-msgid "Apple Aluminium Keyboard (JIS)"
-msgstr "Apple alumínium billentyűzet (JIS)"
+msgid "BTC 9000"
+msgstr "BTC 9000"
 
 #: ../rules/base.xml.in.h:67
-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)"
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
 
 #: ../rules/base.xml.in.h:68
-msgid "Apple Laptop"
-msgstr "Apple noteszgép"
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
 
 #: ../rules/base.xml.in.h:69
-msgid "Ara"
-msgstr "Ara"
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
 
 #: ../rules/base.xml.in.h:70
-msgid "Arabic"
-msgstr "Arab"
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U Mini Wireless internet és játék"
 
 #: ../rules/base.xml.in.h:71
-msgid "Arm"
-msgstr "Arm"
+msgid "Backslash"
+msgstr "Fordított törtvonal"
 
 #: ../rules/base.xml.in.h:72
-msgid "Armenia"
-msgstr "Örményország"
+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 "Asturian variant with bottom-dot H and bottom-dot L"
-msgstr "Asztúri változat középső pontos H és L karakterrel"
+msgid "Bambara"
+msgstr "Bambara"
 
 #: ../rules/base.xml.in.h:74
-msgid "Asus Laptop"
-msgstr "Asus noteszgép"
+msgid "Belarusian"
+msgstr "Belorusz"
 
 #: ../rules/base.xml.in.h:75
-msgid "At bottom left"
-msgstr "Bal oldalt, alul"
+msgid "Belarusian (Latin)"
+msgstr "Belorusz (Latin)"
 
 #: ../rules/base.xml.in.h:76
-msgid "At left of 'A'"
-msgstr "Az „A”-tól balra"
+msgid "Belarusian (legacy)"
+msgstr "Belorusz (hagyományos)"
 
 #: ../rules/base.xml.in.h:77
-msgid "Austria"
-msgstr "Ausztria"
+msgid "Belgian"
+msgstr "Belga"
 
 #: ../rules/base.xml.in.h:78
-msgid "Aut"
-msgstr "Aut"
+msgid "Belgian (ISO alternate)"
+msgstr "Belga (ISO alternatív)"
 
 #: ../rules/base.xml.in.h:79
-msgid "Avatime"
-msgstr "Avatime"
+msgid "Belgian (Sun dead keys)"
+msgstr "Belga (Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:80
-msgid "Aze"
-msgstr "Aze"
+msgid "Belgian (Wang model 724 azerty)"
+msgstr "Belga (Wang 724-es modell, azerty)"
 
 #: ../rules/base.xml.in.h:81
-msgid "Azerbaijan"
-msgstr "Azerbajdzsán"
+msgid "Belgian (alternative)"
+msgstr "Belga (Alternatív)"
 
 #: ../rules/base.xml.in.h:82
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 wireless Internet billentyűzet"
+msgid "Belgian (alternative, Sun dead keys)"
+msgstr "Belga (Alternatív, Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:83
-msgid "BTC 5090"
-msgstr "BTC 5090"
+msgid "Belgian (alternative, latin-9 only)"
+msgstr "Belga (Alternatív, csak latin-9)"
 
 #: ../rules/base.xml.in.h:84
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
+msgid "Belgian (eliminate dead keys)"
+msgstr "Belga (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:85
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
 
 #: ../rules/base.xml.in.h:86
-msgid "BTC 6301URF"
-msgstr "BTC 6301URF"
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
 
 #: ../rules/base.xml.in.h:87
-msgid "BTC 9000"
-msgstr "BTC 9000"
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
 
 #: ../rules/base.xml.in.h:88
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
+msgid "Bengali"
+msgstr "Bengáli"
 
 #: ../rules/base.xml.in.h:89
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
+msgid "Bengali (Probhat)"
+msgstr "Bengáli (probhat)"
 
 #: ../rules/base.xml.in.h:90
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgstr "Berber (Marokkó, alternatív fonetikus Tifinagh)"
 
 #: ../rules/base.xml.in.h:91
-msgid "BTC 9116U Mini Wireless Internet and Gaming"
-msgstr "BTC 9116U Mini Wireless internet és játék"
+msgid "Berber (Morocco, Tifinagh alternative)"
+msgstr "Berber (Marokkó, alternatív Tifinagh)"
 
 #: ../rules/base.xml.in.h:92
-msgid "Backslash"
-msgstr "Fordított törtvonal"
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgstr "Berber (Marokkó, kibővített fonetikus Tifinagh)"
 
 #: ../rules/base.xml.in.h:93
-msgid "Bangladesh"
-msgstr "Banglades"
+msgid "Berber (Morocco, Tifinagh extended)"
+msgstr "Berber (Marokkó, kibővített Tifinagh)"
 
 #: ../rules/base.xml.in.h:94
-msgid "Bashkirian"
-msgstr "Baskír"
+msgid "Berber (Morocco, Tifinagh phonetic)"
+msgstr "Berber (Marokkó, fonetikus Tifinagh)"
 
 #: ../rules/base.xml.in.h:95
-msgid "Bel"
-msgstr "Bel"
+msgid "Berber (Morocco, Tifinagh)"
+msgstr "Berber (Marokkó, Tifinagh)"
 
 #: ../rules/base.xml.in.h:96
-msgid "Belarus"
-msgstr "Fehéroroszország"
+msgid "Bosnian"
+msgstr "Bosnyák"
 
 #: ../rules/base.xml.in.h:97
-msgid "Belgium"
-msgstr "Belgium"
+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
-msgid "BenQ X-Touch"
-msgstr "BenQ X-Touch"
+msgid "Bosnian (US keyboard with Bosnian letters)"
+msgstr "Bosnyák (US billentyűzet bosnyák betűkkel)"
 
 #: ../rules/base.xml.in.h:99
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
+msgid "Bosnian (use Bosnian digraphs)"
+msgstr "Bosnyák (Bosnyák billentyűkombinációk használata)"
 
 #: ../rules/base.xml.in.h:100
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
+msgid "Bosnian (use guillemets for quotes)"
+msgstr "Bosnyák (»Csúcsos« idézőjelek használata idézetekhez)"
 
 #: ../rules/base.xml.in.h:101
-msgid "Bengali"
-msgstr "Bengáli"
+msgid "Both Alt keys together"
+msgstr "A két Alt billentyű együtt"
 
 #: ../rules/base.xml.in.h:102
-msgid "Bengali Probhat"
-msgstr "Bengáli probhat"
+msgid "Both Ctrl keys together"
+msgstr "A két Ctrl billentyű együtt"
 
 #: ../rules/base.xml.in.h:103
-msgid "Bepo, ergonomic, Dvorak way"
-msgstr "Bepo, ergonomikus, Dvorak kiosztás"
+msgid "Both Shift keys together"
+msgstr "A két Shift billentyű együtt"
 
 #: ../rules/base.xml.in.h:104
-msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
-msgstr "Bepo, ergonomikus, Dvorak kiosztás, csak latin-9"
+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
-msgid "Bgd"
-msgstr "Bgd"
+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
-msgid "Bgr"
-msgstr "Bgr"
+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
-msgid "Bhutan"
-msgstr "Bhután"
+msgid "Braille"
+msgstr "Braille"
 
 #: ../rules/base.xml.in.h:108
-msgid "Biblical Hebrew (Tiro)"
-msgstr "Bibliai héber (Tiro)"
+msgid "Braille (left hand)"
+msgstr "Braille (balkezes)"
 
 #: ../rules/base.xml.in.h:109
-msgid "Bih"
-msgstr "Bih"
+msgid "Braille (right hand)"
+msgstr "Braille (jobbkezes)"
 
 #: ../rules/base.xml.in.h:110
-msgid "Blr"
-msgstr "Blr"
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet billentyűzet"
 
 #: ../rules/base.xml.in.h:111
-msgid "Bosnia and Herzegovina"
-msgstr "Bosznia és Hercegovina"
+msgid "Bulgarian"
+msgstr "Bolgár"
 
 #: ../rules/base.xml.in.h:112
-msgid "Both Alt keys together"
-msgstr "A két Alt billentyű együtt"
+msgid "Bulgarian (new phonetic)"
+msgstr "Bolgár (új fonetikus)"
 
 #: ../rules/base.xml.in.h:113
-msgid "Both Ctrl keys together"
-msgstr "A két Ctrl billentyű együtt"
+msgid "Bulgarian (traditional phonetic)"
+msgstr "Bolgár (hagyományos fonetikus)"
 
 #: ../rules/base.xml.in.h:114
-msgid "Both Shift keys together"
-msgstr "A két Shift billentyű együtt"
+msgid "Burmese"
+msgstr "Burmai"
 
 #: ../rules/base.xml.in.h:115
-msgid "Both Shift-Keys together toggle Caps Lock"
-msgstr "A két Shift billentyű együtt váltja a Caps Lockot"
+msgid "Canadian Multilingual"
+msgstr "Kanadai többnyelvű"
 
 #: ../rules/base.xml.in.h:116
-msgid "Botswana"
-msgstr "Botswana"
+msgid "Canadian Multilingual (first part)"
+msgstr "Kanadai többnyelvű (első rész)"
 
 #: ../rules/base.xml.in.h:117
-msgid "Bra"
-msgstr "Bra"
+msgid "Canadian Multilingual (second part)"
+msgstr "Kanadai többnyelvű (második rész)"
 
 #: ../rules/base.xml.in.h:118
-msgid "Braille"
-msgstr "Braille"
+msgid "Caps Lock"
+msgstr "Caps Lock"
 
 #: ../rules/base.xml.in.h:119
-msgid "Brazil"
-msgstr "Brazília"
+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
-msgid "Breton"
-msgstr "Breton"
+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
-msgid "Brl"
-msgstr "Brl"
+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
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internet billentyűzet"
+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
-msgid "Btn"
-msgstr "Btn"
+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
-msgid "Buckwalter"
-msgstr "Buckwalter"
+msgid "Caps Lock is disabled"
+msgstr "A Caps Lock letiltva"
 
 #: ../rules/base.xml.in.h:125
-msgid "Bulgaria"
-msgstr "Bulgária"
+msgid "Caps Lock key behavior"
+msgstr "A Caps Lock billentyű viselkedése"
 
 #: ../rules/base.xml.in.h:126
-msgid "Bwa"
-msgstr "Bwa"
+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
-msgid "COD"
-msgstr "COD"
+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
-msgid "CRULP"
-msgstr "CRULP"
+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
-msgid "Cambodia"
-msgstr "Kambodzsa"
+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
-msgid "Can"
-msgstr "Can"
+msgid "Catalan"
+msgstr "Katalán"
 
 #: ../rules/base.xml.in.h:131
-msgid "Canada"
-msgstr "Kanada"
+msgid "Cherokee"
+msgstr "Cherokee"
 
 #: ../rules/base.xml.in.h:132
-msgid "Capewell-Dvorak (Baybayin)"
-msgstr "Capewell-Dvorak (Baybayin)"
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
 
 #: ../rules/base.xml.in.h:133
-msgid "Capewell-Dvorak (Latin)"
-msgstr "Capewell-Dvorak (Latin)"
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
 
 #: ../rules/base.xml.in.h:134
-msgid "Capewell-QWERF 2006 (Baybayin)"
-msgstr "Capewell-QWERF 2006 (Baybayin)"
+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
-msgid "Capewell-QWERF 2006 (Latin)"
-msgstr "Capewell-QWERF 2006 (Latin)"
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
 
 #: ../rules/base.xml.in.h:136
-msgid "Caps Lock"
-msgstr "Caps Lock"
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
 
 #: ../rules/base.xml.in.h:137
-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)"
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
 
 #: ../rules/base.xml.in.h:138
-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"
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
 
 #: ../rules/base.xml.in.h:139
-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"
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet billentyűzet"
 
 #: ../rules/base.xml.in.h:140
-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"
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
 
 #: ../rules/base.xml.in.h:141
-msgid "Caps Lock is disabled"
-msgstr "A Caps Lock letiltva"
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
 
 #: ../rules/base.xml.in.h:142
-msgid "Caps Lock key behavior"
-msgstr "A Caps Lock billentyű viselkedése"
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
 
 #: ../rules/base.xml.in.h:143
-msgid "Caps Lock toggles Shift so all keys are affected"
-msgstr "A Caps Lock átváltja a Shiftet, így minden billentyű érintett"
+msgid "Chinese"
+msgstr "Kínai"
 
 #: ../rules/base.xml.in.h:144
-msgid "Caps Lock toggles normal capitalization of alphabetic characters"
-msgstr "A Caps Lock átváltja a betűkarakterek normál kis- és nagybetűit"
+msgid "Chinese (Tibetan with ASCII numerals)"
+msgstr "Kínai (Tibeti ASCII számjegyekkel)"
 
 #: ../rules/base.xml.in.h:145
-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"
+msgid "Chinese (Tibetan)"
+msgstr "Kínai (tibeti)"
 
 #: ../rules/base.xml.in.h:146
-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"
+msgid "Chinese (Uyghur)"
+msgstr "Kínai (ujgur)"
 
 #: ../rules/base.xml.in.h:147
-msgid "Catalan variant with middle-dot L"
-msgstr "Katalán változat középső pontos L karakterrel"
+msgid "Classmate PC"
+msgstr "Classmate PC"
 
 #: ../rules/base.xml.in.h:148
-msgid "Cedilla"
-msgstr "Cedilla"
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access billentyűzet"
 
 #: ../rules/base.xml.in.h:149
-msgid "Che"
-msgstr "Che"
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet billentyűzet (13 gombos)"
 
 #: ../rules/base.xml.in.h:150
-msgid "Cherokee"
-msgstr "Cherokee"
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet billentyűzet (18 gombos)"
 
 #: ../rules/base.xml.in.h:151
-msgid "Cherry B.UNLIMITED"
-msgstr "Cherry B.UNLIMITED"
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet billentyűzet (7 gombos)"
 
 #: ../rules/base.xml.in.h:152
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq billentyűzet"
 
 #: ../rules/base.xml.in.h:153
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (másik lehetőség)"
+msgid "Compose key position"
+msgstr "A kombináló (Compose) billentyű helye"
 
 #: ../rules/base.xml.in.h:154
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
+msgid "Control + Alt + Backspace"
+msgstr "Control + Alt + Backspace"
 
 #: ../rules/base.xml.in.h:155
-msgid "Cherry CyMotion Expert"
-msgstr "Cherry CyMotion Expert"
+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
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
+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
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
+msgid "Creative Desktop Wireless 7000"
+msgstr "Creative Desktop Wireless 7000"
 
 #: ../rules/base.xml.in.h:158
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internet billentyűzet"
+msgid "Croatian"
+msgstr "Horvát"
 
 #: ../rules/base.xml.in.h:159
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
+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
-msgid "Chicony KU-0108"
-msgstr "Chicony KU-0108"
+msgid "Croatian (US keyboard with Croatian letters)"
+msgstr "Horvát (US billentyűzet horvát betűkkel)"
 
 #: ../rules/base.xml.in.h:161
-msgid "Chicony KU-0420"
-msgstr "Chicony KU-0420"
+msgid "Croatian (Use Croatian digraphs)"
+msgstr "Horvát (Horvát billentyűkombinációk használata)"
 
 #: ../rules/base.xml.in.h:162
-msgid "China"
-msgstr "Kína"
+msgid "Croatian (Use guillemets for quotes)"
+msgstr "Horvát (»Csúcsos« idézőjelek használata idézetekhez)"
 
 #: ../rules/base.xml.in.h:163
-msgid "Chn"
-msgstr "Chn"
+msgid "Ctrl key position"
+msgstr "Ctrl billentyű helyzete"
 
 #: ../rules/base.xml.in.h:164
-msgid "Chuvash"
-msgstr "Csuvas"
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
 
 #: ../rules/base.xml.in.h:165
-msgid "Chuvash Latin"
-msgstr "Csuvas latin"
+msgid "Czech"
+msgstr "Cseh"
 
 #: ../rules/base.xml.in.h:166
-msgid "Classic"
-msgstr "Klasszikus"
+msgid "Czech (UCW layout accented letters only)"
+msgstr "Cseh (UCW kiosztás, csak ékezetes betűk)"
 
 #: ../rules/base.xml.in.h:167
-msgid "Classic Dvorak"
-msgstr "Klasszikus Dvorak"
+msgid "Czech (US Dvorak with CZ UCW support)"
+msgstr "Cseh (US Dvorak CZ UCW támogatással)"
 
 #: ../rules/base.xml.in.h:168
-msgid "Classic, eliminate dead keys"
-msgstr "Klasszikus, halott billentyűk tiltása"
+msgid "Czech (With &lt;\\|&gt; key)"
+msgstr "Cseh (az &lt;\\|&gt; billentyűvel)"
 
 #: ../rules/base.xml.in.h:169
-msgid "Classmate PC"
-msgstr "Classmate PC"
+msgid "Czech (qwerty)"
+msgstr "Cseh (qwerty)"
 
 #: ../rules/base.xml.in.h:170
-msgid "CloGaelach"
-msgstr "CloGaelach"
+msgid "Czech (qwerty, extended Backslash)"
+msgstr "Cseh (qwerty, kibővített fordított törtvonal)"
 
 #: ../rules/base.xml.in.h:171
-msgid "Colemak"
-msgstr "Colemak"
+msgid "DTK2000"
+msgstr "DTK2000"
 
 #: ../rules/base.xml.in.h:172
-msgid "Colemak (Baybayin)"
-msgstr "Colemak (Baybayin)"
+msgid "Danish"
+msgstr "Dán"
 
 #: ../rules/base.xml.in.h:173
-msgid "Colemak (Latin)"
-msgstr "Colemak (Latin)"
+msgid "Danish (Dvorak)"
+msgstr "Dán (Dvorak)"
 
 #: ../rules/base.xml.in.h:174
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access billentyűzet"
+msgid "Danish (Mac)"
+msgstr "Dán (Mac)"
 
 #: ../rules/base.xml.in.h:175
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet billentyűzet (13 gombos)"
+msgid "Danish (Mac, eliminate dead keys)"
+msgstr "Dán (Mac, halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:176
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet billentyűzet (18 gombos)"
+msgid "Danish (eliminate dead keys)"
+msgstr "Dán (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:177
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet billentyűzet (7 gombos)"
+msgid "Default numeric keypad keys"
+msgstr "Alapértelmezett számbillentyűk"
 
 #: ../rules/base.xml.in.h:178
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq billentyűzet"
+msgid "Dell"
+msgstr "Dell"
 
 #: ../rules/base.xml.in.h:179
-msgid "Compose key position"
-msgstr "A kombináló (Compose) billentyű helye"
+msgid "Dell 101-key PC"
+msgstr "Dell 101-gombos PC"
 
 #: ../rules/base.xml.in.h:180
-msgid "Congo, Democratic Republic of the"
-msgstr "Kongói Demokratikus Köztársaság"
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Inspiron 6xxx/8xxx noteszgép"
 
 #: ../rules/base.xml.in.h:181
-msgid "Control + Alt + Backspace"
-msgstr "Control + Alt + Backspace"
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Precision M sorozatú noteszgép"
 
 #: ../rules/base.xml.in.h:182
-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"
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude sorozatú noteszgép"
 
 #: ../rules/base.xml.in.h:183
-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)"
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
 
 #: ../rules/base.xml.in.h:184
-msgid "Creative Desktop Wireless 7000"
-msgstr "Creative Desktop Wireless 7000"
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
 
 #: ../rules/base.xml.in.h:185
-msgid "Crimean Tatar (Dobruca-1 Q)"
-msgstr "Krími tatár (Dobruca-1 Q)"
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
 
 #: ../rules/base.xml.in.h:186
-msgid "Crimean Tatar (Dobruca-2 Q)"
-msgstr "Krími tatár (Dobruca-2 Q)"
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB multimédia-billentyűzet"
 
 #: ../rules/base.xml.in.h:187
-msgid "Crimean Tatar (Turkish Alt-Q)"
-msgstr "Krími tatár (török Alt-Q)"
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop billentyűzet"
 
 #: ../rules/base.xml.in.h:188
-msgid "Crimean Tatar (Turkish F)"
-msgstr "Krími tatár (török F)"
+msgid "Dhivehi"
+msgstr "Dhivehi"
 
 #: ../rules/base.xml.in.h:189
-msgid "Crimean Tatar (Turkish Q)"
-msgstr "Krími tatár (török Q)"
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 sorozat"
 
 #: ../rules/base.xml.in.h:190
-msgid "Croatia"
-msgstr "Horvátország"
+msgid "Dutch"
+msgstr "Holland"
 
 #: ../rules/base.xml.in.h:191
-msgid "Ctrl key position"
-msgstr "Ctrl billentyű helyzete"
+msgid "Dutch (Mac)"
+msgstr "Holland (Mac)"
 
 #: ../rules/base.xml.in.h:192
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Shift"
+msgid "Dutch (Sun dead keys)"
+msgstr "Holland (Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:193
-msgid "Cyrillic"
-msgstr "Cirill"
+msgid "Dutch (standard)"
+msgstr "Holland (szabványos)"
 
 #: ../rules/base.xml.in.h:194
-msgid "Cyrillic with guillemets"
-msgstr "Cirill, »csúcsos« idézőjelekkel"
+msgid "Dzongkha"
+msgstr "Dzongkha"
 
 #: ../rules/base.xml.in.h:195
-msgid "Cyrillic, Z and ZHE swapped"
-msgstr "Cirill, a Z és a ZHE felcserélve"
+msgid "Enable extra typographic characters"
+msgstr "Extra tipográfiai karakterek engedélyezése"
 
 #: ../rules/base.xml.in.h:196
-msgid "Cze"
-msgstr "Cze"
+msgid "English (Canada)"
+msgstr "Angol (Kanada)"
 
 #: ../rules/base.xml.in.h:197
-msgid "Czechia"
-msgstr "Csehország"
+msgid "English (Colemak)"
+msgstr "Angol (Colemak)"
 
 #: ../rules/base.xml.in.h:198
-msgid "DOS"
-msgstr "DOS"
+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
-msgid "DTK2000"
-msgstr "DTK2000"
+msgid "English (Dvorak international with dead keys)"
+msgstr "Angol (Dvorak nemzetközi, halott billentyűkkel)"
 
 #: ../rules/base.xml.in.h:200
-msgid "Dead acute"
-msgstr "Halott vessző (´) ékezet"
+msgid "English (Dvorak)"
+msgstr "Angol (Dvorak)"
 
 #: ../rules/base.xml.in.h:201
-msgid "Dead grave acute"
-msgstr "Halott grave (`) ékezet"
+msgid "English (Ghana)"
+msgstr "Angol (Ghána)"
 
 #: ../rules/base.xml.in.h:202
-msgid "Default numeric keypad keys"
-msgstr "Alapértelmezett számbillentyűk"
+msgid "English (Ghana, GILLBT)"
+msgstr "Angol (Ghána, GILLBT)"
 
 #: ../rules/base.xml.in.h:203
-msgid "Dell"
-msgstr "Dell"
+msgid "English (Ghana, multilingual)"
+msgstr "Angol (Ghána, többnyelvű)"
 
 #: ../rules/base.xml.in.h:204
-msgid "Dell 101-key PC"
-msgstr "Dell 101-gombos PC"
+msgid "English (India, with RupeeSign)"
+msgstr "Angol (India, rúpiajellel)"
 
 #: ../rules/base.xml.in.h:205
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Dell Inspiron 6xxx/8xxx noteszgép"
+msgid "English (Macintosh)"
+msgstr "Angol (Macintosh)"
 
 #: ../rules/base.xml.in.h:206
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Dell Precision M sorozatú noteszgép"
+msgid "English (Mali, USA Mac)"
+msgstr "Angol (Mali, USA Mac)"
 
 #: ../rules/base.xml.in.h:207
-msgid "Dell Latitude series laptop"
-msgstr "Dell Latitude sorozatú noteszgép"
+msgid "English (Mali, USA international)"
+msgstr "Angol (Mali, USA nemzetközi)"
 
 #: ../rules/base.xml.in.h:208
-msgid "Dell Precision M65"
-msgstr "Dell Precision M65"
+msgid "English (Nigeria)"
+msgstr "Angol (Nigéria)"
 
 #: ../rules/base.xml.in.h:209
-msgid "Dell SK-8125"
-msgstr "Dell SK-8125"
+msgid "English (South Africa)"
+msgstr "Angol (Dél-Afrika)"
 
 #: ../rules/base.xml.in.h:210
-msgid "Dell SK-8135"
-msgstr "Dell SK-8135"
+msgid "English (UK)"
+msgstr "Angol (UK)"
 
 #: ../rules/base.xml.in.h:211
-msgid "Dell USB Multimedia Keyboard"
-msgstr "Dell USB multimédia-billentyűzet"
+msgid "English (UK, Colemak)"
+msgstr "Angol (UK, Colemak)"
 
 #: ../rules/base.xml.in.h:212
-msgid "Denmark"
-msgstr "Dánia"
+msgid "English (UK, Dvorak UK punctuation)"
+msgstr "Angol (UK, Dvorak UK központozás)"
 
 #: ../rules/base.xml.in.h:213
-msgid "Deu"
-msgstr "Deu"
+msgid "English (UK, Dvorak)"
+msgstr "Angol (USA, Dvorak)"
 
 #: ../rules/base.xml.in.h:214
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop billentyűzet"
+msgid "English (UK, Mac international)"
+msgstr "Angol (UK, Mac nemzetközi)"
 
 #: ../rules/base.xml.in.h:215
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802 sorozat"
+msgid "English (UK, Mac)"
+msgstr "Angol (UK, Mac)"
 
 #: ../rules/base.xml.in.h:216
-msgid "Dnk"
-msgstr "Dnk"
+msgid "English (UK, extended, WinKeys)"
+msgstr "Angol (UK, kibővített, Win billentyűk)"
 
 #: ../rules/base.xml.in.h:217
-msgid "Dvorak"
-msgstr "Dvorak-féle"
+msgid "English (UK, international with dead keys)"
+msgstr "Angol (UK, nemzetközi, halott billentyűkkel)"
 
 #: ../rules/base.xml.in.h:218
-msgid "Dvorak (Baybayin)"
-msgstr "Dvorak (Baybayin)"
+msgid "English (US)"
+msgstr "Angol (US)"
 
 #: ../rules/base.xml.in.h:219
-msgid "Dvorak (Latin)"
-msgstr "Dvorak (Latin)"
+msgid "English (US, alternative international)"
+msgstr "Angol (USA, alternatív nemzetközi)"
 
 #: ../rules/base.xml.in.h:220
-msgid "Dvorak (UK Punctuation)"
-msgstr "Dvorak (UK központozás)"
+msgid "English (US, international with dead keys)"
+msgstr "Angol (US, nemzetközi, halott billentyűkkel)"
 
 #: ../rules/base.xml.in.h:221
-msgid "Dvorak alternative international (no dead keys)"
-msgstr "Dvorak alternatív nemzetközi (halott billentyűk nélkül)"
+msgid "English (US, with euro on 5)"
+msgstr "Angol (US, Euró jel az 5-ön)"
 
 #: ../rules/base.xml.in.h:222
-msgid "Dvorak international (with dead keys)"
-msgstr "Dvorak nemzetközi (halott billentyűkkel)"
+msgid "English (classic Dvorak)"
+msgstr "Angol (klasszikus Dvorak)"
 
 #: ../rules/base.xml.in.h:223
-msgid "Dvorak, Polish quotes on key 1"
-msgstr "Dvorak, lengyel idézőjelek az 1 billentyűn"
+msgid "English (international AltGr dead keys)"
+msgstr "Angol (Nemzetközi, AltGr halott billentyűkkel)"
 
 #: ../rules/base.xml.in.h:224
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "Dvorak, lengyel idézőjelek az idézőjel billentyűn"
+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
-msgid "Eastern"
-msgstr "Keleti"
+msgid "English (left handed Dvorak)"
+msgstr "Angol (balkezes Dvorak)"
 
 #: ../rules/base.xml.in.h:226
-msgid "Eliminate dead keys"
-msgstr "Halott billentyűk tiltása"
+msgid "English (programmer Dvorak)"
+msgstr "Angol (programozói Dvorak)"
 
 #: ../rules/base.xml.in.h:227
-msgid "Enable extra typographic characters"
-msgstr "Extra tipográfiai karakterek engedélyezése"
+msgid "English (right handed Dvorak)"
+msgstr "Angol (jobbkezes Dvorak)"
 
 #: ../rules/base.xml.in.h:228
-msgid "English"
-msgstr "Angol"
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
 
 #: ../rules/base.xml.in.h:229
-msgid "English (USA International)"
-msgstr "Angol (USA nemzetközi)"
+msgid "Enter on keypad"
+msgstr "Enter a számbillentyűzeten"
 
 #: ../rules/base.xml.in.h:230
-msgid "English (USA Macintosh)"
-msgstr "Angol (USA Macintosh)"
+msgid "Esperanto"
+msgstr "Eszperantó"
 
 #: ../rules/base.xml.in.h:231
-msgid "English with RupeeSign"
-msgstr "Angol rúpiajellel"
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr "Eszperantó (elcsúszott pontosvessző és idézőjel, elavult)"
 
 #: ../rules/base.xml.in.h:232
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
+msgid "Estonian"
+msgstr "Észt"
 
 #: ../rules/base.xml.in.h:233
-msgid "Enter on keypad"
-msgstr "Enter a számbillentyűzeten"
+msgid "Estonian (Dvorak)"
+msgstr "Észt (Dvorak)"
 
 #: ../rules/base.xml.in.h:234
-msgid "Epo"
-msgstr "Epo"
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr "Észt (US billentyűzet észt betűkkel)"
 
 #: ../rules/base.xml.in.h:235
-msgid "Ergonomic"
-msgstr "Ergonomikus"
+msgid "Estonian (eliminate dead keys)"
+msgstr "Észt (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:236
-msgid "Esp"
-msgstr "Esp"
+msgid "Euro on 2"
+msgstr "Euro jel a 2-es billentyűn"
 
 #: ../rules/base.xml.in.h:237
-msgid "Esperanto"
-msgstr "eszperantó"
+msgid "Euro on 4"
+msgstr "Euro jel a 4-es billentyűn"
 
 #: ../rules/base.xml.in.h:238
-msgid "Est"
-msgstr "Est"
+msgid "Euro on 5"
+msgstr "Euro jel az 5-ös billentyűn"
 
 #: ../rules/base.xml.in.h:239
-msgid "Estonia"
-msgstr "Észtország"
+msgid "Euro on E"
+msgstr "Euro jel az E billentyűn"
 
 #: ../rules/base.xml.in.h:240
-msgid "Eth"
-msgstr "Eth"
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
 
 #: ../rules/base.xml.in.h:241
-msgid "Ethiopia"
-msgstr "Etiópia"
+msgid "Ewe"
+msgstr "ewe"
 
 #: ../rules/base.xml.in.h:242
-msgid "Euro on 2"
-msgstr "Euro jel a 2-es billentyűn"
+msgid "FL90"
+msgstr "FL90"
 
 #: ../rules/base.xml.in.h:243
-msgid "Euro on 4"
-msgstr "Euro jel a 4-es billentyűn"
+msgid "Faroese"
+msgstr "Feröeri"
 
 #: ../rules/base.xml.in.h:244
-msgid "Euro on 5"
-msgstr "Euro jel az 5-ös billentyűn"
+msgid "Faroese (eliminate dead keys)"
+msgstr "Feröeri (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:245
-msgid "Euro on E"
-msgstr "Euro jel az E billentyűn"
+msgid "Filipino"
+msgstr "Filippínó"
 
 #: ../rules/base.xml.in.h:246
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr "Filippínó (Capewell-Dvorak Baybayin)"
 
 #: ../rules/base.xml.in.h:247
-msgid "Ewe"
-msgstr "ewe"
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr "Filippínó (Capewell-Dvorak Latin)"
 
 #: ../rules/base.xml.in.h:248
-msgid "Extended"
-msgstr "Kibővített"
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr "Filippínó (Capewell-QWERF 2006 Baybayin)"
 
 #: ../rules/base.xml.in.h:249
-msgid "Extended - Winkeys"
-msgstr "Kibővített - Win billentyűk"
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr "Filippínó (Capewell-QWERF 2006 Latin)"
 
 #: ../rules/base.xml.in.h:250
-msgid "Extended Backslash"
-msgstr "Kibővített visszaper"
+msgid "Filipino (Colemak Baybayin)"
+msgstr "Filippínó (Colemak Baybayin)"
 
 #: ../rules/base.xml.in.h:251
-msgid "F-letter (F) variant"
-msgstr "F-betűs (F) változat"
+msgid "Filipino (Colemak Latin)"
+msgstr "Filippínó (Colemak Latin)"
 
 #: ../rules/base.xml.in.h:252
-msgid "FL90"
-msgstr "FL90"
+msgid "Filipino (Dvorak Latin)"
+msgstr "Filippínó (Dvorak Latin)"
 
 #: ../rules/base.xml.in.h:253
-msgid "Faroe Islands"
-msgstr "Feröer szigetek"
+msgid "Filipino (QWERTY Baybayin)"
+msgstr "Filippínó (QWERTY Baybayin)"
 
 #: ../rules/base.xml.in.h:254
-msgid "Fin"
-msgstr "Fin"
+msgid "Finnish"
+msgstr "Finn"
 
 #: ../rules/base.xml.in.h:255
-msgid "Finland"
-msgstr "Finnország"
+msgid "Finnish (Mac)"
+msgstr "Finn (Mac)"
+
+#: ../rules/base.xml.in.h:256
+msgid "Finnish (classic)"
+msgstr "Finn (klasszikus)"
+
+#: ../rules/base.xml.in.h:257
+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:258
+#: ../rules/base.xml.in.h:261
 msgid "Four-level key with abstract separators"
 msgstr "Negyedik szintű billentyű absztrakt elválasztókkal"
 
-#: ../rules/base.xml.in.h:259
+#: ../rules/base.xml.in.h:262
 msgid "Four-level key with comma"
 msgstr "Negyedik szintű billentyű vesszővel"
 
-#: ../rules/base.xml.in.h:260
+#: ../rules/base.xml.in.h:263
 msgid "Four-level key with dot"
 msgstr "Negyedik szintű billentyű ponttal"
 
-#: ../rules/base.xml.in.h:261
+#: ../rules/base.xml.in.h:264
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Negyedik szintű billentyű ponttal, latin-9 korlátozás"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:265
 msgid "Four-level key with momayyez"
 msgstr "Negyedik szintű billentyű momayyez-val"
 
-#: ../rules/base.xml.in.h:263
-msgid "Fra"
-msgstr "Fra"
-
-#: ../rules/base.xml.in.h:264
-msgid "France"
-msgstr "Franciaország"
-
-#: ../rules/base.xml.in.h:265
-msgid "Français (France Alternative)"
-msgstr "Francia (Francia alternatív)"
-
 #: ../rules/base.xml.in.h:266
 msgid "French"
 msgstr "Francia"
 
 #: ../rules/base.xml.in.h:267
-msgid "French (Macintosh)"
-msgstr "Francia (Macintosh)"
+msgid "French (Bepo, ergonomic, Dvorak way)"
+msgstr "Finn (Bepo, ergonomikus, Dvorak kiosztás)"
 
 #: ../rules/base.xml.in.h:268
-msgid "French (legacy)"
-msgstr "Francia (hagyományos)"
+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
-msgid "French Dvorak"
-msgstr "Francia Dvorak"
+msgid "French (Breton)"
+msgstr "Francia (breton)"
 
 #: ../rules/base.xml.in.h:270
-msgid "French, Sun dead keys"
-msgstr "Francia, Sun halott billentyűk"
+msgid "French (Canada, Dvorak)"
+msgstr "Francia (Kanada, Dvorak)"
 
 #: ../rules/base.xml.in.h:271
-msgid "French, eliminate dead keys"
-msgstr "Francia, halott billentyűk tiltása"
+msgid "French (Canada, legacy)"
+msgstr "Francia (Kanada, hagyományos)"
 
 #: ../rules/base.xml.in.h:272
-msgid "Fro"
-msgstr "Fro"
+msgid "French (Democratic Republic of the Congo)"
+msgstr "Francia (Kongói Demokratikus Köztársaság)"
 
 #: ../rules/base.xml.in.h:273
-msgid "Fujitsu-Siemens Computers AMILO laptop"
-msgstr "Fujitsu-Siemens Computers AMILO noteszgép"
+msgid "French (Dvorak)"
+msgstr "Francia (Dvorak)"
 
 #: ../rules/base.xml.in.h:274
-msgid "Fula"
-msgstr "Fula"
+msgid "French (Georgian AZERTY Tskapo)"
+msgstr "Francia (Grúz AZERTY Tskapo)"
 
 #: ../rules/base.xml.in.h:275
-msgid "GBr"
-msgstr "GBr"
+msgid "French (Guinea)"
+msgstr "Francia (Guinea)"
 
 #: ../rules/base.xml.in.h:276
-msgid "GILLBT"
-msgstr "GILLBT"
+msgid "French (Mac)"
+msgstr "Francia (Mac)"
 
 #: ../rules/base.xml.in.h:277
-msgid "Ga"
-msgstr "ga"
+msgid "French (Mali, alternative)"
+msgstr "Francia (Mali, alternatív)"
 
 #: ../rules/base.xml.in.h:278
-msgid "Generic 101-key PC"
-msgstr "Általános 101 gombos PC"
+msgid "French (Morocco)"
+msgstr "Francia (Marokkó)"
 
 #: ../rules/base.xml.in.h:279
-msgid "Generic 102-key (Intl) PC"
-msgstr "Általános 102 gombos (nemzetközi) PC"
+msgid "French (Occitan)"
+msgstr "Francia (okcitán)"
 
 #: ../rules/base.xml.in.h:280
-msgid "Generic 104-key PC"
-msgstr "Általános 104 gombos PC"
+msgid "French (Sun dead keys)"
+msgstr "Francia (Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:281
-msgid "Generic 105-key (Intl) PC"
-msgstr "Általános 105 gombos (nemzetközi) PC"
+msgid "French (Switzerland)"
+msgstr "Francia (Svájc)"
 
 #: ../rules/base.xml.in.h:282
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+msgid "French (Switzerland, Mac)"
+msgstr "Francia (Svájc, Mac)"
 
 #: ../rules/base.xml.in.h:283
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgid "French (Switzerland, Sun dead keys)"
+msgstr "Francia (Svájc, Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:284
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
+msgid "French (Switzerland, eliminate dead keys)"
+msgstr "Francia (Svájc, halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:285
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
+msgid "French (alternative)"
+msgstr "Francia (alternatív)"
 
 #: ../rules/base.xml.in.h:286
-msgid "Genius KKB-2050HS"
-msgstr "Genius KKB-2050HS"
+msgid "French (alternative, Sun dead keys)"
+msgstr "Francia (alternatív, Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:287
-msgid "Geo"
-msgstr "Geo"
+msgid "French (alternative, eliminate dead keys)"
+msgstr "Francia (alternatív, halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:288
-msgid "Georgia"
-msgstr "Grúzia"
+msgid "French (alternative, latin-9 only)"
+msgstr "Francia (alternatív, csak latin-9)"
 
 #: ../rules/base.xml.in.h:289
-msgid "Georgian"
-msgstr "Grúz"
+msgid "French (eliminate dead keys)"
+msgstr "Francia (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:290
-msgid "Georgian AZERTY Tskapo"
-msgstr "Grúz AZERTY Tskapo"
+msgid "French (legacy alternative)"
+msgstr "Francia (hagyományos alternatív)"
 
 #: ../rules/base.xml.in.h:291
-msgid "German (Macintosh)"
-msgstr "Német (Macintosh)"
+msgid "French (legacy, alternative, Sun dead keys)"
+msgstr "Francia (hagyományos, alternatív, Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:292
-msgid "German, Sun dead keys"
-msgstr "Német, Sun halott billentyűk"
+msgid "French (legacy, alternative, eliminate dead keys)"
+msgstr "Francia (hagyományos, alternatív, halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:293
-msgid "German, eliminate dead keys"
-msgstr "Német, halott billentyűk tiltása"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO noteszgép"
 
 #: ../rules/base.xml.in.h:294
-msgid "Germany"
-msgstr "Németország"
+msgid "Fula"
+msgstr "Fula"
 
 #: ../rules/base.xml.in.h:295
-msgid "Gha"
-msgstr "Gha"
+msgid "GBr"
+msgstr "GBr"
 
 #: ../rules/base.xml.in.h:296
-msgid "Ghana"
-msgstr "Ghána"
+msgid "Ga"
+msgstr "ga"
 
 #: ../rules/base.xml.in.h:297
-msgid "Gin"
-msgstr "Gin"
+msgid "Generic 101-key PC"
+msgstr "Általános 101 gombos PC"
 
 #: ../rules/base.xml.in.h:298
-msgid "Grc"
-msgstr "Grc"
+msgid "Generic 102-key (Intl) PC"
+msgstr "Általános 102 gombos (nemzetközi) PC"
 
 #: ../rules/base.xml.in.h:299
-msgid "Greece"
-msgstr "Görögország"
+msgid "Generic 104-key PC"
+msgstr "Általános 104 gombos PC"
 
 #: ../rules/base.xml.in.h:300
-msgid "Guinea"
-msgstr "Guinea"
+msgid "Generic 105-key (Intl) PC"
+msgstr "Általános 105 gombos (nemzetközi) PC"
 
 #: ../rules/base.xml.in.h:301
-msgid "Gujarati"
-msgstr "Gudzsarati"
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
 
 #: ../rules/base.xml.in.h:302
-msgid "Gurmukhi"
-msgstr "Gurmukhi"
+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
-msgid "Gurmukhi Jhelum"
-msgstr "Gurmukhi Jhelum"
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
 
 #: ../rules/base.xml.in.h:304
-msgid "Gyration"
-msgstr "Forgás"
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
 
 #: ../rules/base.xml.in.h:305
-msgid "HTC Dream"
-msgstr "HTC Dream"
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
 
 #: ../rules/base.xml.in.h:306
-msgid "Happy Hacking Keyboard"
-msgstr "Happy Hacking billentyűzet"
+msgid "Georgian"
+msgstr "Grúz"
 
 #: ../rules/base.xml.in.h:307
-msgid "Happy Hacking Keyboard for Mac"
-msgstr "Happy Hacking billentyűzet Mac-hez"
+msgid "Georgian (MESS)"
+msgstr "Grúz (MESS)"
 
 #: ../rules/base.xml.in.h:308
-msgid "Hausa"
-msgstr "hausza"
+msgid "Georgian (Ossetian)"
+msgstr "Grúz (oszét)"
 
 #: ../rules/base.xml.in.h:309
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet billentyűzet"
+msgid "Georgian (ergonomic)"
+msgstr "Grúz (ergonomikus)"
 
 #: ../rules/base.xml.in.h:310
-msgid "Hewlett-Packard Mini 110 Notebook"
-msgstr "Hewlett-Packard Mini 110 Notebook"
+msgid "German"
+msgstr "Német"
 
 #: ../rules/base.xml.in.h:311
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
+msgid "German (Austria)"
+msgstr "Német (Ausztria)"
 
 #: ../rules/base.xml.in.h:312
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
+msgid "German (Austria, Mac)"
+msgstr "Német (Ausztria, Mac)"
 
 #: ../rules/base.xml.in.h:313
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
+msgid "German (Austria, Sun dead keys)"
+msgstr "Német (Ausztria, Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:314
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
+msgid "German (Austria, eliminate dead keys)"
+msgstr "Német (Ausztria, halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:315
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
+msgid "German (Dvorak)"
+msgstr "Német (Dvorak)"
 
 #: ../rules/base.xml.in.h:316
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
+msgid "German (Mac)"
+msgstr "Német (Mac)"
 
 #: ../rules/base.xml.in.h:317
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
+msgid "German (Mac, eliminate dead keys)"
+msgstr "Német (Mac, halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:318
-msgid "Hewlett-Packard Pavilion dv5"
-msgstr "Hewlett-Packard Pavilion dv5"
+msgid "German (Neo 2)"
+msgstr "Német (Neo 2)"
 
 #: ../rules/base.xml.in.h:319
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-250x multimédia billentyűzet"
+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 "Hewlett-Packard nx9020"
-msgstr "Hewlett-Packard nx9020"
+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
-msgid "Hexadecimal"
-msgstr "Hexadecimális"
+msgid "German (Sun dead keys)"
+msgstr "Német (Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:322
-msgid "Hindi Bolnagri"
-msgstr "Hindi Bolnagri"
+msgid "German (Switzerland, Mac)"
+msgstr "Német (Svájc, Mac)"
 
 #: ../rules/base.xml.in.h:323
-msgid "Hindi Wx"
-msgstr "Hindi Wx"
+msgid "German (Switzerland, Sun dead keys)"
+msgstr "Német (Svájc, Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:324
-msgid "Homophonic"
-msgstr "Homofon"
+msgid "German (Switzerland, eliminate dead keys)"
+msgstr "Német (Svájc, halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:325
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
+msgid "German (dead acute)"
+msgstr "Német (halott ékezet)"
 
 #: ../rules/base.xml.in.h:326
-msgid "Hrv"
-msgstr "Hrv"
+msgid "German (dead grave acute)"
+msgstr "Német (Halott grave ékezet)"
 
 #: ../rules/base.xml.in.h:327
-msgid "Htc Dream phone"
-msgstr "Htc Dream telefon"
+msgid "German (eliminate dead keys)"
+msgstr "Német (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:328
-msgid "Hun"
-msgstr "Hun"
+msgid "German (lower Sorbian qwertz)"
+msgstr "Német (alsó szorb qwertz)"
 
 #: ../rules/base.xml.in.h:329
-msgid "Hungary"
-msgstr "Magyarország"
+msgid "German (lower Sorbian)"
+msgstr "Német (alsó szorb)"
 
 #: ../rules/base.xml.in.h:330
-msgid "Hyper is mapped to Win-keys"
-msgstr "A Hyper a Win billentyűkhöz van rendelve"
+msgid "German (qwerty)"
+msgstr "Német (qwerty)"
 
 #: ../rules/base.xml.in.h:331
-msgid "IBM (LST 1205-92)"
-msgstr "IBM (LST 1205-92)"
+msgid "Greek"
+msgstr "Görög"
 
 #: ../rules/base.xml.in.h:332
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
+msgid "Greek (eliminate dead keys)"
+msgstr "Görög (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:333
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
+msgid "Greek (extended)"
+msgstr "Görög (kibővített)"
 
 #: ../rules/base.xml.in.h:334
-msgid "IBM Space Saver"
-msgstr "IBM helytakarékos"
+msgid "Greek (polytonic)"
+msgstr "Görög (politonikus)"
 
 #: ../rules/base.xml.in.h:335
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+msgid "Greek (simple)"
+msgstr "Görög (egyszerű)"
 
 #: ../rules/base.xml.in.h:336
-msgid "IBM ThinkPad R60/T60/R61/T61"
-msgstr "IBM ThinkPad R60/T60/R61/T61"
+msgid "Gujarati"
+msgstr "Gudzsarati"
 
 #: ../rules/base.xml.in.h:337
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgid "Gyration"
+msgstr "Forgás"
 
 #: ../rules/base.xml.in.h:338
-msgid "ISO Alternate"
-msgstr "ISO Alternate"
+msgid "HTC Dream"
+msgstr "HTC Dream"
 
 #: ../rules/base.xml.in.h:339
-msgid "Iceland"
-msgstr "Izland"
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking billentyűzet"
 
 #: ../rules/base.xml.in.h:340
-msgid "Igbo"
-msgstr "Igbo"
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking billentyűzet Mac-hez"
 
 #: ../rules/base.xml.in.h:341
-msgid "Include dead tilde"
-msgstr "Halott tilde felvétele"
+msgid "Hausa"
+msgstr "hausza"
 
 #: ../rules/base.xml.in.h:342
-msgid "Ind"
-msgstr "Ind"
+msgid "Hebrew"
+msgstr "Héber"
 
 #: ../rules/base.xml.in.h:343
-msgid "India"
-msgstr "India"
+msgid "Hebrew (Phonetic)"
+msgstr "Héber (fonetikus)"
 
 #: ../rules/base.xml.in.h:344
-msgid "International (AltGr dead keys)"
-msgstr "Nemzetközi (AltGr halott billentyűkkel)"
+msgid "Hebrew (Tiro)"
+msgstr "Héber (Tiro)"
 
 #: ../rules/base.xml.in.h:345
-msgid "International (with dead keys)"
-msgstr "Nemzetközi (halott billentyűkkel)"
+msgid "Hebrew (lyx)"
+msgstr "Héber (lyx)"
 
 #: ../rules/base.xml.in.h:346
-msgid "Inuktitut"
-msgstr "Inuktitut"
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet billentyűzet"
 
-#: ../rules/base.xml.in.h:347 ../rules/base.extras.xml.in.h:8
-msgid "Iran"
-msgstr "Irán"
+#: ../rules/base.xml.in.h:347
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook"
 
 #: ../rules/base.xml.in.h:348
-msgid "Iraq"
-msgstr "Irak"
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
 
 #: ../rules/base.xml.in.h:349
-msgid "Ireland"
-msgstr "Írország"
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
 
 #: ../rules/base.xml.in.h:350
-msgid "Irl"
-msgstr "Irl"
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
 
 #: ../rules/base.xml.in.h:351
-msgid "Irn"
-msgstr "Irn"
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
 
 #: ../rules/base.xml.in.h:352
-msgid "Irq"
-msgstr "Irq"
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
 
 #: ../rules/base.xml.in.h:353
-msgid "Isl"
-msgstr "Isl"
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
 
 #: ../rules/base.xml.in.h:354
-msgid "Isr"
-msgstr "Isr"
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
 
 #: ../rules/base.xml.in.h:355
-msgid "Israel"
-msgstr "Izrael"
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
 
 #: ../rules/base.xml.in.h:356
-msgid "Ita"
-msgstr "Ita"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x multimédia billentyűzet"
 
 #: ../rules/base.xml.in.h:357
-msgid "Italy"
-msgstr "Olaszország"
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
 
 #: ../rules/base.xml.in.h:358
-msgid "Japan"
-msgstr "Japán"
+msgid "Hexadecimal"
+msgstr "Hexadecimális"
 
 #: ../rules/base.xml.in.h:359
-msgid "Japan (PC-98xx Series)"
-msgstr "Japán (PC-98xx sorozat)"
+msgid "Hindi (Bolnagri)"
+msgstr "Hindi (Bolnagri)"
 
 #: ../rules/base.xml.in.h:360
-msgid "Japanese keyboard options"
-msgstr "Japán billentyűzet-beállítások"
+msgid "Hindi (Wx)"
+msgstr "Hindi (Wx)"
 
 #: ../rules/base.xml.in.h:361
-msgid "Jpn"
-msgstr "Jpn"
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
 
 #: ../rules/base.xml.in.h:362
-msgid "Kalmyk"
-msgstr "Kalmük"
+msgid "Htc Dream phone"
+msgstr "Htc Dream telefon"
 
 #: ../rules/base.xml.in.h:363
-msgid "Kana"
-msgstr "Kana"
+msgid "Hungarian"
+msgstr "Magyar"
 
 #: ../rules/base.xml.in.h:364
-msgid "Kana 86"
-msgstr "Kana 86"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr "Magyar (101/qwerty/vessző/halott billentyűk)"
 
 #: ../rules/base.xml.in.h:365
-msgid "Kana Lock key is locking"
-msgstr "A Kana zárolásbillentyű zárol"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr "Magyar (101/qwerty/vessző/halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:366
-msgid "Kannada"
-msgstr "Kannada"
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr "Magyar (101/qwerty/pont/halott billentyűk)"
 
 #: ../rules/base.xml.in.h:367
-msgid "Kashubian"
-msgstr "Kasub"
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr "Magyar (101/qwerty/pont/halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:368
-msgid "Kaz"
-msgstr "Kaz"
+msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgstr "Magyar (101/qwertz/vessző/halott billentyűk)"
 
 #: ../rules/base.xml.in.h:369
-msgid "Kazakh with Russian"
-msgstr "kazah orosszal"
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr "Magyar (101/qwertz/vessző/halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:370
-msgid "Kazakhstan"
-msgstr "Kazahsztán"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgstr "Magyar (101/qwertz/pont/halott billentyűk)"
 
 #: ../rules/base.xml.in.h:371
-msgid "Ken"
-msgstr "Ken"
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr "Magyar (101/qwertz/pont/halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:372
-msgid "Kenya"
-msgstr "Kenya"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgstr "Magyar (102/qwerty/vessző/halott billentyűk)"
 
 #: ../rules/base.xml.in.h:373
-msgid "Key sequence to kill the X server"
-msgstr "Billentyűsorozat az X kiszolgáló kilövéséhez"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgstr "Magyar (102/qwerty/vessző/halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:374
-msgid "Key to choose 3rd level"
-msgstr "Billentyű a harmadik szint választásához"
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr "Magyar (102/qwerty/pont/halott billentyűk)"
 
 #: ../rules/base.xml.in.h:375
-msgid "Key to choose 5th level"
-msgstr "Billentyű az ötödik szint választásához"
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgstr "Magyar (102/qwerty/pont/halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:376
-msgid "Key(s) to change layout"
-msgstr "A kiosztást megváltoztató billentyűk"
+msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgstr "Magyar (102/qwertz/vessző/halott billentyűk)"
 
 #: ../rules/base.xml.in.h:377
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgstr "Magyar (102/qwertz/vessző/halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:378
-msgid "Kgz"
-msgstr "Kgz"
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr "Magyar (102/qwertz/pont/halott billentyűk)"
 
 #: ../rules/base.xml.in.h:379
-msgid "Khm"
-msgstr "Khm"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr "Magyar (102/qwertz/pont/halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:380
-msgid "Kikuyu"
-msgstr "Kikuju"
+msgid "Hungarian (eliminate dead keys)"
+msgstr "Magyar (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:381
-msgid "Kinesis"
-msgstr "Kinesis"
+msgid "Hungarian (qwerty)"
+msgstr "Magyar (qwerty)"
 
 #: ../rules/base.xml.in.h:382
-msgid "Komi"
-msgstr "Komi"
+msgid "Hungarian (standard)"
+msgstr "Magyar (szabványos)"
 
 #: ../rules/base.xml.in.h:383
-msgid "Kor"
-msgstr "Kor"
+msgid "Hyper is mapped to Win-keys"
+msgstr "A Hyper a Win billentyűkhöz van rendelve"
 
 #: ../rules/base.xml.in.h:384
-msgid "Korea, Republic of"
-msgstr "Koreai köztársaság"
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
 
 #: ../rules/base.xml.in.h:385
-msgid "Ktunaxa"
-msgstr "Ktunaxa"
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
 
 #: ../rules/base.xml.in.h:386
-msgid "Kurdish, (F)"
-msgstr "Kurd, (F)"
+msgid "IBM Space Saver"
+msgstr "IBM helytakarékos"
 
 #: ../rules/base.xml.in.h:387
-msgid "Kurdish, Arabic-Latin"
-msgstr "Kurd, arab-latin"
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:388
-msgid "Kurdish, Latin Alt-Q"
-msgstr "Kurd, latin Alt-Q"
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
 
 #: ../rules/base.xml.in.h:389
-msgid "Kurdish, Latin Q"
-msgstr "Kurd, latin Q"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
 #: ../rules/base.xml.in.h:390
-msgid "Kyrgyzstan"
-msgstr "Kirgizisztán"
+msgid "Icelandic"
+msgstr "Izlandi"
 
 #: ../rules/base.xml.in.h:391
-msgid "LEKP"
-msgstr "LEKP"
+msgid "Icelandic (Dvorak)"
+msgstr "Izlandi (Dvorak)"
 
 #: ../rules/base.xml.in.h:392
-msgid "LEKPa"
-msgstr "LEKPa"
+msgid "Icelandic (Mac)"
+msgstr "Izlandi (Mac)"
 
 #: ../rules/base.xml.in.h:393
-msgid "Lao"
-msgstr "Lao"
+msgid "Icelandic (Sun dead keys)"
+msgstr "Izlandi (Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:394
-msgid "Laos"
-msgstr "Laosz"
+msgid "Icelandic (eliminate dead keys)"
+msgstr "Izlandi (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:395
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Compaq noteszgép (pl. Armada) noteszgép-billentyűzet"
+msgid "Igbo"
+msgstr "Igbo"
 
 #: ../rules/base.xml.in.h:396
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Compaq noteszgép (pl. Presario) Internet billentyűzet"
+msgid "Indian"
+msgstr "Indiai"
 
 #: ../rules/base.xml.in.h:397
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "eMachines m68xx noteszgép"
+msgid "Inuktitut"
+msgstr "Inuktitut"
 
 #: ../rules/base.xml.in.h:398
-msgid "Latin"
-msgstr "Latin"
+msgid "Iraqi"
+msgstr "Iraki"
 
 #: ../rules/base.xml.in.h:399
-msgid "Latin American"
-msgstr "Latin-amerikai"
+msgid "Irish"
+msgstr "Ír"
 
 #: ../rules/base.xml.in.h:400
-msgid "Latin Unicode"
-msgstr "Latin Unicode"
+msgid "Irish (CloGaelach)"
+msgstr "Ír (CloGaelach)"
 
 #: ../rules/base.xml.in.h:401
-msgid "Latin Unicode qwerty"
-msgstr "Latin Unicode qwerty"
+msgid "Irish (Ogham IS434)"
+msgstr "Ír (Ogham IS434)"
 
 #: ../rules/base.xml.in.h:402
-msgid "Latin qwerty"
-msgstr "Latin qwerty"
+msgid "Irish (Ogham)"
+msgstr "Ír (Ogham)"
 
 #: ../rules/base.xml.in.h:403
-msgid "Latin unicode"
-msgstr "Latin unicode"
+msgid "Irish (UnicodeExpert)"
+msgstr "Ír (UnicodeExpert)"
 
 #: ../rules/base.xml.in.h:404
-msgid "Latin unicode qwerty"
-msgstr "Latin unicode qwerty"
+msgid "Italian"
+msgstr "Olasz"
 
 #: ../rules/base.xml.in.h:405
-msgid "Latin with guillemets"
-msgstr "Latin, »csúcsos« idézőjelekkel"
+msgid "Italian (Georgian)"
+msgstr "Olasz (grúz)"
 
 #: ../rules/base.xml.in.h:406
-msgid "Latvia"
-msgstr "Lettország"
+msgid "Italian (Mac)"
+msgstr "Olasz (Mac)"
 
 #: ../rules/base.xml.in.h:407
-msgid "Layout toggle on multiply/divide key"
-msgstr "Kiosztás átváltása a szorzás/osztás billentyűn"
+msgid "Italian (US keyboard with Italian letters)"
+msgstr "Olasz (US billentyűzet olasz betűkkel)"
 
 #: ../rules/base.xml.in.h:408
-msgid "Left Alt"
-msgstr "Bal Alt"
+msgid "Italian (eliminate dead keys)"
+msgstr "Olasz (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:409
-msgid "Left Alt (while pressed)"
-msgstr "Bal Alt (lenyomva tartva)"
+msgid "Japanese"
+msgstr "Japán"
 
 #: ../rules/base.xml.in.h:410
-msgid "Left Alt is swapped with Left Win"
-msgstr "A bal Alt fel van cserélve a bal Win billentyűvel"
+msgid "Japanese (Kana 86)"
+msgstr "Japán (Kana 86)"
 
 #: ../rules/base.xml.in.h:411
-msgid "Left Ctrl"
-msgstr "Bal Ctrl"
+msgid "Japanese (Kana)"
+msgstr "Japán (Kana)"
 
 #: ../rules/base.xml.in.h:412
-msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
-msgstr "Bal Ctrl (az első kiosztásra), jobb Ctrl (az utolsó kiosztásra)"
+msgid "Japanese (Mac)"
+msgstr "Japán (Mac)"
 
 #: ../rules/base.xml.in.h:413
-msgid "Left Ctrl+Left Shift"
-msgstr "Bal Ctrl+Bal Shift"
+msgid "Japanese (OADG 109A)"
+msgstr "Japán (OADG 109A)"
 
 #: ../rules/base.xml.in.h:414
-msgid "Left Shift"
-msgstr "Bal Shift"
+msgid "Japanese (PC-98xx Series)"
+msgstr "Japán (PC-98xx sorozat)"
 
 #: ../rules/base.xml.in.h:415
-msgid "Left Win"
-msgstr "Bal Win"
+msgid "Japanese keyboard options"
+msgstr "Japán billentyűzet-beállítások"
 
 #: ../rules/base.xml.in.h:416
-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)"
+msgid "Kana Lock key is locking"
+msgstr "A Kana zárolásbillentyű zárol"
 
 #: ../rules/base.xml.in.h:417
-msgid "Left Win (while pressed)"
-msgstr "Bal Win (lenyomva tartva)"
+msgid "Kannada"
+msgstr "Kannada"
 
 #: ../rules/base.xml.in.h:418
-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"
+msgid "Kazakh"
+msgstr "Kazah"
 
 #: ../rules/base.xml.in.h:419
-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"
+msgid "Kazakh (with Russian)"
+msgstr "Kazah (orosszal)"
 
 #: ../rules/base.xml.in.h:420
-msgid "Left hand"
-msgstr "Balkezes"
+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
-msgid "Left handed Dvorak"
-msgstr "Balkezes Dvorák"
+msgid "Key to choose 3rd level"
+msgstr "Billentyű a harmadik szint választásához"
 
 #: ../rules/base.xml.in.h:422
-msgid "Legacy"
-msgstr "Örökölt"
+msgid "Key to choose 5th level"
+msgstr "Billentyű az ötödik szint választásához"
 
 #: ../rules/base.xml.in.h:423
-msgid "Legacy Wang 724"
-msgstr "Hagyományos Wang 724"
+msgid "Key(s) to change layout"
+msgstr "A kiosztást megváltoztató billentyűk"
+
+#: ../rules/base.xml.in.h:424
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
 
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:425
-msgid "Legacy key with comma"
-msgstr "Hagyományos számbillentyűzet vesszővel"
+msgid "Khmer (Cambodian)"
+msgstr "Khmer (Kambodzsa)"
 
 #: ../rules/base.xml.in.h:426
-msgid "Legacy key with dot"
-msgstr "Hagyományos számbillentyűzet ponttal"
+msgid "Kikuyu"
+msgstr "Kikuju"
 
 #: ../rules/base.xml.in.h:427
-msgid "Lithuania"
-msgstr "Litvánia"
+msgid "Kinesis"
+msgstr "Kinesis"
 
 #: ../rules/base.xml.in.h:428
-msgid "Lka"
-msgstr "Lka"
+msgid "Korean"
+msgstr "Koreai"
 
 #: ../rules/base.xml.in.h:429
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access billentyűzet"
+msgid "Korean (101/104 key compatible)"
+msgstr "Koreai (101/104 gomb kompatibilis)"
 
 #: ../rules/base.xml.in.h:430
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
+msgid "Kurdish (Iran, Arabic-Latin)"
+msgstr "Kurd (Irán, arab-latin)"
 
 #: ../rules/base.xml.in.h:431
-msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "Logitech Cordless Desktop (másik lehetőség)"
+msgid "Kurdish (Iran, F)"
+msgstr "Kurd (Irán, F)"
 
 #: ../rules/base.xml.in.h:432
-msgid "Logitech Cordless Desktop EX110"
-msgstr "Logitech Cordless Desktop EX110"
+msgid "Kurdish (Iran, Latin Q)"
+msgstr "Kurd (Irán, latin Q)"
 
 #: ../rules/base.xml.in.h:433
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300"
+msgid "Kurdish (Iran, latin alt-Q)"
+msgstr "Kurd (Irán, latin Alt-Q)"
 
 #: ../rules/base.xml.in.h:434
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
+msgid "Kurdish (Iraq, Arabic-Latin)"
+msgstr "Kurd (Irak, arab-latin)"
 
 #: ../rules/base.xml.in.h:435
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
+msgid "Kurdish (Iraq, F)"
+msgstr "Kurd (Irak, F)"
 
 #: ../rules/base.xml.in.h:436
-msgid "Logitech Cordless Desktop Pro (alternate option 2)"
-msgstr "Logitech Cordless Desktop Pro (másik lehetőség)"
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr "Kurd (Irak, latin Alt-Q)"
 
 #: ../rules/base.xml.in.h:437
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
+msgid "Kurdish (Iraq, Latin Q)"
+msgstr "Kurd (Irak, latin Q)"
 
 #: ../rules/base.xml.in.h:438
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
+msgid "Kurdish (Syria, F)"
+msgstr "Kurd (Szíria, F)"
 
 #: ../rules/base.xml.in.h:439
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15, extra billentyűk a G15daemon közvetítésével"
+msgid "Kurdish (Syria, Latin Alt-Q)"
+msgstr "Kurd (Szíria, latin Alt-Q)"
 
 #: ../rules/base.xml.in.h:440
-msgid "Logitech Generic Keyboard"
-msgstr "Logitech általános billentyűzet"
+msgid "Kurdish (Syria, Latin Q)"
+msgstr "Kurd (Szíria, latin Q)"
 
 #: ../rules/base.xml.in.h:441
-msgid "Logitech Internet 350 Keyboard"
-msgstr "Logitech Internet 350 billentyűzet"
+msgid "Kurdish (Turkey, F)"
+msgstr "Kurd (Törökország, F)"
 
 #: ../rules/base.xml.in.h:442
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet billentyűzet"
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr "Kurd (Törökország, latin Alt-Q)"
 
 #: ../rules/base.xml.in.h:443
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator billentyűzet"
+msgid "Kurdish (Turkey, Latin Q)"
+msgstr "Kurd (Törökország, latin Q)"
 
 #: ../rules/base.xml.in.h:444
-msgid "Logitech Media Elite Keyboard"
-msgstr "Logitech Media Elite billentyűzet"
+msgid "Kutenai"
+msgstr "Kutenai"
 
 #: ../rules/base.xml.in.h:445
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
-msgstr "Logitech Ultra-X vezeték nélküli asztali médiabillentyűzet"
+msgid "Kyrgyz"
+msgstr "Kirgiz"
 
 #: ../rules/base.xml.in.h:446
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X billentyűzet"
+msgid "Kyrgyz (phonetic)"
+msgstr "Kirgiz (fonetikus)"
 
 #: ../rules/base.xml.in.h:447
-msgid "Logitech diNovo Edge Keyboard"
-msgstr "Logitech diNovo Edge billentyűzet"
+msgid "Lao"
+msgstr "Lao"
 
 #: ../rules/base.xml.in.h:448
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech diNovo billentyűzet"
+msgid "Lao (STEA proposed standard layout)"
+msgstr "Lao (STEA által javasolt szabványos)"
 
 #: ../rules/base.xml.in.h:449
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Compaq noteszgép (pl. Armada) noteszgép-billentyűzet"
 
 #: ../rules/base.xml.in.h:450
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless billentyűzet (modell: Y-RB6)"
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Compaq noteszgép (pl. Presario) Internet billentyűzet"
 
 #: ../rules/base.xml.in.h:451
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "eMachines m68xx noteszgép"
 
 #: ../rules/base.xml.in.h:452
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgid "Latvian"
+msgstr "Lett"
 
 #: ../rules/base.xml.in.h:453
-msgid "Lower Sorbian"
-msgstr "Alsó szorb"
+msgid "Latvian (Apostrophe ' variant)"
+msgstr "Lett (aposztróf (') változat)"
 
 #: ../rules/base.xml.in.h:454
-msgid "Lower Sorbian (qwertz)"
-msgstr "Alsó szorb (qwertz)"
+msgid "Latvian (F variant)"
+msgstr "Lett (F-változat)"
 
 #: ../rules/base.xml.in.h:455
-msgid "Ltu"
-msgstr "Ltu"
+msgid "Latvian (Tilde ~ variant)"
+msgstr "Lett (Tilde ~ változat)"
 
 #: ../rules/base.xml.in.h:456
-msgid "Lva"
-msgstr "Lva"
+msgid "Left Alt"
+msgstr "Bal Alt"
 
 #: ../rules/base.xml.in.h:457
-msgid "MESS"
-msgstr "MESS"
+msgid "Left Alt (while pressed)"
+msgstr "Bal Alt (lenyomva tartva)"
 
 #: ../rules/base.xml.in.h:458
-msgid "MNE"
-msgstr "MNE"
+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
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
+msgid "Left Ctrl"
+msgstr "Bal Ctrl"
 
 #: ../rules/base.xml.in.h:460
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (Intl)"
+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
-msgid "Macedonia"
-msgstr "Macedónia"
+msgid "Left Ctrl+Left Shift"
+msgstr "Bal Ctrl+Bal Shift"
 
 #: ../rules/base.xml.in.h:462
-msgid "Macintosh"
-msgstr "Macintosh"
+msgid "Left Shift"
+msgstr "Bal Shift"
 
 #: ../rules/base.xml.in.h:463
-msgid "Macintosh (International)"
-msgstr "Macintosh (Nemzetközi)"
+msgid "Left Win"
+msgstr "Bal Win"
 
 #: ../rules/base.xml.in.h:464
-msgid "Macintosh Old"
-msgstr "Macintosh Old"
+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
-msgid "Macintosh, Sun dead keys"
-msgstr "Macintosh, Sun halott billentyűk"
+msgid "Left Win (while pressed)"
+msgstr "Bal Win (lenyomva tartva)"
 
 #: ../rules/base.xml.in.h:466
-msgid "Macintosh, eliminate dead keys"
-msgstr "Macintosh, halott billentyűk tiltása"
+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
-msgid "Make Caps Lock an additional Backspace"
-msgstr "A Caps Lock használata másik Backspace-ként"
+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
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "A Caps Lock használata másik Ctrl-ként"
+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
-msgid "Make Caps Lock an additional ESC"
-msgstr "A Caps Lock használata másik Esc-ként"
+msgid "Legacy"
+msgstr "Örökölt"
 
 #: ../rules/base.xml.in.h:470
-msgid "Make Caps Lock an additional Hyper"
-msgstr "A Caps Lock használata másik Hyper-ként"
-
-#: ../rules/base.xml.in.h:471
-msgid "Make Caps Lock an additional Num Lock"
-msgstr "A Caps Lock használata másik Num Lock-ként"
+msgid "Legacy Wang 724"
+msgstr "Hagyományos Wang 724"
 
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:472
-msgid "Make Caps Lock an additional Super"
-msgstr "A Caps Lock használata másik Super-ként"
+msgid "Legacy key with comma"
+msgstr "Hagyományos számbillentyűzet vesszővel"
 
 #: ../rules/base.xml.in.h:473
-msgid "Malayalam"
-msgstr "Malajalam"
+msgid "Legacy key with dot"
+msgstr "Hagyományos számbillentyűzet ponttal"
 
 #: ../rules/base.xml.in.h:474
-msgid "Malayalam Lalitha"
-msgstr "Malajalam lalitha"
+msgid "Lithuanian"
+msgstr "Litván"
 
 #: ../rules/base.xml.in.h:475
-msgid "Maldives"
-msgstr "Maldív-szigetek"
+msgid "Lithuanian (IBM LST 1205-92)"
+msgstr "Litván (IBM LST 1205-92)"
 
 #: ../rules/base.xml.in.h:476
-msgid "Mali"
-msgstr "Mali"
+msgid "Lithuanian (LEKP)"
+msgstr "Litván (LEKP)"
 
 #: ../rules/base.xml.in.h:477
-msgid "Malta"
-msgstr "Málta"
+msgid "Lithuanian (LEKPa)"
+msgstr "Litván (LEKPa)"
 
 #: ../rules/base.xml.in.h:478
-msgid "Maltese keyboard with US layout"
-msgstr "Máltai billentyűzet egyesült államokbeli kiosztással"
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgstr "Litván (US billentyűzet litván betűkkel)"
 
 #: ../rules/base.xml.in.h:479
-msgid "Mao"
-msgstr "Mao"
+msgid "Lithuanian (standard)"
+msgstr "Litván (szabványos)"
 
 #: ../rules/base.xml.in.h:480
-msgid "Maori"
-msgstr "Maori"
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access billentyűzet"
 
 #: ../rules/base.xml.in.h:481
-msgid "Mari"
-msgstr "Mari"
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
 
 #: ../rules/base.xml.in.h:482
-msgid "Mdv"
-msgstr "Mdv"
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (másik lehetőség)"
 
 #: ../rules/base.xml.in.h:483
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
 
 #: ../rules/base.xml.in.h:484
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access billentyűzet"
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
 
 #: ../rules/base.xml.in.h:485
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
 
 #: ../rules/base.xml.in.h:486
-msgid "Menu"
-msgstr "Menü"
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
 
 #: ../rules/base.xml.in.h:487
-msgid "Meta is mapped to Left Win"
-msgstr "A Meta a bal Win billentyűhöz van rendelve"
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (másik lehetőség)"
 
 #: ../rules/base.xml.in.h:488
-msgid "Meta is mapped to Win keys"
-msgstr "A Meta a Win billentyűkhöz van rendelve"
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
 
 #: ../rules/base.xml.in.h:489
-msgid "Meta on Left Ctrl"
-msgstr "Meta a bal Ctrl-en"
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
 #: ../rules/base.xml.in.h:490
-msgid "Microsoft Comfort Curve Keyboard 2000"
-msgstr "Microsoft Comfort Curve Keyboard 2000"
+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
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internet billentyűzet"
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech általános billentyűzet"
 
 #: ../rules/base.xml.in.h:492
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, svéd"
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech Internet 350 billentyűzet"
 
 #: ../rules/base.xml.in.h:493
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet billentyűzet"
 
 #: ../rules/base.xml.in.h:494
-msgid "Microsoft Natural Keyboard Elite"
-msgstr "Microsoft Natural Keyboard Elite"
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator billentyűzet"
 
 #: ../rules/base.xml.in.h:495
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite billentyűzet"
 
 #: ../rules/base.xml.in.h:496
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
+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
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X billentyűzet"
 
 #: ../rules/base.xml.in.h:498
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge billentyűzet"
 
 #: ../rules/base.xml.in.h:499
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office billentyűzet"
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo billentyűzet"
 
 #: ../rules/base.xml.in.h:500
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft vezeték nélküli multimédia billentyűzet 1.0A"
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
 
 #: ../rules/base.xml.in.h:501
-msgid "Miscellaneous compatibility options"
-msgstr "Egyéb kompatibilitási beállítások"
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless billentyűzet (modell: Y-RB6)"
 
 #: ../rules/base.xml.in.h:502
-msgid "Mkd"
-msgstr "Mkd"
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
 #: ../rules/base.xml.in.h:503
-msgid "Mli"
-msgstr "Mli"
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
 #: ../rules/base.xml.in.h:504
-msgid "Mlt"
-msgstr "Mlt"
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
 
 #: ../rules/base.xml.in.h:505
-msgid "Mmr"
-msgstr "Mmr"
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
 
 #: ../rules/base.xml.in.h:506
-msgid "Mng"
-msgstr "Mng"
+msgid "Macedonian"
+msgstr "Macedón"
 
 #: ../rules/base.xml.in.h:507
-msgid "Mongolia"
-msgstr "Mongólia"
+msgid "Macedonian (eliminate dead keys)"
+msgstr "Macedón (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:508
-msgid "Montenegro"
-msgstr "Montenegró"
+msgid "Macintosh"
+msgstr "Macintosh"
 
 #: ../rules/base.xml.in.h:509
-msgid "Morocco"
-msgstr "Marokkó"
+msgid "Macintosh Old"
+msgstr "Macintosh Old"
 
 #: ../rules/base.xml.in.h:510
-msgid "Multilingual"
-msgstr "Többnyelvű"
+msgid "Make Caps Lock an additional Backspace"
+msgstr "A Caps Lock használata másik Backspace-ként"
 
 #: ../rules/base.xml.in.h:511
-msgid "Multilingual, first part"
-msgstr "Többnyelvű, első rész"
+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
-msgid "Multilingual, second part"
-msgstr "Többnyelvű, második rész"
+msgid "Make Caps Lock an additional Ctrl"
+msgstr "A Caps Lock használata másik Ctrl-ként"
 
 #: ../rules/base.xml.in.h:513
-msgid "Myanmar"
-msgstr "Myanmar"
+msgid "Make Caps Lock an additional ESC"
+msgstr "A Caps Lock használata másik Esc-ként"
 
 #: ../rules/base.xml.in.h:514
-msgid "NICOLA-F style Backspace"
-msgstr "NICOLA-F stílusú backspace"
+msgid "Make Caps Lock an additional Hyper"
+msgstr "A Caps Lock használata másik Hyper-ként"
 
 #: ../rules/base.xml.in.h:515
-msgid "NLA"
-msgstr "NLA"
+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
-msgid "Nativo"
-msgstr "Natív"
+msgid "Make Caps Lock an additional Super"
+msgstr "A Caps Lock használata másik Super-ként"
 
 #: ../rules/base.xml.in.h:517
-msgid "Nativo for Esperanto"
-msgstr "Natív az eszperantóhoz"
+msgid "Malayalam"
+msgstr "Malajalam"
 
 #: ../rules/base.xml.in.h:518
-msgid "Nativo for USA keyboards"
-msgstr "Natív az USA billentyűzetekhez"
+msgid "Malayalam (Lalitha)"
+msgstr "Malajalam (lalitha)"
 
 #: ../rules/base.xml.in.h:519
-msgid "Neo 2"
-msgstr "Neo 2"
+msgid "Malayalam (enhanced Inscript with Rupee Sign)"
+msgstr "Malajalam (bővített Inscript rúpiajellel)"
 
 #: ../rules/base.xml.in.h:520
-msgid "Nepal"
-msgstr "Nepál"
+msgid "Maltese"
+msgstr "Máltai"
 
 #: ../rules/base.xml.in.h:521
-msgid "Netherlands"
-msgstr "Hollandia"
+msgid "Maltese (with US layout)"
+msgstr "Máltai (US kiosztással)"
 
 #: ../rules/base.xml.in.h:522
-msgid "New phonetic"
-msgstr "Új fonetikus"
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
 
 #: ../rules/base.xml.in.h:523
-msgid "Nga"
-msgstr "Nga"
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access billentyűzet"
 
 #: ../rules/base.xml.in.h:524
-msgid "Nigeria"
-msgstr "Nigéria"
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
 
 #: ../rules/base.xml.in.h:525
-msgid "Nld"
-msgstr "Nld"
+msgid "Menu"
+msgstr "Menü"
 
 #: ../rules/base.xml.in.h:526
-msgid "Non-breakable space character at fourth level"
-msgstr "Nem törhető szóköz karakter a negyedik szinten"
+msgid "Meta is mapped to Left Win"
+msgstr "A Meta a bal Win billentyűhöz van rendelve"
 
 #: ../rules/base.xml.in.h:527
-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"
+msgid "Meta is mapped to Win keys"
+msgstr "A Meta a Win billentyűkhöz van rendelve"
 
 #: ../rules/base.xml.in.h:528
-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)"
+msgid "Meta on Left Ctrl"
+msgstr "Meta a bal Ctrl-en"
 
 #: ../rules/base.xml.in.h:529
-msgid "Non-breakable space character at second level"
-msgstr "Nem törhető szóköz karakter a második szinten"
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve Keyboard 2000"
 
 #: ../rules/base.xml.in.h:530
-msgid "Non-breakable space character at third level"
-msgstr "Nem törhető szóköz karakter a harmadik szinten"
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet billentyűzet"
 
 #: ../rules/base.xml.in.h:531
-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"
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, svéd"
 
 #: ../rules/base.xml.in.h:532
-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"
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
 
 #: ../rules/base.xml.in.h:533
-msgid "Nor"
-msgstr "Nor"
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
 
 #: ../rules/base.xml.in.h:534
-msgid "Northern Saami"
-msgstr "Északi szami"
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
 #: ../rules/base.xml.in.h:535
-msgid "Northern Saami, eliminate dead keys"
-msgstr "Északi szami, halott billentyűk tiltása"
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
 
 #: ../rules/base.xml.in.h:536
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
+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
-msgid "Norway"
-msgstr "Norvégia"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
 #: ../rules/base.xml.in.h:538
-msgid "Npl"
-msgstr "Npl"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
 #: ../rules/base.xml.in.h:539
-msgid "Num Lock"
-msgstr "Num Lock"
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office billentyűzet"
 
 #: ../rules/base.xml.in.h:540
-msgid "Numeric keypad delete key behaviour"
-msgstr "Számbillentyűzet Delete billentyűjének viselkedése"
+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
-msgid "Numeric keypad keys work as with Mac"
-msgstr "A számbillentyűk úgy működjenek, mint Macen"
+msgid "Miscellaneous compatibility options"
+msgstr "Egyéb kompatibilitási beállítások"
 
 #: ../rules/base.xml.in.h:542
-msgid "Numeric keypad layout selection"
-msgstr "Számbillentyűzet kiosztásválasztása"
+msgid "Mongolian"
+msgstr "Mongol"
 
 #: ../rules/base.xml.in.h:543
-msgid "OADG 109A"
-msgstr "OADG 109A"
+msgid "Montenegrin"
+msgstr "Montenegrói"
 
 #: ../rules/base.xml.in.h:544
-msgid "OLPC"
-msgstr "OLPC"
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr "Montenegrói (Cirill, »csúcsos« idézőjelekkel)"
 
 #: ../rules/base.xml.in.h:545
-msgid "OLPC Dari"
-msgstr "OLPC Dari"
+msgid "Montenegrin (Cyrillic)"
+msgstr "Montenegrói (Cirill)"
 
 #: ../rules/base.xml.in.h:546
-msgid "OLPC Pashto"
-msgstr "OLPC Pastu"
+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 "OLPC Southern Uzbek"
-msgstr "OLPC déli üzbég"
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Montenegrói (Latin qwerty)"
 
 #: ../rules/base.xml.in.h:548
-msgid "Occitan"
-msgstr "Okcitán"
+msgid "Montenegrin (Latin unicode qwerty)"
+msgstr "Montenegrói (Latin unicode qwerty)"
 
 #: ../rules/base.xml.in.h:549
-msgid "Ogham"
-msgstr "Ogham"
+msgid "Montenegrin (Latin unicode)"
+msgstr "Montenegrói (Latin unicode)"
 
 #: ../rules/base.xml.in.h:550
-msgid "Ogham IS434"
-msgstr "Ogham IS434"
+msgid "Montenegrin (Latin with guillemets)"
+msgstr "Montenegrói (Latin, »csúcsos« idézőjelekkel)"
 
 #: ../rules/base.xml.in.h:551
-msgid "Oriya"
-msgstr "Orija"
+msgid "Māori"
+msgstr "Maori"
 
 #: ../rules/base.xml.in.h:552
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Ortek MCK-800 MM/Internet billentyűzet"
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F stílusú backspace"
 
 #: ../rules/base.xml.in.h:553
-msgid "Ossetian"
-msgstr "Oszét"
+msgid "Nepali"
+msgstr "Nepáli"
 
 #: ../rules/base.xml.in.h:554
-msgid "Ossetian, Winkeys"
-msgstr "Oszét, win gombok"
+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
-msgid "Ossetian, legacy"
-msgstr "Oszét, hagyományos"
+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
-msgid "PC-98xx Series"
-msgstr "PC-98xx Series"
+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
-msgid "Pak"
-msgstr "Pak"
+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
-msgid "Pakistan"
-msgstr "Pakisztán"
+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
-msgid "Pannonian Rusyn Homophonic"
-msgstr "Pannon ruszin homofon"
+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
-msgid "Pashto"
-msgstr "Pastu"
+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
-msgid "Pattachote"
-msgstr "Pattachote"
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
 
 #: ../rules/base.xml.in.h:562
-msgid "Pause"
-msgstr "Pause"
+msgid "Norwegian"
+msgstr "Norvég"
 
 #: ../rules/base.xml.in.h:563
-msgid "Persian, with Persian Keypad"
-msgstr "Perzsa, perzsa számbillentyűzettel"
+msgid "Norwegian (Dvorak)"
+msgstr "Norvég (Dvorak)"
 
 #: ../rules/base.xml.in.h:564
-msgid "Phi"
-msgstr "Phi"
+msgid "Norwegian (Mac)"
+msgstr "Norvég (Mac)"
 
 #: ../rules/base.xml.in.h:565
-msgid "Philippines"
-msgstr "Fülöp-szigetek"
+msgid "Norwegian (Mac, eliminate dead keys)"
+msgstr "Norvég (Mac, halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:566
-msgid "Phonetic"
-msgstr "Fonetikus"
+msgid "Norwegian (Northern Saami"
+msgstr "Norvég (északi szami)"
 
 #: ../rules/base.xml.in.h:567
-msgid "Phonetic Winkeys"
-msgstr "Fonetikus Win gombok"
+msgid "Norwegian (eliminate dead keys)"
+msgstr "Norvég (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:568
-msgid "Pol"
-msgstr "Pol"
+msgid "Norwegian (northern Saami, eliminate dead keys)"
+msgstr "Norvég (északi szami, halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:569
-msgid "Poland"
-msgstr "Lengyelország"
+msgid "Num Lock"
+msgstr "Num Lock"
 
 #: ../rules/base.xml.in.h:570
-msgid "Polytonic"
-msgstr "Polytonic"
+msgid "Numeric keypad delete key behaviour"
+msgstr "Számbillentyűzet Delete billentyűjének viselkedése"
 
 #: ../rules/base.xml.in.h:571
-msgid "Portugal"
-msgstr "Portugália"
+msgid "Numeric keypad keys work as with Mac"
+msgstr "A számbillentyűk úgy működjenek, mint Macen"
 
 #: ../rules/base.xml.in.h:572
-msgid "Probhat"
-msgstr "Probhat"
+msgid "Numeric keypad layout selection"
+msgstr "Számbillentyűzet kiosztásválasztása"
 
 #: ../rules/base.xml.in.h:573
-msgid "Programmer Dvorak"
-msgstr "Programozói Dvorak"
+msgid "OLPC"
+msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:574
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
+msgid "Oriya"
+msgstr "Orija"
 
 #: ../rules/base.xml.in.h:575
-msgid "Prt"
-msgstr "Prt"
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet billentyűzet"
 
 #: ../rules/base.xml.in.h:576
-msgid "PrtSc"
-msgstr "PrtSc"
+msgid "PC-98xx Series"
+msgstr "PC-98xx Series"
 
 #: ../rules/base.xml.in.h:577
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+msgid "Pashto"
+msgstr "Pastu"
 
 #: ../rules/base.xml.in.h:578
-msgid "QWERTY (Baybayin)"
-msgstr "QWERTY (Baybayin)"
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr "Pastu (Afganisztán, OLPC)"
 
 #: ../rules/base.xml.in.h:579
-msgid "Right Alt"
-msgstr "Jobb Alt"
+msgid "Pause"
+msgstr "Pause"
 
 #: ../rules/base.xml.in.h:580
-msgid "Right Alt (while pressed)"
-msgstr "Jobb Alt (lenyomva tartva)"
+msgid "Persian"
+msgstr "Perzsa"
 
 #: ../rules/base.xml.in.h:581
-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"
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr "Perzsa (Afganisztán, dari OLPC)"
 
 #: ../rules/base.xml.in.h:582
-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"
+msgid "Persian (with Persian Keypad)"
+msgstr "Perzsa (perzsa számbillentyűzettel)"
 
 #: ../rules/base.xml.in.h:583
-msgid "Right Alt key never chooses 3rd level"
-msgstr "A jobb Alt billentyű sohasem választ harmadik szintet"
+msgid "Philippines - Dvorak (Baybayin)"
+msgstr "Fülöp-szigetek – Dvorak (Baybayin)"
 
 #: ../rules/base.xml.in.h:584
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "Jobb Alt, a Shift+jobb Alt kombináció a Multi_Key"
+msgid "Polish"
+msgstr "Lengyel"
 
 #: ../rules/base.xml.in.h:585
-msgid "Right Ctrl"
-msgstr "Jobb Ctrl"
+msgid "Polish (Dvorak)"
+msgstr "Lengyel (Dvorak)"
 
 #: ../rules/base.xml.in.h:586
-msgid "Right Ctrl (while pressed)"
-msgstr "Jobb Ctrl (lenyomva tartva)"
+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 "Right Ctrl as Right Alt"
-msgstr "Jobb Ctrl használata jobb Alt-ként"
+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 "Right Ctrl+Right Shift"
-msgstr "Jobb Ctrl + jobb Shift"
+msgid "Polish (Kashubian)"
+msgstr "Lengyel (kasub)"
 
 #: ../rules/base.xml.in.h:589
-msgid "Right Shift"
-msgstr "Jobb Shift"
+msgid "Polish (programmer Dvorak)"
+msgstr "Lengyel (programozói Dvorak)"
 
 #: ../rules/base.xml.in.h:590
-msgid "Right Win"
-msgstr "Jobb Win"
+msgid "Polish (qwertz)"
+msgstr "Lengyel (qwertz)"
 
 #: ../rules/base.xml.in.h:591
-msgid "Right Win (while pressed)"
-msgstr "Jobb Win (lenyomva tartva)"
+msgid "Portuguese"
+msgstr "Portugál"
 
 #: ../rules/base.xml.in.h:592
-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"
+msgid "Portuguese (Brazil)"
+msgstr "Portugál (brazil)"
 
 #: ../rules/base.xml.in.h:593
-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"
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr "Portugál (brazil, Dvorak)"
 
 #: ../rules/base.xml.in.h:594
-msgid "Right hand"
-msgstr "Jobbkezes"
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr "Portugál (brazil, halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:595
-msgid "Right handed Dvorak"
-msgstr "Jobbkezes Dvorák"
+msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgstr "Portugál (brazil, natív az eszperantóhoz)"
 
 #: ../rules/base.xml.in.h:596
-msgid "Romania"
-msgstr "Románia"
+msgid "Portuguese (Brazil, nativo for USA keyboards)"
+msgstr "Portugál (brazil, natív a US billentyűzetekhez)"
 
 #: ../rules/base.xml.in.h:597
-msgid "Romanian keyboard with German letters"
-msgstr "Román billentyűzet német betűkkel"
+msgid "Portuguese (Brazil, nativo)"
+msgstr "Portugál (brazil, natív)"
 
 #: ../rules/base.xml.in.h:598
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Román billentyűzet német betűkkel, halott billentyűk tiltása"
+msgid "Portuguese (Mac)"
+msgstr "Portugál (Mac)"
 
 #: ../rules/base.xml.in.h:599
-msgid "Rou"
-msgstr "Rou"
+msgid "Portuguese (Mac, Sun dead keys)"
+msgstr "Portugál (Mac, Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:600
-msgid "Rupee on 4"
-msgstr "Rúpia jel a 4-es billentyűn"
+msgid "Portuguese (Mac, eliminate dead keys)"
+msgstr "Portugál (Mac, halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:601
-msgid "Rus"
-msgstr "Rus"
+msgid "Portuguese (Nativo for Esperanto)"
+msgstr "Portugál (natív az eszperantóhoz)"
 
 #: ../rules/base.xml.in.h:602
-msgid "Russia"
-msgstr "Oroszország"
+msgid "Portuguese (Nativo for USA keyboards)"
+msgstr "Portugál (natív az USA billentyűzetekhez)"
 
 #: ../rules/base.xml.in.h:603
-msgid "Russian"
-msgstr "Orosz"
+msgid "Portuguese (Nativo)"
+msgstr "Portugál (natív)"
 
 #: ../rules/base.xml.in.h:604
-msgid "Russian phonetic"
-msgstr "Orosz fonetikus"
+msgid "Portuguese (Sun dead keys)"
+msgstr "Portugál (Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:605
-msgid "Russian phonetic Dvorak"
-msgstr "Orosz fonetikus Dvorak"
+msgid "Portuguese (eliminate dead keys)"
+msgstr "Portugál (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:606
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "Orosz fonetikus, halott billentyűk tiltása"
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
 
 #: ../rules/base.xml.in.h:607
-msgid "Russian with Kazakh"
-msgstr "orosz kazahhal"
+msgid "PrtSc"
+msgstr "PrtSc"
 
 #: ../rules/base.xml.in.h:608
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard"
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "Pandzsábi (Gurmukhi Jhelum)"
 
 #: ../rules/base.xml.in.h:609
-msgid "SK-1300"
-msgstr "SK-1300"
+msgid "Punjabi (Gurmukhi)"
+msgstr "Pandzsábi (Gurmukhi)"
 
 #: ../rules/base.xml.in.h:610
-msgid "SK-2500"
-msgstr "SK-2500"
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
 
 #: ../rules/base.xml.in.h:611
-msgid "SK-6200"
-msgstr "SK-6200"
+msgid "Right Alt"
+msgstr "Jobb Alt"
 
 #: ../rules/base.xml.in.h:612
-msgid "SK-7100"
-msgstr "SK-7100"
+msgid "Right Alt (while pressed)"
+msgstr "Jobb Alt (lenyomva tartva)"
 
-#: ../rules/base.xml.in.h:613 ../rules/base.extras.xml.in.h:9
-msgid "SRB"
-msgstr "SRB"
+#: ../rules/base.xml.in.h:613
+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
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
+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
-msgid "SVEN Slim 303"
-msgstr "SVEN Slim 303"
+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
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
+msgid "Right Alt key never chooses 3rd level"
+msgstr "A jobb Alt billentyű sohasem választ harmadik szintet"
 
 #: ../rules/base.xml.in.h:617
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
+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
-msgid "Scroll Lock"
-msgstr "Scroll Lock"
+msgid "Right Ctrl"
+msgstr "Jobb Ctrl"
 
 #: ../rules/base.xml.in.h:619
-msgid "Secwepemctsin"
-msgstr "Secwepemctsin"
+msgid "Right Ctrl (while pressed)"
+msgstr "Jobb Ctrl (lenyomva tartva)"
 
 #: ../rules/base.xml.in.h:620
-msgid "Semi-colon on third level"
-msgstr "Pontosvessző a harmadik szinten"
+msgid "Right Ctrl as Right Alt"
+msgstr "Jobb Ctrl használata jobb Alt-ként"
 
 #: ../rules/base.xml.in.h:621
-msgid "Sen"
-msgstr "Sen"
+msgid "Right Ctrl is mapped to Menu"
+msgstr "A jobb Ctrl a Menü billentyűhöz van rendelve"
 
 #: ../rules/base.xml.in.h:622
-msgid "Senegal"
-msgstr "Szenegál"
+msgid "Right Ctrl+Right Shift"
+msgstr "Jobb Ctrl + jobb Shift"
 
-#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:10
-msgid "Serbia"
-msgstr "Szerbia"
+#: ../rules/base.xml.in.h:623
+msgid "Right Shift"
+msgstr "Jobb Shift"
 
 #: ../rules/base.xml.in.h:624
-msgid "Serbian"
-msgstr "Szerb"
+msgid "Right Win"
+msgstr "Jobb Win"
 
 #: ../rules/base.xml.in.h:625
-msgid "Serbo-Croatian"
-msgstr "Szerbhorvát"
+msgid "Right Win (while pressed)"
+msgstr "Jobb Win (lenyomva tartva)"
 
 #: ../rules/base.xml.in.h:626
-msgid "Shift cancels Caps Lock"
-msgstr "A Shift megszakítja a Caps Lockot"
+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
-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"
+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
-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"
+msgid "Romanian"
+msgstr "Román"
 
 #: ../rules/base.xml.in.h:629
-msgid "Shift+Caps Lock"
-msgstr "Shift+Caps Lock"
+msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
+msgstr "Román (krími tatár, Dobruca-1 Q)"
 
 #: ../rules/base.xml.in.h:630
-msgid "Simple"
-msgstr "Egyszerű"
+msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
+msgstr "Román (krími tatár, Dobruca-2 Q)"
 
 #: ../rules/base.xml.in.h:631
-msgid "Sindhi"
-msgstr "Szindhi"
+msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
+msgstr "Román (krími tatár, török Alt-Q)"
 
 #: ../rules/base.xml.in.h:632
-msgid "Slovakia"
-msgstr "Szlovákia"
+msgid "Romanian (Crimean Tatar Turkish F)"
+msgstr "Román (krími tatár, török F)"
 
 #: ../rules/base.xml.in.h:633
-msgid "Slovenia"
-msgstr "Szlovénia"
+msgid "Romanian (WinKeys)"
+msgstr "Román (Win billentyűk)"
 
 #: ../rules/base.xml.in.h:634
-msgid "South Africa"
-msgstr "Dél-Afrika"
+msgid "Romanian (cedilla)"
+msgstr "Román (cédille)"
 
 #: ../rules/base.xml.in.h:635
-msgid "Southern Uzbek"
-msgstr "déli üzbég"
+msgid "Romanian (standard cedilla)"
+msgstr "Román (szabványos cédille)"
 
 #: ../rules/base.xml.in.h:636
-msgid "Spain"
-msgstr "Spanyolország"
+msgid "Romanian (standard)"
+msgstr "Román (szabványos)"
 
 #: ../rules/base.xml.in.h:637
-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"
+msgid "Rupee on 4"
+msgstr "Rúpia jel a 4-es billentyűn"
 
 #: ../rules/base.xml.in.h:638
-msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgid "Russian"
+msgstr "Orosz"
 
 #: ../rules/base.xml.in.h:639
-msgid "Standard"
-msgstr "Szabványos"
+msgid "Russian (Bashkirian)"
+msgstr "Orosz (baskír)"
 
 #: ../rules/base.xml.in.h:640
-msgid "Standard (Cedilla)"
-msgstr "Szabványos (cédille)"
+msgid "Russian (Chuvash Latin)"
+msgstr "Orosz (csuvas latin)"
+
+#: ../rules/base.xml.in.h:641
+msgid "Russian (Chuvash)"
+msgstr "Orosz (csuvas)"
 
-#. RSTU 2019-91
 #: ../rules/base.xml.in.h:642
-msgid "Standard RSTU"
-msgstr "Szabványos RSTU"
+msgid "Russian (DOS)"
+msgstr "Orosz (DOS)"
+
+#: ../rules/base.xml.in.h:643
+msgid "Russian (Georgia)"
+msgstr "Orosz (Grúzia)"
 
-#. RSTU 2019-91
 #: ../rules/base.xml.in.h:644
-msgid "Standard RSTU on Russian layout"
-msgstr "Szabványos RSTU orosz kiosztáson"
+msgid "Russian (Germany, phonetic)"
+msgstr "Orosz (Németország, fonetikus)"
 
 #: ../rules/base.xml.in.h:645
-msgid "Sun Type 5/6"
-msgstr "Sun Type 5/6"
+msgid "Russian (Kalmyk)"
+msgstr "Orosz (kalmük)"
 
 #: ../rules/base.xml.in.h:646
-msgid "Sun dead keys"
-msgstr "Sun halott billentyűk"
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr "Orosz (Kazahsztán, kazahhal)"
 
 #: ../rules/base.xml.in.h:647
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power multimédia billentyűzet"
+msgid "Russian (Komi)"
+msgstr "Orosz (komi)"
 
 #: ../rules/base.xml.in.h:648
-msgid "Svdvorak"
-msgstr "Svdvorak"
+msgid "Russian (Mari)"
+msgstr "Orosz (mari)"
 
 #: ../rules/base.xml.in.h:649
-msgid "Svk"
-msgstr "Svk"
+msgid "Russian (Ossetian, WinKeys)"
+msgstr "Orosz (oszét, Win billentyűk)"
 
 #: ../rules/base.xml.in.h:650
-msgid "Svn"
-msgstr "Svn"
+msgid "Russian (Ossetian, legacy)"
+msgstr "Orosz (oszét, hagyományos)"
 
 #: ../rules/base.xml.in.h:651
-msgid "Swap Ctrl and Caps Lock"
-msgstr "Ctrl és Caps Lock felcserélése"
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr "Orosz (Lengyelország, fonetikus Dvorak)"
 
 #: ../rules/base.xml.in.h:652
-msgid "Swap ESC and Caps Lock"
-msgstr "ESC és Caps Lock felcserélése"
+msgid "Russian (Serbian)"
+msgstr "Orosz (szerb)"
 
 #: ../rules/base.xml.in.h:653
-msgid "Swe"
-msgstr "Swe"
+msgid "Russian (Sweden, phonetic)"
+msgstr "Orosz (Svédország, fonetikus)"
 
 #: ../rules/base.xml.in.h:654
-msgid "Sweden"
-msgstr "Svédország"
+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 "Switzerland"
-msgstr "Svájc"
+msgid "Russian (Tatar)"
+msgstr "Orosz (tatár)"
 
 #: ../rules/base.xml.in.h:656
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
+msgid "Russian (US, phonetic)"
+msgstr "Orosz (US, fonetikus)"
 
 #: ../rules/base.xml.in.h:657
-msgid "Syr"
-msgstr "Syr"
+msgid "Russian (Udmurt)"
+msgstr "Orosz (udmurt)"
 
 #: ../rules/base.xml.in.h:658
-msgid "Syria"
-msgstr "Szíria"
+msgid "Russian (Yakut)"
+msgstr "Orosz (jakut)"
 
 #: ../rules/base.xml.in.h:659
-msgid "Syriac"
-msgstr "Szír"
+msgid "Russian (legacy)"
+msgstr "Orosz (hagyományos)"
 
 #: ../rules/base.xml.in.h:660
-msgid "Syriac phonetic"
-msgstr "Szír fonetikus"
+msgid "Russian (phonetic WinKeys)"
+msgstr "Orosz (fonetikus, Win billentyűk)"
 
 #: ../rules/base.xml.in.h:661
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
+msgid "Russian (phonetic)"
+msgstr "Orosz (fonetikus)"
 
 #: ../rules/base.xml.in.h:662
-msgid "Tajikistan"
-msgstr "Tádzsikisztán"
+msgid "Russian (typewriter)"
+msgstr "Orosz (írógép)"
 
 #: ../rules/base.xml.in.h:663
-msgid "Tamil"
-msgstr "Tamil"
+msgid "Russian (typewriter, legacy)"
+msgstr "Orosz (írógép, hagyományos)"
 
 #: ../rules/base.xml.in.h:664
-msgid "Tamil Keyboard with Numerals"
-msgstr "Tamil billentyűzet számjegyekkel"
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
 #: ../rules/base.xml.in.h:665
-msgid "Tamil TAB Typewriter"
-msgstr "Tamil TAB írógép"
+msgid "SK-1300"
+msgstr "SK-1300"
 
 #: ../rules/base.xml.in.h:666
-msgid "Tamil TSCII Typewriter"
-msgstr "Tamil TSCII írógép"
+msgid "SK-2500"
+msgstr "SK-2500"
 
 #: ../rules/base.xml.in.h:667
-msgid "Tamil Unicode"
-msgstr "Tamil Unicode"
+msgid "SK-6200"
+msgstr "SK-6200"
 
 #: ../rules/base.xml.in.h:668
-msgid "Tanzania"
-msgstr "Tanzánia"
+msgid "SK-7100"
+msgstr "SK-7100"
 
 #: ../rules/base.xml.in.h:669
-msgid "Targa Visionary 811"
-msgstr "Targa Visionary 811"
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
 
 #: ../rules/base.xml.in.h:670
-msgid "Tatar"
-msgstr "tatár"
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
 
 #: ../rules/base.xml.in.h:671
-msgid "Telugu"
-msgstr "Telugu"
+msgid "Saisiyat (Taiwan)"
+msgstr "Saisiyat (Tajvan)"
 
 #: ../rules/base.xml.in.h:672
-msgid "Tha"
-msgstr "Tha"
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
 
 #: ../rules/base.xml.in.h:673
-msgid "Thailand"
-msgstr "Thaiföld"
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
 
 #: ../rules/base.xml.in.h:674
-msgid "Tibetan"
-msgstr "Tibeti"
+msgid "Sanwa Supply SKB-KG3"
+msgstr "Sanwa Supply SKB-KG3"
 
 #: ../rules/base.xml.in.h:675
-msgid "Tibetan (with ASCII numerals)"
-msgstr "Tibeti (ASCII számjegyekkel)"
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
 
 #: ../rules/base.xml.in.h:676
-msgid "Tifinagh"
-msgstr "Tifinagh"
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
 
 #: ../rules/base.xml.in.h:677
-msgid "Tifinagh alternative"
-msgstr "Alternatív Tifinagh"
+msgid "Semi-colon on third level"
+msgstr "Pontosvessző a harmadik szinten"
 
 #: ../rules/base.xml.in.h:678
-msgid "Tifinagh alternative phonetic"
-msgstr "Alternatív fonetikus Tifinagh"
+msgid "Serbian"
+msgstr "Szerb"
 
 #: ../rules/base.xml.in.h:679
-msgid "Tifinagh extended"
-msgstr "Kibővített Tifinagh"
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr "Szerb (latin Unicode qwerty)"
 
 #: ../rules/base.xml.in.h:680
-msgid "Tifinagh extended phonetic"
-msgstr "Kibővített fonetikus Tifinagh"
+msgid "Serbian (Latin Unicode)"
+msgstr "Szerb (latin Unicode)"
 
 #: ../rules/base.xml.in.h:681
-msgid "Tifinagh phonetic"
-msgstr "Fonetikus Tifinagh"
+msgid "Serbian (Latin qwerty)"
+msgstr "Szerb (latin qwerty)"
 
 #: ../rules/base.xml.in.h:682
-msgid "Tilde (~) variant"
-msgstr "Tilde (~) változat"
+msgid "Serbian (Latin with guillemets)"
+msgstr "Szerb (latin, »csúcsos« idézőjelekkel)"
 
 #: ../rules/base.xml.in.h:683
-msgid "Tjk"
-msgstr "Tjk"
+msgid "Serbian (Latin)"
+msgstr "Szerb (latin)"
 
 #: ../rules/base.xml.in.h:684
-msgid "Tkm"
-msgstr "Tkm"
+msgid "Serbian (Pannonian Rusyn Homophonic)"
+msgstr "Szerb (pannon ruszin homofon)"
 
 #: ../rules/base.xml.in.h:685
-msgid "To the corresponding key in a Dvorak keyboard."
-msgstr "A Dvorak billentyűzeten megfelelő billentyűre."
+msgid "Serbian (Z and ZHE swapped)"
+msgstr "Szerb (a Z és a ZHE felcserélve)"
 
 #: ../rules/base.xml.in.h:686
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr "A Qwerty billentyűzeten megfelelő billentyűre."
+msgid "Serbian (with guillemets)"
+msgstr "Szerb (»csúcsos« idézőjelekkel)"
 
 #: ../rules/base.xml.in.h:687
-msgid "Toggle PointerKeys with Shift + NumLock."
-msgstr "Mutatóbillentyűk átváltása a Shift + NumLock használatával."
+msgid "Serbo-Croatian (US)"
+msgstr "Szerbhorvát (US)"
 
 #: ../rules/base.xml.in.h:688
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
+msgid "Shift cancels Caps Lock"
+msgstr "A Shift megszakítja a Caps Lockot"
 
 #: ../rules/base.xml.in.h:689
-msgid "Traditional phonetic"
-msgstr "Hagyományos fonetikus"
+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
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access billentyűzet"
+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
-msgid "Trust Slimline"
-msgstr "Trust Slimline"
+msgid "Shift+Caps Lock"
+msgstr "Shift+Caps Lock"
 
 #: ../rules/base.xml.in.h:692
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
+msgid "Sindhi"
+msgstr "Szindhi"
 
 #: ../rules/base.xml.in.h:693
-msgid "Tur"
-msgstr "Tur"
+msgid "Sinhala"
+msgstr "Szingaléz"
 
 #: ../rules/base.xml.in.h:694
-msgid "Turkey"
-msgstr "Törökország"
+msgid "Slovak"
+msgstr "Szlovák"
 
 #: ../rules/base.xml.in.h:695
-msgid "Turkmenistan"
-msgstr "Türkmenisztán"
+msgid "Slovak (extended Backslash)"
+msgstr "Szlovák (kibővített fordított törtvonal)"
 
 #: ../rules/base.xml.in.h:696
-msgid "TypeMatrix EZ-Reach 2020"
-msgstr "TypeMatrix EZ-Reach 2020"
+msgid "Slovak (qwerty)"
+msgstr "Szlovák (qwerty)"
 
 #: ../rules/base.xml.in.h:697
-msgid "TypeMatrix EZ-Reach 2030 PS2"
-msgstr "TypeMatrix EZ-Reach 2030 PS2"
+msgid "Slovak (qwerty, extended Backslash)"
+msgstr "Szlovák (qwerty, kibővített fordított törtvonal)"
 
 #: ../rules/base.xml.in.h:698
-msgid "TypeMatrix EZ-Reach 2030 USB"
-msgstr "TypeMatrix EZ-Reach 2030 USB"
+msgid "Slovene"
+msgstr "Szlovén"
 
 #: ../rules/base.xml.in.h:699
-msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU mód)"
+msgid "Slovene (US keyboard with Slovenian letters)"
+msgstr "Szlovén (US billentyűzet szlovén betűkkel)"
 
 #: ../rules/base.xml.in.h:700
-msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP mód)"
+msgid "Slovene (use guillemets for quotes)"
+msgstr "Szlovén (»Csúcsos« idézőjelek használata idézetekhez)"
 
 #: ../rules/base.xml.in.h:701
-msgid "Typewriter"
-msgstr "Írógép"
+msgid "Spanish"
+msgstr "Spanyol"
 
 #: ../rules/base.xml.in.h:702
-msgid "Typewriter, legacy"
-msgstr "Írógép, hagyományos"
+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 "Tza"
-msgstr "Tza"
+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
-msgid "UCW layout (accented letters only)"
-msgstr "UCW kiosztás (csak ékezetes betűk)"
+msgid "Spanish (Dvorak)"
+msgstr "Spanyol (Dvorak)"
 
 #: ../rules/base.xml.in.h:705
-msgid "US Dvorak with CZ UCW support"
-msgstr "US Dvorak CZ UCW támogatással"
+msgid "Spanish (Latin American)"
+msgstr "Spanyol (latin-amerikai)"
 
 #: ../rules/base.xml.in.h:706
-msgid "US keyboard with Bosnian digraphs"
-msgstr "US billentyűzet bosnyák billentyűkombinációkkal"
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr "Spanyol (latin-amerikai, halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:707
-msgid "US keyboard with Bosnian letters"
-msgstr "US billentyűzet bosnyák betűkkel"
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr "Spanyol (latin-amerikai, halott tildevel)"
 
 #: ../rules/base.xml.in.h:708
-msgid "US keyboard with Croatian digraphs"
-msgstr "US billentyűzet horvát billentyűkombinációkkal"
+msgid "Spanish (Latin American, sun dead keys)"
+msgstr "Spanyol (latin-amerikai, Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:709
-msgid "US keyboard with Croatian letters"
-msgstr "US billentyűzet horvát betűkkel"
+msgid "Spanish (Mac)"
+msgstr "Spanyol (Mac)"
 
 #: ../rules/base.xml.in.h:710
-msgid "US keyboard with Estonian letters"
-msgstr "US billentyűzet észt betűkkel"
+msgid "Spanish (Sun dead keys)"
+msgstr "Spanyol (Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:711
-msgid "US keyboard with Italian letters"
-msgstr "US billentyűzet olasz betűkkel"
+msgid "Spanish (eliminate dead keys)"
+msgstr "Spanyol (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:712
-msgid "US keyboard with Lithuanian letters"
-msgstr "US billentyűzet litván betűkkel"
+msgid "Spanish (include dead tilde)"
+msgstr "Spanyol (halott tilde felvétele)"
 
 #: ../rules/base.xml.in.h:713
-msgid "US keyboard with Slovenian letters"
-msgstr "US billentyűzet szlovén betűkkel"
+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.extras.xml.in.h:11
-msgid "USA"
-msgstr "USA"
+#: ../rules/base.xml.in.h:714
+msgid "Sun Type 5/6"
+msgstr "Sun Type 5/6"
 
 #: ../rules/base.xml.in.h:715
-msgid "Udmurt"
-msgstr "Udmurt"
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power multimédia billentyűzet"
 
 #: ../rules/base.xml.in.h:716
-msgid "Ukr"
-msgstr "Ukr"
+msgid "Swahili (Kenya)"
+msgstr "Szuahéli (Kenya)"
 
 #: ../rules/base.xml.in.h:717
-msgid "Ukraine"
-msgstr "Ukrajna"
+msgid "Swahili (Tanzania)"
+msgstr "Szuahéli (Tanzánia)"
 
 #: ../rules/base.xml.in.h:718
-msgid "Unicode additions (arrows and math operators)"
-msgstr "Unicode kiegészítések (nyilak és műveleti jelek)"
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Ctrl és Caps Lock felcserélése"
 
 #: ../rules/base.xml.in.h:719
-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"
+msgid "Swap ESC and Caps Lock"
+msgstr "ESC és Caps Lock felcserélése"
 
 #: ../rules/base.xml.in.h:720
-msgid "UnicodeExpert"
-msgstr "UnicodeExpert"
+msgid "Swedish"
+msgstr "Svéd"
 
 #: ../rules/base.xml.in.h:721
-msgid "United Kingdom"
-msgstr "Egyesült Királyság"
+msgid "Swedish (Dvorak)"
+msgstr "Svéd (Dvorak)"
 
 #: ../rules/base.xml.in.h:722
-msgid "Unitek KB-1925"
-msgstr "Unitek KB-1925"
+msgid "Swedish (Mac)"
+msgstr "Svéd (Mac)"
 
 #: ../rules/base.xml.in.h:723
-msgid "Urdu, Alternative phonetic"
-msgstr "Urdu, alternatív fonetikus"
+msgid "Swedish (Svdvorak)"
+msgstr "Svéd (Svdvorak)"
 
 #: ../rules/base.xml.in.h:724
-msgid "Urdu, Phonetic"
-msgstr "Urdu, fonetikus"
+msgid "Swedish (eliminate dead keys)"
+msgstr "Svéd (halott billentyűk tiltása)"
 
 #: ../rules/base.xml.in.h:725
-msgid "Urdu, Winkeys"
-msgstr "Urdu, Winkeys"
+msgid "Swedish (northern Saami)"
+msgstr "Svéd (északi szami)"
 
 #: ../rules/base.xml.in.h:726
-msgid "Use Bosnian digraphs"
-msgstr "Bosnyák billentyűkombinációk használata"
+msgid "Swiss"
+msgstr "Svájci"
 
 #: ../rules/base.xml.in.h:727
-msgid "Use Croatian digraphs"
-msgstr "Horvát billentyűkombinációk használata"
+msgid "Swiss (legacy)"
+msgstr "Svájci (hagyományos)"
 
 #: ../rules/base.xml.in.h:728
-msgid "Use guillemets for quotes"
-msgstr "»Csúcsos« idézőjelek használata idézetekhez"
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
 
 #: ../rules/base.xml.in.h:729
-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"
+msgid "Syriac"
+msgstr "Szír"
 
 #: ../rules/base.xml.in.h:730
-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"
+msgid "Syriac (phonetic)"
+msgstr "Szír (fonetikus)"
 
 #: ../rules/base.xml.in.h:731
-msgid "Usual space at any level"
-msgstr "Hagyományos szóköz bármely szinten"
+msgid "Taiwanese"
+msgstr "Tajvani"
 
 #: ../rules/base.xml.in.h:732
-msgid "Uzb"
-msgstr "Uzb"
+msgid "Taiwanese (indigenous)"
+msgstr "Tajvani (őslakos)"
 
 #: ../rules/base.xml.in.h:733
-msgid "Uzbekistan"
-msgstr "Üzbegisztán"
+msgid "Tajik"
+msgstr "Tádzsik"
 
 #: ../rules/base.xml.in.h:734
-msgid "Vietnam"
-msgstr "Vietnam"
+msgid "Tajik (legacy)"
+msgstr "Tádzsik (hagyományos)"
 
 #: ../rules/base.xml.in.h:735
-msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr "ViewSonic KU-306 Internet billentyűzet"
+msgid "Tamil"
+msgstr "Tamil"
 
 #: ../rules/base.xml.in.h:736
-msgid "Vnm"
-msgstr "Vnm"
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgstr "Tamil (Sri Lanka, TAB írógép)"
 
 #: ../rules/base.xml.in.h:737
-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)"
+msgid "Tamil (Sri Lanka, Unicode)"
+msgstr "Tamil (Sri Lanka, Unicode)"
 
 #: ../rules/base.xml.in.h:738
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Wang 724 numerikus billentyűzet Unicode bővítésekkel (nyilak és műveleti jelek). A műveleti jelek az alapértelmezett szinten"
+msgid "Tamil (TAB typewriter)"
+msgstr "Tamil (TAB írógép)"
 
 #: ../rules/base.xml.in.h:739
-msgid "Wang model 724 azerty"
-msgstr "Wang 724-es modell, azerty"
+msgid "Tamil (TSCII typewriter)"
+msgstr "Tamil (TSCII írógép)"
 
 #: ../rules/base.xml.in.h:740
-msgid "Western"
-msgstr "Nyugati"
+msgid "Tamil (Unicode)"
+msgstr "Tamil (Unicode)"
 
 #: ../rules/base.xml.in.h:741
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
+msgid "Tamil (keyboard with numerals)"
+msgstr "Tamil (billentyűzet számjegyekkel)"
 
 #: ../rules/base.xml.in.h:742
-msgid "Winkeys"
-msgstr "Winkeys"
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
 
 #: ../rules/base.xml.in.h:743
-msgid "With &lt;\\|&gt; key"
-msgstr "Az &lt;\\|&gt; billentyűvel"
+msgid "Telugu"
+msgstr "Telugu"
 
 #: ../rules/base.xml.in.h:744
-msgid "With EuroSign on 5"
-msgstr "Euro jel az 5-ös billentyűn"
+msgid "Thai"
+msgstr "Thai"
 
 #: ../rules/base.xml.in.h:745
-msgid "With guillemets"
-msgstr "»Csúcsos« idézőjelekkel"
+msgid "Thai (Pattachote)"
+msgstr "Thai (Pattachote)"
 
 #: ../rules/base.xml.in.h:746
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet billentyűzet"
+msgid "Thai (TIS-820.2538)"
+msgstr "Thai (TIS-820.2538)"
 
 #: ../rules/base.xml.in.h:747
-msgid "Yakut"
-msgstr "Jakut"
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "A Dvorak billentyűzeten megfelelő billentyűre."
 
 #: ../rules/base.xml.in.h:748
-msgid "Yoruba"
-msgstr "Joruba"
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "A Qwerty billentyűzeten megfelelő billentyűre."
 
 #: ../rules/base.xml.in.h:749
-msgid "Z and ZHE swapped"
-msgstr "A Z és a ZHE felcserélve"
+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
-msgid "Zaf"
-msgstr "Zaf"
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
 
 #: ../rules/base.xml.in.h:751
-msgid "Zero-width non-joiner character at second level"
-msgstr "Nulla szélességű nem egyesítő karakter a második szinten"
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access billentyűzet"
 
 #: ../rules/base.xml.in.h:752
-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"
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
 
 #: ../rules/base.xml.in.h:753
-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"
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
 
 #: ../rules/base.xml.in.h:754
-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"
+msgid "Tswana"
+msgstr "Csvana"
 
 #: ../rules/base.xml.in.h:755
-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"
+msgid "Turkish"
+msgstr "Török"
 
 #: ../rules/base.xml.in.h:756
-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"
+msgid "Turkish (Alt-Q)"
+msgstr "Török (Alt-Q)"
 
 #: ../rules/base.xml.in.h:757
-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"
+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 "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"
+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 "azerty"
-msgstr "Azerty"
+msgid "Turkish (Crimean Tatar Turkish Q)"
+msgstr "Török (krími tatár, török Q)"
 
 #: ../rules/base.xml.in.h:760
-msgid "azerty/digits"
-msgstr "Azerty/számjegyek"
+msgid "Turkish (F)"
+msgstr "Török (F)"
 
 #: ../rules/base.xml.in.h:761
-msgid "digits"
-msgstr "Számjegyek"
+msgid "Turkish (Sun dead keys)"
+msgstr "Török (Sun halott billentyűk)"
 
 #: ../rules/base.xml.in.h:762
-msgid "displaced semicolon and quote (obsolete)"
-msgstr "elcsúszott pontosvessző és idézőjel (elavult)"
+msgid "Turkish (international with dead keys)"
+msgstr "Török (nemzetközi, halott billentyűkkel)"
 
 #: ../rules/base.xml.in.h:763
-msgid "lyx"
-msgstr "lyx"
+msgid "Turkmen"
+msgstr "Türkmén"
 
 #: ../rules/base.xml.in.h:764
-msgid "qwerty"
-msgstr "qwerty"
+msgid "Turkmen (Alt-Q)"
+msgstr "Türkmén (Alt-Q)"
 
 #: ../rules/base.xml.in.h:765
-msgid "qwerty, extended Backslash"
-msgstr "qwerty, kibővített visszaper"
+msgid "TypeMatrix EZ-Reach 2020"
+msgstr "TypeMatrix EZ-Reach 2020"
 
 #: ../rules/base.xml.in.h:766
-msgid "qwerty/digits"
-msgstr "qwerty/számjegyek"
+msgid "TypeMatrix EZ-Reach 2030 PS2"
+msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
 #: ../rules/base.xml.in.h:767
-msgid "qwertz"
-msgstr "qwertz"
+msgid "TypeMatrix EZ-Reach 2030 USB"
+msgstr "TypeMatrix EZ-Reach 2030 USB"
+
+#: ../rules/base.xml.in.h:768
+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
+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)"
+
+#: ../rules/base.xml.in.h:772
+msgid "Ukrainian (Crimean Tatar Turkish F)"
+msgstr "Ukrán (krími tatár, török F)"
+
+#: ../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
+msgid "Ukrainian (homophonic)"
+msgstr "Ukrán (homofon)"
+
+#: ../rules/base.xml.in.h:776
+msgid "Ukrainian (legacy)"
+msgstr "Ukrán (hagyományos)"
+
+#: ../rules/base.xml.in.h:777
+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
+msgid "Ukrainian (standard RSTU)"
+msgstr "Ukrán (szabványos RSTU)"
+
+#: ../rules/base.xml.in.h:780
+msgid "Ukrainian (typewriter)"
+msgstr "Ukrán (írógép)"
+
+#: ../rules/base.xml.in.h:781
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unicode kiegészítések (nyilak és műveleti jelek)"
+
+#: ../rules/base.xml.in.h:782
+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
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
+
+#: ../rules/base.xml.in.h:784
+msgid "Urdu (Pakistan)"
+msgstr "Urdu (Pakisztán)"
+
+#: ../rules/base.xml.in.h:785
+msgid "Urdu (Pakistan, CRULP)"
+msgstr "Urdu (Pakisztán, CRULP)"
+
+#: ../rules/base.xml.in.h:786
+msgid "Urdu (Pakistan, NLA)"
+msgstr "Urdu (Pakisztán, NLA)"
+
+#: ../rules/base.xml.in.h:787
+msgid "Urdu (WinKeys)"
+msgstr "Urdu (Pakisztán, Win billentyűk)"
+
+#: ../rules/base.xml.in.h:788
+msgid "Urdu (alternative phonetic)"
+msgstr "Urdu (alternatív fonetikus)"
+
+#: ../rules/base.xml.in.h:789
+msgid "Urdu (phonetic)"
+msgstr "Urdu (fonetikus)"
+
+#: ../rules/base.xml.in.h:790
+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
+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
+msgid "Usual space at any level"
+msgstr "Hagyományos szóköz bármely szinten"
+
+#: ../rules/base.xml.in.h:793
+msgid "Uzbek"
+msgstr "Üzbég"
+
+#: ../rules/base.xml.in.h:794
+msgid "Uzbek (Afghanistan)"
+msgstr "Üzbég (Afganisztán)"
+
+#: ../rules/base.xml.in.h:795
+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
+msgid "Uzbek (Latin)"
+msgstr "Üzbég (latin)"
+
+#: ../rules/base.xml.in.h:800
+msgid "Vietnamese"
+msgstr "Vietnami"
+
+#: ../rules/base.xml.in.h:801
+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:803
+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
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:805
+msgid "Wolof"
+msgstr "Wolof"
+
+#: ../rules/base.xml.in.h:806
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:807
+msgid "Yoruba"
+msgstr "Joruba"
+
+#: ../rules/base.xml.in.h:808
+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
+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
+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
+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
+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
+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
+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
+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
+msgid "ak"
+msgstr "ak"
+
+#: ../rules/base.xml.in.h:817
+msgid "am"
+msgstr "am"
+
+#: ../rules/base.xml.in.h:818
+msgid "ar"
+msgstr "ar"
+
+#: ../rules/base.xml.in.h:819
+msgid "avn"
+msgstr "avn"
+
+#: ../rules/base.xml.in.h:820
+msgid "az"
+msgstr "az"
+
+#: ../rules/base.xml.in.h:821
+msgid "be"
+msgstr "be"
+
+#: ../rules/base.xml.in.h:822
+msgid "ber"
+msgstr "ber"
+
+#: ../rules/base.xml.in.h:823
+msgid "bg"
+msgstr "bg"
+
+#: ../rules/base.xml.in.h:824
+msgid "bm"
+msgstr "bm"
+
+#: ../rules/base.xml.in.h:825
+msgid "bn"
+msgstr "bn"
+
+#: ../rules/base.xml.in.h:826
+msgid "brl"
+msgstr "brl"
+
+#: ../rules/base.xml.in.h:827
+msgid "bs"
+msgstr "bs"
+
+#: ../rules/base.xml.in.h:828
+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
+msgid "cs"
+msgstr "cs"
+
+#: ../rules/base.xml.in.h:832
+msgid "da"
+msgstr "da"
+
+#: ../rules/base.xml.in.h:833
+msgid "de"
+msgstr "de"
+
+#: ../rules/base.xml.in.h:834
+msgid "dv"
+msgstr "dv"
+
+#: ../rules/base.xml.in.h:835
+msgid "dz"
+msgstr "dz"
+
+#: ../rules/base.xml.in.h:836
+msgid "ee"
+msgstr "ee"
+
+#: ../rules/base.xml.in.h:837
+msgid "en"
+msgstr "en"
+
+#: ../rules/base.xml.in.h:838
+msgid "eo"
+msgstr "eo"
+
+#: ../rules/base.xml.in.h:839
+msgid "es"
+msgstr "es"
+
+#: ../rules/base.xml.in.h:840
+msgid "et"
+msgstr "et"
+
+#: ../rules/base.xml.in.h:841
+msgid "fa"
+msgstr "fa"
+
+#: ../rules/base.xml.in.h:842
+msgid "ff"
+msgstr "ff"
+
+#: ../rules/base.xml.in.h:843
+msgid "fi"
+msgstr "fi"
+
+#: ../rules/base.xml.in.h:844
+msgid "fo"
+msgstr "fo"
+
+#: ../rules/base.xml.in.h:845
+msgid "fr"
+msgstr "fr"
+
+#: ../rules/base.xml.in.h:846
+msgid "gaa"
+msgstr "gaa"
+
+#: ../rules/base.xml.in.h:847
+msgid "gr"
+msgstr "gr"
+
+#: ../rules/base.xml.in.h:848
+msgid "gu"
+msgstr "gu"
+
+#: ../rules/base.xml.in.h:849
+msgid "ha"
+msgstr "ha"
+
+#: ../rules/base.xml.in.h:850
+msgid "he"
+msgstr "he"
+
+#: ../rules/base.xml.in.h:851
+msgid "hi"
+msgstr "hi"
+
+#: ../rules/base.xml.in.h:852
+msgid "hr"
+msgstr "hr"
+
+#: ../rules/base.xml.in.h:853
+msgid "hu"
+msgstr "hu"
+
+#: ../rules/base.xml.in.h:854
+msgid "hy"
+msgstr "hy"
+
+#: ../rules/base.xml.in.h:855
+msgid "ie"
+msgstr "ie"
+
+#: ../rules/base.xml.in.h:856
+msgid "ig"
+msgstr "ig"
+
+#: ../rules/base.xml.in.h:857
+msgid "ike"
+msgstr "ike"
+
+#: ../rules/base.xml.in.h:858
+msgid "in"
+msgstr "in"
+
+#: ../rules/base.xml.in.h:859
+msgid "irq"
+msgstr "irq"
+
+#: ../rules/base.xml.in.h:860
+msgid "is"
+msgstr "is"
+
+#: ../rules/base.xml.in.h:861
+msgid "it"
+msgstr "it"
+
+#: ../rules/base.xml.in.h:862
+msgid "ja"
+msgstr "ja"
+
+#: ../rules/base.xml.in.h:863
+msgid "ka"
+msgstr "ka"
+
+#: ../rules/base.xml.in.h:864
+msgid "ki"
+msgstr "ki"
+
+#: ../rules/base.xml.in.h:865
+msgid "kk"
+msgstr "kk"
+
+#: ../rules/base.xml.in.h:866
+msgid "km"
+msgstr "km"
+
+#: ../rules/base.xml.in.h:867
+msgid "kn"
+msgstr "kn"
+
+#: ../rules/base.xml.in.h:868
+msgid "ko"
+msgstr "ko"
+
+#: ../rules/base.xml.in.h:869
+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
+msgid "lt"
+msgstr "lt"
+
+#: ../rules/base.xml.in.h:873
+msgid "lv"
+msgstr "lv"
+
+#: ../rules/base.xml.in.h:874
+msgid "mi"
+msgstr "mi"
+
+#: ../rules/base.xml.in.h:875
+msgid "mk"
+msgstr "mk"
+
+#: ../rules/base.xml.in.h:876
+msgid "ml"
+msgstr "ml"
+
+#: ../rules/base.xml.in.h:877
+msgid "mn"
+msgstr "mn"
+
+#: ../rules/base.xml.in.h:878
+msgid "mt"
+msgstr "mt"
+
+#: ../rules/base.xml.in.h:879
+msgid "my"
+msgstr "my"
+
+#: ../rules/base.xml.in.h:880
+msgid "ne"
+msgstr "ne"
+
+#: ../rules/base.xml.in.h:881
+msgid "nl"
+msgstr "nl"
+
+#: ../rules/base.xml.in.h:882
+msgid "no"
+msgstr "no"
+
+#: ../rules/base.xml.in.h:883
+msgid "or"
+msgstr "or"
+
+#: ../rules/base.xml.in.h:884
+msgid "pa"
+msgstr "pa"
+
+#: ../rules/base.xml.in.h:885
+msgid "ph"
+msgstr "ph"
+
+#: ../rules/base.xml.in.h:886
+msgid "pl"
+msgstr "pl"
+
+#: ../rules/base.xml.in.h:887
+msgid "ps"
+msgstr "ps"
+
+#: ../rules/base.xml.in.h:888
+msgid "pt"
+msgstr "pt"
+
+#: ../rules/base.xml.in.h:889
+msgid "ro"
+msgstr "ro"
+
+#: ../rules/base.xml.in.h:890
+msgid "ru"
+msgstr "ru"
+
+#: ../rules/base.xml.in.h:891
+msgid "sd"
+msgstr "sd"
+
+#: ../rules/base.xml.in.h:892
+msgid "shs"
+msgstr "shs"
+
+#: ../rules/base.xml.in.h:893
+msgid "si"
+msgstr "si"
+
+#: ../rules/base.xml.in.h:894
+msgid "sk"
+msgstr "sk"
+
+#: ../rules/base.xml.in.h:895
+msgid "sl"
+msgstr "sl"
+
+#: ../rules/base.xml.in.h:896
+msgid "sq"
+msgstr "sq"
+
+#: ../rules/base.xml.in.h:897
+msgid "sr"
+msgstr "sr"
+
+#: ../rules/base.xml.in.h:898
+msgid "srp"
+msgstr "srp"
+
+#: ../rules/base.xml.in.h:899
+msgid "sv"
+msgstr "sv"
+
+#: ../rules/base.xml.in.h:900
+msgid "sw"
+msgstr "sw"
+
+#: ../rules/base.xml.in.h:901
+msgid "syc"
+msgstr "syc"
+
+#: ../rules/base.xml.in.h:902
+msgid "ta"
+msgstr "ta"
+
+#: ../rules/base.xml.in.h:903
+msgid "te"
+msgstr "te"
+
+#: ../rules/base.xml.in.h:904
+msgid "tg"
+msgstr "tg"
+
+#: ../rules/base.xml.in.h:905
+msgid "th"
+msgstr "th"
+
+#: ../rules/base.xml.in.h:906
+msgid "tk"
+msgstr "tk"
+
+#: ../rules/base.xml.in.h:907
+msgid "tn"
+msgstr "tn"
+
+#: ../rules/base.xml.in.h:908
+msgid "tr"
+msgstr "tr"
+
+#: ../rules/base.xml.in.h:909
+msgid "twn"
+msgstr "twn"
+
+#: ../rules/base.xml.in.h:910
+msgid "uk"
+msgstr "uk"
+
+#: ../rules/base.xml.in.h:911
+msgid "ur"
+msgstr "ur"
+
+#: ../rules/base.xml.in.h:912
+msgid "uz"
+msgstr "uz"
+
+#: ../rules/base.xml.in.h:913
+msgid "vi"
+msgstr "vi"
+
+#: ../rules/base.xml.in.h:914
+msgid "wo"
+msgstr "wo"
+
+#: ../rules/base.xml.in.h:915
+msgid "xsy"
+msgstr "xsy"
+
+#: ../rules/base.xml.in.h:916
+msgid "yo"
+msgstr "yo"
+
+#: ../rules/base.xml.in.h:917
+msgid "zh"
+msgstr "zh"
 
 #: ../rules/base.extras.xml.in.h:1
 msgid "APL"
 msgstr "APL"
 
 #: ../rules/base.extras.xml.in.h:2
-msgid "Atsina"
-msgstr "Atsina"
+msgid "Iran"
+msgstr "Irán"
 
 #: ../rules/base.extras.xml.in.h:3
-msgid "Avestan"
-msgstr "Avesztán"
+msgid "Iran - Avestan"
+msgstr "Irán - Avesztán"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Combining accents instead of dead keys"
-msgstr "Ékezetek kombinálása a halott billentyűk helyett"
+msgid "Lithuania"
+msgstr "Litvánia"
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Couer D'alene Salish"
-msgstr "Couer D'alene Salish"
+msgid "Lithuania - Dvorak"
+msgstr "Litvánia - Dvorak"
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "International (AltGr Unicode combining)"
-msgstr "Nemzetközi (AltGr Unicode kombinálással)"
+msgid "Ltu"
+msgstr "Ltu"
 
 #: ../rules/base.extras.xml.in.h:7
-msgid "International (AltGr Unicode combining, alternative)"
-msgstr "Nemzetközi (AltGr Unicode kombinálással, alternatív)"
+msgid "Romania"
+msgstr "Románia"
+
+#: ../rules/base.extras.xml.in.h:8
+msgid "Romania - Ergonomic Touchtype"
+msgstr "Románia - ergonomikus Touchtype"
+
+#: ../rules/base.extras.xml.in.h:9
+msgid "Rou"
+msgstr "Rou"
+
+#: ../rules/base.extras.xml.in.h:10
+msgid "Rus"
+msgstr "Rus"
+
+#: ../rules/base.extras.xml.in.h:11
+msgid "Russia"
+msgstr "Oroszország"
+
+#: ../rules/base.extras.xml.in.h:12
+msgid "Serbia"
+msgstr "Szerbia"
+
+#: ../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"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "Srb"
+msgstr "Srb"
+
+#: ../rules/base.extras.xml.in.h:15
+msgid "USA"
+msgstr "USA"
+
+#: ../rules/base.extras.xml.in.h:16
+msgid "USA - Atsina"
+msgstr "USA - Atsina"
+
+#: ../rules/base.extras.xml.in.h:17
+msgid "USA - Couer D'alene Salish"
+msgstr "USA - Couer D'alene Salish"
+
+#: ../rules/base.extras.xml.in.h:18
+msgid "USA - International (AltGr Unicode combining)"
+msgstr "USA - Nemzetközi (AltGr Unicode kombinálással)"
+
+#: ../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)"
diff --git a/xorg-server/xkeyboard-config/po/it.po b/xorg-server/xkeyboard-config/po/it.po
index d336ccc3d..7f9f5adbf 100644
--- a/xorg-server/xkeyboard-config/po/it.po
+++ b/xorg-server/xkeyboard-config/po/it.po
@@ -33,10 +33,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-02 00:27+0200\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-05-23 09:53+0200\n"
 "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -122,167 +122,170 @@ msgstr "Aggiunta del simboli di valuta a determinati tasti"
 msgid "Advance Scorpius KI"
 msgstr "Advance Scorpius KI"
 
-#: ../rules/base.xml.in.h:18
-msgid "Afg"
-msgstr "Afg"
-
 # UE
-#: ../rules/base.xml.in.h:19
+#: ../rules/base.xml.in.h:18
 msgid "Afghani"
 msgstr "Afgano"
 
 # variante per Ghana
-#: ../rules/base.xml.in.h:20
+#: ../rules/base.xml.in.h:19
 msgid "Akan"
 msgstr "Akan"
 
 # UE
-#: ../rules/base.xml.in.h:21
+#: ../rules/base.xml.in.h:20
 msgid "Albanian"
 msgstr "Albanese"
 
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:21
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt e Meta sono sui tasti Alt"
 
 # to map, pare che in termini matematici voglia dire applicare
-#: ../rules/base.xml.in.h:23
+#: ../rules/base.xml.in.h:22
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Alt è applicato al tasto Win destro, Super al tasto Menu"
 
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:23
 msgid "Alt+Caps Lock"
 msgstr "Alt+BlocMaiusc"
 
-#: ../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+Maiusc"
 
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:26
 msgid "Alt+Space"
 msgstr "Alt+Spazio"
 
 # optionList: altwin
 # descrizione: Using special PC keys (Win, Menu) to work as standard X keys
 #              (Super, Hyper, etc.)
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:27
 msgid "Alt/Win key behavior"
 msgstr "Comportamento tasto Alt/Win"
 
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:28
 msgid "Amharic"
 msgstr "Amarica"
 
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:29
 msgid "Any Alt key"
 msgstr "Ogni tasto Alt"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr "Ogni tasto Win"
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr "Ogni tasto Win (mentre è premuto)"
 
-#: ../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 Keyboard alluminio (ANSI)"
 
-#: ../rules/base.xml.in.h:35
+#: ../rules/base.xml.in.h:34
 msgid "Apple Aluminium Keyboard (ISO)"
 msgstr "Apple Keyboard alluminio (ISO)"
 
-#: ../rules/base.xml.in.h:36
+#: ../rules/base.xml.in.h:35
 msgid "Apple Aluminium Keyboard (JIS)"
 msgstr "Apple Keyboard alluminio (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 Keyboard alluminio: emula tasti PC (Stamp, BlocScorr, Pausa, BlocNum)"
 
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
 msgstr "Portatile Apple"
 
 # nel senso di layout/disposizione e usato nell'elenco di nazioni.
-#: ../rules/base.xml.in.h:39
+#: ../rules/base.xml.in.h:38
 msgid "Arabic"
 msgstr "Araba"
 
 # variante 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 (Marocco)"
 
 # UE
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:41
 msgid "Arabic (Pakistan)"
 msgstr "Araba (Pakistan)"
 
 # nel senso di layout/disposizione e usato nell'elenco di nazioni.
-#: ../rules/base.xml.in.h:43
+#: ../rules/base.xml.in.h:42
 msgid "Arabic (Syria)"
 msgstr "Araba (Siria)"
 
-#: ../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/cifre)"
 
-#: ../rules/base.xml.in.h:46
+#: ../rules/base.xml.in.h:45
 msgid "Arabic (digits)"
 msgstr "Araba (cifre)"
 
-#: ../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 (querty/cifre)"
 
 # UE
-#: ../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 (orientale alternativa)"
 
 # variante marocchina
-#: ../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 (fonetica alternativa)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 msgid "Armenian (eastern)"
 msgstr "Armena (orientale)"
 
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:52
 msgid "Armenian (phonetic)"
 msgstr "Armena (fonetica)"
 
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:53
 msgid "Armenian (western)"
 msgstr "Armena (occidentale)"
 
+# punto sottoscritto stando a http://it.wikipedia.org/wiki/Diacritico
+# Grazie a Daniele Forsi
+#
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturiana (Spagna, con H punto sottoscritto e L punto sottoscritto)"
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "Portatile Asus"
@@ -301,16 +304,16 @@ msgid "Avatime"
 msgstr "Avatime"
 
 # UE
-#
-# FIXME credo sia sbagliato, dovrebbe essere Azerbaijani
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijan (Cyrillic)"
-msgstr "Azera (cirillico)"
+msgid "Azerbaijani"
+msgstr "Azera"
 
 # UE
+#
+# FIXME credo sia sbagliato, dovrebbe essere Azerbaijani
 #: ../rules/base.xml.in.h:60
-msgid "Azerbaijani"
-msgstr "Azera"
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Azera (cirillico)"
 
 #: ../rules/base.xml.in.h:61
 msgid "Azona RF2300 wireless Internet Keyboard"
@@ -358,676 +361,721 @@ msgstr "Backslash"
 
 # tasto per scegliere il quinto livello: |...|
 #: ../rules/base.xml.in.h:72
-msgid "Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr "Backslash sceglie il terzo livello, blocca quando premuto assieme a un altro selettore del terzo livello)"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Backslash (sceglie il terzo livello, blocca quando premuto assieme a un altro selettore del terzo livello)"
 
 #: ../rules/base.xml.in.h:73
 msgid "Bambara"
 msgstr "Bambara"
 
-# UE
+# Variante russa http://it.wikipedia.org/wiki/Baschiri
 #: ../rules/base.xml.in.h:74
+msgid "Bashkirian"
+msgstr "Baschira"
+
+# UE
+#: ../rules/base.xml.in.h:75
 msgid "Belarusian"
 msgstr "Bielorussa"
 
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:76
 msgid "Belarusian (Latin)"
 msgstr "Bielorussa (latina)"
 
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:77
 msgid "Belarusian (legacy)"
 msgstr "Bielorussa (vecchia maniera)"
 
 # UE
-#: ../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 alternativa)"
 
-#: ../rules/base.xml.in.h:79
+#: ../rules/base.xml.in.h:80
 msgid "Belgian (Sun dead keys)"
 msgstr "Belga (tasti muti Sun)"
 
 # variante belga
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belga (modello Wang 724 azerty)"
 
 # variante marocchina
-#: ../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, tasti muti Sun)"
 
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belga (alternativa, solo latin-9)"
 
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:85
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belga (tasti muti rimossi)"
 
-#: ../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"
 
 # variante per india
-#: ../rules/base.xml.in.h:88
+#: ../rules/base.xml.in.h:89
 msgid "Bengali"
 msgstr "Bengalese"
 
 # variante per bengali, credo sia fonetico (crf www.bengalinux.org)
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:90
 msgid "Bengali (Probhat)"
 msgstr "Bengalese (probhat)"
 
 # variante marocchina
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:91
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berbera (Marocco, tifinagh fonetica alternativa)"
 
 # variante marocchina
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berbera (Marocco, tifinagh alternativa)"
 
 # variante marocchina
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berbera (Marocco, tifinagh fonetica estesa)"
 
 # variante marocchina
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berbera (Marocco, tifinagh estesa)"
 
 # variante marocchina
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berbera (Marocco, tifinagh fonetica fonetica)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berbera (Marocco, tifinagh)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bosnian"
 msgstr "Bosniaca"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bosniaca (tastiera USA con digrammi bosniaci)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bosniaca (tastiera USA con lettere bosniache)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bosniaca (con digrammi bosniaci)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bosniaca (con caporali per virgolette)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Both Alt keys together"
 msgstr "Entrambi i tasti Alt insieme"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Both Ctrl keys together"
 msgstr "Entrambi i tasti Ctrl insieme"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Both Shift keys together"
 msgstr "Entrambi i tasti Maiusc insieme"
 
-#: ../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 "Entrambi i tasti Maiusc insieme attivano BloccaMaiusc, un tasto Maiusc lo disattiva"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Entrambi i tasti Maiusc insieme commutano BloccaMaiusc"
 
 # Credo che ShiftLock sia un refuso per Caps Lock
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Entrambi i tasti Maiusc insieme commutano BloccaMaiusc"
 
-#: ../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 (mano sinistra)"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Braille (right hand)"
 msgstr "Braille (mano destra)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:111
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
 # UE
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:112
 msgid "Bulgarian"
 msgstr "Bulgara (fonetica nuova)"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Bulgarian (new phonetic)"
 msgstr "Bulgara (fonetica nuova)"
 
 # variante bulgara
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bulgara (fonetica tradizionale)"
 
-#: ../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 "Canadese multilingue"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Canadian Multilingual (first part)"
 msgstr "Canadese multilingue (prima parte)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "Canadian Multilingual (second part)"
 msgstr "Canadese multilingue (seconda parte)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:119
 msgid "Caps Lock"
 msgstr "BlocMaiusc"
 
 # tasto per scegliere il quinto livello: |...|
-#: ../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 "BlocMaiusc (sceglie il terzo livello, blocca quando premuto assieme a un altro selettore del terzo livello)"
 
 # per come appare, tradurre il "to" è superfluo
-#: ../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 "BlocMaiusc (prima disposizione), Maiusc+BlocMaiusc (ultima disposizione)"
 
-#: ../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 "BlocMaiusc (mentre è premuto), Alt+BlocMaiusc esegue l'azione blocca maiuscole originale"
 
-#: ../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 "BlocMaiusc agisce come Maiusc con il blocco. Maiusc \"mette in pausa\" BlocMaiusc"
 
-#: ../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 "BlocMaiusc agisce come Maiusc con il blocco. Maiusc non ha effetto su BlocMaiusc"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock is disabled"
 msgstr "BlocMaiusc è disabilitato"
 
 # optionList: caps
 # descrizione: CapsLock tweaks. "Internal" capitalization means capitalization
 #              using some internal tables. Otherwise "as Shift" - means using next group
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock key behavior"
 msgstr "Comportamento tasto BlocMaiusc"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:127
 msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr "BlocMaiusc commuta Maiusc così da avere effetto su tutti i tasti"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "BlocMaiusc commuta l'uso normale delle lettere maiuscole dei caratteri alfabetici"
 
 # "Internal" capitalization means capitalization using some internal tables.
 #            Otherwise "as Shift" - means using next group.
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:129
 msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr "BlocMaiusc fa uso interno delle lettere maiuscole. Maiusc \"mette in pausa\" BlocMaiusc"
 
-#: ../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 "BlocMaiusc fa uso interno delle lettere maiuscole. Maiusc non ha effetto su BlocMaiusc"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:131
 msgid "Catalan"
 msgstr "Catalana"
 
+# FIXME... trovare traduzione middle-dot
+#: ../rules/base.xml.in.h:132
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Catalana (Spagna, con L middle-dot)"
+
 # variante USA
-#: ../rules/base.xml.in.h:131
+#: ../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 (opzione 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"
 
 # UE
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:145
 msgid "Chinese"
 msgstr "Cinese"
 
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "Cinese (tibetana con numeri ASCII)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "Cinese (tibetana)"
-
+# variante russa
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "Cinese (uyghur)"
+msgid "Chuvash"
+msgstr "Chuvash"
 
+# variante russa
 #: ../rules/base.xml.in.h:147
+msgid "Chuvash (Latin)"
+msgstr "Chuvash (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 tastiera Easy Access"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:151
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 tasti)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:152
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 tasti)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 tasti)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:154
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq tastiera iPaq"
 
 # optionList: compose
 # descrizione: Tweaking the position of the "Compose" key: mapping to
 #              existing PC keys
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:155
 msgid "Compose key position"
 msgstr "Posizione tasto 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 è applicato ai tasti Alt, Alt è applicato ai tasti 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 è applicato ai tasti Win (e ai soliti tasti Ctrl)"
 
-#: ../rules/base.xml.in.h:157
+#: ../rules/base.xml.in.h:159
 msgid "Creative Desktop Wireless 7000"
 msgstr "Creative Desktop Wireless 7000"
 
+# variante rumena
+#: ../rules/base.xml.in.h:160
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Tatar crimea (Dobruca Q)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Tatar crimea (turca Alt-Q)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Tatar crimea (turca F)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Tatar crimea (turca Q)"
+
 # UE
-#: ../rules/base.xml.in.h:158
+#: ../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 (tastiera USA con digrammi croati)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:166
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Croata (tastiera USA con lettere croate)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
+#: ../rules/base.xml.in.h:167
+msgid "Croatian (use Croatian digraphs)"
 msgstr "Croata (con digrammi croati)"
 
-#: ../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 (con caporali per virgolette)"
 
 # optionList: ctrl
 # descrizione: Tweaking the position of the "Ctrl" key
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Ctrl key position"
 msgstr "Posizione tasto Ctrl"
 
-#: ../rules/base.xml.in.h:164
+#: ../rules/base.xml.in.h:170
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Maiusc"
 
 # UE
-#: ../rules/base.xml.in.h:165
+#: ../rules/base.xml.in.h:171
 msgid "Czech"
 msgstr "Ceca"
 
-#: ../rules/base.xml.in.h:166
-msgid "Czech (UCW layout accented letters only)"
-msgstr "Ceca (disposizione UCW solo lettere accentate)"
+#: ../rules/base.xml.in.h:172
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "Ceca (disposizione UCW, solo lettere accentate)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Coca (Dvorak USA con supporto UCW CZ)"
 
-#: ../rules/base.xml.in.h:168
-msgid "Czech (With &lt;\\|&gt; key)"
-msgstr "Ceca (con tasti &lt;\\|&gt;)"
-
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:174
 msgid "Czech (qwerty)"
 msgstr "Ceca (qwerty)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:175
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Ceca (qwerty, backslash esteso)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:176
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Ceca (con tasti &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 "Danese"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Danish (Dvorak)"
 msgstr "Danese (Dvorak)"
 
-#: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
-msgstr "Danese (Mac)"
+#: ../rules/base.xml.in.h:180
+msgid "Danish (Macintosh)"
+msgstr "Danese (Macintosh )"
 
-#: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
-msgstr "Danese (Mac, tasti muti rimossi)"
+#: ../rules/base.xml.in.h:181
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Danese (Macintosh, tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Danish (eliminate dead keys)"
 msgstr "Danese (tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "Default numeric keypad keys"
 msgstr "Tasti predefiniti nel tastierino numerico"
 
-#: ../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 tasti PC"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell portatile Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell portatile serie Precision M"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Dell Latitude series laptop"
 msgstr "Dell portatile serie 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 tastiera USB multimediale"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa tastiera Wireless Desktop"
 
-#: ../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 serie 9801/9802"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dutch"
 msgstr "Olandese"
 
-#: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
-msgstr "Olandese (Mac)"
+#: ../rules/base.xml.in.h:197
+msgid "Dutch (Macintosh)"
+msgstr "Olandese (Macintosh)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dutch (Sun dead keys)"
 msgstr "Olandese (tasti muti Sun)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dutch (standard)"
 msgstr "Olandese (standard)"
 
-#: ../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 "Abilitare caratteri tipografici aggiuntivi"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
+msgid "English (Cameroon Dvorak)"
+msgstr "Inglese (Dvorak Camerun)"
+
+#: ../rules/base.xml.in.h:203
+msgid "English (Cameroon qwerty)"
+msgstr "Inglese (qwerty Camerun)"
+
+#: ../rules/base.xml.in.h:204
+msgid "English (Cameroon)"
+msgstr "Inglese (Camerun)"
+
+#: ../rules/base.xml.in.h:205
 msgid "English (Canada)"
 msgstr "Inglese (Canada)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:206
 msgid "English (Colemak)"
 msgstr "Inglese (Colemak)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:207
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Inglese (Dvorak internazionale alternativa senza tasti muti)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:208
 msgid "English (Dvorak international with dead keys)"
 msgstr "Inglese (Dvorak internazionale con tasti muti)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:209
 msgid "English (Dvorak)"
 msgstr "Inglese (Dvorak)"
 
 # variante canadese
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:210
 msgid "English (Ghana)"
 msgstr "Inglese (Ghana)"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:211
 msgid "English (Ghana, GILLBT)"
 msgstr "Inglese (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:212
 msgid "English (Ghana, multilingual)"
 msgstr "Inglese (Ghana, multilingue)"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:213
 msgid "English (India, with RupeeSign)"
 msgstr "Inglese (India, con simbolo rupia)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:214
 msgid "English (Macintosh)"
 msgstr "Inglese (Macintosh )"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
-msgstr "Inglese (Mali, Mac USA)"
+#: ../rules/base.xml.in.h:215
+msgid "English (Mali, US Macintosh)"
+msgstr "Inglese (Mali, Macintosh USA)"
 
-#: ../rules/base.xml.in.h:207
-msgid "English (Mali, USA international)"
+#: ../rules/base.xml.in.h:216
+msgid "English (Mali, US international)"
 msgstr "Inglese (Mali, internazionale USA)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:217
 msgid "English (Nigeria)"
 msgstr "Inglese (Nigeria)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:218
 msgid "English (South Africa)"
 msgstr "Inglese (Sud Africa)"
 
 # variante canadese
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:219
 msgid "English (UK)"
 msgstr "Inglese (UK)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:220
 msgid "English (UK, Colemak)"
 msgstr "Inglese (UK, Colemak)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
-msgstr "Inglese (UK, punteggiatura UK Dvorak)"
+#: ../rules/base.xml.in.h:221
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Inglese (UK, Dvorak con punteggiatura UK)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:222
 msgid "English (UK, Dvorak)"
 msgstr "Inglese (UK, Dvorak)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
-msgstr "Inglese (UK, Mac internazionale)"
+#: ../rules/base.xml.in.h:223
+msgid "English (UK, Macintosh international)"
+msgstr "Inglese (UK, Macintosh internazionale)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
-msgstr "Inglese (UK, Mac)"
+#: ../rules/base.xml.in.h:224
+msgid "English (UK, Macintosh)"
+msgstr "Inglese (UK, Macintosh)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
-msgstr "Inglese (UK, estesa, tasti Win)"
+#: ../rules/base.xml.in.h:225
+msgid "English (UK, extended WinKeys)"
+msgstr "Inglese (UK, tasti Win estesi)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, international with dead keys)"
 msgstr "Inglese (UK, internazionale con tasti muti)"
 
 # variante canadese
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
 msgid "English (US)"
 msgstr "Inglese (USA)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:228
 msgid "English (US, alternative international)"
 msgstr "Inglese (USA, internazionale alternativa)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:229
 msgid "English (US, international with dead keys)"
 msgstr "Inglese (USA, internazionale con tasti muti)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:230
 msgid "English (US, with euro on 5)"
 msgstr "Inglese (USA, con Euro sul 5)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:231
 msgid "English (classic Dvorak)"
 msgstr "Inglese (Dvorak classica)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:232
 msgid "English (international AltGr dead keys)"
 msgstr "Inglese (internazionale tasti muti AltGr)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:233
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Inglese (commuta disposizione sul tasto moltiplica/dividi)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:234
 msgid "English (left handed Dvorak)"
 msgstr "Inglese (Dvorak mancina)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:235
 msgid "English (programmer Dvorak)"
 msgstr "Inglese (Dvorak per programmatori)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:236
 msgid "English (right handed Dvorak)"
 msgstr "Inglese (Dvorak destrorsa)"
 
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:237
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
 # lasciato enter, come nome di segnale
 # sono due uno è enter, l'altro return
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:238
 msgid "Enter on keypad"
 msgstr "Enter sul tastierino numerico"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:239
 msgid "Esperanto"
 msgstr "Esperanto"
 
+#: ../rules/base.xml.in.h:240
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Esperanto (Portogallo, Nativo)"
+
 # variante esperanto
 #
 # to diplace: 1) spostare, rimuovere; dislocare
@@ -1035,396 +1083,402 @@ msgstr "Esperanto"
 # 	    3) soppiantare
 #
 # sarà corretto spostate???
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:241
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (punto e virgola e virgolette spostate, obsoleta)"
 
 # UE
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:242
 msgid "Estonian"
 msgstr "Estone"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:243
 msgid "Estonian (Dvorak)"
 msgstr "Estone (Dvorak)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:244
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estone (tastiera USA con lettere estoni)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:245
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estone (tasti muti esclusi)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:246
 msgid "Euro on 2"
 msgstr "Euro sul 2"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:247
 msgid "Euro on 4"
 msgstr "Euro sul 4"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:248
 msgid "Euro on 5"
 msgstr "Euro sul 5"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:249
 msgid "Euro on E"
 msgstr "Euro sulla E"
 
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:250
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
 # Ewe: variante del Ghana
-#: ../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 "Faeroese"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:254
 msgid "Faroese (eliminate dead keys)"
 msgstr "Faeroese (tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:255
 msgid "Filipino"
 msgstr "Filippina"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:256
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filippina (baybayin Capewell-Dvorak)"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:257
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filippina (latina Capewell-Dvorak)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:258
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filippina (baybayin Capewell-QWERF 2006)"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:259
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filippina (latina Capewell-QWERF 2006)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:260
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Filippina (baybayin Colemak)"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Colemak Latin)"
 msgstr "Filippina (latina Colemak)"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:262
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Filippina (baybayin Dvorak)"
+
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filippina (latina Dvorak)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filippina (baybayin QWERTY)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:265
 msgid "Finnish"
 msgstr "Finlandese"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
-msgstr "Finlandese (Mac)"
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
+msgstr "Finlandese (Macintosh)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:267
 msgid "Finnish (classic)"
 msgstr "Finlandese (classica)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:268
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Finlandese (classica, tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:258
-msgid "Finnish (northern Saami)"
-msgstr "Finlandese (saami settentrinale)"
-
 #. 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 "Tasto di quarto livello con separatori astratti"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:272
 msgid "Four-level key with comma"
 msgstr "Tasto di quarto livello con virgola"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:273
 msgid "Four-level key with dot"
 msgstr "Tasto di quarto livello con punto"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:274
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Tasto di quarto livello con punto, restrizione latin-9"
 
 # http://en.wikipedia.org/wiki/Momayyez
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:275
 msgid "Four-level key with momayyez"
 msgstr "Tasto di quarto livello con momayyez"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:276
 msgid "French"
 msgstr "Francese"
 
 # variante francese
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:277
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Francese (Bepo, ergonomica, tipo Dvorak)"
 
 # variante francese
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:278
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Francese (Bepo, ergonomica, tipo Dvorak, solo latin-9)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:279
 msgid "French (Breton)"
 msgstr "Francese (bretone)"
 
-#: ../rules/base.xml.in.h:270
+# variante marocchina
+#: ../rules/base.xml.in.h:280
+msgid "French (Cameroon azerty)"
+msgstr "Francese (azerty Camerun)"
+
+#: ../rules/base.xml.in.h:281
+msgid "French (Cameroon)"
+msgstr "Francese (Camerun)"
+
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "Francese (Canada)"
+
+#: ../rules/base.xml.in.h:283
 msgid "French (Canada, Dvorak)"
 msgstr "Francese (Canada, Dvorak)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:284
 msgid "French (Canada, legacy)"
 msgstr "Francese (Canada, vecchia maniera)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:285
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Francese (Repubblica Democratica del Congo)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:286
 msgid "French (Dvorak)"
 msgstr "Francese (Dvorak)"
 
-# Questa invece variante delle tastiere francesi
-#: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
-msgstr "Francese (georgiana AZERTY Tskapo)"
-
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:287
 msgid "French (Guinea)"
 msgstr "Francese (Guinea)"
 
-#: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
-msgstr "Francese (Mac)"
+#: ../rules/base.xml.in.h:288
+msgid "French (Macintosh)"
+msgstr "Francese (Macintosh)"
 
 # lasciata la forma francese, magari ha un senso particolare
 # variante del mali
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:289
 msgid "French (Mali, alternative)"
 msgstr "Francese (Mali, alternativa)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:290
 msgid "French (Morocco)"
 msgstr "Francese (Marocco)"
 
-#: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
-msgstr "Francese (occitano)"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:291
 msgid "French (Sun dead keys)"
 msgstr "Francese (tasti muti Sun)"
 
 # UE
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:292
 msgid "French (Switzerland)"
 msgstr "Francese (Svizzera)"
 
 # UE
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
-msgstr "Francese (Svizzera, Mac)"
+#: ../rules/base.xml.in.h:293
+msgid "French (Switzerland, Macintosh)"
+msgstr "Francese (Svizzera, Macintosh)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:294
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Francese (Svizzera, tasti muti Sun)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:295
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Francese (Svizzera tasti muti rimossi)"
 
 # variante marocchina
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:296
 msgid "French (alternative)"
 msgstr "Francese (alternativa)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:297
 msgid "French (alternative, Sun dead keys)"
 msgstr "Francese (alternativa, tasti muti Sun)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:298
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Francese (alternativa, tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:299
 msgid "French (alternative, latin-9 only)"
 msgstr "Francese (alternativa, solo latin-9)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:300
 msgid "French (eliminate dead keys)"
 msgstr "Francese (tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
-msgstr "Francese (alternativa vecchia maniera)"
+#: ../rules/base.xml.in.h:301
+msgid "French (legacy, alternative)"
+msgstr "Francese (vecchia maniera, alternativa)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:302
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Francese (vecchia maniera, alternativa, tasti muti Sun)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:303
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Francese (vecchia maniera, alternativa, tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:304
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Portatile AMILO Fujitsu-Siemens Computers"
 
 # Fula: variante del Ghana
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:305
 msgid "Fula"
 msgstr "Fula"
 
-# Codice tre lettere per U.K.
-#: ../rules/base.xml.in.h:295
-msgid "GBr"
-msgstr "GBR"
-
 # Ga: variante del ghana
-#: ../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 "Generica 101 tasti PC"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:308
 msgid "Generic 102-key (Intl) PC"
 msgstr "Generica 102 tasti (Intl) PC"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:309
 msgid "Generic 104-key PC"
 msgstr "Generica 104 tasti PC"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:310
 msgid "Generic 105-key (Intl) PC"
 msgstr "Generica 105 tasti (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"
 
 # Curiosamente è una variante delle tastiere italiane...
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:316
 msgid "Georgian"
 msgstr "Georgiana"
 
+# Questa invece variante delle tastiere francesi
+#: ../rules/base.xml.in.h:317
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Georgiana (Francia, AZERTY Tskapo)"
+
+#: ../rules/base.xml.in.h:318
+msgid "Georgian (Italy)"
+msgstr "Georgiana (Italia)"
+
 # Curiosamente è una variante delle tastiere italiane...
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:319
 msgid "Georgian (MESS)"
 msgstr "Georgiana (MESS)"
 
-#: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
-msgstr "Gergiana (osseta)"
-
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:320
 msgid "Georgian (ergonomic)"
-msgstr "Gergiana (ergonomica)"
+msgstr "Georgiana (ergonomica)"
 
 # UE
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:321
 msgid "German"
 msgstr "Tedesca"
 
 # UE
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:322
 msgid "German (Austria)"
 msgstr "Tedesca (Austria)"
 
-#: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
-msgstr "Tedesca (Austria, Mac)"
+#: ../rules/base.xml.in.h:323
+msgid "German (Austria, Macintosh)"
+msgstr "Tedesca (Austria, Macintosh)"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:324
 msgid "German (Austria, Sun dead keys)"
 msgstr "Tedesca (Austria, tasti muti Sun)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:325
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Tedesca (Austria, tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:326
 msgid "German (Dvorak)"
 msgstr "Tedesca (Dvorak)"
 
-#: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
-msgstr "Tedesca (Mac)"
+#: ../rules/base.xml.in.h:327
+msgid "German (Macintosh)"
+msgstr "Tedesca (Macintosh)"
 
-#: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
-msgstr "Tedesca (Mac, tasti muti rimossi)"
+#: ../rules/base.xml.in.h:328
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Tedesca (Macintosh, tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:329
 msgid "German (Neo 2)"
 msgstr "Tedesca (Neo 2)"
 
-#: ../rules/base.xml.in.h:319
-msgid "German (Romanian keyboard with German letters)"
-msgstr "Tedesca (tastiera rumena con lettere tedesche)"
-
-#: ../rules/base.xml.in.h:320
-msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
-msgstr "Tedesca (tastiera rumena con lettere tedesche, tasti muti rimossi)"
-
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:330
 msgid "German (Sun dead keys)"
 msgstr "Tedesca (tasti muti Sun)"
 
 # UE
-#: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
-msgstr "Tedesca (Svizzera, Mac)"
+#: ../rules/base.xml.in.h:331
+msgid "German (Switzerland)"
+msgstr "Tedesca (Svizzera)"
 
-#: ../rules/base.xml.in.h:323
+# UE
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
+msgstr "Tedesca (Svizzera, Macintosh)"
+
+#: ../rules/base.xml.in.h:333
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Tedesca (Svizzera, tasti muti Sun)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:334
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Tedesca (Svizzera, tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:325
+# UE
+#: ../rules/base.xml.in.h:335
+msgid "German (Switzerland, legacy)"
+msgstr "Tedesca (Svizzera, vecchia maniera)"
+
+#: ../rules/base.xml.in.h:336
 msgid "German (dead acute)"
 msgstr "Tedesca (acuto muto)"
 
@@ -1433,383 +1487,355 @@ msgstr "Tedesca (acuto muto)"
 # rispetto alla tedesca normale cambia un carattere, ^
 # ah, le tastiere tedesche non hanno le lettere accentate, per cui
 # probabilemente 'sta cosa è importate per il Compose
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:337
 msgid "German (dead grave acute)"
 msgstr "Tedesca (acuto grave muto)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:338
 msgid "German (eliminate dead keys)"
 msgstr "Tedesca (tasti muti rimossi)"
 
-# FIXME tradotto come in iso-codes, ma inferiore nun se po' vede...
-#: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
-msgstr "Tedesca (sorabo inferiore qwertz)"
-
-# codice iso639: dsb
-# FIXME tradotto come in iso-codes, ma inferiore nun se po' vede...
-#: ../rules/base.xml.in.h:329
-msgid "German (lower Sorbian)"
-msgstr "Tedesca (sorabo inferiore)"
-
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:339
 msgid "German (qwerty)"
 msgstr "Tedesca (qwerty)"
 
 # UE
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:340
 msgid "Greek"
 msgstr "Greca"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:341
 msgid "Greek (eliminate dead keys)"
 msgstr "Greca (tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:342
 msgid "Greek (extended)"
 msgstr "Greca (estesa)"
 
 # Variante greca
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:343
 msgid "Greek (polytonic)"
 msgstr "Greca (politonica)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:344
 msgid "Greek (simple)"
 msgstr "Greca (semplice)"
 
 # Gujarati: variante india
-#: ../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 per Mac"
 
 # Hausa: variante Ghana
-#: ../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 "Ebraica"
 
-# variante bulgare
-#: ../rules/base.xml.in.h:343
-msgid "Hebrew (Phonetic)"
-msgstr "Ebraica (fonetica)"
-
-#: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
-msgstr "Ebraica (Tiro)"
+#: ../rules/base.xml.in.h:352
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Ebraica (biblica, Tiro)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "Hebrew (lyx)"
 msgstr "Ebraica (lyx)"
 
-#: ../rules/base.xml.in.h:346
+# variante bulgare
+#: ../rules/base.xml.in.h:354
+msgid "Hebrew (phonetic)"
+msgstr "Ebraica (fonetica)"
+
+#: ../rules/base.xml.in.h:355
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
 # omesso Notebook
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:356
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "Hewlett-Packard Mini 110"
 
-#: ../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 Pavillion ZT11xx"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "Hewlett-Packard Pavillion dv5"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "Hewlett-Packard Multimedia Keyboard SK-250x"
 
-#: ../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 "Esadecimale"
 
 # Hindi Bolnagri: variante India
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:368
 msgid "Hindi (Bolnagri)"
 msgstr "Hindi (bolnagri)"
 
 # variante indiana
-#: ../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 "Telefono HTC Dream"
 
 # UE
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:372
 msgid "Hungarian"
 msgstr "Ungherese"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:373
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Ungherese (101/qwerty/virgola/tasti muti)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:374
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Ungherese (101/qwerty/virgola/tasti muti esclusi)"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Ungherese (101/qwerty/punto/tasti muti)"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Ungherese (101/qwerty/punto/tasti muti esclusi)"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Ungherese (101/qwertz/virgola/tasti muti)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Ungherese (101/qwertz/virgola/tasti muti esclusi)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Ungherese (101/qwertz/punto/tasti muti)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Ungherese (101/qwertz/punto/tasti muti esclusi)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Ungherese (102/qwerty/virgola/tasti muti)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Ungherese (102/qwerty/virgola/tasti muti esclusi)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Ungherese (102/qwerty/punto/tasti muti)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Ungherese (102/qwerty/punto/tasti muti esclusi)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Ungherese (102/qwertz/virgola/tasti muti)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Ungherese (102/qwertz/virgola/tasti muti esclusi)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Ungherese (102/qwertz/punto/tasti muti)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Ungherese (102/qwertz/punto/tasti muti esclusi)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Ungherese (tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (qwerty)"
 msgstr "Ungherese (qwerty)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (standard)"
 msgstr "Ungherese (standard)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:392
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper è applicato ai tasti 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"
 
 # UE
-#: ../rules/base.xml.in.h:390
+#: ../rules/base.xml.in.h:399
 msgid "Icelandic"
 msgstr "Islandese"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:400
 msgid "Icelandic (Dvorak)"
 msgstr "Islandese (Dvorak)"
 
 # UE
-#: ../rules/base.xml.in.h:392
-msgid "Icelandic (Mac)"
-msgstr "Islandese (Mac)"
+#: ../rules/base.xml.in.h:401
+msgid "Icelandic (Macintosh)"
+msgstr "Islandese (Macintosh)"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islandese (tasti muti Sun)"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islandese (tasti muti rimossi)"
 
 # Igbo: variante Nigeria
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:404
 msgid "Igbo"
 msgstr "Igbo"
 
 # UE
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:405
 msgid "Indian"
 msgstr "Indiana"
 
 # Inuktitut: variante canadese
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:406
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
 # UE
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:407
 msgid "Iraqi"
 msgstr "Iracheno"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:408
 msgid "Irish"
 msgstr "Irlandese"
 
-#: ../rules/base.xml.in.h:400
-msgid "Irish (CloGaelach)"
-msgstr "Irlandese (CloGaelach)"
-
-#: ../rules/base.xml.in.h:401
-msgid "Irish (Ogham IS434)"
-msgstr "Irlandese (Ogham IS434)"
-
-#: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
-msgstr "Irlandese (Ogham)"
-
 # Sarà da tradurre? -Luca
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:409
 msgid "Irish (UnicodeExpert)"
 msgstr "Irlandese (UnicodeExpert)"
 
 # UE
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:410
 msgid "Italian"
 msgstr "Italiana"
 
-# Curiosamente è una variante delle tastiere italiane...
-#: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
-msgstr "Italiana (georgiana)"
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
-msgstr "Italiana (Mac)"
+#: ../rules/base.xml.in.h:411
+msgid "Italian (Macintosh)"
+msgstr "Italiana (Macintosh)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:412
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Italiana (tastiera USA con lettere italiane)"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:413
 msgid "Italian (eliminate dead keys)"
 msgstr "Italiana (tasti muti rimossi)"
 
 # UE
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:414
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:415
 msgid "Japanese (Kana 86)"
 msgstr "Giapponese (Kana 86)"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:416
 msgid "Japanese (Kana)"
 msgstr "Giapponese (Kana)"
 
-#: ../rules/base.xml.in.h:412
-msgid "Japanese (Mac)"
-msgstr "Giapponese (Mac)"
+#: ../rules/base.xml.in.h:417
+msgid "Japanese (Macintosh)"
+msgstr "Giapponese (Macintosh)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (OADG 109A)"
 msgstr "Giapponese (OADG 109A)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (PC-98xx Series)"
-msgstr "Giappone (serie PC-98xx)"
+msgstr "Giapponese (serie PC-98xx)"
 
 # optionList: japan
 # descrizione:
@@ -1817,2211 +1843,2355 @@ msgstr "Giappone (serie PC-98xx)"
 #  <b>Japanese keyboard options</b>
 #   [*] Kana Lock key is locking
 #   [ ] NICOLA-F style Backspace
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:420
 msgid "Japanese keyboard options"
 msgstr "Opzioni tastiera giapponese"
 
-#: ../rules/base.xml.in.h:416
+# variante russa, in iso639 è XAL
+#: ../rules/base.xml.in.h:421
+msgid "Kalmyk"
+msgstr "Kalmyk"
+
+#: ../rules/base.xml.in.h:422
 msgid "Kana Lock key is locking"
 msgstr "Il tasto Kana Lock sta bloccando"
 
 # variante india
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:423
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../rules/base.xml.in.h:418
+# Kashubian: variante polonia
+#: ../rules/base.xml.in.h:424
+msgid "Kashubian"
+msgstr "Casciuba"
+
+#: ../rules/base.xml.in.h:425
 msgid "Kazakh"
 msgstr "Kazaka"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:426
 msgid "Kazakh (with Russian)"
 msgstr "Kazaka (con russo)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:427
 msgid "Key sequence to kill the X server"
 msgstr "Sequenza di tasti per terminare il server X"
 
 # optionList: lv3
 # descrizione: The key combination used to choose the 3rd (and 4th, together
 #              with Shift) level of symbols
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:428
 msgid "Key to choose 3rd level"
 msgstr "Tasto per scegliere il terzo livello"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:429
 msgid "Key to choose 5th level"
 msgstr "Tasto per scegliere il quinto livello"
 
 # optionList: grp
 # descrizione: The key combination used to switch between groups
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:430
 msgid "Key(s) to change layout"
 msgstr "Tasto o tasti per cambiare disposizione"
 
-#: ../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 (cambogiana)"
+#: ../rules/base.xml.in.h:432
+msgid "Khmer (Cambodia)"
+msgstr "Khmer (Cambogia)"
 
 # variante tastiera kenya
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:433
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
 # nome di modello
-#: ../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 "Coreana"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Korean (101/104 key compatible)"
 msgstr "Coreana (compatibile 101/104 tasti)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Curda (Iran, arabo-latina)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Kurdish (Iran, F)"
 msgstr "Curda (Iran, F)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Curda (Iran, latina Alt-Q)"
+
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Curda (Iran, latina Q)"
 
-# FIXME le altre sono Alt
-#: ../rules/base.xml.in.h:433
-msgid "Kurdish (Iran, latin alt-Q)"
-msgstr "Curda (Iran, latina alt-Q)"
-
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Curda (Iraq, arabo-latina)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iraq, F)"
 msgstr "Curda (Iraq, F)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Curda (Iraq, latina Alt-Q)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Curda (Iraq, latina Q)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Syria, F)"
 msgstr "Curda (Siria, F)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Curda (Siria, latina Alt-Q)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Curda (Siria, latina Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Turkey, F)"
 msgstr "Curda (Turchia, F)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Curda (Turchia, latina Alt-Q)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Curda (Turchia, latina Q)"
 
-#: ../rules/base.xml.in.h:444
-msgid "Kutenai"
-msgstr "Kutenai"
-
 # UE
-#: ../rules/base.xml.in.h:445
+#: ../rules/base.xml.in.h:452
 msgid "Kyrgyz"
 msgstr "Kirghiza"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:453
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirghiza (fonetica)"
 
-#: ../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 (disposizione standard proposta STEA)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:456
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Compaq Laptop tastiera per portatile (es. Armada)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:457
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Compaq Internet Keyboard per portatile (es. Presario)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:458
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Portatile eMachines m68xx"
 
 # UE
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
 msgid "Latvian"
 msgstr "Lettone"
 
-#: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
-msgstr "Lettone (variante apostrofo ')"
-
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:460
 msgid "Latvian (F variant)"
 msgstr "Lettone (variante F)"
 
-#: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
-msgstr "Lettone (variante tilde ~)"
+#: ../rules/base.xml.in.h:461
+msgid "Latvian (adapted)"
+msgstr "Lettone (adattata)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:462
+msgid "Latvian (apostrophe variant)"
+msgstr "Lettone (variante apostrofo)"
+
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Lettone (ergonomica, ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:464
+msgid "Latvian (modern)"
+msgstr "Lettone (moderna)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "Lettone (variante tilde)"
+
+#: ../rules/base.xml.in.h:466
 msgid "Left Alt"
 msgstr "Alt sinistro"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:467
 msgid "Left Alt (while pressed)"
 msgstr "Alt sinistro (mentre è premuto)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:468
 msgid "Left Alt is swapped with Left Win"
 msgstr "Alt sinistro è scambiato con Win sinistro"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:469
 msgid "Left Ctrl"
 msgstr "Ctrl sinistro"
 
-#: ../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 sinistro (per prima disposizione), Ctrl destro (per ultima disposizione)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:471
 msgid "Left Ctrl+Left Shift"
 msgstr "Ctrl sinistro+Maiusc sinistro"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:472
 msgid "Left Shift"
 msgstr "Maiusc sinistro"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:473
 msgid "Left Win"
 msgstr "Win sinistro"
 
-#: ../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 sinistro (prima disposizione), Win/Menu destro (ultima disposizione)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:475
 msgid "Left Win (while pressed)"
 msgstr "Win sinistro (mentre è premuto)"
 
 # tasto per scegliere il quinto livello: |...|
-#: ../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 sinistro sceglie il quinto livello, blocca quando premuto assieme a un altro selettore del quinto livello"
 
 # tasto per scegliere il quinto livello: |...|
-#: ../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 sinistro sceglie il quinto livello, blocca quando premuto assieme a un altro selettore del quinto livello, una pressione rilascia il blocco"
 
-#: ../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 sinistro + Win sinistro (per prima disposizione), Ctrl destro + Menu (per seconda disposizione)"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:479
 msgid "Legacy"
 msgstr "Vecchia maniera"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:480
 msgid "Legacy Wang 724"
 msgstr "Wang 724 vecchia maniera"
 
 #. 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 "Tasto vecchia maniera con virgola"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:483
 msgid "Legacy key with dot"
 msgstr "Tasto vecchia maniera con punto"
 
 # UE
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
 msgid "Lithuanian"
 msgstr "Lituana"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:485
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Lituana (IBM LST 1205-92)"
 
 # UE
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:486
 msgid "Lithuanian (LEKP)"
 msgstr "Lituana (LEKP)"
 
 # UE
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:487
 msgid "Lithuanian (LEKPa)"
 msgstr "Lituana (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:488
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Lituana (tastiera USA con lettere lituane)"
 
 # UE
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (standard)"
 msgstr "Lituana (standard)"
 
-#: ../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 (opzione 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 (opzione 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 "Tasti aggiuntivi Logitech attraverso G15daemon"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech tastiera generica"
 
-#: ../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 (modello 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
+# codice iso639: dsb
+# FIXME tradotto come in iso-codes, ma inferiore nun se po' vede...
+#: ../rules/base.xml.in.h:514
+msgid "Lower Sorbian"
+msgstr "Soraba inferiore"
+
+# FIXME tradotto come in iso-codes, ma inferiore nun se po' vede...
+#: ../rules/base.xml.in.h:515
+msgid "Lower Sorbian (qwertz)"
+msgstr "Soraba inferiore (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 "Macedone"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:519
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macedone (tasti muti rimossi)"
 
-#: ../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 "Rendere BlocMaiusc un Backspace aggiuntivo"
 
-#: ../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 "Rendere BlocMaiusc un Control aggiuntivo, ma mantiente il keysym Caps_Lock"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:524
 msgid "Make Caps Lock an additional Ctrl"
 msgstr "Rendere BlocMaiusc un Ctrl aggiuntivo"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:525
 msgid "Make Caps Lock an additional ESC"
 msgstr "Rendere BlocMaiusc un ESC aggiuntivo"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Rendere BlocMaiusc un Hyper aggiuntivo"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Rendere BlocMaiusc un BlocNum aggiuntivo"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional Super"
 msgstr "Rendere BlocMaiusc un Super aggiuntivo"
 
-#: ../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 "Malayalam (inscript migliorato con simbolo Rupia)"
 
 # UE
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:532
 msgid "Maltese"
 msgstr "Maltese"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:533
 msgid "Maltese (with US layout)"
 msgstr "Maltese (con disposizione USA)"
 
-#: ../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 Keyboard"
 
-#: ../rules/base.xml.in.h:524
+#: ../rules/base.xml.in.h:538
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
 # il tasto Menu
-#: ../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 è applicato al tasto Win sinistro"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:541
 msgid "Meta is mapped to Win keys"
 msgstr "Meta è applicato ai tasti Win"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:542
 msgid "Meta on Left Ctrl"
 msgstr "Meta su Ctrl sinistro"
 
-#: ../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, svedese"
 
-#: ../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"
 
 # optionList: (vari)
 # descrizione: (nessuna)
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:555
 msgid "Miscellaneous compatibility options"
 msgstr "Opzioni varie di compatibilità"
 
-#: ../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 "Montenegrina"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:558
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Montenegrina (cirillico con caporali)"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:559
 msgid "Montenegrin (Cyrillic)"
 msgstr "Montenegrina (cirillico)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Montenegrina (cirillico, Z e ZHE scambiati)"
 
-#: ../rules/base.xml.in.h:547
-msgid "Montenegrin (Latin qwerty)"
-msgstr "Montenegrina (latina qwerty)"
+#: ../rules/base.xml.in.h:561
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Montenegrina (latina Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:548
-msgid "Montenegrin (Latin unicode qwerty)"
-msgstr "Montenegrina (latina unicode qwerty)"
+#: ../rules/base.xml.in.h:562
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Montenegrina (latina Unicode)"
 
-#: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
-msgstr "Montenegrina (latina unicode)"
+#: ../rules/base.xml.in.h:563
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Montenegrina (latina qwerty)"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Montenegrina (latina con caporali)"
 
-#: ../rules/base.xml.in.h:551
-msgid "Māori"
-msgstr "Māori"
-
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:565
 msgid "NICOLA-F style Backspace"
 msgstr "Backspace stile NICOLA-F"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:566
 msgid "Nepali"
 msgstr "Nepalese"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:567
 msgid "Non-breakable space character at fourth level"
 msgstr "Carattere Spazio non-interrompibile al quarto livello"
 
-#: ../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 "Carattere Spazio non-interrompibile al quarto livello, carattere Spazio sottile non-interrompibile al sesto livello"
 
-#: ../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 "Carattere Spazio non-interrompibile al quarto livello, carattere Spazio sottile non-interrompibile al sesto livello (attraverso Ctrl+Maiusc)"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at second level"
 msgstr "Carattere Spazio non-interrompibile al secondo livello"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at third level"
 msgstr "Carattere Spazio non-interrompibile al terzo livello"
 
-#: ../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 "Carattere Spazio non-interrompibile al terzo livello, niente al quarto livello"
 
-#: ../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 "Carattere Spazio non-interrompibile al terzo livello, carattere Spazio sottile non-interrompibile al quarto livello"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:574
+msgid "Northern Saami (Finland)"
+msgstr "Saami settentrionale (Finlandia)"
+
+#: ../rules/base.xml.in.h:575
+msgid "Northern Saami (Norway)"
+msgstr "Saami settentrionale (Norvegia)"
+
+#: ../rules/base.xml.in.h:576
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Saami settentrionale (Norvegia, tasti muti rimossi)"
+
+#: ../rules/base.xml.in.h:577
+msgid "Northern Saami (Sweden)"
+msgstr "Saami settentrionale (Svezia)"
+
+#: ../rules/base.xml.in.h:578
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
 # Curiosamente è una variante delle tastiere italiane...
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:579
 msgid "Norwegian"
 msgstr "Norvegese"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:580
 msgid "Norwegian (Dvorak)"
 msgstr "Norvegese (Dvorak)"
 
-#: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
-msgstr "Norvegese (Mac)"
-
-#: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
-msgstr "Norvegese (Mac, tasti muti rimossi)"
+#: ../rules/base.xml.in.h:581
+msgid "Norwegian (Macintosh)"
+msgstr "Norvegese (Macintosh)"
 
-# FIXME missing )
-#: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
-msgstr "Norvegese (saami settentrinale)"
+#: ../rules/base.xml.in.h:582
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Norvegese (Macintosh, tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norvegese (tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:568
-msgid "Norwegian (northern Saami, eliminate dead keys)"
-msgstr "Norvegese (saami settentrionale, tasti muti rimossi)"
-
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:584
 msgid "Num Lock"
 msgstr "BlocNum"
 
 # optionList: kpdl
 # descrizione: Select a keypad KPDL key variant
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:585
 msgid "Numeric keypad delete key behaviour"
 msgstr "Comportamento tasto Canc su tastierino numerico"
 
-#: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
-msgstr "I tasti del tastierino numerico operano come nei Mac"
+#: ../rules/base.xml.in.h:586
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "I tasti del tastierino numerico operano come nei Macintosh"
 
 # optionList: keypad
 # descrizione: Select a keypad type
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:587
 msgid "Numeric keypad layout selection"
 msgstr "Selezione disposizione tastierino numerico"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:588
 msgid "OLPC"
 msgstr "OLPC"
 
+# variante francese
+#: ../rules/base.xml.in.h:589
+msgid "Occitan"
+msgstr "Occitana"
+
+# Variante irlandese
+#: ../rules/base.xml.in.h:590
+msgid "Ogham"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:591
+msgid "Ogham (IS434)"
+msgstr "Ogham (IS434)"
+
 # variante bangladesh
-#: ../rules/base.xml.in.h:574
+#: ../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 "Ortek MCK-800 MM/Internet keyboard"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:594
+msgid "Ossetian (Georgia)"
+msgstr "Osseta (Georgia)"
+
+#: ../rules/base.xml.in.h:595
+msgid "Ossetian (WinKeys)"
+msgstr "Osseta (tasti win)"
+
+#: ../rules/base.xml.in.h:596
+msgid "Ossetian (legacy)"
+msgstr "Osseta (vecchia maniera)"
+
+#: ../rules/base.xml.in.h:597
 msgid "PC-98xx Series"
 msgstr "Serie PC-98xx"
 
-#: ../rules/base.xml.in.h:577
+# http://it.wikipedia.org/wiki/Lingua_rutena
+#: ../rules/base.xml.in.h:598
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Rutena pannonica (omofonica)"
+
+#: ../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 (Afghanistan, OLPC)"
 
 # posizione del tasto compose: |...|Pause
-#: ../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 "Persiana"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:603
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Persiana (Afghanistan, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:604
 msgid "Persian (with Persian Keypad)"
 msgstr "Persiana (con tastierino numerico persiano)"
 
-#: ../rules/base.xml.in.h:583
-msgid "Philippines - Dvorak (Baybayin)"
-msgstr "Filippine - Dvorak (Baybayin)"
-
 # variante canadese
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
 msgid "Polish"
 msgstr "Polacca"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:606
 msgid "Polish (Dvorak)"
 msgstr "Polacca (Dvorak)"
 
 # variante polacca
-#: ../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 "Polacca (Dvorak, virgolette polacche sul tasto 1)"
 
 # da controllare..
-#: ../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 "Polacca (Dvorak, virgolette polacche sul tasto quotemark)"
 
-# Kashubian: variante polonia
-#: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
-msgstr "Polacca (Kashubian)"
-
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:609
 msgid "Polish (programmer Dvorak)"
 msgstr "Polacca (Dvorak per programmatori)"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:610
 msgid "Polish (qwertz)"
 msgstr "Polacca (qwertz)"
 
 # UE
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:611
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:612
 msgid "Portuguese (Brazil)"
 msgstr "Portoghese (Brasile)"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:613
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portoghese (Brasile, Dvorak)"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portoghese (Brasile, tasti muti rimossi)"
 
 # variante brasiliana
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portoghese (Brasile, nativa per Esperanto)"
 
 # variante brasiliana
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portoghese (Brasile, nativa per tastiere USA)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portoghese (Brasile, nativa)"
 
-#: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
-msgstr "Portoghese (Mac)"
-
-#: ../rules/base.xml.in.h:599
-msgid "Portuguese (Mac, Sun dead keys)"
-msgstr "Portoghese (Mac, tasti muti Sun)"
+#: ../rules/base.xml.in.h:618
+msgid "Portuguese (Macintosh)"
+msgstr "Portoghese (Macintosh)"
 
-#: ../rules/base.xml.in.h:600
-msgid "Portuguese (Mac, eliminate dead keys)"
-msgstr "Portoghese (Mac, tasti muti rimossi)"
+#: ../rules/base.xml.in.h:619
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portoghese (Macintosh, tasti muti Sun)"
 
-# variante brasiliana
-#: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr "Portoghese (nativa per Esperanto)"
+#: ../rules/base.xml.in.h:620
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Portoghese (Macintosh, tasti muti rimossi)"
 
 # variante brasiliana
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portoghese (nativa per tastiere USA)"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Nativo)"
 msgstr "Portoghese (nativa)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portoghese (tasti muti Sun)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portoghese (tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:606
+#: ../rules/base.xml.in.h:625
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
 # Posizione del tasto compose: |...|
 # nelle tastiere italiane è Stamp
-#: ../rules/base.xml.in.h:607
+#: ../rules/base.xml.in.h:626
 msgid "PrtSc"
 msgstr "Stamp"
 
 # Gurmukhi: variante india
-#: ../rules/base.xml.in.h:608
+#: ../rules/base.xml.in.h:627
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr "Punjabi (Gurmukhi Jhelum)"
 
 # Gurmukhi: variante india
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:628
 msgid "Punjabi (Gurmukhi)"
 msgstr "Punjabi (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 destro"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:631
 msgid "Right Alt (while pressed)"
 msgstr "Alt destro (mentre è premuto)"
 
 # tasto per scegliere il quinto livello: |...|
-#: ../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 destro sceglie il quinto livello e attiva level5-Lock quando premuto assieme a un altro selettore del quinto livello, una pressione rilascia il blocco"
 
 # tasto per scegliere il quinto livello: |...|
-#: ../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 destro sceglie il quinto livello, blocca quando premuto assieme a un altro selettore del quinto livello"
 
 # tasto per scegliere il quinto livello: |...|
-#: ../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 destro sceglie il quinto livello, blocca quando premuto assieme a un altro selettore del quinto livello, una pressione rilascia il blocco"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:635
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Il tasto Alt destro non sceglie mai il terzo livello"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Alt destro, il tasto Maiusc+Alt destro è Multi_Key"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:637
 msgid "Right Ctrl"
 msgstr "Ctrl destro"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:638
 msgid "Right Ctrl (while pressed)"
 msgstr "Ctrl destro (mentre è premuto)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:639
 msgid "Right Ctrl as Right Alt"
 msgstr "Ctrl destro come Alt destro"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:640
 msgid "Right Ctrl is mapped to Menu"
 msgstr "Ctrl destro è applicato a Menu"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl+Right Shift"
 msgstr "Ctrl destro + Maiusc destro"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:642
 msgid "Right Shift"
 msgstr "Maiusc destro"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:643
 msgid "Right Win"
 msgstr "Win destro"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:644
 msgid "Right Win (while pressed)"
 msgstr "Win destro (mentre è premuto)"
 
 # tasto per scegliere il quinto livello: |...|<
-#: ../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 destro sceglie il quinto livello, blocca quando premuto assieme a un altro selettore del quinto livello"
 
 # tasto per scegliere il quinto livello: |...|
-#: ../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 destro sceglie il quinto livello, blocca quando premuto assieme a un altro selettore del quinto livello, una pressione rilascia il blocco"
 
 # UE
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
 msgid "Romanian"
-msgstr "Romeno"
-
-# variante rumena
-#: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr "Romena (tatar crimea Dobruca-1 Q)"
-
-#: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr "Romena (tatar crimea Dobruca-2 Q)"
+msgstr "Rumena"
 
-#: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Romena (tatar crimea turca Alt-Q)"
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (Germany)"
+msgstr "Rumena (Germania)"
 
-#: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
-msgstr "Romena (tatar crimea turca F)"
+#: ../rules/base.xml.in.h:649
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Rumena (Germania, tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:650
 msgid "Romanian (WinKeys)"
-msgstr "Romena (tasti Win)"
+msgstr "Rumena (tasti Win)"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (cedilla)"
-msgstr "Romena (cediglia)"
+msgstr "Rumena (cediglia)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (standard cedilla)"
-msgstr "Romena (cediglia standard)"
+msgstr "Rumena (cediglia standard)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (standard)"
-msgstr "Romena (standard)"
+msgstr "Rumena (standard)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:654
 msgid "Rupee on 4"
 msgstr "Rupia sul 4"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
 msgid "Russian"
 msgstr "Russa"
 
-# Variante russa http://it.wikipedia.org/wiki/Baschiri
-#: ../rules/base.xml.in.h:639
-msgid "Russian (Bashkirian)"
-msgstr "Russa (baschira)"
-
-# variante russa
-#: ../rules/base.xml.in.h:640
-msgid "Russian (Chuvash Latin)"
-msgstr "Russa (latina chuvash)"
-
-#: ../rules/base.xml.in.h:641
-msgid "Russian (Chuvash)"
-msgstr "Russa (chuvash)"
-
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:656
 msgid "Russian (DOS)"
 msgstr "Russa (DOS)"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:657
 msgid "Russian (Georgia)"
 msgstr "Russa (Georgia)"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:658
 msgid "Russian (Germany, phonetic)"
 msgstr "Russa (Germania, fonetica)"
 
-#: ../rules/base.xml.in.h:645
-msgid "Russian (Kalmyk)"
-msgstr "Russa (kalmyk)"
-
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:659
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Russa (Kazakistan, con kazaco)"
 
-#: ../rules/base.xml.in.h:647
-msgid "Russian (Komi)"
-msgstr "Russa (komi)"
-
-#: ../rules/base.xml.in.h:648
-msgid "Russian (Mari)"
-msgstr "Russa (mari)"
-
-#: ../rules/base.xml.in.h:649
-msgid "Russian (Ossetian, WinKeys)"
-msgstr "Russa (osseta, tasti win)"
-
-#: ../rules/base.xml.in.h:650
-msgid "Russian (Ossetian, legacy)"
-msgstr "Russa (osseta, vecchia maniera)"
-
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Russa (Polonia, Dvorak fonetica)"
 
-#: ../rules/base.xml.in.h:652
-msgid "Russian (Serbian)"
-msgstr "Russa (serba)"
-
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Sweden, phonetic)"
 msgstr "Russa (svedese, fonetica)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Russa, (svedese, fonetica, tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:655
-msgid "Russian (Tatar)"
-msgstr "Russa (tatara)"
-
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:663
 msgid "Russian (US, phonetic)"
 msgstr "Russa (USA, fonetica)"
 
-#: ../rules/base.xml.in.h:657
-msgid "Russian (Udmurt)"
-msgstr "Russa(udmurta)"
-
-#: ../rules/base.xml.in.h:658
-msgid "Russian (Yakut)"
-msgstr "Russa (yakutia)"
+#: ../rules/base.xml.in.h:664
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Russa (Ucraina, RSTU standard)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:665
 msgid "Russian (legacy)"
 msgstr "Russa (vecchia maniera)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:666
 msgid "Russian (phonetic WinKeys)"
 msgstr "Russa (fonetica tasti win)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:667
 msgid "Russian (phonetic)"
 msgstr "Russa (fonetica)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:668
 msgid "Russian (typewriter)"
 msgstr "Russa (macchina per scrivere)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:669
 msgid "Russian (typewriter, legacy)"
 msgstr "Russa (macchina per scrivere, vecchia maniera)"
 
-#: ../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 (Taiwan)"
 
-#: ../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 "BlocScorr"
 
-# variante canadese
-# No ISO code in ISO639-2, only draft ISO693-3
-#: ../rules/base.xml.in.h:676
-msgid "Secwepemctsin"
-msgstr "Secwepemctsin"
-
 # parte di Numeric keypad delete key behaviour
 # vedi descrizione compelta in altro commento
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:682
 msgid "Semi-colon on third level"
 msgstr "Punto e virgola sul terzo livello"
 
-#: ../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 Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin Unicode)"
 msgstr "Serba (latina Unicode)"
 
-#: ../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 con caporali)"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin)"
 msgstr "Serba (latina)"
 
-# http://it.wikipedia.org/wiki/Lingua_rutena
-#: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr "Serba (rutena pannonica omofonica)"
+#: ../rules/base.xml.in.h:689
+msgid "Serbian (Russia)"
+msgstr "Serba (Russia)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Serba (Z e ZHE scambiati)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (with guillemets)"
 msgstr "Serba (con caporali)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:692
 msgid "Serbo-Croatian (US)"
 msgstr "Serbo-croata (USA)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:693
 msgid "Shift cancels Caps Lock"
 msgstr "Maiusc annulla BlocMaiusc"
 
-#: ../rules/base.xml.in.h:689
+#: ../rules/base.xml.in.h:694
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr "Maiusc non annulla BlocNum, invece sceglie il terzo livello"
 
-#: ../rules/base.xml.in.h:690
+#: ../rules/base.xml.in.h:695
 msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr "Maiusc con i tasti del tastierino numerico opera come in MS Windows"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:696
 msgid "Shift+Caps Lock"
 msgstr "Maiusc+BlocMaiusc"
 
 # variante pakistana
-#: ../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 "Singalese"
 
 # UE
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:699
 msgid "Slovak"
 msgstr "Slovacca"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:700
 msgid "Slovak (extended Backslash)"
 msgstr "Slovacca (backslash esteso)"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:701
 msgid "Slovak (qwerty)"
 msgstr "Slovacca (qwerty)"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:702
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Slovacca (qwerty, backslash esteso)"
 
 # UE
-#: ../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 (tastiera USA con lettere slovene)"
 
-#: ../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 (usa caporali per virgolette)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:706
 msgid "Spanish"
 msgstr "Spagnola"
 
-# punto sottoscritto stando a http://it.wikipedia.org/wiki/Diacritico
-# Grazie a Daniele Forsi
-#
-#: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr "Spagnola (cariante asturiana con H punto sottoscritto e L punto sottoscritto)"
-
-# FIXME... trovare traduzione middle-dot
-#: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr "Spagnola (variante catalana con L middle-dot)"
-
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Spanish (Dvorak)"
 msgstr "Spagnola (Dvorak)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Spanish (Latin American)"
 msgstr "Spagnola (latino americana)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Spagnola (latino americana, tasti muti Sun)"
+
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Spagnola (latino americana, tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Spagnola (latino americana, tilde muta inclusa)"
 
-#: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, sun dead keys)"
-msgstr "Spagnola (latino americana, tasti muti Sun)"
-
-#: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
-msgstr "Spagnola (Mac)"
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Macintosh)"
+msgstr "Inglese (Macintosh )"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Sun dead keys)"
 msgstr "Spagnola (tasti muti Sun)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (eliminate dead keys)"
 msgstr "Spagnola (tasti muti rimossi)"
 
 # variante LatAm
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (include dead tilde)"
 msgstr "Spagnola (tilde muta inclusa)"
 
-#: ../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 "Tasti speciali (Ctrl+Alt+&lt;tasto&gt;) gestiti in un server"
 
-#: ../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 "Swahili (Kenya)"
 
-#: ../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 "Scambiare Ctrl e BlocMaiusc"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swap ESC and Caps Lock"
 msgstr "Scambiare ESC e BlocMaiusc"
 
 # UE
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swedish (Dvorak)"
 msgstr "Svedese (Dvorak)"
 
-#: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
-msgstr "Svedese (Mac)"
+#: ../rules/base.xml.in.h:725
+msgid "Swedish (Macintosh)"
+msgstr "Svedese (Macintosh)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish (Svdvorak)"
 msgstr "Svedese (Svdvorak)"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (eliminate dead keys)"
 msgstr "Svedese (tasti muti rimossi)"
 
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
-msgstr "Svedese (saami settentrinale)"
-
-#: ../rules/base.xml.in.h:726
-msgid "Swiss"
-msgstr "Svizzera"
-
-#: ../rules/base.xml.in.h:727
-msgid "Swiss (legacy)"
-msgstr "Svizzera (vecchia maniera)"
-
 #: ../rules/base.xml.in.h:728
+msgid "Swedish Sign Language"
+msgstr "Linguaggio segni svedese"
+
+#: ../rules/base.xml.in.h:729
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
 # L'aggettivo per Siria in iglese EU sarebbe Syrian
 #
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:730
 msgid "Syriac"
 msgstr "Siriana"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:731
 msgid "Syriac (phonetic)"
 msgstr "Siriana (fonetica)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:732
 msgid "Taiwanese"
 msgstr "Taiwanese"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:733
 msgid "Taiwanese (indigenous)"
 msgstr "Taiwanese (indigena)"
 
 # UE
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:734
 msgid "Tajik"
 msgstr "Tagika"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:735
 msgid "Tajik (legacy)"
 msgstr "Tagika (vecchia maniera)"
 
-#: ../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 macchina per scrivere)"
 
-#: ../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 (Sri Lanka, TAB macchina per scrivere)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamil (TSCII macchina per scrivere)"
 
-#: ../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 (tastiera con numeri)"
 
-#: ../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
+# variante russa, come lingua stado a iso639 sarebbe tatarico
+#: ../rules/base.xml.in.h:744
+msgid "Tatar"
+msgstr "Tatar"
+
+#: ../rules/base.xml.in.h:745
 msgid "Telugu"
 msgstr "Telegu"
 
 # UE
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
 msgid "Thai"
 msgstr "Thai"
 
 # Variante tailandese
-#: ../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 "Tibetana"
+
+#: ../rules/base.xml.in.h:750
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetana (con numeri ASCII)"
+
+#: ../rules/base.xml.in.h:751
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Al tasto corrispondente in una tastiera Dvorak."
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:752
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Al tasto corrispondente in una tastiera Qwerty."
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:753
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Commuta i PointerKey con Maiusc + BlocNum"
 
-#: ../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"
 
 # UE
-#: ../rules/base.xml.in.h:754
+#: ../rules/base.xml.in.h:758
 msgid "Tswana"
 msgstr "Tswana"
 
 # non controllato su UE
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:759
 msgid "Turkish"
 msgstr "Turca"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:760
 msgid "Turkish (Alt-Q)"
 msgstr "Turca (Alt-Q)"
 
-#: ../rules/base.xml.in.h:757
-msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
-msgstr "Turca (Tatar crimea turca Alt-Q)"
-
-#: ../rules/base.xml.in.h:758
-msgid "Turkish (Crimean Tatar Turkish F)"
-msgstr "Turca (Tatar crimea turca F)"
-
-#: ../rules/base.xml.in.h:759
-msgid "Turkish (Crimean Tatar Turkish Q)"
-msgstr "Turca (Tatar crimea turca Q)"
-
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:761
 msgid "Turkish (F)"
 msgstr "Turca (F)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:762
 msgid "Turkish (Sun dead keys)"
 msgstr "Turca (tasti muti Sun)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (international with dead keys)"
 msgstr "Turca (internazionale con tasti muti)"
 
-#: ../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 (modalità 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 (modalità 106:JP)"
 
-# UE
-#: ../rules/base.xml.in.h:770
-msgid "Ukrainian"
-msgstr "Ucraina"
-
+# variante russa
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Ucraina (tatar crimea turca Alt-Q)"
+msgid "Udmurt"
+msgstr "Udmurt"
 
+# UE
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "Ucraina (tatar crimea turca F)"
+msgid "Ukrainian"
+msgstr "Ucraina"
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "Ucraina (tatar crimea turca Q)"
-
-#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (WinKeys)"
 msgstr "Ucraina (tasti win)"
 
 # http://it.wikipedia.org/wiki/Lingua_rutena
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (homophonic)"
 msgstr "Ucraina (omofonica)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (legacy)"
 msgstr "Ucraina (vecchia maniera)"
 
 # variante bulgara
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (phonetic)"
 msgstr "Ucraina (fonetica)"
 
-#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr "Ucraina (RSTU standard su disposizione russa)"
-
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ucraina (RSTU standard)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (typewriter)"
 msgstr "Ucraina (macchina per scrivere)"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:779
 msgid "Unicode additions (arrows and math operators)"
-msgstr "Aggiunte unicode (frecce e operatori matematici)"
+msgstr "Aggiunte Unicode (frecce e operatori matematici)"
 
-#: ../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 "Aggiunte unicode (frecce e operatori matematici). Operatori matematici sul livello predefinito"
+msgstr "Aggiunte Unicode (frecce e operatori matematici). Operatori matematici sul livello predefinito"
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:781
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
 # UE
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:782
 msgid "Urdu (Pakistan)"
 msgstr "Urdu (Pakistan)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:783
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:784
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (tasti Win)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (fonetica alternativa)"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (phonetic)"
 msgstr "Urdu (fonetica)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:788
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Usare i LED della tastiera per mostrare il gruppo alternativo"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:789
 msgid "Using space key to input non-breakable space character"
 msgstr "Uso del tasto Spazio per inserire carattere di spazio non-interrompibile"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:790
 msgid "Usual space at any level"
 msgstr "Solito Spazio a ogni livello"
 
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "Uyghura"
+
 # UE
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:792
 msgid "Uzbek"
 msgstr "Uzbeka"
 
 # UE
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:793
 msgid "Uzbek (Afghanistan)"
 msgstr "Uzbeka (Afghanistan)"
 
 # UE
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:794
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Uzbeka (Afghanistan, OLPC)"
 
-#: ../rules/base.xml.in.h:796
-msgid "Uzbek (Crimean Tatar Turkish Alt-Q)"
-msgstr "Uzbeka  (tatar crimea turca Alt-Q)"
-
-#: ../rules/base.xml.in.h:797
-msgid "Uzbek (Crimean Tatar Turkish F)"
-msgstr "Uzbeka  (tatar crimea turca F)"
-
-#: ../rules/base.xml.in.h:798
-msgid "Uzbek (Crimean Tatar Turkish Q)"
-msgstr "Uzbeka  (tatar crimea turca Q)"
-
 # UE
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek (Latin)"
 msgstr "Uzbeka (latina)"
 
 # UE
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:796
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: ../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 "Tastierino Wang 724 con aggiunte unicode (frecce e operatori matematici)"
+#: ../rules/base.xml.in.h:798
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+msgstr "Tastierino Wang 724 con aggiunte Unicode (frecce e operatori matematici)"
 
-#: ../rules/base.xml.in.h:803
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Tastierino Wang 724 con aggiunte unicode (frecce e operatori matematici). Operatori matematici sul livello predefinito"
+#: ../rules/base.xml.in.h:799
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"
+msgstr "Tastierino Wang 724 con aggiunte Unicode (frecce e operatori matematici). Operatori matematici sul livello predefinito"
 
-#: ../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
+# http://it.wikipedia.org/wiki/Yakuto
+#: ../rules/base.xml.in.h:803
+msgid "Yakut"
+msgstr "Jacuta"
+
+#: ../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 "Spazio non di unione a larghezza nulla al secondo livello"
 
-#: ../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 "Spazio non di unione a larghezza nulla al secondo livello, Spazio non-interrompibile al terzo livello"
 
-#: ../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 "Spazio non di unione a larghezza nulla al secondo livello, Spazio non-interrompibile al terzo livello, niente al quarto livello"
 
-#: ../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 "Spazio non di unione a larghezza nulla al secondo livello, Spazio non-interrompibile al terzo livello, Spazio sottile non-interrompibile al quarto livello"
 
-#: ../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 "Spazio non di unione a larghezza nulla al secondo livello, Spazio non-interrompibile al terzo livello, Spazio di unione a larghezza nulla al quarto livello"
 
-#: ../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 "Spazio non di unione a larghezza nulla al secondo livello, Spazio di unione a larghezza nulla al terzo livello"
 
-#: ../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 "Spazio non di unione a larghezza nulla al secondo livello, Spazio di unione a larghezza nulla al terzo livello, Spazio non-interrompibile al quarto livello"
 
-#: ../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 "Spazio non di unione a larghezza nulla al terzo livello, Spazio di unione a larghezza nulla al quarto livello"
 
-#: ../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"
 
 # shortDesc per Kazakistan
-#: ../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"
 
 # Braille, shortDesc
-#: ../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"
 
-# codice tre lettere per la svizzera
-#: ../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"
+
+# codice tre lettere per la svizzera
+#: ../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"
 
 # codice tre lettere per maldive
-#: ../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"
 
 # codice tre lettere per Kenia
-#: ../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"
 
 # codice tre lettere per Nigeria
-#: ../rules/base.xml.in.h:846
+#: ../rules/base.xml.in.h:844
 msgid "gaa"
 msgstr "gaa"
 
 # codice tre lettere per bulgaria
-#: ../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"
 
 # shortDesc per Ghana, usato codice ISO
-#: ../rules/base.xml.in.h:849
+#: ../rules/base.xml.in.h:847
 msgid "ha"
 msgstr "ha"
 
 # codice tre lettere per la svizzera
-#: ../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"
 
 # variante bielorussa
-#: ../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"
 
-# codice tre lettere per iraq
-#: ../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"
 
 # codice tre lettere per sri lanka
-#: ../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"
 
 # variante per Ghana
-#: ../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"
 
 # codice tre lettere per malta
-#: ../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"
 
 # Komi: variante russa
-#: ../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"
 
 # shortDesc per corea del sud, usato codice iso
-#: ../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"
 
 # codice tre lettere per nepal
-#: ../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"
 
 # codice tre lettere per Isole Fær Øer
-#: ../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"
 
 # Codice tre lettere per islanda<
-#: ../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"
 
 # codice tre lettere per israele<
-#: ../rules/base.xml.in.h:897
+#: ../rules/base.xml.in.h:892 ../rules/base.extras.xml.in.h:45
 msgid "sr"
 msgstr "sr"
 
-# codice tre lettere per spagna
-#: ../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"
 
 # codice tre lettere per etiopia
-#: ../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"
 
 # codice 3 lettere per bhutan
-#: ../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"
 
-# codice 3 lettere per bhutan
-#: ../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"
 
-# layout a parte, sembrerebbe inglese
 #: ../rules/base.extras.xml.in.h:1
-msgid "APL"
-msgstr "APL"
+msgid "APL Keyboard Symbols"
+msgstr "Simboli tastiera APL"
 
-# UE
-#: ../rules/base.extras.xml.in.h:2
-msgid "Iran"
-msgstr "Iran"
+# No ISO code in ISO639-2, only draft ISO693-3
+# Atsina refers to the Gros Ventres tribe.
+# http://en.wikipedia.org/wiki/Atsina_(disambiguation)
+#: ../rules/base.extras.xml.in.h:4
+msgid "Atsina"
+msgstr "Atsina"
 
 # lingua iran nord orientale
 # http://it.wikipedia.org/wiki/Lingua_avestica
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr "Iran - Avestico"
-
-# UE
-#: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "Lituania"
-
-# UE
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
-msgstr "Lituania - Dvorak"
+msgid "Avestan"
+msgstr "Avestica"
 
-# codice tre lettere per lituania
+# http://en.wikipedia.org/wiki/Interior_Salish_languages
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "Ltu"
-
-# UE
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "Romania"
+msgid "Couer D'alene Salish"
+msgstr "Couer D'alene Salish"
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr "Romania - Touchtype ergonomica"
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Inglese (USA, combinazione Unicode AltGr internazionale)"
 
-# codice tre lettere per romania
 #: ../rules/base.extras.xml.in.h:9
-msgid "Rou"
-msgstr "Rou"
-
-# codice tre lettere per russia
-#: ../rules/base.extras.xml.in.h:10
-msgid "Rus"
-msgstr "Rus"
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "Inglese (USA, combinazione Unicode AltGr internazionale, alternativa)"
 
-# UE
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "Russia"
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
-msgstr "Serbia"
+msgid "Kutenai"
+msgstr "Kutenai"
 
-# variante serba
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
-msgstr "Serbia - Combinazione di accenti invece di tasti muti"
+msgid "Latvian (US Colemak)"
+msgstr "Lettone (Colemak USA)"
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
-msgstr "Srb"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Lettone (variante apostrofo)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "USA"
+msgid "Latvian (US Dvorak)"
+msgstr "Lettone (Dvorak USA)"
 
-# No ISO code in ISO639-2, only draft ISO693-3
-# Atsina refers to the Gros Ventres tribe.
-# http://en.wikipedia.org/wiki/Atsina_(disambiguation)
 #: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
-msgstr "USA - Atsina"
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Lettone (Dvorak USA, variante Y)"
 
-# http://en.wikipedia.org/wiki/Interior_Salish_languages
 #: ../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 "Lettone (Dvorak USA, variante meno)"
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
-msgstr "USA - Internazionale (combinazione Unicode AltGr)"
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Lettone (Dvorak USA per programmatori)"
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
-msgstr "USA - Internazionale (combinazione Unicode AltGr, alternativa)"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Lettone (Dvorak USA per programmatori, variante Y)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Lettone (Dvorak USA per programmatori, variante meno)"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Lituana (Dvorak USA con lettere lituane)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "Polacca (internazionale con tasti muti)"
+
+#: ../rules/base.extras.xml.in.h:27
+msgid "Romanian (ergonomic Touchtype)"
+msgstr "Rumena (Touchtype ergonomica)"
+
+#: ../rules/base.extras.xml.in.h:29
+msgid "Russian (with UKR and BEL layout)"
+msgstr "Russa (con disposizione UKR e BEL)"
+
+# variante canadese
+# No ISO code in ISO639-2, only draft ISO693-3
+#: ../rules/base.extras.xml.in.h:30
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+# variante serba
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "Serba (combinazione di accenti invece di tasti muti)"
+
+#: ../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 "Cinese (tibetana)"
+
+#~ msgid "Chinese (Uyghur)"
+#~ msgstr "Cinese (uyghur)"
+
+#~ msgid "Danish (Mac)"
+#~ msgstr "Danese (Mac)"
+
+#~ msgid "English (UK, Mac)"
+#~ msgstr "Inglese (UK, Mac)"
+
+#~ msgid "Finnish (Mac)"
+#~ msgstr "Finlandese (Mac)"
+
+#~ msgid "Finnish (northern Saami)"
+#~ msgstr "Finlandese (saami settentrinale)"
+
+#~ msgid "French (Occitan)"
+#~ msgstr "Francese (occitano)"
+
+# Codice tre lettere per U.K.
+#~ msgid "GBr"
+#~ msgstr "GBR"
+
+#~ msgid "German (Romanian keyboard with German letters)"
+#~ msgstr "Tedesca (tastiera rumena con lettere tedesche)"
+
+#~ msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
+#~ msgstr "Tedesca (tastiera rumena con lettere tedesche, tasti muti rimossi)"
+
+#~ msgid "Irish (Ogham)"
+#~ msgstr "Irlandese (Ogham)"
+
+# Curiosamente è una variante delle tastiere italiane...
+#~ msgid "Italian (Georgian)"
+#~ msgstr "Italiana (georgiana)"
+
+# FIXME le altre sono Alt
+#~ msgid "Kurdish (Iran, latin alt-Q)"
+#~ msgstr "Curda (Iran, latina alt-Q)"
+
+#~ msgid "Māori"
+#~ msgstr "Māori"
+
+# FIXME missing )
+#~ msgid "Norwegian (Northern Saami"
+#~ msgstr "Norvegese (saami settentrinale)"
+
+#~ msgid "Philippines - Dvorak (Baybayin)"
+#~ msgstr "Filippine - Dvorak (Baybayin)"
+
+# variante brasiliana
+#~ msgid "Portuguese (Nativo for Esperanto)"
+#~ msgstr "Portoghese (nativa per Esperanto)"
+
+#~ msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
+#~ msgstr "Romena (tatar crimea Dobruca-2 Q)"
+
+#~ msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Romena (tatar crimea turca Alt-Q)"
+
+#~ msgid "Romanian (Crimean Tatar Turkish F)"
+#~ msgstr "Romena (tatar crimea turca F)"
+
+#~ msgid "Russian (Chuvash)"
+#~ msgstr "Russa (chuvash)"
+
+#~ msgid "Russian (Kalmyk)"
+#~ msgstr "Russa (kalmyk)"
+
+#~ msgid "Russian (Komi)"
+#~ msgstr "Russa (komi)"
+
+#~ msgid "Russian (Mari)"
+#~ msgstr "Russa (mari)"
+
+#~ msgid "Russian (Ossetian, legacy)"
+#~ msgstr "Russa (osseta, vecchia maniera)"
+
+#~ msgid "Russian (Serbian)"
+#~ msgstr "Russa (serba)"
+
+#~ msgid "Russian (Tatar)"
+#~ msgstr "Russa (tatara)"
+
+#~ msgid "Russian (Udmurt)"
+#~ msgstr "Russa(udmurta)"
+
+#~ msgid "Russian (Yakut)"
+#~ msgstr "Russa (yakutia)"
+
+#~ msgid "Spanish (Mac)"
+#~ msgstr "Spagnola (Mac)"
+
+#~ msgid "Swedish (northern Saami)"
+#~ msgstr "Svedese (saami settentrinale)"
+
+#~ msgid "Swiss"
+#~ msgstr "Svizzera"
+
+#~ msgid "Swiss (legacy)"
+#~ msgstr "Svizzera (vecchia maniera)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Turca (Tatar crimea turca Alt-Q)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish F)"
+#~ msgstr "Turca (Tatar crimea turca F)"
+
+#~ msgid "Turkish (Crimean Tatar Turkish Q)"
+#~ msgstr "Turca (Tatar crimea turca Q)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Ucraina (tatar crimea turca Alt-Q)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish F)"
+#~ msgstr "Ucraina (tatar crimea turca F)"
+
+#~ msgid "Ukrainian (Crimean Tatar Turkish Q)"
+#~ msgstr "Ucraina (tatar crimea turca Q)"
+
+#~ msgid "Ukrainian (standard RSTU on Russian layout)"
+#~ msgstr "Ucraina (RSTU standard su disposizione russa)"
+
+# codice tre lettere per iraq
+#~ msgid "irq"
+#~ msgstr "irq"
+
+# codice tre lettere per spagna
+#~ msgid "srp"
+#~ msgstr "srp"
+
+# codice 3 lettere per bhutan
+#~ msgid "twn"
+#~ msgstr "twn"
+
+# layout a parte, sembrerebbe inglese
+#~ msgid "APL"
+#~ msgstr "APL"
+
+# UE
+#~ msgid "Iran"
+#~ msgstr "Iran"
+
+# UE
+#~ msgid "Lithuania"
+#~ msgstr "Lituania"
+
+# UE
+#~ msgid "Lithuania - Dvorak"
+#~ msgstr "Lituania - Dvorak"
+
+# codice tre lettere per lituania
+#~ msgid "Ltu"
+#~ msgstr "Ltu"
+
+# UE
+#~ msgid "Romania"
+#~ msgstr "Romania"
+
+# codice tre lettere per romania
+#~ msgid "Rou"
+#~ msgstr "Rou"
+
+# codice tre lettere per russia
+#~ msgid "Rus"
+#~ msgstr "Rus"
+
+# UE
+#~ msgid "Russia"
+#~ msgstr "Russia"
+
+#~ msgid "Serbia"
+#~ msgstr "Serbia"
+
+#~ msgid "Srb"
+#~ msgstr "Srb"
+
+#~ msgid "USA"
+#~ msgstr "USA"
 
 # variante turca
 #~ msgid "(F)"
@@ -4134,10 +4304,6 @@ msgstr "USA - Internazionale (combinazione Unicode AltGr, alternativa)"
 #~ msgid "Chn"
 #~ msgstr "CHN"
 
-# variante russa
-#~ msgid "Chuvash"
-#~ msgstr "Chuvash"
-
 #~ msgid "Classic"
 #~ msgstr "Classica"
 
@@ -4269,10 +4435,6 @@ msgstr "USA - Internazionale (combinazione Unicode AltGr, alternativa)"
 #~ msgid "Jpn"
 #~ msgstr "JPN"
 
-# variante russa, in iso639 è XAL
-#~ msgid "Kalmyk"
-#~ msgstr "Kalmyk"
-
 # Kana: variante giappone
 #~ msgid "Kana"
 #~ msgstr "Kana"
@@ -4344,9 +4506,6 @@ msgstr "USA - Internazionale (combinazione Unicode AltGr, alternativa)"
 #~ msgid "Mao"
 #~ msgstr "Mao"
 
-#~ msgid "Maori"
-#~ msgstr "Maori"
-
 # codice tre lettere per macedonia
 #~ msgid "Mkd"
 #~ msgstr "MKD"
@@ -4406,14 +4565,6 @@ msgstr "USA - Internazionale (combinazione Unicode AltGr, alternativa)"
 #~ msgid "OLPC Southern Uzbek"
 #~ msgstr "OLPC Uzbeco meridionale"
 
-# variante francese
-#~ msgid "Occitan"
-#~ msgstr "Occitana"
-
-# Variante irlandese
-#~ msgid "Ogham"
-#~ msgstr "Ogham"
-
 #~ msgid "Ossetian"
 #~ msgstr "Osseta"
 
@@ -4481,16 +4632,9 @@ msgstr "USA - Internazionale (combinazione Unicode AltGr, alternativa)"
 #~ msgid "Syria"
 #~ msgstr "Siria"
 
-# variante russa, come lingua stado a iso639 sarebbe tatarico
-#~ msgid "Tatar"
-#~ msgstr "Tatar"
-
 #~ msgid "Tha"
 #~ msgstr "THA"
 
-#~ msgid "Tibetan"
-#~ msgstr "Tibetana"
-
 # variante marocchina, corrispondente al codice iso639 BER (berbero)
 #~ msgid "Tifinagh"
 #~ msgstr "Tifinagh"
@@ -4506,10 +4650,6 @@ msgstr "USA - Internazionale (combinazione Unicode AltGr, alternativa)"
 #~ msgid "Tza"
 #~ msgstr "TZA"
 
-# variante russa
-#~ msgid "Udmurt"
-#~ msgstr "Udmurt"
-
 #~ msgid "Ukr"
 #~ msgstr "UKR"
 
diff --git a/xorg-server/xkeyboard-config/po/ko.po b/xorg-server/xkeyboard-config/po/ko.po
index e52e0a99a..92098a566 100644
--- a/xorg-server/xkeyboard-config/po/ko.po
+++ b/xorg-server/xkeyboard-config/po/ko.po
@@ -7,10 +7,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-03-27 00:43+0900\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-05-22 23:23+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
 "Language: ko\n"
@@ -87,155 +87,156 @@ msgid "Advance Scorpius KI"
 msgstr "Advance 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 키를 오른쪽 윈도우 키로 매핑, 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+스페이스"
 
-#: ../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 키"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr "모든 윈도우 키"
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr "모든 윈도우 키 (누르고 있는 동안)"
 
-#: ../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 "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: PC 키 에뮬레이션 (Print, Scroll_Lock, Pause, Num Lock)"
 
-#: ../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 "아랍어"
 
 # 버크월터 - 아랍어 음역 방법
 #     http://en.wikipedia.org/wiki/Buckwalter_transliteration
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:39
 msgid "Arabic (Buckwalter)"
 msgstr "아랍어 (버크월터)"
 
-#: ../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
 msgid "Armenian (alternative eastern)"
 msgstr "아르메니아 (다른 동부)"
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
 msgid "Armenian (alternative phonetic)"
 msgstr "아르메니아 (다른 음성 기호)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 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
 msgid "Armenian (western)"
 msgstr "아르메니아 (서부)"
 
+# 아스투리아스 - 스페인 지역
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "아스투리아스어 (스페인, 가운데점 H 및 가운데점 L 포함)"
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "에이서스 노트북"
@@ -253,13 +254,13 @@ msgid "Avatime"
 msgstr "Avatime"
 
 #: ../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
 msgid "Azona RF2300 wireless Internet Keyboard"
 msgstr "Azona RF2300 무선 인터넷 키보드"
@@ -305,3528 +306,3518 @@ msgid "Backslash"
 msgstr "백슬래시"
 
 #: ../rules/base.xml.in.h:72
-msgid "Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr "백슬래시로 3번째 단계 선택, 다른 3번째 단계 선택 키와 같이 누르면 고정"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "백슬래시 (3번째 단계 선택, 다른 3번째 단계 선택 키와 같이 누르면 고정)"
 
 #: ../rules/base.xml.in.h:73
 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
+#: ../rules/base.xml.in.h:77
 msgid "Belarusian (legacy)"
 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 "벨기에어 (썬 데드키)"
 
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "벨기에어 (Wang model 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 "벨기에어 (다른 버전, 썬 데드키)"
 
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "벨기에어 (다른 버전, latin-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 (Probhat)"
 msgstr "벵골어 (프롭햇)"
 
 # 베르베르어파
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:91
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "베르베르어 (모로코, 티피나그 다른 음성 기호 버전)"
 
 # 베르베르어파
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "베르베르어 (모로코, 티피나그 다른 버전)"
 
 # 베르베르어파
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "베르베르어 (모로코, 티피나그 확장 음성 기호)"
 
 # 베르베르어파
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "베르베르어 (모로코, 티피나그 확장)"
 
 # 베르베르어파
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "베르베르어 (모로코, 티피나그 음성 기호)"
 
 # 베르베르어파
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "베르베르어 (모로코, 티피나그)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bosnian"
 msgstr "보스니아어"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "보스니아어 (미국식 키보드, 보스니아 이중 문자 포함)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "보스니아어 (미국식 키보드, 보스니아 문자 포함)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "보스니아어 (보스니아 이중 문자 사용)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "보스니아어 (따옴표에 각괄호 사용)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Both Alt keys together"
 msgstr "Alt 키 2개 동시 누름"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Both Ctrl keys together"
 msgstr "Ctrl 키 2개 동시 누름"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Both Shift keys together"
 msgstr "Shift 키 2개 동시 누름"
 
-#: ../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 "Shift 키 두 개로 Caps Lock 켜기, Shift 키 한 개로 해제"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Shift 키 두 개로 Caps Lock 토글"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Shift 키 두 개로 ShiftLock 토글"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:108
 msgid "Braille"
 msgstr "점자"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:109
 msgid "Braille (left hand)"
 msgstr "점자 (왼손잡이)"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Braille (right hand)"
 msgstr "점자 (오른손잡이)"
 
-#: ../rules/base.xml.in.h:110
+#: ../rules/base.xml.in.h:111
 msgid "Brother Internet Keyboard"
 msgstr "브라더 인터넷 키보드"
 
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:112
 msgid "Bulgarian"
 msgstr "불가리아어"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Bulgarian (new phonetic)"
 msgstr "불가리아어 (새 음성 기호)"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Bulgarian (traditional phonetic)"
 msgstr "불가리아어 (구식 음성 기호)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:115
 msgid "Burmese"
 msgstr "미얀마어"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:116
 msgid "Canadian Multilingual"
 msgstr "캐나다 여러 언어 지원"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Canadian Multilingual (first part)"
 msgstr "캐나다 여러 언어 지원 (첫번째)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "Canadian Multilingual (second part)"
 msgstr "캐나다 여러 언어 지원 (두번째)"
 
-#: ../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 (3번째 단계 선택, 다른 3번째 단계 선택 키와 같이 누르면 고정)"
 
-#: ../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 (1번으로), Shift+Caps Lock (마지막으로)"
 
-#: ../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 (누르고 있는 동안), Alt+Caps Lock을 누르면 원래 Caps Lock 기능"
 
-#: ../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이 Shift처럼 동작하고 상태 고정, Shift가 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이 Shift처럼 동작하고 상태 고정, Shift가 Caps Lock 상태에 영향 없음"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock 사용 안 함"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock key behavior"
 msgstr "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이 Shift 상태를 토글, 즉 모든 키가 영향을 받음"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock이 일반적인 알파벳 대문자 상태를 토글"
 
-#: ../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이 내부 대문자 기능 사용. Shift가 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이 내부 대문자 기능 사용. Shift가 Caps Lock 상태에 영향 없음"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:131
 msgid "Catalan"
 msgstr "카탈루냐어"
 
+#: ../rules/base.xml.in.h:132
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "카탈로니아어 (스페인, 가운데점 L 포함)"
+
 # 체로키어 - 아메리카 원주민 부족
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:133
 msgid "Cherokee"
 msgstr "체로키어"
 
-#: ../rules/base.xml.in.h:132
+#: ../rules/base.xml.in.h:134
 msgid "Cherry B.UNLIMITED"
 msgstr "체리 B.UNLIMITED"
 
-#: ../rules/base.xml.in.h:133
+#: ../rules/base.xml.in.h:135
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "체리 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 "체리 Blue Line CyBo@rd (다른 옵션)"
 
-#: ../rules/base.xml.in.h:135
+#: ../rules/base.xml.in.h:137
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr "체리 CyBo@rd USB-Hub"
 
-#: ../rules/base.xml.in.h:136
+#: ../rules/base.xml.in.h:138
 msgid "Cherry CyMotion Expert"
 msgstr "체리 CyMotion Expert"
 
-#: ../rules/base.xml.in.h:137
+#: ../rules/base.xml.in.h:139
 msgid "Cherry CyMotion Master Linux"
 msgstr "체리 CyMotion Master Linux"
 
-#: ../rules/base.xml.in.h:138
+#: ../rules/base.xml.in.h:140
 msgid "Cherry CyMotion Master XPress"
 msgstr "체리 CyMotion Master XPress"
 
-#: ../rules/base.xml.in.h:139
+#: ../rules/base.xml.in.h:141
 msgid "Chicony Internet Keyboard"
 msgstr "치코니 인터넷 키보드"
 
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:142
 msgid "Chicony KB-9885"
 msgstr "치코니 KB-9885"
 
-#: ../rules/base.xml.in.h:141
+#: ../rules/base.xml.in.h:143
 msgid "Chicony KU-0108"
 msgstr "치코니 KU-0108"
 
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:144
 msgid "Chicony KU-0420"
 msgstr "치코니 KU-0420"
 
-#: ../rules/base.xml.in.h:143
+#: ../rules/base.xml.in.h:145
 msgid "Chinese"
 msgstr "중국어"
 
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "중국어 (티베트, ASCII 숫자 포함)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "중국어 (티베트)"
-
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "중국어 (위구르)"
+msgid "Chuvash"
+msgstr "추바시어"
 
+# http://ko.wikipedia.org/wiki/%EC%B6%94%EB%B0%94%EC%8B%9C%EC%96%B4
 #: ../rules/base.xml.in.h:147
+msgid "Chuvash (Latin)"
+msgstr "추바시어 (라틴)"
+
+#: ../rules/base.xml.in.h:148
 msgid "Classmate PC"
 msgstr "클래스메이트 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 "컴팩 Easy Access 키보드"
 
-#: ../rules/base.xml.in.h:149
+#: ../rules/base.xml.in.h:151
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "컴팩 인터넷 키보드 (13키)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:152
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "컴팩 인터넷 키보드 (18키)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "컴팩 인터넷 키보드 (7키)"
 
-#: ../rules/base.xml.in.h:152
+#: ../rules/base.xml.in.h:154
 msgid "Compaq iPaq Keyboard"
 msgstr "컴팩 iPaq 키보드"
 
-#: ../rules/base.xml.in.h:153
+#: ../rules/base.xml.in.h:155
 msgid "Compose key position"
 msgstr "조합 키 위치"
 
-#: ../rules/base.xml.in.h:154
+#: ../rules/base.xml.in.h:156
 msgid "Control + Alt + Backspace"
 msgstr "Ctrl + Alt + 백스페이스"
 
-#: ../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 "Ctrl 키를 윈도우 키로 매핑, Alt 키를 윈도우 키로 매핑"
 
-#: ../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 "Ctrl 키를 윈도우 키로 매핑 (그리고 일반 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 "크림타타르 (Dobruca-1 Q)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "크림타타르 (터키어 Alt-Q)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Crimean Tatar (Turkish F)"
+msgstr "크림타타르 (터키어 F)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "크림타타르 (터키어 Q)"
+
+#: ../rules/base.xml.in.h:164
 msgid "Croatian"
 msgstr "크로아티아어"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:165
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "크로아티아어 (미국식 키보드, 크로아티아 이중 문자 포함)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:166
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "크로아티아어 (미국식 키보드, 크로아티아 문자 포함)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
+#: ../rules/base.xml.in.h:167
+msgid "Croatian (use Croatian digraphs)"
 msgstr "크로아티아어 (크로아티아 이중 문자 사용)"
 
-#: ../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 "크로아티아어 (따옴표에 각괄호 사용)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Ctrl key position"
 msgstr "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 "체코어"
 
-#: ../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 "체코어 (UCW 배치, 액센트 문자만)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "체코어 (US 드보락, CZ UCW 지원)"
 
-#: ../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:174
 msgid "Czech (qwerty)"
 msgstr "체코어 (QWERTY)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:175
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "체코어 (QWERTY, 백슬래시 확장)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:176
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "체코어 (&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 "덴마크어"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Danish (Dvorak)"
 msgstr "덴마크어 (드보락)"
 
-#: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
-msgstr "덴마크어 (맥)"
+#: ../rules/base.xml.in.h:180
+msgid "Danish (Macintosh)"
+msgstr "덴마크어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
-msgstr "덴마크어 (맥, 데드키 없음)"
+#: ../rules/base.xml.in.h:181
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "덴마크어 (매킨토시, 데드키 없음)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Danish (eliminate dead keys)"
 msgstr "덴마크어 (데드키 없음)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "Default numeric keypad keys"
 msgstr "기본 숫자 키패드 키"
 
-#: ../rules/base.xml.in.h:178
+#: ../rules/base.xml.in.h:184
 msgid "Dell"
 msgstr "델"
 
-#: ../rules/base.xml.in.h:179
+#: ../rules/base.xml.in.h:185
 msgid "Dell 101-key PC"
 msgstr "델 101키 PC"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "델 노트북 Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "델 노트북 Precision M series"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Dell Latitude series laptop"
 msgstr "델 Latitude 시리즈 노트북"
 
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:189
 msgid "Dell Precision M65"
 msgstr "델 Precision M65"
 
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:190
 msgid "Dell SK-8125"
 msgstr "델 SK-8125"
 
-#: ../rules/base.xml.in.h:185
+#: ../rules/base.xml.in.h:191
 msgid "Dell SK-8135"
 msgstr "델 SK-8135"
 
-#: ../rules/base.xml.in.h:186
+#: ../rules/base.xml.in.h:192
 msgid "Dell USB Multimedia Keyboard"
 msgstr "델 USB 멀티미디어 키보드"
 
-#: ../rules/base.xml.in.h:187
+#: ../rules/base.xml.in.h:193
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop 키보드"
 
-#: ../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 "다이아몬드 9801 / 9802 시리즈"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dutch"
 msgstr "네덜란드어"
 
-#: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
-msgstr "네덜란드어 (맥)"
+#: ../rules/base.xml.in.h:197
+msgid "Dutch (Macintosh)"
+msgstr "네덜란드어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dutch (Sun dead keys)"
 msgstr "네덜란드어 (썬 데드키)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dutch (standard)"
 msgstr "네덜란드어 (표준)"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dzongkha"
 msgstr "종카어"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Enable extra typographic characters"
 msgstr "추가 타이포그라피 문자 사용"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
+msgid "English (Cameroon Dvorak)"
+msgstr "영어 (카메룬 드보락)"
+
+#: ../rules/base.xml.in.h:203
+msgid "English (Cameroon qwerty)"
+msgstr "영어 (카메룬 QWERTY)"
+
+#: ../rules/base.xml.in.h:204
+msgid "English (Cameroon)"
+msgstr "영어 (카메룬)"
+
+#: ../rules/base.xml.in.h:205
 msgid "English (Canada)"
 msgstr "영어 (캐나다)"
 
 # Colemak: 상표명
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:206
 msgid "English (Colemak)"
 msgstr "영어 (Colemak)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:207
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "영어 (드보락 다른 국제 버전, 데드키 없음)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:208
 msgid "English (Dvorak international with dead keys)"
 msgstr "영어 (드보락 국제 버전, 데드키 포함)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:209
 msgid "English (Dvorak)"
 msgstr "영어 (드보락)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:210
 msgid "English (Ghana)"
 msgstr "영어 (가나)"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:211
 msgid "English (Ghana, GILLBT)"
 msgstr "영어 (가나, GILLBT)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:212
 msgid "English (Ghana, multilingual)"
 msgstr "영어 (가나, 다국어)"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:213
 msgid "English (India, with RupeeSign)"
 msgstr "영어 (인도, 루피 기호 포함)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:214
 msgid "English (Macintosh)"
 msgstr "영어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
-msgstr "영어 (말리, 미국 맥)"
+#: ../rules/base.xml.in.h:215
+msgid "English (Mali, US Macintosh)"
+msgstr "영어 (말리, 미국 매킨토시)"
 
-#: ../rules/base.xml.in.h:207
-msgid "English (Mali, USA international)"
+#: ../rules/base.xml.in.h:216
+msgid "English (Mali, US international)"
 msgstr "영어 (말리, 미국 국제 버전)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:217
 msgid "English (Nigeria)"
 msgstr "영어 (나이지리아)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:218
 msgid "English (South Africa)"
 msgstr "영어 (남아공)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:219
 msgid "English (UK)"
 msgstr "영어 (영국)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:220
 msgid "English (UK, Colemak)"
 msgstr "영어 (영국, Colemak)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
-msgstr "영어 (영국, 드보락 영국 문장 부호)"
+#: ../rules/base.xml.in.h:221
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "영어 (영국, 영국 문장 부호 포함 드보락)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:222
 msgid "English (UK, Dvorak)"
 msgstr "영어 (영국, 드보락)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
-msgstr "영어 (영국, 맥 국제 버전)"
+#: ../rules/base.xml.in.h:223
+msgid "English (UK, Macintosh international)"
+msgstr "영어 (영국, 매킨토시 국제 버전)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
-msgstr "영어 (영국, 맥)"
+#: ../rules/base.xml.in.h:224
+msgid "English (UK, Macintosh)"
+msgstr "영어 (영국, 매킨토시)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
-msgstr "영어 (영국, 확장, 윈도우 키)"
+#: ../rules/base.xml.in.h:225
+msgid "English (UK, extended WinKeys)"
+msgstr "영어 (영국, 확장 윈도우 키)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, international with dead keys)"
 msgstr "영어 (영국, 국제 버전, 데드키 포함)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
 msgid "English (US)"
 msgstr "영어 (미국)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:228
 msgid "English (US, alternative international)"
 msgstr "영어 (미국, 다른 국제 버전)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:229
 msgid "English (US, international with dead keys)"
 msgstr "영어 (미국, 국제 버전, 데드키 포함)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:230
 msgid "English (US, with euro on 5)"
 msgstr "영어 (미국, 5 키에 유로 기호)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:231
 msgid "English (classic Dvorak)"
 msgstr "영어 (클래식 드보락)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:232
 msgid "English (international AltGr dead keys)"
 msgstr "영어 (국제 버전, AltGr 데드키)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:233
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "영어 (곱하기/나누기 키에 키보드 배치 토글)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:234
 msgid "English (left handed Dvorak)"
 msgstr "영어 (왼손잡이 드보락)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:235
 msgid "English (programmer Dvorak)"
 msgstr "영어 (프로그래머 드보락)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:236
 msgid "English (right handed Dvorak)"
 msgstr "영어 (오른손잡이 드보락)"
 
-#: ../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"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:239
 msgid "Esperanto"
 msgstr "에스페란토"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:240
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "에스페란토 (포르투갈, 네이티브)"
+
+#: ../rules/base.xml.in.h:241
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "에스페란토 (세미콜론과 따옴표 없애기, 없어진 기능)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:242
 msgid "Estonian"
 msgstr "에스토니아어"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:243
 msgid "Estonian (Dvorak)"
 msgstr "에스토니아어 (드보락)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:244
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "에스토니아어 (미국식 키보드, 에스토니아 문자 포함)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:245
 msgid "Estonian (eliminate dead keys)"
 msgstr "에스토니아어 (데드키 없음)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:246
 msgid "Euro on 2"
 msgstr "유로를 2 키에"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:247
 msgid "Euro on 4"
 msgstr "유로를 4 키에"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:248
 msgid "Euro on 5"
 msgstr "유로를 5 키에"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:249
 msgid "Euro on E"
 msgstr "유로를 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 "페로어"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:254
 msgid "Faroese (eliminate dead keys)"
 msgstr "페로어 (데드키 없음)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:255
 msgid "Filipino"
 msgstr "필리핀어"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:256
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "필리핀어 (케이프웰 드보락 베이베이인)"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:257
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "필리핀어 (케이프웰 드보락 라틴)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:258
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "필리핀어 (케이프웰 QWERF 2006 베이베이인)"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:259
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "필리핀어 (케이프웰 QWERF 2006 라틴)"
 
 # Colemak: 상표명
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:260
 msgid "Filipino (Colemak Baybayin)"
 msgstr "필리핀어 (Colemak 베이베이인)"
 
 # Colemak: 상표명
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Colemak Latin)"
 msgstr "필리핀어 (Colemak 라틴)"
 
-#: ../rules/base.xml.in.h:252
+# Colemak: 상표명
+#: ../rules/base.xml.in.h:262
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "필리핀어 (드보락 베이베이인)"
+
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Dvorak Latin)"
 msgstr "필리핀어 (드보락 라틴)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "필리핀어 (QWERTY 베이베이인)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:265
 msgid "Finnish"
 msgstr "핀란드어"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
-msgstr "핀란드어 (맥)"
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
+msgstr "핀란드어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:267
 msgid "Finnish (classic)"
 msgstr "핀란드어 (클래식)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:268
 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:271
 msgid "Four-level key with abstract separators"
 msgstr "네번째 단계, 가상 구분 문자 사용"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:272
 msgid "Four-level key with comma"
 msgstr "네번째 단계, 쉼표 사용"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:273
 msgid "Four-level key with dot"
 msgstr "네번째 단계, 점 사용"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:274
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "네번째 단계, 점 사용, latin-9 제한 사항"
 
 # momayyez: http://en.wikipedia.org/wiki/Momayyez
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:275
 msgid "Four-level key with momayyez"
 msgstr "네번째 단계, 아랍식 쉼표 (momayyez) 사용"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:276
 msgid "French"
 msgstr "프랑스어"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:277
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "프랑스어 (Bepo, ergonomic, 드보락 방식)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:278
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "프랑스어 (Bepo, ergonomic, 드보락 방식, latin-9 전용)"
 
 # 브르타뉴어 - 프랑스 지방 언어
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:279
 msgid "French (Breton)"
 msgstr "프랑스어 (브르타뉴어)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:280
+msgid "French (Cameroon azerty)"
+msgstr "프랑스어 (카메룬 AZERTY)"
+
+#: ../rules/base.xml.in.h:281
+msgid "French (Cameroon)"
+msgstr "프랑스어 (카메룬)"
+
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "프랑스어 (캐나다)"
+
+#: ../rules/base.xml.in.h:283
 msgid "French (Canada, Dvorak)"
 msgstr "프랑스어 (캐나다, 드보락)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:284
 msgid "French (Canada, legacy)"
 msgstr "프랑스어 (캐나다, 구형)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:285
 msgid "French (Democratic Republic of the Congo)"
 msgstr "프랑스어 (콩고 민주 공화국)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:286
 msgid "French (Dvorak)"
 msgstr "프랑스어 (드보락)"
 
-#: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
-msgstr "프랑스어 (조지아 AZERTY Tskapo)"
-
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:287
 msgid "French (Guinea)"
 msgstr "프랑스어 (기니)"
 
-#: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
-msgstr "프랑스어 (맥)"
+#: ../rules/base.xml.in.h:288
+msgid "French (Macintosh)"
+msgstr "프랑스어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:289
 msgid "French (Mali, alternative)"
 msgstr "프랑스어 (말리, 다른 버전)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:290
 msgid "French (Morocco)"
 msgstr "프랑스어 (모로코)"
 
-#: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
-msgstr "프랑스어 (오크어)"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:291
 msgid "French (Sun dead keys)"
 msgstr "프랑스어 (썬 데드키)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:292
 msgid "French (Switzerland)"
 msgstr "프랑스어 (스위스)"
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
-msgstr "프랑스어 (스위스, 맥)"
+#: ../rules/base.xml.in.h:293
+msgid "French (Switzerland, Macintosh)"
+msgstr "프랑스어 (스위스, 매킨토시)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:294
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "프랑스어 (스위스, 썬 데드키)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:295
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "프랑스어 (스위스, 데드키 없음)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:296
 msgid "French (alternative)"
 msgstr "프랑스어 (다른 버전)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:297
 msgid "French (alternative, Sun dead keys)"
 msgstr "프랑스어 (다른 버전, 썬 데드키)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:298
 msgid "French (alternative, eliminate dead keys)"
 msgstr "프랑스어 (다른 버전, 데드키 없음)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:299
 msgid "French (alternative, latin-9 only)"
 msgstr "프랑스어 (다른 버전, latin-9 전용)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:300
 msgid "French (eliminate dead keys)"
 msgstr "프랑스어 (데드키 없음)"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
-msgstr "프랑스어 (구형 다른 버전)"
+#: ../rules/base.xml.in.h:301
+msgid "French (legacy, alternative)"
+msgstr "프랑스어 (구형, 다른 버전)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:302
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "프랑스어 (구형, 다른 버전, 썬 데드키)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:303
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "프랑스어 (구형, 다른 버전, 데드키 없음)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:304
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "후지스-지멘스 컴퓨터 AMILO 노트북"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:305
 msgid "Fula"
 msgstr "풀라"
 
-#: ../rules/base.xml.in.h:295
-msgid "GBr"
-msgstr "영국"
-
 # 가나의 언어
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:306
 msgid "Ga"
 msgstr "가어"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:307
 msgid "Generic 101-key PC"
 msgstr "일반 101키 PC"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:308
 msgid "Generic 102-key (Intl) PC"
 msgstr "일반 102키 (국제 버전) PC"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:309
 msgid "Generic 104-key PC"
 msgstr "일반 104키 PC"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:310
 msgid "Generic 105-key (Intl) PC"
 msgstr "일반 105키 (국제 버전) 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 "조지아어"
 
-#: ../rules/base.xml.in.h:307
-msgid "Georgian (MESS)"
-msgstr "조지아어 (MESS)"
+#: ../rules/base.xml.in.h:317
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "조지아어 (프랑스, AZERTY Tskapo)"
 
 # 오세트 - 러시아 및 조지아 지역 오세트족
-#: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
-msgstr "조지아어 (오세트어)"
+#: ../rules/base.xml.in.h:318
+msgid "Georgian (Italy)"
+msgstr "조지아어 (이탈리아)"
 
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:319
+msgid "Georgian (MESS)"
+msgstr "조지아어 (MESS)"
+
+#: ../rules/base.xml.in.h:320
 msgid "Georgian (ergonomic)"
 msgstr "조지아어 (어고노믹)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:321
 msgid "German"
 msgstr "독일어"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:322
 msgid "German (Austria)"
 msgstr "독일어 (오스트리아)"
 
-#: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
-msgstr "독일어 (오스트리아, 맥)"
+#: ../rules/base.xml.in.h:323
+msgid "German (Austria, Macintosh)"
+msgstr "독일어 (오스트리아, 매킨토시)"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:324
 msgid "German (Austria, Sun dead keys)"
 msgstr "독일어 (오스트리아, 썬 데드키)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:325
 msgid "German (Austria, eliminate dead keys)"
 msgstr "독일어 (오스트리아, 데드키 없음)"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:326
 msgid "German (Dvorak)"
 msgstr "독일어 (드보락)"
 
-#: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
-msgstr "독일어 (맥)"
+#: ../rules/base.xml.in.h:327
+msgid "German (Macintosh)"
+msgstr "독일어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
-msgstr "독일어 (맥, 데드키 없음)"
+#: ../rules/base.xml.in.h:328
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "독일어 (매킨토시, 데드키 없음)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:329
 msgid "German (Neo 2)"
 msgstr "독일어 (Neo 2)"
 
-#: ../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:330
 msgid "German (Sun dead keys)"
 msgstr "독일어 (썬 데드키)"
 
-#: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
-msgstr "독일어 (스위스, 맥)"
+#: ../rules/base.xml.in.h:331
+msgid "German (Switzerland)"
+msgstr "독일어 (스위스)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
+msgstr "독일어 (스위스, 매킨토시)"
+
+#: ../rules/base.xml.in.h:333
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "독일어 (스위스, 썬 데드키)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:334
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "독일어 (스위스, 데드키 없음)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:335
+msgid "German (Switzerland, legacy)"
+msgstr "독일어 (스위스, 구형)"
+
+#: ../rules/base.xml.in.h:336
 msgid "German (dead acute)"
 msgstr "독일어 (어큐트 데드키)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:337
 msgid "German (dead grave acute)"
 msgstr "독일어 (그레이브 어큐트 데드키)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:338
 msgid "German (eliminate dead keys)"
 msgstr "독일어 (데드키 없음)"
 
-# http://ko.wikipedia.org/wiki/저지_소르브어
-#: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
-msgstr "독일어 (저지 소르브어 QWERTZ)"
-
-# http://ko.wikipedia.org/wiki/저지_소르브어
-#: ../rules/base.xml.in.h:329
-msgid "German (lower Sorbian)"
-msgstr "독일어 (저지 소르브어)"
-
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:339
 msgid "German (qwerty)"
 msgstr "독일어 (QWERTY)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:340
 msgid "Greek"
 msgstr "그리스어"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:341
 msgid "Greek (eliminate dead keys)"
 msgstr "그리스어 (데드키 없음)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:342
 msgid "Greek (extended)"
 msgstr "그리스어 (확장)"
 
 # 그리스어 발음 표기 http://en.wikipedia.org/wiki/Polytonic_orthography
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:343
 msgid "Greek (polytonic)"
 msgstr "그리스어 (폴리토닉)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:344
 msgid "Greek (simple)"
 msgstr "그리스어 (간단)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:345
 msgid "Gujarati"
 msgstr "구자라트어"
 
 # 제조사 이름
-#: ../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 드림"
 
-#: ../rules/base.xml.in.h:339
+#: ../rules/base.xml.in.h:348
 msgid "Happy Hacking Keyboard"
 msgstr "해피해킹 키보드"
 
-#: ../rules/base.xml.in.h:340
+#: ../rules/base.xml.in.h:349
 msgid "Happy Hacking Keyboard for Mac"
 msgstr "해피해킹 키보드, 맥용"
 
 # 나이지리아 변종
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:350
 msgid "Hausa"
 msgstr "하우사어"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:351
 msgid "Hebrew"
 msgstr "히브리어"
 
-#: ../rules/base.xml.in.h:343
-msgid "Hebrew (Phonetic)"
-msgstr "히브리어 (음성 표기)"
-
-#: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
-msgstr "히브리어 (Tiro)"
+#: ../rules/base.xml.in.h:352
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "히브리어 (성서 방식, Tiro)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "Hebrew (lyx)"
 msgstr "히브리어 (lyx)"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
+msgid "Hebrew (phonetic)"
+msgstr "히브리어 (음성 표기)"
+
+#: ../rules/base.xml.in.h:355
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "휴렛팩커드 인터넷 키보드"
 
-#: ../rules/base.xml.in.h:347
+#: ../rules/base.xml.in.h:356
 msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr "휴렛팩커드 Mini 110 Notebook"
 
-#: ../rules/base.xml.in.h:348
+#: ../rules/base.xml.in.h:357
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "휴렛팩커드 Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:349
+#: ../rules/base.xml.in.h:358
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "휴렛팩커드 Omnibook 5xx"
 
-#: ../rules/base.xml.in.h:350
+#: ../rules/base.xml.in.h:359
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "휴렛팩커드 Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:351
+#: ../rules/base.xml.in.h:360
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "휴렛팩커드 Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:352
+#: ../rules/base.xml.in.h:361
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "휴렛팩커드 Omnibook XE3 GF"
 
-#: ../rules/base.xml.in.h:353
+#: ../rules/base.xml.in.h:362
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "휴렛팩커드 Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:354
+#: ../rules/base.xml.in.h:363
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "휴렛팩커드 Pavilion ZT11xx"
 
-#: ../rules/base.xml.in.h:355
+#: ../rules/base.xml.in.h:364
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "휴렛팩커드 Pavilion dv5"
 
-#: ../rules/base.xml.in.h:356
+#: ../rules/base.xml.in.h:365
 msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr "휴렛팩커드 SK-250x 멀티미디어 키보드"
 
-#: ../rules/base.xml.in.h:357
+#: ../rules/base.xml.in.h:366
 msgid "Hewlett-Packard nx9020"
 msgstr "휴렛팩커드 nx9020"
 
-#: ../rules/base.xml.in.h:358
+#: ../rules/base.xml.in.h:367
 msgid "Hexadecimal"
 msgstr "십육진법"
 
 # Bolnagri: x input method 이름, http://indlinux.org/wiki/index.php/BolNagri
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:368
 msgid "Hindi (Bolnagri)"
 msgstr "힌두어 (Bolnagri)"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:369
 msgid "Hindi (Wx)"
 msgstr "힌두어 (Wx)"
 
-#: ../rules/base.xml.in.h:361
+#: ../rules/base.xml.in.h:370
 msgid "Honeywell Euroboard"
 msgstr "하니웰 Euroboard"
 
-#: ../rules/base.xml.in.h:362
+#: ../rules/base.xml.in.h:371
 msgid "Htc Dream phone"
 msgstr "HTC 드림 휴대전화"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:372
 msgid "Hungarian"
 msgstr "헝가리어"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:373
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "헝가리어 (101/QWERTY/쉼표/데드키)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:374
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "헝가리어 (101/QWERTY/쉼표/데드키 없음)"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "헝가리어 (101/QWERTY/점/데드키)"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "헝가리어 (101/QWERTY/점/데드키 없음)"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "헝가리어 (101/QWERTZ/쉼표/데드키)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "헝가리어 (101/QWERTZ/쉼표/데드키 없음0"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "헝가리어 (101/QWERTZ/점/데드키)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "헝가리어 (101/QWERTZ/점/데드키 없음)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "헝가리어 (102/QWERTY/쉼표/데드키)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "헝가리어 (102/QWERTY/쉼표/데드키 없음)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "헝가리어 (102/QWERTY/점/데드키)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "헝가리어 (102/QWERTY/점/데드키 없음)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "헝가리어 (102/QWERTZ/쉼표/데드키)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "헝가리어 (102/QWERTZ/쉼표/데드키 없음)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "헝가리어 (102/QWERTZ/점/데드키)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "헝가리어 (102/QWERTZ/점/데드키 없음)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (eliminate dead keys)"
 msgstr "헝가리어 (데드키 없음)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (qwerty)"
 msgstr "헝가리어 (QWERTY)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (standard)"
 msgstr "헝가리어 (표준)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:392
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper 키를 윈도우 키로 매핑"
 
-#: ../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 "아이슬란드어"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:400
 msgid "Icelandic (Dvorak)"
 msgstr "아이슬란드어 (드보락)"
 
-#: ../rules/base.xml.in.h:392
-msgid "Icelandic (Mac)"
-msgstr "아이슬란드어 (맥)"
+#: ../rules/base.xml.in.h:401
+msgid "Icelandic (Macintosh)"
+msgstr "아이슬란드어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic (Sun dead keys)"
 msgstr "아이슬란드어 (썬 데드키)"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (eliminate dead keys)"
 msgstr "아이슬란드어 (데드키 없음)"
 
 # 나이지리아 변종
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:404
 msgid "Igbo"
 msgstr "이그보어"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:405
 msgid "Indian"
 msgstr "인도"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:406
 msgid "Inuktitut"
 msgstr "이누이트어"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:407
 msgid "Iraqi"
 msgstr "이라크"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:408
 msgid "Irish"
 msgstr "아일랜드"
 
-# 아일랜드 변종
-#: ../rules/base.xml.in.h:400
-msgid "Irish (CloGaelach)"
-msgstr "아일랜드 (CloGaelach)"
-
-# 아일랜드 변종
-#: ../rules/base.xml.in.h:401
-msgid "Irish (Ogham IS434)"
-msgstr "아일랜드 (오검 문자 IS434)"
-
-#: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
-msgstr "아일랜드 (오검 문자)"
-
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:409
 msgid "Irish (UnicodeExpert)"
 msgstr "아일랜드 (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:410
 msgid "Italian"
 msgstr "이탈리아어"
 
-#: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
-msgstr "이탈리아어 (조지아)"
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
-msgstr "이탈리아어 (맥)"
+#: ../rules/base.xml.in.h:411
+msgid "Italian (Macintosh)"
+msgstr "이탈리아어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:412
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "이탈리아어 (미국식 키보드, 이탈리아어 문자 포함)"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:413
 msgid "Italian (eliminate dead keys)"
 msgstr "이탈리아어 (데드키 없음)"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:414
 msgid "Japanese"
 msgstr "일본어"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:415
 msgid "Japanese (Kana 86)"
 msgstr "일본어 (가나 86)"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:416
 msgid "Japanese (Kana)"
 msgstr "일본어 (가나)"
 
-#: ../rules/base.xml.in.h:412
-msgid "Japanese (Mac)"
-msgstr "일본어 (맥)"
+#: ../rules/base.xml.in.h:417
+msgid "Japanese (Macintosh)"
+msgstr "일본어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (OADG 109A)"
 msgstr "일본어 (OADG 109A)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (PC-98xx Series)"
 msgstr "일본어 (PC-98xx 시리즈)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:420
 msgid "Japanese keyboard options"
 msgstr "일본어 키보드 옵션"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:421
+msgid "Kalmyk"
+msgstr "칼미크어"
+
+#: ../rules/base.xml.in.h:422
 msgid "Kana Lock key is locking"
 msgstr "Kana Lock 키 상태 고정"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:423
 msgid "Kannada"
 msgstr "칸나다어"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:424
+msgid "Kashubian"
+msgstr "카슈브어"
+
+#: ../rules/base.xml.in.h:425
 msgid "Kazakh"
 msgstr "카자흐어"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:426
 msgid "Kazakh (with Russian)"
 msgstr "카자흐어 (러시아어 포함)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:427
 msgid "Key sequence to kill the X server"
 msgstr "X 서버를 멈추는 키 조합"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:428
 msgid "Key to choose 3rd level"
 msgstr "3번째 단계를 선택하는 키"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:429
 msgid "Key to choose 5th level"
 msgstr "5번째 단계를 선택하는 키"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:430
 msgid "Key(s) to change layout"
 msgstr "배치를 전환하는 키"
 
-#: ../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 "크메르어 (캄보디아)"
 
 # http://en.wikipedia.org/wiki/Kikuyu#Language
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:433
 msgid "Kikuyu"
 msgstr "키쿠유어"
 
-#: ../rules/base.xml.in.h:427
+#: ../rules/base.xml.in.h:434
 msgid "Kinesis"
 msgstr "키네시스"
 
-#: ../rules/base.xml.in.h:428
+#: ../rules/base.xml.in.h:435
+msgid "Komi"
+msgstr "코미어"
+
+#: ../rules/base.xml.in.h:436
 msgid "Korean"
 msgstr "한국어"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Korean (101/104 key compatible)"
 msgstr "한국어 (101/104키 호환)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "쿠르드어 (이란, 아랍어 라틴)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Kurdish (Iran, F)"
 msgstr "쿠르드어 (이란, F)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "쿠르드어 (이란, 라틴 Alt-Q)"
+
+#: ../rules/base.xml.in.h:441
 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:442
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "쿠르드어 (이라크, 아랍어 라틴)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iraq, F)"
 msgstr "쿠르드어 (이라크, F)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "쿠르드어 (이라크, 라틴 Alt-Q)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "쿠르드어 (이라크, 라틴 Q)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Syria, F)"
 msgstr "쿠르드어 (시리아, F)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "쿠르드어 (시리아, 라틴 Alt-Q)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "쿠르드어 (시리아, 라틴 Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Turkey, F)"
 msgstr "쿠르드어 (터키, F)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "쿠르드어 (터키, 라틴 Alt-Q)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 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:452
 msgid "Kyrgyz"
 msgstr "키르기스어"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:453
 msgid "Kyrgyz (phonetic)"
 msgstr "키르기스어 (음성 기호)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:454
 msgid "Lao"
 msgstr "라오어"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:455
 msgid "Lao (STEA proposed standard layout)"
 msgstr "라오어 (STEA 제안 표준 키 배치)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:456
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "노트북 컴팩 (Armada 등) 노트북 키보드"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:457
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "노트북 컴팩 (Presario 등) 노트북 키보드"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:458
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "노트북 컴팩 eMachines m68xx"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
 msgid "Latvian"
 msgstr "라트비아어"
 
-#: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
-msgstr "라트비아어 (아포스트로피 ' 변종)"
-
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:460
 msgid "Latvian (F variant)"
 msgstr "라트비아어 (F 변종)"
 
-#: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
-msgstr "라트비아어 (물결 ~ 변종)"
+#: ../rules/base.xml.in.h:461
+msgid "Latvian (adapted)"
+msgstr "라트비아어 (개조 버전)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:462
+msgid "Latvian (apostrophe variant)"
+msgstr "라트비아어 (아포스트로피 변종)"
+
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "라트비아어 (어고노믹, ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:464
+msgid "Latvian (modern)"
+msgstr "라트비아어 (현대 버전)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "라트비아어 (물결 변종)"
+
+#: ../rules/base.xml.in.h:466
 msgid "Left Alt"
 msgstr "왼쪽 Alt"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:467
 msgid "Left Alt (while pressed)"
 msgstr "왼쪽 Alt (누르고 있는 동안)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:468
 msgid "Left Alt is swapped with Left Win"
 msgstr "왼쪽 Alt와 왼쪽 윈도우 키 뒤바꾸기"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:469
 msgid "Left Ctrl"
 msgstr "왼쪽 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 "왼쪽 Ctrl (1번 키보드 배치로), 오른쪽 Ctrl (마지막 키보드 배치로)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:471
 msgid "Left Ctrl+Left Shift"
 msgstr "왼쪽 Ctrl+왼쪽 Shift"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:472
 msgid "Left Shift"
 msgstr "왼쪽 Shift"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:473
 msgid "Left Win"
 msgstr "왼쪽 윈도우"
 
-#: ../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 "왼쪽 윈도우 (1번으로), 오른쪽 윈도우/메뉴 (마지막으로)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:475
 msgid "Left Win (while pressed)"
 msgstr "왼쪽 윈도우 (누르고 있는 동안)"
 
-#: ../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 "왼쪽 윈도우로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
 
-#: ../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 "왼쪽 윈도우로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정, 한 번 누르면 고정 해제"
 
-#: ../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+왼쪽 윈도우 (1번 키보드 배치로), 오른쪽 Ctrl+Menu (2번째 키보드 배치로)"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:479
 msgid "Legacy"
 msgstr "구형 방식"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:480
 msgid "Legacy Wang 724"
 msgstr "구형 방식 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 "구형 방식 키, 쉼표 포함"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:483
 msgid "Legacy key with dot"
 msgstr "구형 방식 키, 점 포함"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
 msgid "Lithuanian"
 msgstr "리투아니아어"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:485
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "리투아니아어 (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:486
 msgid "Lithuanian (LEKP)"
 msgstr "리투아니아어 (LEKP)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:487
 msgid "Lithuanian (LEKPa)"
 msgstr "리투아니아어 (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:488
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "리투아니아어 (미국식 키보드, 리투아니아 문자 포함)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (standard)"
 msgstr "리투아니아어 (표준)"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:480
+#: ../rules/base.xml.in.h:490
 msgid "Logitech Access Keyboard"
 msgstr "로지텍 액세스 키보드"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:481
+#: ../rules/base.xml.in.h:491
 msgid "Logitech Cordless Desktop"
 msgstr "로지텍 무선 데스크탑"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:482
+#: ../rules/base.xml.in.h:492
 msgid "Logitech Cordless Desktop (alternate option)"
 msgstr "로지텍 무선 데스크탑 (다른 옵션)"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:483
+#: ../rules/base.xml.in.h:493
 msgid "Logitech Cordless Desktop EX110"
 msgstr "로지텍 무선 데스크탑 EX110"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:484
+#: ../rules/base.xml.in.h:494
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "로지텍 무선 데스크탑 LX-300"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:485
+#: ../rules/base.xml.in.h:495
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "로지텍 무선 데스크탑 내비게이터"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:486
+#: ../rules/base.xml.in.h:496
 msgid "Logitech Cordless Desktop Optical"
 msgstr "로지텍 무선 데스크탑 옵티컬"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:487
+#: ../rules/base.xml.in.h:497
 msgid "Logitech Cordless Desktop Pro (alternate option 2)"
 msgstr "로지텍 무선 데스크탑 프로 (다른 옵션 2)"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:488
+#: ../rules/base.xml.in.h:498
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "로지텍 무선 데스크탑 아이터치"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:489
+#: ../rules/base.xml.in.h:499
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "로지텍 무선 프리덤/데스크탑 내비게이터"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:490
+#: ../rules/base.xml.in.h:500
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr "로지텍 G15 추가 키, G15daemon 사용"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Generic Keyboard"
 msgstr "로지텍 일반 키보드"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:492
+#: ../rules/base.xml.in.h:502
 msgid "Logitech Internet 350 Keyboard"
 msgstr "로지텍 인터넷 350 키보드"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:493
+#: ../rules/base.xml.in.h:503
 msgid "Logitech Internet Keyboard"
 msgstr "로지텍 인터넷 키보드"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:494
+#: ../rules/base.xml.in.h:504
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "로지텍 인터넷 내비게이터 키보드"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:495
+#: ../rules/base.xml.in.h:505
 msgid "Logitech Media Elite Keyboard"
 msgstr "로지텍 미디어 엘리트 키보드"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:496
+#: ../rules/base.xml.in.h:506
 msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr "로지텍 울트라 무선 미디어 데스크탑 키보드"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:497
+#: ../rules/base.xml.in.h:507
 msgid "Logitech Ultra-X Keyboard"
 msgstr "로지텍 울트라 키보드"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:498
+#: ../rules/base.xml.in.h:508
 msgid "Logitech diNovo Edge Keyboard"
 msgstr "로지텍 디노보 엣지 키보드"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:499
+#: ../rules/base.xml.in.h:509
 msgid "Logitech diNovo Keyboard"
 msgstr "로지텍 디노보 키보드"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:500
+#: ../rules/base.xml.in.h:510
 msgid "Logitech iTouch"
 msgstr "로지텍 아이터치"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:501
+#: ../rules/base.xml.in.h:511
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "로지텍 아이터치 무선 키보드 (모델 Y-RB6)"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:502
+#: ../rules/base.xml.in.h:512
 msgid "Logitech iTouch Internet Navigator Keyboard SE"
 msgstr "로지텍 아이터치 인터넷 내비게이터 키보드 SE"
 
 # 한국에서 광고하는 대로 음역
-#: ../rules/base.xml.in.h:503
+#: ../rules/base.xml.in.h:513
 msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 msgstr "로지텍 아이터치 인터넷 내비게이터 키보드 SE (USB)"
 
-#: ../rules/base.xml.in.h:504
+# http://ko.wikipedia.org/wiki/저지_소르브어
+#: ../rules/base.xml.in.h:514
+msgid "Lower Sorbian"
+msgstr "저지 소르브어"
+
+# http://ko.wikipedia.org/wiki/저지_소르브어
+#: ../rules/base.xml.in.h:515
+msgid "Lower Sorbian (qwertz)"
+msgstr "저지 소르브어 (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 (국제 버전)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:518
 msgid "Macedonian"
 msgstr "마케도니아어"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:519
 msgid "Macedonian (eliminate dead keys)"
 msgstr "마케도니아어 (데드키 없음)"
 
-#: ../rules/base.xml.in.h:508
+#: ../rules/base.xml.in.h:520
 msgid "Macintosh"
 msgstr "매킨토시"
 
-#: ../rules/base.xml.in.h:509
+#: ../rules/base.xml.in.h:521
 msgid "Macintosh Old"
 msgstr "매킨토시 구형"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:522
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Caps Lock을 추가 백스페이스로 사용"
 
-#: ../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 "Caps Lock을 추가 Ctrl로 사용, 하지만 Caps_Lock keysym 유지"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:524
 msgid "Make Caps Lock an additional Ctrl"
 msgstr "Caps Lock을 추가 Ctrl로 사용"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:525
 msgid "Make Caps Lock an additional ESC"
 msgstr "Caps Lock을 추가 ESC로 사용"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Caps Lock을 추가 Hyper로 사용"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Caps Lock을 추가 Num Lock으로 사용"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional Super"
 msgstr "Caps Lock을 추가 Super로 사용"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:529
 msgid "Malayalam"
 msgstr "말라얄람어"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:530
 msgid "Malayalam (Lalitha)"
 msgstr "말라얄람어 (라리타)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:531
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "말라얄람어 (발전된 Inscript, 루피 기호 포함)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:532
 msgid "Maltese"
 msgstr "몰타어"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:533
 msgid "Maltese (with US layout)"
 msgstr "몰타어 (미국식 키 배치)"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:534
+msgid "Maori"
+msgstr "마오리어"
+
+#: ../rules/base.xml.in.h:535
+msgid "Mari"
+msgstr "마리어"
+
+#: ../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 키보드"
 
-#: ../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 "메뉴"
 
-#: ../rules/base.xml.in.h:526
+#: ../rules/base.xml.in.h:540
 msgid "Meta is mapped to Left Win"
 msgstr "메타 키를 왼쪽 윈도우 키로 매핑"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:541
 msgid "Meta is mapped to Win keys"
 msgstr "메타 키를 윈도우 키로 매핑"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:542
 msgid "Meta on Left Ctrl"
 msgstr "메타 키를 왼쪽 Ctrl에"
 
-#: ../rules/base.xml.in.h:529
+#: ../rules/base.xml.in.h:543
 msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr "마이크로소프트 컴포트 커브 키보드 2000"
 
-#: ../rules/base.xml.in.h:530
+#: ../rules/base.xml.in.h:544
 msgid "Microsoft Internet Keyboard"
 msgstr "마이크로소프트 인터넷 키보드"
 
-#: ../rules/base.xml.in.h:531
+#: ../rules/base.xml.in.h:545
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "마이크로소프트 인터넷 키보드 프로, 스웨덴"
 
-#: ../rules/base.xml.in.h:532
+#: ../rules/base.xml.in.h:546
 msgid "Microsoft Natural"
 msgstr "마이크로소프트 내츄럴"
 
-#: ../rules/base.xml.in.h:533
+#: ../rules/base.xml.in.h:547
 msgid "Microsoft Natural Keyboard Elite"
 msgstr "마이크로소프트 내츄럴 키보드 엘리트"
 
-#: ../rules/base.xml.in.h:534
+#: ../rules/base.xml.in.h:548
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "마이크로소프트 내츄럴 키보드 / 마이크로소프트 인터넷 키보드 프로"
 
-#: ../rules/base.xml.in.h:535
+#: ../rules/base.xml.in.h:549
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "마이크로소프트 내츄럴 키보드 프로 OEM"
 
-#: ../rules/base.xml.in.h:536
+#: ../rules/base.xml.in.h:550
 msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
 msgstr "마이크로소프트 내츄럴 키보드 프로 USB / 마이크로소프트 인터넷 키보드 프로"
 
-#: ../rules/base.xml.in.h:537
+#: ../rules/base.xml.in.h:551
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr "마이크로소프트 내츄럴 무선 어고노믹 키보드 4000"
 
-#: ../rules/base.xml.in.h:538
+#: ../rules/base.xml.in.h:552
 msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr "마이크로소프트 내츄럴 무선 어고노믹 키보드 7000"
 
-#: ../rules/base.xml.in.h:539
+#: ../rules/base.xml.in.h:553
 msgid "Microsoft Office Keyboard"
 msgstr "마이크로소프트 오피스 키보드"
 
-#: ../rules/base.xml.in.h:540
+#: ../rules/base.xml.in.h:554
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "마이크로소프트 무선 멀티미디어 키보드 1.0A"
 
-#: ../rules/base.xml.in.h:541
+#: ../rules/base.xml.in.h:555
 msgid "Miscellaneous compatibility options"
 msgstr "기타 호환성 옵션"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:556
 msgid "Mongolian"
 msgstr "몽골어"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:557
 msgid "Montenegrin"
 msgstr "몬테네그로어"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:558
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "몬테네그로어 (키릴 문자, 각괄호 포함)"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:559
 msgid "Montenegrin (Cyrillic)"
 msgstr "몬테네그로어 (키릴 문자)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "몬테네그로어 (키릴 문자, Z와 ZHE 뒤바꾸기)"
 
-#: ../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:561
+msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "몬테네그로어 (라틴 유니코드 QWERTY)"
 
-#: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
+#: ../rules/base.xml.in.h:562
+msgid "Montenegrin (Latin Unicode)"
 msgstr "몬테네그로어 (라틴 유니코드)"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:563
+msgid "Montenegrin (Latin qwerty)"
+msgstr "몬테네그로어 (라틴 QWERTY)"
+
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "몬테네그로어 (라틴, 각괄호 포함)"
 
-#: ../rules/base.xml.in.h:551
-msgid "Māori"
-msgstr "마오리어"
-
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:565
 msgid "NICOLA-F style Backspace"
 msgstr "NICOLA-F 방식 백스페이스"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:566
 msgid "Nepali"
 msgstr "네팔어"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:567
 msgid "Non-breakable space character at fourth level"
 msgstr "4번째 단계에서 강제 공백 문자"
 
-#: ../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 "4번째 단계에서 강제 공백 문자, 6번째 단계에서 얇은 강제 공백 문자"
 
-#: ../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 "4번째 단계에서 강제 공백 문자, 6번째 단계에서 얇은 강제 공백 문자 (Ctrl+Shift 사용)"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at second level"
 msgstr "2번째 단계에서 강제 공백 문자"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at third level"
 msgstr "3번째 단계에서 강제 공백 문자"
 
-#: ../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 "3번째 단계에서 강제 공백 문자, 4번째에서는 출력 없음."
 
-#: ../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 "3번째 단계에서 강제 공백 문자, 4번째에서는 얇은 강제 공백 문자."
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:574
+msgid "Northern Saami (Finland)"
+msgstr "북 사오미 (핀란드)"
+
+#: ../rules/base.xml.in.h:575
+msgid "Northern Saami (Norway)"
+msgstr "북 사오미 (노르웨이)"
+
+#: ../rules/base.xml.in.h:576
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "북 사오미 (노르웨이, 데드키 없음)"
+
+#: ../rules/base.xml.in.h:577
+msgid "Northern Saami (Sweden)"
+msgstr "북 사오미 (스웨덴)"
+
+#: ../rules/base.xml.in.h:578
 msgid "Northgate OmniKey 101"
 msgstr "노스게이트 OmniKey 101"
 
-#: ../rules/base.xml.in.h:562
+#: ../rules/base.xml.in.h:579
 msgid "Norwegian"
 msgstr "노르웨이어"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:580
 msgid "Norwegian (Dvorak)"
 msgstr "노르웨이어 (드보락)"
 
-#: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
-msgstr "노르웨이어 (맥) "
-
-#: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
-msgstr "노르웨이어 (맥, 데드키 없음)"
+#: ../rules/base.xml.in.h:581
+msgid "Norwegian (Macintosh)"
+msgstr "노르웨이어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
-msgstr "노르웨이어 (북 사오미)"
+#: ../rules/base.xml.in.h:582
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "노르웨이어 (매킨토시, 데드키 없음)"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:583
 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: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 "숫자 키패드의 Delete 키 동작"
 
-#: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
-msgstr "숫자 키패드 키가 맥과 동일하게 동작"
+#: ../rules/base.xml.in.h:586
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "숫자 키패드 키가 매킨토시와 동일하게 동작"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:587
 msgid "Numeric keypad layout selection"
 msgstr "숫자 키패드 배치 선택"
 
-#: ../rules/base.xml.in.h:573
+#: ../rules/base.xml.in.h:588
 msgid "OLPC"
 msgstr "OLPC"
 
+#: ../rules/base.xml.in.h:589
+msgid "Occitan"
+msgstr "오크어"
+
+#: ../rules/base.xml.in.h:590
+msgid "Ogham"
+msgstr "오검 문자"
+
+# 아일랜드 변종
+#: ../rules/base.xml.in.h:591
+msgid "Ogham (IS434)"
+msgstr "오검 문자 (IS434)"
+
 # Oriya - 인도 방언
-#: ../rules/base.xml.in.h:574
+#: ../rules/base.xml.in.h:592
 msgid "Oriya"
 msgstr "오리야어"
 
-#: ../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 키보드"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:594
+msgid "Ossetian (Georgia)"
+msgstr "오세트어 (그루지아)"
+
+#: ../rules/base.xml.in.h:595
+msgid "Ossetian (WinKeys)"
+msgstr "오세트어 (윈도우 키)"
+
+#: ../rules/base.xml.in.h:596
+msgid "Ossetian (legacy)"
+msgstr "오세트어 (구형)"
+
+#: ../rules/base.xml.in.h:597
 msgid "PC-98xx Series"
 msgstr "PC-98xx 시리즈"
 
+#: ../rules/base.xml.in.h:598
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "판노니아 루테니아 (음성 기호)"
+
 # 아프가니스탄
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:599
 msgid "Pashto"
 msgstr "파슈토어"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:600
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "파슈토어 (아프가니스탄, 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 "페르시아어"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:603
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "페르시아어 (아프가니스탄, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:604
 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:605 ../rules/base.extras.xml.in.h:24
 msgid "Polish"
 msgstr "폴란드어"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:606
 msgid "Polish (Dvorak)"
 msgstr "폴란드어 (드보락)"
 
-#: ../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 "폴란드어 (드보락, 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 "폴란드어 (드보락, 따옴표 키에 폴란드어 따옴표)"
 
-#: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
-msgstr "폴란드어 (카슈브어)"
-
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:609
 msgid "Polish (programmer Dvorak)"
 msgstr "폴란드어 (프로그래머 드보락)"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:610
 msgid "Polish (qwertz)"
 msgstr "폴란드어 (QWERTZ)"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:611
 msgid "Portuguese"
 msgstr "포르투갈어"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:612
 msgid "Portuguese (Brazil)"
 msgstr "포르투갈어 (브라질)"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:613
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "포르투갈어 (브라질, 드보락)"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "포르투갈어 (브라질, 데드키 없음)"
 
 # 나티보 - 아메리카 소수 언어
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "포르투갈어 (브라질, 에스페란토 나티보)"
 
 # 나티보 - 아메리카 소수 언어
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "포르투갈어 (브라질, 미국 키보드 나티보)"
 
 # 나티보 - 아메리카 소수 언어
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, nativo)"
 msgstr "포르투갈어 (브라질, 나티보)"
 
-#: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
-msgstr "포르투갈어 (맥)"
-
-#: ../rules/base.xml.in.h:599
-msgid "Portuguese (Mac, Sun dead keys)"
-msgstr "포르투갈어 (맥, 썬 데드키)"
+#: ../rules/base.xml.in.h:618
+msgid "Portuguese (Macintosh)"
+msgstr "포르투갈어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:600
-msgid "Portuguese (Mac, eliminate dead keys)"
-msgstr "포르투갈어 (맥, 데드키 없음)"
+#: ../rules/base.xml.in.h:619
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "포르투갈어 (매킨토시, 썬 데드키)"
 
-# 나티보 - 아메리카 소수 언어
-#: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr "포르투갈어 (나티보, 에스페란토)"
+#: ../rules/base.xml.in.h:620
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "포르투갈어 (매킨토시, 데드키 없음)"
 
 # 나티보 - 아메리카 소수 언어
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "포르투갈어 (나티보, 미국 키보드)"
 
 # 나티보 - 아메리카 소수 언어
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Nativo)"
 msgstr "포르투갈어 (나티보)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Sun dead keys)"
 msgstr "포르투갈어 (썬 데드키)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (eliminate dead keys)"
 msgstr "포르투갈어 (데드키 없음)"
 
-#: ../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 "펀자브어 (구르무키 문자, 젤룸)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:628
 msgid "Punjabi (Gurmukhi)"
 msgstr "펀자브어 (구르무키 문자)"
 
-#: ../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"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:631
 msgid "Right Alt (while pressed)"
 msgstr "오른쪽 Alt (누르고 있는 동안)"
 
-#: ../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로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 5번째 단계 고정, 한 번 누르면 고정 해제"
 
-#: ../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로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
 
-#: ../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로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정, 한 번 누르면 고정 해제"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:635
 msgid "Right Alt key never chooses 3rd level"
 msgstr "오른쪽 Alt는 3번째 단계를 선택하지 않음"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "오른쪽 Alt, Shift+오른쪽 Alt가 Multi_Key"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:637
 msgid "Right Ctrl"
 msgstr "오른쪽 Ctrl"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:638
 msgid "Right Ctrl (while pressed)"
 msgstr "오른쪽 Ctrl (누르고 있는 동안)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:639
 msgid "Right Ctrl as Right Alt"
 msgstr "오른쪽 Ctrl 키를 오른쪽 Alt 키로"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:640
 msgid "Right Ctrl is mapped to Menu"
 msgstr "오른쪽 Ctrl 키를 메뉴 키로 매핑"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl+Right Shift"
 msgstr "오른쪽 Ctrl+오른쪽 Alt"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:642
 msgid "Right Shift"
 msgstr "오른쪽 Shift"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:643
 msgid "Right Win"
 msgstr "오른쪽 윈도우"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:644
 msgid "Right Win (while pressed)"
 msgstr "오른쪽 윈도우 (누르고 있는 동안)"
 
-#: ../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 "오른쪽 윈도우로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정"
 
-#: ../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 "오른쪽 윈도우로 5번째 단계 선택, 다른 5번째 단계 선택 키와 같이 누르면 고정, 한 번 누르면 고정 해제"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
 msgid "Romanian"
 msgstr "루마니아어"
 
-#: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr "루마니아어 (크림타타르, Dobruca-1 Q)"
-
-#: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr "루마니아어 (크림타타르, Dobruca-2 Q)"
-
-#: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-msgstr "루마니아어 (크림타타르, 터키어 Alt-Q)"
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (Germany)"
+msgstr "루마니아어 (독일)"
 
-#: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
-msgstr "루마니아어 (크림타타르, 터키어 F)"
+#: ../rules/base.xml.in.h:649
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "루마니아어 (독일, 데드키 없음)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:650
 msgid "Romanian (WinKeys)"
 msgstr "루마니아어 (윈도우 키)"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (cedilla)"
 msgstr "루미니아어 (세디유)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (standard cedilla)"
 msgstr "루마니아어 (표준 세디유)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (standard)"
 msgstr "루마니아어 (표준)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:654
 msgid "Rupee on 4"
 msgstr "루피를 4 키에"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
 msgid "Russian"
 msgstr "러시아어"
 
-# FIXME: 브랜드?
-#: ../rules/base.xml.in.h:639
-msgid "Russian (Bashkirian)"
-msgstr "러시아어 (Bashkirian)"
-
-# http://ko.wikipedia.org/wiki/%EC%B6%94%EB%B0%94%EC%8B%9C%EC%96%B4
-#: ../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:656
 msgid "Russian (DOS)"
 msgstr "러시아어 (DOS)"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:657
 msgid "Russian (Georgia)"
 msgstr "러시아어 (그루지아)"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:658
 msgid "Russian (Germany, phonetic)"
 msgstr "러시아어 (독일, 음성 표기)"
 
-#: ../rules/base.xml.in.h:645
-msgid "Russian (Kalmyk)"
-msgstr "러시아어 (칼미크)"
-
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:659
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "러시아어 (카자흐스탄, 카자흐어 포함)"
 
-#: ../rules/base.xml.in.h:647
-msgid "Russian (Komi)"
-msgstr "러시아어 (코미)"
-
-#: ../rules/base.xml.in.h:648
-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:660
 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:661
 msgid "Russian (Sweden, phonetic)"
 msgstr "러시아어 (스웨덴, 음성 표기)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "러시아어 (스웨덴, 음성 표기, 데드키 없음)"
 
-#: ../rules/base.xml.in.h:655
-msgid "Russian (Tatar)"
-msgstr "러시아어 (타타르)"
-
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:663
 msgid "Russian (US, phonetic)"
 msgstr "러시아어 (미국, 음성 표기)"
 
-#: ../rules/base.xml.in.h:657
-msgid "Russian (Udmurt)"
-msgstr "러시아어 (우드무르트)"
-
-#: ../rules/base.xml.in.h:658
-msgid "Russian (Yakut)"
-msgstr "러시아어 (야쿠트)"
+#: ../rules/base.xml.in.h:664
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "러시아어 (우크라이나, 표준 RSTU)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:665
 msgid "Russian (legacy)"
 msgstr "러시아어 (구형)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:666
 msgid "Russian (phonetic WinKeys)"
 msgstr "러시아어 (음성 표기, 윈도우 키)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:667
 msgid "Russian (phonetic)"
 msgstr "러시아어 (음성 표기)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:668
 msgid "Russian (typewriter)"
 msgstr "러시아어 (타자기)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:669
 msgid "Russian (typewriter, legacy)"
 msgstr "러시아어 (타자기, 구형)"
 
-#: ../rules/base.xml.in.h:664
+#: ../rules/base.xml.in.h:670
 msgid "SILVERCREST Multimedia Wireless Keyboard"
 msgstr "SILVERCREST Multimedia Wireless 키보드"
 
-#: ../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 "사이시얏트 (타이완)"
 
-#: ../rules/base.xml.in.h:672
+#: ../rules/base.xml.in.h:678
 msgid "Samsung SDM 4500P"
 msgstr "삼성 SDM 4500P"
 
-#: ../rules/base.xml.in.h:673
+#: ../rules/base.xml.in.h:679
 msgid "Samsung SDM 4510P"
 msgstr "삼성 SDM 4510P"
 
 # Sanwa Supply - 일본 제조사
-#: ../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 "슈스와프어"
-
-#: ../rules/base.xml.in.h:677
+#: ../rules/base.xml.in.h:682
 msgid "Semi-colon on third level"
 msgstr "3번째 단계에서 세미콜론"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
 msgid "Serbian"
 msgstr "세르비아어"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "세르비아어 (라틴 유니코드 QWERTY)"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin Unicode)"
 msgstr "세르비아어 (라틴 유니코드)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:686
 msgid "Serbian (Latin qwerty)"
 msgstr "세르비아어 (라틴 QWERTY)"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin with guillemets)"
 msgstr "세르비아어 (라틴, 각괄호 포함)"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin)"
 msgstr "세르비아어 (라틴)"
 
-#: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr "세르비아어 (판노니아 루테니아 기호)"
+#: ../rules/base.xml.in.h:689
+msgid "Serbian (Russia)"
+msgstr "세르비아어 (러시아)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "세르비아어 (Z와 ZHE 뒤바꾸기)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (with guillemets)"
 msgstr "세르비아어 (각괄호 포함)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:692
 msgid "Serbo-Croatian (US)"
 msgstr "세르보크로아트어 (미국)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:693
 msgid "Shift cancels Caps Lock"
 msgstr "Shift를 누르면 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를 누르면 Num Lock을 끄지 않고, 3번째 단계를 선택"
 
-#: ../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와 동시에 숫자 키패드 키를 누르면 MS 윈도우즈와 동일하게 동작"
 
-#: ../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 "신디어"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:698
 msgid "Sinhala"
 msgstr "싱할라어"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:699
 msgid "Slovak"
 msgstr "슬로바키아어"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:700
 msgid "Slovak (extended Backslash)"
 msgstr "슬로바키아어 (확장 백슬래시)"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:701
 msgid "Slovak (qwerty)"
 msgstr "슬로바키아어 (QWERTY)"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:702
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "슬로바키아어 (QWERTY, 백슬래시 확장)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Slovene"
+#: ../rules/base.xml.in.h:703
+msgid "Slovenian"
 msgstr "슬로베니아어"
 
-#: ../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 "슬로베니아어 (미국식 키보드, 슬로베니아 문자 포함)"
 
-#: ../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 "슬로베니아어 (따옴표에 각괄호 사용)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:706
 msgid "Spanish"
 msgstr "스페인어"
 
-# 아스투리아스 - 스페인 지역
-#: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr "스페인어 (아스투리아스어 변종, 가운데점 H 및 가운데점 L 포함)"
-
-#: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr "스페인어 (카탈로니아어 변종, 가운데점 L 포함)"
-
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Spanish (Dvorak)"
 msgstr "스페인어 (드보락)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Spanish (Latin American)"
 msgstr "스페인어 (라틴 아메리카)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "스페인어 (라틴 아메리카, 썬 데드키)"
+
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "스페인어 (라틴 아메리카, 데드키 없음)"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "스페인어 (라틴 아메리카, 물결 데드키 포함)"
 
-#: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, sun dead keys)"
-msgstr "스페인어 (라틴 아메리카, 썬 데드키)"
-
-#: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
-msgstr "스페인어 (맥)"
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Macintosh)"
+msgstr "스페인어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Sun dead keys)"
 msgstr "스페인어 (썬 데드키)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (eliminate dead keys)"
 msgstr "스페인어 (데드키 없음)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (include dead tilde)"
 msgstr "스페인어 (물결 데드키 포함)"
 
-#: ../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 "특수 키는 (Ctrl+Alt+&lt;키&gt;) 서버에서 처리"
 
-#: ../rules/base.xml.in.h:714
+#: ../rules/base.xml.in.h:717
 msgid "Sun Type 5/6"
 msgstr "썬 타입 5/6"
 
-#: ../rules/base.xml.in.h:715
+#: ../rules/base.xml.in.h:718
 msgid "Super Power Multimedia Keyboard"
 msgstr "Super Power 멀티미디어 키보드"
 
-#: ../rules/base.xml.in.h:716
+#: ../rules/base.xml.in.h:719
 msgid "Swahili (Kenya)"
 msgstr "스와힐리어 (케냐)"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Swahili (Tanzania)"
 msgstr "스와힐리어 (탄자니아)"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Ctrl과 Caps Lock 뒤바꾸기"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swap ESC and Caps Lock"
 msgstr "ESC와 Caps Lock 뒤바꾸기"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swedish"
 msgstr "스웨덴어"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swedish (Dvorak)"
 msgstr "스웨덴어 (드보락)"
 
-#: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
-msgstr "스웨덴어 (맥)"
+#: ../rules/base.xml.in.h:725
+msgid "Swedish (Macintosh)"
+msgstr "스웨덴어 (매킨토시)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish (Svdvorak)"
 msgstr "스웨덴어 (SV 드보락)"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (eliminate dead keys)"
 msgstr "스웨덴어 (데드키 없음)"
 
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
-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
+msgid "Swedish Sign Language"
+msgstr "스웨덴 기호 언어"
+
+#: ../rules/base.xml.in.h:729
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (타블렛 PC)"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:730
 msgid "Syriac"
 msgstr "시리아어"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:731
 msgid "Syriac (phonetic)"
 msgstr "시리아어 (음성 기호)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:732
 msgid "Taiwanese"
 msgstr "타이완"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:733
 msgid "Taiwanese (indigenous)"
 msgstr "타이완 (원주민)"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:734
 msgid "Tajik"
 msgstr "타지키스탄"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:735
 msgid "Tajik (legacy)"
 msgstr "타지키스탄 (구형)"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:736
 msgid "Tamil"
 msgstr "타밀어"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:737
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "타밀어 (스리랑카, TAB 타자기)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:738
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "타밀어 (스리랑카, 유니코드)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:739
 msgid "Tamil (TAB typewriter)"
 msgstr "타밀어 (TAB 타자기)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (TSCII typewriter)"
 msgstr "타밀어 (TSCII 타자기)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Unicode)"
 msgstr "타밀어 (유니코드)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (keyboard with numerals)"
 msgstr "타밀어 (숫자 포함 키보드)"
 
-#: ../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 "타타르어"
+
+#: ../rules/base.xml.in.h:745
 msgid "Telugu"
 msgstr "텔루구어"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
 msgid "Thai"
 msgstr "타이어"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "타이어 (Pattachote)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
 msgid "Thai (TIS-820.2538)"
 msgstr "타이어 (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
+msgid "Tibetan"
+msgstr "티베트어"
+
+#: ../rules/base.xml.in.h:750
+msgid "Tibetan (with ASCII numerals)"
+msgstr "티베트어 (ASCII 숫자 포함)"
+
+#: ../rules/base.xml.in.h:751
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "드보락 키보드에서 해당하는 키로."
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:752
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "QWERTY 키보드에서 해당하는 키로."
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:753
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "포인터키를 Shift + NumLock 키로 토글"
 
-#: ../rules/base.xml.in.h:750
+#: ../rules/base.xml.in.h:754
 msgid "Toshiba Satellite S3000"
 msgstr "도시바 Satellite S3000"
 
-#: ../rules/base.xml.in.h:751
+#: ../rules/base.xml.in.h:755
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access 키보드"
 
-#: ../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 "츠와나어"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:759
 msgid "Turkish"
 msgstr "터키어"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:760
 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:761
 msgid "Turkish (F)"
 msgstr "터키어 (F)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:762
 msgid "Turkish (Sun dead keys)"
 msgstr "터키어 (썬 데드키)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (international with dead keys)"
 msgstr "터키어 (국제 버전, 데드키 포함)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:764
 msgid "Turkmen"
 msgstr "투르크멘어"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:765
 msgid "Turkmen (Alt-Q)"
 msgstr "투르크멘어 (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:유럽 모드)"
 
-#: ../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:일본 모드)"
 
-#: ../rules/base.xml.in.h:770
-msgid "Ukrainian"
-msgstr "우크라이나어"
-
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "우크라이나어 (크림타타르, 터키어 Alt-Q)"
+msgid "Udmurt"
+msgstr "우드무르트어"
 
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "우크라이나어 (크림타타르, 터키어 F)"
+msgid "Ukrainian"
+msgstr "우크라이나어"
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "우크라이나어 (크림타타르, 터키어 Q)"
-
-#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (WinKeys)"
 msgstr "우크라이나어 (윈도우 키)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (homophonic)"
 msgstr "우크라이나어 (homophonic)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (legacy)"
 msgstr "우크라이나어 (구형)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (phonetic)"
 msgstr "우크라이나어 (음성 기호)"
 
-#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr "우크라이나어 (표준 RSTU, 러시아어 키 배치)"
-
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (standard RSTU)"
 msgstr "우크라이나어 (표준 RSTU)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (typewriter)"
 msgstr "우크라이나어 (타자기)"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:779
 msgid "Unicode additions (arrows and math operators)"
 msgstr "유니코드 추가 (화살표 및 수학 기호)"
 
-#: ../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 "유니코드 추가 (화살표 및 수학 기호). 수학 기호를 기본 단계에"
 
 # Unitek - 유니텍(unitech)이 아님
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:781
 msgid "Unitek KB-1925"
 msgstr "Unitek KB-1925"
 
 # Urdu - 인도 방언
-#: ../rules/base.xml.in.h:784
+#: ../rules/base.xml.in.h:782
 msgid "Urdu (Pakistan)"
 msgstr "우르두어 (파키스탄)"
 
 # Urdu - 인도 방언
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:783
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "우르두어 (파키스탄, CRULP)"
 
 # Urdu - 인도 방언
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:784
 msgid "Urdu (Pakistan, NLA)"
 msgstr "우르두어 (파키스탄, NLA)"
 
 # Urdu - 인도 방언
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (WinKeys)"
 msgstr "우르두어 (윈도우 키)"
 
 # Urdu, 인도 방언
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (alternative phonetic)"
 msgstr "우르두어 (다른 음성 기호 버전)"
 
 # Urdu - 인도 방언
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (phonetic)"
 msgstr "우르두어 (음성 표기)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:788
 msgid "Use keyboard LED to show alternative layout"
 msgstr "키보드 LED에서 다른 키보드 배치 사용 표시"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:789
 msgid "Using space key to input non-breakable space character"
 msgstr "스페이스 키가 강제 공백 출력."
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:790
 msgid "Usual space at any level"
 msgstr "모든 단계에서 일반 공백 문자"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "위구르어"
+
+#: ../rules/base.xml.in.h:792
 msgid "Uzbek"
 msgstr "우즈베크어"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:793
 msgid "Uzbek (Afghanistan)"
 msgstr "우즈베크어 (아프가니스탄)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:794
 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
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek (Latin)"
 msgstr "우즈베크어 (라틴)"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:796
 msgid "Vietnamese"
 msgstr "베트남어"
 
-#: ../rules/base.xml.in.h:801
+#: ../rules/base.xml.in.h:797
 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:798
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Wang 724 키패드, 유니코드 추가 (화살표 및 수학 기호)"
 
-#: ../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 키패드, 유니코드 추가 (화살표 및 수학 기호), 수학 기호를 기본 단계에"
 
-#: ../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 "월로프어"
 
-#: ../rules/base.xml.in.h:806
+#: ../rules/base.xml.in.h:802
 msgid "Yahoo! Internet Keyboard"
 msgstr "야후! 인터넷 키보드"
 
+#: ../rules/base.xml.in.h:803
+msgid "Yakut"
+msgstr "야큐트어"
+
 # 나이지리아 변종
-#: ../rules/base.xml.in.h:807
+#: ../rules/base.xml.in.h:804
 msgid "Yoruba"
 msgstr "요루바어"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:805
 msgid "Zero-width non-joiner character at second level"
 msgstr "2번째 단계에서 폭 없는 연결 금지 문자"
 
-#: ../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 "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자"
 
-#: ../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 "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자, 4번째에서는 없음"
 
-#: ../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 "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자, 4번째에서는 얇은 강제 공백 문자"
 
-#: ../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 "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 강제 공백 문자, 4번째에서는 폭 없는 연결 문자"
 
-#: ../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 "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 폭 없는 연결 문자"
 
-#: ../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 "2번째 단계에서 폭 없는 연결 금지 문자, 3번째에서는 폭 없는 연결 문자, 4번째에서는 강제 공백 문자"
 
-#: ../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 "3번째 단계에서 폭 없는 연결 금지 문자, 4번째에서는 폭 없는 연결 문자"
 
-#: ../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"
 
 # Braille
-#: ../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 "이란"
-
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr "이란 - 아베스탄"
+msgid "APL Keyboard Symbols"
+msgstr "APL 키보드 기호"
 
+# 아스시나 - 미국 원주민 부족
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "리투아니아"
+msgid "Atsina"
+msgstr "아트시나"
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
-msgstr "리투아니아 - 드보락"
+msgid "Avestan"
+msgstr "아베스탄"
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "리투아니아"
-
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "루마니아"
+msgid "Couer D'alene Salish"
+msgstr "Couer D'alene Salish"
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr "루마니아 - 어고노믹 터치 방식"
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "영어 (미국, 국제 버전 AltGr 유니코드 조합)"
 
 #: ../rules/base.extras.xml.in.h:9
-msgid "Rou"
-msgstr "루마니아"
-
-#: ../rules/base.extras.xml.in.h:10
-msgid "Rus"
-msgstr "러시아"
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "영어 (미국, 국제 버전 AltGr 유니코드 조합, 다른 버전)"
 
+# 쿠테나이 - 아메리카 원주민 
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "러시아"
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
-msgstr "세르비아"
+msgid "Kutenai"
+msgstr "쿠테나이어"
 
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
-msgstr "세르비아 - 데드키 대신 조합으로 액센트 입력"
+msgid "Latvian (US Colemak)"
+msgstr "라트비아어 (미국 Colemak)"
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
-msgstr "Srb"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "라트비아어 (미국 Colemak, 아포스트로피 변종)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "미국"
+msgid "Latvian (US Dvorak)"
+msgstr "라트비아어 (미국 드보락)"
 
-# 아스시나 - 미국 원주민 부족
 #: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
-msgstr "미국 - 아트시나"
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "라트비아어 (미국 드보락, Y 변종)"
 
 #: ../rules/base.extras.xml.in.h:17
-msgid "USA - Couer D'alene Salish"
-msgstr "미국 - Couer D'alene Salish"
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr "라트비아어 (미국 드보락, 빼기 기호 변종)"
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
-msgstr "미국 - 국제 (AltGr 유니코드 조합)"
+msgid "Latvian (programmer US Dvorak)"
+msgstr "라트비아어 (프로그래머 미국식 드보락)"
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
-msgstr "미국 - 국제 (AltGr 유니코드 조합, 다른 버전)"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "라트비아어 (프로그래머 미국식 드보락, Y 변종)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "라트비아어 (프로그래머 미국식 드보락, 빼기 기호 변종)"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "리투아니아어 (미국식 드보락, 리투아니아 문자 포함)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "폴란드어 (국제 버전, 데드키 포함)"
+
+#: ../rules/base.extras.xml.in.h:27
+msgid "Romanian (ergonomic Touchtype)"
+msgstr "루마니아 (어고노믹 터치 방식)"
+
+#: ../rules/base.extras.xml.in.h:29
+msgid "Russian (with UKR and BEL layout)"
+msgstr "러시아어 (UKR 및 BEL 키보드 배치 포함)"
+
+# 캐나다 소스 언어
+#: ../rules/base.extras.xml.in.h:30
+msgid "Secwepemctsin"
+msgstr "슈스와프어"
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "세르비아어 (데드키 대신 조합으로 액센트 입력)"
+
+#: ../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/xorg-server/xkeyboard-config/po/nl.po b/xorg-server/xkeyboard-config/po/nl.po
index 715ab9164..b9dc3f25b 100644
--- a/xorg-server/xkeyboard-config/po/nl.po
+++ b/xorg-server/xkeyboard-config/po/nl.po
@@ -5,7 +5,7 @@
 # Tino Meinen <tino.meinen@gmail.com>, 2007, 2008, 2009, 2011
 # ------------------------------------------------------------------------
 # Compose        -samensteltoets
-# dead keys      -dode/latente/inactieve
+# dead keys      -dode/latente/inactieve toetsen
 # guillemets     -Franse aanhalingstekens
 #                 (zie http://slackware.jiten.nl/index.cgi?list=leestekens)
 # is mapped to   -zit op de
@@ -15,16 +15,18 @@
 # level          -niveau
 # non-breakable space character - niet-afbrekende spatie/harde spatie
 # numeric keypad -cijferblok
+# UK             -UK/VK/GB/Engels
+# US             -US/VS/USA/Amerikaans
 # while pressed  -gedurende het indrukken/ingedrukt houden
 # win-key        -windows-toets/win-toets
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xkeyboard-config-2.1-pre1\n"
+"Project-Id-Version: xkeyboard-config-2.3\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-01-12 00:16+0000\n"
-"PO-Revision-Date: 2011-02-09 21:13+0800\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-05-31 09:35+0800\n"
 "Last-Translator: Tino Meinen <tino.meinen@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
@@ -37,3081 +39,3329 @@ msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;Groter dan/Kleiner dan&gt;"
 
 # locks - op slot gezet/blijvend/in stand houden
+# latches - vergrendelt
 #: ../rules/base.xml.in.h:2
-msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "&lt;Groter dan/Kleiner dan&gt; geeft het 5de niveau en is blijvend wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer"
+msgid "&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "&lt;Groter dan/Kleiner dan&gt; (geeft het 3de niveau, en vergrendelt wanneer het ingedrukt wordt samen met een andere 3de niveau-kiezer)"
 
 #: ../rules/base.xml.in.h:3
-msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "&lt;Groter dan/Kleiner dan&gt; geeft het 5de niveau en is blijvend wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer, één toetsaanslag heft het niveau op"
+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;Groter dan/Kleiner dan&gt; geeft het 5de niveau en vergrendelt wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer, één toetsaanslag heft de vergrendeling op"
 
+# locks - op slot gezet/blijvend/in stand houden
 #: ../rules/base.xml.in.h:4
-msgid "(F)"
-msgstr "(F)"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser"
+msgstr "&lt;Groter dan/Kleiner dan&gt; geeft het 5de niveau en vergrendelt het ingedrukt wordt samen met een andere 5de niveau-kiezer"
 
 #: ../rules/base.xml.in.h:5
-msgid "(Legacy) Alternative"
-msgstr "(Historisch) alternatief"
+msgid "&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
+msgstr "&lt;Groter dan/Kleiner dan&gt; 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:6
-msgid "(Legacy) Alternative, Sun dead keys"
-msgstr "(Historisch) alternatief, Sun ‘dode toetsen’"
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
 
 #: ../rules/base.xml.in.h:7
-msgid "(Legacy) Alternative, eliminate dead keys"
-msgstr "(Historisch) alternatief, zonder dode toetsen"
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
 
 #: ../rules/base.xml.in.h:8
-msgid "101/104 key Compatible"
-msgstr "101/104-toetsen compatibel"
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech draadloos toetsenbord RFKB-23"
 
 #: ../rules/base.xml.in.h:9
-msgid "101/qwerty/comma/Dead keys"
-msgstr "101/qwerty/komma/dode toetsen"
+msgid "ATM/phone-style"
+msgstr "ATM/telefoonstijl"
 
 #: ../rules/base.xml.in.h:10
-msgid "101/qwerty/comma/Eliminate dead keys"
-msgstr "101/qwerty/komma/zonder dode toetsen"
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
 
 #: ../rules/base.xml.in.h:11
-msgid "101/qwerty/dot/Dead keys"
-msgstr "101/qwerty/punt/dode toetsen"
+msgid "Acer C300"
+msgstr "Acer C300"
 
 #: ../rules/base.xml.in.h:12
-msgid "101/qwerty/dot/Eliminate dead keys"
-msgstr "101/qwerty/punt/zonder dode toetsen"
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
 
 #: ../rules/base.xml.in.h:13
-msgid "101/qwertz/comma/Dead keys"
-msgstr "101/qwertz/komma/dode toetsen"
+msgid "Acer Laptop"
+msgstr "Acer laptop"
 
 #: ../rules/base.xml.in.h:14
-msgid "101/qwertz/comma/Eliminate dead keys"
-msgstr "101/qwertz/komma/zonder dode toetsen"
+msgid "Add the standard behavior to Menu key"
+msgstr "Het standaard gedrag toevoegen aan de Menu-toets"
 
 #: ../rules/base.xml.in.h:15
-msgid "101/qwertz/dot/Dead keys"
-msgstr "101/qwertz/punt/dode toetsen"
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Esperanto circonflexes toevoegen (supersigno)"
 
+# op afbeelden/aan toekennen
 #: ../rules/base.xml.in.h:16
-msgid "101/qwertz/dot/Eliminate dead keys"
-msgstr "101/qwertz/punt/zonder dode toetsen"
+msgid "Adding currency signs to certain keys"
+msgstr "Het Euro-teken aan bepaalde toetsen toekennen"
 
 #: ../rules/base.xml.in.h:17
-msgid "102/qwerty/comma/Dead keys"
-msgstr "102/qwerty/komma/dode toetsen"
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
 
 #: ../rules/base.xml.in.h:18
-msgid "102/qwerty/comma/Eliminate dead keys"
-msgstr "102/qwerty/komma/zonder dode toetsen"
+msgid "Afghani"
+msgstr "Afghaans"
 
 #: ../rules/base.xml.in.h:19
-msgid "102/qwerty/dot/Dead keys"
-msgstr "102/qwerty/punt/dode toetsen"
+msgid "Akan"
+msgstr "Akaans"
 
 #: ../rules/base.xml.in.h:20
-msgid "102/qwerty/dot/Eliminate dead keys"
-msgstr "102/qwerty/punt/zonder dode toetsen"
+msgid "Albanian"
+msgstr "Albanees"
 
 #: ../rules/base.xml.in.h:21
-msgid "102/qwertz/comma/Dead keys"
-msgstr "102/qwertz/komma/dode toetsen"
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt en Meta zitten op de Alt-toetsen"
 
+# wordt afgebeeld op/zit op
+# zit op is veel korter en is ook duidelijker
 #: ../rules/base.xml.in.h:22
-msgid "102/qwertz/comma/Eliminate dead keys"
-msgstr "102/qwertz/komma/zonder dode toetsen"
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt zit op de rechter Win-toets, Super op de Menu-toets"
 
 #: ../rules/base.xml.in.h:23
-msgid "102/qwertz/dot/Dead keys"
-msgstr "102/qwertz/punt/dode toetsen"
+msgid "Alt+Caps Lock"
+msgstr "Alt+Caps Lock"
 
 #: ../rules/base.xml.in.h:24
-msgid "102/qwertz/dot/Eliminate dead keys"
-msgstr "102/qwertz/punt/zonder dode toetsen"
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
 
 #: ../rules/base.xml.in.h:25
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
 
 #: ../rules/base.xml.in.h:26
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
+msgid "Alt+Space"
+msgstr "Alt+Spatie"
 
 #: ../rules/base.xml.in.h:27
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech draadloos toetsenbord RFKB-23"
+msgid "Alt/Win key behavior"
+msgstr "Alt/Win-toets gedrag"
 
+# Het Amhaars is een Semitische taal die in Ethiopië gesproken wordt
 #: ../rules/base.xml.in.h:28
-msgid "ATM/phone-style"
-msgstr "ATM/telefoonstijl"
+msgid "Amharic"
+msgstr "Amhaars"
 
+# Beide/Willekeurige/Een van de/Een/Elke
 #: ../rules/base.xml.in.h:29
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
+msgid "Any Alt key"
+msgstr "Elke Alt-toets"
 
 #: ../rules/base.xml.in.h:30
-msgid "Acer C300"
-msgstr "Acer C300"
+msgid "Any Win key"
+msgstr "Elke Win-toets"
 
+# Beide Win-toetsen wisselen de indeling gedurende het indrukken.<
+# gedurende het indrukken/ingedrukt houden (vrij vertaald)
 #: ../rules/base.xml.in.h:31
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
+msgid "Any Win key (while pressed)"
+msgstr "Elke Win-toets (ingedrukt houden)"
 
 #: ../rules/base.xml.in.h:32
-msgid "Acer Laptop"
-msgstr "Acer laptop"
+msgid "Apple"
+msgstr "Apple"
 
 #: ../rules/base.xml.in.h:33
-msgid "Add the standard behavior to Menu key"
-msgstr "Het standaard gedrag toevoegen aan de Menu-toets"
+msgid "Apple Aluminium Keyboard (ANSI)"
+msgstr "Apple Aluminium Toetsenbord (ANSI)"
 
 #: ../rules/base.xml.in.h:34
-msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr "Esperanto circonflexes toevoegen (supersigno)"
+msgid "Apple Aluminium Keyboard (ISO)"
+msgstr "Apple Aluminium Toetsenbord (ISO)"
 
-# op afbeelden/aan toekennen
 #: ../rules/base.xml.in.h:35
-msgid "Adding currency signs to certain keys"
-msgstr "Het Euro-teken aan bepaalde toetsen toekennen"
+msgid "Apple Aluminium Keyboard (JIS)"
+msgstr "Apple Aluminium Toetsenbord (JIS)"
 
 #: ../rules/base.xml.in.h:36
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
+msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
+msgstr "Apple Aluminium toetsenbord: PC-toetsen emuleren (Print, Scroll Lock, Pause, Num Lock)"
 
 #: ../rules/base.xml.in.h:37
-msgid "Afg"
-msgstr "Afg"
+msgid "Apple Laptop"
+msgstr "Apple laptop"
 
 #: ../rules/base.xml.in.h:38
-msgid "Afghanistan"
-msgstr "Afghanistan"
+msgid "Arabic"
+msgstr "Arabisch"
 
 #: ../rules/base.xml.in.h:39
-msgid "Akan"
-msgstr "Akaans"
+msgid "Arabic (Buckwalter)"
+msgstr "Arabisch (Buckwalter)"
 
 #: ../rules/base.xml.in.h:40
-msgid "Alb"
-msgstr "Alb"
+msgid "Arabic (Morocco)"
+msgstr "Arabisch (Marokko)"
 
 #: ../rules/base.xml.in.h:41
-msgid "Albania"
-msgstr "Albanië"
+msgid "Arabic (Pakistan)"
+msgstr "Arabisch (Pakistan)"
 
 #: ../rules/base.xml.in.h:42
-msgid "Alt and Meta are on Alt keys"
-msgstr "Alt en Meta zitten op de Alt-toetsen"
+msgid "Arabic (Syria)"
+msgstr "Arabisch (Syrië)"
 
-# wordt afgebeeld op/zit op
-# zit op is veel korter en is ook duidelijker
 #: ../rules/base.xml.in.h:43
-msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr "Alt zit op de rechter Win-toets, Super op de Menu-toets"
+msgid "Arabic (azerty)"
+msgstr "Arabisch (azerty)"
 
 #: ../rules/base.xml.in.h:44
-msgid "Alt+Caps Lock"
-msgstr "Alt+Caps Lock"
+msgid "Arabic (azerty/digits)"
+msgstr "Arabisch (azerty/cijfers)"
 
 #: ../rules/base.xml.in.h:45
-msgid "Alt+Ctrl"
-msgstr "Alt+Ctrl"
+msgid "Arabic (digits)"
+msgstr "Arabisch (cijfers)"
 
 #: ../rules/base.xml.in.h:46
-msgid "Alt+Shift"
-msgstr "Alt+Shift"
+msgid "Arabic (qwerty)"
+msgstr "Arabisch (qwerty)"
 
 #: ../rules/base.xml.in.h:47
-msgid "Alt+Space"
-msgstr "Alt+Spatie"
+msgid "Arabic (qwerty/digits)"
+msgstr "Arabisch (qwerty/cijfers)"
 
-#: ../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 "Armeens"
 
 #: ../rules/base.xml.in.h:49
-msgid "Alt/Win key behavior"
-msgstr "Alt/Win-toets gedrag"
+msgid "Armenian (alternative eastern)"
+msgstr "Armeens (alternatief Oosters)"
 
-#: ../rules/base.xml.in.h:50
-msgid "Alternative"
-msgstr "Alternatief"
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
+msgid "Armenian (alternative phonetic)"
+msgstr "Armeens (alternatief fonetisch)"
 
 #: ../rules/base.xml.in.h:51
-msgid "Alternative Eastern"
-msgstr "Alternatief oosters"
+msgid "Armenian (eastern)"
+msgstr "Armeens (Oosters)"
 
 #: ../rules/base.xml.in.h:52
-msgid "Alternative Phonetic"
-msgstr "Alternatief fonetisch"
+msgid "Armenian (phonetic)"
+msgstr "Armeens (fonetisch)"
 
 #: ../rules/base.xml.in.h:53
-msgid "Alternative international"
-msgstr "Alternatief internationaal"
+msgid "Armenian (western)"
+msgstr "Armeens (Westers)"
 
 #: ../rules/base.xml.in.h:54
-msgid "Alternative, Sun dead keys"
-msgstr "Alternatief, Sun-dode toetsen"
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturisch (Spanje, met onder-punt H en onder-punt L)"
 
 #: ../rules/base.xml.in.h:55
-msgid "Alternative, eliminate dead keys"
-msgstr "Alternatief, zonder dode toetsen"
+msgid "Asus Laptop"
+msgstr "Asus laptop"
 
+# "Ctrl-toets zit linksonder"
 #: ../rules/base.xml.in.h:56
-msgid "Alternative, latin-9 only"
-msgstr "Alternatief, enkel latin-9"
+msgid "At bottom left"
+msgstr "Linksonder"
 
+# Ctrl-toets links van ‘A’
 #: ../rules/base.xml.in.h:57
-msgid "And"
-msgstr "And"
+msgid "At left of 'A'"
+msgstr "Links van de ‘A’"
 
 #: ../rules/base.xml.in.h:58
-msgid "Andorra"
-msgstr "Andorra"
+msgid "Avatime"
+msgstr "Avatime"
 
-# Beide/Willekeurige/Een van de/Een/Elke
 #: ../rules/base.xml.in.h:59
-msgid "Any Alt key"
-msgstr "Elke Alt-toets"
+msgid "Azerbaijani"
+msgstr "Azerbeidzjaans"
 
 #: ../rules/base.xml.in.h:60
-msgid "Any Win key"
-msgstr "Elke Win-toets"
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Azerbeidzjaans (Cyrillisch)"
 
-# Beide Win-toetsen wisselen de indeling gedurende het indrukken.<
-# gedurende het indrukken/ingedrukt houden (vrij vertaald)
 #: ../rules/base.xml.in.h:61
-msgid "Any Win key (while pressed)"
-msgstr "Elke Win-toets (ingedrukt houden)"
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 draadloos internettoetsenbord"
 
 #: ../rules/base.xml.in.h:62
-msgid "Apostrophe (') variant"
-msgstr "Apostrof (') variant"
+msgid "BTC 5090"
+msgstr "BTC 5090"
 
 #: ../rules/base.xml.in.h:63
-msgid "Apple"
-msgstr "Apple"
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF multimedia"
 
 #: ../rules/base.xml.in.h:64
-msgid "Apple Aluminium Keyboard (ANSI)"
-msgstr "Apple Aluminium Toetsenbord (ANSI)"
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
 
 #: ../rules/base.xml.in.h:65
-msgid "Apple Aluminium Keyboard (ISO)"
-msgstr "Apple Aluminium Toetsenbord (ISO)"
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
 
 #: ../rules/base.xml.in.h:66
-msgid "Apple Aluminium Keyboard (JIS)"
-msgstr "Apple Aluminium Toetsenbord (JIS)"
+msgid "BTC 9000"
+msgstr "BTC 9000"
 
 #: ../rules/base.xml.in.h:67
-msgid "Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"
-msgstr "Apple Aluminium toetsenbord: PC-toetsen emuleren (Print, Scroll Lock, Pause, Num Lock)"
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
 
 #: ../rules/base.xml.in.h:68
-msgid "Apple Laptop"
-msgstr "Apple laptop"
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
 
 #: ../rules/base.xml.in.h:69
-msgid "Ara"
-msgstr "Ara"
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
 
 #: ../rules/base.xml.in.h:70
-msgid "Arabic"
-msgstr "Arabisch"
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U Mini Wireless Internet en Gaming"
 
 #: ../rules/base.xml.in.h:71
-msgid "Arm"
-msgstr "Arm"
+msgid "Backslash"
+msgstr "Backslash"
 
 #: ../rules/base.xml.in.h:72
-msgid "Armenia"
-msgstr "Armenië"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Backslash (geeft het 3de niveau en vergrendelt wanneer het ingedrukt wordt samen met een andere 3de niveau-kiezer)"
 
+# Bambara, ook bekend onder de naam Bamanankan, is een Mande-taal die door meer
+# dan zes miljoen mensen gesproken wordt, voornamelijk in Mali
 #: ../rules/base.xml.in.h:73
-msgid "Asturian variant with bottom-dot H and bottom-dot L"
-msgstr "Asturische variant met onder-punt H en onder-punt L"
+msgid "Bambara"
+msgstr "Bambara"
 
+# Het Basjkiers is een Turkse taal, voornamelijk gesproken door de Basjkieren
 #: ../rules/base.xml.in.h:74
-msgid "Asus Laptop"
-msgstr "Asus laptop"
+msgid "Bashkirian"
+msgstr "Basjkiers"
 
-# "Ctrl-toets zit linksonder"
 #: ../rules/base.xml.in.h:75
-msgid "At bottom left"
-msgstr "Linksonder"
+msgid "Belarusian"
+msgstr "Wit-Russisch"
 
-# Ctrl-toets links van ‘A’
+# interpunctie/leestekens
+# het gaat hier waarschijnlijk over de indeling, waar het vraagteken en de
+# puntkomma etc. staan.
 #: ../rules/base.xml.in.h:76
-msgid "At left of 'A'"
-msgstr "Links van de ‘A’"
+msgid "Belarusian (Latin)"
+msgstr "Wit-Russisch (Latijns)"
 
 #: ../rules/base.xml.in.h:77
-msgid "Austria"
-msgstr "Oostenrijk"
+msgid "Belarusian (legacy)"
+msgstr "Wit-Russisch (historisch)"
 
-# Oostenrijk?
 #: ../rules/base.xml.in.h:78
-msgid "Aut"
-msgstr "Oos"
+msgid "Belgian"
+msgstr "Belgisch"
 
 #: ../rules/base.xml.in.h:79
-msgid "Avatime"
-msgstr "Avatime"
+msgid "Belgian (ISO alternate)"
+msgstr "Belgisch (ISO alternatief)"
 
 #: ../rules/base.xml.in.h:80
-msgid "Aze"
-msgstr "Aze"
+msgid "Belgian (Sun dead keys)"
+msgstr "Belgisch (Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:81
-msgid "Azerbaijan"
-msgstr "Azerbeidzjan"
+msgid "Belgian (Wang model 724 azerty)"
+msgstr "Belgisch (Wang model 724 azerty)"
 
 #: ../rules/base.xml.in.h:82
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 draadloos internettoetsenbord"
+msgid "Belgian (alternative)"
+msgstr "Belgisch (alternatief)"
 
 #: ../rules/base.xml.in.h:83
-msgid "BTC 5090"
-msgstr "BTC 5090"
+msgid "Belgian (alternative, Sun dead keys)"
+msgstr "Belgisch (alternatief, Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:84
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF multimedia"
+msgid "Belgian (alternative, latin-9 only)"
+msgstr "Belgisch (alternatief, enkel latin-9)"
 
 #: ../rules/base.xml.in.h:85
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
+msgid "Belgian (eliminate dead keys)"
+msgstr "Belgisch (zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:86
-msgid "BTC 6301URF"
-msgstr "BTC 6301URF"
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
 
 #: ../rules/base.xml.in.h:87
-msgid "BTC 9000"
-msgstr "BTC 9000"
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
 
 #: ../rules/base.xml.in.h:88
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
 
 #: ../rules/base.xml.in.h:89
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
+msgid "Bengali"
+msgstr "Bengaals"
 
 #: ../rules/base.xml.in.h:90
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
+msgid "Bengali (Probhat)"
+msgstr "Bengaals (Probhat)"
 
 #: ../rules/base.xml.in.h:91
-msgid "BTC 9116U Mini Wireless Internet and Gaming"
-msgstr "BTC 9116U Mini Wireless Internet en Gaming"
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgstr "Berbers (Marokko, Tifinagh alternatief fonetisch)"
 
 #: ../rules/base.xml.in.h:92
-msgid "Backslash"
-msgstr "Backslash"
+msgid "Berber (Morocco, Tifinagh alternative)"
+msgstr "Berbers (Marokko, Tifinagh alternatief)"
 
 #: ../rules/base.xml.in.h:93
-msgid "Bangladesh"
-msgstr "Bangladesh"
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgstr "Berbers (Marokko, Tifinagh fonetisch uitgebreid)"
 
 #: ../rules/base.xml.in.h:94
-msgid "Bashkirian"
-msgstr "Bashkiriaans"
+msgid "Berber (Morocco, Tifinagh extended)"
+msgstr "Berbers (Marokko, Tifinagh uitgebreid)"
 
 #: ../rules/base.xml.in.h:95
-msgid "Bel"
-msgstr "Wit"
+msgid "Berber (Morocco, Tifinagh phonetic)"
+msgstr "Berbers (Marokko, Tifinagh fonetisch)"
 
 #: ../rules/base.xml.in.h:96
-msgid "Belarus"
-msgstr "Wit-Rusland"
+msgid "Berber (Morocco, Tifinagh)"
+msgstr "Berbers (Marokko, Tifinagh)"
 
 #: ../rules/base.xml.in.h:97
-msgid "Belgium"
-msgstr "België"
+msgid "Bosnian"
+msgstr "Bosnisch"
 
+# digraaf - lettersamenstelling
 #: ../rules/base.xml.in.h:98
-msgid "BenQ X-Touch"
-msgstr "BenQ X-Touch"
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
+msgstr "Bosnisch (US toetsenbord met Bosnische digrafen)"
 
 #: ../rules/base.xml.in.h:99
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
+msgid "Bosnian (US keyboard with Bosnian letters)"
+msgstr "Bosnisch (US toetsenbord met Bosnische lettertekens)"
 
 #: ../rules/base.xml.in.h:100
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
+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
-msgid "Bengali"
-msgstr "Bengaals"
+msgid "Bosnian (use guillemets for quotes)"
+msgstr "Bosnisch (met Franse aanhalingstekens voor citaten)"
 
+# verandert/wijzigt hier beter dan veranderen/wijzigen
+# "Beide Alt-toetsen samen verandert de groep."
+#
+# tezamen/samen/tegelijk
 #: ../rules/base.xml.in.h:102
-msgid "Bengali Probhat"
-msgstr "Bengaals Probhat"
+msgid "Both Alt keys together"
+msgstr "Beide Alt-toetsen samen"
 
 #: ../rules/base.xml.in.h:103
-msgid "Bepo, ergonomic, Dvorak way"
-msgstr "Bepo, ergonomisch, Dvorak wijze"
+msgid "Both Ctrl keys together"
+msgstr "Beide Ctrl-toetsen samen"
 
 #: ../rules/base.xml.in.h:104
-msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
-msgstr "Bepo, ergonomisch, Dvorak wijze, enkel latin-9"
+msgid "Both Shift keys together"
+msgstr "Beide Shift-toetsen samen"
 
 #: ../rules/base.xml.in.h:105
-msgid "Bgd"
-msgstr "Bgd"
+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
-msgid "Bgr"
-msgstr "Bgr"
+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
-msgid "Bhutan"
-msgstr "Bhutan"
+msgid "Both Shift-Keys together toggle ShiftLock"
+msgstr "Beide Shift-toetsen samen zet de Caps Lock aan/uit"
 
 #: ../rules/base.xml.in.h:108
-msgid "Biblical Hebrew (Tiro)"
-msgstr "Bijbels Hebreeuws (Tiro)"
+msgid "Braille"
+msgstr "Braille"
 
 #: ../rules/base.xml.in.h:109
-msgid "Bih"
-msgstr "Bih"
+msgid "Braille (left hand)"
+msgstr "Braille (linker hand)"
 
 #: ../rules/base.xml.in.h:110
-msgid "Blr"
-msgstr "Blr"
+msgid "Braille (right hand)"
+msgstr "Braille (rechter hand)"
 
 #: ../rules/base.xml.in.h:111
-msgid "Bosnia and Herzegovina"
-msgstr "Bosnië-Herzegovina"
+msgid "Brother Internet Keyboard"
+msgstr "Brother internettoetsenbord"
 
-# verandert/wijzigt hier beter dan veranderen/wijzigen
-# "Beide Alt-toetsen samen verandert de groep."
-#
-# tezamen/samen/tegelijk
 #: ../rules/base.xml.in.h:112
-msgid "Both Alt keys together"
-msgstr "Beide Alt-toetsen samen"
+msgid "Bulgarian"
+msgstr "Bulgaars"
 
 #: ../rules/base.xml.in.h:113
-msgid "Both Ctrl keys together"
-msgstr "Beide Ctrl-toetsen samen"
+msgid "Bulgarian (new phonetic)"
+msgstr "Bulgaars (nieuw fonetisch)"
 
 #: ../rules/base.xml.in.h:114
-msgid "Both Shift keys together"
-msgstr "Beide Shift-toetsen samen"
+msgid "Bulgarian (traditional phonetic)"
+msgstr "Bulgaars (traditioneel fonetisch)"
 
 #: ../rules/base.xml.in.h:115
-msgid "Both Shift-Keys together toggle Caps Lock"
-msgstr "Beide Shift-toetsen zet de Caps Lock aan/uit."
+msgid "Burmese"
+msgstr "Burmees"
 
 #: ../rules/base.xml.in.h:116
-msgid "Botswana"
-msgstr "Botswana"
+msgid "Canadian Multilingual"
+msgstr "Canadees Meertalig"
 
 #: ../rules/base.xml.in.h:117
-msgid "Bra"
-msgstr "Bra"
+msgid "Canadian Multilingual (first part)"
+msgstr "Canadees Meertalig (eerste deel)"
 
 #: ../rules/base.xml.in.h:118
-msgid "Braille"
-msgstr "Braille"
+msgid "Canadian Multilingual (second part)"
+msgstr "Canadees Meertalig  (tweede deel)"
 
 #: ../rules/base.xml.in.h:119
-msgid "Brazil"
-msgstr "Brazilië"
+msgid "Caps Lock"
+msgstr "Caps Lock"
 
 #: ../rules/base.xml.in.h:120
-msgid "Breton"
-msgstr "Bretons"
+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
-msgid "Brl"
-msgstr "Brl"
+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
-msgid "Brother Internet Keyboard"
-msgstr "Brother internet toetsenbord"
+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
-msgid "Btn"
-msgstr "Btn"
+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
-msgid "Buckwalter"
-msgstr "Buckwalter"
+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
-msgid "Bulgaria"
-msgstr "Bulgarije"
+msgid "Caps Lock is disabled"
+msgstr "Caps Lock is uitgezet"
 
 #: ../rules/base.xml.in.h:126
-msgid "Bwa"
-msgstr "Bwa"
+msgid "Caps Lock key behavior"
+msgstr "Caps Lock-toets gedrag"
 
 #: ../rules/base.xml.in.h:127
-msgid "COD"
-msgstr "COD"
+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
-msgid "CRULP"
-msgstr "CRULP"
+msgid "Caps Lock toggles normal capitalization of alphabetic characters"
+msgstr "Caps Lock beïnvloedt alleen de alfabetische toetsen"
 
 #: ../rules/base.xml.in.h:129
-msgid "Cambodia"
-msgstr "Cambodja"
+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
-msgid "Can"
-msgstr "Can"
+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
-msgid "Canada"
-msgstr "Canada"
+msgid "Catalan"
+msgstr "Catalaans"
 
 #: ../rules/base.xml.in.h:132
-msgid "Capewell-Dvorak (Baybayin)"
-msgstr "Capewell-Dvorak (Baybayin)"
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Catalaans (Spanje, met midden-punt L)"
 
 #: ../rules/base.xml.in.h:133
-msgid "Capewell-Dvorak (Latin)"
-msgstr "Capewell-Dvorak (Latijns)"
+msgid "Cherokee"
+msgstr "Cherokee"
 
 #: ../rules/base.xml.in.h:134
-msgid "Capewell-QWERF 2006 (Baybayin)"
-msgstr "Capewell-QWERF 2006 (Baybayin)"
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
 
 #: ../rules/base.xml.in.h:135
-msgid "Capewell-QWERF 2006 (Latin)"
-msgstr "Capewell-QWERF 2006 (Latijns)"
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
 
 #: ../rules/base.xml.in.h:136
-msgid "Caps Lock"
-msgstr "Caps Lock"
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternatieve optie)"
 
-# CapsLock wisselt naar de eerste indeling, Shift+CapsLock wisselt naar de laatste indeling
 #: ../rules/base.xml.in.h:137
-msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
-msgstr "Caps Lock (naar eerste indeling), Shift+Caps Lock (naar laatste indeling)"
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
 
 #: ../rules/base.xml.in.h:138
-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"
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Master Expert"
 
 #: ../rules/base.xml.in.h:139
-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"
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
 
 #: ../rules/base.xml.in.h:140
-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"
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
 
 #: ../rules/base.xml.in.h:141
-msgid "Caps Lock is disabled"
-msgstr "Caps Lock is uitgezet"
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony internet toetsenbord"
 
 #: ../rules/base.xml.in.h:142
-msgid "Caps Lock key behavior"
-msgstr "Caps Lock-toets gedrag"
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
 
 #: ../rules/base.xml.in.h:143
-msgid "Caps Lock toggles Shift so all keys are affected"
-msgstr "Caps Lock wisselt Shift op alle toetsen"
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
 
-# heeft alleen effect op/werkt alleen op/beinvloedt alleen ~ 
-#  de alfabetische toetsen/
-# bepaalt hoofdletters/kleine letters bij alfabetische tekens.<
 #: ../rules/base.xml.in.h:144
-msgid "Caps Lock toggles normal capitalization of alphabetic characters"
-msgstr "Caps Lock beïnvloedt alleen de alfabetische toetsen"
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0420"
 
 #: ../rules/base.xml.in.h:145
-msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
-msgstr "Caps Lock gebruikt interne conversie naar hoofdletters. Shift heft Caps Lock tijdelijk op"
+msgid "Chinese"
+msgstr "Chinees"
 
 #: ../rules/base.xml.in.h:146
-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"
+msgid "Chuvash"
+msgstr "Tsjoevasjisch"
 
 #: ../rules/base.xml.in.h:147
-msgid "Catalan variant with middle-dot L"
-msgstr "Catalaanse variant met midden-punt L"
+msgid "Chuvash (Latin)"
+msgstr "Tsjoevasjisch (Latijns)"
 
 #: ../rules/base.xml.in.h:148
-msgid "Cedilla"
-msgstr "Cedilla"
+msgid "Classmate PC"
+msgstr "Classmate PC"
 
+# Iers
 #: ../rules/base.xml.in.h:149
-msgid "Che"
-msgstr "Che"
+msgid "CloGaelach"
+msgstr "CloGaelach"
 
 #: ../rules/base.xml.in.h:150
-msgid "Cherokee"
-msgstr "Cherokee"
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access toetsenbord"
 
 #: ../rules/base.xml.in.h:151
-msgid "Cherry B.UNLIMITED"
-msgstr "Cherry B.UNLIMITED"
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq internet toetsenbord (13 toetsen)"
 
 #: ../rules/base.xml.in.h:152
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq internet toetsenbord (18 toetsen)"
 
 #: ../rules/base.xml.in.h:153
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (alternatieve optie)"
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq internet toetsenbord (7 toetsen)"
 
 #: ../rules/base.xml.in.h:154
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq toetsenbord"
 
 #: ../rules/base.xml.in.h:155
-msgid "Cherry CyMotion Expert"
-msgstr "Cherry CyMotion Master Expert"
+msgid "Compose key position"
+msgstr "Samensteltoets positie"
 
 #: ../rules/base.xml.in.h:156
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
+msgid "Control + Alt + Backspace"
+msgstr "Ctrl + Alt + Backspace"
 
 #: ../rules/base.xml.in.h:157
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
+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
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony internet toetsenbord"
+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
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
+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 "Chicony KU-0108"
-msgstr "Chicony KU-0108"
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Krim-Tataars (Dobruca-1 Q)"
 
 #: ../rules/base.xml.in.h:161
-msgid "Chicony KU-0420"
-msgstr "Chicony KU-0420"
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krim-Tataars (Turks Alt-Q)"
 
 #: ../rules/base.xml.in.h:162
-msgid "China"
-msgstr "China"
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krim-Tataars (Turks F)"
 
 #: ../rules/base.xml.in.h:163
-msgid "Chn"
-msgstr "Chn"
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krim-Tataars (Turks Q)"
 
 #: ../rules/base.xml.in.h:164
-msgid "Chuvash"
-msgstr "Tsjoevasjisch"
+msgid "Croatian"
+msgstr "Kroatisch"
 
 #: ../rules/base.xml.in.h:165
-msgid "Chuvash Latin"
-msgstr "Tsjoevasjisch Latijns"
+msgid "Croatian (US keyboard with Croatian digraphs)"
+msgstr "Kroatisch (US toetsenbord met Kroatische digrafen)"
 
 #: ../rules/base.xml.in.h:166
-msgid "Classic"
-msgstr "Klassiek"
+msgid "Croatian (US keyboard with Croatian letters)"
+msgstr "Kroatisch (US toetsenbord met Kroatische lettertekens)"
 
 #: ../rules/base.xml.in.h:167
-msgid "Classic Dvorak"
-msgstr "Dvorak klassiek"
+msgid "Croatian (use Croatian digraphs)"
+msgstr "Kroatisch (met Kroatische digrafen)"
 
+# Guillemets of ook quillemets zijn Franse aanhalingstekens.
+# Dit is de "Nederlandse" en dit is de «Franse manier» van aanhalen.
+#
+# ..voor citeren/voor citaten
 #: ../rules/base.xml.in.h:168
-msgid "Classic, eliminate dead keys"
-msgstr "Klassiek, zonder dode toetsen"
+msgid "Croatian (use guillemets for quotes)"
+msgstr "Kroatisch (met Franse aanhalingstekens voor citaten)"
 
 #: ../rules/base.xml.in.h:169
-msgid "Classmate PC"
-msgstr "Classmate PC"
+msgid "Ctrl key position"
+msgstr "Ctrl-toetspositie"
 
 #: ../rules/base.xml.in.h:170
-msgid "CloGaelach"
-msgstr "CloGaelach"
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
 
 #: ../rules/base.xml.in.h:171
-msgid "Colemak"
-msgstr "Colemak"
+msgid "Czech"
+msgstr "Tsjechisch"
 
+# geaccentueerde lettertekens/lettertekens met accenten
 #: ../rules/base.xml.in.h:172
-msgid "Colemak (Baybayin)"
-msgstr "Colemak (Baybayin)"
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "Tsjechisch (UCW-indeling, alleen lettertekens met accenten)"
 
 #: ../rules/base.xml.in.h:173
-msgid "Colemak (Latin)"
-msgstr "Colemak (Latijns)"
+msgid "Czech (US Dvorak with CZ UCW support)"
+msgstr "Tsjechisch (US Dvorak met CZ UCW ondersteuning)"
 
 #: ../rules/base.xml.in.h:174
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access toetsenbord"
+msgid "Czech (qwerty)"
+msgstr "Tsjechisch (qwerty)"
 
+# brede backslash/uitgebreide backslash
 #: ../rules/base.xml.in.h:175
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq internet toetsenbord (13 toetsen)"
+msgid "Czech (qwerty, extended Backslash)"
+msgstr "Tsjechisch (qwerty, brede backslash)"
 
 #: ../rules/base.xml.in.h:176
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq internet toetsenbord (18 toetsen)"
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Tsjechisch (met &lt;\\|&gt;-toets)"
 
 #: ../rules/base.xml.in.h:177
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq internet toetsenbord (7 toetsen)"
+msgid "DTK2000"
+msgstr "DTK2000"
 
 #: ../rules/base.xml.in.h:178
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq toetsenbord"
+msgid "Danish"
+msgstr "Deens"
 
 #: ../rules/base.xml.in.h:179
-msgid "Compose key position"
-msgstr "Samensteltoets positie"
+msgid "Danish (Dvorak)"
+msgstr "Deens (Dvorak)"
 
 #: ../rules/base.xml.in.h:180
-msgid "Congo, Democratic Republic of the"
-msgstr "Congo, Democratisch republiek van"
+msgid "Danish (Macintosh)"
+msgstr "Deens (Macintosh)"
 
 #: ../rules/base.xml.in.h:181
-msgid "Control + Alt + Backspace"
-msgstr "Ctrl + Alt + Backspace"
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Deens (Macintosh, zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:182
-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"
+msgid "Danish (eliminate dead keys)"
+msgstr "Deens (zonder dode toetsen)"
 
+# dubbelop numeriek/cijfer
 #: ../rules/base.xml.in.h:183
-msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
-msgstr "Ctrl zit op de Win-toetsen (en de gebruikelijke Ctrl-toetsen)"
+msgid "Default numeric keypad keys"
+msgstr "Standaard cijferblok-toetsen"
 
 #: ../rules/base.xml.in.h:184
-msgid "Creative Desktop Wireless 7000"
-msgstr "Creative Desktop Wireless 7000"
+msgid "Dell"
+msgstr "Dell"
 
-# Krim-Tataars of Krim-Turks
-# http://nl.wikipedia.org/wiki/Krim-Tataars
 #: ../rules/base.xml.in.h:185
-msgid "Crimean Tatar (Dobruca-1 Q)"
-msgstr "Krim-Tataars (Dobruca-1 Q)"
+msgid "Dell 101-key PC"
+msgstr "Dell 101-toetsen PC"
 
 #: ../rules/base.xml.in.h:186
-msgid "Crimean Tatar (Dobruca-2 Q)"
-msgstr "Krim-Tataars (Dobruca-2 Q)"
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 
 #: ../rules/base.xml.in.h:187
-msgid "Crimean Tatar (Turkish Alt-Q)"
-msgstr "Krim-Tataars (Turks Alt-Q)"
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Laptop/notebook Precision M series"
 
 #: ../rules/base.xml.in.h:188
-msgid "Crimean Tatar (Turkish F)"
-msgstr "Krim-Tataars (Turks F)"
+msgid "Dell Latitude series laptop"
+msgstr "Dell Latitude laptopserie"
 
 #: ../rules/base.xml.in.h:189
-msgid "Crimean Tatar (Turkish Q)"
-msgstr "Krim-Tataars (Turks Q)"
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
 
 #: ../rules/base.xml.in.h:190
-msgid "Croatia"
-msgstr "Kroatië"
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
 
 #: ../rules/base.xml.in.h:191
-msgid "Ctrl key position"
-msgstr "Ctrl-toetspositie"
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
 
 #: ../rules/base.xml.in.h:192
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Shift"
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell USB multimediatoetsenbord"
 
 #: ../rules/base.xml.in.h:193
-msgid "Cyrillic"
-msgstr "Cyrillisch"
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop toetsenbord"
 
-# Guillemets of ook quillemets zijn Franse aanhalingstekens.
-# Dit is "Nederlands" en dit is de «Franse manier» van aanhalen.
 #: ../rules/base.xml.in.h:194
-msgid "Cyrillic with guillemets"
-msgstr "Cyrillisch met Franse aanhalingstekens"
+msgid "Dhivehi"
+msgstr "Dhivehi"
 
-# verwisseld/gewisseld/omgewisseld
 #: ../rules/base.xml.in.h:195
-msgid "Cyrillic, Z and ZHE swapped"
-msgstr "Cyrillisch, Z en ZHE omgewisseld"
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond 9801 / 9802 serie"
 
 #: ../rules/base.xml.in.h:196
-msgid "Cze"
-msgstr "Tsj"
+msgid "Dutch"
+msgstr "Nederlands"
 
 #: ../rules/base.xml.in.h:197
-msgid "Czechia"
-msgstr "Tsjechië"
+msgid "Dutch (Macintosh)"
+msgstr "Nederlands (Macintosh)"
 
 #: ../rules/base.xml.in.h:198
-msgid "DOS"
-msgstr "DOS"
+msgid "Dutch (Sun dead keys)"
+msgstr "Nederlands (Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:199
-msgid "DTK2000"
-msgstr "DTK2000"
+msgid "Dutch (standard)"
+msgstr "Nederlands (standaard)"
 
+# Dzongkha is een taal die is afgeleid van het oud-Tibetaans
 #: ../rules/base.xml.in.h:200
-msgid "Dead acute"
-msgstr "Dood acutus"
+msgid "Dzongkha"
+msgstr "Dzongkha"
 
 #: ../rules/base.xml.in.h:201
-msgid "Dead grave acute"
-msgstr "Dood gravis-acutus"
+msgid "Enable extra typographic characters"
+msgstr "Extra typografische tekens aanzetten"
 
-# dubbelop numeriek/cijfer
 #: ../rules/base.xml.in.h:202
-msgid "Default numeric keypad keys"
-msgstr "Standaard cijferblok-toetsen"
+msgid "English (Cameroon Dvorak)"
+msgstr "Engels (Kameroen Dvorak)"
 
 #: ../rules/base.xml.in.h:203
-msgid "Dell"
-msgstr "Dell"
+msgid "English (Cameroon qwerty)"
+msgstr "Engels (Kameroen qwerty)"
 
 #: ../rules/base.xml.in.h:204
-msgid "Dell 101-key PC"
-msgstr "Dell 101-toetsen PC"
+msgid "English (Cameroon)"
+msgstr "Engels (Kameroen)"
 
 #: ../rules/base.xml.in.h:205
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgid "English (Canada)"
+msgstr "Engels (Canada)"
 
 #: ../rules/base.xml.in.h:206
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Dell Laptop/notebook Precision M series"
+msgid "English (Colemak)"
+msgstr "Engels (Colemak)"
 
 #: ../rules/base.xml.in.h:207
-msgid "Dell Latitude series laptop"
-msgstr "Dell Latitude laptopserie"
+msgid "English (Dvorak alternative international no dead keys)"
+msgstr "Engels (Dvorak alternatief internationaal geen dode toetsen)"
 
 #: ../rules/base.xml.in.h:208
-msgid "Dell Precision M65"
-msgstr "Dell Precision M65"
+msgid "English (Dvorak international with dead keys)"
+msgstr "Engels (Dvorak internationaal met dode toetsen)"
 
 #: ../rules/base.xml.in.h:209
-msgid "Dell SK-8125"
-msgstr "Dell SK-8125"
+msgid "English (Dvorak)"
+msgstr "Engers (Dvorak)"
 
 #: ../rules/base.xml.in.h:210
-msgid "Dell SK-8135"
-msgstr "Dell SK-8135"
+msgid "English (Ghana)"
+msgstr "Engels (Ghana)"
 
 #: ../rules/base.xml.in.h:211
-msgid "Dell USB Multimedia Keyboard"
-msgstr "Dell USB multimediatoetsenbord"
+msgid "English (Ghana, GILLBT)"
+msgstr "Engels (Ghana, GILLBT)"
 
 #: ../rules/base.xml.in.h:212
-msgid "Denmark"
-msgstr "Denemarken"
+msgid "English (Ghana, multilingual)"
+msgstr "Engels (Ghana, meertalig)"
 
 #: ../rules/base.xml.in.h:213
-msgid "Deu"
-msgstr "Deu"
+msgid "English (India, with RupeeSign)"
+msgstr "Engels (India, met Roepie-teken)"
 
 #: ../rules/base.xml.in.h:214
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop toetsenbord"
+msgid "English (Macintosh)"
+msgstr "Engels (Macintosh)"
 
 #: ../rules/base.xml.in.h:215
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond 9801 / 9802 serie"
+msgid "English (Mali, US Macintosh)"
+msgstr "Engels (Mali, US Macintosh)"
 
-# denemarken?
 #: ../rules/base.xml.in.h:216
-msgid "Dnk"
-msgstr "Dnk"
+msgid "English (Mali, US international)"
+msgstr "Engels (Mali, US internationaal)"
 
 #: ../rules/base.xml.in.h:217
-msgid "Dvorak"
-msgstr "Dvorak"
+msgid "English (Nigeria)"
+msgstr "Engels (Nigeria)"
 
-# interpunctie/leestekens
-# het gaat hier waarschijnlijk over de indeling, waar het vraagteken en de
-# puntkomma etc. staan.
 #: ../rules/base.xml.in.h:218
-msgid "Dvorak (Baybayin)"
-msgstr "Dvorak (Baybayin)"
+msgid "English (South Africa)"
+msgstr "Engels (Zuid-Afrika)"
 
-# interpunctie/leestekens
-# het gaat hier waarschijnlijk over de indeling, waar het vraagteken en de
-# puntkomma etc. staan.
 #: ../rules/base.xml.in.h:219
-msgid "Dvorak (Latin)"
-msgstr "Dvorak (Latijns)"
+msgid "English (UK)"
+msgstr "Engels (UK)"
 
-# interpunctie/leestekens
-# het gaat hier waarschijnlijk over de indeling, waar het vraagteken en de
-# puntkomma etc. staan.
 #: ../rules/base.xml.in.h:220
-msgid "Dvorak (UK Punctuation)"
-msgstr "Dvorak (UK-leestekens)"
+msgid "English (UK, Colemak)"
+msgstr "Engels (UK, Colemak)"
 
 #: ../rules/base.xml.in.h:221
-msgid "Dvorak alternative international (no dead keys)"
-msgstr "Dvorak alternatief internationaal (geen dode toetsen)"
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Engels (UK, Dvorak met UK-leestekens)"
 
 #: ../rules/base.xml.in.h:222
-msgid "Dvorak international (with dead keys)"
-msgstr "Dvorak internationaal (met dode toetsen)"
+msgid "English (UK, Dvorak)"
+msgstr "Engels (UK, Dvorak)"
 
 #: ../rules/base.xml.in.h:223
-msgid "Dvorak, Polish quotes on key 1"
-msgstr "Dvorak, Poolse aanhalingstekens op toets 1"
+msgid "English (UK, Macintosh international)"
+msgstr "Engels (UK, Macintosh internationaal)"
 
 #: ../rules/base.xml.in.h:224
-msgid "Dvorak, Polish quotes on quotemark key"
-msgstr "Dvorak, Poolse aanhalingstekens op aanhalingstekentoets"
+msgid "English (UK, Macintosh)"
+msgstr "Engels (UK, Macintosh)"
 
-# oostelijk/oosters
 #: ../rules/base.xml.in.h:225
-msgid "Eastern"
-msgstr "Oosters"
+msgid "English (UK, extended WinKeys)"
+msgstr "Engels (UK, uitgebreid, Windows-toetsen)"
 
 #: ../rules/base.xml.in.h:226
-msgid "Eliminate dead keys"
-msgstr "Geen dode toetsen"
+msgid "English (UK, international with dead keys)"
+msgstr "Engels (UK, internationaal met dode toetsen)"
 
-#: ../rules/base.xml.in.h:227
-msgid "Enable extra typographic characters"
-msgstr "Extra typografische tekens aanzetten"
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
+msgid "English (US)"
+msgstr "Engels (US)"
 
 #: ../rules/base.xml.in.h:228
-msgid "English"
-msgstr "Engels"
+msgid "English (US, alternative international)"
+msgstr "Engels (US, alternatief internationaal)"
 
 #: ../rules/base.xml.in.h:229
-msgid "English (USA International)"
-msgstr "Engels (USA internationaal)"
+msgid "English (US, international with dead keys)"
+msgstr "Engels (US, internationaal met dode toetsen)"
 
 #: ../rules/base.xml.in.h:230
-msgid "English (USA Macintosh)"
-msgstr "Engels (USA Macintosh)"
+msgid "English (US, with euro on 5)"
+msgstr "Engels (US, met de Euro op 5)"
 
 #: ../rules/base.xml.in.h:231
-msgid "English with RupeeSign"
-msgstr "Engels met Rupee-teken"
+msgid "English (classic Dvorak)"
+msgstr "Engels (Dvorak klassiek)"
 
 #: ../rules/base.xml.in.h:232
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
+msgid "English (international AltGr dead keys)"
+msgstr "Engels (internationaal AltGr dode toetsen)"
 
 #: ../rules/base.xml.in.h:233
-msgid "Enter on keypad"
-msgstr "Enter op cijferblok"
+msgid "English (layout toggle on multiply/divide key)"
+msgstr "Engels (Indeling wisselen met de toetsen vermenigvuldigen/delen)"
 
 #: ../rules/base.xml.in.h:234
-msgid "Epo"
-msgstr "Epo"
+msgid "English (left handed Dvorak)"
+msgstr "Engels (Linkshandige Dvorak)"
 
 #: ../rules/base.xml.in.h:235
-msgid "Ergonomic"
-msgstr "Ergonomisch"
+msgid "English (programmer Dvorak)"
+msgstr "Engels (Programmeer-Dvorak)"
 
 #: ../rules/base.xml.in.h:236
-msgid "Esp"
-msgstr "Esp"
+msgid "English (right handed Dvorak)"
+msgstr "Engels (Rechtshandige Dvorak("
 
 #: ../rules/base.xml.in.h:237
-msgid "Esperanto"
-msgstr "Esperanto"
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
 
 #: ../rules/base.xml.in.h:238
-msgid "Est"
-msgstr "Est"
+msgid "Enter on keypad"
+msgstr "Enter op cijferblok"
 
 #: ../rules/base.xml.in.h:239
-msgid "Estonia"
-msgstr "Estland"
+msgid "Esperanto"
+msgstr "Esperanto"
 
 #: ../rules/base.xml.in.h:240
-msgid "Eth"
-msgstr "Eth"
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Esperanto (Portugal, Nativo)"
 
 #: ../rules/base.xml.in.h:241
-msgid "Ethiopia"
-msgstr "Ethiopië"
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr "Esperanto (puntkomma en aanhalingsteken op afwijkende plek, historisch)"
 
-# Rusland<
+# Estisch, de taal, die ook Estlands of Ests wordt genoemd, 
+# heeft ongeveer 1 miljoen sprekers
 #: ../rules/base.xml.in.h:242
-msgid "Euro on 2"
-msgstr "Euro-teken op 2"
+msgid "Estonian"
+msgstr "Estisch"
 
 #: ../rules/base.xml.in.h:243
-msgid "Euro on 4"
-msgstr "Euro-teken op 4"
+msgid "Estonian (Dvorak)"
+msgstr "Estisch (Dvorak)"
 
 #: ../rules/base.xml.in.h:244
-msgid "Euro on 5"
-msgstr "Euro-teken op 5"
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr "Estisch (US toetsenbord met Estische lettertekens)"
 
 #: ../rules/base.xml.in.h:245
-msgid "Euro on E"
-msgstr "Euro-teken op E"
+msgid "Estonian (eliminate dead keys)"
+msgstr "Estisch (zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:246
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
+msgid "Euro on 2"
+msgstr "Euro-teken op 2"
 
 #: ../rules/base.xml.in.h:247
-msgid "Ewe"
-msgstr "Ewe"
+msgid "Euro on 4"
+msgstr "Euro-teken op 4"
 
 #: ../rules/base.xml.in.h:248
-msgid "Extended"
-msgstr "Uitgebreid"
+msgid "Euro on 5"
+msgstr "Euro-teken op 5"
 
 #: ../rules/base.xml.in.h:249
-msgid "Extended - Winkeys"
-msgstr "Uitgebreid - Win-toetsen"
+msgid "Euro on E"
+msgstr "Euro-teken op E"
 
 #: ../rules/base.xml.in.h:250
-msgid "Extended Backslash"
-msgstr "Brede backslash"
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
 
 #: ../rules/base.xml.in.h:251
-msgid "F-letter (F) variant"
-msgstr "F-letter (F) variant"
+msgid "Ewe"
+msgstr "Ewe"
 
 #: ../rules/base.xml.in.h:252
 msgid "FL90"
 msgstr "FL90"
 
 #: ../rules/base.xml.in.h:253
-msgid "Faroe Islands"
-msgstr "Faeröer-eilanden"
+msgid "Faroese"
+msgstr "Faeröers"
 
 #: ../rules/base.xml.in.h:254
-msgid "Fin"
-msgstr "Fin"
+msgid "Faroese (eliminate dead keys)"
+msgstr "Faeröers (zonder dode toetsen)"
 
+# Het Filipijns (Filipino of Pilipino)
 #: ../rules/base.xml.in.h:255
-msgid "Finland"
-msgstr "Finland"
+msgid "Filipino"
+msgstr "Filipijns"
+
+#: ../rules/base.xml.in.h:256
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr "Filipijns (Capewell-Dvorak Baybayin)"
+
+#: ../rules/base.xml.in.h:257
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr "Filipijns (Capewell-Dvorak Latijns)"
 
-#. This assumes the KP_ abstract symbols are actually useful for some apps
-#. The description needs to be rewritten
 #: ../rules/base.xml.in.h:258
-msgid "Four-level key with abstract separators"
-msgstr "Vier-niveaus toets met abstracte scheidingstekens"
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr "Filipijns (Capewell-QWERF 2006 Baybayin)"
 
 #: ../rules/base.xml.in.h:259
-msgid "Four-level key with comma"
-msgstr "Vier-niveaus toets met komma"
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr "Filipijns (Capewell-QWERF 2006 Latijns)"
 
 #: ../rules/base.xml.in.h:260
-msgid "Four-level key with dot"
-msgstr "Vier-niveaus toets met punt"
+msgid "Filipino (Colemak Baybayin)"
+msgstr "Filipijns (Colemak Baybayin)"
 
 #: ../rules/base.xml.in.h:261
-msgid "Four-level key with dot, latin-9 restriction"
-msgstr "Vier-niveaus toets met punt, latin-9 restrictie"
+msgid "Filipino (Colemak Latin)"
+msgstr "Filipijns (Colemak Latijns)"
 
 #: ../rules/base.xml.in.h:262
-msgid "Four-level key with momayyez"
-msgstr "Vier-niveaus toets met momayyez"
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Filipijns (Dvorak Baybayin)"
 
 #: ../rules/base.xml.in.h:263
-msgid "Fra"
-msgstr "Fra"
+msgid "Filipino (Dvorak Latin)"
+msgstr "Filipijns (Dvorak Latijns)"
 
 #: ../rules/base.xml.in.h:264
-msgid "France"
-msgstr "Frankrijk"
+msgid "Filipino (QWERTY Baybayin)"
+msgstr "Filipijns (QWERTY Baybayin)"
 
-# waarom Francais en niet French?
 #: ../rules/base.xml.in.h:265
-msgid "Français (France Alternative)"
-msgstr "Frans (Frankrijk alternatief)"
+msgid "Finnish"
+msgstr "Fins"
 
 #: ../rules/base.xml.in.h:266
-msgid "French"
-msgstr "Frans"
+msgid "Finnish (Macintosh)"
+msgstr "Fins (Macintosh)"
 
 #: ../rules/base.xml.in.h:267
-msgid "French (Macintosh)"
-msgstr "Frans (Macintosh)"
+msgid "Finnish (classic)"
+msgstr "Fins (klassiek)"
 
 #: ../rules/base.xml.in.h:268
-msgid "French (legacy)"
-msgstr "Frans (oud)"
-
-#: ../rules/base.xml.in.h:269
-msgid "French Dvorak"
-msgstr "Frans-Dvorak"
-
-#: ../rules/base.xml.in.h:270
-msgid "French, Sun dead keys"
-msgstr "Frans, Sun-dode toetsen"
+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
-msgid "French, eliminate dead keys"
-msgstr "Frans, zonder dode toetsen"
+msgid "Four-level key with abstract separators"
+msgstr "Vier-niveaus toets met abstracte scheidingstekens"
 
 #: ../rules/base.xml.in.h:272
-msgid "Fro"
-msgstr "Fro"
+msgid "Four-level key with comma"
+msgstr "Vier-niveaus toets met komma"
 
 #: ../rules/base.xml.in.h:273
-msgid "Fujitsu-Siemens Computers AMILO laptop"
-msgstr "Fujitsu-Siemens Computers AMILO laptop"
+msgid "Four-level key with dot"
+msgstr "Vier-niveaus toets met punt"
 
 #: ../rules/base.xml.in.h:274
-msgid "Fula"
-msgstr "Fula"
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Vier-niveaus toets met punt, latin-9 restrictie"
 
 #: ../rules/base.xml.in.h:275
-msgid "GBr"
-msgstr "GBr"
+msgid "Four-level key with momayyez"
+msgstr "Vier-niveaus toets met momayyez"
 
 #: ../rules/base.xml.in.h:276
-msgid "GILLBT"
-msgstr "GILLBT"
+msgid "French"
+msgstr "Frans"
 
 #: ../rules/base.xml.in.h:277
-msgid "Ga"
-msgstr "Ga"
+msgid "French (Bepo, ergonomic, Dvorak way)"
+msgstr "Frans (Bepo, ergonomisch, Dvorak wijze)"
 
 #: ../rules/base.xml.in.h:278
-msgid "Generic 101-key PC"
-msgstr "Algemeen 101-toetsen PC"
+msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
+msgstr "Frans (Bepo, ergonomisch, Dvorak wijze, enkel latin-9)"
 
 #: ../rules/base.xml.in.h:279
-msgid "Generic 102-key (Intl) PC"
-msgstr "Algemeen 102-toetsen (internationaal) PC"
+msgid "French (Breton)"
+msgstr "Frans (Bretons)"
 
 #: ../rules/base.xml.in.h:280
-msgid "Generic 104-key PC"
-msgstr "Algemeen 104-toetsen PC"
+msgid "French (Cameroon azerty)"
+msgstr "Frans (Kameroen azerty)"
 
 #: ../rules/base.xml.in.h:281
-msgid "Generic 105-key (Intl) PC"
-msgstr "Algemeen 105-toetsen (internationaal) PC"
+msgid "French (Cameroon)"
+msgstr "Frans (Kameroen)"
 
-#: ../rules/base.xml.in.h:282
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "Frans (Canada)"
 
 #: ../rules/base.xml.in.h:283
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM toetsenbord KWD-910"
+msgid "French (Canada, Dvorak)"
+msgstr "Frans (Canada, Dvorak)"
 
 #: ../rules/base.xml.in.h:284
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
+msgid "French (Canada, legacy)"
+msgstr "Frans (Canada, historisch)"
 
 #: ../rules/base.xml.in.h:285
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
+msgid "French (Democratic Republic of the Congo)"
+msgstr "Frans (Democratisch republiek van Congo)"
 
 #: ../rules/base.xml.in.h:286
-msgid "Genius KKB-2050HS"
-msgstr "Genius KKB-2050HS"
+msgid "French (Dvorak)"
+msgstr "Frans (Dvorak)"
 
+# Guinee, voormalig Frans Guinee, soms Guinee-Conakry genoemd en officieel
+# 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
-msgid "Geo"
-msgstr "Geo"
+msgid "French (Guinea)"
+msgstr "Frans (Guinee)"
 
 #: ../rules/base.xml.in.h:288
-msgid "Georgia"
-msgstr "Georgië"
+msgid "French (Macintosh)"
+msgstr "Frans (Macintosh)"
 
 #: ../rules/base.xml.in.h:289
-msgid "Georgian"
-msgstr "Georgisch"
+msgid "French (Mali, alternative)"
+msgstr "Frans (Mali, alternatief)"
 
 #: ../rules/base.xml.in.h:290
-msgid "Georgian AZERTY Tskapo"
-msgstr "Georgisch AZERTY Tskapo"
+msgid "French (Morocco)"
+msgstr "Frans (Marokko)"
 
 #: ../rules/base.xml.in.h:291
-msgid "German (Macintosh)"
-msgstr "Duits (Macintosh)"
+msgid "French (Sun dead keys)"
+msgstr "Frans (Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:292
-msgid "German, Sun dead keys"
-msgstr "Duits, Sun-dode toetsen"
+msgid "French (Switzerland)"
+msgstr "Frans (Zwitserland)"
 
 #: ../rules/base.xml.in.h:293
-msgid "German, eliminate dead keys"
-msgstr "Duits, zonder dode toetsen"
+msgid "French (Switzerland, Macintosh)"
+msgstr "Frans (Zwitserland, Macintosh)"
 
 #: ../rules/base.xml.in.h:294
-msgid "Germany"
-msgstr "Duitsland"
+msgid "French (Switzerland, Sun dead keys)"
+msgstr "Frans (Zwitserland, Sun-dode toetsen)"
 
 #: ../rules/base.xml.in.h:295
-msgid "Gha"
-msgstr "Gha"
+msgid "French (Switzerland, eliminate dead keys)"
+msgstr "Frans (Zwitserland, zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:296
-msgid "Ghana"
-msgstr "Ghana"
+msgid "French (alternative)"
+msgstr "Frans (alternatief)"
 
 #: ../rules/base.xml.in.h:297
-msgid "Gin"
-msgstr "Gin"
+msgid "French (alternative, Sun dead keys)"
+msgstr "Frans (alternatief, Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:298
-msgid "Grc"
-msgstr "Grc"
+msgid "French (alternative, eliminate dead keys)"
+msgstr "Frans (alternatief, zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:299
-msgid "Greece"
-msgstr "Griekenland"
+msgid "French (alternative, latin-9 only)"
+msgstr "Fans (alternatief, enkel latin-9)"
 
 #: ../rules/base.xml.in.h:300
-msgid "Guinea"
-msgstr "Guinea"
+msgid "French (eliminate dead keys)"
+msgstr "Frans (zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:301
-msgid "Gujarati"
-msgstr "Gujarati"
+msgid "French (legacy, alternative)"
+msgstr "Frans (historisch, alternatief)"
 
 #: ../rules/base.xml.in.h:302
-msgid "Gurmukhi"
-msgstr "Gurmukhi"
+msgid "French (legacy, alternative, Sun dead keys)"
+msgstr "Frans (historisch, alternatief, Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:303
-msgid "Gurmukhi Jhelum"
-msgstr "Gurmukhi Jhelum"
+msgid "French (legacy, alternative, eliminate dead keys)"
+msgstr "Frans (historisch, alternatief, zonder dode toetsen)"
 
-# het zal wel een merk zijn
 #: ../rules/base.xml.in.h:304
-msgid "Gyration"
-msgstr "Gyration"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Fujitsu-Siemens Computers AMILO laptop"
 
 #: ../rules/base.xml.in.h:305
-msgid "HTC Dream"
-msgstr "HTC Dream"
+msgid "Fula"
+msgstr "Fula"
 
 #: ../rules/base.xml.in.h:306
-msgid "Happy Hacking Keyboard"
-msgstr "Happy Hacking toetsenbord"
+msgid "Ga"
+msgstr "Ga"
 
 #: ../rules/base.xml.in.h:307
-msgid "Happy Hacking Keyboard for Mac"
-msgstr "Happy Hacking toetsenbord voor Mac"
+msgid "Generic 101-key PC"
+msgstr "Algemeen 101-toetsen PC"
 
 #: ../rules/base.xml.in.h:308
-msgid "Hausa"
-msgstr "Hausa"
+msgid "Generic 102-key (Intl) PC"
+msgstr "Algemeen 102-toetsen (internationaal) PC"
 
 #: ../rules/base.xml.in.h:309
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard internet toetsenbord"
+msgid "Generic 104-key PC"
+msgstr "Algemeen 104-toetsen PC"
 
 #: ../rules/base.xml.in.h:310
-msgid "Hewlett-Packard Mini 110 Notebook"
-msgstr "Hewlett-Packard Mini 110 Notebook"
+msgid "Generic 105-key (Intl) PC"
+msgstr "Algemeen 105-toetsen (internationaal) PC"
 
 #: ../rules/base.xml.in.h:311
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
 
 #: ../rules/base.xml.in.h:312
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
+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
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
 
 #: ../rules/base.xml.in.h:314
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
 
 #: ../rules/base.xml.in.h:315
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
 
 #: ../rules/base.xml.in.h:316
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
+msgid "Georgian"
+msgstr "Georgisch"
 
 #: ../rules/base.xml.in.h:317
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Georgisch (Frankrijk, AZERTY Tskapo)"
 
 #: ../rules/base.xml.in.h:318
-msgid "Hewlett-Packard Pavilion dv5"
-msgstr "Hewlett-Packard Pavilion dv5"
+msgid "Georgian (Italy)"
+msgstr "Georgisch (Italië)"
 
 #: ../rules/base.xml.in.h:319
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-250x multimedia toetsenbord"
+msgid "Georgian (MESS)"
+msgstr "Georgisch (MESS)"
 
 #: ../rules/base.xml.in.h:320
-msgid "Hewlett-Packard nx9020"
-msgstr "Hewlett-Packard nx9020"
+msgid "Georgian (ergonomic)"
+msgstr "Georgisch (ergonomisch)"
 
 #: ../rules/base.xml.in.h:321
-msgid "Hexadecimal"
-msgstr "Hexadecimaal"
+msgid "German"
+msgstr "Duits"
 
 #: ../rules/base.xml.in.h:322
-msgid "Hindi Bolnagri"
-msgstr "Hindi Bolnagri"
+msgid "German (Austria)"
+msgstr "Duits (Oostenrijk)"
 
 #: ../rules/base.xml.in.h:323
-msgid "Hindi Wx"
-msgstr "Hindi Wx"
+msgid "German (Austria, Macintosh)"
+msgstr "Duits (Oostenrijk, Macintosh)"
 
-# gelijkklinkend/homofonetisch/homofonisch
 #: ../rules/base.xml.in.h:324
-msgid "Homophonic"
-msgstr "Homofonisch"
+msgid "German (Austria, Sun dead keys)"
+msgstr "Duits (Oostenrijk, Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:325
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
+msgid "German (Austria, eliminate dead keys)"
+msgstr "Duits (Oostenrijk, zonder dode toetsen)"
 
-# Kro/Hrv
 #: ../rules/base.xml.in.h:326
-msgid "Hrv"
-msgstr "Hrv"
+msgid "German (Dvorak)"
+msgstr "Duits (Dvorak)"
 
 #: ../rules/base.xml.in.h:327
-msgid "Htc Dream phone"
-msgstr "Htc Dream phone"
+msgid "German (Macintosh)"
+msgstr "Duits (Macintosh)"
 
 #: ../rules/base.xml.in.h:328
-msgid "Hun"
-msgstr "Hon"
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Duits (Macintosh, zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:329
-msgid "Hungary"
-msgstr "Hongarije"
+msgid "German (Neo 2)"
+msgstr "Duits (Neo 2)"
 
 #: ../rules/base.xml.in.h:330
-msgid "Hyper is mapped to Win-keys"
-msgstr "Hyper zit op de Win-toetsen"
+msgid "German (Sun dead keys)"
+msgstr "Duits (Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:331
-msgid "IBM (LST 1205-92)"
-msgstr "IBM (LST 1205-92)"
+msgid "German (Switzerland)"
+msgstr "Duits (Zwitserland)"
 
 #: ../rules/base.xml.in.h:332
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
+msgid "German (Switzerland, Macintosh)"
+msgstr "Duits (Zwitserland, Macintosh)"
 
 #: ../rules/base.xml.in.h:333
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
+msgid "German (Switzerland, Sun dead keys)"
+msgstr "Duits (Zwitserland, Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:334
-msgid "IBM Space Saver"
-msgstr "IBM Space Saver"
+msgid "German (Switzerland, eliminate dead keys)"
+msgstr "Duits (Zwitserland, zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:335
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+msgid "German (Switzerland, legacy)"
+msgstr "Duits (Zwitserland, historisch)"
 
+# acute - aigu  (bijv.  á)
 #: ../rules/base.xml.in.h:336
-msgid "IBM ThinkPad R60/T60/R61/T61"
-msgstr "IBM ThinkPad R60/T60/R61/T61"
+msgid "German (dead acute)"
+msgstr "Duits (dode aigu)"
 
+# grave (bijv: à)
 #: ../rules/base.xml.in.h:337
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgid "German (dead grave acute)"
+msgstr "Duits (dode grave en aigu)"
 
 #: ../rules/base.xml.in.h:338
-msgid "ISO Alternate"
-msgstr "ISO alternatief"
+msgid "German (eliminate dead keys)"
+msgstr "Duits (zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:339
-msgid "Iceland"
-msgstr "IJsland"
+msgid "German (qwerty)"
+msgstr "Duits (qwerty)"
 
 #: ../rules/base.xml.in.h:340
-msgid "Igbo"
-msgstr "Igbo"
+msgid "Greek"
+msgstr "Grieks"
 
-# met/bijvoegen
-# inactieve/dode/latente
 #: ../rules/base.xml.in.h:341
-msgid "Include dead tilde"
-msgstr "Met dode tilde"
+msgid "Greek (eliminate dead keys)"
+msgstr "Grieks (zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:342
-msgid "Ind"
-msgstr "Ind"
+msgid "Greek (extended)"
+msgstr "Grieks (uitgebreid)"
 
 #: ../rules/base.xml.in.h:343
-msgid "India"
-msgstr "India"
+msgid "Greek (polytonic)"
+msgstr "Grieks (meertonig)"
 
 #: ../rules/base.xml.in.h:344
-msgid "International (AltGr dead keys)"
-msgstr "Internationaal (AltGr dode toetsen)"
+msgid "Greek (simple)"
+msgstr "Grieks (eenvoudig)"
 
 #: ../rules/base.xml.in.h:345
-msgid "International (with dead keys)"
-msgstr "Internationaal (met dode toetsen)"
+msgid "Gujarati"
+msgstr "Gujarati"
 
+# het zal wel een merk zijn
 #: ../rules/base.xml.in.h:346
-msgid "Inuktitut"
-msgstr "Inuktitut"
+msgid "Gyration"
+msgstr "Gyration"
 
-#: ../rules/base.xml.in.h:347 ../rules/base.extras.xml.in.h:8
-msgid "Iran"
-msgstr "Iran"
+#: ../rules/base.xml.in.h:347
+msgid "HTC Dream"
+msgstr "HTC Dream"
 
 #: ../rules/base.xml.in.h:348
-msgid "Iraq"
-msgstr "Irak"
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking toetsenbord"
 
 #: ../rules/base.xml.in.h:349
-msgid "Ireland"
-msgstr "Ierland"
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking toetsenbord voor Mac"
 
 #: ../rules/base.xml.in.h:350
-msgid "Irl"
-msgstr "Irl"
+msgid "Hausa"
+msgstr "Hausa"
 
 #: ../rules/base.xml.in.h:351
-msgid "Irn"
-msgstr "Irn"
+msgid "Hebrew"
+msgstr "Hebreeuws"
 
 #: ../rules/base.xml.in.h:352
-msgid "Irq"
-msgstr "Irq"
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Hebreeuws (Bijbers, Tiro)"
 
 #: ../rules/base.xml.in.h:353
-msgid "Isl"
-msgstr "Isl"
+msgid "Hebrew (lyx)"
+msgstr "Hebreeuws (lyx)"
 
 #: ../rules/base.xml.in.h:354
-msgid "Isr"
-msgstr "Isr"
+msgid "Hebrew (phonetic)"
+msgstr "Hebreeuws (fonetisch)"
 
 #: ../rules/base.xml.in.h:355
-msgid "Israel"
-msgstr "Israël"
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard internet toetsenbord"
 
 #: ../rules/base.xml.in.h:356
-msgid "Ita"
-msgstr "Ita"
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard Mini 110 Notebook"
 
 #: ../rules/base.xml.in.h:357
-msgid "Italy"
-msgstr "Italië"
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
 
 #: ../rules/base.xml.in.h:358
-msgid "Japan"
-msgstr "Japan"
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
 
 #: ../rules/base.xml.in.h:359
-msgid "Japan (PC-98xx Series)"
-msgstr "Japan (PC-98xx serie)"
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
 
 #: ../rules/base.xml.in.h:360
-msgid "Japanese keyboard options"
-msgstr "Japanse toetsenbordopties"
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
 
 #: ../rules/base.xml.in.h:361
-msgid "Jpn"
-msgstr "Jpn"
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
 
 #: ../rules/base.xml.in.h:362
-msgid "Kalmyk"
-msgstr "Kalmyk"
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
 
 #: ../rules/base.xml.in.h:363
-msgid "Kana"
-msgstr "Kana"
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
 
 #: ../rules/base.xml.in.h:364
-msgid "Kana 86"
-msgstr "Kana 86"
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
 
 #: ../rules/base.xml.in.h:365
-msgid "Kana Lock key is locking"
-msgstr "Kana Lock-toets is blokkerend"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x multimedia toetsenbord"
 
 #: ../rules/base.xml.in.h:366
-msgid "Kannada"
-msgstr "Kannada"
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
 
 #: ../rules/base.xml.in.h:367
-msgid "Kashubian"
-msgstr "Kasjoebiaans"
+msgid "Hexadecimal"
+msgstr "Hexadecimaal"
 
 #: ../rules/base.xml.in.h:368
-msgid "Kaz"
-msgstr "Kaz"
+msgid "Hindi (Bolnagri)"
+msgstr "Hindi (Bolnagri)"
 
-# de taal Kazachstaans
 #: ../rules/base.xml.in.h:369
-msgid "Kazakh with Russian"
-msgstr "Kazachstaans met Russisch"
+msgid "Hindi (Wx)"
+msgstr "Hindi (Wx)"
 
 #: ../rules/base.xml.in.h:370
-msgid "Kazakhstan"
-msgstr "Kazachstan"
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
 
 #: ../rules/base.xml.in.h:371
-msgid "Ken"
-msgstr "Ken"
+msgid "Htc Dream phone"
+msgstr "Htc Dream phone"
 
 #: ../rules/base.xml.in.h:372
-msgid "Kenya"
-msgstr "Kenia"
+msgid "Hungarian"
+msgstr "Hongaars"
 
-# om zeep te helpen/af te breken/te stoppen/
 #: ../rules/base.xml.in.h:373
-msgid "Key sequence to kill the X server"
-msgstr "Toetscombinatie om de X-server af te breken"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr "Hongaars (101/qwerty/komma/dode toetsen)"
 
-# 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:374
-msgid "Key to choose 3rd level"
-msgstr "De toets om het 3e niveau te krijgen"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr "Hongaars (101/qwerty/komma/zonder dode toetsen)"
 
-# aan te zetten/te kiezen/te selecteren/te krijgen
-#
-# 'to choose' is hier een slechte woordkeuze IMO
 #: ../rules/base.xml.in.h:375
-msgid "Key to choose 5th level"
-msgstr "De toets om het 5e niveau te krijgen"
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr "Hongaars (101/qwerty/punt/dode toetsen)"
 
-# wijzigen/veranderen
 #: ../rules/base.xml.in.h:376
-msgid "Key(s) to change layout"
-msgstr "De toets(en) om de indeling te veranderen"
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr "Hongaars (101/qwerty/punt/zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:377
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
+msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgstr "Hongaars (101/qwertz/komma/dode toetsen)"
 
 #: ../rules/base.xml.in.h:378
-msgid "Kgz"
-msgstr "Kgz"
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr "Hongaars (101/qwertz/komma/zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:379
-msgid "Khm"
-msgstr "Khm"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgstr "Hongaars (101/qwertz/punt/dode toetsen)"
 
 #: ../rules/base.xml.in.h:380
-msgid "Kikuyu"
-msgstr "Kikuyu"
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr "Hongaars (101/qwertz/punt/zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:381
-msgid "Kinesis"
-msgstr "Kinesis"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgstr "Hongaars (102/qwerty/komma/dode toetsen)"
 
 #: ../rules/base.xml.in.h:382
-msgid "Komi"
-msgstr "Komi"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgstr "Hongaars (102/qwerty/komma/zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:383
-msgid "Kor"
-msgstr "Kor"
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr "Hongaars (102/qwerty/punt/dode toetsen)"
 
 #: ../rules/base.xml.in.h:384
-msgid "Korea, Republic of"
-msgstr "Korea, Republiek"
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgstr "Hongaars (102/qwerty/punt/zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:385
-msgid "Ktunaxa"
-msgstr "Ktunaxa"
+msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgstr "Hongaars (102/qwertz/komma/dode toetsen)"
 
 #: ../rules/base.xml.in.h:386
-msgid "Kurdish, (F)"
-msgstr "Koerdisch, (F)"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgstr "Hongaars (102/qwertz/komma/zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:387
-msgid "Kurdish, Arabic-Latin"
-msgstr "Koerdisch, Arabisch-Latijns"
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr "Hongaars (102/qwertz/punt/dode toetsen)"
 
 #: ../rules/base.xml.in.h:388
-msgid "Kurdish, Latin Alt-Q"
-msgstr "Koerdisch, Latijns Alt-Q"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr "Hongaars (102/qwertz/punt/zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:389
-msgid "Kurdish, Latin Q"
-msgstr "Koerdisch, Latijns Q"
+msgid "Hungarian (eliminate dead keys)"
+msgstr "Hongaars (zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:390
-msgid "Kyrgyzstan"
-msgstr "Kirgizië"
+msgid "Hungarian (qwerty)"
+msgstr "Hongaars (qwerty)"
 
 #: ../rules/base.xml.in.h:391
-msgid "LEKP"
-msgstr "LEKP"
+msgid "Hungarian (standard)"
+msgstr "Hongaars (standaard)"
 
 #: ../rules/base.xml.in.h:392
-msgid "LEKPa"
-msgstr "LEKPa"
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper zit op de Win-toetsen"
 
 #: ../rules/base.xml.in.h:393
-msgid "Lao"
-msgstr "Lao"
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
 
 #: ../rules/base.xml.in.h:394
-msgid "Laos"
-msgstr "Laos"
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
 
 #: ../rules/base.xml.in.h:395
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Laptop/notebook Compaq (bijv. Armada) laptop toetsenbord"
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
 
 #: ../rules/base.xml.in.h:396
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Laptop/notebook Compaq (bijv. Presario) internet toetsenbord"
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:397
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "Laptop/notebook eMachines m68xx"
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
 
 #: ../rules/base.xml.in.h:398
-msgid "Latin"
-msgstr "Latijns"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
 #: ../rules/base.xml.in.h:399
-msgid "Latin American"
-msgstr "Latijns-Amerika"
+msgid "Icelandic"
+msgstr "IJslands"
 
 #: ../rules/base.xml.in.h:400
-msgid "Latin Unicode"
-msgstr "Latijns-Unicode"
+msgid "Icelandic (Dvorak)"
+msgstr "IJslands (Dvorak)"
 
 #: ../rules/base.xml.in.h:401
-msgid "Latin Unicode qwerty"
-msgstr "Latijns-Unicode qwerty"
+msgid "Icelandic (Macintosh)"
+msgstr "IJslands (Macintosh)"
 
 #: ../rules/base.xml.in.h:402
-msgid "Latin qwerty"
-msgstr "Latijns qwerty"
+msgid "Icelandic (Sun dead keys)"
+msgstr "IJslands (Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:403
-msgid "Latin unicode"
-msgstr "Latijns-unicode"
+msgid "Icelandic (eliminate dead keys)"
+msgstr "IJslands (zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:404
-msgid "Latin unicode qwerty"
-msgstr "Latijns-unicode qwerty"
+msgid "Igbo"
+msgstr "Igbo"
 
-# Guillemets of ook quillemets zijn Franse aanhalingstekens.
-# Dit is "Nederlands" en dit is de «Franse manier» van aanhalen.
 #: ../rules/base.xml.in.h:405
-msgid "Latin with guillemets"
-msgstr "Latijns met Franse aanhalingstekens"
+msgid "Indian"
+msgstr "Indisch"
 
 #: ../rules/base.xml.in.h:406
-msgid "Latvia"
-msgstr "Letland"
+msgid "Inuktitut"
+msgstr "Inuktitut"
 
 #: ../rules/base.xml.in.h:407
-msgid "Layout toggle on multiply/divide key"
-msgstr "Indeling wisselen met de toetsen vermenigvuldigen/delen"
+msgid "Iraqi"
+msgstr "Irakees"
 
 #: ../rules/base.xml.in.h:408
-msgid "Left Alt"
-msgstr "Linker Alt-toets"
+msgid "Irish"
+msgstr "Iers"
 
 #: ../rules/base.xml.in.h:409
-msgid "Left Alt (while pressed)"
-msgstr "Linker Alt-toets (ingedrukt houden)"
+msgid "Irish (UnicodeExpert)"
+msgstr "Iers (UnicodeExpert)"
 
 #: ../rules/base.xml.in.h:410
-msgid "Left Alt is swapped with Left Win"
-msgstr "De linker Alt-toets en Win-toets worden gewisseld"
+msgid "Italian"
+msgstr "Italiaans"
 
 #: ../rules/base.xml.in.h:411
-msgid "Left Ctrl"
-msgstr "Linker Ctrl-toets"
+msgid "Italian (Macintosh)"
+msgstr "Italiaans (Macintosh)"
 
-# 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:412
-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)"
+msgid "Italian (US keyboard with Italian letters)"
+msgstr "Italiaans (US toetsenbord met Italiaanse lettertekens)"
 
-# Linker Ctrl + Shift-toets
 #: ../rules/base.xml.in.h:413
-msgid "Left Ctrl+Left Shift"
-msgstr "Linker Ctrl + linker Shift-toets"
+msgid "Italian (eliminate dead keys)"
+msgstr "Italiaans (zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:414
-msgid "Left Shift"
-msgstr "Linker Shift-toets"
+msgid "Japanese"
+msgstr "Japans"
 
 #: ../rules/base.xml.in.h:415
-msgid "Left Win"
-msgstr "Linker Win-toets"
+msgid "Japanese (Kana 86)"
+msgstr "Japans (Kana 86)"
 
-# Linker Win-toets wisselt naar de eerste indeling, rechter Win/Menu-toets wisselt naar de laatste indeling
 #: ../rules/base.xml.in.h:416
-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)"
+msgid "Japanese (Kana)"
+msgstr "Japans (Kana)"
 
 #: ../rules/base.xml.in.h:417
-msgid "Left Win (while pressed)"
-msgstr "Linker Win-toets (ingedrukt houden)"
+msgid "Japanese (Macintosh)"
+msgstr "Japans (Macintosh)"
 
 #: ../rules/base.xml.in.h:418
-msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Linker Win-toets geeft het 5de niveau en is blijvend wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer"
+msgid "Japanese (OADG 109A)"
+msgstr "Japans (OADG 109A)"
 
 #: ../rules/base.xml.in.h:419
-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 is blijvend wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer, één toetsaanslag heft het niveau op"
+msgid "Japanese (PC-98xx Series)"
+msgstr "Japans (PC-98xx serie)"
 
 #: ../rules/base.xml.in.h:420
-msgid "Left hand"
-msgstr "Linkshandig"
+msgid "Japanese keyboard options"
+msgstr "Japanse toetsenbordopties"
 
 #: ../rules/base.xml.in.h:421
-msgid "Left handed Dvorak"
-msgstr "Linkshandige Dvorak"
+msgid "Kalmyk"
+msgstr "Kalmyk"
 
 #: ../rules/base.xml.in.h:422
-msgid "Legacy"
-msgstr "Historisch"
+msgid "Kana Lock key is locking"
+msgstr "Kana Lock-toets is blokkerend"
 
 #: ../rules/base.xml.in.h:423
-msgid "Legacy Wang 724"
-msgstr "Historisch Wang 724"
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../rules/base.xml.in.h:424
+msgid "Kashubian"
+msgstr "Kasjoebisch"
 
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:425
-msgid "Legacy key with comma"
-msgstr "Historisch cijferblok met komma"
+msgid "Kazakh"
+msgstr "Kazachstaans"
 
 #: ../rules/base.xml.in.h:426
-msgid "Legacy key with dot"
-msgstr "Historisch cijferblok met punt"
+msgid "Kazakh (with Russian)"
+msgstr "Kazachstaans (met Russisch)"
 
+# om zeep te helpen/af te breken/te stoppen/
 #: ../rules/base.xml.in.h:427
-msgid "Lithuania"
-msgstr "Litouwen"
+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
-msgid "Lka"
-msgstr "Lka"
+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
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access toetsenbord"
+msgid "Key to choose 5th level"
+msgstr "De toets om het 5e niveau te krijgen"
 
+# wijzigen/veranderen
 #: ../rules/base.xml.in.h:430
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
+msgid "Key(s) to change layout"
+msgstr "De toets(en) om de indeling te veranderen"
 
 #: ../rules/base.xml.in.h:431
-msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "Logitech Cordless Desktop (alternatieve optie)"
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
 
 #: ../rules/base.xml.in.h:432
-msgid "Logitech Cordless Desktop EX110"
-msgstr "Logitech Cordless Desktop EX110"
+msgid "Khmer (Cambodia)"
+msgstr "Khmer (Cambodja)"
 
 #: ../rules/base.xml.in.h:433
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300"
+msgid "Kikuyu"
+msgstr "Kikuyu"
 
 #: ../rules/base.xml.in.h:434
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
+msgid "Kinesis"
+msgstr "Kinesis"
 
 #: ../rules/base.xml.in.h:435
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optisch"
+msgid "Komi"
+msgstr "Komi"
 
 #: ../rules/base.xml.in.h:436
-msgid "Logitech Cordless Desktop Pro (alternate option 2)"
-msgstr "Logitech Cordless Desktop Pro (alternatieve optie 2)"
+msgid "Korean"
+msgstr "Koreaans"
 
 #: ../rules/base.xml.in.h:437
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
+msgid "Korean (101/104 key compatible)"
+msgstr "Koreaans (101/104-toetsen compatibel)"
 
 #: ../rules/base.xml.in.h:438
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
+msgid "Kurdish (Iran, Arabic-Latin)"
+msgstr "Koerdisch (Iran, Arabisch-Latijns)"
 
 #: ../rules/base.xml.in.h:439
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15 extra toetsen via G15daemon"
+msgid "Kurdish (Iran, F)"
+msgstr "Koerdisch (Iran, F)"
 
 #: ../rules/base.xml.in.h:440
-msgid "Logitech Generic Keyboard"
-msgstr "Logitech algemeen toetsenbord"
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Koerdisch (Iran, Latijns Alt-Q)"
 
 #: ../rules/base.xml.in.h:441
-msgid "Logitech Internet 350 Keyboard"
-msgstr "Logitech internet 350 toetsenbord"
+msgid "Kurdish (Iran, Latin Q)"
+msgstr "Koerdisch (Iran, Latijns Q)"
 
 #: ../rules/base.xml.in.h:442
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech internet toetsenbord"
+msgid "Kurdish (Iraq, Arabic-Latin)"
+msgstr "Koerdisch (Irak, Arabisch-Latijns)"
 
 #: ../rules/base.xml.in.h:443
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator toetsenbord"
+msgid "Kurdish (Iraq, F)"
+msgstr "Koerdisch (Irak, F)"
 
 #: ../rules/base.xml.in.h:444
-msgid "Logitech Media Elite Keyboard"
-msgstr "Logitech Media Elite toetsenbord"
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr "Koerdisch (Irak, Latijns Alt-Q)"
 
 #: ../rules/base.xml.in.h:445
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
-msgstr "Logitech Ultra-X Cordless Media Desktop toetsenbord"
+msgid "Kurdish (Iraq, Latin Q)"
+msgstr "Koerdisch (Irak, Latijns Q)"
 
 #: ../rules/base.xml.in.h:446
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X toetsenbord"
+msgid "Kurdish (Syria, F)"
+msgstr "Koerdisch (Syrië, F)"
 
 #: ../rules/base.xml.in.h:447
-msgid "Logitech diNovo Edge Keyboard"
-msgstr "Logitech diNovo Edge toetsenbord"
+msgid "Kurdish (Syria, Latin Alt-Q)"
+msgstr "Koerdisch (Syrië, Latijns Alt-Q)"
 
 #: ../rules/base.xml.in.h:448
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech diNovo toetsenbord"
+msgid "Kurdish (Syria, Latin Q)"
+msgstr "Koerdisch (Syrië, Latijns Q)"
 
 #: ../rules/base.xml.in.h:449
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
+msgid "Kurdish (Turkey, F)"
+msgstr "Koerdisch (Turks, F)"
 
 #: ../rules/base.xml.in.h:450
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch draadloos toetsenbord (model Y-RB6)"
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr "Koerdisch (Turks, Latijns Alt-Q)"
 
 #: ../rules/base.xml.in.h:451
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Internet Navigator toetsenbord SE"
+msgid "Kurdish (Turkey, Latin Q)"
+msgstr "Koerdisch (Turks, Latijns Q)"
 
 #: ../rules/base.xml.in.h:452
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Internet Navigator toetsenbord SE (USB)"
+msgid "Kyrgyz"
+msgstr "Kirgizisch"
 
-# Het Nedersorbisch is de noordelijke versie van de in Brandenburg
-# gesproken Sorbische taal.
-# http://nl.wikipedia.org/wiki/Nedersorbisch
 #: ../rules/base.xml.in.h:453
-msgid "Lower Sorbian"
-msgstr "Nedersorbisch"
+msgid "Kyrgyz (phonetic)"
+msgstr "Kirgizisch (fonetisch)"
 
 #: ../rules/base.xml.in.h:454
-msgid "Lower Sorbian (qwertz)"
-msgstr "Nedersorbisch (qwertz)"
+msgid "Lao"
+msgstr "Lao"
 
 #: ../rules/base.xml.in.h:455
-msgid "Ltu"
-msgstr "Ltu"
+msgid "Lao (STEA proposed standard layout)"
+msgstr "Lao (STEA voorgestelde standaard indeling)"
 
 #: ../rules/base.xml.in.h:456
-msgid "Lva"
-msgstr "Lva"
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (bijv. Armada) laptop toetsenbord"
 
 #: ../rules/base.xml.in.h:457
-msgid "MESS"
-msgstr "MESS"
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (bijv. Presario) internet toetsenbord"
 
 #: ../rules/base.xml.in.h:458
-msgid "MNE"
-msgstr "MNE"
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx"
 
-#: ../rules/base.xml.in.h:459
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
+msgid "Latvian"
+msgstr "Lets"
 
 #: ../rules/base.xml.in.h:460
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (Intl)"
+msgid "Latvian (F variant)"
+msgstr "Lets (F variant)"
 
 #: ../rules/base.xml.in.h:461
-msgid "Macedonia"
-msgstr "Macedonisch"
+msgid "Latvian (adapted)"
+msgstr "Lets (aangepast)"
 
 #: ../rules/base.xml.in.h:462
-msgid "Macintosh"
-msgstr "Macintosh"
+msgid "Latvian (apostrophe variant)"
+msgstr "Lets (apostrof variant)"
 
 #: ../rules/base.xml.in.h:463
-msgid "Macintosh (International)"
-msgstr "Macintosh (Internationaal)"
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Lets (ergonomisch,  ŪGJRMV)"
 
 #: ../rules/base.xml.in.h:464
-msgid "Macintosh Old"
-msgstr "Macintosh oud"
+msgid "Latvian (modern)"
+msgstr "Lets (modern)"
 
 #: ../rules/base.xml.in.h:465
-msgid "Macintosh, Sun dead keys"
-msgstr "Macintosh, Sun-‘dode toetsen’"
+msgid "Latvian (tilde variant)"
+msgstr "Lets (tilde variant)"
 
 #: ../rules/base.xml.in.h:466
-msgid "Macintosh, eliminate dead keys"
-msgstr "Macintosh, zonder dode toetsen"
+msgid "Left Alt"
+msgstr "Linker Alt-toets"
 
-# Backspace-toets
 #: ../rules/base.xml.in.h:467
-msgid "Make Caps Lock an additional Backspace"
-msgstr "Van Caps Lock een extra Backspace maken"
+msgid "Left Alt (while pressed)"
+msgstr "Linker Alt-toets (ingedrukt houden)"
 
-# Ctrl-toets
 #: ../rules/base.xml.in.h:468
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Van Caps Lock een extra Ctrl maken"
+msgid "Left Alt is swapped with Left Win"
+msgstr "De linker Alt-toets en Win-toets worden gewisseld"
 
-# ESC-toets
 #: ../rules/base.xml.in.h:469
-msgid "Make Caps Lock an additional ESC"
-msgstr "Van Caps Lock een extra ESC maken"
+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
-msgid "Make Caps Lock an additional Hyper"
-msgstr "Van Caps Lock een extra Hyper maken"
+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)"
 
+# Linker Ctrl + Shift-toets
 #: ../rules/base.xml.in.h:471
-msgid "Make Caps Lock an additional Num Lock"
-msgstr "Van Caps Lock een extra Num Lock maken"
+msgid "Left Ctrl+Left Shift"
+msgstr "Linker Ctrl + linker Shift-toets"
 
 #: ../rules/base.xml.in.h:472
-msgid "Make Caps Lock an additional Super"
-msgstr "Van Caps Lock een extra Super maken"
+msgid "Left Shift"
+msgstr "Linker Shift-toets"
 
-# een van de 23 Indische talen
 #: ../rules/base.xml.in.h:473
-msgid "Malayalam"
-msgstr "Malayalam"
+msgid "Left Win"
+msgstr "Linker Win-toets"
 
-# een van de 23 Indische talen
+# Linker Win-toets wisselt naar de eerste indeling, rechter Win/Menu-toets wisselt naar de laatste indeling
 #: ../rules/base.xml.in.h:474
-msgid "Malayalam Lalitha"
-msgstr "Malayalam Lalitha"
+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)"
 
-# kan ook als Malediven worden geschreven.
 #: ../rules/base.xml.in.h:475
-msgid "Maldives"
-msgstr "Maldiven"
+msgid "Left Win (while pressed)"
+msgstr "Linker Win-toets (ingedrukt houden)"
 
 #: ../rules/base.xml.in.h:476
-msgid "Mali"
-msgstr "Mali"
+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
-msgid "Malta"
-msgstr "Malta"
+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"
 
-# VS/US/
 #: ../rules/base.xml.in.h:478
-msgid "Maltese keyboard with US layout"
-msgstr "Maltees toetsenbord met US-indeling"
+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
-msgid "Mao"
-msgstr "Mao"
+msgid "Legacy"
+msgstr "Historisch"
 
 #: ../rules/base.xml.in.h:480
-msgid "Maori"
-msgstr "Maori"
-
-#: ../rules/base.xml.in.h:481
-msgid "Mari"
-msgstr "Mari"
+msgid "Legacy Wang 724"
+msgstr "Historisch Wang 724"
 
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:482
-msgid "Mdv"
-msgstr "Mdv"
+msgid "Legacy key with comma"
+msgstr "Historisch cijferblok met komma"
 
 #: ../rules/base.xml.in.h:483
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
+msgid "Legacy key with dot"
+msgstr "Historisch cijferblok met punt"
 
-#: ../rules/base.xml.in.h:484
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access toetsenbord"
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
+msgid "Lithuanian"
+msgstr "Litouws"
 
 #: ../rules/base.xml.in.h:485
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
+msgid "Lithuanian (IBM LST 1205-92)"
+msgstr "Litouws (IBM LST 1205-92)"
 
 #: ../rules/base.xml.in.h:486
-msgid "Menu"
-msgstr "Menu"
+msgid "Lithuanian (LEKP)"
+msgstr "Litouws (LEKP)"
 
 #: ../rules/base.xml.in.h:487
-msgid "Meta is mapped to Left Win"
-msgstr "Meta zit op de linker Win-toets"
+msgid "Lithuanian (LEKPa)"
+msgstr "Litouws (LEKPa)"
 
 #: ../rules/base.xml.in.h:488
-msgid "Meta is mapped to Win keys"
-msgstr "Meta zit op de Win-toetsen"
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgstr "Litouws (US toetsenbord met Litouwse lettertekens)"
 
 #: ../rules/base.xml.in.h:489
-msgid "Meta on Left Ctrl"
-msgstr "Meta op Linker Ctrl-toets"
+msgid "Lithuanian (standard)"
+msgstr "Litouws (standaard)"
 
 #: ../rules/base.xml.in.h:490
-msgid "Microsoft Comfort Curve Keyboard 2000"
-msgstr "Microsoft Comfort Curve toetsenbord 2000"
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access toetsenbord"
 
 #: ../rules/base.xml.in.h:491
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft internet toetsenbord"
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
 
 #: ../rules/base.xml.in.h:492
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, Zweeds"
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (alternatieve optie)"
 
 #: ../rules/base.xml.in.h:493
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
 
 #: ../rules/base.xml.in.h:494
-msgid "Microsoft Natural Keyboard Elite"
-msgstr "Microsoft Natural Keyboard Elite"
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
 
 #: ../rules/base.xml.in.h:495
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
 
 #: ../rules/base.xml.in.h:496
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optisch"
 
 #: ../rules/base.xml.in.h:497
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (alternatieve optie 2)"
 
 #: ../rules/base.xml.in.h:498
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
 
 #: ../rules/base.xml.in.h:499
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office toetsenbord"
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
 #: ../rules/base.xml.in.h:500
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft draadloos multimediatoetsenbord 1.0A"
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 extra toetsen via G15daemon"
 
 #: ../rules/base.xml.in.h:501
-msgid "Miscellaneous compatibility options"
-msgstr "Overige compatibiliteitsopties"
+msgid "Logitech Generic Keyboard"
+msgstr "Logitech algemeen toetsenbord"
 
 #: ../rules/base.xml.in.h:502
-msgid "Mkd"
-msgstr "Mkd"
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Logitech internet 350 toetsenbord"
 
 #: ../rules/base.xml.in.h:503
-msgid "Mli"
-msgstr "Mli"
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech internet toetsenbord"
 
 #: ../rules/base.xml.in.h:504
-msgid "Mlt"
-msgstr "Mlt"
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator toetsenbord"
 
 #: ../rules/base.xml.in.h:505
-msgid "Mmr"
-msgstr "Mmr"
+msgid "Logitech Media Elite Keyboard"
+msgstr "Logitech Media Elite toetsenbord"
 
 #: ../rules/base.xml.in.h:506
-msgid "Mng"
-msgstr "Mng"
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Logitech Ultra-X Cordless Media Desktop toetsenbord"
 
 #: ../rules/base.xml.in.h:507
-msgid "Mongolia"
-msgstr "Mongolië"
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X toetsenbord"
 
-# Servië en Montenegro
 #: ../rules/base.xml.in.h:508
-msgid "Montenegro"
-msgstr "Montenegro"
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Logitech diNovo Edge toetsenbord"
 
 #: ../rules/base.xml.in.h:509
-msgid "Morocco"
-msgstr "Marokko"
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo toetsenbord"
 
 #: ../rules/base.xml.in.h:510
-msgid "Multilingual"
-msgstr "Meertalig"
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
 
 #: ../rules/base.xml.in.h:511
-msgid "Multilingual, first part"
-msgstr "Meertalig, eerste deel"
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch draadloos toetsenbord (model Y-RB6)"
 
 #: ../rules/base.xml.in.h:512
-msgid "Multilingual, second part"
-msgstr "Meertalig, tweede deel"
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator toetsenbord SE"
 
 #: ../rules/base.xml.in.h:513
-msgid "Myanmar"
-msgstr "Myanmar"
+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
-msgid "NICOLA-F style Backspace"
-msgstr "NICOLA-F stijl backspace"
+msgid "Lower Sorbian"
+msgstr "Nedersorbisch"
 
 #: ../rules/base.xml.in.h:515
-msgid "NLA"
-msgstr "NLA"
+msgid "Lower Sorbian (qwertz)"
+msgstr "Nedersorbisch (qwertz)"
 
 #: ../rules/base.xml.in.h:516
-msgid "Nativo"
-msgstr "Nativo"
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
 
 #: ../rules/base.xml.in.h:517
-msgid "Nativo for Esperanto"
-msgstr "Nativo voor Esperanto"
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
 
 #: ../rules/base.xml.in.h:518
-msgid "Nativo for USA keyboards"
-msgstr "Nativo voor Amerikaanse toetsenborden"
+msgid "Macedonian"
+msgstr "Macedonisch"
 
 #: ../rules/base.xml.in.h:519
-msgid "Neo 2"
-msgstr "Neo 2"
+msgid "Macedonian (eliminate dead keys)"
+msgstr "Macedonisch (zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:520
-msgid "Nepal"
-msgstr "Nepal"
+msgid "Macintosh"
+msgstr "Macintosh"
 
 #: ../rules/base.xml.in.h:521
-msgid "Netherlands"
-msgstr "Nederland"
+msgid "Macintosh Old"
+msgstr "Macintosh oud"
 
+# Backspace-toets
 #: ../rules/base.xml.in.h:522
-msgid "New phonetic"
-msgstr "Nieuw fonetisch"
+msgid "Make Caps Lock an additional Backspace"
+msgstr "Van Caps Lock een extra Backspace maken"
 
 #: ../rules/base.xml.in.h:523
-msgid "Nga"
-msgstr "Nga"
+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 "Nigeria"
-msgstr "Nigeria"
+msgid "Make Caps Lock an additional Ctrl"
+msgstr "Van Caps Lock een extra Ctrl maken"
 
+# ESC-toets
 #: ../rules/base.xml.in.h:525
-msgid "Nld"
-msgstr "Nld"
+msgid "Make Caps Lock an additional ESC"
+msgstr "Van Caps Lock een extra ESC maken"
 
-# Spatiebalk geeft harde spatie op het vierde niveau.
 #: ../rules/base.xml.in.h:526
-msgid "Non-breakable space character at fourth level"
-msgstr "Harde spatie op het vierde niveau"
+msgid "Make Caps Lock an additional Hyper"
+msgstr "Van Caps Lock een extra Hyper maken"
 
-# sixth level? hoeveel levels zijn er wel niet?
 #: ../rules/base.xml.in.h:527
-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"
+msgid "Make Caps Lock an additional Num Lock"
+msgstr "Van Caps Lock een extra Num Lock maken"
 
-# sixth level? hoeveel levels zijn er wel niet?
 #: ../rules/base.xml.in.h:528
-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)"
+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
-msgid "Non-breakable space character at second level"
-msgstr "Harde spatie op het tweede niveau"
+msgid "Malayalam"
+msgstr "Malayalam"
 
+# een van de 23 Indische talen
 #: ../rules/base.xml.in.h:530
-msgid "Non-breakable space character at third level"
-msgstr "Harde spatie op het derde niveau"
+msgid "Malayalam (Lalitha)"
+msgstr "Malayalam (Lalitha)"
 
 #: ../rules/base.xml.in.h:531
-msgid "Non-breakable space character at third level, nothing at fourth level"
-msgstr "Harde spatie op het derde niveau, niets op het vierde niveau"
+msgid "Malayalam (enhanced Inscript with Rupee Sign)"
+msgstr "Malayalam (verbeterd Inscript met Roepie-teken)"
 
 #: ../rules/base.xml.in.h:532
-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"
+msgid "Maltese"
+msgstr "Maltees"
 
 #: ../rules/base.xml.in.h:533
-msgid "Nor"
-msgstr "Nor"
+msgid "Maltese (with US layout)"
+msgstr "Maltees (met US-indeling)"
 
 #: ../rules/base.xml.in.h:534
-msgid "Northern Saami"
-msgstr "Noord-Lapland"
+msgid "Maori"
+msgstr "Maori"
 
 #: ../rules/base.xml.in.h:535
-msgid "Northern Saami, eliminate dead keys"
-msgstr "Noord-Lapland, zonder dode toetsen"
+msgid "Mari"
+msgstr "Mari"
 
 #: ../rules/base.xml.in.h:536
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
 
 #: ../rules/base.xml.in.h:537
-msgid "Norway"
-msgstr "Noorwegen"
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access toetsenbord"
 
-# Nepal
 #: ../rules/base.xml.in.h:538
-msgid "Npl"
-msgstr "Npl"
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
 
 #: ../rules/base.xml.in.h:539
-msgid "Num Lock"
-msgstr "Num Lock"
+msgid "Menu"
+msgstr "Menu"
 
-# op het cijferblok is de delete toets aangegeven met del
 #: ../rules/base.xml.in.h:540
-msgid "Numeric keypad delete key behaviour"
-msgstr "Cijferblok del-toetsgedrag"
+msgid "Meta is mapped to Left Win"
+msgstr "Meta zit op de linker Win-toets"
 
 #: ../rules/base.xml.in.h:541
-msgid "Numeric keypad keys work as with Mac"
-msgstr "Cijferblok-toetsen werken net als bij een Mac"
+msgid "Meta is mapped to Win keys"
+msgstr "Meta zit op de Win-toetsen"
 
 #: ../rules/base.xml.in.h:542
-msgid "Numeric keypad layout selection"
-msgstr "Cijferblok-indeling selecteren"
+msgid "Meta on Left Ctrl"
+msgstr "Meta op Linker Ctrl-toets"
 
 #: ../rules/base.xml.in.h:543
-msgid "OADG 109A"
-msgstr "OADG 109A"
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Comfort Curve toetsenbord 2000"
 
 #: ../rules/base.xml.in.h:544
-msgid "OLPC"
-msgstr "OLPC"
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft internet toetsenbord"
 
 #: ../rules/base.xml.in.h:545
-msgid "OLPC Dari"
-msgstr "OLPC Dari"
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Zweeds"
 
 #: ../rules/base.xml.in.h:546
-msgid "OLPC Pashto"
-msgstr "OLPC Pashto"
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
 
 #: ../rules/base.xml.in.h:547
-msgid "OLPC Southern Uzbek"
-msgstr "OLPC Zuid-Oezbekistan"
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Keyboard Elite"
 
 #: ../rules/base.xml.in.h:548
-msgid "Occitan"
-msgstr "Occitaans"
+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 "Ogham"
-msgstr "Oghamees"
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
 
 #: ../rules/base.xml.in.h:550
-msgid "Ogham IS434"
-msgstr "Oghamees IS434"
+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 "Oriya"
-msgstr "Oriya"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
 #: ../rules/base.xml.in.h:552
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Ortek MCK-800 MM/Internet toetsenbord"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
 #: ../rules/base.xml.in.h:553
-msgid "Ossetian"
-msgstr "Osetisch"
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office toetsenbord"
 
 #: ../rules/base.xml.in.h:554
-msgid "Ossetian, Winkeys"
-msgstr "Osetisch, Win-toetsen"
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft draadloos multimediatoetsenbord 1.0A"
 
 #: ../rules/base.xml.in.h:555
-msgid "Ossetian, legacy"
-msgstr "Osetisch, historisch"
+msgid "Miscellaneous compatibility options"
+msgstr "Overige compatibiliteitsopties"
 
 #: ../rules/base.xml.in.h:556
-msgid "PC-98xx Series"
-msgstr "PC-98xx serie"
+msgid "Mongolian"
+msgstr "Mongools"
 
+# Montenegrijns is het Servo-Kroatische (Štokavische) dialect 
+# dat in Montenegro wordt gesproken
 #: ../rules/base.xml.in.h:557
-msgid "Pak"
-msgstr "Pak"
+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
-msgid "Pakistan"
-msgstr "Pakistan"
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr "Montenegrijns (Cyrillisch met Franse aanhalingstekens)"
 
-# 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:559
-msgid "Pannonian Rusyn Homophonic"
-msgstr "Pannonisch Rusyn Homophonisch"
+msgid "Montenegrin (Cyrillic)"
+msgstr "Montenegrijns (Cyrillisch)"
 
+# verwisseld/gewisseld/omgewisseld
 #: ../rules/base.xml.in.h:560
-msgid "Pashto"
-msgstr "Pashto"
+msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
+msgstr "Montenegrijns (Cyrillisch, Z en ZHE omgewisseld)"
 
 #: ../rules/base.xml.in.h:561
-msgid "Pattachote"
-msgstr "Pattachote"
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Montenegrijns (Latijns Unicode qwerty)"
 
-# de text op de Pause-toets is meestal "Pause"
 #: ../rules/base.xml.in.h:562
-msgid "Pause"
-msgstr "Pause"
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Montenegrijns (Latijns Unicode)"
 
 #: ../rules/base.xml.in.h:563
-msgid "Persian, with Persian Keypad"
-msgstr "Persisch, met Persisch cijferblok"
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Montenegrijns (Latijns qwerty)"
 
 #: ../rules/base.xml.in.h:564
-msgid "Phi"
-msgstr "Phi"
+msgid "Montenegrin (Latin with guillemets)"
+msgstr "Montenegrijns (Latijns met Franse aanhalingstekens)"
 
 #: ../rules/base.xml.in.h:565
-msgid "Philippines"
-msgstr "Filipijnen"
+msgid "NICOLA-F style Backspace"
+msgstr "NICOLA-F stijl backspace"
 
 #: ../rules/base.xml.in.h:566
-msgid "Phonetic"
-msgstr "Fonetisch"
+msgid "Nepali"
+msgstr "Nepalees"
 
+# Spatiebalk geeft harde spatie op het vierde niveau.
 #: ../rules/base.xml.in.h:567
-msgid "Phonetic Winkeys"
-msgstr "Fonetisch Win-toetsen"
+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
-msgid "Pol"
-msgstr "Pol"
+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
-msgid "Poland"
-msgstr "Polen"
+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
-msgid "Polytonic"
-msgstr "Meertonig"
+msgid "Non-breakable space character at second level"
+msgstr "Harde spatie op het tweede niveau"
 
 #: ../rules/base.xml.in.h:571
-msgid "Portugal"
-msgstr "Portugal"
+msgid "Non-breakable space character at third level"
+msgstr "Harde spatie op het derde niveau"
 
 #: ../rules/base.xml.in.h:572
-msgid "Probhat"
-msgstr "Probhat"
+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
-msgid "Programmer Dvorak"
-msgstr "Programmeer-Dvorak"
+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
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
+msgid "Northern Saami (Finland)"
+msgstr "Noord-Samisch (Finland)"
 
 #: ../rules/base.xml.in.h:575
-msgid "Prt"
-msgstr "Prt"
+msgid "Northern Saami (Norway)"
+msgstr "Noord-Samisch (Noorwegen)"
 
 #: ../rules/base.xml.in.h:576
-msgid "PrtSc"
-msgstr "PrtSc"
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Noord-Samisch (Noorwegen, zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:577
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+msgid "Northern Saami (Sweden)"
+msgstr "Noord-Samisch (Zweden)"
 
 #: ../rules/base.xml.in.h:578
-msgid "QWERTY (Baybayin)"
-msgstr "QWERTY (Baybayin)"
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
 
 #: ../rules/base.xml.in.h:579
-msgid "Right Alt"
-msgstr "Rechter Alt-toets"
+msgid "Norwegian"
+msgstr "Noors"
 
-# BUG Alt ipv Alt key
 #: ../rules/base.xml.in.h:580
-msgid "Right Alt (while pressed)"
-msgstr "Rechter Alt-toets (ingedrukt houden)"
+msgid "Norwegian (Dvorak)"
+msgstr "Noors (Dvorak)"
 
 #: ../rules/base.xml.in.h:581
-msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Rechter Alt-toets geeft het 5de niveau en is blijvend wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer"
+msgid "Norwegian (Macintosh)"
+msgstr "Noors (Macintosh)"
 
 #: ../rules/base.xml.in.h:582
-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 is blijvend wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer, één toetsaanslag heft het niveau op"
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Noors (Macintosh, zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:583
-msgid "Right Alt key never chooses 3rd level"
-msgstr "Rechter Alt-toets geeft nooit het 3e niveau"
+msgid "Norwegian (eliminate dead keys)"
+msgstr "Noors (zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:584
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "Rechter Alt-toets, Shift + rechter Alt-toets is Multi_Key"
+msgid "Num Lock"
+msgstr "Num Lock"
 
+# op het cijferblok is de delete toets aangegeven met del
 #: ../rules/base.xml.in.h:585
-msgid "Right Ctrl"
-msgstr "Rechter Ctrl-toets"
+msgid "Numeric keypad delete key behaviour"
+msgstr "Cijferblok del-toetsgedrag"
 
+# Apple-computer/Macintosh
 #: ../rules/base.xml.in.h:586
-msgid "Right Ctrl (while pressed)"
-msgstr "Rechter Ctrl-toets (ingedrukt houden)"
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "Cijferblok-toetsen werken net als bij een Macintosh"
 
-# Rechter Ctrl-toets doet hetzelfde als de rechter Alt-toets.
 #: ../rules/base.xml.in.h:587
-msgid "Right Ctrl as Right Alt"
-msgstr "Rechter Ctrl-toets en Alt-toets hetzelfde"
+msgid "Numeric keypad layout selection"
+msgstr "Cijferblok-indeling selecteren"
 
-# Rechter Ctrl+Shift-toets
 #: ../rules/base.xml.in.h:588
-msgid "Right Ctrl+Right Shift"
-msgstr "Rechter Ctrl-toets + Rechter Shift-toets"
+msgid "OLPC"
+msgstr "OLPC"
 
 #: ../rules/base.xml.in.h:589
-msgid "Right Shift"
-msgstr "Rechter Shift-toets"
+msgid "Occitan"
+msgstr "Occitaans"
 
 #: ../rules/base.xml.in.h:590
-msgid "Right Win"
-msgstr "Rechter Win-toets"
+msgid "Ogham"
+msgstr "Ogham"
 
+# Iers (Ogham IS434)
 #: ../rules/base.xml.in.h:591
-msgid "Right Win (while pressed)"
-msgstr "Rechter Win-toets (ingedrukt houden)"
+msgid "Ogham (IS434)"
+msgstr "Ogham (IS434)"
 
 #: ../rules/base.xml.in.h:592
-msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Rechter Win-toets geeft het 5de niveau en is blijvend wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer"
+msgid "Oriya"
+msgstr "Oriya"
 
 #: ../rules/base.xml.in.h:593
-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 is blijvend wanneer het ingedrukt wordt samen met een andere 5de niveau-kiezer, één toetsaanslag heft het niveau op"
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/Internet toetsenbord"
 
+# Russisch (Georgisch)
 #: ../rules/base.xml.in.h:594
-msgid "Right hand"
-msgstr "Rechtshandig"
+msgid "Ossetian (Georgia)"
+msgstr "Ossetisch (Georgië)"
 
 #: ../rules/base.xml.in.h:595
-msgid "Right handed Dvorak"
-msgstr "Rechtshandige Dvorak"
+msgid "Ossetian (WinKeys)"
+msgstr "Ossetisch (Windows-toetsen)"
 
 #: ../rules/base.xml.in.h:596
-msgid "Romania"
-msgstr "Roemenië"
+msgid "Ossetian (legacy)"
+msgstr "Ossetisch (historisch)"
 
 #: ../rules/base.xml.in.h:597
-msgid "Romanian keyboard with German letters"
-msgstr "Roemeens toetsenbord met Duitse lettertekens"
+msgid "PC-98xx Series"
+msgstr "PC-98xx serie"
 
+# 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:598
-msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Roemeens toetsenbord met Duitse lettertekens, zonder dode toetsen"
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Pannonisch Rusyn (homophonisch)"
 
 #: ../rules/base.xml.in.h:599
-msgid "Rou"
-msgstr "Rou"
+msgid "Pashto"
+msgstr "Pashto"
 
 #: ../rules/base.xml.in.h:600
-msgid "Rupee on 4"
-msgstr "Rupee op 4"
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr "Pashto (Afghanistan, OLPC)"
 
+# de text op de Pause-toets is meestal "Pause"
 #: ../rules/base.xml.in.h:601
-msgid "Rus"
-msgstr "Rus"
+msgid "Pause"
+msgstr "Pause"
 
-#: ../rules/base.xml.in.h:602
-msgid "Russia"
-msgstr "Rusland"
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
+msgid "Persian"
+msgstr "Persisch"
 
 #: ../rules/base.xml.in.h:603
-msgid "Russian"
-msgstr "Russisch"
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr "Persisch (Afghanistan, Dari OLPC)"
 
 #: ../rules/base.xml.in.h:604
-msgid "Russian phonetic"
-msgstr "Russisch fonetisch"
+msgid "Persian (with Persian Keypad)"
+msgstr "Persisch (met Persisch cijferblok)"
 
-#: ../rules/base.xml.in.h:605
-msgid "Russian phonetic Dvorak"
-msgstr "Russisch-fonetisch Dvorak"
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
+msgid "Polish"
+msgstr "Pools"
 
 #: ../rules/base.xml.in.h:606
-msgid "Russian phonetic, eliminate dead keys"
-msgstr "Russisch fonetisch, zonder dode toetsen"
+msgid "Polish (Dvorak)"
+msgstr "Pools (Dvorak)"
 
 #: ../rules/base.xml.in.h:607
-msgid "Russian with Kazakh"
-msgstr "Russisch met Kazachstaans"
+msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgstr "Pools (Dvorak, Poolse aanhalingstekens op toets 1)"
 
-# draadloos toetsenbord
 #: ../rules/base.xml.in.h:608
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard"
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr "Pools (Dvorak, Poolse aanhalingstekens op aanhalingstekentoets)"
 
 #: ../rules/base.xml.in.h:609
-msgid "SK-1300"
-msgstr "SK-1300"
+msgid "Polish (programmer Dvorak)"
+msgstr "Pools (Programmeer-Dvorak)"
 
 #: ../rules/base.xml.in.h:610
-msgid "SK-2500"
-msgstr "SK-2500"
+msgid "Polish (qwertz)"
+msgstr "Pools (qwertz)"
 
 #: ../rules/base.xml.in.h:611
-msgid "SK-6200"
-msgstr "SK-6200"
+msgid "Portuguese"
+msgstr "Portugees"
 
 #: ../rules/base.xml.in.h:612
-msgid "SK-7100"
-msgstr "SK-7100"
+msgid "Portuguese (Brazil)"
+msgstr "Portugees (Brazilië)"
 
-#: ../rules/base.xml.in.h:613 ../rules/base.extras.xml.in.h:9
-msgid "SRB"
-msgstr "SRB"
+#: ../rules/base.xml.in.h:613
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr "Portugees (Brazilië, Dvorak)"
 
 #: ../rules/base.xml.in.h:614
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr "Portugees (Brazilië, zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:615
-msgid "SVEN Slim 303"
-msgstr "SVEN Slim 303"
+msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgstr "Portugees (Brazilië, nativo voor Esperanto)"
 
+# BUG USA keyboards ipv US keyboards
 #: ../rules/base.xml.in.h:616
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
+msgid "Portuguese (Brazil, nativo for USA keyboards)"
+msgstr "Portugees (Brazilië, Nativo voor US toetsenborden)"
 
 #: ../rules/base.xml.in.h:617
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
+msgid "Portuguese (Brazil, nativo)"
+msgstr "Portugees (Brazilië, nativo)"
 
 #: ../rules/base.xml.in.h:618
-msgid "Scroll Lock"
-msgstr "Scroll Lock"
+msgid "Portuguese (Macintosh)"
+msgstr "Portugees (Macintosh)"
 
-# Canadees-Indiaanse taal (Shuswap)
 #: ../rules/base.xml.in.h:619
-msgid "Secwepemctsin"
-msgstr "Secwepemctsin"
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portugees (Macintosh, Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:620
-msgid "Semi-colon on third level"
-msgstr "Punt-komma op derde niveau"
+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
-msgid "Sen"
-msgstr "Sen"
+msgid "Portuguese (Nativo for USA keyboards)"
+msgstr "Portugees (Nativo voor US toetsenborden)"
 
 #: ../rules/base.xml.in.h:622
-msgid "Senegal"
-msgstr "Senegal"
+msgid "Portuguese (Nativo)"
+msgstr "Portugees (Nativo)"
 
-#: ../rules/base.xml.in.h:623 ../rules/base.extras.xml.in.h:10
-msgid "Serbia"
-msgstr "Servië"
+#: ../rules/base.xml.in.h:623
+msgid "Portuguese (Sun dead keys)"
+msgstr "Portugees (Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:624
-msgid "Serbian"
-msgstr "Servisch"
+msgid "Portuguese (eliminate dead keys)"
+msgstr "Portugees (zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:625
-msgid "Serbo-Croatian"
-msgstr "Servo-Kroatisch"
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
 
 #: ../rules/base.xml.in.h:626
-msgid "Shift cancels Caps Lock"
-msgstr "Shift heft Caps Lock op"
+msgid "PrtSc"
+msgstr "PrtSc"
 
 #: ../rules/base.xml.in.h:627
-msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
-msgstr "Shift heft Num Lock niet op, maar geeft juist het 3e niveau"
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "Punjabi (Gurmukhi Jhelum)"
 
 #: ../rules/base.xml.in.h:628
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Shift met cijferblok-toetsen werkt zoals in MS Windows"
+msgid "Punjabi (Gurmukhi)"
+msgstr "Punjabi (Gurmukhi)"
 
 #: ../rules/base.xml.in.h:629
-msgid "Shift+Caps Lock"
-msgstr "Shift+Caps Lock"
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
 
 #: ../rules/base.xml.in.h:630
-msgid "Simple"
-msgstr "Simpel"
+msgid "Right Alt"
+msgstr "Rechter Alt-toets"
 
+# BUG Alt ipv Alt key
 #: ../rules/base.xml.in.h:631
-msgid "Sindhi"
-msgstr "Sindhi"
+msgid "Right Alt (while pressed)"
+msgstr "Rechter Alt-toets (ingedrukt houden)"
 
 #: ../rules/base.xml.in.h:632
-msgid "Slovakia"
-msgstr "Slowakije"
+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
-msgid "Slovenia"
-msgstr "Slovenië"
+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
-msgid "South Africa"
-msgstr "Zuid-Afrika"
+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
-msgid "Southern Uzbek"
-msgstr "Zuid-Oezbekistan"
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Rechter Alt-toets geeft nooit het 3e niveau"
 
 #: ../rules/base.xml.in.h:636
-msgid "Spain"
-msgstr "Spanje"
+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
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr "Speciale toetsen (Ctrl+Alt+&lt;toets&gt;) afgehandeld in een server"
+msgid "Right Ctrl"
+msgstr "Rechter Ctrl-toets"
 
 #: ../rules/base.xml.in.h:638
-msgid "Sri Lanka"
-msgstr "Sri Lanka"
+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
-msgid "Standard"
-msgstr "Standaard"
+msgid "Right Ctrl as Right Alt"
+msgstr "Rechter Ctrl en Alt-toets doen hetzelfde"
 
 #: ../rules/base.xml.in.h:640
-msgid "Standard (Cedilla)"
-msgstr "Standaard (Cedilla)"
+msgid "Right Ctrl is mapped to Menu"
+msgstr "Rechter Ctrl zit op de Menu-toets"
+
+# Rechter Ctrl+Shift-toets
+#: ../rules/base.xml.in.h:641
+msgid "Right Ctrl+Right Shift"
+msgstr "Rechter Ctrl-toets + Rechter Shift-toets"
 
-#. RSTU 2019-91
 #: ../rules/base.xml.in.h:642
-msgid "Standard RSTU"
-msgstr "Standaard RSTU"
+msgid "Right Shift"
+msgstr "Rechter Shift-toets"
+
+#: ../rules/base.xml.in.h:643
+msgid "Right Win"
+msgstr "Rechter Win-toets"
 
-#. RSTU 2019-91
 #: ../rules/base.xml.in.h:644
-msgid "Standard RSTU on Russian layout"
-msgstr "Standaard RSTU op Russische indeling"
+msgid "Right Win (while pressed)"
+msgstr "Rechter Win-toets (ingedrukt houden)"
 
 #: ../rules/base.xml.in.h:645
-msgid "Sun Type 5/6"
-msgstr "Sun type 5/6"
+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
-msgid "Sun dead keys"
-msgstr "Sun dode toetsen"
+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
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power multimediatoetsenbord"
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
+msgid "Romanian"
+msgstr "Roemeens"
 
-# Slovaaks Dvorak?
 #: ../rules/base.xml.in.h:648
-msgid "Svdvorak"
-msgstr "Svdvorak"
+msgid "Romanian (Germany)"
+msgstr "Roemeens (Duitsland)"
 
 #: ../rules/base.xml.in.h:649
-msgid "Svk"
-msgstr "Svk"
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Roemeens (Duitsland, zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:650
-msgid "Svn"
-msgstr "Svn"
+msgid "Romanian (WinKeys)"
+msgstr "Roemeens (Windows-toetsen)"
 
 #: ../rules/base.xml.in.h:651
-msgid "Swap Ctrl and Caps Lock"
-msgstr "Ctrl en Caps Lock omwisselen"
+msgid "Romanian (cedilla)"
+msgstr "Roemeens (cedilla)"
 
 #: ../rules/base.xml.in.h:652
-msgid "Swap ESC and Caps Lock"
-msgstr "Esc en Caps Lock omwisselen"
+msgid "Romanian (standard cedilla)"
+msgstr "Roemeens (standaard cedilla)"
 
 #: ../rules/base.xml.in.h:653
-msgid "Swe"
-msgstr "Swe"
+msgid "Romanian (standard)"
+msgstr "Roemeens (standaard)"
 
 #: ../rules/base.xml.in.h:654
-msgid "Sweden"
-msgstr "Zweden"
+msgid "Rupee on 4"
+msgstr "Roepie op 4"
 
-#: ../rules/base.xml.in.h:655
-msgid "Switzerland"
-msgstr "Zwitserland"
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
+msgid "Russian"
+msgstr "Russisch"
 
 #: ../rules/base.xml.in.h:656
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
+msgid "Russian (DOS)"
+msgstr "Russisch (DOS)"
 
 #: ../rules/base.xml.in.h:657
-msgid "Syr"
-msgstr "Syr"
+msgid "Russian (Georgia)"
+msgstr "Russisch (Georgisch)"
 
 #: ../rules/base.xml.in.h:658
-msgid "Syria"
-msgstr "Syrië"
+msgid "Russian (Germany, phonetic)"
+msgstr "Russisch (Duitsland fonetisch)"
 
 #: ../rules/base.xml.in.h:659
-msgid "Syriac"
-msgstr "Syrisch"
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr "Russisch (Kazachstans, met Kazachstaans)"
 
 #: ../rules/base.xml.in.h:660
-msgid "Syriac phonetic"
-msgstr "Syrisch fonetisch"
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr "Russisch (Polen, fonetisch Dvorak)"
 
 #: ../rules/base.xml.in.h:661
-msgid "TIS-820.2538"
-msgstr "TIS-820.2538"
+msgid "Russian (Sweden, phonetic)"
+msgstr "Russisch (Zweden, fonetisch)"
 
 #: ../rules/base.xml.in.h:662
-msgid "Tajikistan"
-msgstr "Tadzjikistan"
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgstr "Russisch (Zweden, fonetisch, zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:663
-msgid "Tamil"
-msgstr "Tamil"
+msgid "Russian (US, phonetic)"
+msgstr "Russisch (US, fonetisch)"
 
+# Oekraïens (standaard RSTU)<
 #: ../rules/base.xml.in.h:664
-msgid "Tamil Keyboard with Numerals"
-msgstr "Tamil toetsenbord met cijfertekens"
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Russisch (Oekraïne, standaard RSTU)"
 
 #: ../rules/base.xml.in.h:665
-msgid "Tamil TAB Typewriter"
-msgstr "Tamil TAB typmachine"
+msgid "Russian (legacy)"
+msgstr "Russisch (historisch)"
 
 #: ../rules/base.xml.in.h:666
-msgid "Tamil TSCII Typewriter"
-msgstr "Tamil TSCII typmachine"
+msgid "Russian (phonetic WinKeys)"
+msgstr "Russisch (fonetisch Windows-toetsen)"
 
 #: ../rules/base.xml.in.h:667
-msgid "Tamil Unicode"
-msgstr "Tamil unicode"
+msgid "Russian (phonetic)"
+msgstr "Russisch (fonetisch)"
 
 #: ../rules/base.xml.in.h:668
-msgid "Tanzania"
-msgstr "Tanzania"
+msgid "Russian (typewriter)"
+msgstr "Russisch (typmachine)"
 
 #: ../rules/base.xml.in.h:669
-msgid "Targa Visionary 811"
-msgstr "Targa Visionary 811"
+msgid "Russian (typewriter, legacy)"
+msgstr "Russisch (typmachine, historisch)"
 
+# draadloos toetsenbord
 #: ../rules/base.xml.in.h:670
-msgid "Tatar"
-msgstr "Tatar"
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
 #: ../rules/base.xml.in.h:671
-msgid "Telugu"
-msgstr "Telugu"
+msgid "SK-1300"
+msgstr "SK-1300"
 
 #: ../rules/base.xml.in.h:672
-msgid "Tha"
-msgstr "Tha"
+msgid "SK-2500"
+msgstr "SK-2500"
 
 #: ../rules/base.xml.in.h:673
-msgid "Thailand"
-msgstr "Thailand"
+msgid "SK-6200"
+msgstr "SK-6200"
 
 #: ../rules/base.xml.in.h:674
-msgid "Tibetan"
-msgstr "Tibetaans"
+msgid "SK-7100"
+msgstr "SK-7100"
 
 #: ../rules/base.xml.in.h:675
-msgid "Tibetan (with ASCII numerals)"
-msgstr "Tibetaans (met ASCII-cijfers)"
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
 
 #: ../rules/base.xml.in.h:676
-msgid "Tifinagh"
-msgstr "Tifinagh"
+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
-msgid "Tifinagh alternative"
-msgstr "Tifinagh alternatief"
+msgid "Saisiyat (Taiwan)"
+msgstr "Saisiyat (Taiwan)"
 
 #: ../rules/base.xml.in.h:678
-msgid "Tifinagh alternative phonetic"
-msgstr "Tifinagh alternatief fonetisch"
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
 
 #: ../rules/base.xml.in.h:679
-msgid "Tifinagh extended"
-msgstr "Tifinagh uitgebreid"
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
 
 #: ../rules/base.xml.in.h:680
-msgid "Tifinagh extended phonetic"
-msgstr "Tifinagh fonetisch uitgebreid"
+msgid "Sanwa Supply SKB-KG3"
+msgstr "Sanwa Supply SKB-KG3"
 
 #: ../rules/base.xml.in.h:681
-msgid "Tifinagh phonetic"
-msgstr "Tifinagh fonetisch"
+msgid "Scroll Lock"
+msgstr "Scroll Lock"
 
 #: ../rules/base.xml.in.h:682
-msgid "Tilde (~) variant"
-msgstr "Tilde (~) variant"
+msgid "Semi-colon on third level"
+msgstr "Punt-komma op derde niveau"
 
-#: ../rules/base.xml.in.h:683
-msgid "Tjk"
-msgstr "Tjk"
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
+msgid "Serbian"
+msgstr "Servisch"
 
 #: ../rules/base.xml.in.h:684
-msgid "Tkm"
-msgstr "Tkm"
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr "Servisch (Latijns Unicode qwerty)"
 
 #: ../rules/base.xml.in.h:685
-msgid "To the corresponding key in a Dvorak keyboard."
-msgstr "Naar de corresponderende toets op een Dvorak toetsenbord."
+msgid "Serbian (Latin Unicode)"
+msgstr "Servisch (Latijns Unicode)"
 
 #: ../rules/base.xml.in.h:686
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr "Naar de corresponderende toets op een Qwerty toetsenbord."
+msgid "Serbian (Latin qwerty)"
+msgstr "Servisch (Latijns qwerty)"
 
-# 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)
+# Guillemets of ook quillemets zijn Franse aanhalingstekens.
+# Dit is "Nederlands" en dit is de «Franse manier» van aanhalen.
 #: ../rules/base.xml.in.h:687
-msgid "Toggle PointerKeys with Shift + NumLock."
-msgstr "Muistoetsen aan/uitzetten met Shift+NumLock."
+msgid "Serbian (Latin with guillemets)"
+msgstr "Servisch (Latijns met Franse aanhalingstekens)"
 
 #: ../rules/base.xml.in.h:688
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
+msgid "Serbian (Latin)"
+msgstr "Servisch (Latijns)"
 
 #: ../rules/base.xml.in.h:689
-msgid "Traditional phonetic"
-msgstr "Traditioneel fonetisch"
+msgid "Serbian (Russia)"
+msgstr "Servisch (Rusland)"
 
 #: ../rules/base.xml.in.h:690
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access toetsenbord"
+msgid "Serbian (Z and ZHE swapped)"
+msgstr "Servisch (Z en ZHE omgewisseld)"
 
 #: ../rules/base.xml.in.h:691
-msgid "Trust Slimline"
-msgstr "Trust Slimline"
+msgid "Serbian (with guillemets)"
+msgstr "Servisch (met Franse aanhalingstekens)"
 
-# classic is hier onderdeel van merknaam?
 #: ../rules/base.xml.in.h:692
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
+msgid "Serbo-Croatian (US)"
+msgstr "Servo-Kroatisch (US)"
 
 #: ../rules/base.xml.in.h:693
-msgid "Tur"
-msgstr "Tur"
+msgid "Shift cancels Caps Lock"
+msgstr "Shift heft Caps Lock op"
 
 #: ../rules/base.xml.in.h:694
-msgid "Turkey"
-msgstr "Turkije"
+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
-msgid "Turkmenistan"
-msgstr "Turkmenistan"
+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
-msgid "TypeMatrix EZ-Reach 2020"
-msgstr "TypeMatrix EZ-Reach 2020"
+msgid "Shift+Caps Lock"
+msgstr "Shift+Caps Lock"
 
 #: ../rules/base.xml.in.h:697
-msgid "TypeMatrix EZ-Reach 2030 PS2"
-msgstr "TypeMatrix EZ-Reach 2030 PS2"
+msgid "Sindhi"
+msgstr "Sindhi"
 
+# Het Singalees of Sinhala
 #: ../rules/base.xml.in.h:698
-msgid "TypeMatrix EZ-Reach 2030 USB"
-msgstr "TypeMatrix EZ-Reach 2030 USB"
+msgid "Sinhala"
+msgstr "Singalees"
 
 #: ../rules/base.xml.in.h:699
-msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
+msgid "Slovak"
+msgstr "Slowaaks"
 
+# brede backslash/uitgebreide backslash
 #: ../rules/base.xml.in.h:700
-msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgid "Slovak (extended Backslash)"
+msgstr "Slovaaks (brede backslash)"
 
 #: ../rules/base.xml.in.h:701
-msgid "Typewriter"
-msgstr "Typmachine"
+msgid "Slovak (qwerty)"
+msgstr "Slovaaks (qwerty)"
 
+# brede backslash/uitgebreide backslash
 #: ../rules/base.xml.in.h:702
-msgid "Typewriter, legacy"
-msgstr "Typmachine, historisch"
+msgid "Slovak (qwerty, extended Backslash)"
+msgstr "Slovaaks (qwerty, brede backslash)"
 
-# Tanzania?
 #: ../rules/base.xml.in.h:703
-msgid "Tza"
-msgstr "Tza"
+msgid "Slovenian"
+msgstr "Sloveens"
 
 #: ../rules/base.xml.in.h:704
-msgid "UCW layout (accented letters only)"
-msgstr "UCW-indeling (allen lettertekens met accenten)"
+msgid "Slovenian (US keyboard with Slovenian letters)"
+msgstr "Sloveens (US toetsenbord met Sloveense lettertekens)"
 
 #: ../rules/base.xml.in.h:705
-msgid "US Dvorak with CZ UCW support"
-msgstr "US Dvorak met CZ UCW ondersteuning"
+msgid "Slovenian (use guillemets for quotes)"
+msgstr "Sloveens (met Franse aanhalingstekens voor citaten)"
 
-# lettersamenstelling?
 #: ../rules/base.xml.in.h:706
-msgid "US keyboard with Bosnian digraphs"
-msgstr "Amerikaans toetsenbord met Bosnische digrafen"
+msgid "Spanish"
+msgstr "Spaans"
 
 #: ../rules/base.xml.in.h:707
-msgid "US keyboard with Bosnian letters"
-msgstr "Amerikaans toetsenbord met Bosnische lettertekens"
+msgid "Spanish (Dvorak)"
+msgstr "Spaans (Dvorak)"
 
 #: ../rules/base.xml.in.h:708
-msgid "US keyboard with Croatian digraphs"
-msgstr "Amerikaans toetsenbord met Kroatische digrafen"
+msgid "Spanish (Latin American)"
+msgstr "Spaans (Latijns-Amerika)"
 
 #: ../rules/base.xml.in.h:709
-msgid "US keyboard with Croatian letters"
-msgstr "Amerikaans toetsenbord met Kroatische lettertekens"
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Spaans (Latijns-Amerika, Sun dode toetsen)"
 
 #: ../rules/base.xml.in.h:710
-msgid "US keyboard with Estonian letters"
-msgstr "Amerikaans toetsenbord met Estlandse lettertekens"
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr "Spaans (Latijns-Amerika, zonder dode toetsen)"
 
 #: ../rules/base.xml.in.h:711
-msgid "US keyboard with Italian letters"
-msgstr "Amerikaans toetsenbord met Italiaanse lettertekens"
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr "Spaans (Latijns-Amerika, met dode tilde)"
 
 #: ../rules/base.xml.in.h:712
-msgid "US keyboard with Lithuanian letters"
-msgstr "Amerikaans toetsenbord met Litouwse lettertekens"
+msgid "Spanish (Macintosh)"
+msgstr "Spaans (Macintosh)"
 
 #: ../rules/base.xml.in.h:713
-msgid "US keyboard with Slovenian letters"
-msgstr "Amerikaans toetsenbord met Sloveense lettertekens"
+msgid "Spanish (Sun dead keys)"
+msgstr "Spaans (Sun dode toetsen)"
 
-# eigenlijk VS maar dat is veel dubbelzinniger,
-# iedereen weet wat USA betekent, VS kan voor veel dingen staan
-#: ../rules/base.xml.in.h:714 ../rules/base.extras.xml.in.h:11
-msgid "USA"
-msgstr "USA"
+#: ../rules/base.xml.in.h:714
+msgid "Spanish (eliminate dead keys)"
+msgstr "Spaans (zonder dode toetsen)"
 
+# met/bijvoegen
+# inactieve/dode/latente
 #: ../rules/base.xml.in.h:715
-msgid "Udmurt"
-msgstr "Udmurts"
+msgid "Spanish (include dead tilde)"
+msgstr "Spaans (met dode tilde)"
 
 #: ../rules/base.xml.in.h:716
-msgid "Ukr"
-msgstr "Ukr"
+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
-msgid "Ukraine"
-msgstr "Oekraïne"
+msgid "Sun Type 5/6"
+msgstr "Sun type 5/6"
 
 #: ../rules/base.xml.in.h:718
-msgid "Unicode additions (arrows and math operators)"
-msgstr "Unicode-aanvullingen (pijlen en wiskundige operatoren)"
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power multimediatoetsenbord"
 
 #: ../rules/base.xml.in.h:719
-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"
+msgid "Swahili (Kenya)"
+msgstr "Swahili (Kenia)"
 
 #: ../rules/base.xml.in.h:720
-msgid "UnicodeExpert"
-msgstr "UnicodeExpert"
+msgid "Swahili (Tanzania)"
+msgstr "Swahili (Tanzania)"
 
 #: ../rules/base.xml.in.h:721
-msgid "United Kingdom"
-msgstr "Verenigd Koninkrijk"
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Ctrl en Caps Lock omwisselen"
 
 #: ../rules/base.xml.in.h:722
-msgid "Unitek KB-1925"
-msgstr "Unitek KB-1925"
+msgid "Swap ESC and Caps Lock"
+msgstr "Esc en Caps Lock omwisselen"
 
 #: ../rules/base.xml.in.h:723
-msgid "Urdu, Alternative phonetic"
-msgstr "Urdu, alternatief fonetisch"
+msgid "Swedish"
+msgstr "Zweeds"
 
 #: ../rules/base.xml.in.h:724
-msgid "Urdu, Phonetic"
-msgstr "Urdu, fonetisch"
+msgid "Swedish (Dvorak)"
+msgstr "Zweeds (Dvorak)"
 
 #: ../rules/base.xml.in.h:725
-msgid "Urdu, Winkeys"
-msgstr "Urdu, Win-toetsen"
+msgid "Swedish (Macintosh)"
+msgstr "Zweeds (Macintosh)"
 
 #: ../rules/base.xml.in.h:726
-msgid "Use Bosnian digraphs"
-msgstr "Bosnische digrafen gebruiken"
+msgid "Swedish (Svdvorak)"
+msgstr "Zweeds (Svdvorak)"
 
 #: ../rules/base.xml.in.h:727
-msgid "Use Croatian digraphs"
-msgstr "Kroatische digrafen gebruiken"
+msgid "Swedish (eliminate dead keys)"
+msgstr "Zweeds (zonder dode toetsen)"
 
-# Guillemets of ook quillemets zijn Franse aanhalingstekens.
-# Dit is de "Nederlandse" en dit is de «Franse manier» van aanhalen.
 #: ../rules/base.xml.in.h:728
-msgid "Use guillemets for quotes"
-msgstr "Franse aanhalingstekens gebruiken voor citaten"
+msgid "Swedish Sign Language"
+msgstr "Zweedse gebarentaal"
 
 #: ../rules/base.xml.in.h:729
-msgid "Use keyboard LED to show alternative layout"
-msgstr "Toetsenbord-LED gebruiken om alternatieve indeling te tonen"
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
 
 #: ../rules/base.xml.in.h:730
-msgid "Using space key to input non-breakable space character"
-msgstr "Spatiebalk gebruiken voor het invoeren van niet-afbrekende (harde) spaties"
+msgid "Syriac"
+msgstr "Syrisch"
 
-# Spatiebalk geeft de gebruikelijke spatie op elk niveau.
 #: ../rules/base.xml.in.h:731
-msgid "Usual space at any level"
-msgstr "Gebruikelijke spatie op elk niveau"
+msgid "Syriac (phonetic)"
+msgstr "Syrisch (fonetisch)"
 
 #: ../rules/base.xml.in.h:732
-msgid "Uzb"
-msgstr "Uzb"
+msgid "Taiwanese"
+msgstr "Taiwanees"
 
 #: ../rules/base.xml.in.h:733
-msgid "Uzbekistan"
-msgstr "Oezbekistan"
+msgid "Taiwanese (indigenous)"
+msgstr "Taiwanees (oorspronkelijk)"
 
+# Het Tadzjieks of Tajiki
 #: ../rules/base.xml.in.h:734
-msgid "Vietnam"
-msgstr "Viëtnam"
+msgid "Tajik"
+msgstr "Tadzjieks"
 
 #: ../rules/base.xml.in.h:735
-msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr "ViewSonic KU-306 internet toetsenbord"
+msgid "Tajik (legacy)"
+msgstr "Tadzjieks (historisch)"
 
 #: ../rules/base.xml.in.h:736
-msgid "Vnm"
-msgstr "Vnm"
+msgid "Tamil"
+msgstr "Tamil"
 
 #: ../rules/base.xml.in.h:737
-msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Wang 724 cijferblok met unicode-aanvullingen (pijlen en wiskundige operatoren)"
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgstr "Tamil (Sri Lanka, TAB typmachine)"
 
 #: ../rules/base.xml.in.h:738
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level"
-msgstr "Wang 724 cijferblok met unicode aanvullingen (pijlen en wiskundige operatoren). Wiskundige operatoren op het standaard niveau"
+msgid "Tamil (Sri Lanka, Unicode)"
+msgstr "Tamil (Sri Lanka, Unicode)"
 
 #: ../rules/base.xml.in.h:739
-msgid "Wang model 724 azerty"
-msgstr "Wang model 724 azerty"
+msgid "Tamil (TAB typewriter)"
+msgstr "Tamil (TAB typmachine)"
 
 #: ../rules/base.xml.in.h:740
-msgid "Western"
-msgstr "Westers"
+msgid "Tamil (TSCII typewriter)"
+msgstr "Tamil (TSCII typmachine)"
 
 #: ../rules/base.xml.in.h:741
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
+msgid "Tamil (Unicode)"
+msgstr "Tamil (Unicode)"
 
 #: ../rules/base.xml.in.h:742
-msgid "Winkeys"
-msgstr "Win-toetsen"
+msgid "Tamil (keyboard with numerals)"
+msgstr "Tamil (toetsenbord met cijfertekens)"
 
 #: ../rules/base.xml.in.h:743
-msgid "With &lt;\\|&gt; key"
-msgstr "Met &lt;\\|&gt;-toets"
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
 
 #: ../rules/base.xml.in.h:744
-msgid "With EuroSign on 5"
-msgstr "Met het Euro-teken bij de 5"
+msgid "Tatar"
+msgstr "Tatar"
 
-# Guillemets of ook quillemets zijn Franse aanhalingstekens.
-# Dit is "Nederlands" en dit is de «Franse manier» van aanhalen.
 #: ../rules/base.xml.in.h:745
-msgid "With guillemets"
-msgstr "Met Franse aanhalingstekens"
+msgid "Telugu"
+msgstr "Telugu"
 
+# Het Thai is de officiële taal van Thailand.
 #: ../rules/base.xml.in.h:746
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! internettoetsenbord"
+msgid "Thai"
+msgstr "Thai"
 
+# Pattachote en Kedmanee zijn de twee toetsenbordindelingen voor Thai
 #: ../rules/base.xml.in.h:747
-msgid "Yakut"
-msgstr "Yakut"
+msgid "Thai (Pattachote)"
+msgstr "Thai (Pattachote)"
 
 #: ../rules/base.xml.in.h:748
-msgid "Yoruba"
-msgstr "Yoruba"
+msgid "Thai (TIS-820.2538)"
+msgstr "Thai (TIS-820.2538)"
 
 #: ../rules/base.xml.in.h:749
-msgid "Z and ZHE swapped"
-msgstr "Z en ZHE omgewisseld"
+msgid "Tibetan"
+msgstr "Tibetaans"
 
 #: ../rules/base.xml.in.h:750
-msgid "Zaf"
-msgstr "Zaf"
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibetaans (met ASCII-cijfers)"
+
+#: ../rules/base.xml.in.h:751
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Naar de corresponderende toets op een Dvorak toetsenbord."
+
+#: ../rules/base.xml.in.h:752
+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
+msgid "Toggle PointerKeys with Shift + NumLock."
+msgstr "Muistoetsen aan/uitzetten met 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 "Trust Direct Access toetsenbord"
+
+#: ../rules/base.xml.in.h:756
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
+
+# classic is hier onderdeel van merknaam?
+#: ../rules/base.xml.in.h:757
+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
+msgid "Tswana"
+msgstr "Tswana"
+
+#: ../rules/base.xml.in.h:759
+msgid "Turkish"
+msgstr "Turks"
+
+#: ../rules/base.xml.in.h:760
+msgid "Turkish (Alt-Q)"
+msgstr "Turks (Alt-Q)"
+
+#: ../rules/base.xml.in.h:761
+msgid "Turkish (F)"
+msgstr "Turks (F)"
+
+#: ../rules/base.xml.in.h:762
+msgid "Turkish (Sun dead keys)"
+msgstr "Turks (Sun dode toetsen)"
+
+#: ../rules/base.xml.in.h:763
+msgid "Turkish (international with dead keys)"
+msgstr "Turks (internationaal met dode toetsen)"
+
+#: ../rules/base.xml.in.h:764
+msgid "Turkmen"
+msgstr "Turkmeens"
+
+#: ../rules/base.xml.in.h:765
+msgid "Turkmen (Alt-Q)"
+msgstr "Turkmeens (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 (102/105:EU mode)"
+
+#: ../rules/base.xml.in.h:770
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+
+#: ../rules/base.xml.in.h:771
+msgid "Udmurt"
+msgstr "Udmurts"
+
+#: ../rules/base.xml.in.h:772
+msgid "Ukrainian"
+msgstr "Oekraïens"
+
+#: ../rules/base.xml.in.h:773
+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
+msgid "Ukrainian (homophonic)"
+msgstr "Oekraïens (homophonisch)"
+
+#: ../rules/base.xml.in.h:775
+msgid "Ukrainian (legacy)"
+msgstr "Oekraïens (historisch)"
+
+#: ../rules/base.xml.in.h:776
+msgid "Ukrainian (phonetic)"
+msgstr "Oekraïens (fonetisch)"
+
+#: ../rules/base.xml.in.h:777
+msgid "Ukrainian (standard RSTU)"
+msgstr "Oekraïens (standaard RSTU)"
+
+#: ../rules/base.xml.in.h:778
+msgid "Ukrainian (typewriter)"
+msgstr "Oekraïens (typmachine)"
+
+#: ../rules/base.xml.in.h:779
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Unicode-aanvullingen (pijlen en wiskundige operatoren)"
+
+#: ../rules/base.xml.in.h:780
+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
+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
+msgid "Urdu (Pakistan)"
+msgstr "Urdu (Pakistan)"
+
+#: ../rules/base.xml.in.h:783
+msgid "Urdu (Pakistan, CRULP)"
+msgstr "Urdu (Pakistan, CRULP)"
+
+#: ../rules/base.xml.in.h:784
+msgid "Urdu (Pakistan, NLA)"
+msgstr "Urdu (Pakistan, NLA)"
+
+#: ../rules/base.xml.in.h:785
+msgid "Urdu (WinKeys)"
+msgstr "Urdu (Windows-toetsen)"
+
+#: ../rules/base.xml.in.h:786
+msgid "Urdu (alternative phonetic)"
+msgstr "Urdu (alternatief fonetisch)"
+
+#: ../rules/base.xml.in.h:787
+msgid "Urdu (phonetic)"
+msgstr "Urdu (fonetisch)"
+
+#: ../rules/base.xml.in.h:788
+msgid "Use keyboard LED to show alternative layout"
+msgstr "Toetsenbord-LED gebruiken om alternatieve indeling te tonen"
+
+#: ../rules/base.xml.in.h:789
+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
+msgid "Usual space at any level"
+msgstr "Gebruikelijke spatie op elk niveau"
+
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "Oeigoers"
+
+#: ../rules/base.xml.in.h:792
+msgid "Uzbek"
+msgstr "Oezbeeks"
+
+#: ../rules/base.xml.in.h:793
+msgid "Uzbek (Afghanistan)"
+msgstr "Oezbeeks (Afghanistan)"
+
+#: ../rules/base.xml.in.h:794
+msgid "Uzbek (Afghanistan, OLPC)"
+msgstr "Oezbeeks (Afghanistanm, OLPC)"
+
+#: ../rules/base.xml.in.h:795
+msgid "Uzbek (Latin)"
+msgstr "Oezbeeks (Latijns)"
+
+#: ../rules/base.xml.in.h:796
+msgid "Vietnamese"
+msgstr "Viëtnamees"
+
+#: ../rules/base.xml.in.h:797
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 internet toetsenbord"
+
+#: ../rules/base.xml.in.h:798
+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
+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
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
+
+#: ../rules/base.xml.in.h:801
+msgid "Wolof"
+msgstr "Wolof"
+
+#: ../rules/base.xml.in.h:802
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! internettoetsenbord"
+
+# Het Jakoets is een Turkse taal met ongeveer 363.000 sprekers
+#: ../rules/base.xml.in.h:803
+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
+msgid "Yoruba"
+msgstr "Yoruba"
 
 # The zero-width non-joiner (ZWNJ) is a non-printing character used in the computerized
 # typesetting of some cursive scripts, or other scripts which make use of ligatures, such as
@@ -3123,107 +3373,832 @@ msgstr "Zaf"
 # 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:751
+#: ../rules/base.xml.in.h:805
 msgid "Zero-width non-joiner character at second level"
 msgstr "Nulbreedte-losmaker op het tweede niveau"
 
-#: ../rules/base.xml.in.h:752
+#: ../rules/base.xml.in.h:806
 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:753
+#: ../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 "Nulbreedte-losmaker op het tweede niveau, harde spatie op het derde niveau, niets op het vierde niveau"
 
-#: ../rules/base.xml.in.h:754
+#: ../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 "Nulbreedte-losmaker op het tweede niveau, harde spatie op het derde niveau, smalle harde spatie op het vierde niveau"
 
-#: ../rules/base.xml.in.h:755
+#: ../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 "Nulbreedte-losmaker op het tweede niveau, harde spatie op het derde niveau, nulbreedte-verbinder op het vierde niveau"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:810
 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:757
+#: ../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 "Nulbreedte-losmaker op het tweede niveau, nulbreedte-verbinder op het derde niveau, harde spatie op het vierde niveau"
 
-#: ../rules/base.xml.in.h:758
+#: ../rules/base.xml.in.h:812
 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:759
-msgid "azerty"
-msgstr "azerty"
+#: ../rules/base.xml.in.h:813
+msgid "ak"
+msgstr "ak"
 
-#: ../rules/base.xml.in.h:760
-msgid "azerty/digits"
-msgstr "azerty/cijfers"
+#: ../rules/base.xml.in.h:814
+msgid "am"
+msgstr "am"
 
-#: ../rules/base.xml.in.h:761
-msgid "digits"
-msgstr "cijfers"
+#: ../rules/base.xml.in.h:815
+msgid "ar"
+msgstr "ar"
 
-#: ../rules/base.xml.in.h:762
-msgid "displaced semicolon and quote (obsolete)"
-msgstr "puntkomma en aanhalingsteken op afwijkende plek (historisch)"
+#: ../rules/base.xml.in.h:816
+msgid "avn"
+msgstr "avn"
 
-#: ../rules/base.xml.in.h:763
-msgid "lyx"
-msgstr "lyx"
+#: ../rules/base.xml.in.h:817
+msgid "az"
+msgstr "az"
 
-#: ../rules/base.xml.in.h:764
-msgid "qwerty"
-msgstr "qwerty"
+#: ../rules/base.xml.in.h:818
+msgid "be"
+msgstr "be"
 
-# brede backslash/uitgebreide backslash
-#: ../rules/base.xml.in.h:765
-msgid "qwerty, extended Backslash"
-msgstr "qwerty, brede backslash"
+#: ../rules/base.xml.in.h:819
+msgid "ber"
+msgstr "ber"
 
-#: ../rules/base.xml.in.h:766
-msgid "qwerty/digits"
-msgstr "qwerty/cijfers"
+#: ../rules/base.xml.in.h:820
+msgid "bg"
+msgstr "bg"
 
-#: ../rules/base.xml.in.h:767
-msgid "qwertz"
-msgstr "qwertz"
+#: ../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"
-msgstr "APL"
+msgid "APL Keyboard Symbols"
+msgstr "APL toetsenbordsymbolen"
 
-#: ../rules/base.extras.xml.in.h:2
+#: ../rules/base.extras.xml.in.h:4
 msgid "Atsina"
 msgstr "Atsina"
 
+# Iran - Avestisch
 # Het Avestisch is de taal van de Avesta: religieuze literatuur van de Parsi's,
 # volgelingen van Zoroaster of Zarathustra (heilsprofeet)
-#: ../rules/base.extras.xml.in.h:3
+#: ../rules/base.extras.xml.in.h:5
 msgid "Avestan"
 msgstr "Avestisch"
 
-#: ../rules/base.extras.xml.in.h:4
-msgid "Combining accents instead of dead keys"
-msgstr "Combinerende accenten in plaats van dode toetsen"
-
 # Coeur d'Alene is a Salishan language spoken by only five of the 800 individuals
 # in the Coeur d'Alene Tribe on the Coeur d'Alene Reservation in northern Idaho, United States.
 # http://en.wikipedia.org/wiki/Coeur_d'Alene_language
-#: ../rules/base.extras.xml.in.h:5
+#: ../rules/base.extras.xml.in.h:6
 msgid "Couer D'alene Salish"
 msgstr "Coeur D'alene Salish"
 
-#: ../rules/base.extras.xml.in.h:6
-msgid "International (AltGr Unicode combining)"
-msgstr "Internationaal (AltGr Unicode combinatie)"
+#: ../rules/base.extras.xml.in.h:8
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Engels (US, internationaal AltGr Unicode combineren)"
+
+#: ../rules/base.extras.xml.in.h:9
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "Engels (US, internationaal AltGr Unicode combineren, alternatief)"
+
+# 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
+msgid "Kutenai"
+msgstr "Kutenai"
+
+#: ../rules/base.extras.xml.in.h:13
+msgid "Latvian (US Colemak)"
+msgstr "Lets (US, Colemak)"
+
+#: ../rules/base.extras.xml.in.h:14
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Lets (US Colemak, apostrof variant)"
+
+#: ../rules/base.extras.xml.in.h:15
+msgid "Latvian (US Dvorak)"
+msgstr "Lets (US Dvorak)"
+
+#: ../rules/base.extras.xml.in.h:16
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Lets (US Dvorak, Y variant)"
+
+#: ../rules/base.extras.xml.in.h:17
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr "Lets (US Dvorak, min variant)"
+
+#: ../rules/base.extras.xml.in.h:18
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Lets (programmeer US Dvorak)"
+
+#: ../rules/base.extras.xml.in.h:19
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Lets (programmeer US Dvorak, Y variant)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Lets (programmeer US Dvorak, min variant)"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Litouws (US Dvorak met Litouwse lettertekens)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "Pools (internationaal met dode toetsen)"
+
+#: ../rules/base.extras.xml.in.h:27
+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)"
+
+# Canadees-Indiaanse taal (Shuswap)
+#: ../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 "Servisch  (Combinerende accenten in plaats van dode toetsen)"
+
+#: ../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 "Chinees (Tibetaans)"
 
-#: ../rules/base.extras.xml.in.h:7
-msgid "International (AltGr Unicode combining, alternative)"
-msgstr "Internationaal (AltGr Unicode combinatie, alternatief)"
+# Het Oeigoers is een Turkse taal, die door ongeveer 9 miljoen mensen in de
+# Oeigoerse autonome regio Sinkiang in Volksrepubliek China wordt gesproken. 
+#~ msgid "Chinese (Uyghur)"
+#~ msgstr "Chinees (Oeigoers)"
+
+# De benaming Laps wordt door de sprekers zelf als denigrerend opgevat en is
+# vrijwel geheel uit het hedendaagse taalgebruik van Scandinaviërs en uit de
+# vaktaal van taalkundigen verdwenen.
+# Samisch is een officieel erkende minderheidstaal in Noorwegen (in de gemeentes
+# Kautokeino, Karasjok, Kåfjord, Nesseby, Sør-Varanger en Tana), 
+# in Finland (Enontekiö, Inari, Sodankylä en Utsjoki) 
+# en in Zweden(Arjeplog, Gällivare, Jokkmokk en Kiruna).
+#~ msgid "Finnish (northern Saami)"
+#~ msgstr "Fins (Noord-Samisch)"
+
+# Occitanië (Occitaans: Occitània, Frans: Occitanie) noemt men het gebied waar
+# Occitaans wordt gesproken. Het gebied wordt Pays d'Oc of Languedoc genoemd.
+#~ msgid "French (Occitan)"
+#~ msgstr "Frans (Occitaans)"
+
+# De officiële schrijfwijze is Māori (alleen in het Engels)
+#~ msgid "Māori"
+#~ msgstr "Maori"
+
+# gelijkklinkend/homofonetisch/homofonisch
+#~ msgid "Homophonic"
+#~ msgstr "Homofonisch"
+
+# Kro/Hrv
+#~ msgid "Hrv"
+#~ msgstr "Hrv"
+
+#~ msgid "Hun"
+#~ msgstr "Hon"
+
+#~ msgid "Hungary"
+#~ msgstr "Hongarije"
+
+#~ msgid "Ind"
+#~ msgstr "Ind"
+
+#~ msgid "Ireland"
+#~ msgstr "Ierland"
+
+#~ msgid "Irl"
+#~ msgstr "Irl"
+
+#~ msgid "Irn"
+#~ msgstr "Irn"
+
+#~ msgid "Israel"
+#~ msgstr "Israël"
+
+#~ msgid "Italy"
+#~ msgstr "Italië"
+
+#~ msgid "Japan"
+#~ msgstr "Japan"
+
+#~ msgid "Jpn"
+#~ msgstr "Jpn"
+
+#~ msgid "Kana"
+#~ msgstr "Kana"
+
+#~ msgid "Kana 86"
+#~ msgstr "Kana 86"
+
+#~ msgid "Kenya"
+#~ msgstr "Kenia"
+
+#~ msgid "Kgz"
+#~ msgstr "Kgz"
+
+#~ msgid "Khm"
+#~ msgstr "Khm"
+
+#~ msgid "Korea, Republic of"
+#~ msgstr "Korea, Republiek"
+
+#~ msgid "Ktunaxa"
+#~ msgstr "Ktunaxa"
+
+#~ msgid "LEKP"
+#~ msgstr "LEKP"
+
+#~ msgid "LEKPa"
+#~ msgstr "LEKPa"
+
+#~ msgid "Laos"
+#~ msgstr "Laos"
+
+#~ msgid "Latin"
+#~ msgstr "Latijns"
+
+#~ msgid "Left hand"
+#~ msgstr "Linkshandig"
+
+#~ msgid "Lva"
+#~ msgstr "Lva"
+
+#~ msgid "MESS"
+#~ msgstr "MESS"
+
+#~ msgid "MNE"
+#~ msgstr "MNE"
+
+#~ msgid "Macintosh (International)"
+#~ msgstr "Macintosh (Internationaal)"
+
+# kan ook als Malediven worden geschreven.
+#~ msgid "Maldives"
+#~ msgstr "Maldiven"
+
+#~ msgid "Mali"
+#~ msgstr "Mali"
+
+#~ msgid "Mao"
+#~ msgstr "Mao"
+
+#~ msgid "Mkd"
+#~ msgstr "Mkd"
+
+#~ msgid "Mli"
+#~ msgstr "Mli"
+
+#~ msgid "Mmr"
+#~ msgstr "Mmr"
+
+#~ msgid "Mng"
+#~ msgstr "Mng"
+
+#~ msgid "Myanmar"
+#~ msgstr "Myanmar"
+
+#~ msgid "NLA"
+#~ msgstr "NLA"
+
+#~ msgid "Nativo"
+#~ msgstr "Nativo"
+
+#~ msgid "Neo 2"
+#~ msgstr "Neo 2"
+
+#~ msgid "Netherlands"
+#~ msgstr "Nederland"
+
+#~ msgid "Nigeria"
+#~ msgstr "Nigeria"
+
+#~ msgid "Nld"
+#~ msgstr "Nld"
+
+#~ msgid "Nor"
+#~ msgstr "Nor"
+
+#~ msgid "Norway"
+#~ msgstr "Noorwegen"
+
+#~ msgid "OLPC Dari"
+#~ msgstr "OLPC Dari"
+
+#~ msgid "OLPC Pashto"
+#~ msgstr "OLPC Pashto"
+
+#~ msgid "OLPC Southern Uzbek"
+#~ msgstr "OLPC Zuid-Oezbekistan"
+
+#~ msgid "Ossetian"
+#~ msgstr "Osetisch"
+
+#~ msgid "Phonetic"
+#~ msgstr "Fonetisch"
+
+#~ msgid "Pol"
+#~ msgstr "Pol"
+
+#~ msgid "Poland"
+#~ msgstr "Polen"
+
+#~ msgid "Portugal"
+#~ msgstr "Portugal"
+
+#~ msgid "Probhat"
+#~ msgstr "Probhat"
+
+#~ msgid "Prt"
+#~ msgstr "Prt"
+
+#~ msgid "SRB"
+#~ msgstr "SRB"
+
+#~ msgid "Sen"
+#~ msgstr "Sen"
+
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
+
+#~ msgid "Simple"
+#~ msgstr "Simpel"
+
+#~ msgid "Slovakia"
+#~ msgstr "Slowakije"
+
+#~ msgid "Southern Uzbek"
+#~ msgstr "Zuid-Oezbekistan"
+
+#~ msgid "Spain"
+#~ msgstr "Spanje"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "Sri Lanka"
+
+#~ msgid "Standard"
+#~ msgstr "Standaard"
+
+#~ msgid "Svk"
+#~ msgstr "Svk"
+
+#~ msgid "Svn"
+#~ msgstr "Svn"
+
+#~ msgid "Swe"
+#~ msgstr "Swe"
+
+#~ msgid "Sweden"
+#~ msgstr "Zweden"
+
+#~ msgid "Syria"
+#~ msgstr "Syrië"
+
+#~ msgid "Tha"
+#~ msgstr "Tha"
+
+#~ msgid "Tifinagh"
+#~ msgstr "Tifinagh"
+
+#~ msgid "Tjk"
+#~ msgstr "Tjk"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "Turkmenistan"
+
+#~ msgid "Typewriter"
+#~ msgstr "Typmachine"
+
+# Tanzania?
+#~ msgid "Tza"
+#~ msgstr "Tza"
+
+#~ msgid "Ukr"
+#~ msgstr "Ukr"
+
+#~ msgid "United Kingdom"
+#~ msgstr "Verenigd Koninkrijk"
+
+#~ msgid "Uzb"
+#~ msgstr "Uzb"
+
+#~ msgid "Vnm"
+#~ msgstr "Vnm"
+
+#~ msgid "Western"
+#~ msgstr "Westers"
+
+#~ msgid "With EuroSign on 5"
+#~ msgstr "Met het Euro-teken bij de 5"
+
+# Guillemets of ook quillemets zijn Franse aanhalingstekens.
+# Dit is "Nederlands" en dit is de «Franse manier» van aanhalen.
+#~ msgid "With guillemets"
+#~ msgstr "Met Franse aanhalingstekens"
+
+#~ msgid "Zaf"
+#~ msgstr "Zaf"
+
+#~ msgid "azerty"
+#~ msgstr "azerty"
+
+#~ msgid "digits"
+#~ msgstr "cijfers"
+
+#~ msgid "lyx"
+#~ msgstr "lyx"
+
+#~ msgid "qwertz"
+#~ msgstr "qwertz"
 
 #~ msgid "2"
 #~ msgstr "2"
@@ -3240,9 +4215,6 @@ msgstr "Internationaal (AltGr Unicode combinatie, alternatief)"
 #~ msgid "Baltic+"
 #~ msgstr "Baltisch+"
 
-#~ msgid "Bhu"
-#~ msgstr "Bhu"
-
 #~ msgid "DRC"
 #~ msgstr "DRC"
 
@@ -3339,9 +4311,6 @@ msgstr "Internationaal (AltGr Unicode combinatie, alternatief)"
 #~ msgid "Kir"
 #~ msgstr "Kir"
 
-#~ msgid "Korean 106-key"
-#~ msgstr "Koreaans 106-toetsen"
-
 #~ msgid "LCtrl+LShift change layout."
 #~ msgstr "Linker Ctrl+Linker Shift verandert de indeling."
 
@@ -3431,15 +4400,6 @@ msgstr "Internationaal (AltGr Unicode combinatie, alternatief)"
 #~ msgid "Third level choosers"
 #~ msgstr "3e niveau kiezers"
 
-#~ msgid "US keyboard with Slovenian digraphs"
-#~ msgstr "Amerikaans toetsenbord met Sloveense digrafen"
-
-#~ msgid "Urdu"
-#~ msgstr "Urdu"
-
-#~ msgid "Use Slovenian digraphs"
-#~ msgstr "Sloveense digrafen gebruiken"
-
 #~ msgid "(Legacy) Dvorak"
 #~ msgstr "(Historisch) Dvorak"
 
@@ -3457,12 +4417,6 @@ msgstr "Internationaal (AltGr Unicode combinatie, alternatief)"
 #~ msgid "Alt+Shift changes group"
 #~ msgstr "Alt+Shift verandert de groep"
 
-#~ msgid "Belgian"
-#~ msgstr "Belgisch"
-
-#~ msgid "Bulgarian"
-#~ msgstr "Bulgaars"
-
 #~ msgid "Caps Lock key changes group"
 #~ msgstr "Caps Lock-toets verandert de groep"
 
@@ -3481,9 +4435,6 @@ msgstr "Internationaal (AltGr Unicode combinatie, alternatief)"
 #~ msgid "Control+Shift changes group"
 #~ msgstr "Ctrl+Shift verandert de groep"
 
-#~ msgid "Czech"
-#~ msgstr "Tsjechisch"
-
 # (Zwitsers Duits)
 #~ msgid "DeuCH"
 #~ msgstr "DeuCH"
@@ -3491,28 +4442,13 @@ msgstr "Internationaal (AltGr Unicode combinatie, alternatief)"
 #~ msgid "Dvo"
 #~ msgstr "Dvo"
 
-#~ msgid "Finnish"
-#~ msgstr "Fins"
-
 # (Zwitsers Frans)
 #~ msgid "FraCH"
 #~ msgstr "FraCH"
 
-#~ msgid "German"
-#~ msgstr "Duits"
-
 #~ msgid "Group Shift/Lock behavior"
 #~ msgstr "Groepgedrag Shift/Lock"
 
-#~ msgid "Hungarian"
-#~ msgstr "Hongaars"
-
-#~ msgid "Italian"
-#~ msgstr "Italiaans"
-
-#~ msgid "Japanese"
-#~ msgstr "Japans"
-
 #~ msgid "Left Alt key changes group"
 #~ msgstr "Linker Alt-toets verandert de groep"
 
@@ -3522,21 +4458,12 @@ msgstr "Internationaal (AltGr Unicode combinatie, alternatief)"
 #~ msgid "Left Shift key changes group"
 #~ msgstr "Linker Shift-toets verandert de groep"
 
-#~ msgid "Norwegian"
-#~ msgstr "Noors"
-
 #~ msgid "Num_Lock LED shows alternative group"
 #~ msgstr "NumLock-lampje toont alternatieve groep"
 
-#~ msgid "Polish"
-#~ msgstr "Pools"
-
 #~ msgid "Polish with Polish quotes on key \"1/!\""
 #~ msgstr "Pools met Poolse aanhalingstekens op toets ‘1/!’"
 
-#~ msgid "Portuguese"
-#~ msgstr "Portugees"
-
 #~ msgid "Press Left Alt key to choose 3rd level"
 #~ msgstr "De linker Alt-toets geeft het 3e niveau"
 
@@ -3574,12 +4501,6 @@ msgstr "Internationaal (AltGr Unicode combinatie, alternatief)"
 #~ msgid "Shift+CapsLock changes group"
 #~ msgstr "Shift+CapsLock verandert de groep"
 
-#~ msgid "Slovak"
-#~ msgstr "Slowaaks"
-
-#~ msgid "Spanish"
-#~ msgstr "Spaans"
-
 #~ msgid "Sun Type 4"
 #~ msgstr "Sun type 4"
 
@@ -3598,30 +4519,15 @@ msgstr "Internationaal (AltGr Unicode combinatie, alternatief)"
 #~ msgid "Sun Type 6 with Euro key"
 #~ msgstr "Sun type 6 met Euro-teken"
 
-#~ msgid "Swedish"
-#~ msgstr "Zweeds"
-
 #~ msgid "Swiss French"
 #~ msgstr "Zwitsers Frans"
 
 #~ msgid "Swiss German"
 #~ msgstr "Zwitsers Duits"
 
-#~ msgid "Turkish"
-#~ msgstr "Turks"
-
-#~ msgid "Turkish (F)"
-#~ msgstr "Turks (F)"
-
 #~ msgid "Turkish Alt-Q Layout"
 #~ msgstr "Turks Alt-Q indeling"
 
-#~ msgid "U.S. English w/ ISO9995-3"
-#~ msgstr "Amerikaans-Engels w/ ISO9995-3"
-
-#~ msgid "Use keyboard LED to show alternative group"
-#~ msgstr "Toetsenbord-lampje gebruiken om alternatieve groep te tonen"
-
 # Caps ipv CapsLock?
 #~ msgid "Uses internal capitalization. Shift cancels Caps."
 #~ msgstr "Gebruikt interne conversie naar hoofdletters. Shift heft CapsLock op."
@@ -3642,9 +4548,6 @@ msgstr "Internationaal (AltGr Unicode combinatie, alternatief)"
 #~ msgid "\"Standard\""
 #~ msgstr "‘Standaard’"
 
-#~ msgid "Dhivehi"
-#~ msgstr "Dhivehi"
-
 #~ msgid "Logitech Deluxe Access Keyboard"
 #~ msgstr "Logitech Deluxe Access toetsenbord"
 
diff --git a/xorg-server/xkeyboard-config/po/pl.po b/xorg-server/xkeyboard-config/po/pl.po
index a064d8e8c..e314c22b0 100644
--- a/xorg-server/xkeyboard-config/po/pl.po
+++ b/xorg-server/xkeyboard-config/po/pl.po
@@ -4,10 +4,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-01 18:20+0200\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-05-19 16:45+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -84,153 +84,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 "Afgański"
 
-#: ../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 "Albański"
 
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:21
 msgid "Alt and Meta are on Alt keys"
 msgstr "Alt i Meta pod klawiszami 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 pod prawym Win, Super pod Menu"
 
-#: ../rules/base.xml.in.h:24
+#: ../rules/base.xml.in.h:23
 msgid "Alt+Caps Lock"
 msgstr "Alt+CapsLock"
 
-#: ../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+Spacja"
 
-#: ../rules/base.xml.in.h:28
+#: ../rules/base.xml.in.h:27
 msgid "Alt/Win key behavior"
 msgstr "Zachowanie klawiszy Alt/Win"
 
-#: ../rules/base.xml.in.h:29
+#: ../rules/base.xml.in.h:28
 msgid "Amharic"
 msgstr "Amharski"
 
-#: ../rules/base.xml.in.h:30
+#: ../rules/base.xml.in.h:29
 msgid "Any Alt key"
 msgstr "Dowolny klawisz Alt"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr "Dowolny klawisz Win"
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr "Dowolny klawisz Win (wciśnięty)"
 
-#: ../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: emulacja klawiszy PC (Print, ScrollLock, Pause, NumLock)"
 
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
 msgstr "Laptop Apple"
 
-#: ../rules/base.xml.in.h:39
+#: ../rules/base.xml.in.h:38
 msgid "Arabic"
 msgstr "Arabski"
 
-#: ../rules/base.xml.in.h:40
+#: ../rules/base.xml.in.h:39
 msgid "Arabic (Buckwalter)"
 msgstr "Arabski (Buckwalter)"
 
-#: ../rules/base.xml.in.h:41
+#: ../rules/base.xml.in.h:40
 msgid "Arabic (Morocco)"
 msgstr "Arabski (marokański)"
 
-#: ../rules/base.xml.in.h:42
+#: ../rules/base.xml.in.h:41
 msgid "Arabic (Pakistan)"
 msgstr "Arabski (pakistański)"
 
-#: ../rules/base.xml.in.h:43
+#: ../rules/base.xml.in.h:42
 msgid "Arabic (Syria)"
 msgstr "Arabski (syryjski)"
 
-#: ../rules/base.xml.in.h:44
+#: ../rules/base.xml.in.h:43
 msgid "Arabic (azerty)"
 msgstr "Arabski (AZERTY)"
 
-#: ../rules/base.xml.in.h:45
+#: ../rules/base.xml.in.h:44
 msgid "Arabic (azerty/digits)"
 msgstr "Arabski (AZERTY/cyfry)"
 
-#: ../rules/base.xml.in.h:46
+#: ../rules/base.xml.in.h:45
 msgid "Arabic (digits)"
 msgstr "Arabski (cyfry)"
 
-#: ../rules/base.xml.in.h:47
+#: ../rules/base.xml.in.h:46
 msgid "Arabic (qwerty)"
 msgstr "Arabski (QWERTY)"
 
-#: ../rules/base.xml.in.h:48
+#: ../rules/base.xml.in.h:47
 msgid "Arabic (qwerty/digits)"
 msgstr "Arabski (QWERTY/cyfry)"
 
-#: ../rules/base.xml.in.h:49
+#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
 msgid "Armenian"
 msgstr "Armeński"
 
-#: ../rules/base.xml.in.h:50
+#: ../rules/base.xml.in.h:49
 msgid "Armenian (alternative eastern)"
 msgstr "Armeński (anternatywny wschodni)"
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
 msgid "Armenian (alternative phonetic)"
 msgstr "Armeński (alternatywny fonetyczny)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 msgid "Armenian (eastern)"
 msgstr "Armeński (wschodni)"
 
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:52
 msgid "Armenian (phonetic)"
 msgstr "Armeński (fonetyczny)"
 
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:53
 msgid "Armenian (western)"
 msgstr "Armeński (zachodni)"
 
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturski (hiszpański, z H i L z dolną kropką)"
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "Laptop Asus"
@@ -248,13 +248,13 @@ msgid "Avatime"
 msgstr "Avatime"
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijan (Cyrillic)"
-msgstr "Azerbejdżański (cyrylica)"
-
-#: ../rules/base.xml.in.h:60
 msgid "Azerbaijani"
 msgstr "Azerbejdżański"
 
+#: ../rules/base.xml.in.h:60
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Azerbejdżański (cyrylica)"
+
 #: ../rules/base.xml.in.h:61
 msgid "Azona RF2300 wireless Internet Keyboard"
 msgstr "Azona RF2300 wireless Internet Keyboard"
@@ -300,3452 +300,3444 @@ msgid "Backslash"
 msgstr "Backslash"
 
 #: ../rules/base.xml.in.h:72
-msgid "Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr "Odwrotny ukośnik wybiera poziom 3., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 3."
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Odwrotny ukośnik (wybiera poziom 3., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 3.)"
 
 #: ../rules/base.xml.in.h:73
 msgid "Bambara"
 msgstr "Bambara"
 
 #: ../rules/base.xml.in.h:74
+msgid "Bashkirian"
+msgstr "Baszkirski"
+
+#: ../rules/base.xml.in.h:75
 msgid "Belarusian"
 msgstr "Białoruski"
 
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:76
 msgid "Belarusian (Latin)"
 msgstr "Białoruski (łaciński)"
 
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:77
 msgid "Belarusian (legacy)"
 msgstr "Białoruski (stary)"
 
-#: ../rules/base.xml.in.h:77
+#: ../rules/base.xml.in.h:78
 msgid "Belgian"
 msgstr "Belgijski"
 
-#: ../rules/base.xml.in.h:78
+#: ../rules/base.xml.in.h:79
 msgid "Belgian (ISO alternate)"
 msgstr "Belgijski (alternatywny ISO)"
 
-#: ../rules/base.xml.in.h:79
+#: ../rules/base.xml.in.h:80
 msgid "Belgian (Sun dead keys)"
 msgstr "Belgijski (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Belgijski (Wang model 724 AZERTY)"
 
-#: ../rules/base.xml.in.h:81
+#: ../rules/base.xml.in.h:82
 msgid "Belgian (alternative)"
 msgstr "Belgijski (alternatywny)"
 
-#: ../rules/base.xml.in.h:82
+#: ../rules/base.xml.in.h:83
 msgid "Belgian (alternative, Sun dead keys)"
 msgstr "Belgijski (alternatywny, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Belgijski (alternatywny, tylko latin-9)"
 
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:85
 msgid "Belgian (eliminate dead keys)"
 msgstr "Belgijski (bez klawiszy akcentów)"
 
-#: ../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 "Bengalski"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:90
 msgid "Bengali (Probhat)"
 msgstr "Bengalski (Probhat)"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:91
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Berberyjski (Maroko, alternatywny fonetyczny tifinagh)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Berberyjski (Maroko, alternatywny tifinagh)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Berberyjski (Maroko, rozszerzony fonetyczny tifinagh)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Berberyjski (Maroko, rozszerzony tifinagh)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Berberyjski (Maroko, tifinagh fonetyczny"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Berberyjski (Maroko, tifinagh)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bosnian"
 msgstr "Bośniacki"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Bośniacki (klawiatura US z dwuznakami bośniackimi)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Bośniacki (klawiatura US z literami bośniackimi)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Bośniacki (z użyciem dwuznaków bośniackich)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Bośniacki (z użyciem cudzysłowów do cytowania)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Both Alt keys together"
 msgstr "Oba klawisze Alt naraz"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Both Ctrl keys together"
 msgstr "Oba klawisze Ctrl naraz"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Both Shift keys together"
 msgstr "Oba klawisze Shift naraz"
 
-#: ../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 "Oba klawisze Shift naraz włączają CapsLock, jeden Shift wyłącza"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Oba klawisze Shift naraz przełączają CapsLock"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Oba klawisze Shift naraz przełączają ShiftLock"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:108
 msgid "Braille"
 msgstr "Braille'a"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:109
 msgid "Braille (left hand)"
 msgstr "Braille (leworęczny)"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Braille (right hand)"
 msgstr "Braille (praworęczny)"
 
-#: ../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 "Bułgarski"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Bulgarian (new phonetic)"
 msgstr "Bułgarski (nowy fonetyczny)"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Bułgarski (tradycyjny fonetyczny)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:115
 msgid "Burmese"
 msgstr "Birmański"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:116
 msgid "Canadian Multilingual"
 msgstr "Kanadyjski wielojęzyczny"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Canadian Multilingual (first part)"
 msgstr "Kanadyjski wielojęzyczny (część pierwsza)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "Canadian Multilingual (second part)"
 msgstr "Kanadyjski wielojęzyczny (część druga)"
 
-#: ../rules/base.xml.in.h:118
+#: ../rules/base.xml.in.h:119
 msgid "Caps Lock"
 msgstr "CapsLock"
 
-#: ../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 "CapsLock (wybiera poziom 3., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 3.)"
 
-#: ../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 "CapsLock (do pierwszego układu), Shift+CapsLock (do ostatniego układu)"
 
-#: ../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 "CapsLock (wciśnięty), Alt+CapsLock działa jak zwykły CapsLock"
 
-#: ../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 "CapsLock działa jako Shift z blokadą. Shift wstrzymuje CapsLock"
 
-#: ../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 "CapsLock działa jako Shift z blokadą. Shift nie wpływa na CapsLock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock is disabled"
 msgstr "CapsLock wyłączony"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock key behavior"
 msgstr "Zachowanie klawisza CapsLock"
 
-#: ../rules/base.xml.in.h:126
+#: ../rules/base.xml.in.h:127
 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:127
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "CapsLock przełącza wielkość znaków alfabetycznych"
 
-#: ../rules/base.xml.in.h:128
+#: ../rules/base.xml.in.h:129
 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:129
+#: ../rules/base.xml.in.h:130
 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:130
+#: ../rules/base.xml.in.h:131
 msgid "Catalan"
 msgstr "Kataloński"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:132
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Kataloński (hiszpański, z L ze środkową kropką)"
+
+#: ../rules/base.xml.in.h:133
 msgid "Cherokee"
 msgstr "Czerokeski"
 
-#: ../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 (opcja zmiany)"
 
-#: ../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 "Chiński"
 
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "Chiński (tybetański z liczbami ASCII)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "Chiński (tybetański)"
-
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "Chiński (ujgurski)"
+msgid "Chuvash"
+msgstr "Czuwaski"
 
 #: ../rules/base.xml.in.h:147
+msgid "Chuvash (Latin)"
+msgstr "Czuwaski (łaciński)"
+
+#: ../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 "Irlandzki gaelicki"
+
+#: ../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 klawiszy)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:152
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 klawiszy)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 klawiszy)"
 
-#: ../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 "Położenie klawisza 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 pod klawiszami Alt, Alt pod klawiszami 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 pod klawiszami Win (oraz zwykłymi klawiszami 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 "Krymskotatarski (Dobruja Q)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Krymskotatarski (turecki Alt-Q)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Krymskotatarski (turecki F)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Krymskotatarski (turecki Q)"
+
+#: ../rules/base.xml.in.h:164
 msgid "Croatian"
 msgstr "Chorwacki"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:165
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Chorwacki (klawiatura US z dwuznakami chorwackimi)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:166
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Chorwacki (klawiatura US z literami chorwackimi)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
+#: ../rules/base.xml.in.h:167
+msgid "Croatian (use Croatian digraphs)"
 msgstr "Chorwacki (z użyciem dwuznaków chorwackich)"
 
-#: ../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 "Chorwacki (z użyciem cudzysłowów do cytowania)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Ctrl key position"
 msgstr "Położenie klawisza 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 "Czeski"
 
-#: ../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 "Czeski (układ UCW - tylko litery akcentowane)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Czeski (US Dvoraka z obsługą CZ UCW)"
 
-#: ../rules/base.xml.in.h:168
-msgid "Czech (With &lt;\\|&gt; key)"
-msgstr "Czeski (z klawiszem &lt;\\|&gt;)"
-
-#: ../rules/base.xml.in.h:169
+#: ../rules/base.xml.in.h:174
 msgid "Czech (qwerty)"
 msgstr "Czeski (QWERTY)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:175
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Czeski (QWERTY, rozszerzony Backslash)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:176
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Czeski (z klawiszem &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 "Duński"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Danish (Dvorak)"
 msgstr "Duński (Dvoraka)"
 
-#: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
-msgstr "Duński (Mac)"
+#: ../rules/base.xml.in.h:180
+msgid "Danish (Macintosh)"
+msgstr "Duński (Macintosh)"
 
-#: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
-msgstr "Duński (Mac, bez klawiszy akcentów)"
+#: ../rules/base.xml.in.h:181
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Duński (Macintosh, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Danish (eliminate dead keys)"
 msgstr "Duński (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "Default numeric keypad keys"
 msgstr "Domyślne klawisze klawiatury numerycznej"
 
-#: ../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-key PC"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Laptop/notebook Dell Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Laptop/notebook z serii Dell Precision M"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Dell Latitude series laptop"
 msgstr "Laptop z serii 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 "Malediwski"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond z serii 9801 / 9802"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dutch"
 msgstr "Holenderski"
 
-#: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
-msgstr "Holenderski (Mac)"
+#: ../rules/base.xml.in.h:197
+msgid "Dutch (Macintosh)"
+msgstr "Holenderski (Macintosh)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dutch (Sun dead keys)"
 msgstr "Holenderski (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dutch (standard)"
 msgstr "Holenderski (standardowy)"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dzongkha"
 msgstr "Dzongka"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Enable extra typographic characters"
 msgstr "Włączenie dodatkowych znaków typograficznych"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
+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
+msgid "English (Cameroon)"
+msgstr "Angielski (Kamerun)"
+
+#: ../rules/base.xml.in.h:205
 msgid "English (Canada)"
 msgstr "Angielski (Kanada)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:206
 msgid "English (Colemak)"
 msgstr "Angielski (Colemak)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:207
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Angielski (alternatywny międzynarodowy Dvoraka bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:208
 msgid "English (Dvorak international with dead keys)"
 msgstr "Angielski (międzynarodowy Dvoraka z klawiszami akcentów)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:209
 msgid "English (Dvorak)"
 msgstr "Angielski (Dvoraka)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:210
 msgid "English (Ghana)"
 msgstr "Angielski (Ghana)"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:211
 msgid "English (Ghana, GILLBT)"
 msgstr "Angielski (Ghana, GILLBT)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:212
 msgid "English (Ghana, multilingual)"
 msgstr "Angielski (Ghana, wielojęzyczny)"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:213
 msgid "English (India, with RupeeSign)"
 msgstr "Angielski (Indie, ze znakiem rupii)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:214
 msgid "English (Macintosh)"
 msgstr "Angielski (Macintosh)"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
-msgstr "Angielski (Mali, USA - Mac)"
+#: ../rules/base.xml.in.h:215
+msgid "English (Mali, US Macintosh)"
+msgstr "Angielski (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 "Angielski (Mali, międzynarodowy USA)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:217
 msgid "English (Nigeria)"
 msgstr "Angielski (Nigeria)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:218
 msgid "English (South Africa)"
 msgstr "Angielski (Afryka Południowa)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:219
 msgid "English (UK)"
 msgstr "Angielski (Wielka Brytania)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:220
 msgid "English (UK, Colemak)"
 msgstr "Angielski (Wielka Brytania, Colemak)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
+#: ../rules/base.xml.in.h:221
+msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Angielski (Wielka Brytania, Dvoraka z brytyjskimi znakami przestankowymi)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:222
 msgid "English (UK, Dvorak)"
 msgstr "Angielski (Wielka Brytania, Dvoraka)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
-msgstr "Angielski (Wielka Brytania, międzynarodowy Mac)"
+#: ../rules/base.xml.in.h:223
+msgid "English (UK, Macintosh international)"
+msgstr "Angielski (Wielka Brytania, międzynarodowy Macintosh)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
-msgstr "Angielski (Wielka Brytania, Mac)"
+#: ../rules/base.xml.in.h:224
+msgid "English (UK, Macintosh)"
+msgstr "Angielski (Wielka Brytania, Macintosh)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
-msgstr "Angielski (Wielka Brytania, rozszerzony, klawisze Win)"
+#: ../rules/base.xml.in.h:225
+msgid "English (UK, extended WinKeys)"
+msgstr "Angielski (Wielka Brytania, rozszerzone klawisze Win)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, international with dead keys)"
 msgstr "Angielski (Wielka Brytania, międzynarodowy z klawiszami akcentów)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
 msgid "English (US)"
 msgstr "Angielski (USA)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:228
 msgid "English (US, alternative international)"
 msgstr "Angielski (USA, alternatywny międzynarodowy)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:229
 msgid "English (US, international with dead keys)"
 msgstr "Międzynarodowy (USA, międzynarodowy z klawiszami akcentów)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:230
 msgid "English (US, with euro on 5)"
 msgstr "Angielski (USA, ze znakiem euro pod 5)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:231
 msgid "English (classic Dvorak)"
 msgstr "Angielski (klasyczny Dvoraka)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:232
 msgid "English (international AltGr dead keys)"
 msgstr "Angielski (międzynarodowy, klawisze akcentów pod AltGr)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:233
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Angielski (przełączanie układu klawiszem mnożenia/dzielenia)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:234
 msgid "English (left handed Dvorak)"
 msgstr "Angielski (leworęczny Dvoraka)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:235
 msgid "English (programmer Dvorak)"
 msgstr "Angielski (Dvoraka programisty)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:236
 msgid "English (right handed Dvorak)"
 msgstr "Angielski (praworęczny Dvoraka)"
 
-#: ../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 na klawiaturze numerycznej"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:239
 msgid "Esperanto"
 msgstr "Esperancki"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:240
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Esperanto (Portugalia, Nativo)"
+
+#: ../rules/base.xml.in.h:241
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Esperanto (zamieniony średnik i apostrof, przestarzałe)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:242
 msgid "Estonian"
 msgstr "Estoński"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:243
 msgid "Estonian (Dvorak)"
 msgstr "Estoński (Dvoraka)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:244
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Estoński (klawiatura US z literami estońskimi)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:245
 msgid "Estonian (eliminate dead keys)"
 msgstr "Estoński (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:246
 msgid "Euro on 2"
 msgstr "Euro pod 2"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:247
 msgid "Euro on 4"
 msgstr "Euro pod 4"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:248
 msgid "Euro on 5"
 msgstr "Euro pod 5"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:249
 msgid "Euro on E"
 msgstr "Euro pod 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 "Farerski"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:254
 msgid "Faroese (eliminate dead keys)"
 msgstr "Farerski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:255
 msgid "Filipino"
 msgstr "Filipiński"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:256
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Filipiński (baybayin Capewella-Dvoraka)"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:257
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Filipiński (łaciński Capewella-Dvoraka)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:258
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Filipiński (baybayin Capewella-QWERF 2006)"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:259
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Filipiński (łaciński Capewella-QWERF 2006)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:260
 msgid "Filipino (Colemak Baybayin)"
-msgstr "Folipiński (baybain Colemak)"
+msgstr "Filipiński (baybain Colemak)"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Colemak Latin)"
 msgstr "Filipiński (łaciński Colemak)"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:262
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Filipiński (baybain Dvoraka)"
+
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Dvorak Latin)"
 msgstr "Filipiński (łaciński Dvoraka)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Filipino (baybain QWERTY)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:265
 msgid "Finnish"
 msgstr "Fiński"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
-msgstr "Fiński (Mac)"
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
+msgstr "Fiński (Macintosh)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:267
 msgid "Finnish (classic)"
 msgstr "Fiński (klasyczny)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:268
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Fiński (klasyczny, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:258
-msgid "Finnish (northern Saami)"
-msgstr "Fiński (północnolapoński)"
-
 #. 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 "Klawisz czterofunkcyjny z abstrakcyjnymi separatorami"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:272
 msgid "Four-level key with comma"
 msgstr "Klawisz czterofunkcyjny z przecinkiem"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:273
 msgid "Four-level key with dot"
 msgstr "Klawisz czterofunkcyjny z kropką"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:274
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Klawisz czterofunkcyjny z kropką, tylko latin-9"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:275
 msgid "Four-level key with momayyez"
 msgstr "Klawisz czterofunkcyjny ze znakiem momayyez"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:276
 msgid "French"
 msgstr "Francuski"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:277
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Francuski (Bepo, ergonomiczny, w stylu Dvoraka)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:278
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Francuski (Bepo, ergonomiczny, w stylu Dvoraka, tylko latin-9)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:279
 msgid "French (Breton)"
 msgstr "Francuski (bretoński)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:280
+msgid "French (Cameroon azerty)"
+msgstr "Francuski (kameruński AZERTY)"
+
+#: ../rules/base.xml.in.h:281
+msgid "French (Cameroon)"
+msgstr "Francuski (Kamerun)"
+
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "Francuski (Kanada)"
+
+#: ../rules/base.xml.in.h:283
 msgid "French (Canada, Dvorak)"
 msgstr "Francuski (kanadyjski, Dvoraka)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:284
 msgid "French (Canada, legacy)"
 msgstr "Francuski (kanadyjski, stary)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:285
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Francuski (Demokratyczna Republika Konga)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:286
 msgid "French (Dvorak)"
 msgstr "Francuski (Dvoraka)"
 
-#: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
-msgstr "Francuski (gruziński AZERTY Tskapo)"
-
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:287
 msgid "French (Guinea)"
 msgstr "Francuski (Gwinea)"
 
-#: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
-msgstr "Francuski (Mac)"
+#: ../rules/base.xml.in.h:288
+msgid "French (Macintosh)"
+msgstr "Francuski (Macintosh)"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:289
 msgid "French (Mali, alternative)"
 msgstr "Francuski (Mali, alternatywny)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:290
 msgid "French (Morocco)"
 msgstr "Francuski (Maroko)"
 
-#: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
-msgstr "Francuski (okcytański)"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:291
 msgid "French (Sun dead keys)"
 msgstr "Francuski (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:292
 msgid "French (Switzerland)"
 msgstr "Francuski (Szwajcaria)"
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
-msgstr "Francuski (Szwajcaria, Mac)"
+#: ../rules/base.xml.in.h:293
+msgid "French (Switzerland, Macintosh)"
+msgstr "Francuski (Szwajcaria, Macintosh)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:294
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Francuski (Szwajcaria, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:295
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Francuski (Szwajcaria, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:296
 msgid "French (alternative)"
 msgstr "Francuski (alternatywny)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:297
 msgid "French (alternative, Sun dead keys)"
 msgstr "Francuski (alternatywny, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:298
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Francuski (alternatywny, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:299
 msgid "French (alternative, latin-9 only)"
 msgstr "Francuski (alternatywny, tylko latin-9)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:300
 msgid "French (eliminate dead keys)"
 msgstr "Francuski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
-msgstr "Francuski (stary alternatywny)"
+#: ../rules/base.xml.in.h:301
+msgid "French (legacy, alternative)"
+msgstr "Francuski (stary, alternatywny)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:302
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Francuski (stary alternatywny, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:303
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Francuski (stary alternatywny, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:304
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Laptop Fujitsu-Siemens Computers AMILO"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:305
 msgid "Fula"
 msgstr "Fulani"
 
-#: ../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 "Zwykła PC 101-klawiszowa"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:308
 msgid "Generic 102-key (Intl) PC"
 msgstr "Zwykła PC 102-klawiszowa (Intl)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:309
 msgid "Generic 104-key PC"
 msgstr "Zwykła PC 104-klawiszowa"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:310
 msgid "Generic 105-key (Intl) PC"
 msgstr "Zwykła PC 105-klawiszowa (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 "Gruziński"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:317
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Gruziński (Francja, AZERTY Tskapo)"
+
+#: ../rules/base.xml.in.h:318
+msgid "Georgian (Italy)"
+msgstr "Gruziński (Włochy)"
+
+#: ../rules/base.xml.in.h:319
 msgid "Georgian (MESS)"
 msgstr "Gruziński (MESS)"
 
-#: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
-msgstr "Gruziński (osetyjski)"
-
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:320
 msgid "Georgian (ergonomic)"
 msgstr "Gruziński (ergonomiczny)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:321
 msgid "German"
 msgstr "Niemiecki"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:322
 msgid "German (Austria)"
 msgstr "Niemiecki (Austria)"
 
-#: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
-msgstr "Niemiecki (Austria, Mac)"
+#: ../rules/base.xml.in.h:323
+msgid "German (Austria, Macintosh)"
+msgstr "Niemiecki (Austria, Macintosh)"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:324
 msgid "German (Austria, Sun dead keys)"
 msgstr "Niemiecki (Austria, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:325
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Niemiecki (Austria, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:326
 msgid "German (Dvorak)"
 msgstr "Niemiecki (Dvoraka)"
 
-#: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
-msgstr "Niemiecki (Mac)"
+#: ../rules/base.xml.in.h:327
+msgid "German (Macintosh)"
+msgstr "Niemiecki (Macintosh)"
 
-#: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
-msgstr "Niemiecki (Mac, bez klawiszy akcentów)"
+#: ../rules/base.xml.in.h:328
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Niemiecki (Macintosh, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:329
 msgid "German (Neo 2)"
 msgstr "Niemiecki (Neo 2)"
 
-#: ../rules/base.xml.in.h:319
-msgid "German (Romanian keyboard with German letters)"
-msgstr "Niemiecki (klawiatura rumuńska z literami niemieckimi)"
-
-#: ../rules/base.xml.in.h:320
-msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
-msgstr "Niemiecki (klawiatura rumuńska z literami niemieckimi, bez klawiszy akcentów)"
-
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:330
 msgid "German (Sun dead keys)"
 msgstr "Niemiecki (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
-msgstr "Niemiecki (Szwajcaria, Mac)"
+#: ../rules/base.xml.in.h:331
+msgid "German (Switzerland)"
+msgstr "Niemiecki (Szwajcaria)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
+msgstr "Niemiecki (Szwajcaria, Macintosh)"
+
+#: ../rules/base.xml.in.h:333
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Niemiecki (Szwajcaria, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:334
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Niemiecki (Szwajcaria, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:335
+msgid "German (Switzerland, legacy)"
+msgstr "Niemiecki (Szwajcaria, stary)"
+
+#: ../rules/base.xml.in.h:336
 msgid "German (dead acute)"
 msgstr "Niemiecki (akcent ostry)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:337
 msgid "German (dead grave acute)"
 msgstr "Niemiecki (akcent gravis)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:338
 msgid "German (eliminate dead keys)"
 msgstr "Niemiecki (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
-msgstr "Niemiecki (dolnołużycki QWERTZ)"
-
-#: ../rules/base.xml.in.h:329
-msgid "German (lower Sorbian)"
-msgstr "Niemiecki (dolnołużycki)"
-
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:339
 msgid "German (qwerty)"
 msgstr "Niemiecki (QWERTY)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:340
 msgid "Greek"
 msgstr "Grecki"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:341
 msgid "Greek (eliminate dead keys)"
 msgstr "Grecki (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:342
 msgid "Greek (extended)"
 msgstr "Grecki (rozszerzony)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:343
 msgid "Greek (polytonic)"
 msgstr "Grecki (politoniczny)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:344
 msgid "Greek (simple)"
 msgstr "Grecki (prosty)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:345
 msgid "Gujarati"
 msgstr "Gudźarati"
 
-#: ../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 for 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 "Hebrajski"
 
-#: ../rules/base.xml.in.h:343
-msgid "Hebrew (Phonetic)"
-msgstr "Hebrajski (fonetyczny)"
-
-#: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
-msgstr "Hebrajski (Tiro)"
+#: ../rules/base.xml.in.h:352
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Hebrajski (biblijny, Tiro)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "Hebrew (lyx)"
 msgstr "Hebrajski (lyx)"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
+msgid "Hebrew (phonetic)"
+msgstr "Hebrajski (fonetyczny)"
+
+#: ../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 "Szesnastkowy"
 
-#: ../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 "Telefon HTC Dream"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:372
 msgid "Hungarian"
 msgstr "Węgierski"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:373
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Węgierski (101/QWERTY/przecinek/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:374
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Węgierski (101/QWERTY/przecinek/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Węgierski (101/QWERTY/kropka/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Węgierski (101/QWERTY/kropka/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Węgierski (101/QWERTZ/przecinek/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Węgierski (101/QWERTZ/przecinek/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Węgierski (101/QWERTZ/kropka/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Węgierski (101/QWERTZ/kropka/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Węgierski (102/QWERTY/przecinek/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Węgierski (102/QWERTY/przecinek/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Węgierski (102/QWERTY/kropka/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Węgierski (102/QWERTY/kropka/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Węgierski (102/QWERTZ/przecinek/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Węgierski (102/QWERTZ/przecinek/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Węgierski (102/QWERTZ/kropka/klawisze akcentów)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Węgierski (102/QWERTZ/kropka/bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Węgierski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (qwerty)"
 msgstr "Węgierski (QWERTY)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (standard)"
 msgstr "Węgierski (standardowy)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:392
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper pod klawiszami 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 "Islandzki"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:400
 msgid "Icelandic (Dvorak)"
 msgstr "Islandzki (Dvoraka)"
 
-#: ../rules/base.xml.in.h:392
-msgid "Icelandic (Mac)"
-msgstr "Islandzki (Mac)"
+#: ../rules/base.xml.in.h:401
+msgid "Icelandic (Macintosh)"
+msgstr "Islandzki (Macintosh)"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic (Sun dead keys)"
 msgstr "Islandzki (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Islandzki (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:404
 msgid "Igbo"
 msgstr "Ibo"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:405
 msgid "Indian"
 msgstr "Indyjski"
 
-#: ../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 "Iracki"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:408
 msgid "Irish"
 msgstr "Irlandzki"
 
-#: ../rules/base.xml.in.h:400
-msgid "Irish (CloGaelach)"
-msgstr "Irlandzki (gaelicki)"
-
-#: ../rules/base.xml.in.h:401
-msgid "Irish (Ogham IS434)"
-msgstr "Irlandzki (Ogham IS434)"
-
-#: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
-msgstr "Irlandzki (Ogham)"
-
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:409
 msgid "Irish (UnicodeExpert)"
 msgstr "Irlandzki (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:410
 msgid "Italian"
 msgstr "Włoski"
 
-#: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
-msgstr "Włoski (gruziński)"
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
-msgstr "Włoski (Mac)"
+#: ../rules/base.xml.in.h:411
+msgid "Italian (Macintosh)"
+msgstr "Włoski (Macintosh)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:412
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Włoski (klawiatura US z literami włoskimi)"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:413
 msgid "Italian (eliminate dead keys)"
 msgstr "Włoski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:414
 msgid "Japanese"
 msgstr "Japoński"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:415
 msgid "Japanese (Kana 86)"
 msgstr "Japoński (Kana 86)"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:416
 msgid "Japanese (Kana)"
 msgstr "Japoński (Kana)"
 
-#: ../rules/base.xml.in.h:412
-msgid "Japanese (Mac)"
-msgstr "Japoński (Mac)"
+#: ../rules/base.xml.in.h:417
+msgid "Japanese (Macintosh)"
+msgstr "Japoński (Macintosh)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (OADG 109A)"
 msgstr "Japoński (OADG 109A)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (PC-98xx Series)"
 msgstr "Japoński (serie PC-98xx)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:420
 msgid "Japanese keyboard options"
 msgstr "Opcje klawiatury japońskiej"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:421
+msgid "Kalmyk"
+msgstr "Kałmucki"
+
+#: ../rules/base.xml.in.h:422
 msgid "Kana Lock key is locking"
 msgstr "Blokujący klawisz Kana Lock"
 
-#: ../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 "Kaszubski"
+
+#: ../rules/base.xml.in.h:425
 msgid "Kazakh"
 msgstr "Kazaski"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:426
 msgid "Kazakh (with Russian)"
 msgstr "Kazaski (z rosyjskim)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:427
 msgid "Key sequence to kill the X server"
 msgstr "Sekwencja klawiszy zabijająca serwer X"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:428
 msgid "Key to choose 3rd level"
 msgstr "Klawisz wybierający poziom 3."
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:429
 msgid "Key to choose 5th level"
 msgstr "Klawisz wybierający poziom 5."
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:430
 msgid "Key(s) to change layout"
 msgstr "Klawisze zmieniające układ"
 
-#: ../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 "Khmerski (Kambodża)"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:433
 msgid "Kikuyu"
 msgstr "Kikiju"
 
-#: ../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 "Koreański"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Korean (101/104 key compatible)"
 msgstr "Koreański (kompatybilny ze 101/104 klawiszami)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Kurdyjski (Iran, arabsko-łaciński)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Kurdish (Iran, F)"
 msgstr "Kurdyjski (Iran, F)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kurdyjski (Iran, łaciński Alt-Q)"
+
+#: ../rules/base.xml.in.h:441
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "Kurdyjski (Iran, łaciński Q)"
 
-#: ../rules/base.xml.in.h:433
-msgid "Kurdish (Iran, latin alt-Q)"
-msgstr "Kurdyjski (Iran, łaciński Alt-Q)"
-
-#: ../rules/base.xml.in.h:434
+#: ../rules/base.xml.in.h:442
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Kurdyjski (Irak, arabsko-łaciński)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iraq, F)"
 msgstr "Kurdyjski (Irak, F)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Kurdyjski (Irak, łaciński Alt-Q)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Kurdyjski (Irak, łaciński Q)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Syria, F)"
 msgstr "Kurdyjski (Syria, F)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Kurdyjski (Syria, łaciński Alt-Q)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Kurdyjski (Syria, łaciński Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Turkey, F)"
 msgstr "Kurdyjski (Turcja, F)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Kurdyjski (Turcja, łaciński Alt-Q)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "Kurdyjski (Turcja, łaciński 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 "Kirgiski"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:453
 msgid "Kyrgyz (phonetic)"
 msgstr "Kirgiski (fonetyczny)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:454
 msgid "Lao"
 msgstr "Laotański"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:455
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Laotański (proponowany układ standardowy STEA)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:456
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Klawiatura laptopowa Compaq (np. Armada)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:457
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Klawiatura internetowa laptopów/notebooków Compaq (np. Presario)"
 
-#: ../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 "Łotewski"
 
-#: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
-msgstr "Łotewski (wariant z apostrofem ')"
-
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:460
 msgid "Latvian (F variant)"
 msgstr "Łotewski (wariant F)"
 
-#: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
-msgstr "Łotewski (wariant z tyldą ~)"
+#: ../rules/base.xml.in.h:461
+msgid "Latvian (adapted)"
+msgstr "Łotewski (zaadaptowany)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:462
+msgid "Latvian (apostrophe variant)"
+msgstr "Łotewski (wariant z apostrofem)"
+
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Łotewski (ergonomiczny ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:464
+msgid "Latvian (modern)"
+msgstr "Łotewski (współczesny)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "Łotewski (wariant z tyldą)"
+
+#: ../rules/base.xml.in.h:466
 msgid "Left Alt"
 msgstr "Lewy Alt"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:467
 msgid "Left Alt (while pressed)"
 msgstr "Lewy Alt (wciśnięty)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:468
 msgid "Left Alt is swapped with Left Win"
 msgstr "Lewy Alt zamieniony z lewym Win"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:469
 msgid "Left Ctrl"
 msgstr "Lewy 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 "Lewy Ctrl (do pierwszego układu), prawy Ctrl (do ostatniego układu)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:471
 msgid "Left Ctrl+Left Shift"
 msgstr "Lewy Ctrl+lewy Shift"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:472
 msgid "Left Shift"
 msgstr "Lewy Shift"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:473
 msgid "Left Win"
 msgstr "Lewy 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 "Lewy Win (do pierwszego układu), prawy Win/Menu (do ostatniego układu)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:475
 msgid "Left Win (while pressed)"
 msgstr "Lewy Win (wciśnięty)"
 
-#: ../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 "Lewy Win wybiera poziom 5., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 5."
 
-#: ../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 "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:468
+#: ../rules/base.xml.in.h:478
 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:469
+#: ../rules/base.xml.in.h:479
 msgid "Legacy"
 msgstr "Stary"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:480
 msgid "Legacy Wang 724"
 msgstr "Legacy 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 "Klawisz tradycyjny z przecinkiem"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:483
 msgid "Legacy key with dot"
 msgstr "Klawisz tradycyjny z kropką"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
 msgid "Lithuanian"
 msgstr "Litewski"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:485
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Litewski (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:486
 msgid "Lithuanian (LEKP)"
 msgstr "Litewski (LEKP)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:487
 msgid "Lithuanian (LEKPa)"
 msgstr "Litewski (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:488
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Litewski (klawiatura US z literami litewskimi)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (standard)"
 msgstr "Litewski (standardowy)"
 
-#: ../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 (opcja zmiany)"
 
-#: ../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 (opcja zmiany 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 - dodatkowe glawisze poprzez G15daemon"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech Generic Keyboard"
 
-#: ../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 "Dolnołużycki"
+
+#: ../rules/base.xml.in.h:515
+msgid "Lower Sorbian (qwertz)"
+msgstr "Dolnołużycki (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 "Macedoński"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:519
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Macedoński (bez klawiszy akcentów)"
 
-#: ../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 - stary"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:522
 msgid "Make Caps Lock an additional Backspace"
 msgstr "CapsLock jako dodatkowy Backspace"
 
-#: ../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 "CapsLock jako dodatkowy Ctrl, ale z pozostawieniem symbolu Caps_Lock"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:524
 msgid "Make Caps Lock an additional Ctrl"
 msgstr "CapsLock jako dodatkowy Ctrl"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:525
 msgid "Make Caps Lock an additional ESC"
 msgstr "CapsLock jako dodatkowy Esc"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Hyper"
 msgstr "CapsLock jako dodatkowy Hyper"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "CapsLock jako dodatkowy NumLock"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional Super"
 msgstr "CapsLock jako dodatkowy Super"
 
-#: ../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 (rozszerzony Inscript ze znakiem rupii)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:532
 msgid "Maltese"
 msgstr "Maltański"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:533
 msgid "Maltese (with US layout)"
 msgstr "Maltański (z układem US)"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:534
+msgid "Maori"
+msgstr "Maoryski"
+
+#: ../rules/base.xml.in.h:535
+msgid "Mari"
+msgstr "Maryjski"
+
+#: ../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 pod lewym Win"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:541
 msgid "Meta is mapped to Win keys"
 msgstr "Meta pod klawiszami Win"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:542
 msgid "Meta on Left Ctrl"
 msgstr "Meta pod lewym 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, Swedish"
 
-#: ../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 "Różne opcje kompatybilności"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:556
 msgid "Mongolian"
 msgstr "Mongolski"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:557
 msgid "Montenegrin"
 msgstr "Czarnogórski"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:558
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Czarnogórski (cyrylicki z cudzysłowami)"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:559
 msgid "Montenegrin (Cyrillic)"
 msgstr "Czarnogórski (cyrylicki)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:560
 msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr "Czarnogórski (cyrylicki, zamienione Z i Ż"
 
-#: ../rules/base.xml.in.h:547
-msgid "Montenegrin (Latin qwerty)"
-msgstr "Czarnogórski (łaciński QWERTY)"
-
-#: ../rules/base.xml.in.h:548
-msgid "Montenegrin (Latin unicode qwerty)"
+#: ../rules/base.xml.in.h:561
+msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Czarnogórski (łaciński unikodowy QWERTY)"
 
-#: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
+#: ../rules/base.xml.in.h:562
+msgid "Montenegrin (Latin Unicode)"
 msgstr "Czarnogórski (łaciński unikodowy)"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:563
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Czarnogórski (łaciński QWERTY)"
+
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Czarnogórski (łaciński z cudzysłowami)"
 
-#: ../rules/base.xml.in.h:551
-msgid "Māori"
-msgstr "Maoryski"
-
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:565
 msgid "NICOLA-F style Backspace"
 msgstr "Backspace w stylu NICOLA-F"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:566
 msgid "Nepali"
 msgstr "Nepalski"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:567
 msgid "Non-breakable space character at fourth level"
 msgstr "Znak niełamliwej spacji na poziomie 4."
 
-#: ../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 "Znak niełamliwej spacji na poziomie 4., wąskiej niełamliwej spacji na poziomie 6."
 
-#: ../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 "Znak niełamliwej spacji na poziomie 4., wąskiej niełamliwej spacji na poziomie 6. (z Ctrl+Shift)"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at second level"
 msgstr "Znak niełamliwej spacji na poziomie 2."
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at third level"
 msgstr "Znak niełamliwej spacji na poziomie 3."
 
-#: ../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 "Znak niełamliwej spacji na poziomie 3., nic na poziomie 4."
 
-#: ../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 "Znak niełamliwej spacji na poziomie 3., wąskiej niełamliwej spacji na poziomie 4."
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:574
+msgid "Northern Saami (Finland)"
+msgstr "Północnolapoński (Finlandia)"
+
+#: ../rules/base.xml.in.h:575
+msgid "Northern Saami (Norway)"
+msgstr "Północnolapoński (Norwegia)"
+
+#: ../rules/base.xml.in.h:576
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Północnolapoński (Norwegia, bez klawiszy akcentów)"
+
+#: ../rules/base.xml.in.h:577
+msgid "Northern Saami (Sweden)"
+msgstr "Północnolapoński (Szwecja)"
+
+#: ../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 "Norweski"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:580
 msgid "Norwegian (Dvorak)"
 msgstr "Norweski (Dvoraka)"
 
-#: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
-msgstr "Norweski (Mac)"
-
-#: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
-msgstr "Norweski (Mac, bez klawiszy akcentów)"
+#: ../rules/base.xml.in.h:581
+msgid "Norwegian (Macintosh)"
+msgstr "Norweski (Macintosh)"
 
-#: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
-msgstr "Norweski (północnolapoński)"
+#: ../rules/base.xml.in.h:582
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Norweski (Macintosh, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Norweski (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:568
-msgid "Norwegian (northern Saami, eliminate dead keys)"
-msgstr "Norweski (północnolapoński, bez klawiszy akcentów)"
-
-#: ../rules/base.xml.in.h:569
+#: ../rules/base.xml.in.h:584
 msgid "Num Lock"
 msgstr "NumLock"
 
-#: ../rules/base.xml.in.h:570
+#: ../rules/base.xml.in.h:585
 msgid "Numeric keypad delete key behaviour"
 msgstr "Zachowanie klawisza Delete na klawiaturze numerycznej"
 
-#: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
-msgstr "Klawiatura numeryczna działająca jak w Macu"
+#: ../rules/base.xml.in.h:586
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "Klawiatura numeryczna działająca jak w Macintoshu"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:587
 msgid "Numeric keypad layout selection"
 msgstr "Wybór układu klawiatury numerycznej"
 
-#: ../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 "Okcytański"
+
+#: ../rules/base.xml.in.h:590
+msgid "Ogham"
+msgstr "Ogamiczny"
+
+#: ../rules/base.xml.in.h:591
+msgid "Ogham (IS434)"
+msgstr "Ogamiczny (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 "Osetyjski (Gruzja)"
+
+#: ../rules/base.xml.in.h:595
+msgid "Ossetian (WinKeys)"
+msgstr "Osetyjski (klawisze Win)"
+
+#: ../rules/base.xml.in.h:596
+msgid "Ossetian (legacy)"
+msgstr "Osetyjski (stary)"
+
+#: ../rules/base.xml.in.h:597
 msgid "PC-98xx Series"
 msgstr "Serie PC-98xx"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:598
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Pannońskorusiński (homofoniczny)"
+
+#: ../rules/base.xml.in.h:599
 msgid "Pashto"
 msgstr "Pasztuński"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:600
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Paszto (Afganistan, OLPC)"
 
-#: ../rules/base.xml.in.h:579
+#: ../rules/base.xml.in.h:601
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../rules/base.xml.in.h:580
+#: ../rules/base.xml.in.h:602 ../rules/base.extras.xml.in.h:23
 msgid "Persian"
 msgstr "Perski"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:603
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Perski (Afganistan, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:604
 msgid "Persian (with Persian Keypad)"
 msgstr "Perski (z perską klawiaturą numeryczną)"
 
-#: ../rules/base.xml.in.h:583
-msgid "Philippines - Dvorak (Baybayin)"
-msgstr "Filipiński - Dvoraka (baybayin)"
-
-#: ../rules/base.xml.in.h:584
+#: ../rules/base.xml.in.h:605 ../rules/base.extras.xml.in.h:24
 msgid "Polish"
 msgstr "Polski"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:606
 msgid "Polish (Dvorak)"
 msgstr "Polski (Dvoraka)"
 
-#: ../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 "Polski (Dvoraka, polskie cudzysłowy pod klawiszem 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 "Polski (Dvoraka, polskie cudzysłowy pod klawiszem cudzysłowu)"
 
-#: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
-msgstr "Polski (kaszubski)"
-
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:609
 msgid "Polish (programmer Dvorak)"
 msgstr "Polski (Dvoraka programisty)"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:610
 msgid "Polish (qwertz)"
 msgstr "Polski (QWERTZ)"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:611
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:612
 msgid "Portuguese (Brazil)"
 msgstr "Portugalski (Brazylia)"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:613
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Portugalski (Brazylia, Dvoraka)"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Portugalski (Brazylia, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Portugalski (Brazylia, nativo dla esperanto)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Portugalski (Brazylia, nativo dla klawiatur USA)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Portugalski (Brazylia, nativo)"
 
-#: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
-msgstr "Portugalski (Mac)"
-
-#: ../rules/base.xml.in.h:599
-msgid "Portuguese (Mac, Sun dead keys)"
-msgstr "Portugalski (Mac, klawisze akcentów Suna)"
+#: ../rules/base.xml.in.h:618
+msgid "Portuguese (Macintosh)"
+msgstr "Portugalski (Macintosh)"
 
-#: ../rules/base.xml.in.h:600
-msgid "Portuguese (Mac, eliminate dead keys)"
-msgstr "Portugalski (Mac, bez klawiszy akcentów)"
+#: ../rules/base.xml.in.h:619
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portugalski (Macintosh, klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr "Portugalski (nativo dla esperanto)"
+#: ../rules/base.xml.in.h:620
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Portugalski (Macintosh, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Portugalski (nativo dla klawiatur USA)"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Nativo)"
 msgstr "Portugalski (nativo)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Sun dead keys)"
 msgstr "Portugalski (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Portugalski (bez klawiszy akcentów)"
 
-#: ../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 "Pendżabski (Gurmukhi Jhelum)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:628
 msgid "Punjabi (Gurmukhi)"
 msgstr "Pendżabski (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 "Prawy Alt"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:631
 msgid "Right Alt (while pressed)"
 msgstr "Prawy Alt (wciśnięty)"
 
-#: ../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 "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:614
+#: ../rules/base.xml.in.h:633
 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: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 "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:616
+#: ../rules/base.xml.in.h:635
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Prawy Alt nigdy nie wybierający poziomu 3."
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Prawy Alt, Shift+prawy Alt jako Multi_Key"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:637
 msgid "Right Ctrl"
 msgstr "Prawy Ctrl"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:638
 msgid "Right Ctrl (while pressed)"
 msgstr "Prawy Ctrl (wciśnięty)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:639
 msgid "Right Ctrl as Right Alt"
 msgstr "Prawy Ctrl jako prawy Alt"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:640
 msgid "Right Ctrl is mapped to Menu"
 msgstr "Prawy Ctrl pod Menu"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl+Right Shift"
 msgstr "Prawy Ctrl+prawy Shift"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:642
 msgid "Right Shift"
 msgstr "Prawy Shift"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:643
 msgid "Right Win"
 msgstr "Prawy Win"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:644
 msgid "Right Win (while pressed)"
 msgstr "Prawy Win (wciśnięty)"
 
-#: ../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 "Prawy Win wybiera poziom 5., blokuje przy naciśnięciu z innym klawiszem wybierającym poziom 5."
 
-#: ../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 "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:628
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
 msgid "Romanian"
 msgstr "Rumuński"
 
-#: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr "Rumuński (krymskotatarski Dobruca-1 Q)"
-
-#: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr "Rumuński (krymskotatarski Dobruca-2 Q)"
-
-#: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Rumuński (krymskotatarski turecki Alt-Q)"
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (Germany)"
+msgstr "Rumuński (Niemcy)"
 
-#: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
-msgstr "Rumuński (krymskotatarski turecki F)"
+#: ../rules/base.xml.in.h:649
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Rumuński (Niemcy, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:650
 msgid "Romanian (WinKeys)"
 msgstr "Rumuński (klawisze Win)"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (cedilla)"
 msgstr "Rumuński (cedilla)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (standard cedilla)"
 msgstr "Rumuński (standardowy cedilla)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (standard)"
 msgstr "Rumuński (standardowy)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:654
 msgid "Rupee on 4"
 msgstr "Rupia pod 4"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
 msgid "Russian"
 msgstr "Rosyjski"
 
-#: ../rules/base.xml.in.h:639
-msgid "Russian (Bashkirian)"
-msgstr "Rosyjski (baszkirski)"
-
-#: ../rules/base.xml.in.h:640
-msgid "Russian (Chuvash Latin)"
-msgstr "Rosyjski (czuwaski łaciński)"
-
-#: ../rules/base.xml.in.h:641
-msgid "Russian (Chuvash)"
-msgstr "Rosyjski (czuwaski)"
-
-#: ../rules/base.xml.in.h:642
+#: ../rules/base.xml.in.h:656
 msgid "Russian (DOS)"
 msgstr "Rosyjski (DOS)"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:657
 msgid "Russian (Georgia)"
 msgstr "Rosyjski (gruziński)"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:658
 msgid "Russian (Germany, phonetic)"
 msgstr "Rosyjski (Niemcy, fonetyczny)"
 
-#: ../rules/base.xml.in.h:645
-msgid "Russian (Kalmyk)"
-msgstr "Rosyjski (kałmucki)"
-
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:659
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Rosyjski (Kazahstan, z kazaskim)"
 
-#: ../rules/base.xml.in.h:647
-msgid "Russian (Komi)"
-msgstr "Rosyjski (Komi)"
-
-#: ../rules/base.xml.in.h:648
-msgid "Russian (Mari)"
-msgstr "Rosyjski (Mari)"
-
-#: ../rules/base.xml.in.h:649
-msgid "Russian (Ossetian, WinKeys)"
-msgstr "Rosyjski (osetyjski, klawisze Win)"
-
-#: ../rules/base.xml.in.h:650
-msgid "Russian (Ossetian, legacy)"
-msgstr "Rosyjski (osetyjski, stary)"
-
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:660
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr "Rosyjski (Polska, fonetyczny Dvoraka)"
 
-#: ../rules/base.xml.in.h:652
-msgid "Russian (Serbian)"
-msgstr "Rosyjski (serbski)"
-
-#: ../rules/base.xml.in.h:653
+#: ../rules/base.xml.in.h:661
 msgid "Russian (Sweden, phonetic)"
 msgstr "Rosyjski (Szwecja, fonetyczny)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Rosyjski (Szwecja, fonetyczny, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:655
-msgid "Russian (Tatar)"
-msgstr "Rosyjski (tatarski)"
-
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:663
 msgid "Russian (US, phonetic)"
 msgstr "Rosyjski (USA, fonetyczny)"
 
-#: ../rules/base.xml.in.h:657
-msgid "Russian (Udmurt)"
-msgstr "Rosyjski (udmurcki)"
-
-#: ../rules/base.xml.in.h:658
-msgid "Russian (Yakut)"
-msgstr "Rosyjski (jakucki)"
+#: ../rules/base.xml.in.h:664
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Rosyjski (Ukraina, standardowy RSTU)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:665
 msgid "Russian (legacy)"
 msgstr "Rosyjski (stary)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:666
 msgid "Russian (phonetic WinKeys)"
 msgstr "Rosyjski (fonetyczny, klawisze Win)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:667
 msgid "Russian (phonetic)"
 msgstr "Rosyjski (fonetyczny)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:668
 msgid "Russian (typewriter)"
 msgstr "Rosyjski (maszynistki)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:669
 msgid "Russian (typewriter, legacy)"
 msgstr "Rosyjski (maszynistki, stary)"
 
-#: ../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 (Tajwan)"
 
-#: ../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 "ScrollLock"
 
-#: ../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 "Średnik na poziomie 3."
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
 msgid "Serbian"
 msgstr "Serbski"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Serbski (łaciński unikodowy QWERTY)"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin Unicode)"
 msgstr "Serbski (łaciński unikodowy)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:686
 msgid "Serbian (Latin qwerty)"
 msgstr "Serbski (łaciński QWERTY)"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin with guillemets)"
 msgstr "Serbski (łaciński z cudzysłowami)"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin)"
 msgstr "Serbski (łaciński)"
 
-#: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr "Serbski (pannońskorusiński homofoniczny)"
+#: ../rules/base.xml.in.h:689
+msgid "Serbian (Russia)"
+msgstr "Serbski (Rosja)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Serbski (zamienione Z i Ż)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (with guillemets)"
 msgstr "Serbski (z cudzysłowami)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:692
 msgid "Serbo-Croatian (US)"
 msgstr "Serbsko-chorwacki (USA)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:693
 msgid "Shift cancels Caps Lock"
 msgstr "Shift anuluje CapsLock"
 
-#: ../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 nie anuluje NumLocka, wybiera poziom 3."
 
-#: ../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 z klawiaturą numeryczną działą jak pod MS Windows"
 
-#: ../rules/base.xml.in.h:691
+#: ../rules/base.xml.in.h:696
 msgid "Shift+Caps Lock"
 msgstr "Shift+CapsLock"
 
-#: ../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 "Syngaleski"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:699
 msgid "Slovak"
 msgstr "Słowacki"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:700
 msgid "Slovak (extended Backslash)"
 msgstr "Słowacki (rozszerzony backslash)"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:701
 msgid "Slovak (qwerty)"
 msgstr "Słowacki (QWERTY)"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:702
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Słowacki (QWERTY, rozszerzony Backslash)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Slovene"
+#: ../rules/base.xml.in.h:703
+msgid "Slovenian"
 msgstr "Słoweński"
 
-#: ../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 "Słoweński (klawiatura US z literami słoweńskimi)"
 
-#: ../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 "Słoweński (używanie cudzysłowów do cytowania)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:706
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr "Hiszpański (wariant asturski z H i L z dolną kropką)"
-
-#: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr "Hiszpański (wariant kataloński z L ze środkową kropką)"
-
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Spanish (Dvorak)"
 msgstr "Hiszpański (Dvoraka)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Spanish (Latin American)"
 msgstr "Hiszpański (Ameryka Łacińska)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Hiszpański (Ameryka Łacińska, klawisze akcentów Suna)"
+
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Hiszpański (Ameryka Łacińska, bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Hiszpański (Ameryka Łacińska, ze znakiem tyldy)"
 
-#: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, sun dead keys)"
-msgstr "Hiszpański (Ameryka Łacińska, klawisze akcentów Suna)"
-
-#: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
-msgstr "Hiszpański (Mac)"
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Macintosh)"
+msgstr "Hiszpański (Macintosh)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Sun dead keys)"
 msgstr "Hiszpański (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (eliminate dead keys)"
 msgstr "Hiszpański (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (include dead tilde)"
 msgstr "Hiszpański (ze znakiem tyldy)"
 
-#: ../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 "Klawisze specjalne (Ctrl+Alt+&lt;klawisz&gt;) obsługiwane przez serwer"
 
-#: ../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 "Suahili (Kenia)"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Swahili (Tanzania)"
 msgstr "Suahili (Tanzania)"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Zamiana Ctrl i CapsLocka"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swap ESC and Caps Lock"
 msgstr "Zamiana Esc i CapsLocka"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swedish"
 msgstr "Szwedzki"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swedish (Dvorak)"
 msgstr "Szwedzki (Dvoraka)"
 
-#: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
-msgstr "Szwedzki (Mac)"
+#: ../rules/base.xml.in.h:725
+msgid "Swedish (Macintosh)"
+msgstr "Szwedzki (Macintosh)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish (Svdvorak)"
 msgstr "Szwedzki (Svdvorak)"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (eliminate dead keys)"
 msgstr "Szwedzki (bez klawiszy akcentów)"
 
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
-msgstr "Szwedzki (północnolapoński)"
-
-#: ../rules/base.xml.in.h:726
-msgid "Swiss"
-msgstr "Szwajcarski"
-
-#: ../rules/base.xml.in.h:727
-msgid "Swiss (legacy)"
-msgstr "Szwajcarski (stary)"
-
 #: ../rules/base.xml.in.h:728
+msgid "Swedish Sign Language"
+msgstr "Szwedzki migowy"
+
+#: ../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 "Syryjski"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:731
 msgid "Syriac (phonetic)"
 msgstr "Syryjski (fonetyczny)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:732
 msgid "Taiwanese"
 msgstr "Tajwański"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:733
 msgid "Taiwanese (indigenous)"
 msgstr "Tajwański (autochtoniczny)"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:734
 msgid "Tajik"
 msgstr "Tadżycki"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:735
 msgid "Tajik (legacy)"
 msgstr "Tadżycki (stary)"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:736
 msgid "Tamil"
 msgstr "Tamilski"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:737
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Tamilski (Sri Lanka, maszynistki TAB)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:738
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Tamilski (Sri Lanka, unikodowy)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:739
 msgid "Tamil (TAB typewriter)"
 msgstr "Tamilski (maszynistki TAB)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (TSCII typewriter)"
 msgstr "Tamilski (maszynistki TSCII)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Unicode)"
 msgstr "Tamilski (unikodowy)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (keyboard with numerals)"
 msgstr "Tamilski (klawiatura z cyframi)"
 
-#: ../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 "Tatarski"
+
+#: ../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 "Tajski"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Tajski (Pattachote)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
 msgid "Thai (TIS-820.2538)"
 msgstr "Tajski (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
+msgid "Tibetan"
+msgstr "Tybetański"
+
+#: ../rules/base.xml.in.h:750
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tybetański (z liczbami ASCII)"
+
+#: ../rules/base.xml.in.h:751
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "Pod odpowiednimi klawiszami wg układu Dvoraka."
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:752
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "Pod odpowiednimi klawiszami wg układu QWERTY."
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:753
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Przełączanie klawiszy kursorów przez 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 "Tswana"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:759
 msgid "Turkish"
 msgstr "Turecki"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:760
 msgid "Turkish (Alt-Q)"
 msgstr "Turecki (Alt-Q)"
 
-#: ../rules/base.xml.in.h:757
-msgid "Turkish (Crimean Tatar Turkish Alt-Q)"
-msgstr "Turecki (krymskotatarski turecki Alt-Q)"
-
-#: ../rules/base.xml.in.h:758
-msgid "Turkish (Crimean Tatar Turkish F)"
-msgstr "Turecki (krymskotatarski turecki F)"
-
-#: ../rules/base.xml.in.h:759
-msgid "Turkish (Crimean Tatar Turkish Q)"
-msgstr "Turecki (krymskotatarski turecki Q)"
-
-#: ../rules/base.xml.in.h:760
+#: ../rules/base.xml.in.h:761
 msgid "Turkish (F)"
 msgstr "Turecki (F)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:762
 msgid "Turkish (Sun dead keys)"
 msgstr "Turecki (klawisze akcentów Suna)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (international with dead keys)"
 msgstr "Turecki (międzynarodowy z klawiszami akcentów)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:764
 msgid "Turkmen"
 msgstr "Turkmeński"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:765
 msgid "Turkmen (Alt-Q)"
 msgstr "Turkmeński (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 (tryb 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 (tryb 106:JP)"
 
-#: ../rules/base.xml.in.h:770
-msgid "Ukrainian"
-msgstr "Ukraiński"
-
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Ukraiński (krymskotatarski turecki Alt-Q)"
+msgid "Udmurt"
+msgstr "Udmurcki"
 
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "Ukraiński (krymskotatarski turecki F)"
+msgid "Ukrainian"
+msgstr "Ukraiński"
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "Ukraiński (krymskotatarski turecki Q)"
-
-#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (WinKeys)"
 msgstr "Ukraiński (klawisze Win)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (homophonic)"
 msgstr "Ukraiński (homofoniczny)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (legacy)"
 msgstr "Ukraiński (stary)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (phonetic)"
 msgstr "Ukraiński (fonetyczny)"
 
-#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr "Ukraiński (standardowy RSTU przy układzie rosyjskim)"
-
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (standard RSTU)"
 msgstr "Ukraiński (standardowy RSTU)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (typewriter)"
 msgstr "Ukraiński (maszynistki)"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:779
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Dodatki Unicode (strzałki i symbole matematyczne)"
 
-#: ../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 "Dodatki Unicode (strzałki i symbole matematyczne). Symbole matematyczne na poziomie domyślnym"
 
-#: ../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 (Pakistan)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:783
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Urdu (Pakistan, CRULP)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:784
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Urdu (Pakistan, NLA)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (WinKeys)"
 msgstr "Urdu (klawisze Win)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (alternative phonetic)"
 msgstr "Urdu (alternatywny fonetyczny)"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (phonetic)"
 msgstr "Urdu (fonetyczny)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:788
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Używanie diody na klawiaturze do sygnalizacji układu alternatywnego"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:789
 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:792
+#: ../rules/base.xml.in.h:790
 msgid "Usual space at any level"
 msgstr "Zwykła spacja na dowolnym poziomie"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "Ujgurski"
+
+#: ../rules/base.xml.in.h:792
 msgid "Uzbek"
 msgstr "Uzbecki"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:793
 msgid "Uzbek (Afghanistan)"
 msgstr "Uzbecki (Afganistan)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:794
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "Uzbecki (Afganistan, OLPC)"
 
-#: ../rules/base.xml.in.h:796
-msgid "Uzbek (Crimean Tatar Turkish Alt-Q)"
-msgstr "Uzbecki (krymskotatarski turecki Alt-Q)"
-
-#: ../rules/base.xml.in.h:797
-msgid "Uzbek (Crimean Tatar Turkish F)"
-msgstr "Uzbecki (krymskotatarski turecki F)"
-
-#: ../rules/base.xml.in.h:798
-msgid "Uzbek (Crimean Tatar Turkish Q)"
-msgstr "Uzbecki (krymskotatarski turecki Q)"
-
-#: ../rules/base.xml.in.h:799
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek (Latin)"
 msgstr "Uzbecki (łaciński)"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:796
 msgid "Vietnamese"
 msgstr "Wietnamski"
 
-#: ../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)"
+#: ../rules/base.xml.in.h:798
+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: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 "Klawiatura numeryczna Wang 724 z dodatkami Unicode (strzałki i symbole matematyczne). Symbole matematyczne na poziomie domyślnym"
 
-#: ../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 "Jakucki"
+
+#: ../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 "Znak rozdzielający zerowej szerokości na poziomie 2."
 
-#: ../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 "Znak rozdzielający zerowej szerokości na poziomie 2., znak niełamliwej spacji na poziomie 3."
 
-#: ../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 "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: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 "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: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 "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:813
+#: ../rules/base.xml.in.h:810
 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: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 "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:815
+#: ../rules/base.xml.in.h:812
 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: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 "Iran"
-
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr "Iran - awestyjski"
+msgid "APL Keyboard Symbols"
+msgstr "Symbole klawiatury APL"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "Litwa"
+msgid "Atsina"
+msgstr "Atsina"
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
-msgstr "Litwa - Dvoraka"
+msgid "Avestan"
+msgstr "Awestyjski"
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "LTU"
-
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "Rumunia"
+msgid "Couer D'alene Salish"
+msgstr "Couer D'alene Salish"
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr "Rumunia - ergonomiczny Touchtype"
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Angielski (USA, międzynarodowy, łączenie unikodu z AltGr)"
 
 #: ../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 "Angielski (USA, międzynarodowy, łączenie unikodu z AltGr, alternatywny)"
 
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "Rosja"
-
-#: ../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 - łączenie akcentów zamiast klawiszy akcentów"
+msgid "Latvian (US Colemak)"
+msgstr "Łotewski (USA, Colemak)"
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
-msgstr "SRB"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Łotewski (USA, Colemak, wariant z apostrofem)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "USA"
+msgid "Latvian (US Dvorak)"
+msgstr "Łotewski (USA, Dvoraka)"
 
 #: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
-msgstr "USA - Atsina"
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Łotewski (USA, Dvoraka, wariant Y)"
 
 #: ../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 "Łotewski (USA, Dvoraka, wariant minus)"
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
-msgstr "USA - międzynarodowy (łączenie unikodu z AltGr)"
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Łotewski (USA, Dvoraka programisty)"
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
-msgstr "USA - międzynarodowy (łączenie unikodu z AltGr, alternatywny)"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Łotewski (USA, Dvoraka programisty, wariant Y)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Łotewski (USA, Dvoraka programisty, wariant minus)"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Litewski (USA, Dvoraka z literami litewskimi)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "Polski (międzynarodowy z klawiszami akcentów)"
+
+#: ../rules/base.extras.xml.in.h:27
+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:30
+msgid "Secwepemctsin"
+msgstr "Shuswap"
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "Serbski (łączenie akcentów zamiast klawiszy akcentów)"
+
+#: ../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/xorg-server/xkeyboard-config/po/ru.po b/xorg-server/xkeyboard-config/po/ru.po
index 0eb0dcadb..969b8451e 100644
--- a/xorg-server/xkeyboard-config/po/ru.po
+++ b/xorg-server/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.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-01 16:52+0400\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-05-23 19:15+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "Language: ru\n"
@@ -92,153 +92,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 "Афганская"
 
-#: ../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 - 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+Пробел"
 
-#: ../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"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr "Любая клавиша Win"
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr "Любая клавиша Win (на время нажатия)"
 
-#: ../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 (ANSI)"
 
-#: ../rules/base.xml.in.h:35
+#: ../rules/base.xml.in.h:34
 msgid "Apple Aluminium Keyboard (ISO)"
 msgstr "Алюминиевая клавиатура Apple (ISO)"
 
-#: ../rules/base.xml.in.h:36
+#: ../rules/base.xml.in.h:35
 msgid "Apple Aluminium Keyboard (JIS)"
 msgstr "Алюминиевая клавиатура 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 "Алюминиевая клавиатура Apple: эмуляция клавиш ПК (Print, Scroll Lock, Pause, Num Lock)"
 
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
 msgstr "Ноутбук Apple"
 
-#: ../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
 msgid "Armenian (alternative eastern)"
 msgstr "Армянская (альтернативная восточная)"
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
 msgid "Armenian (alternative phonetic)"
 msgstr "Армянская (альтернативная фонетическая)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 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
 msgid "Armenian (western)"
 msgstr "Армянская (западная)"
 
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Астурлеонская (испанский вариант с нижними точками у H и L)"
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "Ноутбук Asus"
@@ -256,13 +256,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
 msgid "Azona RF2300 wireless Internet Keyboard"
 msgstr "Azona RF2300 wireless Internet Keyboard"
@@ -308,3455 +308,3615 @@ msgid "Backslash"
 msgstr "Backslash"
 
 #: ../rules/base.xml.in.h:72
-msgid "Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr "По правой клавише Backslash выбирается 3-й ряд, защёлкивается при нажатии вместе с другим выборщиком-3-го-ряда"
+msgid "Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
+msgstr "Backslash (выбирается 3-й ряд, защёлкивается при нажатии вместе с другим выборщиком-3-го-ряда)"
 
 #: ../rules/base.xml.in.h:73
 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
+#: ../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 "Бельгийская (спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:80
+#: ../rules/base.xml.in.h:81
 msgid "Belgian (Wang model 724 azerty)"
 msgstr "Бельгийская (Wang model 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 "Бельгийская (альтернативная, спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:83
+#: ../rules/base.xml.in.h:84
 msgid "Belgian (alternative, latin-9 only)"
 msgstr "Бельгийская (альтернативная, только latin-9)"
 
-#: ../rules/base.xml.in.h:84
+#: ../rules/base.xml.in.h:85
 msgid "Belgian (eliminate dead keys)"
 msgstr "Бельгийская (без спец. клавиш (dead keys))"
 
-#: ../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 "Бенгальская"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:90
 msgid "Bengali (Probhat)"
 msgstr "Бенгальская (Probhat)"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:91
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Берберская (Марокко, тифинагская альтернативная фонетическая)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Берберская (Марокко, тифинагская альтернативная)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Берберская (Марокко, тифинагская расширенная фонетическая)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Берберская (Марокко, тифинагская расширенная)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Берберская (Марокко, тифинагская фонетическая)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Берберская (Марокко, тифинагская)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bosnian"
 msgstr "Боснийская"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Боснийская (клавиатура США с боснийскими диграфами)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Боснийская (клавиатура США с боснийскими буквами)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Боснийская (используются боснийские диграфы)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Боснийская (используются кавычки ёлочки как кавычки)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Both Alt keys together"
 msgstr "Обе клавиши Alt, нажатые вместе"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Both Ctrl keys together"
 msgstr "Обе клавиши Ctrl, нажатые вместе"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Both Shift keys together"
 msgstr "Обе клавиши Shift, нажатые вместе"
 
-#: ../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 "Обе клавиши Shift, нажатые вместе, включают Caps Lock, одна клавиша Shift выключает"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Обе клавиши Shift, нажатые вместе, переключают Caps Lock"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Обе клавиши Shift, нажатые вместе, переключают ShiftLock"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:108
 msgid "Braille"
 msgstr "Брайля"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:109
 msgid "Braille (left hand)"
 msgstr "Брайля (под левую руку)"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Braille (right hand)"
 msgstr "Брайля (под правую руку)"
 
-#: ../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 "Болгарская"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Bulgarian (new phonetic)"
 msgstr "Болгарская (новая фонетическая)"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Болгарская (традиционная фонетическая)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:115
 msgid "Burmese"
 msgstr "Бирманская"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:116
 msgid "Canadian Multilingual"
 msgstr "Канадская многоязыковая"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Canadian Multilingual (first part)"
 msgstr "Канадская многоязыковая (первая часть)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "Canadian Multilingual (second part)"
 msgstr "Канадская многоязыковая (вторая часть)"
 
-#: ../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 (выбирается 3-й ряд, защёлкивается при нажатии вместе с другим выборщиком-3-го-ряда)"
 
-#: ../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 (на первую раскладку), Shift+Caps Lock (на последнюю раскладку)"
 
-#: ../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 (пока нажата), Alt+Caps Lock выполняет первоначальную функцию capslock"
 
-#: ../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 действует как Shift с блокировкой. Shift приостанавливает действие 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 действует как Shift с блокировкой. Shift не влияет на Caps Lock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock выключен"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock key behavior"
 msgstr "Поведение клавиши 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 переключает Shift, таким образом что, он действует сразу на все клавиши"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock переключает обычную капитализацию символов алфавита"
 
-#: ../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 включает внутреннюю капитализацию. Shift приостанавливает действие 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 включает внутреннюю капитализацию. Shift не влияет на Caps Lock"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:131
 msgid "Catalan"
 msgstr "Каталонская"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:132
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Каталонская (испанский вариант с точкой в L посередине)"
+
+#: ../rules/base.xml.in.h:133
 msgid "Cherokee"
 msgstr "Черокская"
 
-#: ../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 (альтернативный вариант)"
 
-#: ../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 Linux"
 
-#: ../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 "Китайская"
 
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "Китайская (тибетская с цифрами ASCII)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "Китайская (тибетская)"
-
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "Китайская (уйгурская)"
+msgid "Chuvash"
+msgstr "Чувашия"
 
 #: ../rules/base.xml.in.h:147
+msgid "Chuvash (Latin)"
+msgstr "Чувашская (латиница)"
+
+#: ../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 клавиш)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:152
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 клавиш)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 клавиш)"
 
-#: ../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 "Положение клавиши 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 используется в качестве клавиш Alt, Alt используется в качестве клавиш 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 используется в качестве клавиш Win (и как обычный Control)"
 
-#: ../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 "Крымско-татарская (Dobruja Q)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Крымско-татарская (турецкая Alt-Q)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Крымско-татарская (турецкая F)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Крымско-татарская (турецкая Q)"
+
+#: ../rules/base.xml.in.h:164
 msgid "Croatian"
 msgstr "Хорватская"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:165
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Хорватская (клавиатура США с хорватскими диграфами)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:166
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Хорватская (клавиатура США с хорватскими буквами)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
+#: ../rules/base.xml.in.h:167
+msgid "Croatian (use Croatian digraphs)"
 msgstr "Хорватская (используются хорватские диграфы)"
 
-#: ../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 "Хорватская (используются кавычки ёлочки как кавычки)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Ctrl key position"
 msgstr "Положение клавиши 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 "Чешская"
 
-#: ../rules/base.xml.in.h:166
-msgid "Czech (UCW layout accented letters only)"
-msgstr "Чешская (раскладка UCW (только символы акцентов))"
+#: ../rules/base.xml.in.h:172
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "Чешская (раскладка UCW, только символы акцентов)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Чешская (Дворак США с поддержкой CZ UCW)"
 
-#: ../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:174
 msgid "Czech (qwerty)"
 msgstr "Чешская (qwerty)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:175
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Чешская (qwerty, расширенные функции Backslash)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:176
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Чешская (с клавишей &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 "Датская"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Danish (Dvorak)"
 msgstr "Датская (Дворак)"
 
-#: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
-msgstr "Датская (Mac)"
+#: ../rules/base.xml.in.h:180
+msgid "Danish (Macintosh)"
+msgstr "Датская (Macintosh)"
 
-#: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
+#: ../rules/base.xml.in.h:181
+msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr "Датская (Macintosh, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Danish (eliminate dead keys)"
 msgstr "Датская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "Default numeric keypad keys"
 msgstr "Клавиши цифровой клавиатуры по умолчанию"
 
-#: ../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-клавишный 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"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Ноутбук Dell Precision из серии M"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Dell Latitude series laptop"
 msgstr "Ноутбук 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 "Дивехи"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Diamond 9801 / 9802 series"
 msgstr "Модели Diamond 9801/9802"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dutch"
 msgstr "Голландская"
 
-#: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
-msgstr "Голландская (Mac)"
+#: ../rules/base.xml.in.h:197
+msgid "Dutch (Macintosh)"
+msgstr "Голландская (Macintosh)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dutch (Sun dead keys)"
 msgstr "Голландская (спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dutch (standard)"
 msgstr "Голландская (стандартная)"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dzongkha"
 msgstr "Дзонг-кэ (dz"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Enable extra typographic characters"
 msgstr "Включить дополнительные типографские символы"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
+msgid "English (Cameroon Dvorak)"
+msgstr "Английская (камерунский Дворак)"
+
+#: ../rules/base.xml.in.h:203
+msgid "English (Cameroon qwerty)"
+msgstr "Английская (камерунская qwerty)"
+
+#: ../rules/base.xml.in.h:204
+msgid "English (Cameroon)"
+msgstr "Английская (Камерун)"
+
+#: ../rules/base.xml.in.h:205
 msgid "English (Canada)"
 msgstr "Английская (Канада)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:206
 msgid "English (Colemak)"
 msgstr "Английская (Коулмак)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:207
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Английская (Дворак альтернативная международная (без спец. клавиш))"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:208
 msgid "English (Dvorak international with dead keys)"
 msgstr "Английская (Дворак международная с спец. клавишами)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:209
 msgid "English (Dvorak)"
 msgstr "Английская (Дворак)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:210
 msgid "English (Ghana)"
 msgstr "Английская (Гана)"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:211
 msgid "English (Ghana, GILLBT)"
 msgstr "Английская (Гана, GILLBT)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:212
 msgid "English (Ghana, multilingual)"
 msgstr "Английская (Гана, международная)"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:213
 msgid "English (India, with RupeeSign)"
 msgstr "Английская (Индия, с знаком индийской рупии)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:214
 msgid "English (Macintosh)"
 msgstr "Английская (Macintosh)"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
-msgstr "Английская (Мали, Mac США)"
+#: ../rules/base.xml.in.h:215
+msgid "English (Mali, US Macintosh)"
+msgstr "Английская (Мали, Macintosh США)"
 
-#: ../rules/base.xml.in.h:207
-msgid "English (Mali, USA international)"
+#: ../rules/base.xml.in.h:216
+msgid "English (Mali, US international)"
 msgstr "Английская (Мали, международная США)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:217
 msgid "English (Nigeria)"
 msgstr "Английская (Нигерия)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:218
 msgid "English (South Africa)"
 msgstr "Английская (Южная Африка)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:219
 msgid "English (UK)"
 msgstr "Английская (Великобритания)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:220
 msgid "English (UK, Colemak)"
 msgstr "Английская (Великобритания, Коулмак)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
-msgstr "Английская (Великобритания, Дворак (английская расстановка))"
+#: ../rules/base.xml.in.h:221
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Английская (Великобритания, Дворак с английской пунктуацией)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:222
 msgid "English (UK, Dvorak)"
 msgstr "Английская (Великобритания, Дворак)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
-msgstr "Английская (Великобритания, Mac международная)"
+#: ../rules/base.xml.in.h:223
+msgid "English (UK, Macintosh international)"
+msgstr "Английская (Великобритания, Macintosh международная)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
-msgstr "Английская (Великобритания, Mac)"
+#: ../rules/base.xml.in.h:224
+msgid "English (UK, Macintosh)"
+msgstr "Английская (Великобритания, Macintosh)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
-msgstr "Английская (Великобритания, расширенная, клавиши Win)"
+#: ../rules/base.xml.in.h:225
+msgid "English (UK, extended WinKeys)"
+msgstr "Английская (Великобритания, расширенная клавишами Win)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, international with dead keys)"
 msgstr "Английская (Великобритания, международная с спец. клавишами (dead keys))"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
 msgid "English (US)"
 msgstr "Английская (США)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:228
 msgid "English (US, alternative international)"
 msgstr "Английская (США, альтернативная международная)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:229
 msgid "English (US, international with dead keys)"
 msgstr "Английская (США, международная с спец. клавишами (dead keys))"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:230
 msgid "English (US, with euro on 5)"
 msgstr "Английская (США, международная с символом евро на клавише 5)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:231
 msgid "English (classic Dvorak)"
 msgstr "Английская (классическая Дворак)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:232
 msgid "English (international AltGr dead keys)"
 msgstr "Английская (международная с AltGr и спец. клавишами (dead keys))"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:233
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Английская (переключение раскладки по клавише умножения/деления)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:234
 msgid "English (left handed Dvorak)"
 msgstr "Английская (Дворак под левую руку)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:235
 msgid "English (programmer Dvorak)"
 msgstr "Английская (Дворак для программистов)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:236
 msgid "English (right handed Dvorak)"
 msgstr "Английская (Дворак под правую руку)"
 
-#: ../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 на цифровой клавиатуре"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:239
 msgid "Esperanto"
 msgstr "Эсперанто"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:240
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Эсперанто (Португалия, Nativo)"
+
+#: ../rules/base.xml.in.h:241
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Эсперанто (смещённые точка с запятой и кавычка, устарела)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:242
 msgid "Estonian"
 msgstr "Эстонская"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:243
 msgid "Estonian (Dvorak)"
 msgstr "Эстонская (Дворак)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:244
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Эстонская (клавиатура США с эстонскими буквами)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:245
 msgid "Estonian (eliminate dead keys)"
 msgstr "Эстонская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:246
 msgid "Euro on 2"
 msgstr "Символ евро на клавише 2"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:247
 msgid "Euro on 4"
 msgstr "Символ евро на клавише 4"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:248
 msgid "Euro on 5"
 msgstr "Символ евро на клавише 5"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:249
 msgid "Euro on E"
 msgstr "Символ евро на клавише 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 "Фарерская"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:254
 msgid "Faroese (eliminate dead keys)"
 msgstr "Фарерская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:255
 msgid "Filipino"
 msgstr "Филиппинская"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:256
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Филиппинская (Кэйпвелл-Дворак байбайинcкая)"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:257
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Филиппинская (Кэйпвелл-Дворак латиница)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:258
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Филиппинская (Кэйпвелл-QWERF 2006 байбайинская)"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:259
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Филиппинская (Кэйпвелл-QWERF 2006 латиница)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:260
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Филиппинская (Коулмак байбайинская)"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Colemak Latin)"
 msgstr "Филиппинская (Коулмак латиница)"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:262
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Филиппинская (Дворак байбайинcкая)"
+
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Dvorak Latin)"
 msgstr "Филиппинская (Дворак латиница)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Филиппинская (QWERTY байбайинская)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:265
 msgid "Finnish"
 msgstr "Финская"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
-msgstr "Финская (Mac)"
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
+msgstr "Финская (Macintosh)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:267
 msgid "Finnish (classic)"
 msgstr "Финская (классическая)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:268
 msgid "Finnish (classic, eliminate dead keys)"
 msgstr "Финская (классическая, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:258
-msgid "Finnish (northern Saami)"
-msgstr "Финская (cеверная cаамская)"
-
 #. 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 "Четырёх-рядная клавиша с абстрактными разделителями"
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:272
 msgid "Four-level key with comma"
 msgstr "Четырёх-рядная клавиша с запятой"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:273
 msgid "Four-level key with dot"
 msgstr "Четырёх-рядная клавиша с точкой"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:274
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Четырёх-рядная клавиша с точкой, ограничена latin-9"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:275
 msgid "Four-level key with momayyez"
 msgstr "Четырёх-рядная клавиша с momayyez"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:276
 msgid "French"
 msgstr "Французская"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:277
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Французская (Бепо, эргономичная, похожая на Дворак)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:278
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Французская (Бепо, эргономичная, похожая на Дворак, только latin-9)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:279
 msgid "French (Breton)"
 msgstr "Французская (бретонская)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:280
+msgid "French (Cameroon azerty)"
+msgstr "Французская (камерунская azerty)"
+
+#: ../rules/base.xml.in.h:281
+msgid "French (Cameroon)"
+msgstr "Французская (Камерун)"
+
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "Французская (Канада)"
+
+#: ../rules/base.xml.in.h:283
 msgid "French (Canada, Dvorak)"
 msgstr "Французская (Канада, Дворак)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:284
 msgid "French (Canada, legacy)"
-msgstr "Французская (Канада, унаследованная)"
+msgstr "Французская (Канада, устаревшая)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:285
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Французская (Демократическая республика Конго)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:286
 msgid "French (Dvorak)"
 msgstr "Французская (Дворак)"
 
-#: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
-msgstr "Французская (грузинская AZERTY Tskapo)"
-
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:287
 msgid "French (Guinea)"
 msgstr "Французская (Гвинея)"
 
-#: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
-msgstr "Французская (Mac)"
+#: ../rules/base.xml.in.h:288
+msgid "French (Macintosh)"
+msgstr "Французская (Macintosh)"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:289
 msgid "French (Mali, alternative)"
 msgstr "Французская (Мали, альтернативная)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:290
 msgid "French (Morocco)"
 msgstr "Французская (Марокко)"
 
-#: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
-msgstr "Французская (окситанский язык)"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:291
 msgid "French (Sun dead keys)"
 msgstr "Французская (со спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:292
 msgid "French (Switzerland)"
 msgstr "Французская (Швейцария)"
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
-msgstr "Французская (Швейцария, Mac)"
+#: ../rules/base.xml.in.h:293
+msgid "French (Switzerland, Macintosh)"
+msgstr "Французская (Швейцария, Macintosh)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:294
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Французская (Швейцария, спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:295
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Французская (Швейцария, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:296
 msgid "French (alternative)"
 msgstr "Французская (альтернативная)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:297
 msgid "French (alternative, Sun dead keys)"
 msgstr "Французская (альтернативная, спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:298
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Французская (альтернативная, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:299
 msgid "French (alternative, latin-9 only)"
 msgstr "Французская (альтернативная, только latin-9)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:300
 msgid "French (eliminate dead keys)"
 msgstr "Французская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
-msgstr "Французская (устаревшая альтернативная)"
+#: ../rules/base.xml.in.h:301
+msgid "French (legacy, alternative)"
+msgstr "Французская (устаревшая, альтернативная)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:302
 msgid "French (legacy, alternative, Sun dead keys)"
-msgstr "Французская (устаревшая альтернативная с спец. клавишами (dead keys) Sun)"
+msgstr "Французская (устаревшая, альтернативная, с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:303
 msgid "French (legacy, alternative, eliminate dead keys)"
-msgstr "Французская (устаревшая альтернативная без спец. клавиш (dead keys))"
+msgstr "Французская (устаревшая, альтернативная, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:304
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Ноутбук 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"
+msgstr "Фулайская"
 
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:306
 msgid "Ga"
-msgstr "Ga"
+msgstr "Гайская"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:307
 msgid "Generic 101-key PC"
 msgstr "Обычная 101-клавишная"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:308
 msgid "Generic 102-key (Intl) PC"
 msgstr "Обычная 102-клавишная (межд)"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:309
 msgid "Generic 104-key PC"
 msgstr "Обычная 104-клавишная"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:310
 msgid "Generic 105-key (Intl) PC"
 msgstr "Обычная 105-клавишная (межд)"
 
-#: ../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 "Грузинская"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:317
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Грузинская (Франция, AZERTY Tskapo)"
+
+#: ../rules/base.xml.in.h:318
+msgid "Georgian (Italy)"
+msgstr "Грузинская (Италия)"
+
+#: ../rules/base.xml.in.h:319
 msgid "Georgian (MESS)"
 msgstr "Грузинская (MESS)"
 
-#: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
-msgstr "Грузинская (осетинская)"
-
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:320
 msgid "Georgian (ergonomic)"
 msgstr "Georgian (эргономичная)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:321
 msgid "German"
 msgstr "Немецкая"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:322
 msgid "German (Austria)"
 msgstr "Немецкая (Австрия)"
 
-#: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
-msgstr "Немецкая (Австрия, Mac)"
+#: ../rules/base.xml.in.h:323
+msgid "German (Austria, Macintosh)"
+msgstr "Немецкая (Австрия, Macintosh)"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:324
 msgid "German (Austria, Sun dead keys)"
 msgstr "Немецкая (Австрия, с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:325
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Немецкая (Австрия, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:326
 msgid "German (Dvorak)"
 msgstr "Немецкая (Дворак)"
 
-#: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
-msgstr "Немецкая (Mac)"
+#: ../rules/base.xml.in.h:327
+msgid "German (Macintosh)"
+msgstr "Немецкая (Macintosh)"
 
-#: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
-msgstr "Немецкая (Mac, без спец. клавиш (dead keys))"
+#: ../rules/base.xml.in.h:328
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Немецкая (Macintosh, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:329
 msgid "German (Neo 2)"
 msgstr "Немецкая (Neo 2)"
 
-#: ../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 "Немецкая (румынская клавиатура с немецкими буквами, без спец. клавиш (dead keys))"
-
-#: ../rules/base.xml.in.h:321
+#: ../rules/base.xml.in.h:330
 msgid "German (Sun dead keys)"
 msgstr "Немецкая (со спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
-msgstr "Немецкая (Швейцария, Mac)"
+#: ../rules/base.xml.in.h:331
+msgid "German (Switzerland)"
+msgstr "Немецкая (Швейцария)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
+msgstr "Немецкая (Швейцария, Macintosh)"
+
+#: ../rules/base.xml.in.h:333
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Немецкая (Швейцария, с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:334
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Немецкая (Швейцария, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:335
+msgid "German (Switzerland, legacy)"
+msgstr "Немецкая (Швейцария, устаревшая)"
+
+#: ../rules/base.xml.in.h:336
 msgid "German (dead acute)"
-msgstr "Немецкая (с dead acute)"
+msgstr "Немецкая (с акутом (dead acute))"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:337
 msgid "German (dead grave acute)"
 msgstr "Немецкая (с dead grave acute)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:338
 msgid "German (eliminate dead keys)"
 msgstr "Немецкая (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
-msgstr "Немецкая (нижнелужицкий qwertz)"
-
-#: ../rules/base.xml.in.h:329
-msgid "German (lower Sorbian)"
-msgstr "Немецкая (нижнелужицкий)"
-
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:339
 msgid "German (qwerty)"
 msgstr "Немецкая (qwerty)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:340
 msgid "Greek"
 msgstr "Греческая"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:341
 msgid "Greek (eliminate dead keys)"
 msgstr "Греческая (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:342
 msgid "Greek (extended)"
 msgstr "Греческая (расширенная)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:343
 msgid "Greek (polytonic)"
 msgstr "Греческая (полифоническая)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:344
 msgid "Greek (simple)"
 msgstr "Греческая (простая)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:345
 msgid "Gujarati"
 msgstr "Гуджарати"
 
-#: ../rules/base.xml.in.h:337
+#: ../rules/base.xml.in.h:346
 msgid "Gyration"
 msgstr "Гирашн"
 
-#: ../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 для Mac"
 
-#: ../rules/base.xml.in.h:341
+#: ../rules/base.xml.in.h:350
 msgid "Hausa"
 msgstr "Хауза"
 
-#: ../rules/base.xml.in.h:342
+#: ../rules/base.xml.in.h:351
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: ../rules/base.xml.in.h:343
-msgid "Hebrew (Phonetic)"
-msgstr "Иврит (фонетическая)"
-
-#: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
-msgstr "Иврит (Tiro)"
+#: ../rules/base.xml.in.h:352
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Иврит (библейский, Tiro)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "Hebrew (lyx)"
 msgstr "Иврит (lyx)"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
+msgid "Hebrew (phonetic)"
+msgstr "Иврит (фонетическая)"
+
+#: ../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"
+msgstr "Ноутбук Hewlett-Packard Mini 110"
 
-#: ../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 "Шестнадцатеричная"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:368
 msgid "Hindi (Bolnagri)"
 msgstr "Хинди (Bolnagri)"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:369
 msgid "Hindi (Wx)"
 msgstr "Хинди (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"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:372
 msgid "Hungarian"
 msgstr "Венгерская"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:373
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Венгерская (pc101/qwerty/запятая/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:374
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Венгерская (pc101/qwerty/запятая/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Венгерская (pc101/qwerty/точка/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Венгерская (pc101/qwerty/точка/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Венгерская (101/qwertz/запятая/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Венгерская (101/qwertz/запятая/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Венгерская (101/qwertz/точка/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Венгерская (101/qwertz/точка/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Венгерская (102/qwerty/запятая/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Венгерская (102/qwerty/запятая/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Венгерская (102/qwerty/точка/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Венгерская (102/qwerty/точка/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Венгерская (102/qwertz/запятая/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Венгерская (102/qwertz/запятая/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Венгерская (102/qwertz/точка/спец. клавиши (dead keys))"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Венгерская (102/qwertz/точка/без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Венгерская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (qwerty)"
 msgstr "Венгерская (qwerty)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (standard)"
 msgstr "Венгерская (стандартная)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:392
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper соответствует клавишам 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 "Исландская"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:400
 msgid "Icelandic (Dvorak)"
 msgstr "Исландская (Дворак)"
 
-#: ../rules/base.xml.in.h:392
-msgid "Icelandic (Mac)"
-msgstr "Исландская (Mac)"
+#: ../rules/base.xml.in.h:401
+msgid "Icelandic (Macintosh)"
+msgstr "Исландская (Macintosh)"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic (Sun dead keys)"
 msgstr "Исландская (спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Исландская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:395
+#: ../rules/base.xml.in.h:404
 msgid "Igbo"
 msgstr "Игбо"
 
-#: ../rules/base.xml.in.h:396
+#: ../rules/base.xml.in.h:405
 msgid "Indian"
 msgstr "Индийская"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:406
 msgid "Inuktitut"
 msgstr "Иннуитская"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:407
 msgid "Iraqi"
 msgstr "Иракская"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:408
 msgid "Irish"
 msgstr "Ирландская"
 
-#: ../rules/base.xml.in.h:400
-msgid "Irish (CloGaelach)"
-msgstr "Ирландская (CloGaelach)"
-
-#: ../rules/base.xml.in.h:401
-msgid "Irish (Ogham IS434)"
-msgstr "Ирландская (Огхам IS434)"
-
-#: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
-msgstr "Ирландская (Огхам)"
-
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:409
 msgid "Irish (UnicodeExpert)"
 msgstr "Ирландская (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:410
 msgid "Italian"
 msgstr "Итальянская"
 
-#: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
-msgstr "Итальянская (грузинская)"
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
-msgstr "Итальянская (Mac)"
+#: ../rules/base.xml.in.h:411
+msgid "Italian (Macintosh)"
+msgstr "Итальянская (Macintosh)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:412
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Итальянская (клавиатура США с итальянскими буквами)"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:413
 msgid "Italian (eliminate dead keys)"
 msgstr "Итальянская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:414
 msgid "Japanese"
 msgstr "Японская"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:415
 msgid "Japanese (Kana 86)"
 msgstr "Японская (Кана 86)"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:416
 msgid "Japanese (Kana)"
 msgstr "Японская (Кана)"
 
-#: ../rules/base.xml.in.h:412
-msgid "Japanese (Mac)"
-msgstr "Японская (Mac)"
+#: ../rules/base.xml.in.h:417
+msgid "Japanese (Macintosh)"
+msgstr "Японская (Macintosh)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (OADG 109A)"
 msgstr "Японская (OADG 109A)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (PC-98xx Series)"
 msgstr "Японская (PC-98xx Series)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:420
 msgid "Japanese keyboard options"
 msgstr "Настройки японской клавиатуры"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:421
+msgid "Kalmyk"
+msgstr "Калмыкская"
+
+#: ../rules/base.xml.in.h:422
 msgid "Kana Lock key is locking"
 msgstr "Кана блокируется клавишей Lock"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:423
 msgid "Kannada"
 msgstr "Каннада"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:424
+msgid "Kashubian"
+msgstr "Кашубская"
+
+#: ../rules/base.xml.in.h:425
 msgid "Kazakh"
 msgstr "Казахская"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:426
 msgid "Kazakh (with Russian)"
 msgstr "Казахская (с русским)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:427
 msgid "Key sequence to kill the X server"
 msgstr "Комбинация клавиш для прерывания работы X-сервера"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:428
 msgid "Key to choose 3rd level"
 msgstr "Клавиша для выбора 3-го ряда"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:429
 msgid "Key to choose 5th level"
 msgstr "Клавиша для выбора 5-го ряда"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:430
 msgid "Key(s) to change layout"
 msgstr "Клавиша(и) для смены раскладки"
 
-#: ../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 "Кхмерская (камбоджийская)"
+#: ../rules/base.xml.in.h:432
+msgid "Khmer (Cambodia)"
+msgstr "Кхмерская (Камбоджа)"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:433
 msgid "Kikuyu"
 msgstr "Кикуйу"
 
-#: ../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 "Комякская"
+
+#: ../rules/base.xml.in.h:436
 msgid "Korean"
 msgstr "Корейская"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Korean (101/104 key compatible)"
 msgstr "Корейская (совместимая c 101/104 кнопочной)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Курдская (Иран, арабо-латинская)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Kurdish (Iran, F)"
 msgstr "Курдская (Иран, F)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Курдская (Иран, латинская Alt-Q)"
+
+#: ../rules/base.xml.in.h:441
 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:442
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Курдская (Ирак, арабо-латинская)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iraq, F)"
 msgstr "Курдская (Ирак, F)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Курдская (Ирак, латинская alt-Q)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Курдская (Ирак, латинская Q)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Syria, F)"
 msgstr "Курдская (Сирия, F)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Курдская (Сирия, латинская Alt-Q)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Курдская (Сирия, латинская Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Turkey, F)"
 msgstr "Курдская (Турция, F)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Курдская (Турция, латинская Alt-Q)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 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:452
 msgid "Kyrgyz"
 msgstr "Киргизская"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:453
 msgid "Kyrgyz (phonetic)"
 msgstr "Киргизская (фонетическая)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:454
 msgid "Lao"
 msgstr "Лаосская"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:455
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Лаосская (стандартная раскладка, предложенная STEA)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:456
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Клавиатура ноутбука Compaq (например, Armada)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:457
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "«Интернет-клавиатура» ноутбука Compaq (например, Presario)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:458
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Ноутбук eMachines из серии m68xx"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
 msgid "Latvian"
 msgstr "Латышская"
 
-#: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
-msgstr "Латышская (вариант с апострофом ')"
-
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:460
 msgid "Latvian (F variant)"
 msgstr "Латышская (вариант с F)"
 
-#: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
-msgstr "Латышская (вариант с тильдой ~)"
+#: ../rules/base.xml.in.h:461
+msgid "Latvian (adapted)"
+msgstr "Латышская (адаптированная)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:462
+msgid "Latvian (apostrophe variant)"
+msgstr "Латышская (вариант с апострофом)"
+
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Латышская (эргономичная, ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:464
+msgid "Latvian (modern)"
+msgstr "Латышская (современная)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "Латышская (вариант с тильдой)"
+
+#: ../rules/base.xml.in.h:466
 msgid "Left Alt"
 msgstr "Левая клавиша Alt"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:467
 msgid "Left Alt (while pressed)"
 msgstr "Левая клавиша Alt (пока нажата)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:468
 msgid "Left Alt is swapped with Left Win"
 msgstr "Левая клавиша Alt поменяна местами с левой клавишей Win"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:469
 msgid "Left Ctrl"
 msgstr "Левая клавиша 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 "Левая Ctrl (на первую раскладку), Правая Ctrl (на последнюю раскладку)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:471
 msgid "Left Ctrl+Left Shift"
 msgstr "Левая Ctrl+Левая Shift"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:472
 msgid "Left Shift"
 msgstr "Левая клавиша Shift"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:473
 msgid "Left Win"
 msgstr "Левая клавиша 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 "Левая Win (на первую раскладку), Правая Win/Menu (на последнюю раскладку)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:475
 msgid "Left Win (while pressed)"
 msgstr "Левая клавиша Win (пока нажата)"
 
-#: ../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 выбирается 5-й ряд, блокирует, блокирует при нажатии вместе с другим выборщиком-5-го-ряда"
 
-#: ../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 выбирается 5-й ряд, блокирует, блокирует при нажатии вместе с другим выборщиком-5-го-ряда, однократное нажатие снимает блокировку"
 
-#: ../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+Левая-Win (на первую раскладку), Правая-Ctrl+Menu (на вторую раскладку)"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:479
 msgid "Legacy"
 msgstr "Legacy"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:480
 msgid "Legacy Wang 724"
 msgstr "Старая 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 "Клавиша Legacy с запятой"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:483
 msgid "Legacy key with dot"
 msgstr "Клавиша Legacy с точкой"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
 msgid "Lithuanian"
 msgstr "Литовская"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:485
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Литовская (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:486
 msgid "Lithuanian (LEKP)"
 msgstr "Литовская (LEKP)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:487
 msgid "Lithuanian (LEKPa)"
 msgstr "Литовская (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:488
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr "Литовская (клавиатура США с литовскими буквами)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (standard)"
 msgstr "Литовская (стандартная)"
 
-#: ../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 (альтернативный вариант)"
 
-#: ../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 (альтернативный вариант 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 с помощью службы G15"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech Generic Keyboard"
 
-#: ../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 (модель 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 "Нижнелужицкая"
+
+#: ../rules/base.xml.in.h:515
+msgid "Lower Sorbian (qwertz)"
+msgstr "Нижнелужицкая (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 (межд)"
 
-#: ../rules/base.xml.in.h:506
+#: ../rules/base.xml.in.h:518
 msgid "Macedonian"
 msgstr "Македонская"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:519
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Македонская (без спец. клавиш (dead keys))"
 
-#: ../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"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:522
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Использовать Caps Lock как дополнительную клавишу Backspace"
 
-#: ../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 "Использовать Caps Lock как дополнительную клавишу Control, но сохранить символ клавиши Caps_Lock"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:524
 msgid "Make Caps Lock an additional Ctrl"
 msgstr "Использовать Caps Lock как дополнительную клавишу Ctrl"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:525
 msgid "Make Caps Lock an additional ESC"
 msgstr "Использовать Caps Lock как дополнительную клавишу ESC"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Использовать Caps Lock как дополнительную клавишу Hyper"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Использовать Caps Lock как дополнительную клавишу Num Lock"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional Super"
 msgstr "Использовать Caps Lock как дополнительную клавишу Super"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:529
 msgid "Malayalam"
 msgstr "Малайaлам"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:530
 msgid "Malayalam (Lalitha)"
 msgstr "Малайaламская (лалита)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:531
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Малайaламская (улучшенный Inscript со символом рупии)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:532
 msgid "Maltese"
 msgstr "Мальтийская"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:533
 msgid "Maltese (with US layout)"
 msgstr "Мальтийская (с раскладкой США)"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:534
+msgid "Maori"
+msgstr "Маори"
+
+#: ../rules/base.xml.in.h:535
+msgid "Mari"
+msgstr "Марийская"
+
+#: ../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 соответствует левой клавише Win"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:541
 msgid "Meta is mapped to Win keys"
 msgstr "Meta соответствует клавишам Win"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:542
 msgid "Meta on Left Ctrl"
 msgstr "Meta на левой клавише 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, шведская"
 
-#: ../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 "Разные параметры совместимости"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:556
 msgid "Mongolian"
 msgstr "Монгольская"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:557
 msgid "Montenegrin"
 msgstr "Черногорская"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:558
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Черногорская (кириллица с кавычками ёлочками)"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:559
 msgid "Montenegrin (Cyrillic)"
 msgstr "Черногорская (кириллица)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:560
 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:561
+msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr "Черногорская (латинская юникодная qwerty)"
 
-#: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
+#: ../rules/base.xml.in.h:562
+msgid "Montenegrin (Latin Unicode)"
 msgstr "Черногорская (латинская юникодная)"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:563
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Черногорская (латинская qwerty)"
+
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Черногорская (латинская с кавычками ёлочками)"
 
-#: ../rules/base.xml.in.h:551
-msgid "Māori"
-msgstr "Маорийская"
-
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:565
 msgid "NICOLA-F style Backspace"
 msgstr "Backspace в стиле NICOLA-F"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:566
 msgid "Nepali"
 msgstr "Непальская"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:567
 msgid "Non-breakable space character at fourth level"
 msgstr "Символ неразрывного пробела в четвёртом ряду"
 
-#: ../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 "Символ неразрывного пробела в четвёртом ряду, символ тонкого неразрывного пробела в шестом ряду"
 
-#: ../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 "Символ неразрывного пробела в четвёртом ряду, символ тонкого неразрывного пробела в шестом ряду (с помощью Ctrl+Shift)"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at second level"
 msgstr "Символ неразрывного пробела во втором ряду"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at third level"
 msgstr "Символ неразрывного пробела в третьем ряду"
 
-#: ../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 "Символ неразрывного пробела в третьем ряду, ничего на четвёртом"
 
-#: ../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 "Символ неразрывного пробела в третьем ряду, символ тонкого неразрывного пробела в четвёртом ряду"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:574
+msgid "Northern Saami (Finland)"
+msgstr "Северная Саамская (Финляндия)"
+
+#: ../rules/base.xml.in.h:575
+msgid "Northern Saami (Norway)"
+msgstr "Северная Саамская (Норвегия)"
+
+#: ../rules/base.xml.in.h:576
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Северная Саамская (Норвегия, без спец. клавиш (dead keys))"
+
+#: ../rules/base.xml.in.h:577
+msgid "Northern Saami (Sweden)"
+msgstr "Северная Саамская (Швеция)"
+
+#: ../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 "Норвежская"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:580
 msgid "Norwegian (Dvorak)"
 msgstr "Норвежская (Дворак)"
 
-#: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
-msgstr "Норвежская (Mac)"
-
-#: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
-msgstr "Норвежская (Mac, без спец. клавиш (dead keys))"
+#: ../rules/base.xml.in.h:581
+msgid "Norwegian (Macintosh)"
+msgstr "Норвежская (Macintosh)"
 
-#: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
-msgstr "Норвежская (Северная Саамская)"
+#: ../rules/base.xml.in.h:582
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Норвежская (Macintosh, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:583
 msgid "Norwegian (eliminate dead keys)"
 msgstr "Норвежская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:568
-msgid "Norwegian (northern Saami, eliminate dead keys)"
-msgstr "Норвежская (Северная Саамская, без спец. клавиш (dead keys))"
-
-#: ../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 "Функция клавиши Delete на цифровой клавиатуре"
 
-#: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
-msgstr "Клавиши цифровой клавиатуры работают как в Mac"
+#: ../rules/base.xml.in.h:586
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "Клавиши цифровой клавиатуры работают как в Macintosh"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:587
 msgid "Numeric keypad layout selection"
 msgstr "Выбор раскладки цифровой клавиатуры"
 
-#: ../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 "Окситанский"
+
+#: ../rules/base.xml.in.h:590
+msgid "Ogham"
+msgstr "Огхам"
+
+#: ../rules/base.xml.in.h:591
+msgid "Ogham (IS434)"
+msgstr "Огхам (IS434)"
+
+#: ../rules/base.xml.in.h:592
 msgid "Oriya"
 msgstr "Орийя"
 
-#: ../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"
+msgstr "Клавиатура Ortek MCK-800 MM/Internet"
 
-#: ../rules/base.xml.in.h:576
+#: ../rules/base.xml.in.h:594
+msgid "Ossetian (Georgia)"
+msgstr "Осетинская (Грузия)"
+
+#: ../rules/base.xml.in.h:595
+msgid "Ossetian (WinKeys)"
+msgstr "Осетинская (с клавишами Win)"
+
+#: ../rules/base.xml.in.h:596
+msgid "Ossetian (legacy)"
+msgstr "Осетинская (устаревшая)"
+
+#: ../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 "Паннонская русинская (омофоническая)"
+
+#: ../rules/base.xml.in.h:599
 msgid "Pashto"
 msgstr "Пуштунская"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:600
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Пуштунская (Афганистан, 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 "Персидская"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:603
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Персидская (Афганистан, Dari OLPC)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:604
 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:605 ../rules/base.extras.xml.in.h:24
 msgid "Polish"
 msgstr "Польская"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:606
 msgid "Polish (Dvorak)"
 msgstr "Польская (Дворак)"
 
-#: ../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 "Польская (Дворак, польские кавычки на клавише 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 "Польская (Дворак, польские кавычки на клавишах с кавычками)"
 
-#: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
-msgstr "Польская (кашубская)"
-
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:609
 msgid "Polish (programmer Dvorak)"
 msgstr "Польская (Дворак для программистов)"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:610
 msgid "Polish (qwertz)"
 msgstr "Польская (qwertz)"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:611
 msgid "Portuguese"
 msgstr "Португальская"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:612
 msgid "Portuguese (Brazil)"
 msgstr "Португальская (Бразилия)"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:613
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Португальская (Бразилия, Дворак)"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Португальская (Бразилия, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Португальская (Бразилия, nativo для эсперанто)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Португальская (Бразилия, nativo для клавиатур США)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Португальская (Бразилия, nativo)"
 
-#: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
-msgstr "Португальская (Mac)"
-
-#: ../rules/base.xml.in.h:599
-msgid "Portuguese (Mac, Sun dead keys)"
-msgstr "Португальская (Mac, спец. клавиши (dead keys) Sun)"
+#: ../rules/base.xml.in.h:618
+msgid "Portuguese (Macintosh)"
+msgstr "Португальская (Macintosh)"
 
-#: ../rules/base.xml.in.h:600
-msgid "Portuguese (Mac, eliminate dead keys)"
-msgstr "Португальская (Mac, без спец. клавиш (dead keys))"
+#: ../rules/base.xml.in.h:619
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Португальская (Macintosh, спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr "Португальская (Nativo для эсперанто)"
+#: ../rules/base.xml.in.h:620
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Португальская (Macintosh, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Португальская (Nativo для клавиатур США)"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Nativo)"
 msgstr "Португальская (Nativo)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Sun dead keys)"
 msgstr "Португальская (спец. клавиши (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Португальская (без спец. клавиш (dead keys))"
 
-#: ../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 "Пенджабская (гурмукхи Jhelum)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:628
 msgid "Punjabi (Gurmukhi)"
 msgstr "Пенджабская (гурмукхи)"
 
-#: ../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"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:631
 msgid "Right Alt (while pressed)"
 msgstr "Правая клавиша Alt (пока нажата)"
 
-#: ../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 выбирается 5-й ряд и активируется level5-Lock при нажатии вместе с другим выборщиком-5-го-ряда, однократное нажатие снимает блокировку"
 
-#: ../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 выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда"
 
-#: ../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 выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда, однократное нажатие снимает блокировку"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:635
 msgid "Right Alt key never chooses 3rd level"
 msgstr "По правой клавише Alt никогда не выбирается третий ряд"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Правая клавиша Alt, Shift и правая Alt вместе работают как Multi_Key"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:637
 msgid "Right Ctrl"
 msgstr "Правая клавиша Ctrl"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:638
 msgid "Right Ctrl (while pressed)"
 msgstr "Правая клавиша Ctrl (пока нажата)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:639
 msgid "Right Ctrl as Right Alt"
 msgstr "Правая клавиша Ctrl работает как правая клавиша Alt"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:640
 msgid "Right Ctrl is mapped to Menu"
 msgstr "Правая клавиша Ctrl соответствует клавише Menu"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl+Right Shift"
 msgstr "Правая Ctrl+Правая Shift"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:642
 msgid "Right Shift"
 msgstr "Правая клавиша Shift"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:643
 msgid "Right Win"
 msgstr "Правая клавиша Win"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:644
 msgid "Right Win (while pressed)"
 msgstr "Правая клавиша Win (пока нажата)"
 
-#: ../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 выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда"
 
-#: ../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 выбирается 5-й ряд, блокируется при нажатии вместе с другим выборщиком-5-го-ряда, однократное нажатие снимает блокировку"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
 msgid "Romanian"
 msgstr "Румынская"
 
-#: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr "Румынская (крымско-татарская Dobruca-1 Q)"
-
-#: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr "Румынская (крымско-татарская Dobruca-2 Q)"
-
-#: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Румынская (крымско-татарская турецкая Alt-Q)"
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (Germany)"
+msgstr "Румынская (Германия)"
 
-#: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
-msgstr "Румынская (крымско-татарская турецкая F)"
+#: ../rules/base.xml.in.h:649
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Румынская (Германия, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:650
 msgid "Romanian (WinKeys)"
 msgstr "Румынская (клавиши Win)"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (cedilla)"
 msgstr "Румынская (седиль)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (standard cedilla)"
 msgstr "Румынская (стандартная седиль)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (standard)"
 msgstr "Румынская (стандартная)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:654
 msgid "Rupee on 4"
 msgstr "Символ рупии на клавише 4"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
 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:656
 msgid "Russian (DOS)"
 msgstr "Русская (DOS)"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:657
 msgid "Russian (Georgia)"
 msgstr "Русская (Грузия)"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:658
 msgid "Russian (Germany, phonetic)"
 msgstr "Русская (Германия, фонетическая)"
 
-#: ../rules/base.xml.in.h:645
-msgid "Russian (Kalmyk)"
-msgstr "Русская (калмыцкая)"
-
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:659
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Русская (Казахстан, с казахской)"
 
-#: ../rules/base.xml.in.h:647
-msgid "Russian (Komi)"
-msgstr "Русская (комякская)"
-
-#: ../rules/base.xml.in.h:648
-msgid "Russian (Mari)"
-msgstr "Русская (марийская)"
-
-#: ../rules/base.xml.in.h:649
-msgid "Russian (Ossetian, WinKeys)"
-msgstr "Русская (осетинская, с клавишами Win)"
-
-#: ../rules/base.xml.in.h:650
-msgid "Russian (Ossetian, legacy)"
-msgstr "Русская (осетинская, устаревшая)"
-
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:660
 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:661
 msgid "Russian (Sweden, phonetic)"
 msgstr "Русская (Швеция, фонетическая)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Русская (Швеция, фонетическая, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:655
-msgid "Russian (Tatar)"
-msgstr "Русская (татарская)"
-
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:663
 msgid "Russian (US, phonetic)"
 msgstr "Русская (США, фонетическая)"
 
-#: ../rules/base.xml.in.h:657
-msgid "Russian (Udmurt)"
-msgstr "Русская (удмуртская)"
-
-#: ../rules/base.xml.in.h:658
-msgid "Russian (Yakut)"
-msgstr "Русская (якутская)"
+#: ../rules/base.xml.in.h:664
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Русская (Украина, стандартная RSTU)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:665
 msgid "Russian (legacy)"
 msgstr "Русская (устаревшая)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:666
 msgid "Russian (phonetic WinKeys)"
 msgstr "Русская (фонетическая с клавишами Win)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:667
 msgid "Russian (phonetic)"
 msgstr "Русская (фонетическая)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:668
 msgid "Russian (typewriter)"
 msgstr "Русская (печатная машинка)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:669
 msgid "Russian (typewriter, legacy)"
 msgstr "Русская (печатная машинка, устаревшая)"
 
-#: ../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 "Сайсьят (Тайвань)"
 
-#: ../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 "Точка с запятой в третьем ряду"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
 msgid "Serbian"
 msgstr "Сербская"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Сербская (латинская юникодная qwerty)"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin Unicode)"
 msgstr "Сербская (латинская юникодная)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:686
 msgid "Serbian (Latin qwerty)"
 msgstr "Сербская (латинская qwerty)"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin with guillemets)"
 msgstr "Сербская (латинская с кавычками ёлочками)"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin)"
 msgstr "Сербская (латинская)"
 
-#: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr "Сербская (паннонская русинская омофоническая)"
+#: ../rules/base.xml.in.h:689
+msgid "Serbian (Russia)"
+msgstr "Сербская (Россия)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Сербская (З и Ж переставлены местами)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (with guillemets)"
 msgstr "Сербская (латинская с кавычками ёлочками)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:692
 msgid "Serbo-Croatian (US)"
 msgstr "Сербо-Хорватская (США)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:693
 msgid "Shift cancels Caps Lock"
 msgstr "Shift отменяет 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 не отменяет Num Lock, а выбирает третий ряд"
 
-#: ../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 с клавишами цифровой клавиатуры работают также как в 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 "Синдхи"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:698
 msgid "Sinhala"
 msgstr "Сингальская"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:699
 msgid "Slovak"
 msgstr "Словацкая"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:700
 msgid "Slovak (extended Backslash)"
 msgstr "Словацкая (расширенные функции Backslash)"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:701
 msgid "Slovak (qwerty)"
 msgstr "Словацкая (qwerty)"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:702
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Словацкая (qwerty, расширенные функции Backslash)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Slovene"
+#: ../rules/base.xml.in.h:703
+msgid "Slovenian"
 msgstr "Словенская"
 
-#: ../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 "Словенская (клавиатура США с словенскими буквами)"
 
-#: ../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 "Словенская (используются кавычки ёлочки как кавычки)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:706
 msgid "Spanish"
 msgstr "Испанская"
 
-#: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr "Испанская (астурлеонский вариант с нижними точками у H и L)"
-
-#: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr "Испанская (каталонский вариант с точкой в L посередине)"
-
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Spanish (Dvorak)"
 msgstr "Испанская (Дворак)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Spanish (Latin American)"
 msgstr "Испанская (латиноамериканская)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Испанская (латиноамериканская, с спец. клавишами (dead keys) Sun)"
+
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Испанская (латиноамериканская, без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:711
 msgid "Spanish (Latin American, include dead tilde)"
 msgstr "Испанская (латиноамериканская, с dead tilde)"
 
-#: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, sun dead keys)"
-msgstr "Испанская (латиноамериканская, с спец. клавишами (dead keys) Sun)"
-
-#: ../rules/base.xml.in.h:709
-msgid "Spanish (Mac)"
-msgstr "Испанская (Mac)"
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Macintosh)"
+msgstr "Испанская (Macintosh)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Sun dead keys)"
 msgstr "Испанская (с спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (eliminate dead keys)"
 msgstr "Испанская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (include dead tilde)"
 msgstr "Испанская (с dead tilde)"
 
-#: ../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 "Специальные клавиши (Ctrl+Alt+&lt;клв&gt;) обрабатываются сервером"
 
-#: ../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 "Суахильская (Кения)"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Swahili (Tanzania)"
 msgstr "Суахильская (Танзания)"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Поменять местами клавиши Ctrl и Caps Lock"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swap ESC and Caps Lock"
 msgstr "Поменять местами клавиши ESC и Caps Lock"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swedish"
 msgstr "Шведская"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swedish (Dvorak)"
 msgstr "Шведская (Дворак)"
 
-#: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
-msgstr "Шведская (Mac)"
+#: ../rules/base.xml.in.h:725
+msgid "Swedish (Macintosh)"
+msgstr "Шведская (Macintosh)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish (Svdvorak)"
 msgstr "Шведская (Svdvorak)"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (eliminate dead keys)"
 msgstr "Шведская (без спец. клавиш (dead keys))"
 
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
-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
+msgid "Swedish Sign Language"
+msgstr "Шведский язык жестов"
+
+#: ../rules/base.xml.in.h:729
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (карманный ПК)"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:730
 msgid "Syriac"
 msgstr "Сирийская"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:731
 msgid "Syriac (phonetic)"
 msgstr "Сирийская (фонетическая)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:732
 msgid "Taiwanese"
 msgstr "Тайваньская"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:733
 msgid "Taiwanese (indigenous)"
 msgstr "Тайваньская (туземная)"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:734
 msgid "Tajik"
 msgstr "Таджикская"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:735
 msgid "Tajik (legacy)"
-msgstr "Таджикская (унаследованная)"
+msgstr "Таджикская (устаревшая)"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:736
 msgid "Tamil"
 msgstr "Тамильская"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:737
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Тамильская (Шри-Ланка, печатная машинка TAB)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:738
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Тамильская (Шри-Ланка, юникодная)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:739
 msgid "Tamil (TAB typewriter)"
 msgstr "Тамильская (печатная машинка TAB)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (TSCII typewriter)"
 msgstr "Тамильская (печатная машинка TSCII)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Unicode)"
 msgstr "Тамильская (юникодная)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (keyboard with numerals)"
 msgstr "Тамильская (клавиатура с цифрами)"
 
-#: ../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 "Татарская"
+
+#: ../rules/base.xml.in.h:745
 msgid "Telugu"
 msgstr "Телугская"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
 msgid "Thai"
 msgstr "Тайская"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Тайская (паттачотская)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
 msgid "Thai (TIS-820.2538)"
 msgstr "Тайская (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
+msgid "Tibetan"
+msgstr "Тибетская"
+
+#: ../rules/base.xml.in.h:750
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Тибетская (с цифрами ASCII)"
+
+#: ../rules/base.xml.in.h:751
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "На соответствующую клавишу на клавиатуре Дворак."
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:752
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "На соответствующую клавишу на клавиатуре Qwerty."
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:753
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Переключать PointerKeys с помощью 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 "Тсванская"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:759
 msgid "Turkish"
 msgstr "Турецкая"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:760
 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:761
 msgid "Turkish (F)"
 msgstr "Турецкая (F)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:762
 msgid "Turkish (Sun dead keys)"
 msgstr "Турецкая (со спец. клавишами (dead keys) Sun)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (international with dead keys)"
 msgstr "Турецкая (международная со спец. клавишами)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:764
 msgid "Turkmen"
 msgstr "Туркменская"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:765
 msgid "Turkmen (Alt-Q)"
 msgstr "Туркменская (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)"
 
-#: ../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)"
 
-#: ../rules/base.xml.in.h:770
-msgid "Ukrainian"
-msgstr "Украинская"
-
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Украинская (крымско-татарская турецкая Alt-Q)"
+msgid "Udmurt"
+msgstr "Удмуртская"
 
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "Украинская (крымско-татарская турецкая F)"
+msgid "Ukrainian"
+msgstr "Украинская"
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "Украинская (крымско-татарская турецкая Q)"
-
-#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (WinKeys)"
 msgstr "Украинская (с клавишами Win)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (homophonic)"
 msgstr "Украинская (омофоническая)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (legacy)"
-msgstr "Украинская (унаследованная)"
+msgstr "Украинская (устаревшая)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (phonetic)"
 msgstr "Украинская (фонетическая)"
 
-#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr "Украинская (стандартная RSTU в русской раскладке)"
-
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (standard RSTU)"
 msgstr "Украинская (стандартная RSTU)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (typewriter)"
 msgstr "Украинская (печатная машинка)"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:779
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Дополнения юникода (стрелки и математические операторы)"
 
-#: ../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 "Дополнения юникода (стрелки и математические операторы). Математические операторы в ряду по умолчанию"
 
-#: ../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 "Урдская (Пакистан)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:783
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Урдская (Пакистан, CRULP)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:784
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Урдская (Пакистан, NLA)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (WinKeys)"
 msgstr "Урдcкая (с клавишами Win)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (alternative phonetic)"
 msgstr "Урдская (альтернативная фонетическая)"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (phonetic)"
 msgstr "Урдская (фонетическая)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:788
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Использовать клавиатурные индикаторы для отображения дополнительных раскладок"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:789
 msgid "Using space key to input non-breakable space character"
 msgstr "Клавиша пробела используется для ввода символа неразрывного пробела"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:790
 msgid "Usual space at any level"
 msgstr "Обычный пробел в любом ряду"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "Уйгурская"
+
+#: ../rules/base.xml.in.h:792
 msgid "Uzbek"
 msgstr "Узбекская"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:793
 msgid "Uzbek (Afghanistan)"
 msgstr "Узбекская (Афганистан)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:794
 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
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek (Latin)"
 msgstr "Узбекская (латинская)"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:796
 msgid "Vietnamese"
 msgstr "Вьетнамская"
 
-#: ../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)"
+#: ../rules/base.xml.in.h:798
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Цифровая клавиатура Wang 724 с дополнениями юникода (стрелки и математические операторы)"
 
-#: ../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 с дополнениями юникода (стрелки и математические операторы). Математические операторы в ряду по умолчанию"
 
-#: ../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 "Волофская"
 
-#: ../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 "Якутская"
+
+#: ../rules/base.xml.in.h:804
 msgid "Yoruba"
-msgstr "Йоруба"
+msgstr "Йорубская"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:805
 msgid "Zero-width non-joiner character at second level"
 msgstr "Несвязывающий символ нулевой ширины во втором ряду"
 
-#: ../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 "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду"
 
-#: ../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 "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду, ничего в четвёртом"
 
-#: ../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 "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду, тонкий неразрывный пробел в четвёртом ряду"
 
-#: ../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 "Несвязывающий символ нулевой ширины во втором ряду, символ неразрывного пробела в третьем ряду, связывающий символ нулевой ширины в четвёртом ряду"
 
-#: ../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 "Несвязывающий символ нулевой ширины во втором ряду, связывающий символ нулевой ширины в третьем ряду"
 
-#: ../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 "Несвязывающий символ нулевой ширины во втором ряду, связывающий символ нулевой ширины в третьем ряду, символ неразрывного пробела в четвёртом ряду"
 
-#: ../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 "Несвязывающий символ нулевой ширины в третьем ряду, связывающий символ нулевой ширины в четвёртом ряду"
 
-#: ../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 "Иран"
-
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr "Иран - авестийская"
+msgid "APL Keyboard Symbols"
+msgstr "APL Keyboard Symbols"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "Литва"
+msgid "Atsina"
+msgstr "Атсинская"
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
-msgstr "Литва - Дворак"
+msgid "Avestan"
+msgstr "Авестийская"
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "Ltu"
-
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "Румыния"
+msgid "Couer D'alene Salish"
+msgstr "Салишская кёр-д’ален"
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr "Румыния - эргономичная слепопечатная"
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Английская (США, международная, объединённая с юникодным AltGr)"
 
 #: ../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 "Английская (США, международная, объединённая с юникодным AltGr, альтернативная)"
 
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "Россия"
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
-msgstr "Сербия"
+msgid "Kutenai"
+msgstr "Кутенайская"
 
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
-msgstr "Сербия - объединённые надбуквенные знаки вместе спец. клавиш (dead keys)"
+msgid "Latvian (US Colemak)"
+msgstr "Латышская (Коулмак США)"
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
-msgstr "Srb"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Латышская (Коулмак США, вариант с апострофом)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "США"
+msgid "Latvian (US Dvorak)"
+msgstr "Латышская (Дворак США)"
 
 #: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
-msgstr "США - атсинская"
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Латышская (Дворак США, вариант с Y)"
 
 #: ../rules/base.extras.xml.in.h:17
-msgid "USA - Couer D'alene Salish"
-msgstr "США - салишская кёр-д’ален"
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr "Латышская (Дворак США, вариант с минусом)"
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
-msgstr "США - международная (объединённая с юникодным AltGr)"
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Латышская (Дворак США для программистов)"
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
-msgstr "США - международная (объединённая с юникодным AltGr, альтернативная)"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Латышская (Дворак США для программистов, вариант с Y)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Латышская (Дворак США для программистов, вариант с минусом)"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Литовская (Дворак США с литовскими буквами)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "Польская (международная со спец. клавишами)"
+
+#: ../rules/base.extras.xml.in.h:27
+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:30
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "Сербская (объединённые надбуквенные знаки вместе спец. клавиш (dead keys))"
+
+#: ../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 "Китайская (тибетская)"
+
+#~ msgid "Chinese (Uyghur)"
+#~ msgstr "Китайская (уйгурская)"
+
+#~ msgid "Danish (Mac)"
+#~ msgstr "Датская (Mac)"
+
+#~ msgid "English (UK, Mac)"
+#~ msgstr "Английская (Великобритания, Mac)"
+
+#~ msgid "Finnish (Mac)"
+#~ msgstr "Финская (Mac)"
+
+#~ msgid "Finnish (northern Saami)"
+#~ msgstr "Финская (cеверная cаамская)"
+
+#~ msgid "French (Occitan)"
+#~ msgstr "Французская (окситанский язык)"
+
+#~ 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))"
+
+#~ msgid "Irish (Ogham)"
+#~ msgstr "Ирландская (Огхам)"
+
+#~ msgid "Italian (Georgian)"
+#~ msgstr "Итальянская (грузинская)"
+
+#~ msgid "Kurdish (Iran, latin alt-Q)"
+#~ msgstr "Курдская (Иран, латинская alt-Q)"
+
+#~ msgid "Māori"
+#~ msgstr "Маорийская"
+
+#~ msgid "Norwegian (Northern Saami"
+#~ msgstr "Норвежская (Северная Саамская)"
+
+#~ msgid "Philippines - Dvorak (Baybayin)"
+#~ msgstr "Филиппинская (Дворак, байбайин)"
+
+#~ msgid "Portuguese (Nativo for Esperanto)"
+#~ msgstr "Португальская (Nativo для эсперанто)"
+
+#~ msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
+#~ msgstr "Румынская (крымско-татарская Dobruca-2 Q)"
+
+#~ msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Румынская (крымско-татарская турецкая Alt-Q)"
+
+#~ msgid "Romanian (Crimean Tatar Turkish F)"
+#~ msgstr "Румынская (крымско-татарская турецкая F)"
+
+#~ msgid "Russian (Chuvash)"
+#~ msgstr "Русская (чувашская)"
+
+#~ msgid "Russian (Kalmyk)"
+#~ msgstr "Русская (калмыцкая)"
+
+#~ msgid "Russian (Komi)"
+#~ msgstr "Русская (комякская)"
+
+#~ msgid "Russian (Mari)"
+#~ msgstr "Русская (марийская)"
+
+#~ msgid "Russian (Ossetian, legacy)"
+#~ msgstr "Русская (осетинская, устаревшая)"
+
+#~ msgid "Russian (Serbian)"
+#~ msgstr "Русская (сербская)"
+
+#~ msgid "Russian (Tatar)"
+#~ msgstr "Русская (татарская)"
+
+#~ msgid "Russian (Udmurt)"
+#~ msgstr "Русская (удмуртская)"
+
+#~ msgid "Russian (Yakut)"
+#~ msgstr "Русская (якутская)"
+
+#~ msgid "Spanish (Mac)"
+#~ msgstr "Испанская (Mac)"
+
+#~ msgid "Swedish (northern Saami)"
+#~ msgstr "Шведская (Северная Саамская)"
+
+#~ 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 "Ukrainian (standard RSTU on Russian layout)"
+#~ msgstr "Украинская (стандартная RSTU в русской раскладке)"
+
+#~ msgid "irq"
+#~ msgstr "irq"
+
+#~ msgid "srp"
+#~ msgstr "srp"
+
+#~ msgid "twn"
+#~ msgstr "twn"
+
+#~ msgid "APL"
+#~ msgstr "APL"
+
+#~ msgid "Iran"
+#~ msgstr "Иран"
+
+#~ msgid "Lithuania"
+#~ msgstr "Литва"
+
+#~ msgid "Lithuania - Dvorak"
+#~ msgstr "Литва - Дворак"
+
+#~ 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 "США"
 
 #~ msgid "(F)"
 #~ msgstr "(F)"
@@ -3842,9 +4002,6 @@ msgstr "США - международная (объединённая с юни�
 #~ msgid "Chn"
 #~ msgstr "Chn"
 
-#~ msgid "Chuvash"
-#~ msgstr "Чувашия"
-
 #~ msgid "Classic"
 #~ msgstr "Классическая"
 
@@ -4004,9 +4161,6 @@ msgstr "США - международная (объединённая с юни�
 #~ msgid "Mao"
 #~ msgstr "Mao"
 
-#~ msgid "Maori"
-#~ msgstr "Маори"
-
 #~ msgid "Mkd"
 #~ msgstr "Mkd"
 
@@ -4055,12 +4209,6 @@ msgstr "США - международная (объединённая с юни�
 #~ msgid "OLPC Southern Uzbek"
 #~ msgstr "Южно-узбекский OLPC"
 
-#~ msgid "Occitan"
-#~ msgstr "Окситанский"
-
-#~ msgid "Ogham"
-#~ msgstr "Огхам"
-
 #~ msgid "Ossetian"
 #~ msgstr "Осетинская"
 
@@ -4118,15 +4266,9 @@ msgstr "США - международная (объединённая с юни�
 #~ msgid "Syria"
 #~ msgstr "Сирия"
 
-#~ msgid "Tatar"
-#~ msgstr "Татарская"
-
 #~ msgid "Tha"
 #~ msgstr "Tha"
 
-#~ msgid "Tibetan"
-#~ msgstr "Тибетская"
-
 #~ msgid "Tifinagh"
 #~ msgstr "Тифинагская"
 
@@ -4139,9 +4281,6 @@ msgstr "США - международная (объединённая с юни�
 #~ msgid "Tza"
 #~ msgstr "Tza"
 
-#~ msgid "Udmurt"
-#~ msgstr "Удмуртская"
-
 #~ msgid "Ukr"
 #~ msgstr "Ukr"
 
diff --git a/xorg-server/xkeyboard-config/po/sv.po b/xorg-server/xkeyboard-config/po/sv.po
index 1c85a6889..cd1eb5151 100644
--- a/xorg-server/xkeyboard-config/po/sv.po
+++ b/xorg-server/xkeyboard-config/po/sv.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: xkeyboard-config 2.1.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-27 23:35+0100\n"
+"PO-Revision-Date: 2011-04-04 18:56+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -19,23 +19,23 @@ msgstr ""
 
 #: ../rules/base.xml.in.h:1
 msgid "&lt;Less/Greater&gt;"
-msgstr "&lt;Mindre än/Större än&gt;"
+msgstr "‹Mindre än/Större än›"
 
 #: ../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;Mindre än/Större än&gt; (väljer tredje nivån, låses när nedtryckt tillsammans med annan 3rd-level-chooser)"
+msgstr "‹Mindre än/Större än› (väljer tredje nivån, låses när nedtryckt tillsammans med annan tredjenivåväljare)"
 
 #: ../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;Mindre än/Större än&gt; väljer femte nivån och aktiverar level5-Lock när nedtryckt tillsammans med en annan 5th-level-chooser, ett tryck släpper på låset"
+msgstr "‹Mindre än/Större än› väljer femte nivån och aktiverar level5-Lock när nedtryckt tillsammans med en annan femtenivåväljare, ett tryck släpper på låset"
 
 #: ../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;Mindre än/Större än&gt; väljer femte nivån, låses när nedtryckt tillsammans med en annan 5th-level-chooser"
+msgstr "‹Mindre än/Större än› väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare"
 
 #: ../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;Mindre än/Större än&gt; väljer femte nivån, låses när nedtryckt tillsammans med en annan 5th-level-chooser, ett tryck släpper på låset"
+msgstr "‹Mindre än/Större än› väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare, ett tryck släpper på låset"
 
 #: ../rules/base.xml.in.h:6
 msgid "A4Tech KB-21"
@@ -259,7 +259,7 @@ msgstr "Azerbajdzjansk"
 
 #: ../rules/base.xml.in.h:61
 msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 trådlöst internettangentbord"
 
 #: ../rules/base.xml.in.h:62
 msgid "BTC 5090"
@@ -303,7 +303,7 @@ msgstr "Omvänt snedstreck"
 
 #: ../rules/base.xml.in.h:72
 msgid "Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr "Omvänt snedstreck väljer tredje nivån, låses när nedtryckt tillsammans med en annan 3rd-level-chooser)"
+msgstr "Omvänt snedstreck väljer tredje nivån, låses när nedtryckt tillsammans med en annan tredjenivåväljare)"
 
 #: ../rules/base.xml.in.h:73
 msgid "Bambara"
@@ -475,7 +475,7 @@ msgstr "Burmesisk"
 
 #: ../rules/base.xml.in.h:115
 msgid "Canadian Multilingual"
-msgstr "Kanadensisk (flerspråkig)"
+msgstr "Kanadensisk flerspråkig"
 
 #: ../rules/base.xml.in.h:116
 msgid "Canadian Multilingual (first part)"
@@ -491,7 +491,7 @@ msgstr "Caps Lock"
 
 #: ../rules/base.xml.in.h:119
 msgid "Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)"
-msgstr "Caps Lock (väljer tredje nivån, låses när nedtryckt tillsammans med en annan 3rd-level-chooser)"
+msgstr "Caps Lock (väljer tredje nivån, låses när nedtryckt tillsammans med en annan tredjenivåväljare)"
 
 #: ../rules/base.xml.in.h:120
 msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
@@ -635,7 +635,7 @@ msgstr "Control + Alt + Backsteg"
 
 #: ../rules/base.xml.in.h:155
 msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
-msgstr "Control är mappad till Win-tangenterna, Alt-tangenten är mappad till Win-tangenterna"
+msgstr "Control är mappad till Alt-tangenterna, Alt-tangenten är mappad till Win-tangenterna"
 
 #: ../rules/base.xml.in.h:156
 msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
@@ -687,7 +687,7 @@ msgstr "Tjeckisk (US Dvorak med CZ UCW-stöd)"
 
 #: ../rules/base.xml.in.h:168
 msgid "Czech (With &lt;\\|&gt; key)"
-msgstr "Tjeckisk (Med &lt;\\|&gt;-tangent)"
+msgstr "Tjeckisk (Med ‹\\|›-tangent)"
 
 #: ../rules/base.xml.in.h:169
 msgid "Czech (qwerty)"
@@ -831,7 +831,7 @@ msgstr "Engelsk (Ghana, flerspråkig)"
 
 #: ../rules/base.xml.in.h:204
 msgid "English (India, with RupeeSign)"
-msgstr "Engelsk (Indien, med RupeeSign)"
+msgstr "Engelsk (Indien, med rupietecken)"
 
 #: ../rules/base.xml.in.h:205
 msgid "English (Macintosh)"
@@ -1874,11 +1874,11 @@ msgstr "Vänster Win-tangent (då den trycks ned)"
 
 #: ../rules/base.xml.in.h:466
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Vänster Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan 5th-level-chooser"
+msgstr "Vänster Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare"
 
 #: ../rules/base.xml.in.h:467
 msgid "Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "Vänster Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan 5th-level-chooser, ett tryck släpper på låset"
+msgstr "Vänster Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare, ett tryck släpper på låset"
 
 #: ../rules/base.xml.in.h:468
 msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
@@ -2460,15 +2460,15 @@ msgstr "Höger Alt-tangent (då den trycks ned)"
 
 #: ../rules/base.xml.in.h:613
 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öger Alt-tangent väljer femte nivån och aktiverar level5-Lock när nedtryckt tillsammans med en annan 5th-level-chooser, ett tryck släpper på låset"
+msgstr "Höger Alt-tangent väljer femte nivån och aktiverar level5-Lock när nedtryckt tillsammans med en annan femtenivåväljare, ett tryck släpper på låset"
 
 #: ../rules/base.xml.in.h:614
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Höger Alt-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan 5th-level-chooser"
+msgstr "Höger Alt-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare"
 
 #: ../rules/base.xml.in.h:615
 msgid "Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "Höger Alt-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan 5th-level-chooser, ett tryck släpper på låset"
+msgstr "Höger Alt-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare, ett tryck släpper på låset"
 
 #: ../rules/base.xml.in.h:616
 msgid "Right Alt key never chooses 3rd level"
@@ -2512,11 +2512,11 @@ msgstr "Höger Win-tangent (då den trycks ned)"
 
 #: ../rules/base.xml.in.h:626
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"
-msgstr "Höger Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan 5th-level-chooser"
+msgstr "Höger Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare"
 
 #: ../rules/base.xml.in.h:627
 msgid "Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr "Höger Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan 5th-level-chooser, ett tryck släpper på låset"
+msgstr "Höger Win-tangent väljer femte nivån, låses när nedtryckt tillsammans med en annan femtenivåväljare, ett tryck släpper på låset"
 
 #: ../rules/base.xml.in.h:628
 msgid "Romanian"
@@ -2860,7 +2860,7 @@ msgstr "Spansk (Inkludera dött tilde-tecken)"
 
 #: ../rules/base.xml.in.h:713
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr "Specialtangenter (Ctrl+Alt+&lt;tangent&gt;) hanteras i en server"
+msgstr "Specialtangenter (Ctrl+Alt+‹tangent›) hanteras i en server"
 
 #: ../rules/base.xml.in.h:714
 msgid "Sun Type 5/6"
diff --git a/xorg-server/xkeyboard-config/po/uk.po b/xorg-server/xkeyboard-config/po/uk.po
index 0074e32f3..e096c382c 100644
--- a/xorg-server/xkeyboard-config/po/uk.po
+++ b/xorg-server/xkeyboard-config/po/uk.po
@@ -7,13 +7,14 @@
 # Andriy Rysin <arysin@bcsii.com>, 2007, 2008.
 # Andriy Rysin <arysin@gmail.com>, 2008.
 # Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2011.
+# Yuri Chornoivan <yurchor@ukr.net>, 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 19:48+0300\n"
-"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
+"POT-Creation-Date: 2011-05-17 21:08+0100\n"
+"PO-Revision-Date: 2011-05-19 14:56+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
@@ -91,153 +92,153 @@ msgid "Advance Scorpius KI"
 msgstr "Advance 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 - клавіші 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+Пробіл"
 
-#: ../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"
 
-#: ../rules/base.xml.in.h:31
+#: ../rules/base.xml.in.h:30
 msgid "Any Win key"
 msgstr "Будь-яка клавіша Win"
 
-#: ../rules/base.xml.in.h:32
+#: ../rules/base.xml.in.h:31
 msgid "Any Win key (while pressed)"
 msgstr "Будь-яка клавіша Win (на час натискання)"
 
-#: ../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 (ANSI)"
 
-#: ../rules/base.xml.in.h:35
+#: ../rules/base.xml.in.h:34
 msgid "Apple Aluminium Keyboard (ISO)"
 msgstr "Клавіатура Apple Aluminium (ISO)"
 
-#: ../rules/base.xml.in.h:36
+#: ../rules/base.xml.in.h:35
 msgid "Apple Aluminium Keyboard (JIS)"
 msgstr "Клавіатура Apple Aluminium (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 (емуляція клавіш ПК: Print, Scroll Lock, Pause, Num Lock)"
 
-#: ../rules/base.xml.in.h:38
+#: ../rules/base.xml.in.h:37
 msgid "Apple Laptop"
 msgstr "Ноутбук Apple"
 
-#: ../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 "Арабська (Бакволтера)"
 
-#: ../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
 msgid "Armenian (alternative eastern)"
 msgstr "Вірменська (альтернативна східна)"
 
-#: ../rules/base.xml.in.h:51
+#: ../rules/base.xml.in.h:50 ../rules/base.extras.xml.in.h:3
 msgid "Armenian (alternative phonetic)"
 msgstr "Вірменська (альтернативна фонетична)"
 
-#: ../rules/base.xml.in.h:52
+#: ../rules/base.xml.in.h:51
 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
 msgid "Armenian (western)"
 msgstr "Вірменська (західна)"
 
+#: ../rules/base.xml.in.h:54
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Астурійська (Іспанія, з H та L з нижньою крапкою)"
+
 #: ../rules/base.xml.in.h:55
 msgid "Asus Laptop"
 msgstr "Ноутбук Asus"
@@ -255,13 +256,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
 msgid "Azona RF2300 wireless Internet Keyboard"
 msgstr "Azona RF2300 бездротова Інтернет-клавіатура"
@@ -307,7 +308,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 "Зворотна похила риска, «/» (вибирає 3-ій рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 3-го рівня)"
 
 #: ../rules/base.xml.in.h:73
@@ -315,3444 +316,3601 @@ 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
+#: ../rules/base.xml.in.h:77
 msgid "Belarusian (legacy)"
 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 "Бельгійська (модель Wang 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 "Бельгійська (альтернативна, лише latin-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 "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 "Бенгальська"
 
-#: ../rules/base.xml.in.h:89
+#: ../rules/base.xml.in.h:90
 msgid "Bengali (Probhat)"
 msgstr "Бенгальська (пробхат)"
 
-#: ../rules/base.xml.in.h:90
+#: ../rules/base.xml.in.h:91
 msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr "Берберська (Марокко, тифінаг, альтернативна фонетична)"
 
-#: ../rules/base.xml.in.h:91
+#: ../rules/base.xml.in.h:92
 msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr "Берберська (Марокко, тифінаг, альтернативна)"
 
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:93
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr "Берберська (Марокко, тифінаг, розширена фонетична)"
 
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:94
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr "Берберська (Марокко, тифінаг, розширена)"
 
-#: ../rules/base.xml.in.h:94
+#: ../rules/base.xml.in.h:95
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr "Берберська (Марокко, тифінаг, фонетична)"
 
-#: ../rules/base.xml.in.h:95
+#: ../rules/base.xml.in.h:96
 msgid "Berber (Morocco, Tifinagh)"
 msgstr "Берберська (Марокко, давньолівійська)"
 
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:97
 msgid "Bosnian"
 msgstr "Боснійська"
 
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:98
 msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr "Боснійська (клавіатура США з боснійськими диграфами)"
 
-#: ../rules/base.xml.in.h:98
+#: ../rules/base.xml.in.h:99
 msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr "Боснійська (клавіатура США з боснійськими літерами)"
 
-#: ../rules/base.xml.in.h:99
+#: ../rules/base.xml.in.h:100
 msgid "Bosnian (use Bosnian digraphs)"
 msgstr "Боснійська (з боснійськими диграфами)"
 
-#: ../rules/base.xml.in.h:100
+#: ../rules/base.xml.in.h:101
 msgid "Bosnian (use guillemets for quotes)"
 msgstr "Боснійська (кутові лапки)"
 
-#: ../rules/base.xml.in.h:101
+#: ../rules/base.xml.in.h:102
 msgid "Both Alt keys together"
 msgstr "Обидві клавіші Alt разом"
 
-#: ../rules/base.xml.in.h:102
+#: ../rules/base.xml.in.h:103
 msgid "Both Ctrl keys together"
 msgstr "Обидві клавіші Ctrl разом"
 
-#: ../rules/base.xml.in.h:103
+#: ../rules/base.xml.in.h:104
 msgid "Both Shift keys together"
 msgstr "Обидві клавіші Shift разом"
 
-#: ../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 "Натискання обох клавіш Shift вмикають Caps Lock, одна клавіша Shift — вимикає"
 
-#: ../rules/base.xml.in.h:105
+#: ../rules/base.xml.in.h:106
 msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr "Обидві клавіші Shift разом перемикають стан Caps Lock"
 
-#: ../rules/base.xml.in.h:106
+#: ../rules/base.xml.in.h:107
 msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr "Обидві клавіші Shift разом перемикають стан Shift"
 
-#: ../rules/base.xml.in.h:107
+#: ../rules/base.xml.in.h:108
 msgid "Braille"
 msgstr "Брайля"
 
-#: ../rules/base.xml.in.h:108
+#: ../rules/base.xml.in.h:109
 msgid "Braille (left hand)"
 msgstr "Брайля (для шульги)"
 
-#: ../rules/base.xml.in.h:109
+#: ../rules/base.xml.in.h:110
 msgid "Braille (right hand)"
 msgstr "Брайль (для правші)"
 
-#: ../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 "Болгарська"
 
-#: ../rules/base.xml.in.h:112
+#: ../rules/base.xml.in.h:113
 msgid "Bulgarian (new phonetic)"
 msgstr "Болгарська (нова фонетична)"
 
-#: ../rules/base.xml.in.h:113
+#: ../rules/base.xml.in.h:114
 msgid "Bulgarian (traditional phonetic)"
 msgstr "Болгарська (традиційна фонетична)"
 
-#: ../rules/base.xml.in.h:114
+#: ../rules/base.xml.in.h:115
 msgid "Burmese"
 msgstr "Бірманська"
 
-#: ../rules/base.xml.in.h:115
+#: ../rules/base.xml.in.h:116
 msgid "Canadian Multilingual"
 msgstr "Канадська (багатомовна)"
 
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:117
 msgid "Canadian Multilingual (first part)"
 msgstr "Канадська (багатомовна, перша частина)"
 
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:118
 msgid "Canadian Multilingual (second part)"
 msgstr "Канадська (багатомовна, друга частина)"
 
-#: ../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 (вибирає 3-ій рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 3-го рівня)"
 
-#: ../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 (на першу розкладку), Shift+Caps Lock (на останню розкладку)"
 
-#: ../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 (поки натиснена), Alt+Caps Lock виконує оригінальну функцію capslock"
 
-#: ../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 дія як Shift з блокуванням. Shift призупиняє дію 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 діє як Shift з блокуванням. Shift не впливає на Caps Lock"
 
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:125
 msgid "Caps Lock is disabled"
 msgstr "Caps Lock вимкнено"
 
-#: ../rules/base.xml.in.h:125
+#: ../rules/base.xml.in.h:126
 msgid "Caps Lock key behavior"
 msgstr "Поведінка клавіші 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 вмикає Shift, таким чином, він діє одразу на всі клавіші"
 
-#: ../rules/base.xml.in.h:127
+#: ../rules/base.xml.in.h:128
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr "Caps Lock вмикає звичайну капіталізацію символів алфавіту"
 
-#: ../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 вмикає внутрішню капіталізацію. Shift призупиняє дію 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 вмикає внутрішню капіталізацію. Shift не впливає на Caps Lock"
 
-#: ../rules/base.xml.in.h:130
+#: ../rules/base.xml.in.h:131
 msgid "Catalan"
 msgstr "Каталонська"
 
-#: ../rules/base.xml.in.h:131
+#: ../rules/base.xml.in.h:132
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Іспанська (Іспанія, варіант з L із середньою точкою)"
+
+#: ../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 (альтернативний варіант)"
 
-#: ../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"
 
-#: ../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 "Китайська"
 
-#: ../rules/base.xml.in.h:144
-msgid "Chinese (Tibetan with ASCII numerals)"
-msgstr "Китайська (тибетська з ASCII числами)"
-
-#: ../rules/base.xml.in.h:145
-msgid "Chinese (Tibetan)"
-msgstr "Китайська (тибетська)"
-
 #: ../rules/base.xml.in.h:146
-msgid "Chinese (Uyghur)"
-msgstr "Китайська (уйгурська)"
+msgid "Chuvash"
+msgstr "Чуваська"
 
 #: ../rules/base.xml.in.h:147
+msgid "Chuvash (Latin)"
+msgstr "Чуваська (латиниця)"
+
+#: ../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 "Гаельський шрифт"
+
+#: ../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 клавіш)"
 
-#: ../rules/base.xml.in.h:150
+#: ../rules/base.xml.in.h:152
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 клавіш)"
 
-#: ../rules/base.xml.in.h:151
+#: ../rules/base.xml.in.h:153
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 клавіш)"
 
-#: ../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 "Розташування клавіші 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 використовується як клавіші Alt, Alt використовується як 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 використовується як Win (і як звичайний Control)"
 
-#: ../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 "Кримськотатарська (Dobruja Q)"
+
+#: ../rules/base.xml.in.h:161
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Кримськотатарська (турецька Alt-Q)"
+
+#: ../rules/base.xml.in.h:162
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Кримськотатарська (турецька F)"
+
+#: ../rules/base.xml.in.h:163
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Кримськотатарська (турецька Q)"
+
+#: ../rules/base.xml.in.h:164
 msgid "Croatian"
 msgstr "Хорватська"
 
-#: ../rules/base.xml.in.h:159
+#: ../rules/base.xml.in.h:165
 msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr "Хорватська (клавіатура США з хорватськими диграфами)"
 
-#: ../rules/base.xml.in.h:160
+#: ../rules/base.xml.in.h:166
 msgid "Croatian (US keyboard with Croatian letters)"
 msgstr "Хорватська (клавіатура США з хорватськими літерами)"
 
-#: ../rules/base.xml.in.h:161
-msgid "Croatian (Use Croatian digraphs)"
+#: ../rules/base.xml.in.h:167
+msgid "Croatian (use Croatian digraphs)"
 msgstr "Хорватська (з хорватськими диграфами)"
 
-#: ../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 "Хорватська (кутові лапки)"
 
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:169
 msgid "Ctrl key position"
 msgstr "Розташування клавіші 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 "Чеська"
 
-#: ../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 "Чеська (UCW-розкладка, лише літери з акцентами)"
 
-#: ../rules/base.xml.in.h:167
+#: ../rules/base.xml.in.h:173
 msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr "Чеська (Дворак-США з підтримкою CZ UCW)"
 
-#: ../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:174
 msgid "Czech (qwerty)"
 msgstr "Чеська (qwerty)"
 
-#: ../rules/base.xml.in.h:170
+#: ../rules/base.xml.in.h:175
 msgid "Czech (qwerty, extended Backslash)"
 msgstr "Чеська (qwerty, розширені функції Backslash)"
 
-#: ../rules/base.xml.in.h:171
+#: ../rules/base.xml.in.h:176
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Чеська (з клавішею &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 "Данська"
 
-#: ../rules/base.xml.in.h:173
+#: ../rules/base.xml.in.h:179
 msgid "Danish (Dvorak)"
 msgstr "Данська (Дворака)"
 
-#: ../rules/base.xml.in.h:174
-msgid "Danish (Mac)"
-msgstr "Данська (Mac)"
+#: ../rules/base.xml.in.h:180
+msgid "Danish (Macintosh)"
+msgstr "Данська (Macintosh)"
 
-#: ../rules/base.xml.in.h:175
-msgid "Danish (Mac, eliminate dead keys)"
-msgstr "Данська (Mac, вимкнути сліпі клавіші)"
+#: ../rules/base.xml.in.h:181
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Данська (Macintosh, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:176
+#: ../rules/base.xml.in.h:182
 msgid "Danish (eliminate dead keys)"
 msgstr "Данська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:177
+#: ../rules/base.xml.in.h:183
 msgid "Default numeric keypad keys"
 msgstr "Типові клавіші цифрової клавіатури"
 
-#: ../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-клавішна для ПК"
 
-#: ../rules/base.xml.in.h:180
+#: ../rules/base.xml.in.h:186
 msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 msgstr "Dell, ноутбуки Inspiron 6xxx/8xxx"
 
-#: ../rules/base.xml.in.h:181
+#: ../rules/base.xml.in.h:187
 msgid "Dell Laptop/notebook Precision M series"
 msgstr "Dell, ноутбуки Precision M"
 
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:188
 msgid "Dell Latitude series laptop"
 msgstr "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 "Мальдивська"
 
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:195
 msgid "Diamond 9801 / 9802 series"
 msgstr "Моделі Diamond 9801/9802"
 
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:196
 msgid "Dutch"
 msgstr "Голландська"
 
-#: ../rules/base.xml.in.h:191
-msgid "Dutch (Mac)"
-msgstr "Голландська (Mac)"
+#: ../rules/base.xml.in.h:197
+msgid "Dutch (Macintosh)"
+msgstr "Голландська (Macintosh)"
 
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:198
 msgid "Dutch (Sun dead keys)"
 msgstr "Голландська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:199
 msgid "Dutch (standard)"
 msgstr "Голландська (стандартна)"
 
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:200
 msgid "Dzongkha"
 msgstr "Дзонг-ке"
 
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:201
 msgid "Enable extra typographic characters"
 msgstr "Увімкнути додаткові типографські символи"
 
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:202
+msgid "English (Cameroon Dvorak)"
+msgstr "Англійська (камерунський Дворак)"
+
+#: ../rules/base.xml.in.h:203
+msgid "English (Cameroon qwerty)"
+msgstr "Англійська (камерунський qwerty)"
+
+#: ../rules/base.xml.in.h:204
+msgid "English (Cameroon)"
+msgstr "Англійська (Камерун)"
+
+#: ../rules/base.xml.in.h:205
 msgid "English (Canada)"
 msgstr "Англійська (Канада)"
 
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:206
 msgid "English (Colemak)"
 msgstr "Англійська (Коулмак)"
 
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:207
 msgid "English (Dvorak alternative international no dead keys)"
 msgstr "Англійська (альтернативна інтернаціональна Дворака без сліпих клавіш)"
 
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:208
 msgid "English (Dvorak international with dead keys)"
 msgstr "Англійська (інтернаціональна Дворака зі сліпими клавішами)"
 
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:209
 msgid "English (Dvorak)"
 msgstr "Англійська (Дворак)"
 
-#: ../rules/base.xml.in.h:201
+#: ../rules/base.xml.in.h:210
 msgid "English (Ghana)"
 msgstr "Англійська (Гана)"
 
-#: ../rules/base.xml.in.h:202
+#: ../rules/base.xml.in.h:211
 msgid "English (Ghana, GILLBT)"
 msgstr "Англійська (Гана, GILLBT)"
 
-#: ../rules/base.xml.in.h:203
+#: ../rules/base.xml.in.h:212
 msgid "English (Ghana, multilingual)"
 msgstr "Англійська (Гана, інтернаціональна)"
 
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:213
 msgid "English (India, with RupeeSign)"
 msgstr "Англійська (Індія, з підтримкою символу рупії)"
 
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:214
 msgid "English (Macintosh)"
 msgstr "Англійська (Macintosh)"
 
-#: ../rules/base.xml.in.h:206
-msgid "English (Mali, USA Mac)"
-msgstr "Англійська (Малі, Mac США)"
+#: ../rules/base.xml.in.h:215
+msgid "English (Mali, US Macintosh)"
+msgstr "Англійська (Малі, Macintosh США)"
 
-#: ../rules/base.xml.in.h:207
-msgid "English (Mali, USA international)"
+#: ../rules/base.xml.in.h:216
+msgid "English (Mali, US international)"
 msgstr "Англійська (Малі, інтернаціональна США)"
 
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:217
 msgid "English (Nigeria)"
 msgstr "Англійська (Нігерія)"
 
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:218
 msgid "English (South Africa)"
 msgstr "Англійська (ПАР)"
 
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:219
 msgid "English (UK)"
 msgstr "Англійська (Великобританія)"
 
-#: ../rules/base.xml.in.h:211
+#: ../rules/base.xml.in.h:220
 msgid "English (UK, Colemak)"
 msgstr "Англійська (США, Коулмак)"
 
-#: ../rules/base.xml.in.h:212
-msgid "English (UK, Dvorak UK punctuation)"
+#: ../rules/base.xml.in.h:221
+msgid "English (UK, Dvorak with UK punctuation)"
 msgstr "Англійська (Великобританія, Дворак з британською пунктуацією)"
 
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:222
 msgid "English (UK, Dvorak)"
 msgstr "Англійська (Великобританія, Дворак)"
 
-#: ../rules/base.xml.in.h:214
-msgid "English (UK, Mac international)"
-msgstr "Англійська (Великобританія, інтернаціональна Mac)"
+#: ../rules/base.xml.in.h:223
+msgid "English (UK, Macintosh international)"
+msgstr "Англійська (Великобританія, інтернаціональна Macintosh)"
 
-#: ../rules/base.xml.in.h:215
-msgid "English (UK, Mac)"
-msgstr "Англійська (Великобританія, Mac)"
+#: ../rules/base.xml.in.h:224
+msgid "English (UK, Macintosh)"
+msgstr "Англійська (Великобританія, Macintosh)"
 
-#: ../rules/base.xml.in.h:216
-msgid "English (UK, extended, WinKeys)"
+#: ../rules/base.xml.in.h:225
+msgid "English (UK, extended WinKeys)"
 msgstr "Англійська (Великобританія, розширена, з клавішами Win)"
 
-#: ../rules/base.xml.in.h:217
+#: ../rules/base.xml.in.h:226
 msgid "English (UK, international with dead keys)"
 msgstr "Англійська (Великобританія, інтернаціональна зі сліпими клавішами)"
 
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:7
 msgid "English (US)"
 msgstr "Англійська (США)"
 
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:228
 msgid "English (US, alternative international)"
 msgstr "Англійська (США, альтернативна інтернаціональна)"
 
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:229
 msgid "English (US, international with dead keys)"
 msgstr "Англійська (США, інтернаціональна зі сліпими клавішами)"
 
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:230
 msgid "English (US, with euro on 5)"
 msgstr "Англійська (США, з символом євро на клавіші 5)"
 
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:231
 msgid "English (classic Dvorak)"
 msgstr "Англійська (класична Дворака)"
 
-#: ../rules/base.xml.in.h:223
+#: ../rules/base.xml.in.h:232
 msgid "English (international AltGr dead keys)"
 msgstr "Англійська (інтернаціональна зі сліпими клавішами AltGr)"
 
-#: ../rules/base.xml.in.h:224
+#: ../rules/base.xml.in.h:233
 msgid "English (layout toggle on multiply/divide key)"
 msgstr "Англійська (перемикання розкладки клавішею «помножити/ділити»)"
 
-#: ../rules/base.xml.in.h:225
+#: ../rules/base.xml.in.h:234
 msgid "English (left handed Dvorak)"
 msgstr "Англійська (Дворака для шульги)"
 
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:235
 msgid "English (programmer Dvorak)"
 msgstr "Англійська (програмістський Дворак)"
 
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:236
 msgid "English (right handed Dvorak)"
 msgstr "Англійська (Дворак для правші)"
 
-#: ../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 на цифровій клавіатурі"
 
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:239
 msgid "Esperanto"
 msgstr "Есперанто"
 
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:240
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Есперанто (португальська, Nativo)"
+
+#: ../rules/base.xml.in.h:241
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr "Есперанто (посунута крапка з комою та лапки, застаріла)"
 
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:242
 msgid "Estonian"
 msgstr "Естонська"
 
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:243
 msgid "Estonian (Dvorak)"
 msgstr "Естонська (Дворака)"
 
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:244
 msgid "Estonian (US keyboard with Estonian letters)"
 msgstr "Естонська (клавіатура США з естонськими літерами)"
 
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:245
 msgid "Estonian (eliminate dead keys)"
 msgstr "Естонська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:236
+#: ../rules/base.xml.in.h:246
 msgid "Euro on 2"
 msgstr "Євро на 2"
 
-#: ../rules/base.xml.in.h:237
+#: ../rules/base.xml.in.h:247
 msgid "Euro on 4"
 msgstr "Євро на 4"
 
-#: ../rules/base.xml.in.h:238
+#: ../rules/base.xml.in.h:248
 msgid "Euro on 5"
 msgstr "Євро на 5"
 
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:249
 msgid "Euro on E"
 msgstr "Євро на 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 "Фарерська"
 
-#: ../rules/base.xml.in.h:244
+#: ../rules/base.xml.in.h:254
 msgid "Faroese (eliminate dead keys)"
 msgstr "Фарерська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:245
+#: ../rules/base.xml.in.h:255
 msgid "Filipino"
 msgstr "Філіппінська"
 
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:256
 msgid "Filipino (Capewell-Dvorak Baybayin)"
 msgstr "Філіппінська (Кейпвелл-Дворак, байбаїн)"
 
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:257
 msgid "Filipino (Capewell-Dvorak Latin)"
 msgstr "Філіппінська (Кейпвелл-Дворак, латиниця)"
 
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:258
 msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
 msgstr "Філіппінська (Кейпвелл-QWERF 2006, байбаїн)"
 
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:259
 msgid "Filipino (Capewell-QWERF 2006 Latin)"
 msgstr "Філіппінська (Кейпвелл-QWERF 2006, латиниця)"
 
-#: ../rules/base.xml.in.h:250
+#: ../rules/base.xml.in.h:260
 msgid "Filipino (Colemak Baybayin)"
 msgstr "Філіппінська (Коулмак, байбаїн)"
 
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:261
 msgid "Filipino (Colemak Latin)"
 msgstr "Філіппінська (Коулмак, латиниця)"
 
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:262
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Філіппінська (Дворат, байбаїн)"
+
+#: ../rules/base.xml.in.h:263
 msgid "Filipino (Dvorak Latin)"
 msgstr "Філіппінська (Дворак, латиниця)"
 
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:264
 msgid "Filipino (QWERTY Baybayin)"
 msgstr "Філіппінська (QWERTY, байбаїн)"
 
-#: ../rules/base.xml.in.h:254
+#: ../rules/base.xml.in.h:265
 msgid "Finnish"
 msgstr "Фінська"
 
-#: ../rules/base.xml.in.h:255
-msgid "Finnish (Mac)"
-msgstr "Фінська (Mac)"
+#: ../rules/base.xml.in.h:266
+msgid "Finnish (Macintosh)"
+msgstr "Фінська (Macintosh)"
 
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:267
 msgid "Finnish (classic)"
 msgstr "Фінська (класична)"
 
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:268
 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:271
 msgid "Four-level key with abstract separators"
 msgstr "Клавіша четвертого рівня з абстрактним розділювачем "
 
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:272
 msgid "Four-level key with comma"
 msgstr "Клавіша четвертого рівня з комою"
 
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:273
 msgid "Four-level key with dot"
 msgstr "Клавіша четвертого рівня з крапкою"
 
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:274
 msgid "Four-level key with dot, latin-9 restriction"
 msgstr "Клавіша четвертого рівня з крапкою, обмежена latin-9"
 
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:275
 msgid "Four-level key with momayyez"
 msgstr "Клавіша четвертого рівня з momayyez"
 
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:276
 msgid "French"
 msgstr "Французька"
 
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:277
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr "Французька (Bepo, ергономічна, варіант Дворак)"
 
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:278
 msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr "Французька (Bepo, ергономічна, варіант Дворак, лише latin-9)"
 
-#: ../rules/base.xml.in.h:269
+#: ../rules/base.xml.in.h:279
 msgid "French (Breton)"
 msgstr "Французька (бретонська)"
 
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:280
+msgid "French (Cameroon azerty)"
+msgstr "Французька (камерунська azerty)"
+
+#: ../rules/base.xml.in.h:281
+msgid "French (Cameroon)"
+msgstr "Французька (Камерун)"
+
+#: ../rules/base.xml.in.h:282 ../rules/base.extras.xml.in.h:10
+msgid "French (Canada)"
+msgstr "Французька (Канада)"
+
+#: ../rules/base.xml.in.h:283
 msgid "French (Canada, Dvorak)"
 msgstr "Французька (Канада, Дворак)"
 
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:284
 msgid "French (Canada, legacy)"
 msgstr "Французька (Канада, застаріла)"
 
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:285
 msgid "French (Democratic Republic of the Congo)"
 msgstr "Французька (Демократична республіка Конго)"
 
-#: ../rules/base.xml.in.h:273
+#: ../rules/base.xml.in.h:286
 msgid "French (Dvorak)"
 msgstr "Французька (Дворак)"
 
-#: ../rules/base.xml.in.h:274
-msgid "French (Georgian AZERTY Tskapo)"
-msgstr "Французька (грузинська AZERTY Tskapo)"
-
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:287
 msgid "French (Guinea)"
 msgstr "Французька (Гвінея)"
 
-#: ../rules/base.xml.in.h:276
-msgid "French (Mac)"
-msgstr "Французька (Mac)"
+#: ../rules/base.xml.in.h:288
+msgid "French (Macintosh)"
+msgstr "Французька (Macintosh)"
 
-#: ../rules/base.xml.in.h:277
+#: ../rules/base.xml.in.h:289
 msgid "French (Mali, alternative)"
 msgstr "Французька (Малі, альтернативна)"
 
-#: ../rules/base.xml.in.h:278
+#: ../rules/base.xml.in.h:290
 msgid "French (Morocco)"
 msgstr "Французька (Марокко)"
 
-#: ../rules/base.xml.in.h:279
-msgid "French (Occitan)"
-msgstr "Французька (окситанська)"
-
-#: ../rules/base.xml.in.h:280
+#: ../rules/base.xml.in.h:291
 msgid "French (Sun dead keys)"
 msgstr "Французька (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:292
 msgid "French (Switzerland)"
 msgstr "Французька (Швейцарія)"
 
-#: ../rules/base.xml.in.h:282
-msgid "French (Switzerland, Mac)"
-msgstr "Французька (Швейцарія, Mac)"
+#: ../rules/base.xml.in.h:293
+msgid "French (Switzerland, Macintosh)"
+msgstr "Французька (Швейцарія, Macintosh)"
 
-#: ../rules/base.xml.in.h:283
+#: ../rules/base.xml.in.h:294
 msgid "French (Switzerland, Sun dead keys)"
 msgstr "Французька (Швейцарія, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:284
+#: ../rules/base.xml.in.h:295
 msgid "French (Switzerland, eliminate dead keys)"
 msgstr "Французька (Швейцарія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:285
+#: ../rules/base.xml.in.h:296
 msgid "French (alternative)"
 msgstr "Французька (альтернативна)"
 
-#: ../rules/base.xml.in.h:286
+#: ../rules/base.xml.in.h:297
 msgid "French (alternative, Sun dead keys)"
 msgstr "Французька (альтернативна, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:298
 msgid "French (alternative, eliminate dead keys)"
 msgstr "Французька (альтернативна, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:299
 msgid "French (alternative, latin-9 only)"
 msgstr "Французька (альтернативна, лише latin-9)"
 
-#: ../rules/base.xml.in.h:289
+#: ../rules/base.xml.in.h:300
 msgid "French (eliminate dead keys)"
 msgstr "Французька (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:290
-msgid "French (legacy alternative)"
-msgstr "Французька (застаріла альтернативна)"
+#: ../rules/base.xml.in.h:301
+msgid "French (legacy, alternative)"
+msgstr "Французька (застаріла, альтернативна)"
 
-#: ../rules/base.xml.in.h:291
+#: ../rules/base.xml.in.h:302
 msgid "French (legacy, alternative, Sun dead keys)"
 msgstr "Французька (застаріла, альтернативна, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:292
+#: ../rules/base.xml.in.h:303
 msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr "Французька (застаріла, альтернативна, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:293
+#: ../rules/base.xml.in.h:304
 msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr "Ноутбук Fujitsu-Siemens Computers AMILO"
 
-#: ../rules/base.xml.in.h:294
+#: ../rules/base.xml.in.h:305
 msgid "Fula"
 msgstr "Фула"
 
-#: ../rules/base.xml.in.h:295
-msgid "GBr"
-msgstr "Брит"
-
-#: ../rules/base.xml.in.h:296
+#: ../rules/base.xml.in.h:306
 msgid "Ga"
 msgstr "Га"
 
-#: ../rules/base.xml.in.h:297
+#: ../rules/base.xml.in.h:307
 msgid "Generic 101-key PC"
 msgstr "Звичайна 101-клавішна для ПК"
 
-#: ../rules/base.xml.in.h:298
+#: ../rules/base.xml.in.h:308
 msgid "Generic 102-key (Intl) PC"
 msgstr "Звичайна 102-клавішна для ПК"
 
-#: ../rules/base.xml.in.h:299
+#: ../rules/base.xml.in.h:309
 msgid "Generic 104-key PC"
 msgstr "Звичайна 104-клавішна для ПК"
 
-#: ../rules/base.xml.in.h:300
+#: ../rules/base.xml.in.h:310
 msgid "Generic 105-key (Intl) PC"
 msgstr "Звичайна 105-клавішна для ПК"
 
-#: ../rules/base.xml.in.h:301
+#: ../rules/base.xml.in.h:311
 msgid "Genius Comfy KB-12e"
 msgstr "Genius Comfy KB-21e"
 
-#: ../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 "Грузинська"
 
-#: ../rules/base.xml.in.h:307
+#: ../rules/base.xml.in.h:317
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Грузинська (Франція, AZERTY Tskapo)"
+
+#: ../rules/base.xml.in.h:318
+msgid "Georgian (Italy)"
+msgstr "Грузинська (Італія)"
+
+#: ../rules/base.xml.in.h:319
 msgid "Georgian (MESS)"
 msgstr "Грузинська (MESS)"
 
-#: ../rules/base.xml.in.h:308
-msgid "Georgian (Ossetian)"
-msgstr "Грузинська (осетинська)"
-
-#: ../rules/base.xml.in.h:309
+#: ../rules/base.xml.in.h:320
 msgid "Georgian (ergonomic)"
 msgstr "Грузинська (ергономічна)"
 
-#: ../rules/base.xml.in.h:310
+#: ../rules/base.xml.in.h:321
 msgid "German"
 msgstr "Німецька"
 
-#: ../rules/base.xml.in.h:311
+#: ../rules/base.xml.in.h:322
 msgid "German (Austria)"
 msgstr "Німецька (Австрія)"
 
-#: ../rules/base.xml.in.h:312
-msgid "German (Austria, Mac)"
-msgstr "Німецька (Австрія, Mac)"
+#: ../rules/base.xml.in.h:323
+msgid "German (Austria, Macintosh)"
+msgstr "Німецька (Австрія, Macintosh)"
 
-#: ../rules/base.xml.in.h:313
+#: ../rules/base.xml.in.h:324
 msgid "German (Austria, Sun dead keys)"
 msgstr "Німецька (Австрія, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:314
+#: ../rules/base.xml.in.h:325
 msgid "German (Austria, eliminate dead keys)"
 msgstr "Німецька (Австрія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:315
+#: ../rules/base.xml.in.h:326
 msgid "German (Dvorak)"
 msgstr "Німецька (Дворак)"
 
-#: ../rules/base.xml.in.h:316
-msgid "German (Mac)"
-msgstr "Німецька (Mac)"
+#: ../rules/base.xml.in.h:327
+msgid "German (Macintosh)"
+msgstr "Німецька (Macintosh)"
 
-#: ../rules/base.xml.in.h:317
-msgid "German (Mac, eliminate dead keys)"
-msgstr "Німецька (Mac, вимкнути сліпі клавіші)"
+#: ../rules/base.xml.in.h:328
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Німецька (Macintosh, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:318
+#: ../rules/base.xml.in.h:329
 msgid "German (Neo 2)"
 msgstr "Німецька (Neo 2)"
 
-#: ../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:330
 msgid "German (Sun dead keys)"
 msgstr "Німецька (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:322
-msgid "German (Switzerland, Mac)"
-msgstr "Німецька (Швейцарія, Mac)"
+#: ../rules/base.xml.in.h:331
+msgid "German (Switzerland)"
+msgstr "Німецька (Швейцарія)"
 
-#: ../rules/base.xml.in.h:323
+#: ../rules/base.xml.in.h:332
+msgid "German (Switzerland, Macintosh)"
+msgstr "Німецька (Швейцарія, Macintosh)"
+
+#: ../rules/base.xml.in.h:333
 msgid "German (Switzerland, Sun dead keys)"
 msgstr "Німецька (Швейцарія, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:324
+#: ../rules/base.xml.in.h:334
 msgid "German (Switzerland, eliminate dead keys)"
 msgstr "Німецька (Швейцарія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:325
+#: ../rules/base.xml.in.h:335
+msgid "German (Switzerland, legacy)"
+msgstr "Німецька (Швейцарія, застаріла)"
+
+#: ../rules/base.xml.in.h:336
 msgid "German (dead acute)"
 msgstr "Німецька (сліпий акут)"
 
-#: ../rules/base.xml.in.h:326
+#: ../rules/base.xml.in.h:337
 msgid "German (dead grave acute)"
 msgstr "Німецька (сліпий наголос-акут)"
 
-#: ../rules/base.xml.in.h:327
+#: ../rules/base.xml.in.h:338
 msgid "German (eliminate dead keys)"
 msgstr "Німецька (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:328
-msgid "German (lower Sorbian qwertz)"
-msgstr "Німецька (нижньолужицька, qwertz)"
-
-#: ../rules/base.xml.in.h:329
-msgid "German (lower Sorbian)"
-msgstr "Німецька (нижньолужицька)"
-
-#: ../rules/base.xml.in.h:330
+#: ../rules/base.xml.in.h:339
 msgid "German (qwerty)"
 msgstr "Німецька (qwerty)"
 
-#: ../rules/base.xml.in.h:331
+#: ../rules/base.xml.in.h:340
 msgid "Greek"
 msgstr "Грецька"
 
-#: ../rules/base.xml.in.h:332
+#: ../rules/base.xml.in.h:341
 msgid "Greek (eliminate dead keys)"
 msgstr "Грецька (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:333
+#: ../rules/base.xml.in.h:342
 msgid "Greek (extended)"
 msgstr "Грецька (розширена)"
 
-#: ../rules/base.xml.in.h:334
+#: ../rules/base.xml.in.h:343
 msgid "Greek (polytonic)"
 msgstr "Грецька (поліфонічна)"
 
-#: ../rules/base.xml.in.h:335
+#: ../rules/base.xml.in.h:344
 msgid "Greek (simple)"
 msgstr "Грецька (проста)"
 
-#: ../rules/base.xml.in.h:336
+#: ../rules/base.xml.in.h:345
 msgid "Gujarati"
 msgstr "Гуджараті"
 
-#: ../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 для 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 "Іврит"
 
-#: ../rules/base.xml.in.h:343
-msgid "Hebrew (Phonetic)"
-msgstr "Іврит (фонетична)"
-
-#: ../rules/base.xml.in.h:344
-msgid "Hebrew (Tiro)"
-msgstr "Іврит (Tiro)"
+#: ../rules/base.xml.in.h:352
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Іврит (Біблейська, Tiro)"
 
-#: ../rules/base.xml.in.h:345
+#: ../rules/base.xml.in.h:353
 msgid "Hebrew (lyx)"
 msgstr "Іврит (lyx)"
 
-#: ../rules/base.xml.in.h:346
+#: ../rules/base.xml.in.h:354
+msgid "Hebrew (phonetic)"
+msgstr "Іврит (фонетична)"
+
+#: ../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 "Шістнадцяткова"
 
-#: ../rules/base.xml.in.h:359
+#: ../rules/base.xml.in.h:368
 msgid "Hindi (Bolnagri)"
 msgstr "Хінді (болнагрі)"
 
-#: ../rules/base.xml.in.h:360
+#: ../rules/base.xml.in.h:369
 msgid "Hindi (Wx)"
 msgstr "Хінді (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"
 
-#: ../rules/base.xml.in.h:363
+#: ../rules/base.xml.in.h:372
 msgid "Hungarian"
 msgstr "Угорська"
 
-#: ../rules/base.xml.in.h:364
+#: ../rules/base.xml.in.h:373
 msgid "Hungarian (101/qwerty/comma/dead keys)"
 msgstr "Угорська (101/qwerty/кома/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:365
+#: ../rules/base.xml.in.h:374
 msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
 msgstr "Угорська (101/qwerty/кома/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:366
+#: ../rules/base.xml.in.h:375
 msgid "Hungarian (101/qwerty/dot/dead keys)"
 msgstr "Угорська (101/qwerty/крапка/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:367
+#: ../rules/base.xml.in.h:376
 msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
 msgstr "Угорська (101/qwerty/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:368
+#: ../rules/base.xml.in.h:377
 msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr "Угорська (101/qwertz/кома/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:369
+#: ../rules/base.xml.in.h:378
 msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
 msgstr "Угорська (101/qwertz/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:370
+#: ../rules/base.xml.in.h:379
 msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr "Угорська (101/qwertz/крапка/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:371
+#: ../rules/base.xml.in.h:380
 msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
 msgstr "Угорська (101/qwertz/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:372
+#: ../rules/base.xml.in.h:381
 msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr "Угорська (102/qwerty/кома/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:382
 msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr "Угорська (102/qwerty/кома/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:374
+#: ../rules/base.xml.in.h:383
 msgid "Hungarian (102/qwerty/dot/dead keys)"
 msgstr "Угорська (102/qwerty/крапка/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:375
+#: ../rules/base.xml.in.h:384
 msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr "Угорська (102/qwerty/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:376
+#: ../rules/base.xml.in.h:385
 msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr "Угорська (102/qwertz/кома/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:377
+#: ../rules/base.xml.in.h:386
 msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr "Угорська (102/qwertz/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:378
+#: ../rules/base.xml.in.h:387
 msgid "Hungarian (102/qwertz/dot/dead keys)"
 msgstr "Угорська (102/qwertz/крапка/сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:388
 msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
 msgstr "Угорська (102/qwertz/крапка/вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:389
 msgid "Hungarian (eliminate dead keys)"
 msgstr "Угорська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:381
+#: ../rules/base.xml.in.h:390
 msgid "Hungarian (qwerty)"
 msgstr "Угорська (qwerty)"
 
-#: ../rules/base.xml.in.h:382
+#: ../rules/base.xml.in.h:391
 msgid "Hungarian (standard)"
 msgstr "Угорська (стандартна)"
 
-#: ../rules/base.xml.in.h:383
+#: ../rules/base.xml.in.h:392
 msgid "Hyper is mapped to Win-keys"
 msgstr "Hyper відповідає клавішам 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 "Ісландська"
 
-#: ../rules/base.xml.in.h:391
+#: ../rules/base.xml.in.h:400
 msgid "Icelandic (Dvorak)"
 msgstr "Ісландська (Дворак)"
 
-#: ../rules/base.xml.in.h:392
-msgid "Icelandic (Mac)"
-msgstr "Ісландська (Mac)"
+#: ../rules/base.xml.in.h:401
+msgid "Icelandic (Macintosh)"
+msgstr "Ісландська (Macintosh)"
 
-#: ../rules/base.xml.in.h:393
+#: ../rules/base.xml.in.h:402
 msgid "Icelandic (Sun dead keys)"
 msgstr "Ісландська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:394
+#: ../rules/base.xml.in.h:403
 msgid "Icelandic (eliminate dead keys)"
 msgstr "Ісландська (вимкнути сліпі клавіші)"
 
-#: ../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 "Індійська"
 
-#: ../rules/base.xml.in.h:397
+#: ../rules/base.xml.in.h:406
 msgid "Inuktitut"
 msgstr "Інуктитут"
 
-#: ../rules/base.xml.in.h:398
+#: ../rules/base.xml.in.h:407
 msgid "Iraqi"
 msgstr "Іракська"
 
-#: ../rules/base.xml.in.h:399
+#: ../rules/base.xml.in.h:408
 msgid "Irish"
 msgstr "Ірландська"
 
-#: ../rules/base.xml.in.h:400
-msgid "Irish (CloGaelach)"
-msgstr "Ірландська (гаельський шрифт)"
-
-#: ../rules/base.xml.in.h:401
-msgid "Irish (Ogham IS434)"
-msgstr "Ірландська (огам IS434)"
-
-#: ../rules/base.xml.in.h:402
-msgid "Irish (Ogham)"
-msgstr "Ірландська (огам)"
-
-#: ../rules/base.xml.in.h:403
+#: ../rules/base.xml.in.h:409
 msgid "Irish (UnicodeExpert)"
 msgstr "Ірландська (UnicodeExpert)"
 
-#: ../rules/base.xml.in.h:404
+#: ../rules/base.xml.in.h:410
 msgid "Italian"
 msgstr "Італійська"
 
-#: ../rules/base.xml.in.h:405
-msgid "Italian (Georgian)"
-msgstr "Італійська (грузинська)"
-
-#: ../rules/base.xml.in.h:406
-msgid "Italian (Mac)"
-msgstr "Італійська (Mac)"
+#: ../rules/base.xml.in.h:411
+msgid "Italian (Macintosh)"
+msgstr "Італійська (Macintosh)"
 
-#: ../rules/base.xml.in.h:407
+#: ../rules/base.xml.in.h:412
 msgid "Italian (US keyboard with Italian letters)"
 msgstr "Італійська (клавіатура США з італійськими літерами)"
 
-#: ../rules/base.xml.in.h:408
+#: ../rules/base.xml.in.h:413
 msgid "Italian (eliminate dead keys)"
 msgstr "Італійська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:409
+#: ../rules/base.xml.in.h:414
 msgid "Japanese"
 msgstr "Японська"
 
-#: ../rules/base.xml.in.h:410
+#: ../rules/base.xml.in.h:415
 msgid "Japanese (Kana 86)"
 msgstr "Японська (кана 86)"
 
-#: ../rules/base.xml.in.h:411
+#: ../rules/base.xml.in.h:416
 msgid "Japanese (Kana)"
 msgstr "Японська (кана)"
 
-#: ../rules/base.xml.in.h:412
-msgid "Japanese (Mac)"
-msgstr "Японська (Mac)"
+#: ../rules/base.xml.in.h:417
+msgid "Japanese (Macintosh)"
+msgstr "Японська (Macintosh)"
 
-#: ../rules/base.xml.in.h:413
+#: ../rules/base.xml.in.h:418
 msgid "Japanese (OADG 109A)"
 msgstr "Японська (OADG 109A)"
 
-#: ../rules/base.xml.in.h:414
+#: ../rules/base.xml.in.h:419
 msgid "Japanese (PC-98xx Series)"
 msgstr "Японська (родина PC-98xx)"
 
-#: ../rules/base.xml.in.h:415
+#: ../rules/base.xml.in.h:420
 msgid "Japanese keyboard options"
 msgstr "Параметри японської клавіатури"
 
-#: ../rules/base.xml.in.h:416
+#: ../rules/base.xml.in.h:421
+msgid "Kalmyk"
+msgstr "Калмицька"
+
+#: ../rules/base.xml.in.h:422
 msgid "Kana Lock key is locking"
 msgstr "Клавіша Kana Lock фіксується"
 
-#: ../rules/base.xml.in.h:417
+#: ../rules/base.xml.in.h:423
 msgid "Kannada"
 msgstr "Канадська"
 
-#: ../rules/base.xml.in.h:418
+#: ../rules/base.xml.in.h:424
+msgid "Kashubian"
+msgstr "Кашубська"
+
+#: ../rules/base.xml.in.h:425
 msgid "Kazakh"
 msgstr "Казахська"
 
-#: ../rules/base.xml.in.h:419
+#: ../rules/base.xml.in.h:426
 msgid "Kazakh (with Russian)"
 msgstr "Казахська (з російськими)"
 
-#: ../rules/base.xml.in.h:420
+#: ../rules/base.xml.in.h:427
 msgid "Key sequence to kill the X server"
 msgstr "Комбінація клавіш для переривання роботи X-сервера"
 
-#: ../rules/base.xml.in.h:421
+#: ../rules/base.xml.in.h:428
 msgid "Key to choose 3rd level"
 msgstr "Клавіша для вибору 3-го ряду"
 
-#: ../rules/base.xml.in.h:422
+#: ../rules/base.xml.in.h:429
 msgid "Key to choose 5th level"
 msgstr "Клавіша для вибору 5-го ряду"
 
-#: ../rules/base.xml.in.h:423
+#: ../rules/base.xml.in.h:430
 msgid "Key(s) to change layout"
 msgstr "Клавіші для зміни розкладки"
 
-#: ../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 "Кхмерська (камбоджійська)"
+#: ../rules/base.xml.in.h:432
+msgid "Khmer (Cambodia)"
+msgstr "Кхмерська (Камбоджа)"
 
-#: ../rules/base.xml.in.h:426
+#: ../rules/base.xml.in.h:433
 msgid "Kikuyu"
 msgstr "Кікуйю"
 
-#: ../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 "Комі"
+
+#: ../rules/base.xml.in.h:436
 msgid "Korean"
 msgstr "Корейська"
 
-#: ../rules/base.xml.in.h:429
+#: ../rules/base.xml.in.h:437
 msgid "Korean (101/104 key compatible)"
 msgstr "Корейська (сумісна з 101/104 клавішною)"
 
-#: ../rules/base.xml.in.h:430
+#: ../rules/base.xml.in.h:438
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "Курдська (Іран, арабсько-латинська)"
 
-#: ../rules/base.xml.in.h:431
+#: ../rules/base.xml.in.h:439
 msgid "Kurdish (Iran, F)"
 msgstr "Курдська (Іран, F)"
 
-#: ../rules/base.xml.in.h:432
+#: ../rules/base.xml.in.h:440
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Курдська (Іран, латиниця Alt-Q)"
+
+#: ../rules/base.xml.in.h:441
 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:442
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "Курдська (Ірак, арабсько-латинська)"
 
-#: ../rules/base.xml.in.h:435
+#: ../rules/base.xml.in.h:443
 msgid "Kurdish (Iraq, F)"
 msgstr "Курдська (Ірак, F)"
 
-#: ../rules/base.xml.in.h:436
+#: ../rules/base.xml.in.h:444
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "Курдська (Ірак, латиниця Alt-Q)"
 
-#: ../rules/base.xml.in.h:437
+#: ../rules/base.xml.in.h:445
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "Курдська (Ірак, латиниця Q)"
 
-#: ../rules/base.xml.in.h:438
+#: ../rules/base.xml.in.h:446
 msgid "Kurdish (Syria, F)"
 msgstr "Курдська (Сирія, F)"
 
-#: ../rules/base.xml.in.h:439
+#: ../rules/base.xml.in.h:447
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "Курдська (Сирія, латиниця Alt-Q)"
 
-#: ../rules/base.xml.in.h:440
+#: ../rules/base.xml.in.h:448
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "Курдська (Сирія, латиниця Q)"
 
-#: ../rules/base.xml.in.h:441
+#: ../rules/base.xml.in.h:449
 msgid "Kurdish (Turkey, F)"
 msgstr "Курдська (Туреччина, F)"
 
-#: ../rules/base.xml.in.h:442
+#: ../rules/base.xml.in.h:450
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "Курдська (Туреччина, латиниця Alt-Q)"
 
-#: ../rules/base.xml.in.h:443
+#: ../rules/base.xml.in.h:451
 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:452
 msgid "Kyrgyz"
 msgstr "Киргизька"
 
-#: ../rules/base.xml.in.h:446
+#: ../rules/base.xml.in.h:453
 msgid "Kyrgyz (phonetic)"
 msgstr "Киргизька (фонетична)"
 
-#: ../rules/base.xml.in.h:447
+#: ../rules/base.xml.in.h:454
 msgid "Lao"
 msgstr "Лаоська"
 
-#: ../rules/base.xml.in.h:448
+#: ../rules/base.xml.in.h:455
 msgid "Lao (STEA proposed standard layout)"
 msgstr "Лаоська (стандартна розкладка, запропонована STEA)"
 
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:456
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Клавіатура для ноутбуків Compaq (напр., Armada)"
 
-#: ../rules/base.xml.in.h:450
+#: ../rules/base.xml.in.h:457
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Інтернет-клавіатура для ноутбуків Compaq (напр., Presario)"
 
-#: ../rules/base.xml.in.h:451
+#: ../rules/base.xml.in.h:458
 msgid "Laptop/notebook eMachines m68xx"
 msgstr "Ноутбуки eMachines m68xx"
 
-#: ../rules/base.xml.in.h:452
+#: ../rules/base.xml.in.h:459 ../rules/base.extras.xml.in.h:12
 msgid "Latvian"
 msgstr "Латвійська"
 
-#: ../rules/base.xml.in.h:453
-msgid "Latvian (Apostrophe ' variant)"
-msgstr "Латвійська (варіант з апострофом ('))"
-
-#: ../rules/base.xml.in.h:454
+#: ../rules/base.xml.in.h:460
 msgid "Latvian (F variant)"
 msgstr "Латвійська (варіант з літерою F)"
 
-#: ../rules/base.xml.in.h:455
-msgid "Latvian (Tilde ~ variant)"
-msgstr "Латвійська (варіант з тильдою (~))"
+#: ../rules/base.xml.in.h:461
+msgid "Latvian (adapted)"
+msgstr "Латвійська (адаптована)"
 
-#: ../rules/base.xml.in.h:456
+#: ../rules/base.xml.in.h:462
+msgid "Latvian (apostrophe variant)"
+msgstr "Латвійська (варіант з апострофом)"
+
+#: ../rules/base.xml.in.h:463
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Латвійська (ергономічна, ŪGJRMV)"
+
+#: ../rules/base.xml.in.h:464
+msgid "Latvian (modern)"
+msgstr "Латвійська (сучасна)"
+
+#: ../rules/base.xml.in.h:465
+msgid "Latvian (tilde variant)"
+msgstr "Латвійська (варіант з тильдою)"
+
+#: ../rules/base.xml.in.h:466
 msgid "Left Alt"
 msgstr "Ліва клавіша Alt"
 
-#: ../rules/base.xml.in.h:457
+#: ../rules/base.xml.in.h:467
 msgid "Left Alt (while pressed)"
 msgstr "Ліва клавіша Alt (поки натиснена)"
 
-#: ../rules/base.xml.in.h:458
+#: ../rules/base.xml.in.h:468
 msgid "Left Alt is swapped with Left Win"
 msgstr "Ліва Alt міняється з лівою клавішею Win"
 
-#: ../rules/base.xml.in.h:459
+#: ../rules/base.xml.in.h:469
 msgid "Left Ctrl"
 msgstr "Ліва клавіша 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 "Ліва Ctrl (на першу розкладку), Правий Ctrl (на останню розкладку)"
 
-#: ../rules/base.xml.in.h:461
+#: ../rules/base.xml.in.h:471
 msgid "Left Ctrl+Left Shift"
 msgstr "Лівий Ctrl+Лівий Shift"
 
-#: ../rules/base.xml.in.h:462
+#: ../rules/base.xml.in.h:472
 msgid "Left Shift"
 msgstr "Ліва клавіша Shift"
 
-#: ../rules/base.xml.in.h:463
+#: ../rules/base.xml.in.h:473
 msgid "Left Win"
 msgstr "Ліва клавіша 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 "Ліва Win (на першу розкладку), Права Win/Menu (на останню розкладку)"
 
-#: ../rules/base.xml.in.h:465
+#: ../rules/base.xml.in.h:475
 msgid "Left Win (while pressed)"
 msgstr "Ліва клавіша Win (поки натиснута)"
 
-#: ../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 вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../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 вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../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+ліва Win (на першу розкладку), правий Ctrl+Menu (на другу розкладку)"
 
-#: ../rules/base.xml.in.h:469
+#: ../rules/base.xml.in.h:479
 msgid "Legacy"
 msgstr "Застаріла"
 
-#: ../rules/base.xml.in.h:470
+#: ../rules/base.xml.in.h:480
 msgid "Legacy Wang 724"
 msgstr "Стара 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 "Застаріла клавіша з комою"
 
-#: ../rules/base.xml.in.h:473
+#: ../rules/base.xml.in.h:483
 msgid "Legacy key with dot"
 msgstr "Застаріла клавіша з крапкою"
 
-#: ../rules/base.xml.in.h:474
+#: ../rules/base.xml.in.h:484 ../rules/base.extras.xml.in.h:21
 msgid "Lithuanian"
 msgstr "Литовська"
 
-#: ../rules/base.xml.in.h:475
+#: ../rules/base.xml.in.h:485
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "Литовська (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:476
+#: ../rules/base.xml.in.h:486
 msgid "Lithuanian (LEKP)"
 msgstr "Литовська (LEKP)"
 
-#: ../rules/base.xml.in.h:477
+#: ../rules/base.xml.in.h:487
 msgid "Lithuanian (LEKPa)"
 msgstr "Литовська (LEKPa)"
 
-#: ../rules/base.xml.in.h:478
+#: ../rules/base.xml.in.h:488
 msgid "Lithuanian (US keyboard with Lithuanian letters)"
-msgstr "Литовська (клавіатура США з литовськими літерами)"
+msgstr "Литовська (клавіатура США, з литовськими літерами)"
 
-#: ../rules/base.xml.in.h:479
+#: ../rules/base.xml.in.h:489
 msgid "Lithuanian (standard)"
 msgstr "Литовська (стандартна)"
 
-#: ../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 (альтернативний варіант)"
 
-#: ../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 (альтернативний варіант 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 з додатковими клавішами через G15daemon"
 
-#: ../rules/base.xml.in.h:491
+#: ../rules/base.xml.in.h:501
 msgid "Logitech Generic Keyboard"
 msgstr "Logitech Generic Keyboard"
 
-#: ../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 (модель 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 "Нижньолужицька"
+
+#: ../rules/base.xml.in.h:515
+msgid "Lower Sorbian (qwertz)"
+msgstr "Нижньолужицька (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 "Македонська"
 
-#: ../rules/base.xml.in.h:507
+#: ../rules/base.xml.in.h:519
 msgid "Macedonian (eliminate dead keys)"
 msgstr "Македонська (вимкнути сліпі клавіші)"
 
-#: ../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"
 
-#: ../rules/base.xml.in.h:510
+#: ../rules/base.xml.in.h:522
 msgid "Make Caps Lock an additional Backspace"
 msgstr "Caps Lock — додаткова клавіша Backspace"
 
-#: ../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 "Caps Lock — додаткова клавіша Ctrl, але зі збереженням символу клавіші Caps_Lock"
 
-#: ../rules/base.xml.in.h:512
+#: ../rules/base.xml.in.h:524
 msgid "Make Caps Lock an additional Ctrl"
 msgstr "Caps Lock — додаткова клавіша Ctrl"
 
-#: ../rules/base.xml.in.h:513
+#: ../rules/base.xml.in.h:525
 msgid "Make Caps Lock an additional ESC"
 msgstr "Caps Lock — додаткова клавіша ESC"
 
-#: ../rules/base.xml.in.h:514
+#: ../rules/base.xml.in.h:526
 msgid "Make Caps Lock an additional Hyper"
 msgstr "Caps Lock — додаткова клавіша Hyper"
 
-#: ../rules/base.xml.in.h:515
+#: ../rules/base.xml.in.h:527
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "Caps Lock — додаткова клавіша Num Lock"
 
-#: ../rules/base.xml.in.h:516
+#: ../rules/base.xml.in.h:528
 msgid "Make Caps Lock an additional Super"
 msgstr "Caps Lock — додаткова клавіша Super"
 
-#: ../rules/base.xml.in.h:517
+#: ../rules/base.xml.in.h:529
 msgid "Malayalam"
 msgstr "Малаяламська"
 
-#: ../rules/base.xml.in.h:518
+#: ../rules/base.xml.in.h:530
 msgid "Malayalam (Lalitha)"
 msgstr "Малаяламська (лаліта)"
 
-#: ../rules/base.xml.in.h:519
+#: ../rules/base.xml.in.h:531
 msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr "Малаяламська (покращений запис індійських мов з символом рупії)"
 
-#: ../rules/base.xml.in.h:520
+#: ../rules/base.xml.in.h:532
 msgid "Maltese"
 msgstr "Мальтійська"
 
-#: ../rules/base.xml.in.h:521
+#: ../rules/base.xml.in.h:533
 msgid "Maltese (with US layout)"
 msgstr "Мальтійська (клавіатура з розкладкою США)"
 
-#: ../rules/base.xml.in.h:522
+#: ../rules/base.xml.in.h:534
+msgid "Maori"
+msgstr "Маорійська"
+
+#: ../rules/base.xml.in.h:535
+msgid "Mari"
+msgstr "Марійська"
+
+#: ../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 відповідає лівій клавіші Win"
 
-#: ../rules/base.xml.in.h:527
+#: ../rules/base.xml.in.h:541
 msgid "Meta is mapped to Win keys"
 msgstr "Meta відповідає клавішам Win"
 
-#: ../rules/base.xml.in.h:528
+#: ../rules/base.xml.in.h:542
 msgid "Meta on Left Ctrl"
 msgstr "Meta на лівій клавіші 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, шведська"
 
-#: ../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 "Різні параметри сумісності"
 
-#: ../rules/base.xml.in.h:542
+#: ../rules/base.xml.in.h:556
 msgid "Mongolian"
 msgstr "Монгольська"
 
-#: ../rules/base.xml.in.h:543
+#: ../rules/base.xml.in.h:557
 msgid "Montenegrin"
 msgstr "Чорногорська"
 
-#: ../rules/base.xml.in.h:544
+#: ../rules/base.xml.in.h:558
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr "Чорногорська (кирилиця з кутовими лапками)"
 
-#: ../rules/base.xml.in.h:545
+#: ../rules/base.xml.in.h:559
 msgid "Montenegrin (Cyrillic)"
 msgstr "Чорногорська (кирилиця)"
 
-#: ../rules/base.xml.in.h:546
+#: ../rules/base.xml.in.h:560
 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:561
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Чорногорська (латиниця, Unicode, qwerty)"
 
-#: ../rules/base.xml.in.h:548
-msgid "Montenegrin (Latin unicode qwerty)"
-msgstr "Чорногорська (латиниця Unicode, qwerty)"
+#: ../rules/base.xml.in.h:562
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Чорногорська (латиниця, Unicode)"
 
-#: ../rules/base.xml.in.h:549
-msgid "Montenegrin (Latin unicode)"
-msgstr "Чорногорська (латиниця Unicode)"
+#: ../rules/base.xml.in.h:563
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Чорногорська (латиниця, qwerty)"
 
-#: ../rules/base.xml.in.h:550
+#: ../rules/base.xml.in.h:564
 msgid "Montenegrin (Latin with guillemets)"
 msgstr "Чорногорська (латиниця з кутовими лапками)"
 
-#: ../rules/base.xml.in.h:551
-msgid "Māori"
-msgstr "Маорійська"
-
-#: ../rules/base.xml.in.h:552
+#: ../rules/base.xml.in.h:565
 msgid "NICOLA-F style Backspace"
 msgstr "NICOLA-F style Backspace"
 
-#: ../rules/base.xml.in.h:553
+#: ../rules/base.xml.in.h:566
 msgid "Nepali"
 msgstr "Непальська"
 
-#: ../rules/base.xml.in.h:554
+#: ../rules/base.xml.in.h:567
 msgid "Non-breakable space character at fourth level"
 msgstr "Символ нерозривного пробілу на четвертому рівні"
 
-#: ../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 "Клавіша пробіл видає нерозривний пробіл на 4-му рівні, вузький нерозривний пробіл на 6-му рівні"
 
-#: ../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 "Клавіша пробіл видає нерозривний пробіл на 4-му рівні, вузький нерозривний пробіл на 6-му рівні (через Ctrl+Shift)"
 
-#: ../rules/base.xml.in.h:557
+#: ../rules/base.xml.in.h:570
 msgid "Non-breakable space character at second level"
 msgstr "Символ нерозривного пробілу на другому рівні"
 
-#: ../rules/base.xml.in.h:558
+#: ../rules/base.xml.in.h:571
 msgid "Non-breakable space character at third level"
 msgstr "Символ нерозривного пробілу на третьому рівні"
 
-#: ../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 "Символ нерозривного пробілу на третьому рівні, нічого на четвертому"
 
-#: ../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 "Символ нерозривного пробілу на третьому рівні, символ тонкого нерозривного пробілу на четвертому рівні"
 
-#: ../rules/base.xml.in.h:561
+#: ../rules/base.xml.in.h:574
+msgid "Northern Saami (Finland)"
+msgstr "Північно-саамська (Фінляндія)"
+
+#: ../rules/base.xml.in.h:575
+msgid "Northern Saami (Norway)"
+msgstr "Північно-саамська (Норвегія)"
+
+#: ../rules/base.xml.in.h:576
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Північно-саамська (Норвегія, вимкнути сліпі клавіші)"
+
+#: ../rules/base.xml.in.h:577
+msgid "Northern Saami (Sweden)"
+msgstr "Північно-саамська (Швеція)"
+
+#: ../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 "Норвезька"
 
-#: ../rules/base.xml.in.h:563
+#: ../rules/base.xml.in.h:580
 msgid "Norwegian (Dvorak)"
 msgstr "Норвезька (Дворак)"
 
-#: ../rules/base.xml.in.h:564
-msgid "Norwegian (Mac)"
-msgstr "Норвезька (Mac)"
-
-#: ../rules/base.xml.in.h:565
-msgid "Norwegian (Mac, eliminate dead keys)"
-msgstr "Норвезька (Mac, вимкнути сліпі клавіші)"
+#: ../rules/base.xml.in.h:581
+msgid "Norwegian (Macintosh)"
+msgstr "Норвезька (Macintosh)"
 
-#: ../rules/base.xml.in.h:566
-msgid "Norwegian (Northern Saami"
-msgstr "Норвезька (північно-саамська)"
+#: ../rules/base.xml.in.h:582
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Норвезька (Macintosh, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:567
+#: ../rules/base.xml.in.h:583
 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: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 "Вибір поведінки клавіші del на цифровій клавіатурі"
 
-#: ../rules/base.xml.in.h:571
-msgid "Numeric keypad keys work as with Mac"
-msgstr "Цифрова клавіатура працює як у Mac"
+#: ../rules/base.xml.in.h:586
+msgid "Numeric keypad keys work as with Macintosh"
+msgstr "Цифрова клавіатура працює як у Macintosh"
 
-#: ../rules/base.xml.in.h:572
+#: ../rules/base.xml.in.h:587
 msgid "Numeric keypad layout selection"
 msgstr "Вибір розкладки цифрової клавіатури"
 
-#: ../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 "Окситанська"
+
+#: ../rules/base.xml.in.h:590
+msgid "Ogham"
+msgstr "Огам"
+
+#: ../rules/base.xml.in.h:591
+msgid "Ogham (IS434)"
+msgstr "Огам (IS434)"
+
+#: ../rules/base.xml.in.h:592
 msgid "Oriya"
 msgstr "Орія"
 
-#: ../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 "Осетинська (Грузія)"
+
+#: ../rules/base.xml.in.h:595
+msgid "Ossetian (WinKeys)"
+msgstr "Осетинська (з клавішами Win)"
+
+#: ../rules/base.xml.in.h:596
+msgid "Ossetian (legacy)"
+msgstr "Осетинська (застаріла)"
+
+#: ../rules/base.xml.in.h:597
 msgid "PC-98xx Series"
 msgstr "Моделі PC-98xx"
 
-#: ../rules/base.xml.in.h:577
+#: ../rules/base.xml.in.h:598
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Паннонська русинська (гомофонна)"
+
+#: ../rules/base.xml.in.h:599
 msgid "Pashto"
 msgstr "Пушту"
 
-#: ../rules/base.xml.in.h:578
+#: ../rules/base.xml.in.h:600
 msgid "Pashto (Afghanistan, OLPC)"
 msgstr "Пушту (Афганістан, 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 "Перська"
 
-#: ../rules/base.xml.in.h:581
+#: ../rules/base.xml.in.h:603
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "Перська (Афганістан, дарі OLPC)"
 
-#: ../rules/base.xml.in.h:582
+#: ../rules/base.xml.in.h:604
 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:605 ../rules/base.extras.xml.in.h:24
 msgid "Polish"
 msgstr "Польська"
 
-#: ../rules/base.xml.in.h:585
+#: ../rules/base.xml.in.h:606
 msgid "Polish (Dvorak)"
 msgstr "Польська (Дворак)"
 
-#: ../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 "Польська (Дворак, польські лапки на клавіші 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 "Польська (Дворак, польські лапки на знаку лапки)"
 
-#: ../rules/base.xml.in.h:588
-msgid "Polish (Kashubian)"
-msgstr "Польська (кашубська)"
-
-#: ../rules/base.xml.in.h:589
+#: ../rules/base.xml.in.h:609
 msgid "Polish (programmer Dvorak)"
 msgstr "Польська (програмістський Дворак)"
 
-#: ../rules/base.xml.in.h:590
+#: ../rules/base.xml.in.h:610
 msgid "Polish (qwertz)"
 msgstr "Польська (qwertz)"
 
-#: ../rules/base.xml.in.h:591
+#: ../rules/base.xml.in.h:611
 msgid "Portuguese"
 msgstr "Португальська"
 
-#: ../rules/base.xml.in.h:592
+#: ../rules/base.xml.in.h:612
 msgid "Portuguese (Brazil)"
 msgstr "Португальська (Бразилія)"
 
-#: ../rules/base.xml.in.h:593
+#: ../rules/base.xml.in.h:613
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "Португальська (Бразилія, Дворак)"
 
-#: ../rules/base.xml.in.h:594
+#: ../rules/base.xml.in.h:614
 msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr "Португальська (Бразилія, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:595
+#: ../rules/base.xml.in.h:615
 msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr "Португальська (Бразилія, nativo для есперанто)"
 
-#: ../rules/base.xml.in.h:596
+#: ../rules/base.xml.in.h:616
 msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr "Португальська (Бразилія, nativo для клавіатур США)"
 
-#: ../rules/base.xml.in.h:597
+#: ../rules/base.xml.in.h:617
 msgid "Portuguese (Brazil, nativo)"
 msgstr "Португальська (Бразилія, nativo)"
 
-#: ../rules/base.xml.in.h:598
-msgid "Portuguese (Mac)"
-msgstr "Португальська (Mac)"
-
-#: ../rules/base.xml.in.h:599
-msgid "Portuguese (Mac, Sun dead keys)"
-msgstr "Португальська (Mac, сліпі клавіші Sun)"
+#: ../rules/base.xml.in.h:618
+msgid "Portuguese (Macintosh)"
+msgstr "Португальська (Macintosh)"
 
-#: ../rules/base.xml.in.h:600
-msgid "Portuguese (Mac, eliminate dead keys)"
-msgstr "Португальська (Mac, вимкнути сліпі клавіші)"
+#: ../rules/base.xml.in.h:619
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Португальська (Macintosh, сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:601
-msgid "Portuguese (Nativo for Esperanto)"
-msgstr "Португальська (nativo для есперанто)"
+#: ../rules/base.xml.in.h:620
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Португальська (Macintosh, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:602
+#: ../rules/base.xml.in.h:621
 msgid "Portuguese (Nativo for USA keyboards)"
 msgstr "Португальська (nativo для клавіатур у США)"
 
-#: ../rules/base.xml.in.h:603
+#: ../rules/base.xml.in.h:622
 msgid "Portuguese (Nativo)"
 msgstr "Португальська (Nativo)"
 
-#: ../rules/base.xml.in.h:604
+#: ../rules/base.xml.in.h:623
 msgid "Portuguese (Sun dead keys)"
 msgstr "Португальська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:605
+#: ../rules/base.xml.in.h:624
 msgid "Portuguese (eliminate dead keys)"
 msgstr "Португальська (вимкнути сліпі клавіші)"
 
-#: ../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 "Пенджабська (гурмухі, джелум)"
 
-#: ../rules/base.xml.in.h:609
+#: ../rules/base.xml.in.h:628
 msgid "Punjabi (Gurmukhi)"
 msgstr "Пенджабська (гурмухі)"
 
-#: ../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"
 
-#: ../rules/base.xml.in.h:612
+#: ../rules/base.xml.in.h:631
 msgid "Right Alt (while pressed)"
 msgstr "Права клавіша Alt (поки натиснена)"
 
-#: ../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 вибирає 5-ий рівень і активує блокування рівня 5, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../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 вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../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 вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:616
+#: ../rules/base.xml.in.h:635
 msgid "Right Alt key never chooses 3rd level"
 msgstr "Права клавіша Alt ніколи не обирає 3-й рівень"
 
-#: ../rules/base.xml.in.h:617
+#: ../rules/base.xml.in.h:636
 msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr "Вибір 3-го рівня натисненням правої клавіші Alt, Shift+права клавіша Alt діє як Multi_Key"
 
-#: ../rules/base.xml.in.h:618
+#: ../rules/base.xml.in.h:637
 msgid "Right Ctrl"
 msgstr "Права клавіша Ctrl"
 
-#: ../rules/base.xml.in.h:619
+#: ../rules/base.xml.in.h:638
 msgid "Right Ctrl (while pressed)"
 msgstr "Права клавіша Ctrl (поки натиснута)"
 
-#: ../rules/base.xml.in.h:620
+#: ../rules/base.xml.in.h:639
 msgid "Right Ctrl as Right Alt"
 msgstr "Права клавіша Ctrl працює як права клавіша Alt"
 
-#: ../rules/base.xml.in.h:621
+#: ../rules/base.xml.in.h:640
 msgid "Right Ctrl is mapped to Menu"
 msgstr "Права Ctrl відповідає клавіші Menu"
 
-#: ../rules/base.xml.in.h:622
+#: ../rules/base.xml.in.h:641
 msgid "Right Ctrl+Right Shift"
 msgstr "Права Ctrl+Права Shift"
 
-#: ../rules/base.xml.in.h:623
+#: ../rules/base.xml.in.h:642
 msgid "Right Shift"
 msgstr "Права клавіша Shift"
 
-#: ../rules/base.xml.in.h:624
+#: ../rules/base.xml.in.h:643
 msgid "Right Win"
 msgstr "Права клавіша Win"
 
-#: ../rules/base.xml.in.h:625
+#: ../rules/base.xml.in.h:644
 msgid "Right Win (while pressed)"
 msgstr "Права клавіша Win (поки натиснена)"
 
-#: ../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 вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../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 вибирає 5-ий рівень, фіксується, якщо натиснути разом зі іншою комбінацією вибору 5-го рівня"
 
-#: ../rules/base.xml.in.h:628
+#: ../rules/base.xml.in.h:647 ../rules/base.extras.xml.in.h:26
 msgid "Romanian"
 msgstr "Румунська"
 
-#: ../rules/base.xml.in.h:629
-msgid "Romanian (Crimean Tatar Dobruca-1 Q)"
-msgstr "Румунська (кримськотатарська Dobruca-1 Q)"
-
-#: ../rules/base.xml.in.h:630
-msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
-msgstr "Румунська (кримськотатарська Dobruca-2 Q)"
-
-#: ../rules/base.xml.in.h:631
-msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Румунська (кримськотатарська турецька Alt-Q)"
+#: ../rules/base.xml.in.h:648
+msgid "Romanian (Germany)"
+msgstr "Румунська (Німеччина)"
 
-#: ../rules/base.xml.in.h:632
-msgid "Romanian (Crimean Tatar Turkish F)"
-msgstr "Румунська (кримськотатарська турецька F)"
+#: ../rules/base.xml.in.h:649
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Німецька (Німеччина, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:633
+#: ../rules/base.xml.in.h:650
 msgid "Romanian (WinKeys)"
 msgstr "Румунська (з клавішами Win)"
 
-#: ../rules/base.xml.in.h:634
+#: ../rules/base.xml.in.h:651
 msgid "Romanian (cedilla)"
 msgstr "Румунська (седиль)"
 
-#: ../rules/base.xml.in.h:635
+#: ../rules/base.xml.in.h:652
 msgid "Romanian (standard cedilla)"
 msgstr "Румунська (стандартна седиль)"
 
-#: ../rules/base.xml.in.h:636
+#: ../rules/base.xml.in.h:653
 msgid "Romanian (standard)"
 msgstr "Румунська (стандартна)"
 
-#: ../rules/base.xml.in.h:637
+#: ../rules/base.xml.in.h:654
 msgid "Rupee on 4"
 msgstr "Символ рупії на 4"
 
-#: ../rules/base.xml.in.h:638
+#: ../rules/base.xml.in.h:655 ../rules/base.extras.xml.in.h:28
 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:656
 msgid "Russian (DOS)"
 msgstr "Російська (DOS)"
 
-#: ../rules/base.xml.in.h:643
+#: ../rules/base.xml.in.h:657
 msgid "Russian (Georgia)"
 msgstr "Російська (Грузія)"
 
-#: ../rules/base.xml.in.h:644
+#: ../rules/base.xml.in.h:658
 msgid "Russian (Germany, phonetic)"
 msgstr "Російська (Німеччина, фонетична)"
 
-#: ../rules/base.xml.in.h:645
-msgid "Russian (Kalmyk)"
-msgstr "Російська (калмицька)"
-
-#: ../rules/base.xml.in.h:646
+#: ../rules/base.xml.in.h:659
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr "Російська (Казахстан, з казахською)"
 
-#: ../rules/base.xml.in.h:647
-msgid "Russian (Komi)"
-msgstr "Російська (Комі)"
-
-#: ../rules/base.xml.in.h:648
-msgid "Russian (Mari)"
-msgstr "Російська (Марі)"
-
-#: ../rules/base.xml.in.h:649
-msgid "Russian (Ossetian, WinKeys)"
-msgstr "Російська (осетинська, з клавішами Win)"
-
-#: ../rules/base.xml.in.h:650
-msgid "Russian (Ossetian, legacy)"
-msgstr "Російська (осетинська, застаріла)"
-
-#: ../rules/base.xml.in.h:651
+#: ../rules/base.xml.in.h:660
 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:661
 msgid "Russian (Sweden, phonetic)"
 msgstr "Російська (шведська, фонетична)"
 
-#: ../rules/base.xml.in.h:654
+#: ../rules/base.xml.in.h:662
 msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr "Російська (шведська, фонетична, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:655
-msgid "Russian (Tatar)"
-msgstr "Російська (татарська)"
-
-#: ../rules/base.xml.in.h:656
+#: ../rules/base.xml.in.h:663
 msgid "Russian (US, phonetic)"
 msgstr "Російська (США, фонетична)"
 
-#: ../rules/base.xml.in.h:657
-msgid "Russian (Udmurt)"
-msgstr "Російська (удмуртська)"
-
-#: ../rules/base.xml.in.h:658
-msgid "Russian (Yakut)"
-msgstr "Російська (якутська)"
+#: ../rules/base.xml.in.h:664
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Російська (Україна, стандартна RSTU)"
 
-#: ../rules/base.xml.in.h:659
+#: ../rules/base.xml.in.h:665
 msgid "Russian (legacy)"
 msgstr "Російська (застаріла)"
 
-#: ../rules/base.xml.in.h:660
+#: ../rules/base.xml.in.h:666
 msgid "Russian (phonetic WinKeys)"
 msgstr "Російська (фонетична з клавішами Win)"
 
-#: ../rules/base.xml.in.h:661
+#: ../rules/base.xml.in.h:667
 msgid "Russian (phonetic)"
 msgstr "Російська (фонетична)"
 
-#: ../rules/base.xml.in.h:662
+#: ../rules/base.xml.in.h:668
 msgid "Russian (typewriter)"
 msgstr "Російська (машинопис)"
 
-#: ../rules/base.xml.in.h:663
+#: ../rules/base.xml.in.h:669
 msgid "Russian (typewriter, legacy)"
 msgstr "Російська (машинопис, застаріла)"
 
-#: ../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 "Сайсіят (Тайвань)"
 
-#: ../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 "Крапка з комою на третьому рівні"
 
-#: ../rules/base.xml.in.h:678
+#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:31
 msgid "Serbian"
 msgstr "Сербська"
 
-#: ../rules/base.xml.in.h:679
+#: ../rules/base.xml.in.h:684
 msgid "Serbian (Latin Unicode qwerty)"
 msgstr "Сербська (латиниця, Unicode qwerty)"
 
-#: ../rules/base.xml.in.h:680
+#: ../rules/base.xml.in.h:685
 msgid "Serbian (Latin Unicode)"
 msgstr "Сербська (латиниця Unicode)"
 
-#: ../rules/base.xml.in.h:681
+#: ../rules/base.xml.in.h:686
 msgid "Serbian (Latin qwerty)"
 msgstr "Сербська (латиниця, qwerty)"
 
-#: ../rules/base.xml.in.h:682
+#: ../rules/base.xml.in.h:687
 msgid "Serbian (Latin with guillemets)"
 msgstr "Сербська (латиниця з кутовими лапками)"
 
-#: ../rules/base.xml.in.h:683
+#: ../rules/base.xml.in.h:688
 msgid "Serbian (Latin)"
 msgstr "Сербська (латиниця)"
 
-#: ../rules/base.xml.in.h:684
-msgid "Serbian (Pannonian Rusyn Homophonic)"
-msgstr "Сербська (паннонська русинська гомофонна)"
+#: ../rules/base.xml.in.h:689
+msgid "Serbian (Russia)"
+msgstr "Сербська (Росія)"
 
-#: ../rules/base.xml.in.h:685
+#: ../rules/base.xml.in.h:690
 msgid "Serbian (Z and ZHE swapped)"
 msgstr "Сербська (З та Ж поміняні місцями)"
 
-#: ../rules/base.xml.in.h:686
+#: ../rules/base.xml.in.h:691
 msgid "Serbian (with guillemets)"
 msgstr "Сербська (з кутовими лапками)"
 
-#: ../rules/base.xml.in.h:687
+#: ../rules/base.xml.in.h:692
 msgid "Serbo-Croatian (US)"
 msgstr "Сербо-хорватська (США)"
 
-#: ../rules/base.xml.in.h:688
+#: ../rules/base.xml.in.h:693
 msgid "Shift cancels Caps Lock"
 msgstr "Shift скасовує 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 не скасовує Num Lock, а вибирає третій рівень"
 
-#: ../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 з цифровою клавіатурою працює як у Microsoft 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 "Синдхі"
 
-#: ../rules/base.xml.in.h:693
+#: ../rules/base.xml.in.h:698
 msgid "Sinhala"
 msgstr "Сингальська"
 
-#: ../rules/base.xml.in.h:694
+#: ../rules/base.xml.in.h:699
 msgid "Slovak"
 msgstr "Словацька"
 
-#: ../rules/base.xml.in.h:695
+#: ../rules/base.xml.in.h:700
 msgid "Slovak (extended Backslash)"
 msgstr "Словацька (розширені функції Backslash)"
 
-#: ../rules/base.xml.in.h:696
+#: ../rules/base.xml.in.h:701
 msgid "Slovak (qwerty)"
 msgstr "Словацька (qwerty)"
 
-#: ../rules/base.xml.in.h:697
+#: ../rules/base.xml.in.h:702
 msgid "Slovak (qwerty, extended Backslash)"
 msgstr "Словацька (qwerty, розширені функції Backslash)"
 
-#: ../rules/base.xml.in.h:698
-msgid "Slovene"
+#: ../rules/base.xml.in.h:703
+msgid "Slovenian"
 msgstr "Словенська"
 
-#: ../rules/base.xml.in.h:699
-msgid "Slovene (US keyboard with Slovenian letters)"
-msgstr "Клавіатура (США із словенськими літерами)"
+#: ../rules/base.xml.in.h:704
+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:705
+msgid "Slovenian (use guillemets for quotes)"
 msgstr "Словенська (кутові лапки)"
 
-#: ../rules/base.xml.in.h:701
+#: ../rules/base.xml.in.h:706
 msgid "Spanish"
 msgstr "Іспанська"
 
-#: ../rules/base.xml.in.h:702
-msgid "Spanish (Asturian variant with bottom-dot H and bottom-dot L)"
-msgstr "Іспанська (Астурійський варіант з H та L з нижньою крапкою)"
-
-#: ../rules/base.xml.in.h:703
-msgid "Spanish (Catalan variant with middle-dot L)"
-msgstr "Іспанська (каталонський варіант з L із середньою точкою)"
-
-#: ../rules/base.xml.in.h:704
+#: ../rules/base.xml.in.h:707
 msgid "Spanish (Dvorak)"
 msgstr "Іспанська (Дворак)"
 
-#: ../rules/base.xml.in.h:705
+#: ../rules/base.xml.in.h:708
 msgid "Spanish (Latin American)"
 msgstr "Іспанська (латиноамериканська)"
 
-#: ../rules/base.xml.in.h:706
+#: ../rules/base.xml.in.h:709
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Іспанська (латиноамериканська, сліпі клавіші Sun)"
+
+#: ../rules/base.xml.in.h:710
 msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr "Іспанська (латиноамериканська, вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:707
+#: ../rules/base.xml.in.h:711
 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)"
-msgstr "Іспанська (Mac)"
+#: ../rules/base.xml.in.h:712
+msgid "Spanish (Macintosh)"
+msgstr "Іспанська (Macintosh)"
 
-#: ../rules/base.xml.in.h:710
+#: ../rules/base.xml.in.h:713
 msgid "Spanish (Sun dead keys)"
 msgstr "Іспанська (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:711
+#: ../rules/base.xml.in.h:714
 msgid "Spanish (eliminate dead keys)"
 msgstr "Іспанська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:712
+#: ../rules/base.xml.in.h:715
 msgid "Spanish (include dead tilde)"
 msgstr "Іспанська (зі «спеціальною» тильдою)"
 
-#: ../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 "Сліпі клавіші (Ctrl+Alt+&lt;key&gt;) обробляються на сервері"
 
-#: ../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 "Суахілі (Кенія)"
 
-#: ../rules/base.xml.in.h:717
+#: ../rules/base.xml.in.h:720
 msgid "Swahili (Tanzania)"
 msgstr "Суахілі (Танзанія)"
 
-#: ../rules/base.xml.in.h:718
+#: ../rules/base.xml.in.h:721
 msgid "Swap Ctrl and Caps Lock"
 msgstr "Поміняти місцями клавіші Ctrl та Caps Lock"
 
-#: ../rules/base.xml.in.h:719
+#: ../rules/base.xml.in.h:722
 msgid "Swap ESC and Caps Lock"
 msgstr "Поміняти місцями клавіші ESC та Caps Lock"
 
-#: ../rules/base.xml.in.h:720
+#: ../rules/base.xml.in.h:723
 msgid "Swedish"
 msgstr "Шведська"
 
-#: ../rules/base.xml.in.h:721
+#: ../rules/base.xml.in.h:724
 msgid "Swedish (Dvorak)"
 msgstr "Шведська (Дворак)"
 
-#: ../rules/base.xml.in.h:722
-msgid "Swedish (Mac)"
-msgstr "Шведська (Mac)"
+#: ../rules/base.xml.in.h:725
+msgid "Swedish (Macintosh)"
+msgstr "Шведська (Macintosh)"
 
-#: ../rules/base.xml.in.h:723
+#: ../rules/base.xml.in.h:726
 msgid "Swedish (Svdvorak)"
 msgstr "Шведська (Svdvorak)"
 
-#: ../rules/base.xml.in.h:724
+#: ../rules/base.xml.in.h:727
 msgid "Swedish (eliminate dead keys)"
 msgstr "Шведська (вимкнути сліпі клавіші)"
 
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (northern Saami)"
-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
+msgid "Swedish Sign Language"
+msgstr "Шведська мова жестів"
+
+#: ../rules/base.xml.in.h:729
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (планшетний ПК)"
 
-#: ../rules/base.xml.in.h:729
+#: ../rules/base.xml.in.h:730
 msgid "Syriac"
 msgstr "Сирійська"
 
-#: ../rules/base.xml.in.h:730
+#: ../rules/base.xml.in.h:731
 msgid "Syriac (phonetic)"
 msgstr "Сирійська (фонетична)"
 
-#: ../rules/base.xml.in.h:731
+#: ../rules/base.xml.in.h:732
 msgid "Taiwanese"
 msgstr "Тайванська"
 
-#: ../rules/base.xml.in.h:732
+#: ../rules/base.xml.in.h:733
 msgid "Taiwanese (indigenous)"
 msgstr "Тайванська (місцева)"
 
-#: ../rules/base.xml.in.h:733
+#: ../rules/base.xml.in.h:734
 msgid "Tajik"
 msgstr "Таджицька"
 
-#: ../rules/base.xml.in.h:734
+#: ../rules/base.xml.in.h:735
 msgid "Tajik (legacy)"
 msgstr "Таджицька (застаріла)"
 
-#: ../rules/base.xml.in.h:735
+#: ../rules/base.xml.in.h:736
 msgid "Tamil"
 msgstr "Тамільська"
 
-#: ../rules/base.xml.in.h:736
+#: ../rules/base.xml.in.h:737
 msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr "Тамільська (Шрі-Ланка, TAB, машинопис)"
 
-#: ../rules/base.xml.in.h:737
+#: ../rules/base.xml.in.h:738
 msgid "Tamil (Sri Lanka, Unicode)"
 msgstr "Тамільська (Шрі-Ланка, Unicode)"
 
-#: ../rules/base.xml.in.h:738
+#: ../rules/base.xml.in.h:739
 msgid "Tamil (TAB typewriter)"
 msgstr "Тамільська (TAB, машинопис)"
 
-#: ../rules/base.xml.in.h:739
+#: ../rules/base.xml.in.h:740
 msgid "Tamil (TSCII typewriter)"
 msgstr "Тамільська (TSCII, машинопис)"
 
-#: ../rules/base.xml.in.h:740
+#: ../rules/base.xml.in.h:741
 msgid "Tamil (Unicode)"
 msgstr "Тамільська (Unicode)"
 
-#: ../rules/base.xml.in.h:741
+#: ../rules/base.xml.in.h:742
 msgid "Tamil (keyboard with numerals)"
 msgstr "Тамільська (клавіатура з цифрами)"
 
-#: ../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 "Татарська"
+
+#: ../rules/base.xml.in.h:745
 msgid "Telugu"
 msgstr "Телугу"
 
-#: ../rules/base.xml.in.h:744
+#: ../rules/base.xml.in.h:746
 msgid "Thai"
 msgstr "Тайська"
 
-#: ../rules/base.xml.in.h:745
+#: ../rules/base.xml.in.h:747
 msgid "Thai (Pattachote)"
 msgstr "Тайська (паттачот)"
 
-#: ../rules/base.xml.in.h:746
+#: ../rules/base.xml.in.h:748
 msgid "Thai (TIS-820.2538)"
 msgstr "Тайська (TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:747
+#: ../rules/base.xml.in.h:749
+msgid "Tibetan"
+msgstr "Тибетська"
+
+#: ../rules/base.xml.in.h:750
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Тибетська (з ASCII числами)"
+
+#: ../rules/base.xml.in.h:751
 msgid "To the corresponding key in a Dvorak keyboard."
 msgstr "На відповідну клавішу на клавіатурі Дворак."
 
-#: ../rules/base.xml.in.h:748
+#: ../rules/base.xml.in.h:752
 msgid "To the corresponding key in a Qwerty keyboard."
 msgstr "На відповідну клавішу на клавіатурі Qwerty."
 
-#: ../rules/base.xml.in.h:749
+#: ../rules/base.xml.in.h:753
 msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr "Вмикати або вимикати PointerKeys за допомогою 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 "Тсвана"
 
-#: ../rules/base.xml.in.h:755
+#: ../rules/base.xml.in.h:759
 msgid "Turkish"
 msgstr "Турецька"
 
-#: ../rules/base.xml.in.h:756
+#: ../rules/base.xml.in.h:760
 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:761
 msgid "Turkish (F)"
 msgstr "Турецька (F)"
 
-#: ../rules/base.xml.in.h:761
+#: ../rules/base.xml.in.h:762
 msgid "Turkish (Sun dead keys)"
 msgstr "Турецька (сліпі клавіші Sun)"
 
-#: ../rules/base.xml.in.h:762
+#: ../rules/base.xml.in.h:763
 msgid "Turkish (international with dead keys)"
 msgstr "Турецька (інтернаціональна зі сліпими клавішами)"
 
-#: ../rules/base.xml.in.h:763
+#: ../rules/base.xml.in.h:764
 msgid "Turkmen"
 msgstr "Туркменська"
 
-#: ../rules/base.xml.in.h:764
+#: ../rules/base.xml.in.h:765
 msgid "Turkmen (Alt-Q)"
 msgstr "Туркменська (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:режим ЄС)"
 
-#: ../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:режим Японії)"
 
-#: ../rules/base.xml.in.h:770
-msgid "Ukrainian"
-msgstr "Українська"
-
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian (Crimean Tatar Turkish Alt-Q)"
-msgstr "Українська (кримськотатарська турецька Alt-Q)"
+msgid "Udmurt"
+msgstr "Удмуртська"
 
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (Crimean Tatar Turkish F)"
-msgstr "Українська (кримськотатарська турецька F)"
+msgid "Ukrainian"
+msgstr "Українська"
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (Crimean Tatar Turkish Q)"
-msgstr "Українська (кримськотатарська турецька Q)"
-
-#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (WinKeys)"
 msgstr "Українська (з клавішами Win)"
 
-#: ../rules/base.xml.in.h:775
+#: ../rules/base.xml.in.h:774
 msgid "Ukrainian (homophonic)"
 msgstr "Українська (гомофонна)"
 
-#: ../rules/base.xml.in.h:776
+#: ../rules/base.xml.in.h:775
 msgid "Ukrainian (legacy)"
 msgstr "Українська (застаріла)"
 
-#: ../rules/base.xml.in.h:777
+#: ../rules/base.xml.in.h:776
 msgid "Ukrainian (phonetic)"
 msgstr "Українська (фонетична)"
 
-#: ../rules/base.xml.in.h:778
-msgid "Ukrainian (standard RSTU on Russian layout)"
-msgstr "Українська (стандартна RSTU на російській розкладці)"
-
-#: ../rules/base.xml.in.h:779
+#: ../rules/base.xml.in.h:777
 msgid "Ukrainian (standard RSTU)"
 msgstr "Українська (стандартна RSTU)"
 
-#: ../rules/base.xml.in.h:780
+#: ../rules/base.xml.in.h:778
 msgid "Ukrainian (typewriter)"
 msgstr "Українська (друкарська машинка)"
 
-#: ../rules/base.xml.in.h:781
+#: ../rules/base.xml.in.h:779
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Доповнення Unicode (стрілки та математичні оператори)"
 
-#: ../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 (стрілки та математичні оператори). Математичні оператори на типовому рівні."
 
-#: ../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 "Урду (Пакистан)"
 
-#: ../rules/base.xml.in.h:785
+#: ../rules/base.xml.in.h:783
 msgid "Urdu (Pakistan, CRULP)"
 msgstr "Урду (Пакистан, CRULP)"
 
-#: ../rules/base.xml.in.h:786
+#: ../rules/base.xml.in.h:784
 msgid "Urdu (Pakistan, NLA)"
 msgstr "Урду (Пакистан, NLA)"
 
-#: ../rules/base.xml.in.h:787
+#: ../rules/base.xml.in.h:785
 msgid "Urdu (WinKeys)"
 msgstr "Урду (з клавішами Win)"
 
-#: ../rules/base.xml.in.h:788
+#: ../rules/base.xml.in.h:786
 msgid "Urdu (alternative phonetic)"
 msgstr "Урду (альтернативна фонетична)"
 
-#: ../rules/base.xml.in.h:789
+#: ../rules/base.xml.in.h:787
 msgid "Urdu (phonetic)"
 msgstr "Урду (фонетична)"
 
-#: ../rules/base.xml.in.h:790
+#: ../rules/base.xml.in.h:788
 msgid "Use keyboard LED to show alternative layout"
 msgstr "Використовувати клавіатурні індикатори для індикації альтернативних розкладок"
 
-#: ../rules/base.xml.in.h:791
+#: ../rules/base.xml.in.h:789
 msgid "Using space key to input non-breakable space character"
 msgstr "Клавіша пробіл генерує символ нерозривного пробілу"
 
-#: ../rules/base.xml.in.h:792
+#: ../rules/base.xml.in.h:790
 msgid "Usual space at any level"
 msgstr "Звичайний пробіл на будь-якому рівні"
 
-#: ../rules/base.xml.in.h:793
+#: ../rules/base.xml.in.h:791
+msgid "Uyghur"
+msgstr "Уйгурська"
+
+#: ../rules/base.xml.in.h:792
 msgid "Uzbek"
 msgstr "Узбецька"
 
-#: ../rules/base.xml.in.h:794
+#: ../rules/base.xml.in.h:793
 msgid "Uzbek (Afghanistan)"
 msgstr "Узбецька (Афганістан)"
 
-#: ../rules/base.xml.in.h:795
+#: ../rules/base.xml.in.h:794
 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
+#: ../rules/base.xml.in.h:795
 msgid "Uzbek (Latin)"
 msgstr "Узбецька (латиниця)"
 
-#: ../rules/base.xml.in.h:800
+#: ../rules/base.xml.in.h:796
 msgid "Vietnamese"
 msgstr "В'єтнамська"
 
-#: ../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)"
+#: ../rules/base.xml.in.h:798
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr "Клавіатура Wang 724 з доповненнями Unicode (стрілки та математичні оператори)"
 
-#: ../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 з доповненнями Unicode (стрілки та математичні оператори). Математичні операції на типовому рівні"
 
-#: ../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 "Волоф"
 
-#: ../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 "Якутська"
+
+#: ../rules/base.xml.in.h:804
 msgid "Yoruba"
 msgstr "Йоруба"
 
-#: ../rules/base.xml.in.h:808
+#: ../rules/base.xml.in.h:805
 msgid "Zero-width non-joiner character at second level"
 msgstr "Незв’язувальний символ нульової ширини на другому рівні"
 
-#: ../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 "Незв’язувальний символ нульової ширини на другому рівні, нерозривний пробіл на третьому рівні"
 
-#: ../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 "Незв’язувальний символ нульової ширини на другому рівні, нерозривний пробіл на третьому рівні, нічого на четвертому рівні"
 
-#: ../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 "Незв’язувальний символ нульової ширини на другому рівні, нерозривний пробіл на третьому рівні, вузький нерозривний пробіл на четвертому рівні"
 
-#: ../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 "Незв’язувальний символ нульової ширини на другому рівні, символ нерозривного пробілу на третьому рівні, зв’язувальний символ нульової ширини на четвертому"
 
-#: ../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 "Незв’язувальний символ нульової ширини на другому рівні, зв’язувальний символ нульової ширини на третьому рівні"
 
-#: ../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 "Незв’язувальний символ нульової ширини на другому рівні, зв’язувальний символ нульової ширини на третьому рівні, символ нерозривного пробілу на четвертому рівні"
 
-#: ../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 "Незв’язувальний символ нульової ширини на третьому рівні, зв’язувальний символ нульової ширини на четвертому"
 
-#: ../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 "Іран"
-
-#: ../rules/base.extras.xml.in.h:3
-msgid "Iran - Avestan"
-msgstr "Іран — авестійська"
+msgid "APL Keyboard Symbols"
+msgstr "Клавіатурні символи APL"
 
 #: ../rules/base.extras.xml.in.h:4
-msgid "Lithuania"
-msgstr "Литовська"
+msgid "Atsina"
+msgstr "Атсінська"
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Lithuania - Dvorak"
-msgstr "Литва — Дворака"
+msgid "Avestan"
+msgstr "Авестанська"
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Ltu"
-msgstr "Лит"
-
-#: ../rules/base.extras.xml.in.h:7
-msgid "Romania"
-msgstr "Румунська"
+msgid "Couer D'alene Salish"
+msgstr "Салішська кер-д’ален"
 
 #: ../rules/base.extras.xml.in.h:8
-msgid "Romania - Ergonomic Touchtype"
-msgstr "Румунська — ергономічна для друку наосліп"
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Англійська (США, інтернаціональна, введення Unicode за допомогою AltGr)"
 
 #: ../rules/base.extras.xml.in.h:9
-msgid "Rou"
-msgstr "Рум"
-
-#: ../rules/base.extras.xml.in.h:10
-msgid "Rus"
-msgstr "Рос"
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "Англійська (США, інтернаціональна, введення Unicode за допомогою AltGr, альтернативна)"
 
 #: ../rules/base.extras.xml.in.h:11
-msgid "Russia"
-msgstr "Росія"
-
-#: ../rules/base.extras.xml.in.h:12
-msgid "Serbia"
-msgstr "Сербія"
+msgid "Kutenai"
+msgstr "Кутенай"
 
 #: ../rules/base.extras.xml.in.h:13
-msgid "Serbia - Combining accents instead of dead keys"
-msgstr "Сербія — об'єднані надбуквені знаки разом спец. клавіш"
+msgid "Latvian (US Colemak)"
+msgstr "Латвійська (США, Коулмак)"
 
 #: ../rules/base.extras.xml.in.h:14
-msgid "Srb"
-msgstr "Срб"
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Латвійська (Коулмак, США, варіант з апострофом)"
 
 #: ../rules/base.extras.xml.in.h:15
-msgid "USA"
-msgstr "США"
+msgid "Latvian (US Dvorak)"
+msgstr "Латвійська (Дворак, США)"
 
 #: ../rules/base.extras.xml.in.h:16
-msgid "USA - Atsina"
-msgstr "США — атсінська"
+msgid "Latvian (US Dvorak, Y variant)"
+msgstr "Латвійська (Дворак, США, варіант з літерою Y)"
 
 #: ../rules/base.extras.xml.in.h:17
-msgid "USA - Couer D'alene Salish"
-msgstr "США — салішська кер-д’ален"
+msgid "Latvian (US Dvorak, minus variant)"
+msgstr "Латвійська (Дворак, США, варіант з мінусом)"
 
 #: ../rules/base.extras.xml.in.h:18
-msgid "USA - International (AltGr Unicode combining)"
-msgstr "США (інтернаціональна, об'єднана з AltGr)"
+msgid "Latvian (programmer US Dvorak)"
+msgstr "Латвійська (програмістський Дворак)"
 
 #: ../rules/base.extras.xml.in.h:19
-msgid "USA - International (AltGr Unicode combining, alternative)"
-msgstr "США — інтернаціональна (об'єднана з AltGr, альтернативна)"
+msgid "Latvian (programmer US Dvorak, Y variant)"
+msgstr "Латвійська (програмістський Дворак, варіант з літерою Y)"
+
+#: ../rules/base.extras.xml.in.h:20
+msgid "Latvian (programmer US Dvorak, minus variant)"
+msgstr "Латвійська (програмістський Дворак, варіант з мінусом)"
+
+#: ../rules/base.extras.xml.in.h:22
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Литовська (Дворак, США, з литовськими літерами)"
+
+#: ../rules/base.extras.xml.in.h:25
+msgid "Polish (international with dead keys)"
+msgstr "Польська (інтернаціональна зі сліпими клавішами)"
+
+#: ../rules/base.extras.xml.in.h:27
+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:30
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr "Сербська (комбінації з акцентами замість сліпих клавіш)"
+
+#: ../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 "Афг"
+
+#~ 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 "Finnish (northern Saami)"
+#~ msgstr "Фінська (північно-саамська)"
+
+#~ msgid "GBr"
+#~ msgstr "Брит"
+
+#~ msgid "German (Romanian keyboard with German letters)"
+#~ msgstr "Німецька (румунська клавіатура з німецькими літерами)"
+
+#~ msgid "German (Romanian keyboard with German letters, eliminate dead keys)"
+#~ msgstr "Німецька (румунська клавіатура з німецькими літерами, вимкнути сліпі клавіші)"
+
+#~ msgid "Irish (Ogham)"
+#~ msgstr "Ірландська (огам)"
+
+#~ msgid "Italian (Georgian)"
+#~ msgstr "Італійська (грузинська)"
+
+#~ msgid "Kurdish (Iran, latin alt-Q)"
+#~ msgstr "Курдська (Іран, латиниця alt-Q)"
+
+#~ msgid "Māori"
+#~ msgstr "Маорійська"
+
+#~ msgid "Norwegian (Northern Saami"
+#~ msgstr "Норвезька (північно-саамська)"
+
+#~ msgid "Philippines - Dvorak (Baybayin)"
+#~ msgstr "Філіппінська (Дворак, байбаїн)"
+
+#~ msgid "Portuguese (Nativo for Esperanto)"
+#~ msgstr "Португальська (nativo для есперанто)"
+
+#~ msgid "Romanian (Crimean Tatar Dobruca-2 Q)"
+#~ msgstr "Румунська (кримськотатарська Dobruca-2 Q)"
+
+#~ msgid "Romanian (Crimean Tatar Turkish Alt-Q)"
+#~ msgstr "Румунська (кримськотатарська турецька Alt-Q)"
+
+#~ msgid "Romanian (Crimean Tatar Turkish F)"
+#~ msgstr "Румунська (кримськотатарська турецька F)"
+
+#~ msgid "Russian (Chuvash)"
+#~ msgstr "Російська (чуваська)"
+
+#~ msgid "Russian (Kalmyk)"
+#~ msgstr "Російська (калмицька)"
+
+#~ msgid "Russian (Komi)"
+#~ msgstr "Російська (Комі)"
+
+#~ msgid "Russian (Mari)"
+#~ msgstr "Російська (Марі)"
+
+#~ msgid "Russian (Ossetian, legacy)"
+#~ msgstr "Російська (осетинська, застаріла)"
+
+#~ msgid "Russian (Serbian)"
+#~ msgstr "Російська (сербська)"
+
+#~ msgid "Russian (Tatar)"
+#~ msgstr "Російська (татарська)"
+
+#~ msgid "Russian (Udmurt)"
+#~ msgstr "Російська (удмуртська)"
+
+#~ msgid "Russian (Yakut)"
+#~ msgstr "Російська (якутська)"
+
+#~ msgid "Spanish (Mac)"
+#~ msgstr "Іспанська (Mac)"
+
+#~ msgid "Swedish (northern Saami)"
+#~ msgstr "Шведська (північно-саамська)"
+
+#~ 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 "Ukrainian (standard RSTU on Russian layout)"
+#~ msgstr "Українська (стандартна RSTU на російській розкладці)"
+
+#~ msgid "irq"
+#~ msgstr "irq"
+
+#~ msgid "srp"
+#~ msgstr "srp"
+
+#~ msgid "twn"
+#~ msgstr "twn"
+
+#~ msgid "APL"
+#~ msgstr "APL"
+
+#~ msgid "Iran"
+#~ msgstr "Іран"
+
+#~ msgid "Lithuania"
+#~ msgstr "Литовська"
+
+#~ msgid "Lithuania - Dvorak"
+#~ msgstr "Литва — Дворака"
+
+#~ msgid "Ltu"
+#~ msgstr "Лит"
+
+#~ msgid "Romania"
+#~ msgstr "Румунська"
+
+#~ msgid "Rou"
+#~ msgstr "Рум"
+
+#~ msgid "Rus"
+#~ msgstr "Рос"
+
+#~ msgid "Russia"
+#~ msgstr "Росія"
+
+#~ msgid "Serbia"
+#~ msgstr "Сербія"
+
+#~ msgid "Srb"
+#~ msgstr "Срб"
+
+#~ msgid "USA"
+#~ msgstr "США"