From ef7a634b37a36fc8ac59e67fe8b6583f713a31c4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Mar 2014 13:02:45 +0100 Subject: fix fbset compile problem --- package/fbset/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/fbset/Makefile b/package/fbset/Makefile index bd8186ceb..d9b51e299 100644 --- a/package/fbset/Makefile +++ b/package/fbset/Makefile @@ -5,9 +5,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= fbset PKG_VERSION:= 2.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= e547cfcbb8c1a4f2a6b8ba4acb8b7164 PKG_DESCR:= framebuffer utility +PKG_DEPENDS:= bison-host flex-host PKG_SECTION:= utils PKG_SITES:= http://users.telenet.be/geertu/Linux/fbdev/ @@ -22,8 +23,8 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-build: - (cd ${WRKSRC} && bison -d modes.y) - (cd ${WRKSRC} && flex modes.l) + (cd ${WRKSRC} && PATH='${HOST_PATH}' bison -d modes.y) + (cd ${WRKSRC} && PATH='${HOST_PATH}' flex modes.l) ${TARGET_CC} ${TARGET_CFLAGS} -I${WRKBUILD} -c -o \ ${WRKBUILD}/modes.tab.o ${WRKSRC}/modes.tab.c ${TARGET_CC} ${TARGET_CFLAGS} -I${WRKBUILD} -c -o \ -- cgit v1.2.3 From 9311739789dd1def6b95c5a604d05f5754ec166d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Mar 2014 15:23:56 +0100 Subject: need to explicitely link dl and pthread --- package/asterisk/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 964c417df..051ad3ea3 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk PKG_VERSION:= 1.8.20.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 99204257de80a42c4e287fc93dfe714a PKG_DESCR:= Open Source PBX PKG_SECTION:= phone @@ -101,7 +101,7 @@ endif INSTALL_STYLE:= manual -TARGET_LDFLAGS+= -lm -ltinfo +TARGET_LDFLAGS+= -lm -ltinfo -ldl -lpthread MAKE_ENV= ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \ ASTLDFLAGS="${TARGET_LDFLAGS}" MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ -- cgit v1.2.3 From a93f757687841d9371975eb723678568bbc4e2da Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 10:15:33 +0100 Subject: remove dependency to intltool --- package/avahi/Makefile | 5 +++-- package/avahi/patches/patch-Makefile_am | 12 ++++++++++++ package/avahi/patches/patch-avahi-ui_Makefile_am | 19 +++++++++++++++++++ package/avahi/patches/patch-configure_ac | 10 ++++++++++ package/avahi/patches/patch-ltmain_sh | 6 +++--- 5 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 package/avahi/patches/patch-Makefile_am create mode 100644 package/avahi/patches/patch-avahi-ui_Makefile_am create mode 100644 package/avahi/patches/patch-configure_ac (limited to 'package') diff --git a/package/avahi/Makefile b/package/avahi/Makefile index fa8c56fe1..bd203e79e 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= avahi PKG_VERSION:= 0.6.31 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 2f22745b8f7368ad5a0a3fddac343f2d PKG_DESCR:= mDNS daemon PKG_SECTION:= dhcp -PKG_BUILDDEP:= libdaemon expat gdbm glib gettext-tiny gtk+ dbus +PKG_BUILDDEP:= autotool libdaemon expat gdbm glib gettext-tiny gtk+ dbus PKG_URL:= http://avahi.org/ PKG_SITES:= http://avahi.org/download/ PKG_NEED_CXX:= 1 @@ -33,6 +33,7 @@ $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEAS $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION})) $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI},${PKG_OPTS})) +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --enable-glib \ --enable-gtk2 \ --enable-libdaemon \ diff --git a/package/avahi/patches/patch-Makefile_am b/package/avahi/patches/patch-Makefile_am new file mode 100644 index 000000000..ff5160336 --- /dev/null +++ b/package/avahi/patches/patch-Makefile_am @@ -0,0 +1,12 @@ +--- avahi-0.6.31.orig/Makefile.am 2011-12-30 22:26:44.000000000 +0100 ++++ avahi-0.6.31/Makefile.am 2014-03-04 09:57:29.000000000 +0100 +@@ -75,8 +75,7 @@ SUBDIRS = \ + avahi-compat-howl \ + avahi-autoipd \ + avahi-ui \ +- avahi-ui-sharp \ +- po ++ avahi-ui-sharp + + DX_INPUT = \ + $(srcdir)/avahi-common/address.h \ diff --git a/package/avahi/patches/patch-avahi-ui_Makefile_am b/package/avahi/patches/patch-avahi-ui_Makefile_am new file mode 100644 index 000000000..c1744d9d0 --- /dev/null +++ b/package/avahi/patches/patch-avahi-ui_Makefile_am @@ -0,0 +1,19 @@ +--- avahi-0.6.31.orig/avahi-ui/Makefile.am 2012-02-14 23:22:16.000000000 +0100 ++++ avahi-0.6.31/avahi-ui/Makefile.am 2014-03-04 09:45:16.000000000 +0100 +@@ -79,9 +79,6 @@ libavahi_ui_gtk3_la_CFLAGS += -DDATABASE + endif + + bin_PROGRAMS = bssh +-desktop_DATA += bssh.desktop bvnc.desktop +-@INTLTOOL_DESKTOP_RULE@ +- + bssh_SOURCES = bssh.c + + if HAVE_GTK3 +@@ -108,6 +105,4 @@ endif # HAVE_GLIB + endif + endif + +-@INTLTOOL_DESKTOP_RULE@ +- + CLEANFILES = $(desktop_DATA) $(desktop_DATA_in) diff --git a/package/avahi/patches/patch-configure_ac b/package/avahi/patches/patch-configure_ac new file mode 100644 index 000000000..c610da2cd --- /dev/null +++ b/package/avahi/patches/patch-configure_ac @@ -0,0 +1,10 @@ +--- avahi-0.6.31.orig/configure.ac 2012-02-14 22:44:25.000000000 +0100 ++++ avahi-0.6.31/configure.ac 2014-03-04 08:05:14.000000000 +0100 +@@ -412,7 +412,6 @@ if test "x$have_kqueue" = "xyes" ; then + AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage]) + fi + +-IT_PROG_INTLTOOL([0.35.0]) + GETTEXT_PACKAGE=avahi + AC_SUBST([GETTEXT_PACKAGE]) + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) diff --git a/package/avahi/patches/patch-ltmain_sh b/package/avahi/patches/patch-ltmain_sh index c83acd926..e3bcd4083 100644 --- a/package/avahi/patches/patch-ltmain_sh +++ b/package/avahi/patches/patch-ltmain_sh @@ -1,6 +1,6 @@ ---- avahi-0.6.30.orig/ltmain.sh 2011-04-04 00:10:35.000000000 +0200 -+++ avahi-0.6.30/ltmain.sh 2011-05-12 12:30:44.000000000 +0200 -@@ -5840,7 +5840,7 @@ func_mode_link () +--- avahi-0.6.31.orig/ltmain.sh 2012-02-14 23:36:26.000000000 +0100 ++++ avahi-0.6.31/ltmain.sh 2014-03-04 07:44:03.000000000 +0100 +@@ -5853,7 +5853,7 @@ func_mode_link () # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- cgit v1.2.3 From 0755318d755d6fee3f307582e8f0efa67b893709 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 14:50:25 +0100 Subject: update xkeyboard-config, pregenerate xml files, so no dependency to intltool exist --- package/xkeyboard-config/Makefile | 12 +- package/xkeyboard-config/patches/patch-Makefile_am | 10 + .../xkeyboard-config/patches/patch-configure_ac | 13 + .../patches/patch-rules_Makefile_am | 10 + .../patches/patch-rules_base_extras_xml_in | 855 +++ .../patches/patch-rules_base_xml_in | 7654 ++++++++++++++++++++ .../patches/patch-rules_evdev_extras_xml_in | 855 +++ .../patches/patch-rules_evdev_xml_in | 7654 ++++++++++++++++++++ 8 files changed, 17059 insertions(+), 4 deletions(-) create mode 100644 package/xkeyboard-config/patches/patch-Makefile_am create mode 100644 package/xkeyboard-config/patches/patch-configure_ac create mode 100644 package/xkeyboard-config/patches/patch-rules_Makefile_am create mode 100644 package/xkeyboard-config/patches/patch-rules_base_extras_xml_in create mode 100644 package/xkeyboard-config/patches/patch-rules_base_xml_in create mode 100644 package/xkeyboard-config/patches/patch-rules_evdev_extras_xml_in create mode 100644 package/xkeyboard-config/patches/patch-rules_evdev_xml_in (limited to 'package') diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index 68a89e31e..df46bc896 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -4,18 +4,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xkeyboard-config -PKG_VERSION:= 2.6 +PKG_VERSION:= 2.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9a77cb477aec1123720332a091255f25 +PKG_MD5SUM:= e3defd29cc464cc1a1dfa0eebaca53b1 PKG_DESCR:= X keyboard config PKG_SECTION:= x11/libs -PKG_BUILDDEP:= xkbcomp -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_BUILDDEP:= autotool util-macros xkbcomp +PKG_SITES:= http://www.x.org/releases/individual/data/xkeyboard-config/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XKEYBOARD_CONFIG,xkeyboard-config,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf + xkeyboard-config-install: ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb ${CP} ${WRKINST}/usr/share/X11/xkb/* \ diff --git a/package/xkeyboard-config/patches/patch-Makefile_am b/package/xkeyboard-config/patches/patch-Makefile_am new file mode 100644 index 000000000..91f90f91b --- /dev/null +++ b/package/xkeyboard-config/patches/patch-Makefile_am @@ -0,0 +1,10 @@ +--- xkeyboard-config-2.11.orig/Makefile.am 2013-10-19 18:02:53.000000000 +0200 ++++ xkeyboard-config-2.11/Makefile.am 2014-03-04 14:43:40.000000000 +0100 +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = compat geometry keycodes po rules symbols types docs man ++SUBDIRS = compat geometry keycodes rules symbols types + + pkgconfigdir = $(datadir)/pkgconfig + pkgconfig_DATA = xkeyboard-config.pc diff --git a/package/xkeyboard-config/patches/patch-configure_ac b/package/xkeyboard-config/patches/patch-configure_ac new file mode 100644 index 000000000..2cb7cc7db --- /dev/null +++ b/package/xkeyboard-config/patches/patch-configure_ac @@ -0,0 +1,13 @@ +--- xkeyboard-config-2.11.orig/configure.ac 2014-01-29 21:08:27.000000000 +0100 ++++ xkeyboard-config-2.11/configure.ac 2014-03-04 14:43:26.000000000 +0100 +@@ -63,10 +63,6 @@ AM_CONDITIONAL(USE_COMPAT_RULES, test "x + # **** + # i18n + # **** +-AC_PROG_INTLTOOL(0.30) +- +-AM_GNU_GETTEXT_VERSION([0.18.1]) +-AM_GNU_GETTEXT([external]) + + GETTEXT_PACKAGE=xkeyboard-config + AC_SUBST(GETTEXT_PACKAGE) diff --git a/package/xkeyboard-config/patches/patch-rules_Makefile_am b/package/xkeyboard-config/patches/patch-rules_Makefile_am new file mode 100644 index 000000000..ac07e510b --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_Makefile_am @@ -0,0 +1,10 @@ +--- xkeyboard-config-2.11.orig/rules/Makefile.am 2013-12-17 23:59:06.000000000 +0100 ++++ xkeyboard-config-2.11/rules/Makefile.am 2014-03-04 14:30:44.000000000 +0100 +@@ -244,4 +244,6 @@ MAINTAINERCLEANFILES = $(srcdir)/evdev.x + rulesdir = $(xkb_base)/rules + xmldir = $(rulesdir) + +-@INTLTOOL_XML_NOMERGE_RULE@ ++# remove intltool-merge dependency ++%.xml: %.xml.in ++ cp $< $@ diff --git a/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in b/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in new file mode 100644 index 000000000..beb2b7a9d --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in @@ -0,0 +1,855 @@ +--- xkeyboard-config-2.11.orig/rules/base.extras.xml.in 2013-12-24 00:48:45.000000000 +0100 ++++ xkeyboard-config-2.11/rules/base.extras.xml.in 2014-03-04 14:31:19.000000000 +0100 +@@ -1,4 +1,4 @@ +- ++ + + + +@@ -6,8 +6,8 @@ + + + apl +- <_shortDescription>apl +- <_description>APL keyboard symbols ++ apl ++ APL keyboard symbols + eng + + +@@ -58,29 +58,29 @@ + + + ca +- <_shortDescription>fr +- <_description>French (Canada) ++ fr ++ French (Canada) + fra + + + + + kut +- <_shortDescription>kut +- <_description>Kutenai ++ kut ++ Kutenai + + + + + shs +- <_shortDescription>shs +- <_description>Secwepemctsin ++ shs ++ Secwepemctsin + + + + + sun_type6 +- <_description>Multilingual (Canada, Sun Type 6/7) ++ Multilingual (Canada, Sun Type 6/7) + + + +@@ -88,8 +88,8 @@ + + + de +- <_shortDescription>de +- <_description>German ++ de ++ German + + ger + +@@ -98,7 +98,7 @@ + + + us +- <_description>German (US keyboard with German letters) ++ German (US keyboard with German letters) + + eng + +@@ -107,7 +107,7 @@ + + + hu +- <_description>German (with Hungarian letters and no dead keys) ++ German (with Hungarian letters and no dead keys) + + ger + hun +@@ -117,7 +117,7 @@ + + + sun_type6 +- <_description>German (Sun Type 6/7) ++ German (Sun Type 6/7) + + + +@@ -125,15 +125,15 @@ + + + ir +- <_shortDescription>fa +- <_description>Persian ++ fa ++ Persian + per + + + + + ave +- <_description>Avestan ++ Avestan + ave + + +@@ -142,21 +142,21 @@ + + + lt +- <_shortDescription>lt +- <_description>Lithuanian ++ lt ++ Lithuanian + lit + + + + + us_dvorak +- <_description>Lithuanian (US Dvorak with Lithuanian letters) ++ Lithuanian (US Dvorak with Lithuanian letters) + + + + + sun_type6 +- <_description>Lithuanian (Sun Type 6/7) ++ Lithuanian (Sun Type 6/7) + + + +@@ -164,8 +164,8 @@ + + + lv +- <_shortDescription>lv +- <_description>Latvian ++ lv ++ Latvian + + lav + +@@ -174,55 +174,55 @@ + + + dvorak +- <_description>Latvian (US Dvorak) ++ Latvian (US Dvorak) + + + + + ykeydvorak +- <_description>Latvian (US Dvorak, Y variant) ++ Latvian (US Dvorak, Y variant) + + + + + minuskeydvorak +- <_description>Latvian (US Dvorak, minus variant) ++ Latvian (US Dvorak, minus variant) + + + + + dvorakprogr +- <_description>Latvian (programmer US Dvorak) ++ Latvian (programmer US Dvorak) + + + + + ykeydvorakprogr +- <_description>Latvian (programmer US Dvorak, Y variant) ++ Latvian (programmer US Dvorak, Y variant) + + + + + minuskeydvorakprogr +- <_description>Latvian (programmer US Dvorak, minus variant) ++ Latvian (programmer US Dvorak, minus variant) + + + + + colemak +- <_description>Latvian (US Colemak) ++ Latvian (US Colemak) + + + + + apostrophecolemak +- <_description>Latvian (US Colemak, apostrophe variant) ++ Latvian (US Colemak, apostrophe variant) + + + + + sun_type6 +- <_description>Latvian (Sun Type 6/7) ++ Latvian (Sun Type 6/7) + + + +@@ -230,34 +230,34 @@ + + + us +- <_shortDescription>en +- <_description>English (US) ++ en ++ English (US) + eng + + + + + intl-unicode +- <_description>English (US, international AltGr Unicode combining) ++ English (US, international AltGr Unicode combining) + + + + + alt-intl-unicode +- <_description>English (US, international AltGr Unicode combining, alternative) ++ English (US, international AltGr Unicode combining, alternative) + + + + + ats +- <_description>Atsina +- ++ Atsina ++ + + + + + crd +- <_description>Coeur d'Alene Salish ++ Coeur d'Alene Salish + crd + + +@@ -274,13 +274,13 @@ + + + sun_type6 +- <_description>English (US, Sun Type 6/7) ++ English (US, Sun Type 6/7) + + + + + norman +- <_description>English (Norman) ++ English (Norman) + + + +@@ -288,27 +288,27 @@ + + + pl +- <_shortDescription>pl +- <_description>Polish ++ pl ++ Polish + pol + + + + + intl +- <_description>Polish (international with dead keys) ++ Polish (international with dead keys) + + + + + colemak +- <_description>Polish (Colemak) ++ Polish (Colemak) + + + + + sun_type6 +- <_description>Polish (Sun Type 6/7) ++ Polish (Sun Type 6/7) + + + +@@ -316,16 +316,16 @@ + + + ro +- <_shortDescription>ro +- <_description>Romanian ++ ro ++ Romanian + rum + + + + + crh_dobruja +- <_shortDescription>crh +- <_description>Crimean Tatar (Dobruja Q) ++ crh ++ Crimean Tatar (Dobruja Q) + + crh + +@@ -334,13 +334,13 @@ + + + ergonomic +- <_description>Romanian (ergonomic Touchtype) ++ Romanian (ergonomic Touchtype) + + + + + sun_type6 +- <_description>Romanian (Sun Type 6/7) ++ Romanian (Sun Type 6/7) + + + +@@ -348,15 +348,15 @@ + + + rs +- <_shortDescription>sr +- <_description>Serbian ++ sr ++ Serbian + srp + + + + + combiningkeys +- <_description>Serbian (combining accents instead of dead keys) ++ Serbian (combining accents instead of dead keys) + + + +@@ -364,8 +364,8 @@ + + + ru +- <_shortDescription>ru +- <_description>Russian ++ ru ++ Russian + + + +@@ -378,8 +378,8 @@ + + + ruu +- <_shortDescription>ru +- <_description>Russian (with Ukrainian-Belorussian layout) ++ ru ++ Russian (with Ukrainian-Belorussian layout) + rus + ukr + bel +@@ -388,7 +388,7 @@ + + + sun_type6 +- <_description>Russian (Sun Type 6/7) ++ Russian (Sun Type 6/7) + + + +@@ -396,8 +396,8 @@ + + + am +- <_shortDescription>hy +- <_description>Armenian ++ hy ++ Armenian + + hye + +@@ -406,7 +406,7 @@ + + + olpc-phonetic +- <_description>Armenian (OLPC phonetic) ++ Armenian (OLPC phonetic) + + + +@@ -414,15 +414,15 @@ + + + il +- <_shortDescription>he +- <_description>Hebrew ++ he ++ Hebrew + heb + + + + + biblicalSIL +- <_description>Hebrew (Biblical, SIL phonetic) ++ Hebrew (Biblical, SIL phonetic) + heb + + +@@ -431,14 +431,14 @@ + + + ara +- <_shortDescription>ar +- <_description>Arabic ++ ar ++ Arabic + + + + + sun_type6 +- <_description>Arabic (Sun Type 6/7) ++ Arabic (Sun Type 6/7) + + + +@@ -446,14 +446,14 @@ + + + be +- <_shortDescription>be +- <_description>Belgian ++ be ++ Belgian + + + + + sun_type6 +- <_description>Belgian (Sun Type 6/7) ++ Belgian (Sun Type 6/7) + + + +@@ -461,14 +461,14 @@ + + + br +- <_shortDescription>pt +- <_description>Portuguese (Brazil) ++ pt ++ Portuguese (Brazil) + + + + + sun_type6 +- <_description>Portuguese (Brazil, Sun Type 6/7) ++ Portuguese (Brazil, Sun Type 6/7) + + + +@@ -476,14 +476,14 @@ + + + cz +- <_shortDescription>cs +- <_description>Czech ++ cs ++ Czech + + + + + sun_type6 +- <_description>Czech (Sun Type 6/7) ++ Czech (Sun Type 6/7) + + + +@@ -491,14 +491,14 @@ + + + dk +- <_shortDescription>da +- <_description>Danish ++ da ++ Danish + + + + + sun_type6 +- <_description>Danish (Sun Type 6/7) ++ Danish (Sun Type 6/7) + + + +@@ -506,14 +506,14 @@ + + + nl +- <_shortDescription>nl +- <_description>Dutch ++ nl ++ Dutch + + + + + sun_type6 +- <_description>Dutch (Sun Type 6/7) ++ Dutch (Sun Type 6/7) + + + +@@ -521,14 +521,14 @@ + + + ee +- <_shortDescription>et +- <_description>Estonian ++ et ++ Estonian + + + + + sun_type6 +- <_description>Estonian (Sun Type 6/7) ++ Estonian (Sun Type 6/7) + + + +@@ -536,14 +536,14 @@ + + + fi +- <_shortDescription>fi +- <_description>Finnish ++ fi ++ Finnish + + + + + sun_type6 +- <_description>Finnish (Sun Type 6/7) ++ Finnish (Sun Type 6/7) + + + +@@ -551,14 +551,14 @@ + + + fr +- <_shortDescription>fr +- <_description>French ++ fr ++ French + + + + + sun_type6 +- <_description>French (Sun Type 6/7) ++ French (Sun Type 6/7) + + + +@@ -566,14 +566,14 @@ + + + gr +- <_shortDescription>gr +- <_description>Greek ++ gr ++ Greek + + + + + sun_type6 +- <_description>Greek (Sun Type 6/7) ++ Greek (Sun Type 6/7) + + + +@@ -581,14 +581,14 @@ + + + it +- <_shortDescription>it +- <_description>Italian ++ it ++ Italian + + + + + sun_type6 +- <_description>Italian (Sun Type 6/7) ++ Italian (Sun Type 6/7) + + + +@@ -596,26 +596,26 @@ + + + jp +- <_shortDescription>ja +- <_description>Japanese ++ ja ++ Japanese + + + + + sun_type6 +- <_description>Japanese (Sun Type 6) ++ Japanese (Sun Type 6) + + + + + sun_type7 +- <_description>Japanese (Sun Type 7 - pc compatible) ++ Japanese (Sun Type 7 - pc compatible) + + + + + sun_type7_suncompat +- <_description>Japanese (Sun Type 7 - sun compatible) ++ Japanese (Sun Type 7 - sun compatible) + + + +@@ -623,14 +623,14 @@ + + + no +- <_shortDescription>no +- <_description>Norwegian ++ no ++ Norwegian + + + + + sun_type6 +- <_description>Norwegian (Sun Type 6/7) ++ Norwegian (Sun Type 6/7) + + + +@@ -638,14 +638,14 @@ + + + pt +- <_shortDescription>pt +- <_description>Portuguese ++ pt ++ Portuguese + + + + + sun_type6 +- <_description>Portuguese (Sun Type 6/7) ++ Portuguese (Sun Type 6/7) + + + +@@ -653,14 +653,14 @@ + + + sk +- <_shortDescription>sk +- <_description>Slovak ++ sk ++ Slovak + + + + + sun_type6 +- <_description>Slovak (Sun Type 6/7) ++ Slovak (Sun Type 6/7) + + + +@@ -668,14 +668,14 @@ + + + es +- <_shortDescription>es +- <_description>Spanish ++ es ++ Spanish + + + + + sun_type6 +- <_description>Spanish (Sun Type 6/7) ++ Spanish (Sun Type 6/7) + + + +@@ -683,14 +683,14 @@ + + + se +- <_shortDescription>sv +- <_description>Swedish ++ sv ++ Swedish + + + + + sun_type6 +- <_description>Swedish (Sun Type 6/7) ++ Swedish (Sun Type 6/7) + + + +@@ -698,20 +698,20 @@ + + + ch +- <_shortDescription>de +- <_description>German (Switzerland) ++ de ++ German (Switzerland) + + + + + sun_type6_de +- <_description>German (Switzerland, Sun Type 6/7) ++ German (Switzerland, Sun Type 6/7) + + + + + sun_type6_fr +- <_description>French (Switzerland, Sun Type 6/7) ++ French (Switzerland, Sun Type 6/7) + + + +@@ -719,14 +719,14 @@ + + + tr +- <_shortDescription>tr +- <_description>Turkish ++ tr ++ Turkish + + + + + sun_type6 +- <_description>Turkish (Sun Type 6/7) ++ Turkish (Sun Type 6/7) + + + +@@ -734,14 +734,14 @@ + + + ua +- <_shortDescription>uk +- <_description>Ukrainian ++ uk ++ Ukrainian + + + + + sun_type6 +- <_description>Ukrainian (Sun Type 6/7) ++ Ukrainian (Sun Type 6/7) + + + +@@ -749,14 +749,14 @@ + + + gb +- <_shortDescription>en +- <_description>English (UK) ++ en ++ English (UK) + + + + + sun_type6 +- <_description>English (UK, Sun Type 6/7) ++ English (UK, Sun Type 6/7) + + + +@@ -764,18 +764,18 @@ + + + kr +- <_shortDescription>ko +- <_description>Korean ++ ko ++ Korean + + + + + sun_type6 +- <_description>Korean (Sun Type 6/7) ++ Korean (Sun Type 6/7) + + + + + + +- ++ +\ No newline at end of file diff --git a/package/xkeyboard-config/patches/patch-rules_base_xml_in b/package/xkeyboard-config/patches/patch-rules_base_xml_in new file mode 100644 index 000000000..5249ade99 --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_base_xml_in @@ -0,0 +1,7654 @@ +--- xkeyboard-config-2.11.orig/rules/base.xml.in 2014-01-15 02:02:39.000000000 +0100 ++++ xkeyboard-config-2.11/rules/base.xml.in 2014-03-04 14:31:12.000000000 +0100 +@@ -5,627 +5,627 @@ + + + pc101 +- <_description>Generic 101-key PC ++ Generic 101-key PC + Generic + + + + + pc102 +- <_description>Generic 102-key (Intl) PC ++ Generic 102-key (Intl) PC + Generic + + + + + pc104 +- <_description>Generic 104-key PC ++ Generic 104-key PC + Generic + + + + + pc105 +- <_description>Generic 105-key (Intl) PC ++ Generic 105-key (Intl) PC + Generic + + + + + dell101 +- <_description>Dell 101-key PC ++ Dell 101-key PC + Dell + + + + + latitude +- <_description>Dell Latitude series laptop ++ Dell Latitude series laptop + Dell + + + + + dellm65 +- <_description>Dell Precision M65 ++ Dell Precision M65 + Dell + + + + + everex +- <_description>Everex STEPnote ++ Everex STEPnote + Everex + + + + + flexpro +- <_description>Keytronic FlexPro ++ Keytronic FlexPro + Keytronic + + + + + microsoft +- <_description>Microsoft Natural ++ Microsoft Natural + Microsoft Inc. + + + + + omnikey101 +- <_description>Northgate OmniKey 101 ++ Northgate OmniKey 101 + Northgate + + + + + winbook +- <_description>Winbook Model XP5 ++ Winbook Model XP5 + Generic + + + + + pc98 +- <_description>PC-98xx Series ++ PC-98xx Series + Generic + + + + + a4techKB21 +- <_description>A4Tech KB-21 ++ A4Tech KB-21 + A4Tech + + + + + a4techKBS8 +- <_description>A4Tech KBS-8 ++ A4Tech KBS-8 + A4Tech + + + + + a4_rfkb23 +- <_description>A4Tech Wireless Desktop RFKB-23 ++ A4Tech Wireless Desktop RFKB-23 + A4Tech + + + + + airkey +- <_description>Acer AirKey V ++ Acer AirKey V + Acer + + + + + azonaRF2300 +- <_description>Azona RF2300 wireless Internet Keyboard ++ Azona RF2300 wireless Internet Keyboard + Azona + + + + + scorpius +- <_description>Advance Scorpius KI ++ Advance Scorpius KI + Scorpius + + + + + brother +- <_description>Brother Internet Keyboard ++ Brother Internet Keyboard + Brother + + + + + btc5113rf +- <_description>BTC 5113RF Multimedia ++ BTC 5113RF Multimedia + BTC + + + + + btc5126t +- <_description>BTC 5126T ++ BTC 5126T + BTC + + + + + btc6301urf +- <_description>BTC 6301URF ++ BTC 6301URF + BTC + + + + + btc9000 +- <_description>BTC 9000 ++ BTC 9000 + BTC + + + + + btc9000a +- <_description>BTC 9000A ++ BTC 9000A + BTC + + + + + btc9001ah +- <_description>BTC 9001AH ++ BTC 9001AH + BTC + + + + + btc5090 +- <_description>BTC 5090 ++ BTC 5090 + BTC + + + + + btc9019u +- <_description>BTC 9019U ++ BTC 9019U + BTC + + + + + btc9116u +- <_description>BTC 9116U Mini Wireless Internet and Gaming ++ BTC 9116U Mini Wireless Internet and Gaming + + + + + cherryblue +- <_description>Cherry Blue Line CyBo@rd ++ Cherry Blue Line CyBo@rd + + + + + cherryblueb +- <_description>Cherry CyMotion Master XPress ++ Cherry CyMotion Master XPress + Cherry + + + + + cherrybluea +- <_description>Cherry Blue Line CyBo@rd (alternate option) ++ Cherry Blue Line CyBo@rd (alternate option) + Cherry + + + + + cherrycyboard +- <_description>Cherry CyBo@rd USB-Hub ++ Cherry CyBo@rd USB-Hub + Cherry + + + + + cherrycmexpert +- <_description>Cherry CyMotion Expert ++ Cherry CyMotion Expert + Cherry + + + + + cherrybunlim +- <_description>Cherry B.UNLIMITED ++ Cherry B.UNLIMITED + Cherry + + + + + chicony +- <_description>Chicony Internet Keyboard ++ Chicony Internet Keyboard + Chicony + + + + + chicony0108 +- <_description>Chicony KU-0108 ++ Chicony KU-0108 + Chicony + + + + + chicony0420 +- <_description>Chicony KU-0420 ++ Chicony KU-0420 + Chicony + + + + + chicony9885 +- <_description>Chicony KB-9885 ++ Chicony KB-9885 + Chicony + + + + + compaqeak8 +- <_description>Compaq Easy Access Keyboard ++ Compaq Easy Access Keyboard + Compaq + + + + + compaqik7 +- <_description>Compaq Internet Keyboard (7 keys) ++ Compaq Internet Keyboard (7 keys) + Compaq + + + + + compaqik13 +- <_description>Compaq Internet Keyboard (13 keys) ++ Compaq Internet Keyboard (13 keys) + Compaq + + + + + compaqik18 +- <_description>Compaq Internet Keyboard (18 keys) ++ Compaq Internet Keyboard (18 keys) + Compaq + + + + + cymotionlinux +- <_description>Cherry CyMotion Master Linux ++ Cherry CyMotion Master Linux + Cherry + + + + + armada +- <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard ++ Laptop/notebook Compaq (eg. Armada) Laptop Keyboard + Compaq + + + + + presario +- <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard ++ Laptop/notebook Compaq (eg. Presario) Internet Keyboard + Compaq + + + + + ipaq +- <_description>Compaq iPaq Keyboard ++ Compaq iPaq Keyboard + Compaq + + + + + dell +- <_description>Dell ++ Dell + Dell + + + + + dellsk8125 +- <_description>Dell SK-8125 ++ Dell SK-8125 + Dell + + + + + dellsk8135 +- <_description>Dell SK-8135 ++ Dell SK-8135 + Dell + + + + + dellusbmm +- <_description>Dell USB Multimedia Keyboard ++ Dell USB Multimedia Keyboard + Dell + + + + + inspiron +- <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx ++ Dell Laptop/notebook Inspiron 6xxx/8xxx + Dell + + + + + precision_m +- <_description>Dell Laptop/notebook Precision M series ++ Dell Laptop/notebook Precision M series + Dell + + + + + dexxa +- <_description>Dexxa Wireless Desktop Keyboard ++ Dexxa Wireless Desktop Keyboard + Dexxa + + + + + diamond +- <_description>Diamond 9801 / 9802 series ++ Diamond 9801 / 9802 series + Diamond + + + + + dtk2000 +- <_description>DTK2000 ++ DTK2000 + + + + + ennyah_dkb1008 +- <_description>Ennyah DKB-1008 ++ Ennyah DKB-1008 + Ennyah + + + + + fscaa1667g +- <_description>Fujitsu-Siemens Computers AMILO laptop ++ Fujitsu-Siemens Computers AMILO laptop + Fujitsu-Siemens + + + + + genius +- <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910 ++ Genius Comfy KB-16M / Genius MM Keyboard KWD-910 + Genius + + + + + geniuscomfy +- <_description>Genius Comfy KB-12e ++ Genius Comfy KB-12e + Genius + + + + + geniuscomfy2 +- <_description>Genius Comfy KB-21e-Scroll ++ Genius Comfy KB-21e-Scroll + Genius + + + + + geniuskb19e +- <_description>Genius KB-19e NB ++ Genius KB-19e NB + Genius + + + + + geniuskkb2050hs +- <_description>Genius KKB-2050HS ++ Genius KKB-2050HS + Genius + + + + + gyration +- <_description>Gyration ++ Gyration + Gyration + + + + + htcdream +- <_description>HTC Dream ++ HTC Dream + HTC + + + + + kinesis +- <_description>Kinesis ++ Kinesis + Kinesis + + + + + logitech_base +- <_description>Logitech Generic Keyboard ++ Logitech Generic Keyboard + Logitech + + + + + logitech_g15 +- <_description>Logitech G15 extra keys via G15daemon ++ Logitech G15 extra keys via G15daemon + Logitech + + + + + hpi6 +- <_description>Hewlett-Packard Internet Keyboard ++ Hewlett-Packard Internet Keyboard + Hewlett-Packard + + + + + hp250x +- <_description>Hewlett-Packard SK-250x Multimedia Keyboard ++ Hewlett-Packard SK-250x Multimedia Keyboard + Hewlett-Packard + + + + + hpxe3gc +- <_description>Hewlett-Packard Omnibook XE3 GC ++ Hewlett-Packard Omnibook XE3 GC + Hewlett-Packard + + + + + hpxe3gf +- <_description>Hewlett-Packard Omnibook XE3 GF ++ Hewlett-Packard Omnibook XE3 GF + Hewlett-Packard + + + + + hpxt1000 +- <_description>Hewlett-Packard Omnibook XT1000 ++ Hewlett-Packard Omnibook XT1000 + Hewlett-Packard + + + + + hpdv5 +- <_description>Hewlett-Packard Pavilion dv5 ++ Hewlett-Packard Pavilion dv5 + Hewlett-Packard + + + + + hpzt11xx +- <_description>Hewlett-Packard Pavilion ZT11xx ++ Hewlett-Packard Pavilion ZT11xx + Hewlett-Packard + + + + + hp500fa +- <_description>Hewlett-Packard Omnibook 500 FA ++ Hewlett-Packard Omnibook 500 FA + Hewlett-Packard + + + + + hp5xx +- <_description>Hewlett-Packard Omnibook 5xx ++ Hewlett-Packard Omnibook 5xx + Hewlett-Packard + + + + + hpnx9020 +- <_description>Hewlett-Packard nx9020 ++ Hewlett-Packard nx9020 + Hewlett-Packard + + + + + hp6000 +- <_description>Hewlett-Packard Omnibook 6000/6100 ++ Hewlett-Packard Omnibook 6000/6100 + Hewlett-Packard + + + + + honeywell_euroboard +- <_description>Honeywell Euroboard ++ Honeywell Euroboard + Hewlett-Packard + + + + + hpmini110 +- <_description>Hewlett-Packard Mini 110 Notebook ++ Hewlett-Packard Mini 110 Notebook + Hewlett-Packard + + + + + rapidaccess +- <_description>IBM Rapid Access ++ IBM Rapid Access + Lenovo (previously IBM) + + + + + rapidaccess2 +- <_description>IBM Rapid Access II ++ IBM Rapid Access II + Lenovo (previously IBM) + + + + + thinkpad +- <_description>IBM ThinkPad 560Z/600/600E/A22E ++ IBM ThinkPad 560Z/600/600E/A22E + Lenovo (previously IBM) + + + + + thinkpad60 +- <_description>IBM ThinkPad R60/T60/R61/T61 ++ IBM ThinkPad R60/T60/R61/T61 + Lenovo (previously IBM) + + + + + thinkpadz60 +- <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t ++ IBM ThinkPad Z60m/Z60t/Z61m/Z61t + Lenovo (previously IBM) + + + + + ibm_spacesaver +- <_description>IBM Space Saver ++ IBM Space Saver + Lenovo (previously IBM) + + + + + logiaccess +- <_description>Logitech Access Keyboard ++ Logitech Access Keyboard + Logitech + + + + + logiclx300 +- <_description>Logitech Cordless Desktop LX-300 ++ Logitech Cordless Desktop LX-300 + Logitech + + + + + logii350 +- <_description>Logitech Internet 350 Keyboard ++ Logitech Internet 350 Keyboard + Logitech + 046d:c313 + +@@ -633,665 +633,665 @@ + + + logimel +- <_description>Logitech Media Elite Keyboard ++ Logitech Media Elite Keyboard + Logitech + + + + + logicd +- <_description>Logitech Cordless Desktop ++ Logitech Cordless Desktop + Logitech + + + + + logicd_it +- <_description>Logitech Cordless Desktop iTouch ++ Logitech Cordless Desktop iTouch + Logitech + + + + + logicd_nav +- <_description>Logitech Cordless Desktop Navigator ++ Logitech Cordless Desktop Navigator + Logitech + + + + + logicd_opt +- <_description>Logitech Cordless Desktop Optical ++ Logitech Cordless Desktop Optical + Logitech + + + + + logicda +- <_description>Logitech Cordless Desktop (alternate option) ++ Logitech Cordless Desktop (alternate option) + Logitech + + + + + logicdpa2 +- <_description>Logitech Cordless Desktop Pro (alternate option 2) ++ Logitech Cordless Desktop Pro (alternate option 2) + Logitech + + + + + logicfn +- <_description>Logitech Cordless Freedom/Desktop Navigator ++ Logitech Cordless Freedom/Desktop Navigator + Logitech + + + + + logicdn +- <_description>Logitech Cordless Desktop Navigator ++ Logitech Cordless Desktop Navigator + Logitech + + + + + logiitc +- <_description>Logitech iTouch Cordless Keyboard (model Y-RB6) ++ Logitech iTouch Cordless Keyboard (model Y-RB6) + Logitech + + + + + logiik +- <_description>Logitech Internet Keyboard ++ Logitech Internet Keyboard + Logitech + + + + + itouch +- <_description>Logitech iTouch ++ Logitech iTouch + Logitech + + + + + logicink +- <_description>Logitech Internet Navigator Keyboard ++ Logitech Internet Navigator Keyboard + Logitech + + + + + logiex110 +- <_description>Logitech Cordless Desktop EX110 ++ Logitech Cordless Desktop EX110 + Logitech + + + + + logiinkse +- <_description>Logitech iTouch Internet Navigator Keyboard SE ++ Logitech iTouch Internet Navigator Keyboard SE + Logitech + + + + + logiinkseusb +- <_description>Logitech iTouch Internet Navigator Keyboard SE (USB) ++ Logitech iTouch Internet Navigator Keyboard SE (USB) + Logitech + + + + + logiultrax +- <_description>Logitech Ultra-X Keyboard ++ Logitech Ultra-X Keyboard + Logitech + + + + + logiultraxc +- <_description>Logitech Ultra-X Cordless Media Desktop Keyboard ++ Logitech Ultra-X Cordless Media Desktop Keyboard + Logitech + + + + + logidinovo +- <_description>Logitech diNovo Keyboard ++ Logitech diNovo Keyboard + Logitech + + + + + logidinovoedge +- <_description>Logitech diNovo Edge Keyboard ++ Logitech diNovo Edge Keyboard + Logitech + + + + + mx1998 +- <_description>Memorex MX1998 ++ Memorex MX1998 + Memorex + + + + + mx2500 +- <_description>Memorex MX2500 EZ-Access Keyboard ++ Memorex MX2500 EZ-Access Keyboard + Memorex + + + + + mx2750 +- <_description>Memorex MX2750 ++ Memorex MX2750 + Memorex + + + + + microsoft4000 +- <_description>Microsoft Natural Wireless Ergonomic Keyboard 4000 ++ Microsoft Natural Wireless Ergonomic Keyboard 4000 + Microsoft Inc. + + + + + microsoft7000 +- <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000 ++ Microsoft Natural Wireless Ergonomic Keyboard 7000 + Microsoft Inc. + + + + + microsoftinet +- <_description>Microsoft Internet Keyboard ++ Microsoft Internet Keyboard + Microsoft Inc. + + + + + microsoftpro +- <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro ++ Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro + Microsoft Inc. + + + + + microsoftprousb +- <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro ++ Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro + Microsoft Inc. + + + + + microsoftprooem +- <_description>Microsoft Natural Keyboard Pro OEM ++ Microsoft Natural Keyboard Pro OEM + Microsoft Inc. + + + + + vsonku306 +- <_description>ViewSonic KU-306 Internet Keyboard ++ ViewSonic KU-306 Internet Keyboard + ViewSonic + + + + + microsoftprose +- <_description>Microsoft Internet Keyboard Pro, Swedish ++ Microsoft Internet Keyboard Pro, Swedish + Microsoft Inc. + + + + + microsoftoffice +- <_description>Microsoft Office Keyboard ++ Microsoft Office Keyboard + Microsoft Inc. + + + + + microsoftmult +- <_description>Microsoft Wireless Multimedia Keyboard 1.0A ++ Microsoft Wireless Multimedia Keyboard 1.0A + Microsoft Inc. + + + + + microsoftelite +- <_description>Microsoft Natural Keyboard Elite ++ Microsoft Natural Keyboard Elite + Microsoft Inc. + + + + + microsoftccurve2k +- <_description>Microsoft Comfort Curve Keyboard 2000 ++ Microsoft Comfort Curve Keyboard 2000 + Microsoft Inc. + + + + + oretec +- <_description>Ortek MCK-800 MM/Internet keyboard ++ Ortek MCK-800 MM/Internet keyboard + Ortek + + + + + propeller +- <_description>Propeller Voyager (KTEZ-1000) ++ Propeller Voyager (KTEZ-1000) + KeyTronic + + + + + qtronix +- <_description>QTronix Scorpius 98N+ ++ QTronix Scorpius 98N+ + QTronix + + + + + samsung4500 +- <_description>Samsung SDM 4500P ++ Samsung SDM 4500P + Samsung + + + + + samsung4510 +- <_description>Samsung SDM 4510P ++ Samsung SDM 4510P + Samsung + + + + + sanwaskbkg3 +- <_description>Sanwa Supply SKB-KG3 ++ Sanwa Supply SKB-KG3 + Sanwa Supply Inc. + + + + + sk1300 +- <_description>SK-1300 ++ SK-1300 + NEC + + + + + sk2500 +- <_description>SK-2500 ++ SK-2500 + NEC + + + + + sk6200 +- <_description>SK-6200 ++ SK-6200 + NEC + + + + + sk7100 +- <_description>SK-7100 ++ SK-7100 + NEC + + + + + sp_inet +- <_description>Super Power Multimedia Keyboard ++ Super Power Multimedia Keyboard + Generic + + + + + sven +- <_description>SVEN Ergonomic 2500 ++ SVEN Ergonomic 2500 + SVEN + + + + + sven303 +- <_description>SVEN Slim 303 ++ SVEN Slim 303 + SVEN + + + + + symplon +- <_description>Symplon PaceBook (tablet PC) ++ Symplon PaceBook (tablet PC) + Symplon + + + + + toshiba_s3000 +- <_description>Toshiba Satellite S3000 ++ Toshiba Satellite S3000 + Toshiba + + + + + trust +- <_description>Trust Wireless Keyboard Classic ++ Trust Wireless Keyboard Classic + Trust + + + + + trustda +- <_description>Trust Direct Access Keyboard ++ Trust Direct Access Keyboard + Trust + + + + + trust_slimline +- <_description>Trust Slimline ++ Trust Slimline + Trust + + + + + tm2020 +- <_description>TypeMatrix EZ-Reach 2020 ++ TypeMatrix EZ-Reach 2020 + TypeMatrix + + + + + tm2030PS2 +- <_description>TypeMatrix EZ-Reach 2030 PS2 ++ TypeMatrix EZ-Reach 2030 PS2 + TypeMatrix + + + + + tm2030USB +- <_description>TypeMatrix EZ-Reach 2030 USB ++ TypeMatrix EZ-Reach 2030 USB + TypeMatrix + + + + + tm2030USB-102 +- <_description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) ++ TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) + TypeMatrix + + + + + tm2030USB-106 +- <_description>TypeMatrix EZ-Reach 2030 USB (106:JP mode) ++ TypeMatrix EZ-Reach 2030 USB (106:JP mode) + TypeMatrix + + + + + yahoo +- <_description>Yahoo! Internet Keyboard ++ Yahoo! Internet Keyboard + Yahoo! + + + + + macbook78 +- <_description>MacBook/MacBook Pro ++ MacBook/MacBook Pro + Apple + + + + + macbook79 +- <_description>MacBook/MacBook Pro (Intl) ++ MacBook/MacBook Pro (Intl) + Apple + + + + + macintosh +- <_description>Macintosh ++ Macintosh + Apple + + + + + macintosh_old +- <_description>Macintosh Old ++ Macintosh Old + Apple + + + + + macintosh_hhk +- <_description>Happy Hacking Keyboard for Mac ++ Happy Hacking Keyboard for Mac + Fujitsu + + + + + acer_c300 +- <_description>Acer C300 ++ Acer C300 + Acer + + + + + acer_ferrari4k +- <_description>Acer Ferrari 4000 ++ Acer Ferrari 4000 + Acer + + + + + acer_laptop +- <_description>Acer Laptop ++ Acer Laptop + Acer + + + + + asus_laptop +- <_description>Asus Laptop ++ Asus Laptop + Asus + + + + + apple +- <_description>Apple ++ Apple + Apple + + + + + apple_laptop +- <_description>Apple Laptop ++ Apple Laptop + Apple + + + + + applealu_ansi +- <_description>Apple Aluminium Keyboard (ANSI) ++ Apple Aluminium Keyboard (ANSI) + Apple + + + + + applealu_iso +- <_description>Apple Aluminium Keyboard (ISO) ++ Apple Aluminium Keyboard (ISO) + Apple + + + + + applealu_jis +- <_description>Apple Aluminium Keyboard (JIS) ++ Apple Aluminium Keyboard (JIS) + Apple + + + + + silvercrest +- <_description>SILVERCREST Multimedia Wireless Keyboard ++ SILVERCREST Multimedia Wireless Keyboard + Silvercrest + + + + + emachines +- <_description>Laptop/notebook eMachines m68xx ++ Laptop/notebook eMachines m68xx + eMachines + + + + + benqx +- <_description>BenQ X-Touch ++ BenQ X-Touch + BenQ + + + + + benqx730 +- <_description>BenQ X-Touch 730 ++ BenQ X-Touch 730 + BenQ + + + + + benqx800 +- <_description>BenQ X-Touch 800 ++ BenQ X-Touch 800 + BenQ + + + + + hhk +- <_description>Happy Hacking Keyboard ++ Happy Hacking Keyboard + Fujitsu + + + + + classmate +- <_description>Classmate PC ++ Classmate PC + Intel + + + + + olpc +- <_description>OLPC ++ OLPC + OLPC + + + + + sun_type7_usb +- <_description>Sun Type 7 USB ++ Sun Type 7 USB + Sun Microsystems + + + + + sun_type7_euro_usb +- <_description>Sun Type 7 USB (European layout) ++ Sun Type 7 USB (European layout) + Sun Microsystems + + + + + sun_type7_unix_usb +- <_description>Sun Type 7 USB (Unix layout) ++ Sun Type 7 USB (Unix layout) + Sun Microsystems + + + + + sun_type7_jp_usb +- <_description>Sun Type 7 USB (Japanese layout) / Japanese 106-key ++ Sun Type 7 USB (Japanese layout) / Japanese 106-key + Sun Microsystems + + + + + sun_type6_usb +- <_description>Sun Type 6/7 USB ++ Sun Type 6/7 USB + Sun Microsystems + + + + + sun_type6_euro_usb +- <_description>Sun Type 6/7 USB (European layout) ++ Sun Type 6/7 USB (European layout) + Sun Microsystems + + + + + sun_type6_unix_usb +- <_description>Sun Type 6 USB (Unix layout) ++ Sun Type 6 USB (Unix layout) + Sun Microsystems + + + + + sun_type6_jp_usb +- <_description>Sun Type 6 USB (Japanese layout) ++ Sun Type 6 USB (Japanese layout) + Sun Microsystems + + + + + sun_type6_jp +- <_description>Sun Type 6 (Japanese layout) ++ Sun Type 6 (Japanese layout) + Sun Microsystems + + + + + targa_v811 +- <_description>Targa Visionary 811 ++ Targa Visionary 811 + Targa + + + + + unitekkb1925 +- <_description>Unitek KB-1925 ++ Unitek KB-1925 + Unitek Group + + + + + compalfl90 +- <_description>FL90 ++ FL90 + Compal Electronics Inc. + + + + + creativedw7000 +- <_description>Creative Desktop Wireless 7000 ++ Creative Desktop Wireless 7000 + Creative + + + + + htcdream +- <_description>Htc Dream phone ++ Htc Dream phone + htc + + +@@ -1300,9 +1300,9 @@ + + + us +- +- <_shortDescription>en +- <_description>English (US) ++ ++ en ++ English (US) + + eng + +@@ -1311,9 +1311,9 @@ + + + chr +- +- <_shortDescription>chr +- <_description>Cherokee ++ ++ chr ++ Cherokee + + chr + +@@ -1322,75 +1322,75 @@ + + + euro +- <_description>English (US, with euro on 5) ++ English (US, with euro on 5) + + + + + intl +- <_description>English (US, international with dead keys) ++ English (US, international with dead keys) + + + + + alt-intl +- <_description>English (US, alternative international) ++ English (US, alternative international) + + + + + colemak +- <_description>English (Colemak) ++ English (Colemak) + + + + + dvorak +- <_description>English (Dvorak) ++ English (Dvorak) + + + + + dvorak-intl +- <_description>English (Dvorak, international with dead keys) ++ English (Dvorak, international with dead keys) + + + + + dvorak-alt-intl +- <_description>English (Dvorak alternative international no dead keys) ++ English (Dvorak alternative international no dead keys) + + + + + dvorak-l +- <_description>English (left handed Dvorak) ++ English (left handed Dvorak) + + + + + dvorak-r +- <_description>English (right handed Dvorak) ++ English (right handed Dvorak) + + + + + dvorak-classic +- <_description>English (classic Dvorak) ++ English (classic Dvorak) + + + + + dvp +- <_description>English (programmer Dvorak) ++ English (programmer Dvorak) + + + + + rus +- +- <_shortDescription>ru +- <_description>Russian (US, phonetic) ++ ++ ru ++ Russian (US, phonetic) + + rus + +@@ -1399,13 +1399,13 @@ + + + mac +- <_description>English (Macintosh) ++ English (Macintosh) + + + + + altgr-intl +- <_description>English (international AltGr dead keys) ++ English (international AltGr dead keys) + eng + fra + ger +@@ -1414,13 +1414,13 @@ + + + olpc2 +- <_description>English (the divide/multiply keys toggle the layout) ++ English (the divide/multiply keys toggle the layout) + + + + + hbs +- <_description>Serbo-Croatian (US) ++ Serbo-Croatian (US) + eng + bos + hbs +@@ -1431,13 +1431,13 @@ + + + workman +- <_description>English (Workman) ++ English (Workman) + + + + + workman-intl +- <_description>English (Workman, international with dead keys) ++ English (Workman, international with dead keys) + + + +@@ -1445,17 +1445,17 @@ + + + af +- +- <_shortDescription>fa +- <_description>Afghani ++ ++ fa ++ Afghani + + + + + ps +- +- <_shortDescription>ps +- <_description>Pashto ++ ++ ps ++ Pashto + + pus + +@@ -1464,9 +1464,9 @@ + + + uz +- +- <_shortDescription>uz +- <_description>Uzbek (Afghanistan) ++ ++ uz ++ Uzbek (Afghanistan) + + uzb + +@@ -1475,9 +1475,9 @@ + + + olpc-ps +- +- <_shortDescription>ps +- <_description>Pashto (Afghanistan, OLPC) ++ ++ ps ++ Pashto (Afghanistan, OLPC) + + pus + +@@ -1486,17 +1486,17 @@ + + + fa-olpc +- +- <_shortDescription>fa +- <_description>Persian (Afghanistan, Dari OLPC) ++ ++ fa ++ Persian (Afghanistan, Dari OLPC) + + + + + uz-olpc +- +- <_shortDescription>uz +- <_description>Uzbek (Afghanistan, OLPC) ++ ++ uz ++ Uzbek (Afghanistan, OLPC) + + uzb + +@@ -1507,9 +1507,9 @@ + + + ara +- +- <_shortDescription>ar +- <_description>Arabic ++ ++ ar ++ Arabic + + AE + BH +@@ -1539,37 +1539,37 @@ + + + azerty +- <_description>Arabic (azerty) ++ Arabic (azerty) + + + + + azerty_digits +- <_description>Arabic (azerty/digits) ++ Arabic (azerty/digits) + + + + + digits +- <_description>Arabic (digits) ++ Arabic (digits) + + + + + qwerty +- <_description>Arabic (qwerty) ++ Arabic (qwerty) + + + + + qwerty_digits +- <_description>Arabic (qwerty/digits) ++ Arabic (qwerty/digits) + + + + + buckwalter +- <_description>Arabic (Buckwalter) ++ Arabic (Buckwalter) + + + +@@ -1577,9 +1577,9 @@ + + + al +- +- <_shortDescription>sq +- <_description>Albanian ++ ++ sq ++ Albanian + + alb + +@@ -1589,9 +1589,9 @@ + + + am +- +- <_shortDescription>hy +- <_description>Armenian ++ ++ hy ++ Armenian + + hye + +@@ -1600,31 +1600,31 @@ + + + phonetic +- <_description>Armenian (phonetic) ++ Armenian (phonetic) + + + + + phonetic-alt +- <_description>Armenian (alternative phonetic) ++ Armenian (alternative phonetic) + + + + + eastern +- <_description>Armenian (eastern) ++ Armenian (eastern) + + + + + western +- <_description>Armenian (western) ++ Armenian (western) + + + + + eastern-alt +- <_description>Armenian (alternative eastern) ++ Armenian (alternative eastern) + + + +@@ -1632,9 +1632,9 @@ + + + at +- +- <_shortDescription>de +- <_description>German (Austria) ++ ++ de ++ German (Austria) + + ger + +@@ -1643,19 +1643,19 @@ + + + nodeadkeys +- <_description>German (Austria, eliminate dead keys) ++ German (Austria, eliminate dead keys) + + + + + sundeadkeys +- <_description>German (Austria, Sun dead keys) ++ German (Austria, Sun dead keys) + + + + + mac +- <_description>German (Austria, Macintosh) ++ German (Austria, Macintosh) + + + +@@ -1663,9 +1663,9 @@ + + + az +- +- <_shortDescription>az +- <_description>Azerbaijani ++ ++ az ++ Azerbaijani + + aze + +@@ -1674,7 +1674,7 @@ + + + cyrillic +- <_description>Azerbaijani (Cyrillic) ++ Azerbaijani (Cyrillic) + + + +@@ -1682,9 +1682,9 @@ + + + by +- +- <_shortDescription>by +- <_description>Belarusian ++ ++ by ++ Belarusian + + bel + +@@ -1693,13 +1693,13 @@ + + + legacy +- <_description>Belarusian (legacy) ++ Belarusian (legacy) + + + + + latin +- <_description>Belarusian (Latin) ++ Belarusian (Latin) + + + +@@ -1707,9 +1707,9 @@ + + + be +- +- <_shortDescription>be +- <_description>Belgian ++ ++ be ++ Belgian + ger + nld + fra +@@ -1718,43 +1718,43 @@ + + + oss +- <_description>Belgian (alternative) ++ Belgian (alternative) + + + + + oss_latin9 +- <_description>Belgian (alternative, Latin-9 only) ++ Belgian (alternative, Latin-9 only) + + + + + oss_sundeadkeys +- <_description>Belgian (alternative, Sun dead keys) ++ Belgian (alternative, Sun dead keys) + + + + + iso-alternate +- <_description>Belgian (ISO alternate) ++ Belgian (ISO alternate) + + + + + nodeadkeys +- <_description>Belgian (eliminate dead keys) ++ Belgian (eliminate dead keys) + + + + + sundeadkeys +- <_description>Belgian (Sun dead keys) ++ Belgian (Sun dead keys) + + + + + wang +- <_description>Belgian (Wang model 724 azerty) ++ Belgian (Wang model 724 azerty) + + + +@@ -1762,9 +1762,9 @@ + + + bd +- +- <_shortDescription>bn +- <_description>Bangla ++ ++ bn ++ Bangla + + ben + +@@ -1773,7 +1773,7 @@ + + + probhat +- <_description>Bangla (Probhat) ++ Bangla (Probhat) + + + +@@ -1781,17 +1781,17 @@ + + + in +- +- <_shortDescription>in +- <_description>Indian ++ ++ in ++ Indian + + + + + ben +- +- <_shortDescription>bn +- <_description>Bangla (India) ++ ++ bn ++ Bangla (India) + + ben + +@@ -1800,9 +1800,9 @@ + + + ben_probhat +- +- <_shortDescription>bn +- <_description>Bangla (India, Probhat) ++ ++ bn ++ Bangla (India, Probhat) + + ben + +@@ -1811,28 +1811,28 @@ + + + ben_baishakhi +- <_description>Bangla (India, Baishakhi) ++ Bangla (India, Baishakhi) + ben + + + + + ben_bornona +- <_description>Bangla (India, Bornona) ++ Bangla (India, Bornona) + ben + + + + + ben_gitanjali +- <_description>Bangla (India, Uni Gitanjali) ++ Bangla (India, Uni Gitanjali) + ben + + + + + ben_inscript +- <_description>Bangla (India, Baishakhi Inscript) ++ Bangla (India, Baishakhi Inscript) + ben + + +@@ -1846,9 +1846,9 @@ + + + guj +- +- <_shortDescription>gu +- <_description>Gujarati ++ ++ gu ++ Gujarati + + guj + +@@ -1857,9 +1857,9 @@ + + + guru +- +- <_shortDescription>pa +- <_description>Punjabi (Gurmukhi) ++ ++ pa ++ Punjabi (Gurmukhi) + + pan + +@@ -1868,9 +1868,9 @@ + + + jhelum +- +- <_shortDescription>pa +- <_description>Punjabi (Gurmukhi Jhelum) ++ ++ pa ++ Punjabi (Gurmukhi Jhelum) + + pan + +@@ -1879,9 +1879,9 @@ + + + kan +- +- <_shortDescription>kn +- <_description>Kannada ++ ++ kn ++ Kannada + + kan + +@@ -1890,9 +1890,9 @@ + + + kan-kagapa +- +- <_shortDescription>kn +- <_description>Kannada (KaGaPa phonetic) ++ ++ kn ++ Kannada (KaGaPa phonetic) + + kan + +@@ -1901,9 +1901,9 @@ + + + mal +- +- <_shortDescription>ml +- <_description>Malayalam ++ ++ ml ++ Malayalam + + mal + +@@ -1912,9 +1912,9 @@ + + + mal_lalitha +- +- <_shortDescription>ml +- <_description>Malayalam (Lalitha) ++ ++ ml ++ Malayalam (Lalitha) + + mal + +@@ -1923,18 +1923,18 @@ + + + mal_enhanced +- +- <_shortDescription>ml +- <_description>Malayalam (enhanced Inscript with Rupee Sign) ++ ++ ml ++ Malayalam (enhanced Inscript with Rupee Sign) + mal + + + + + ori +- +- <_shortDescription>or +- <_description>Oriya ++ ++ or ++ Oriya + + ori + +@@ -1943,9 +1943,9 @@ + + + tam_unicode +- +- <_shortDescription>ta +- <_description>Tamil (Unicode) ++ ++ ta ++ Tamil (Unicode) + + tam + +@@ -1954,9 +1954,9 @@ + + + tam_keyboard_with_numerals +- +- <_shortDescription>ta +- <_description>Tamil (keyboard with numerals) ++ ++ ta ++ Tamil (keyboard with numerals) + + tam + +@@ -1965,9 +1965,9 @@ + + + tam_TAB +- +- <_shortDescription>ta +- <_description>Tamil (TAB typewriter) ++ ++ ta ++ Tamil (TAB typewriter) + + tam + +@@ -1976,9 +1976,9 @@ + + + tam_TSCII +- +- <_shortDescription>ta +- <_description>Tamil (TSCII typewriter) ++ ++ ta ++ Tamil (TSCII typewriter) + + tam + +@@ -1987,9 +1987,9 @@ + + + tam +- +- <_shortDescription>ta +- <_description>Tamil ++ ++ ta ++ Tamil + + tam + +@@ -1998,9 +1998,9 @@ + + + tel +- +- <_shortDescription>te +- <_description>Telugu ++ ++ te ++ Telugu + + tel + +@@ -2009,9 +2009,9 @@ + + + tel-kagapa +- +- <_shortDescription>te +- <_description>Telugu (KaGaPa phonetic) ++ ++ te ++ Telugu (KaGaPa phonetic) + + tel + +@@ -2020,9 +2020,9 @@ + + + urd-phonetic +- +- <_shortDescription>ur +- <_description>Urdu (phonetic) ++ ++ ur ++ Urdu (phonetic) + + urd + +@@ -2031,9 +2031,9 @@ + + + urd-phonetic3 +- +- <_shortDescription>ur +- <_description>Urdu (alternative phonetic) ++ ++ ur ++ Urdu (alternative phonetic) + + urd + +@@ -2042,9 +2042,9 @@ + + + urd-winkeys +- +- <_shortDescription>ur +- <_description>Urdu (WinKeys) ++ ++ ur ++ Urdu (WinKeys) + + urd + +@@ -2053,9 +2053,9 @@ + + + bolnagri +- +- <_shortDescription>hi +- <_description>Hindi (Bolnagri) ++ ++ hi ++ Hindi (Bolnagri) + + hin + +@@ -2064,9 +2064,9 @@ + + + hin-wx +- +- <_shortDescription>hi +- <_description>Hindi (Wx) ++ ++ hi ++ Hindi (Wx) + + hin + +@@ -2075,9 +2075,9 @@ + + + hin-kagapa +- +- <_shortDescription>hi +- <_description>Hindi (KaGaPa phonetic) ++ ++ hi ++ Hindi (KaGaPa phonetic) + + hin + +@@ -2086,9 +2086,9 @@ + + + san-kagapa +- +- <_shortDescription>sa +- <_description>Sanskrit (KaGaPa phonetic) ++ ++ sa ++ Sanskrit (KaGaPa phonetic) + + san + +@@ -2097,9 +2097,9 @@ + + + mar-kagapa +- +- <_shortDescription>mr +- <_description>Marathi (KaGaPa phonetic) ++ ++ mr ++ Marathi (KaGaPa phonetic) + + mar + +@@ -2108,9 +2108,9 @@ + + + eng +- +- <_shortDescription>en +- <_description>English (India, with RupeeSign) ++ ++ en ++ English (India, with RupeeSign) + + eng + +@@ -2121,9 +2121,9 @@ + + + ba +- +- <_shortDescription>bs +- <_description>Bosnian ++ ++ bs ++ Bosnian + + bos + +@@ -2132,25 +2132,25 @@ + + + alternatequotes +- <_description>Bosnian (use guillemets for quotes) ++ Bosnian (use guillemets for quotes) + + + + + unicode +- <_description>Bosnian (use Bosnian digraphs) ++ Bosnian (use Bosnian digraphs) + + + + + unicodeus +- <_description>Bosnian (US keyboard with Bosnian digraphs) ++ Bosnian (US keyboard with Bosnian digraphs) + + + + + us +- <_description>Bosnian (US keyboard with Bosnian letters) ++ Bosnian (US keyboard with Bosnian letters) + + + +@@ -2158,9 +2158,9 @@ + + + br +- +- <_shortDescription>pt +- <_description>Portuguese (Brazil) ++ ++ pt ++ Portuguese (Brazil) + + por + +@@ -2169,31 +2169,31 @@ + + + nodeadkeys +- <_description>Portuguese (Brazil, eliminate dead keys) ++ Portuguese (Brazil, eliminate dead keys) + + + + + dvorak +- <_description>Portuguese (Brazil, Dvorak) ++ Portuguese (Brazil, Dvorak) + + + + + nativo +- <_description>Portuguese (Brazil, Nativo) ++ Portuguese (Brazil, Nativo) + + + + + nativo-us +- <_description>Portuguese (Brazil, Nativo for US keyboards) ++ Portuguese (Brazil, Nativo for US keyboards) + + + + + nativo-epo +- <_description>Esperanto (Brazil, Nativo) ++ Esperanto (Brazil, Nativo) + + epo + +@@ -2204,9 +2204,9 @@ + + + bg +- +- <_shortDescription>bg +- <_description>Bulgarian ++ ++ bg ++ Bulgarian + + bul + +@@ -2215,13 +2215,13 @@ + + + phonetic +- <_description>Bulgarian (traditional phonetic) ++ Bulgarian (traditional phonetic) + + + + + bas_phonetic +- <_description>Bulgarian (new phonetic) ++ Bulgarian (new phonetic) + + + +@@ -2229,17 +2229,17 @@ + + + ma +- +- <_shortDescription>ar +- <_description>Arabic (Morocco) ++ ++ ar ++ Arabic (Morocco) + + + + + french +- +- <_shortDescription>fr +- <_description>French (Morocco) ++ ++ fr ++ French (Morocco) + + fra + +@@ -2248,9 +2248,9 @@ + + + tifinagh +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh) ++ ++ ber ++ Berber (Morocco, Tifinagh) + + ber + +@@ -2259,9 +2259,9 @@ + + + tifinagh-alt +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh alternative) ++ ++ ber ++ Berber (Morocco, Tifinagh alternative) + + ber + +@@ -2270,9 +2270,9 @@ + + + tifinagh-alt-phonetic +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh alternative phonetic) ++ ++ ber ++ Berber (Morocco, Tifinagh alternative phonetic) + + ber + +@@ -2281,9 +2281,9 @@ + + + tifinagh-extended +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh extended) ++ ++ ber ++ Berber (Morocco, Tifinagh extended) + + ber + +@@ -2292,9 +2292,9 @@ + + + tifinagh-phonetic +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh phonetic) ++ ++ ber ++ Berber (Morocco, Tifinagh phonetic) + + ber + +@@ -2303,9 +2303,9 @@ + + + tifinagh-extended-phonetic +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh extended phonetic) ++ ++ ber ++ Berber (Morocco, Tifinagh extended phonetic) + + ber + +@@ -2316,23 +2316,23 @@ + + + cm +- +- <_shortDescription>cm +- <_description>English (Cameroon) ++ ++ cm ++ English (Cameroon) + eng + + + + + french +- <_description>French (Cameroon) ++ French (Cameroon) + fra + + + + + qwerty +- <_description>Cameroon Multilingual (qwerty) ++ Cameroon Multilingual (qwerty) + + eng + bas +@@ -2369,7 +2369,7 @@ + + + azerty +- <_description>Cameroon Multilingual (azerty) ++ Cameroon Multilingual (azerty) + + fra + bas +@@ -2406,7 +2406,7 @@ + + + dvorak +- <_description>Cameroon Multilingual (Dvorak) ++ Cameroon Multilingual (Dvorak) + + + +@@ -2414,9 +2414,9 @@ + + + mm +- +- <_shortDescription>my +- <_description>Burmese ++ ++ my ++ Burmese + + mya + +@@ -2426,9 +2426,9 @@ + + + ca +- +- <_shortDescription>fr +- <_description>French (Canada) ++ ++ fr ++ French (Canada) + + fra + +@@ -2437,43 +2437,43 @@ + + + fr-dvorak +- +- <_shortDescription>fr +- <_description>French (Canada, Dvorak) ++ ++ fr ++ French (Canada, Dvorak) + + + + + fr-legacy +- +- <_shortDescription>fr +- <_description>French (Canada, legacy) ++ ++ fr ++ French (Canada, legacy) + + + + + multix +- <_description>Canadian Multilingual ++ Canadian Multilingual + + + + + multi +- <_description>Canadian Multilingual (first part) ++ Canadian Multilingual (first part) + + + + + multi-2gr +- <_description>Canadian Multilingual (second part) ++ Canadian Multilingual (second part) + + + + + ike +- +- <_shortDescription>ike +- <_description>Inuktitut ++ ++ ike ++ Inuktitut + + iku + +@@ -2482,9 +2482,9 @@ + + + eng +- +- <_shortDescription>en +- <_description>English (Canada) ++ ++ en ++ English (Canada) + + eng + +@@ -2495,9 +2495,9 @@ + + + cd +- +- <_shortDescription>fr +- <_description>French (Democratic Republic of the Congo) ++ ++ fr ++ French (Democratic Republic of the Congo) + + fra + +@@ -2507,9 +2507,9 @@ + + + cn +- +- <_shortDescription>zh +- <_description>Chinese ++ ++ zh ++ Chinese + + chi + +@@ -2518,7 +2518,7 @@ + + + tib +- <_description>Tibetan ++ Tibetan + + tib + +@@ -2527,7 +2527,7 @@ + + + tib_asciinum +- <_description>Tibetan (with ASCII numerals) ++ Tibetan (with ASCII numerals) + + tib + +@@ -2536,8 +2536,8 @@ + + + ug +- <_shortDescription>ug +- <_description>Uyghur ++ ug ++ Uyghur + + ug + +@@ -2548,9 +2548,9 @@ + + + hr +- +- <_shortDescription>hr +- <_description>Croatian ++ ++ hr ++ Croatian + + hrv + +@@ -2559,25 +2559,25 @@ + + + alternatequotes +- <_description>Croatian (use guillemets for quotes) ++ Croatian (use guillemets for quotes) + + + + + unicode +- <_description>Croatian (use Croatian digraphs) ++ Croatian (use Croatian digraphs) + + + + + unicodeus +- <_description>Croatian (US keyboard with Croatian digraphs) ++ Croatian (US keyboard with Croatian digraphs) + + + + + us +- <_description>Croatian (US keyboard with Croatian letters) ++ Croatian (US keyboard with Croatian letters) + + + +@@ -2585,9 +2585,9 @@ + + + cz +- +- <_shortDescription>cs +- <_description>Czech ++ ++ cs ++ Czech + + cze + +@@ -2596,31 +2596,31 @@ + + + bksl +- <_description>Czech (with <\|> key) ++ Czech (with <\|> key) + + + + + qwerty +- <_description>Czech (qwerty) ++ Czech (qwerty) + + + + + qwerty_bksl +- <_description>Czech (qwerty, extended Backslash) ++ Czech (qwerty, extended Backslash) + + + + + ucw +- <_description>Czech (UCW layout, accented letters only) ++ Czech (UCW layout, accented letters only) + + + + + dvorak-ucw +- <_description>Czech (US Dvorak with CZ UCW support) ++ Czech (US Dvorak with CZ UCW support) + + + +@@ -2628,9 +2628,9 @@ + + + dk +- +- <_shortDescription>da +- <_description>Danish ++ ++ da ++ Danish + + dan + +@@ -2639,25 +2639,25 @@ + + + nodeadkeys +- <_description>Danish (eliminate dead keys) ++ Danish (eliminate dead keys) + + + + + mac +- <_description>Danish (Macintosh) ++ Danish (Macintosh) + + + + + mac_nodeadkeys +- <_description>Danish (Macintosh, eliminate dead keys) ++ Danish (Macintosh, eliminate dead keys) + + + + + dvorak +- <_description>Danish (Dvorak) ++ Danish (Dvorak) + + + +@@ -2665,9 +2665,9 @@ + + + nl +- +- <_shortDescription>nl +- <_description>Dutch ++ ++ nl ++ Dutch + + nld + +@@ -2676,19 +2676,19 @@ + + + sundeadkeys +- <_description>Dutch (Sun dead keys) ++ Dutch (Sun dead keys) + + + + + mac +- <_description>Dutch (Macintosh) ++ Dutch (Macintosh) + + + + + std +- <_description>Dutch (standard) ++ Dutch (standard) + + + +@@ -2696,9 +2696,9 @@ + + + bt +- +- <_shortDescription>dz +- <_description>Dzongkha ++ ++ dz ++ Dzongkha + + dzo + +@@ -2707,9 +2707,9 @@ + + + ee +- +- <_shortDescription>et +- <_description>Estonian ++ ++ et ++ Estonian + + est + +@@ -2718,19 +2718,19 @@ + + + nodeadkeys +- <_description>Estonian (eliminate dead keys) ++ Estonian (eliminate dead keys) + + + + + dvorak +- <_description>Estonian (Dvorak) ++ Estonian (Dvorak) + + + + + us +- <_description>Estonian (US keyboard with Estonian letters) ++ Estonian (US keyboard with Estonian letters) + + + +@@ -2738,9 +2738,9 @@ + + + ir +- +- <_shortDescription>fa +- <_description>Persian ++ ++ fa ++ Persian + + per + +@@ -2749,15 +2749,15 @@ + + + pes_keypad +- <_description>Persian (with Persian Keypad) ++ Persian (with Persian Keypad) + + + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, Latin Q) ++ ++ ku ++ Kurdish (Iran, Latin Q) + + kur + +@@ -2766,9 +2766,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, F) ++ ++ ku ++ Kurdish (Iran, F) + + kur + +@@ -2777,9 +2777,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, Latin Alt-Q) ++ ++ ku ++ Kurdish (Iran, Latin Alt-Q) + + kur + +@@ -2788,9 +2788,9 @@ + + + ku_ara +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, Arabic-Latin) ++ ++ ku ++ Kurdish (Iran, Arabic-Latin) + + kur + +@@ -2801,9 +2801,9 @@ + + + iq +- +- <_shortDescription>ar +- <_description>Iraqi ++ ++ ar ++ Iraqi + ara + kur + +@@ -2811,9 +2811,9 @@ + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, Latin Q) ++ ++ ku ++ Kurdish (Iraq, Latin Q) + + kur + +@@ -2822,9 +2822,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, F) ++ ++ ku ++ Kurdish (Iraq, F) + + kur + +@@ -2833,9 +2833,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, Latin Alt-Q) ++ ++ ku ++ Kurdish (Iraq, Latin Alt-Q) + + kur + +@@ -2844,9 +2844,9 @@ + + + ku_ara +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, Arabic-Latin) ++ ++ ku ++ Kurdish (Iraq, Arabic-Latin) + + kur + +@@ -2857,9 +2857,9 @@ + + + fo +- +- <_shortDescription>fo +- <_description>Faroese ++ ++ fo ++ Faroese + + fao + +@@ -2868,7 +2868,7 @@ + + + nodeadkeys +- <_description>Faroese (eliminate dead keys) ++ Faroese (eliminate dead keys) + + + +@@ -2876,9 +2876,9 @@ + + + fi +- +- <_shortDescription>fi +- <_description>Finnish ++ ++ fi ++ Finnish + + fin + +@@ -2887,26 +2887,26 @@ + + + classic +- <_description>Finnish (classic) ++ Finnish (classic) + + + + + nodeadkeys +- <_description>Finnish (classic, eliminate dead keys) ++ Finnish (classic, eliminate dead keys) + + + + + smi +- <_description>Northern Saami (Finland) ++ Northern Saami (Finland) + sme + + + + + mac +- <_description>Finnish (Macintosh) ++ Finnish (Macintosh) + + + +@@ -2914,9 +2914,9 @@ + + + fr +- +- <_shortDescription>fr +- <_description>French ++ ++ fr ++ French + + fra + +@@ -2925,91 +2925,91 @@ + + + nodeadkeys +- <_description>French (eliminate dead keys) ++ French (eliminate dead keys) + + + + + sundeadkeys +- <_description>French (Sun dead keys) ++ French (Sun dead keys) + + + + + oss +- <_description>French (alternative) ++ French (alternative) + + + + + oss_latin9 +- <_description>French (alternative, Latin-9 only) ++ French (alternative, Latin-9 only) + + + + + oss_nodeadkeys +- <_description>French (alternative, eliminate dead keys) ++ French (alternative, eliminate dead keys) + + + + + oss_sundeadkeys +- <_description>French (alternative, Sun dead keys) ++ French (alternative, Sun dead keys) + + + + + latin9 +- <_description>French (legacy, alternative) ++ French (legacy, alternative) + + + + + latin9_nodeadkeys +- <_description>French (legacy, alternative, eliminate dead keys) ++ French (legacy, alternative, eliminate dead keys) + + + + + latin9_sundeadkeys +- <_description>French (legacy, alternative, Sun dead keys) ++ French (legacy, alternative, Sun dead keys) + + + + + bepo +- <_description>French (Bepo, ergonomic, Dvorak way) ++ French (Bepo, ergonomic, Dvorak way) + + + + + bepo_latin9 +- <_description>French (Bepo, ergonomic, Dvorak way, Latin-9 only) ++ French (Bepo, ergonomic, Dvorak way, Latin-9 only) + + + + + dvorak +- <_description>French (Dvorak) ++ French (Dvorak) + + + + + mac +- <_description>French (Macintosh) ++ French (Macintosh) + + + + + bre +- <_description>French (Breton) ++ French (Breton) + + + + + oci +- <_description>Occitan ++ Occitan + + oci + +@@ -3018,7 +3018,7 @@ + + + geo +- <_description>Georgian (France, AZERTY Tskapo) ++ Georgian (France, AZERTY Tskapo) + + geo + +@@ -3029,9 +3029,9 @@ + + + gh +- +- <_shortDescription>en +- <_description>English (Ghana) ++ ++ en ++ English (Ghana) + + eng + +@@ -3040,15 +3040,15 @@ + + + generic +- <_description>English (Ghana, multilingual) ++ English (Ghana, multilingual) + + + + + akan +- +- <_shortDescription>ak +- <_description>Akan ++ ++ ak ++ Akan + + aka + +@@ -3057,9 +3057,9 @@ + + + ewe +- +- <_shortDescription>ee +- <_description>Ewe ++ ++ ee ++ Ewe + + ewe + +@@ -3068,9 +3068,9 @@ + + + fula +- +- <_shortDescription>ff +- <_description>Fula ++ ++ ff ++ Fula + + ful + +@@ -3079,9 +3079,9 @@ + + + ga +- +- <_shortDescription>gaa +- <_description>Ga ++ ++ gaa ++ Ga + + gaa + +@@ -3090,9 +3090,9 @@ + + + hausa +- +- <_shortDescription>ha +- <_description>Hausa ++ ++ ha ++ Hausa + + hau + +@@ -3101,9 +3101,9 @@ + + + avn +- +- <_shortDescription>avn +- <_description>Avatime ++ ++ avn ++ Avatime + + avn + +@@ -3112,7 +3112,7 @@ + + + gillbt +- <_description>English (Ghana, GILLBT) ++ English (Ghana, GILLBT) + + + +@@ -3120,9 +3120,9 @@ + + + gn +- +- <_shortDescription>fr +- <_description>French (Guinea) ++ ++ fr ++ French (Guinea) + + fra + +@@ -3132,9 +3132,9 @@ + + + ge +- +- <_shortDescription>ka +- <_description>Georgian ++ ++ ka ++ Georgian + + geo + +@@ -3143,21 +3143,21 @@ + + + ergonomic +- <_description>Georgian (ergonomic) ++ Georgian (ergonomic) + + + + + mess +- <_description>Georgian (MESS) ++ Georgian (MESS) + + + + + ru +- +- <_shortDescription>ru +- <_description>Russian (Georgia) ++ ++ ru ++ Russian (Georgia) + + rus + +@@ -3166,7 +3166,7 @@ + + + os +- <_description>Ossetian (Georgia) ++ Ossetian (Georgia) + + oss + +@@ -3177,9 +3177,9 @@ + + + de +- +- <_shortDescription>de +- <_description>German ++ ++ de ++ German + + ger + +@@ -3188,75 +3188,75 @@ + + + deadacute +- <_description>German (dead acute) ++ German (dead acute) + + + + + deadgraveacute +- <_description>German (dead grave acute) ++ German (dead grave acute) + + + + + nodeadkeys +- <_description>German (eliminate dead keys) ++ German (eliminate dead keys) + + + + + T3 +- <_description>German (T3) ++ German (T3) + + + + + ro +- <_description>Romanian (Germany) ++ Romanian (Germany) + rum + + + + + ro_nodeadkeys +- <_description>Romanian (Germany, eliminate dead keys) ++ Romanian (Germany, eliminate dead keys) + rum + + + + + dvorak +- <_description>German (Dvorak) ++ German (Dvorak) + + + + + sundeadkeys +- <_description>German (Sun dead keys) ++ German (Sun dead keys) + + + + + neo +- <_description>German (Neo 2) ++ German (Neo 2) + + + + + mac +- <_description>German (Macintosh) ++ German (Macintosh) + + + + + mac_nodeadkeys +- <_description>German (Macintosh, eliminate dead keys) ++ German (Macintosh, eliminate dead keys) + + + + + dsb +- <_description>Lower Sorbian ++ Lower Sorbian + + dsb + +@@ -3265,7 +3265,7 @@ + + + dsb_qwertz +- <_description>Lower Sorbian (qwertz) ++ Lower Sorbian (qwertz) + + dsb + +@@ -3274,15 +3274,15 @@ + + + qwerty +- <_description>German (qwerty) ++ German (qwerty) + + + + + ru +- +- <_shortDescription>ru +- <_description>Russian (Germany, phonetic) ++ ++ ru ++ Russian (Germany, phonetic) + + rus + +@@ -3291,7 +3291,7 @@ + + + legacy +- <_description>German (legacy) ++ German (legacy) + + + +@@ -3299,9 +3299,9 @@ + + + gr +- +- <_shortDescription>gr +- <_description>Greek ++ ++ gr ++ Greek + + gre + +@@ -3310,25 +3310,25 @@ + + + simple +- <_description>Greek (simple) ++ Greek (simple) + + + + + extended +- <_description>Greek (extended) ++ Greek (extended) + + + + + nodeadkeys +- <_description>Greek (eliminate dead keys) ++ Greek (eliminate dead keys) + + + + + polytonic +- <_description>Greek (polytonic) ++ Greek (polytonic) + + + +@@ -3336,9 +3336,9 @@ + + + hu +- +- <_shortDescription>hu +- <_description>Hungarian ++ ++ hu ++ Hungarian + + hun + +@@ -3347,115 +3347,115 @@ + + + standard +- <_description>Hungarian (standard) ++ Hungarian (standard) + + + + + nodeadkeys +- <_description>Hungarian (eliminate dead keys) ++ Hungarian (eliminate dead keys) + + + + + qwerty +- <_description>Hungarian (qwerty) ++ Hungarian (qwerty) + + + + + 101_qwertz_comma_dead +- <_description>Hungarian (101/qwertz/comma/dead keys) ++ Hungarian (101/qwertz/comma/dead keys) + + + + + 101_qwertz_comma_nodead +- <_description>Hungarian (101/qwertz/comma/eliminate dead keys) ++ Hungarian (101/qwertz/comma/eliminate dead keys) + + + + + 101_qwertz_dot_dead +- <_description>Hungarian (101/qwertz/dot/dead keys) ++ Hungarian (101/qwertz/dot/dead keys) + + + + + 101_qwertz_dot_nodead +- <_description>Hungarian (101/qwertz/dot/eliminate dead keys) ++ Hungarian (101/qwertz/dot/eliminate dead keys) + + + + + 101_qwerty_comma_dead +- <_description>Hungarian (101/qwerty/comma/dead keys) ++ Hungarian (101/qwerty/comma/dead keys) + + + + + 101_qwerty_comma_nodead +- <_description>Hungarian (101/qwerty/comma/eliminate dead keys) ++ Hungarian (101/qwerty/comma/eliminate dead keys) + + + + + 101_qwerty_dot_dead +- <_description>Hungarian (101/qwerty/dot/dead keys) ++ Hungarian (101/qwerty/dot/dead keys) + + + + + 101_qwerty_dot_nodead +- <_description>Hungarian (101/qwerty/dot/eliminate dead keys) ++ Hungarian (101/qwerty/dot/eliminate dead keys) + + + + + 102_qwertz_comma_dead +- <_description>Hungarian (102/qwertz/comma/dead keys) ++ Hungarian (102/qwertz/comma/dead keys) + + + + + 102_qwertz_comma_nodead +- <_description>Hungarian (102/qwertz/comma/eliminate dead keys) ++ Hungarian (102/qwertz/comma/eliminate dead keys) + + + + + 102_qwertz_dot_dead +- <_description>Hungarian (102/qwertz/dot/dead keys) ++ Hungarian (102/qwertz/dot/dead keys) + + + + + 102_qwertz_dot_nodead +- <_description>Hungarian (102/qwertz/dot/eliminate dead keys) ++ Hungarian (102/qwertz/dot/eliminate dead keys) + + + + + 102_qwerty_comma_dead +- <_description>Hungarian (102/qwerty/comma/dead keys) ++ Hungarian (102/qwerty/comma/dead keys) + + + + + 102_qwerty_comma_nodead +- <_description>Hungarian (102/qwerty/comma/eliminate dead keys) ++ Hungarian (102/qwerty/comma/eliminate dead keys) + + + + + 102_qwerty_dot_dead +- <_description>Hungarian (102/qwerty/dot/dead keys) ++ Hungarian (102/qwerty/dot/dead keys) + + + + + 102_qwerty_dot_nodead +- <_description>Hungarian (102/qwerty/dot/eliminate dead keys) ++ Hungarian (102/qwerty/dot/eliminate dead keys) + + + +@@ -3463,9 +3463,9 @@ + + + is +- +- <_shortDescription>is +- <_description>Icelandic ++ ++ is ++ Icelandic + + ice + +@@ -3474,25 +3474,25 @@ + + + Sundeadkeys +- <_description>Icelandic (Sun dead keys) ++ Icelandic (Sun dead keys) + + + + + nodeadkeys +- <_description>Icelandic (eliminate dead keys) ++ Icelandic (eliminate dead keys) + + + + + mac +- <_description>Icelandic (Macintosh) ++ Icelandic (Macintosh) + + + + + dvorak +- <_description>Icelandic (Dvorak) ++ Icelandic (Dvorak) + + + +@@ -3500,9 +3500,9 @@ + + + il +- +- <_shortDescription>he +- <_description>Hebrew ++ ++ he ++ Hebrew + + heb + +@@ -3511,19 +3511,19 @@ + + + lyx +- <_description>Hebrew (lyx) ++ Hebrew (lyx) + + + + + phonetic +- <_description>Hebrew (phonetic) ++ Hebrew (phonetic) + + + + + biblical +- <_description>Hebrew (Biblical, Tiro) ++ Hebrew (Biblical, Tiro) + + + +@@ -3531,9 +3531,9 @@ + + + it +- +- <_shortDescription>it +- <_description>Italian ++ ++ it ++ Italian + + ita + +@@ -3542,25 +3542,25 @@ + + + nodeadkeys +- <_description>Italian (eliminate dead keys) ++ Italian (eliminate dead keys) + + + + + mac +- <_description>Italian (Macintosh) ++ Italian (Macintosh) + + + + + us +- <_description>Italian (US keyboard with Italian letters) ++ Italian (US keyboard with Italian letters) + + + + + geo +- <_description>Georgian (Italy) ++ Georgian (Italy) + + geo + +@@ -3569,7 +3569,7 @@ + + + ibm +- <_description>Italian (IBM 142) ++ Italian (IBM 142) + + + +@@ -3577,9 +3577,9 @@ + + + jp +- +- <_shortDescription>ja +- <_description>Japanese ++ ++ ja ++ Japanese + + jpn + +@@ -3588,31 +3588,31 @@ + + + kana +- <_description>Japanese (Kana) ++ Japanese (Kana) + + + + + kana86 +- <_description>Japanese (Kana 86) ++ Japanese (Kana 86) + + + + + OADG109A +- <_description>Japanese (OADG 109A) ++ Japanese (OADG 109A) + + + + + mac +- <_description>Japanese (Macintosh) ++ Japanese (Macintosh) + + + + + dvorak +- <_description>Japanese (Dvorak) ++ Japanese (Dvorak) + + + +@@ -3620,9 +3620,9 @@ + + + kg +- +- <_shortDescription>ki +- <_description>Kyrgyz ++ ++ ki ++ Kyrgyz + + kir + +@@ -3631,7 +3631,7 @@ + + + phonetic +- <_description>Kyrgyz (phonetic) ++ Kyrgyz (phonetic) + + + +@@ -3639,9 +3639,9 @@ + + + kh +- +- <_shortDescription>km +- <_description>Khmer (Cambodia) ++ ++ km ++ Khmer (Cambodia) + + khm + +@@ -3651,9 +3651,9 @@ + + + kz +- +- <_shortDescription>kk +- <_description>Kazakh ++ ++ kk ++ Kazakh + + kaz + +@@ -3662,9 +3662,9 @@ + + + ruskaz +- +- <_shortDescription>ru +- <_description>Russian (Kazakhstan, with Kazakh) ++ ++ ru ++ Russian (Kazakhstan, with Kazakh) + kaz + rus + +@@ -3672,7 +3672,7 @@ + + + kazrus +- <_description>Kazakh (with Russian) ++ Kazakh (with Russian) + kaz + rus + +@@ -3682,9 +3682,9 @@ + + + la +- +- <_shortDescription>lo +- <_description>Lao ++ ++ lo ++ Lao + + lao + +@@ -3693,7 +3693,7 @@ + + + stea +- <_description>Lao (STEA proposed standard layout) ++ Lao (STEA proposed standard layout) + lao + + +@@ -3703,9 +3703,9 @@ + + + latam +- +- <_shortDescription>es +- <_description>Spanish (Latin American) ++ ++ es ++ Spanish (Latin American) + + AR + BO +@@ -3737,19 +3737,19 @@ + + + nodeadkeys +- <_description>Spanish (Latin American, eliminate dead keys) ++ Spanish (Latin American, eliminate dead keys) + + + + + deadtilde +- <_description>Spanish (Latin American, include dead tilde) ++ Spanish (Latin American, include dead tilde) + + + + + sundeadkeys +- <_description>Spanish (Latin American, Sun dead keys) ++ Spanish (Latin American, Sun dead keys) + + + +@@ -3757,9 +3757,9 @@ + + + lt +- +- <_shortDescription>lt +- <_description>Lithuanian ++ ++ lt ++ Lithuanian + + lit + +@@ -3768,31 +3768,31 @@ + + + std +- <_description>Lithuanian (standard) ++ Lithuanian (standard) + + + + + us +- <_description>Lithuanian (US keyboard with Lithuanian letters) ++ Lithuanian (US keyboard with Lithuanian letters) + + + + + ibm +- <_description>Lithuanian (IBM LST 1205-92) ++ Lithuanian (IBM LST 1205-92) + + + + + lekp +- <_description>Lithuanian (LEKP) ++ Lithuanian (LEKP) + + + + + lekpa +- <_description>Lithuanian (LEKPa) ++ Lithuanian (LEKPa) + + + +@@ -3800,9 +3800,9 @@ + + + lv +- +- <_shortDescription>lv +- <_description>Latvian ++ ++ lv ++ Latvian + + lav + +@@ -3811,37 +3811,37 @@ + + + apostrophe +- <_description>Latvian (apostrophe variant) ++ Latvian (apostrophe variant) + + + + + tilde +- <_description>Latvian (tilde variant) ++ Latvian (tilde variant) + + + + + fkey +- <_description>Latvian (F variant) ++ Latvian (F variant) + + + + + modern +- <_description>Latvian (modern) ++ Latvian (modern) + + + + + ergonomic +- <_description>Latvian (ergonomic, ŪGJRMV) ++ Latvian (ergonomic, ŪGJRMV) + + + + + adapted +- <_description>Latvian (adapted) ++ Latvian (adapted) + + + +@@ -3849,9 +3849,9 @@ + + + mao +- +- <_shortDescription>mi +- <_description>Maori ++ ++ mi ++ Maori + + mao + +@@ -3861,9 +3861,9 @@ + + + me +- +- <_shortDescription>sr +- <_description>Montenegrin ++ ++ sr ++ Montenegrin + + srp + +@@ -3872,43 +3872,43 @@ + + + cyrillic +- <_description>Montenegrin (Cyrillic) ++ Montenegrin (Cyrillic) + + + + + cyrillicyz +- <_description>Montenegrin (Cyrillic, Z and ZHE swapped) ++ Montenegrin (Cyrillic, Z and ZHE swapped) + + + + + latinunicode +- <_description>Montenegrin (Latin Unicode) ++ Montenegrin (Latin Unicode) + + + + + latinyz +- <_description>Montenegrin (Latin qwerty) ++ Montenegrin (Latin qwerty) + + + + + latinunicodeyz +- <_description>Montenegrin (Latin Unicode qwerty) ++ Montenegrin (Latin Unicode qwerty) + + + + + cyrillicalternatequotes +- <_description>Montenegrin (Cyrillic with guillemets) ++ Montenegrin (Cyrillic with guillemets) + + + + + latinalternatequotes +- <_description>Montenegrin (Latin with guillemets) ++ Montenegrin (Latin with guillemets) + + + +@@ -3916,9 +3916,9 @@ + + + mk +- +- <_shortDescription>mk +- <_description>Macedonian ++ ++ mk ++ Macedonian + + mkd + +@@ -3927,7 +3927,7 @@ + + + nodeadkeys +- <_description>Macedonian (eliminate dead keys) ++ Macedonian (eliminate dead keys) + + + +@@ -3935,9 +3935,9 @@ + + + mt +- +- <_shortDescription>mt +- <_description>Maltese ++ ++ mt ++ Maltese + + mlt + +@@ -3946,7 +3946,7 @@ + + + us +- <_description>Maltese (with US layout) ++ Maltese (with US layout) + + + +@@ -3954,9 +3954,9 @@ + + + mn +- +- <_shortDescription>mn +- <_description>Mongolian ++ ++ mn ++ Mongolian + + mon + +@@ -3966,9 +3966,9 @@ + + + no +- +- <_shortDescription>no +- <_description>Norwegian ++ ++ no ++ Norwegian + + nor + nob +@@ -3979,19 +3979,19 @@ + + + nodeadkeys +- <_description>Norwegian (eliminate dead keys) ++ Norwegian (eliminate dead keys) + + + + + dvorak +- <_description>Norwegian (Dvorak) ++ Norwegian (Dvorak) + + + + + smi +- <_description>Northern Saami (Norway) ++ Northern Saami (Norway) + + sme + +@@ -4000,7 +4000,7 @@ + + + smi_nodeadkeys +- <_description>Northern Saami (Norway, eliminate dead keys) ++ Northern Saami (Norway, eliminate dead keys) + + sme + +@@ -4009,19 +4009,19 @@ + + + mac +- <_description>Norwegian (Macintosh) ++ Norwegian (Macintosh) + + + + + mac_nodeadkeys +- <_description>Norwegian (Macintosh, eliminate dead keys) ++ Norwegian (Macintosh, eliminate dead keys) + + + + + colemak +- <_description>Norwegian (Colemak) ++ Norwegian (Colemak) + + + +@@ -4029,9 +4029,9 @@ + + + pl +- +- <_shortDescription>pl +- <_description>Polish ++ ++ pl ++ Polish + + pol + +@@ -4040,37 +4040,37 @@ + + + legacy +- <_description>Polish (legacy) ++ Polish (legacy) + + + + + qwertz +- <_description>Polish (qwertz) ++ Polish (qwertz) + + + + + dvorak +- <_description>Polish (Dvorak) ++ Polish (Dvorak) + + + + + dvorak_quotes +- <_description>Polish (Dvorak, Polish quotes on quotemark key) ++ Polish (Dvorak, Polish quotes on quotemark key) + + + + + dvorak_altquotes +- <_description>Polish (Dvorak, Polish quotes on key 1) ++ Polish (Dvorak, Polish quotes on key 1) + + + + + csb +- <_description>Kashubian ++ Kashubian + + csb + +@@ -4086,9 +4086,9 @@ + + + ru_phonetic_dvorak +- +- <_shortDescription>ru +- <_description>Russian (Poland, phonetic Dvorak) ++ ++ ru ++ Russian (Poland, phonetic Dvorak) + + rus + +@@ -4097,7 +4097,7 @@ + + + dvp +- <_description>Polish (programmer Dvorak) ++ Polish (programmer Dvorak) + + + +@@ -4105,9 +4105,9 @@ + + + pt +- +- <_shortDescription>pt +- <_description>Portuguese ++ ++ pt ++ Portuguese + + por + +@@ -4116,49 +4116,49 @@ + + + nodeadkeys +- <_description>Portuguese (eliminate dead keys) ++ Portuguese (eliminate dead keys) + + + + + sundeadkeys +- <_description>Portuguese (Sun dead keys) ++ Portuguese (Sun dead keys) + + + + + mac +- <_description>Portuguese (Macintosh) ++ Portuguese (Macintosh) + + + + + mac_nodeadkeys +- <_description>Portuguese (Macintosh, eliminate dead keys) ++ Portuguese (Macintosh, eliminate dead keys) + + + + + mac_sundeadkeys +- <_description>Portuguese (Macintosh, Sun dead keys) ++ Portuguese (Macintosh, Sun dead keys) + + + + + nativo +- <_description>Portuguese (Nativo) ++ Portuguese (Nativo) + + + + + nativo-us +- <_description>Portuguese (Nativo for US keyboards) ++ Portuguese (Nativo for US keyboards) + + + + + nativo-epo +- <_description>Esperanto (Portugal, Nativo) ++ Esperanto (Portugal, Nativo) + + epo + +@@ -4169,9 +4169,9 @@ + + + ro +- +- <_shortDescription>ro +- <_description>Romanian ++ ++ ro ++ Romanian + + rum + +@@ -4180,25 +4180,25 @@ + + + cedilla +- <_description>Romanian (cedilla) ++ Romanian (cedilla) + + + + + std +- <_description>Romanian (standard) ++ Romanian (standard) + + + + + std_cedilla +- <_description>Romanian (standard cedilla) ++ Romanian (standard cedilla) + + + + + winkeys +- <_description>Romanian (WinKeys) ++ Romanian (WinKeys) + + + +@@ -4206,9 +4206,9 @@ + + + ru +- +- <_shortDescription>ru +- <_description>Russian ++ ++ ru ++ Russian + + rus + +@@ -4217,37 +4217,37 @@ + + + phonetic +- <_description>Russian (phonetic) ++ Russian (phonetic) + + + + + phonetic_winkeys +- <_description>Russian (phonetic WinKeys) ++ Russian (phonetic WinKeys) + + + + + typewriter +- <_description>Russian (typewriter) ++ Russian (typewriter) + + + + + legacy +- <_description>Russian (legacy) ++ Russian (legacy) + + + + + typewriter-legacy +- <_description>Russian (typewriter, legacy) ++ Russian (typewriter, legacy) + + + + + tt +- <_description>Tatar ++ Tatar + + tat + +@@ -4256,7 +4256,7 @@ + + + os_legacy +- <_description>Ossetian (legacy) ++ Ossetian (legacy) + + oss + +@@ -4265,7 +4265,7 @@ + + + os_winkeys +- <_description>Ossetian (WinKeys) ++ Ossetian (WinKeys) + + oss + +@@ -4274,7 +4274,7 @@ + + + cv +- <_description>Chuvash ++ Chuvash + + chv + +@@ -4283,7 +4283,7 @@ + + + cv_latin +- <_description>Chuvash (Latin) ++ Chuvash (Latin) + + chv + +@@ -4292,7 +4292,7 @@ + + + udm +- <_description>Udmurt ++ Udmurt + + udm + +@@ -4301,7 +4301,7 @@ + + + kom +- <_description>Komi ++ Komi + + kom + +@@ -4310,7 +4310,7 @@ + + + sah +- <_description>Yakut ++ Yakut + + sah + +@@ -4319,7 +4319,7 @@ + + + xal +- <_description>Kalmyk ++ Kalmyk + + xal + +@@ -4328,19 +4328,19 @@ + + + dos +- <_description>Russian (DOS) ++ Russian (DOS) + + + + + mac +- <_description>Russian (Macintosh) ++ Russian (Macintosh) + + + + + srp +- <_description>Serbian (Russia) ++ Serbian (Russia) + rus + srp + +@@ -4348,7 +4348,7 @@ + + + bak +- <_description>Bashkirian ++ Bashkirian + + bak + +@@ -4357,7 +4357,7 @@ + + + chm +- <_description>Mari ++ Mari + + chm + +@@ -4368,9 +4368,9 @@ + + + rs +- +- <_shortDescription>sr +- <_description>Serbian ++ ++ sr ++ Serbian + + srp + +@@ -4379,49 +4379,49 @@ + + + yz +- <_description>Serbian (Cyrillic, Z and ZHE swapped) ++ Serbian (Cyrillic, Z and ZHE swapped) + + + + + latin +- <_description>Serbian (Latin) ++ Serbian (Latin) + + + + + latinunicode +- <_description>Serbian (Latin Unicode) ++ Serbian (Latin Unicode) + + + + + latinyz +- <_description>Serbian (Latin qwerty) ++ Serbian (Latin qwerty) + + + + + latinunicodeyz +- <_description>Serbian (Latin Unicode qwerty) ++ Serbian (Latin Unicode qwerty) + + + + + alternatequotes +- <_description>Serbian (Cyrillic with guillemets) ++ Serbian (Cyrillic with guillemets) + + + + + latinalternatequotes +- <_description>Serbian (Latin with guillemets) ++ Serbian (Latin with guillemets) + + + + + rue +- <_description>Pannonian Rusyn ++ Pannonian Rusyn + + rue + +@@ -4432,9 +4432,9 @@ + + + si +- +- <_shortDescription>sl +- <_description>Slovenian ++ ++ sl ++ Slovenian + + slv + +@@ -4443,13 +4443,13 @@ + + + alternatequotes +- <_description>Slovenian (use guillemets for quotes) ++ Slovenian (use guillemets for quotes) + + + + + us +- <_description>Slovenian (US keyboard with Slovenian letters) ++ Slovenian (US keyboard with Slovenian letters) + + + +@@ -4457,9 +4457,9 @@ + + + sk +- +- <_shortDescription>sk +- <_description>Slovak ++ ++ sk ++ Slovak + + slo + +@@ -4468,19 +4468,19 @@ + + + bksl +- <_description>Slovak (extended Backslash) ++ Slovak (extended Backslash) + + + + + qwerty +- <_description>Slovak (qwerty) ++ Slovak (qwerty) + + + + + qwerty_bksl +- <_description>Slovak (qwerty, extended Backslash) ++ Slovak (qwerty, extended Backslash) + + + +@@ -4488,9 +4488,9 @@ + + + es +- +- <_shortDescription>es +- <_description>Spanish ++ ++ es ++ Spanish + + spa + +@@ -4499,31 +4499,31 @@ + + + nodeadkeys +- <_description>Spanish (eliminate dead keys) ++ Spanish (eliminate dead keys) + + + + + deadtilde +- <_description>Spanish (include dead tilde) ++ Spanish (include dead tilde) + + + + + sundeadkeys +- <_description>Spanish (Sun dead keys) ++ Spanish (Sun dead keys) + + + + + dvorak +- <_description>Spanish (Dvorak) ++ Spanish (Dvorak) + + + + + ast +- <_description>Asturian (Spain, with bottom-dot H and bottom-dot L) ++ Asturian (Spain, with bottom-dot H and bottom-dot L) + + ast + +@@ -4532,7 +4532,7 @@ + + + cat +- <_description>Catalan (Spain, with middle-dot L) ++ Catalan (Spain, with middle-dot L) + + cat + +@@ -4541,7 +4541,7 @@ + + + mac +- <_description>Spanish (Macintosh) ++ Spanish (Macintosh) + + + +@@ -4549,9 +4549,9 @@ + + + se +- +- <_shortDescription>sv +- <_description>Swedish ++ ++ sv ++ Swedish + + swe + +@@ -4560,21 +4560,21 @@ + + + nodeadkeys +- <_description>Swedish (eliminate dead keys) ++ Swedish (eliminate dead keys) + + + + + dvorak +- <_description>Swedish (Dvorak) ++ Swedish (Dvorak) + + + + + rus +- +- <_shortDescription>ru +- <_description>Russian (Sweden, phonetic) ++ ++ ru ++ Russian (Sweden, phonetic) + + rus + +@@ -4583,9 +4583,9 @@ + + + rus_nodeadkeys +- +- <_shortDescription>ru +- <_description>Russian (Sweden, phonetic, eliminate dead keys) ++ ++ ru ++ Russian (Sweden, phonetic, eliminate dead keys) + + rus + +@@ -4594,7 +4594,7 @@ + + + smi +- <_description>Northern Saami (Sweden) ++ Northern Saami (Sweden) + + sme + +@@ -4603,19 +4603,19 @@ + + + mac +- <_description>Swedish (Macintosh) ++ Swedish (Macintosh) + + + + + svdvorak +- <_description>Swedish (Svdvorak) ++ Swedish (Svdvorak) + + + + + swl +- <_description>Swedish Sign Language ++ Swedish Sign Language + swl + + +@@ -4624,9 +4624,9 @@ + + + ch +- +- <_shortDescription>de +- <_description>German (Switzerland) ++ ++ de ++ German (Switzerland) + ger + gsw + +@@ -4634,31 +4634,31 @@ + + + legacy +- <_description>German (Switzerland, legacy) ++ German (Switzerland, legacy) + + + + + de_nodeadkeys +- +- <_shortDescription>de +- <_description>German (Switzerland, eliminate dead keys) ++ ++ de ++ German (Switzerland, eliminate dead keys) + + + + + de_sundeadkeys +- +- <_shortDescription>de +- <_description>German (Switzerland, Sun dead keys) ++ ++ de ++ German (Switzerland, Sun dead keys) + + + + + fr +- +- <_shortDescription>fr +- <_description>French (Switzerland) ++ ++ fr ++ French (Switzerland) + + fra + +@@ -4667,9 +4667,9 @@ + + + fr_nodeadkeys +- +- <_shortDescription>fr +- <_description>French (Switzerland, eliminate dead keys) ++ ++ fr ++ French (Switzerland, eliminate dead keys) + + fra + +@@ -4678,9 +4678,9 @@ + + + fr_sundeadkeys +- +- <_shortDescription>fr +- <_description>French (Switzerland, Sun dead keys) ++ ++ fr ++ French (Switzerland, Sun dead keys) + + fra + +@@ -4689,9 +4689,9 @@ + + + fr_mac +- +- <_shortDescription>fr +- <_description>French (Switzerland, Macintosh) ++ ++ fr ++ French (Switzerland, Macintosh) + + fra + +@@ -4700,9 +4700,9 @@ + + + de_mac +- +- <_shortDescription>de +- <_description>German (Switzerland, Macintosh) ++ ++ de ++ German (Switzerland, Macintosh) + + + +@@ -4710,9 +4710,9 @@ + + + sy +- +- <_shortDescription>ar +- <_description>Arabic (Syria) ++ ++ ar ++ Arabic (Syria) + + syr + +@@ -4721,25 +4721,25 @@ + + + syc +- +- <_shortDescription>syc +- <_description>Syriac ++ ++ syc ++ Syriac + + + + + syc_phonetic +- +- <_shortDescription>syc +- <_description>Syriac (phonetic) ++ ++ syc ++ Syriac (phonetic) + + + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Syria, Latin Q) ++ ++ ku ++ Kurdish (Syria, Latin Q) + + kur + +@@ -4748,9 +4748,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Syria, F) ++ ++ ku ++ Kurdish (Syria, F) + + kur + +@@ -4759,9 +4759,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Syria, Latin Alt-Q) ++ ++ ku ++ Kurdish (Syria, Latin Alt-Q) + + kur + +@@ -4772,9 +4772,9 @@ + + + tj +- +- <_shortDescription>tg +- <_description>Tajik ++ ++ tg ++ Tajik + + tgk + +@@ -4783,7 +4783,7 @@ + + + legacy +- <_description>Tajik (legacy) ++ Tajik (legacy) + + + +@@ -4791,9 +4791,9 @@ + + + lk +- +- <_shortDescription>si +- <_description>Sinhala (phonetic) ++ ++ si ++ Sinhala (phonetic) + + sin + +@@ -4802,9 +4802,9 @@ + + + tam_unicode +- +- <_shortDescription>ta +- <_description>Tamil (Sri Lanka, Unicode) ++ ++ ta ++ Tamil (Sri Lanka, Unicode) + + tam + +@@ -4813,7 +4813,7 @@ + + + tam_TAB +- <_description>Tamil (Sri Lanka, TAB Typewriter) ++ Tamil (Sri Lanka, TAB Typewriter) + + tam + +@@ -4824,9 +4824,9 @@ + + + th +- +- <_shortDescription>th +- <_description>Thai ++ ++ th ++ Thai + + tha + +@@ -4835,13 +4835,13 @@ + + + tis +- <_description>Thai (TIS-820.2538) ++ Thai (TIS-820.2538) + + + + + pat +- <_description>Thai (Pattachote) ++ Thai (Pattachote) + + + +@@ -4849,9 +4849,9 @@ + + + tr +- +- <_shortDescription>tr +- <_description>Turkish ++ ++ tr ++ Turkish + + tur + +@@ -4860,27 +4860,27 @@ + + + f +- <_description>Turkish (F) ++ Turkish (F) + + + + + alt +- <_description>Turkish (Alt-Q) ++ Turkish (Alt-Q) + + + + + sundeadkeys +- <_description>Turkish (Sun dead keys) ++ Turkish (Sun dead keys) + + + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Turkey, Latin Q) ++ ++ ku ++ Kurdish (Turkey, Latin Q) + + kur + +@@ -4889,9 +4889,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Turkey, F) ++ ++ ku ++ Kurdish (Turkey, F) + + kur + +@@ -4900,9 +4900,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Turkey, Latin Alt-Q) ++ ++ ku ++ Kurdish (Turkey, Latin Alt-Q) + + kur + +@@ -4911,15 +4911,15 @@ + + + intl +- <_description>Turkish (international with dead keys) ++ Turkish (international with dead keys) + + + + + crh +- +- <_shortDescription>crh +- <_description>Crimean Tatar (Turkish Q) ++ ++ crh ++ Crimean Tatar (Turkish Q) + + crh + +@@ -4928,9 +4928,9 @@ + + + crh_f +- +- <_shortDescription>crh +- <_description>Crimean Tatar (Turkish F) ++ ++ crh ++ Crimean Tatar (Turkish F) + + crh + +@@ -4939,9 +4939,9 @@ + + + crh_alt +- +- <_shortDescription>crh +- <_description>Crimean Tatar (Turkish Alt-Q) ++ ++ crh ++ Crimean Tatar (Turkish Alt-Q) + + crh + +@@ -4952,9 +4952,9 @@ + + + tw +- +- <_shortDescription>zh +- <_description>Taiwanese ++ ++ zh ++ Taiwanese + + fox + +@@ -4963,7 +4963,7 @@ + + + indigenous +- <_description>Taiwanese (indigenous) ++ Taiwanese (indigenous) + + ami + tay +@@ -4987,9 +4987,9 @@ + + + saisiyat +- +- <_shortDescription>xsy +- <_description>Saisiyat (Taiwan) ++ ++ xsy ++ Saisiyat (Taiwan) + + xsy + +@@ -5000,9 +5000,9 @@ + + + ua +- +- <_shortDescription>uk +- <_description>Ukrainian ++ ++ uk ++ Ukrainian + + ukr + +@@ -5011,43 +5011,43 @@ + + + phonetic +- <_description>Ukrainian (phonetic) ++ Ukrainian (phonetic) + + + + + typewriter +- <_description>Ukrainian (typewriter) ++ Ukrainian (typewriter) + + + + + winkeys +- <_description>Ukrainian (WinKeys) ++ Ukrainian (WinKeys) + + + + + legacy +- <_description>Ukrainian (legacy) ++ Ukrainian (legacy) + + + + + rstu +- <_description>Ukrainian (standard RSTU) ++ Ukrainian (standard RSTU) + + + + + rstu_ru +- <_description>Russian (Ukraine, standard RSTU) ++ Russian (Ukraine, standard RSTU) + + + + + homophonic +- <_description>Ukrainian (homophonic) ++ Ukrainian (homophonic) + + + +@@ -5055,9 +5055,9 @@ + + + gb +- +- <_shortDescription>en +- <_description>English (UK) ++ ++ en ++ English (UK) + + eng + +@@ -5066,43 +5066,43 @@ + + + extd +- <_description>English (UK, extended WinKeys) ++ English (UK, extended WinKeys) + + + + + intl +- <_description>English (UK, international with dead keys) ++ English (UK, international with dead keys) + + + + + dvorak +- <_description>English (UK, Dvorak) ++ English (UK, Dvorak) + + + + + dvorakukp +- <_description>English (UK, Dvorak with UK punctuation) ++ English (UK, Dvorak with UK punctuation) + + + + + mac +- <_description>English (UK, Macintosh) ++ English (UK, Macintosh) + + + + + mac_intl +- <_description>English (UK, Macintosh international) ++ English (UK, Macintosh international) + + + + + colemak +- <_description>English (UK, Colemak) ++ English (UK, Colemak) + + + +@@ -5110,9 +5110,9 @@ + + + uz +- +- <_shortDescription>uz +- <_description>Uzbek ++ ++ uz ++ Uzbek + + uzb + +@@ -5121,7 +5121,7 @@ + + + latin +- <_description>Uzbek (Latin) ++ Uzbek (Latin) + + + +@@ -5129,9 +5129,9 @@ + + + vn +- +- <_shortDescription>vi +- <_description>Vietnamese ++ ++ vi ++ Vietnamese + + vie + +@@ -5141,9 +5141,9 @@ + + + kr +- +- <_shortDescription>ko +- <_description>Korean ++ ++ ko ++ Korean + + kor + +@@ -5152,7 +5152,7 @@ + + + kr104 +- <_description>Korean (101/104 key compatible) ++ Korean (101/104 key compatible) + + + +@@ -5160,9 +5160,9 @@ + + + nec_vndr/jp +- +- <_shortDescription>ja +- <_description>Japanese (PC-98xx Series) ++ ++ ja ++ Japanese (PC-98xx Series) + + JP + +@@ -5175,9 +5175,9 @@ + + + ie +- +- <_shortDescription>ie +- <_description>Irish ++ ++ ie ++ Irish + + eng + +@@ -5186,7 +5186,7 @@ + + + CloGaelach +- <_description>CloGaelach ++ CloGaelach + + gle + +@@ -5195,13 +5195,13 @@ + + + UnicodeExpert +- <_description>Irish (UnicodeExpert) ++ Irish (UnicodeExpert) + + + + + ogam +- <_description>Ogham ++ Ogham + + sga + +@@ -5210,7 +5210,7 @@ + + + ogam_is434 +- <_description>Ogham (IS434) ++ Ogham (IS434) + + sga + +@@ -5221,9 +5221,9 @@ + + + pk +- +- <_shortDescription>ur +- <_description>Urdu (Pakistan) ++ ++ ur ++ Urdu (Pakistan) + + urd + +@@ -5232,20 +5232,20 @@ + + + urd-crulp +- <_description>Urdu (Pakistan, CRULP) ++ Urdu (Pakistan, CRULP) + + + + + urd-nla +- <_description>Urdu (Pakistan, NLA) ++ Urdu (Pakistan, NLA) + + + + + ara +- <_shortDescription>ar +- <_description>Arabic (Pakistan) ++ ar ++ Arabic (Pakistan) + + ara + +@@ -5254,9 +5254,9 @@ + + + snd +- +- <_shortDescription>sd +- <_description>Sindhi ++ ++ sd ++ Sindhi + + snd + +@@ -5267,9 +5267,9 @@ + + + mv +- +- <_shortDescription>dv +- <_description>Dhivehi ++ ++ dv ++ Dhivehi + + div + +@@ -5279,9 +5279,9 @@ + + + za +- +- <_shortDescription>en +- <_description>English (South Africa) ++ ++ en ++ English (South Africa) + + eng + +@@ -5290,9 +5290,9 @@ + + + epo +- +- <_shortDescription>eo +- <_description>Esperanto ++ ++ eo ++ Esperanto + + epo + +@@ -5301,7 +5301,7 @@ + + + legacy +- <_description>Esperanto (displaced semicolon and quote, obsolete) ++ Esperanto (displaced semicolon and quote, obsolete) + + + +@@ -5309,9 +5309,9 @@ + + + np +- +- <_shortDescription>ne +- <_description>Nepali ++ ++ ne ++ Nepali + + nep + +@@ -5320,9 +5320,9 @@ + + + ng +- +- <_shortDescription>en +- <_description>English (Nigeria) ++ ++ en ++ English (Nigeria) + + eng + +@@ -5331,9 +5331,9 @@ + + + igbo +- +- <_shortDescription>ig +- <_description>Igbo ++ ++ ig ++ Igbo + + ibo + +@@ -5342,9 +5342,9 @@ + + + yoruba +- +- <_shortDescription>yo +- <_description>Yoruba ++ ++ yo ++ Yoruba + + yor + +@@ -5353,9 +5353,9 @@ + + + hausa +- +- <_shortDescription>ha +- <_description>Hausa ++ ++ ha ++ Hausa + + hau + +@@ -5366,9 +5366,9 @@ + + + et +- +- <_shortDescription>am +- <_description>Amharic ++ ++ am ++ Amharic + + amh + +@@ -5378,9 +5378,9 @@ + + + sn +- +- <_shortDescription>wo +- <_description>Wolof ++ ++ wo ++ Wolof + + wol + +@@ -5390,21 +5390,21 @@ + + + brai +- +- <_shortDescription>brl +- <_description>Braille ++ ++ brl ++ Braille + + + + + left_hand +- <_description>Braille (left hand) ++ Braille (left hand) + + + + + right_hand +- <_description>Braille (right hand) ++ Braille (right hand) + + + +@@ -5412,9 +5412,9 @@ + + + tm +- +- <_shortDescription>tk +- <_description>Turkmen ++ ++ tk ++ Turkmen + + tuk + +@@ -5423,7 +5423,7 @@ + + + alt +- <_description>Turkmen (Alt-Q) ++ Turkmen (Alt-Q) + + + +@@ -5431,9 +5431,9 @@ + + + ml +- +- <_shortDescription>bm +- <_description>Bambara ++ ++ bm ++ Bambara + + bam + +@@ -5442,9 +5442,9 @@ + + + fr-oss +- +- <_shortDescription>fr +- <_description>French (Mali, alternative) ++ ++ fr ++ French (Mali, alternative) + + fra + +@@ -5453,9 +5453,9 @@ + + + us-mac +- +- <_shortDescription>en +- <_description>English (Mali, US Macintosh) ++ ++ en ++ English (Mali, US Macintosh) + + eng + +@@ -5464,9 +5464,9 @@ + + + us-intl +- +- <_shortDescription>en +- <_description>English (Mali, US international) ++ ++ en ++ English (Mali, US international) + + eng + +@@ -5477,9 +5477,9 @@ + + + tz +- +- <_shortDescription>sw +- <_description>Swahili (Tanzania) ++ ++ sw ++ Swahili (Tanzania) + + swa + +@@ -5488,9 +5488,9 @@ + + + ke +- +- <_shortDescription>sw +- <_description>Swahili (Kenya) ++ ++ sw ++ Swahili (Kenya) + + swa + +@@ -5499,9 +5499,9 @@ + + + kik +- +- <_shortDescription>ki +- <_description>Kikuyu ++ ++ ki ++ Kikuyu + + kik + +@@ -5512,9 +5512,9 @@ + + + bw +- +- <_shortDescription>tn +- <_description>Tswana ++ ++ tn ++ Tswana + + tsn + +@@ -5523,9 +5523,9 @@ + + + ph +- +- <_shortDescription>ph +- <_description>Filipino ++ ++ ph ++ Filipino + eng + bik + ceb +@@ -5542,7 +5542,7 @@ + + + qwerty-bay +- <_description>Filipino (QWERTY Baybayin) ++ Filipino (QWERTY Baybayin) + bik + ceb + fil +@@ -5558,13 +5558,13 @@ + + + capewell-dvorak +- <_description>Filipino (Capewell-Dvorak Latin) ++ Filipino (Capewell-Dvorak Latin) + + + + + capewell-dvorak-bay +- <_description>Filipino (Capewell-Dvorak Baybayin) ++ Filipino (Capewell-Dvorak Baybayin) + bik + ceb + fil +@@ -5580,13 +5580,13 @@ + + + capewell-qwerf2k6 +- <_description>Filipino (Capewell-QWERF 2006 Latin) ++ Filipino (Capewell-QWERF 2006 Latin) + + + + + capewell-qwerf2k6-bay +- <_description>Filipino (Capewell-QWERF 2006 Baybayin) ++ Filipino (Capewell-QWERF 2006 Baybayin) + bik + ceb + fil +@@ -5602,13 +5602,13 @@ + + + colemak +- <_description>Filipino (Colemak Latin) ++ Filipino (Colemak Latin) + + + + + colemak-bay +- <_description>Filipino (Colemak Baybayin) ++ Filipino (Colemak Baybayin) + bik + ceb + fil +@@ -5624,13 +5624,13 @@ + + + dvorak +- <_description>Filipino (Dvorak Latin) ++ Filipino (Dvorak Latin) + + + + + dvorak-bay +- <_description>Filipino (Dvorak Baybayin) ++ Filipino (Dvorak Baybayin) + bik + ceb + fil +@@ -5648,16 +5648,16 @@ + + + md +- <_shortDescription>md +- <_description>Moldavian ++ md ++ Moldavian + rum + + + + + gag +- <_shortDescription>gag +- <_description>Moldavian (Gagauz) ++ gag ++ Moldavian (Gagauz) + gag + + +@@ -5666,1183 +5666,1142 @@ + + + +- ++ + + grp +- <_description>Switching to another layout ++ Switching to another layout + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- ++ + + lv3 +- <_description>Key to choose 3rd level ++ Key to choose 3rd level + + + + + + + + + + + + + + + + + + + + +- ++ + + ctrl +- <_description>Ctrl key position ++ Ctrl key position + + + + + + + + + + + + + + +- ++ + + grp_led +- <_description>Use keyboard LED to show alternative layout ++ Use keyboard LED to show alternative layout + + + + + + +- ++ + + keypad +- <_description>Layout of numeric keypad ++ Layout of numeric keypad + + + + + + + + + + +- ++ + +- ++ + + kpdl +- <_description>Numeric keypad delete key behaviour ++ Numeric keypad delete key behaviour + + + + + + + + + + + +- ++ + + caps +- <_description>Caps Lock key behavior ++ Caps Lock key behavior + + + + + + + + + + + + + + + + + +- ++ + + altwin +- <_description>Alt/Win key behavior ++ Alt/Win key behavior + + + + + + + + + + + + + +- ++ + + Compose key +- <_description>Position of Compose key ++ Position of Compose key + + + + + + + + + + + + + + + + + + + + + + + compat +- <_description>Miscellaneous compatibility options ++ Miscellaneous compatibility options + + + + + + + + + + + + + + + + + +- ++ + + currencysign +- <_description>Adding currency signs to certain keys ++ Adding currency signs to certain keys + + + + + + + + + + lv5 +- <_description>Key to choose 5th level ++ Key to choose 5th level + + + + + +- ++ + + +- ++ + + nbsp +- <_description>Using space key to input non-breakable space character ++ Using space key to input non-breakable space character + + + + + + + + + + + + + + + + + + + + + japan +- <_description>Japanese keyboard options ++ Japanese keyboard options + + + + + + + + esperanto +- <_description>Adding Esperanto supersigned letters ++ Adding Esperanto supersigned letters + + + + + + + + solaris +- <_description>Maintain key compatibility with old Solaris keycodes ++ Maintain key compatibility with old Solaris keycodes + + + + + + terminate +- <_description>Key sequence to kill the X server ++ Key sequence to kill the X server + + + + +- ++ +\ No newline at end of file diff --git a/package/xkeyboard-config/patches/patch-rules_evdev_extras_xml_in b/package/xkeyboard-config/patches/patch-rules_evdev_extras_xml_in new file mode 100644 index 000000000..185ded7f8 --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_evdev_extras_xml_in @@ -0,0 +1,855 @@ +--- xkeyboard-config-2.11.orig/rules/evdev.extras.xml.in 2013-12-24 00:49:09.000000000 +0100 ++++ xkeyboard-config-2.11/rules/evdev.extras.xml.in 2014-03-04 14:31:30.000000000 +0100 +@@ -1,4 +1,4 @@ +- ++ + + + +@@ -6,8 +6,8 @@ + + + apl +- <_shortDescription>apl +- <_description>APL keyboard symbols ++ apl ++ APL keyboard symbols + eng + + +@@ -58,29 +58,29 @@ + + + ca +- <_shortDescription>fr +- <_description>French (Canada) ++ fr ++ French (Canada) + fra + + + + + kut +- <_shortDescription>kut +- <_description>Kutenai ++ kut ++ Kutenai + + + + + shs +- <_shortDescription>shs +- <_description>Secwepemctsin ++ shs ++ Secwepemctsin + + + + + sun_type6 +- <_description>Multilingual (Canada, Sun Type 6/7) ++ Multilingual (Canada, Sun Type 6/7) + + + +@@ -88,8 +88,8 @@ + + + de +- <_shortDescription>de +- <_description>German ++ de ++ German + + ger + +@@ -98,7 +98,7 @@ + + + us +- <_description>German (US keyboard with German letters) ++ German (US keyboard with German letters) + + eng + +@@ -107,7 +107,7 @@ + + + hu +- <_description>German (with Hungarian letters and no dead keys) ++ German (with Hungarian letters and no dead keys) + + ger + hun +@@ -117,7 +117,7 @@ + + + sun_type6 +- <_description>German (Sun Type 6/7) ++ German (Sun Type 6/7) + + + +@@ -125,15 +125,15 @@ + + + ir +- <_shortDescription>fa +- <_description>Persian ++ fa ++ Persian + per + + + + + ave +- <_description>Avestan ++ Avestan + ave + + +@@ -142,21 +142,21 @@ + + + lt +- <_shortDescription>lt +- <_description>Lithuanian ++ lt ++ Lithuanian + lit + + + + + us_dvorak +- <_description>Lithuanian (US Dvorak with Lithuanian letters) ++ Lithuanian (US Dvorak with Lithuanian letters) + + + + + sun_type6 +- <_description>Lithuanian (Sun Type 6/7) ++ Lithuanian (Sun Type 6/7) + + + +@@ -164,8 +164,8 @@ + + + lv +- <_shortDescription>lv +- <_description>Latvian ++ lv ++ Latvian + + lav + +@@ -174,55 +174,55 @@ + + + dvorak +- <_description>Latvian (US Dvorak) ++ Latvian (US Dvorak) + + + + + ykeydvorak +- <_description>Latvian (US Dvorak, Y variant) ++ Latvian (US Dvorak, Y variant) + + + + + minuskeydvorak +- <_description>Latvian (US Dvorak, minus variant) ++ Latvian (US Dvorak, minus variant) + + + + + dvorakprogr +- <_description>Latvian (programmer US Dvorak) ++ Latvian (programmer US Dvorak) + + + + + ykeydvorakprogr +- <_description>Latvian (programmer US Dvorak, Y variant) ++ Latvian (programmer US Dvorak, Y variant) + + + + + minuskeydvorakprogr +- <_description>Latvian (programmer US Dvorak, minus variant) ++ Latvian (programmer US Dvorak, minus variant) + + + + + colemak +- <_description>Latvian (US Colemak) ++ Latvian (US Colemak) + + + + + apostrophecolemak +- <_description>Latvian (US Colemak, apostrophe variant) ++ Latvian (US Colemak, apostrophe variant) + + + + + sun_type6 +- <_description>Latvian (Sun Type 6/7) ++ Latvian (Sun Type 6/7) + + + +@@ -230,34 +230,34 @@ + + + us +- <_shortDescription>en +- <_description>English (US) ++ en ++ English (US) + eng + + + + + intl-unicode +- <_description>English (US, international AltGr Unicode combining) ++ English (US, international AltGr Unicode combining) + + + + + alt-intl-unicode +- <_description>English (US, international AltGr Unicode combining, alternative) ++ English (US, international AltGr Unicode combining, alternative) + + + + + ats +- <_description>Atsina +- ++ Atsina ++ + + + + + crd +- <_description>Coeur d'Alene Salish ++ Coeur d'Alene Salish + crd + + +@@ -274,13 +274,13 @@ + + + sun_type6 +- <_description>English (US, Sun Type 6/7) ++ English (US, Sun Type 6/7) + + + + + norman +- <_description>English (Norman) ++ English (Norman) + + + +@@ -288,27 +288,27 @@ + + + pl +- <_shortDescription>pl +- <_description>Polish ++ pl ++ Polish + pol + + + + + intl +- <_description>Polish (international with dead keys) ++ Polish (international with dead keys) + + + + + colemak +- <_description>Polish (Colemak) ++ Polish (Colemak) + + + + + sun_type6 +- <_description>Polish (Sun Type 6/7) ++ Polish (Sun Type 6/7) + + + +@@ -316,16 +316,16 @@ + + + ro +- <_shortDescription>ro +- <_description>Romanian ++ ro ++ Romanian + rum + + + + + crh_dobruja +- <_shortDescription>crh +- <_description>Crimean Tatar (Dobruja Q) ++ crh ++ Crimean Tatar (Dobruja Q) + + crh + +@@ -334,13 +334,13 @@ + + + ergonomic +- <_description>Romanian (ergonomic Touchtype) ++ Romanian (ergonomic Touchtype) + + + + + sun_type6 +- <_description>Romanian (Sun Type 6/7) ++ Romanian (Sun Type 6/7) + + + +@@ -348,15 +348,15 @@ + + + rs +- <_shortDescription>sr +- <_description>Serbian ++ sr ++ Serbian + srp + + + + + combiningkeys +- <_description>Serbian (combining accents instead of dead keys) ++ Serbian (combining accents instead of dead keys) + + + +@@ -364,8 +364,8 @@ + + + ru +- <_shortDescription>ru +- <_description>Russian ++ ru ++ Russian + + + +@@ -378,8 +378,8 @@ + + + ruu +- <_shortDescription>ru +- <_description>Russian (with Ukrainian-Belorussian layout) ++ ru ++ Russian (with Ukrainian-Belorussian layout) + rus + ukr + bel +@@ -388,7 +388,7 @@ + + + sun_type6 +- <_description>Russian (Sun Type 6/7) ++ Russian (Sun Type 6/7) + + + +@@ -396,8 +396,8 @@ + + + am +- <_shortDescription>hy +- <_description>Armenian ++ hy ++ Armenian + + hye + +@@ -406,7 +406,7 @@ + + + olpc-phonetic +- <_description>Armenian (OLPC phonetic) ++ Armenian (OLPC phonetic) + + + +@@ -414,15 +414,15 @@ + + + il +- <_shortDescription>he +- <_description>Hebrew ++ he ++ Hebrew + heb + + + + + biblicalSIL +- <_description>Hebrew (Biblical, SIL phonetic) ++ Hebrew (Biblical, SIL phonetic) + heb + + +@@ -431,14 +431,14 @@ + + + ara +- <_shortDescription>ar +- <_description>Arabic ++ ar ++ Arabic + + + + + sun_type6 +- <_description>Arabic (Sun Type 6/7) ++ Arabic (Sun Type 6/7) + + + +@@ -446,14 +446,14 @@ + + + be +- <_shortDescription>be +- <_description>Belgian ++ be ++ Belgian + + + + + sun_type6 +- <_description>Belgian (Sun Type 6/7) ++ Belgian (Sun Type 6/7) + + + +@@ -461,14 +461,14 @@ + + + br +- <_shortDescription>pt +- <_description>Portuguese (Brazil) ++ pt ++ Portuguese (Brazil) + + + + + sun_type6 +- <_description>Portuguese (Brazil, Sun Type 6/7) ++ Portuguese (Brazil, Sun Type 6/7) + + + +@@ -476,14 +476,14 @@ + + + cz +- <_shortDescription>cs +- <_description>Czech ++ cs ++ Czech + + + + + sun_type6 +- <_description>Czech (Sun Type 6/7) ++ Czech (Sun Type 6/7) + + + +@@ -491,14 +491,14 @@ + + + dk +- <_shortDescription>da +- <_description>Danish ++ da ++ Danish + + + + + sun_type6 +- <_description>Danish (Sun Type 6/7) ++ Danish (Sun Type 6/7) + + + +@@ -506,14 +506,14 @@ + + + nl +- <_shortDescription>nl +- <_description>Dutch ++ nl ++ Dutch + + + + + sun_type6 +- <_description>Dutch (Sun Type 6/7) ++ Dutch (Sun Type 6/7) + + + +@@ -521,14 +521,14 @@ + + + ee +- <_shortDescription>et +- <_description>Estonian ++ et ++ Estonian + + + + + sun_type6 +- <_description>Estonian (Sun Type 6/7) ++ Estonian (Sun Type 6/7) + + + +@@ -536,14 +536,14 @@ + + + fi +- <_shortDescription>fi +- <_description>Finnish ++ fi ++ Finnish + + + + + sun_type6 +- <_description>Finnish (Sun Type 6/7) ++ Finnish (Sun Type 6/7) + + + +@@ -551,14 +551,14 @@ + + + fr +- <_shortDescription>fr +- <_description>French ++ fr ++ French + + + + + sun_type6 +- <_description>French (Sun Type 6/7) ++ French (Sun Type 6/7) + + + +@@ -566,14 +566,14 @@ + + + gr +- <_shortDescription>gr +- <_description>Greek ++ gr ++ Greek + + + + + sun_type6 +- <_description>Greek (Sun Type 6/7) ++ Greek (Sun Type 6/7) + + + +@@ -581,14 +581,14 @@ + + + it +- <_shortDescription>it +- <_description>Italian ++ it ++ Italian + + + + + sun_type6 +- <_description>Italian (Sun Type 6/7) ++ Italian (Sun Type 6/7) + + + +@@ -596,26 +596,26 @@ + + + jp +- <_shortDescription>ja +- <_description>Japanese ++ ja ++ Japanese + + + + + sun_type6 +- <_description>Japanese (Sun Type 6) ++ Japanese (Sun Type 6) + + + + + sun_type7 +- <_description>Japanese (Sun Type 7 - pc compatible) ++ Japanese (Sun Type 7 - pc compatible) + + + + + sun_type7_suncompat +- <_description>Japanese (Sun Type 7 - sun compatible) ++ Japanese (Sun Type 7 - sun compatible) + + + +@@ -623,14 +623,14 @@ + + + no +- <_shortDescription>no +- <_description>Norwegian ++ no ++ Norwegian + + + + + sun_type6 +- <_description>Norwegian (Sun Type 6/7) ++ Norwegian (Sun Type 6/7) + + + +@@ -638,14 +638,14 @@ + + + pt +- <_shortDescription>pt +- <_description>Portuguese ++ pt ++ Portuguese + + + + + sun_type6 +- <_description>Portuguese (Sun Type 6/7) ++ Portuguese (Sun Type 6/7) + + + +@@ -653,14 +653,14 @@ + + + sk +- <_shortDescription>sk +- <_description>Slovak ++ sk ++ Slovak + + + + + sun_type6 +- <_description>Slovak (Sun Type 6/7) ++ Slovak (Sun Type 6/7) + + + +@@ -668,14 +668,14 @@ + + + es +- <_shortDescription>es +- <_description>Spanish ++ es ++ Spanish + + + + + sun_type6 +- <_description>Spanish (Sun Type 6/7) ++ Spanish (Sun Type 6/7) + + + +@@ -683,14 +683,14 @@ + + + se +- <_shortDescription>sv +- <_description>Swedish ++ sv ++ Swedish + + + + + sun_type6 +- <_description>Swedish (Sun Type 6/7) ++ Swedish (Sun Type 6/7) + + + +@@ -698,20 +698,20 @@ + + + ch +- <_shortDescription>de +- <_description>German (Switzerland) ++ de ++ German (Switzerland) + + + + + sun_type6_de +- <_description>German (Switzerland, Sun Type 6/7) ++ German (Switzerland, Sun Type 6/7) + + + + + sun_type6_fr +- <_description>French (Switzerland, Sun Type 6/7) ++ French (Switzerland, Sun Type 6/7) + + + +@@ -719,14 +719,14 @@ + + + tr +- <_shortDescription>tr +- <_description>Turkish ++ tr ++ Turkish + + + + + sun_type6 +- <_description>Turkish (Sun Type 6/7) ++ Turkish (Sun Type 6/7) + + + +@@ -734,14 +734,14 @@ + + + ua +- <_shortDescription>uk +- <_description>Ukrainian ++ uk ++ Ukrainian + + + + + sun_type6 +- <_description>Ukrainian (Sun Type 6/7) ++ Ukrainian (Sun Type 6/7) + + + +@@ -749,14 +749,14 @@ + + + gb +- <_shortDescription>en +- <_description>English (UK) ++ en ++ English (UK) + + + + + sun_type6 +- <_description>English (UK, Sun Type 6/7) ++ English (UK, Sun Type 6/7) + + + +@@ -764,18 +764,18 @@ + + + kr +- <_shortDescription>ko +- <_description>Korean ++ ko ++ Korean + + + + + sun_type6 +- <_description>Korean (Sun Type 6/7) ++ Korean (Sun Type 6/7) + + + + + + +- ++ +\ No newline at end of file diff --git a/package/xkeyboard-config/patches/patch-rules_evdev_xml_in b/package/xkeyboard-config/patches/patch-rules_evdev_xml_in new file mode 100644 index 000000000..57eb6df34 --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_evdev_xml_in @@ -0,0 +1,7654 @@ +--- xkeyboard-config-2.11.orig/rules/evdev.xml.in 2014-01-15 02:05:04.000000000 +0100 ++++ xkeyboard-config-2.11/rules/evdev.xml.in 2014-03-04 14:30:54.000000000 +0100 +@@ -5,627 +5,627 @@ + + + pc101 +- <_description>Generic 101-key PC ++ Generic 101-key PC + Generic + + + + + pc102 +- <_description>Generic 102-key (Intl) PC ++ Generic 102-key (Intl) PC + Generic + + + + + pc104 +- <_description>Generic 104-key PC ++ Generic 104-key PC + Generic + + + + + pc105 +- <_description>Generic 105-key (Intl) PC ++ Generic 105-key (Intl) PC + Generic + + + + + dell101 +- <_description>Dell 101-key PC ++ Dell 101-key PC + Dell + + + + + latitude +- <_description>Dell Latitude series laptop ++ Dell Latitude series laptop + Dell + + + + + dellm65 +- <_description>Dell Precision M65 ++ Dell Precision M65 + Dell + + + + + everex +- <_description>Everex STEPnote ++ Everex STEPnote + Everex + + + + + flexpro +- <_description>Keytronic FlexPro ++ Keytronic FlexPro + Keytronic + + + + + microsoft +- <_description>Microsoft Natural ++ Microsoft Natural + Microsoft Inc. + + + + + omnikey101 +- <_description>Northgate OmniKey 101 ++ Northgate OmniKey 101 + Northgate + + + + + winbook +- <_description>Winbook Model XP5 ++ Winbook Model XP5 + Generic + + + + + pc98 +- <_description>PC-98xx Series ++ PC-98xx Series + Generic + + + + + a4techKB21 +- <_description>A4Tech KB-21 ++ A4Tech KB-21 + A4Tech + + + + + a4techKBS8 +- <_description>A4Tech KBS-8 ++ A4Tech KBS-8 + A4Tech + + + + + a4_rfkb23 +- <_description>A4Tech Wireless Desktop RFKB-23 ++ A4Tech Wireless Desktop RFKB-23 + A4Tech + + + + + airkey +- <_description>Acer AirKey V ++ Acer AirKey V + Acer + + + + + azonaRF2300 +- <_description>Azona RF2300 wireless Internet Keyboard ++ Azona RF2300 wireless Internet Keyboard + Azona + + + + + scorpius +- <_description>Advance Scorpius KI ++ Advance Scorpius KI + Scorpius + + + + + brother +- <_description>Brother Internet Keyboard ++ Brother Internet Keyboard + Brother + + + + + btc5113rf +- <_description>BTC 5113RF Multimedia ++ BTC 5113RF Multimedia + BTC + + + + + btc5126t +- <_description>BTC 5126T ++ BTC 5126T + BTC + + + + + btc6301urf +- <_description>BTC 6301URF ++ BTC 6301URF + BTC + + + + + btc9000 +- <_description>BTC 9000 ++ BTC 9000 + BTC + + + + + btc9000a +- <_description>BTC 9000A ++ BTC 9000A + BTC + + + + + btc9001ah +- <_description>BTC 9001AH ++ BTC 9001AH + BTC + + + + + btc5090 +- <_description>BTC 5090 ++ BTC 5090 + BTC + + + + + btc9019u +- <_description>BTC 9019U ++ BTC 9019U + BTC + + + + + btc9116u +- <_description>BTC 9116U Mini Wireless Internet and Gaming ++ BTC 9116U Mini Wireless Internet and Gaming + + + + + cherryblue +- <_description>Cherry Blue Line CyBo@rd ++ Cherry Blue Line CyBo@rd + + + + + cherryblueb +- <_description>Cherry CyMotion Master XPress ++ Cherry CyMotion Master XPress + Cherry + + + + + cherrybluea +- <_description>Cherry Blue Line CyBo@rd (alternate option) ++ Cherry Blue Line CyBo@rd (alternate option) + Cherry + + + + + cherrycyboard +- <_description>Cherry CyBo@rd USB-Hub ++ Cherry CyBo@rd USB-Hub + Cherry + + + + + cherrycmexpert +- <_description>Cherry CyMotion Expert ++ Cherry CyMotion Expert + Cherry + + + + + cherrybunlim +- <_description>Cherry B.UNLIMITED ++ Cherry B.UNLIMITED + Cherry + + + + + chicony +- <_description>Chicony Internet Keyboard ++ Chicony Internet Keyboard + Chicony + + + + + chicony0108 +- <_description>Chicony KU-0108 ++ Chicony KU-0108 + Chicony + + + + + chicony0420 +- <_description>Chicony KU-0420 ++ Chicony KU-0420 + Chicony + + + + + chicony9885 +- <_description>Chicony KB-9885 ++ Chicony KB-9885 + Chicony + + + + + compaqeak8 +- <_description>Compaq Easy Access Keyboard ++ Compaq Easy Access Keyboard + Compaq + + + + + compaqik7 +- <_description>Compaq Internet Keyboard (7 keys) ++ Compaq Internet Keyboard (7 keys) + Compaq + + + + + compaqik13 +- <_description>Compaq Internet Keyboard (13 keys) ++ Compaq Internet Keyboard (13 keys) + Compaq + + + + + compaqik18 +- <_description>Compaq Internet Keyboard (18 keys) ++ Compaq Internet Keyboard (18 keys) + Compaq + + + + + cymotionlinux +- <_description>Cherry CyMotion Master Linux ++ Cherry CyMotion Master Linux + Cherry + + + + + armada +- <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard ++ Laptop/notebook Compaq (eg. Armada) Laptop Keyboard + Compaq + + + + + presario +- <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard ++ Laptop/notebook Compaq (eg. Presario) Internet Keyboard + Compaq + + + + + ipaq +- <_description>Compaq iPaq Keyboard ++ Compaq iPaq Keyboard + Compaq + + + + + dell +- <_description>Dell ++ Dell + Dell + + + + + dellsk8125 +- <_description>Dell SK-8125 ++ Dell SK-8125 + Dell + + + + + dellsk8135 +- <_description>Dell SK-8135 ++ Dell SK-8135 + Dell + + + + + dellusbmm +- <_description>Dell USB Multimedia Keyboard ++ Dell USB Multimedia Keyboard + Dell + + + + + inspiron +- <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx ++ Dell Laptop/notebook Inspiron 6xxx/8xxx + Dell + + + + + precision_m +- <_description>Dell Laptop/notebook Precision M series ++ Dell Laptop/notebook Precision M series + Dell + + + + + dexxa +- <_description>Dexxa Wireless Desktop Keyboard ++ Dexxa Wireless Desktop Keyboard + Dexxa + + + + + diamond +- <_description>Diamond 9801 / 9802 series ++ Diamond 9801 / 9802 series + Diamond + + + + + dtk2000 +- <_description>DTK2000 ++ DTK2000 + + + + + ennyah_dkb1008 +- <_description>Ennyah DKB-1008 ++ Ennyah DKB-1008 + Ennyah + + + + + fscaa1667g +- <_description>Fujitsu-Siemens Computers AMILO laptop ++ Fujitsu-Siemens Computers AMILO laptop + Fujitsu-Siemens + + + + + genius +- <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910 ++ Genius Comfy KB-16M / Genius MM Keyboard KWD-910 + Genius + + + + + geniuscomfy +- <_description>Genius Comfy KB-12e ++ Genius Comfy KB-12e + Genius + + + + + geniuscomfy2 +- <_description>Genius Comfy KB-21e-Scroll ++ Genius Comfy KB-21e-Scroll + Genius + + + + + geniuskb19e +- <_description>Genius KB-19e NB ++ Genius KB-19e NB + Genius + + + + + geniuskkb2050hs +- <_description>Genius KKB-2050HS ++ Genius KKB-2050HS + Genius + + + + + gyration +- <_description>Gyration ++ Gyration + Gyration + + + + + htcdream +- <_description>HTC Dream ++ HTC Dream + HTC + + + + + kinesis +- <_description>Kinesis ++ Kinesis + Kinesis + + + + + logitech_base +- <_description>Logitech Generic Keyboard ++ Logitech Generic Keyboard + Logitech + + + + + logitech_g15 +- <_description>Logitech G15 extra keys via G15daemon ++ Logitech G15 extra keys via G15daemon + Logitech + + + + + hpi6 +- <_description>Hewlett-Packard Internet Keyboard ++ Hewlett-Packard Internet Keyboard + Hewlett-Packard + + + + + hp250x +- <_description>Hewlett-Packard SK-250x Multimedia Keyboard ++ Hewlett-Packard SK-250x Multimedia Keyboard + Hewlett-Packard + + + + + hpxe3gc +- <_description>Hewlett-Packard Omnibook XE3 GC ++ Hewlett-Packard Omnibook XE3 GC + Hewlett-Packard + + + + + hpxe3gf +- <_description>Hewlett-Packard Omnibook XE3 GF ++ Hewlett-Packard Omnibook XE3 GF + Hewlett-Packard + + + + + hpxt1000 +- <_description>Hewlett-Packard Omnibook XT1000 ++ Hewlett-Packard Omnibook XT1000 + Hewlett-Packard + + + + + hpdv5 +- <_description>Hewlett-Packard Pavilion dv5 ++ Hewlett-Packard Pavilion dv5 + Hewlett-Packard + + + + + hpzt11xx +- <_description>Hewlett-Packard Pavilion ZT11xx ++ Hewlett-Packard Pavilion ZT11xx + Hewlett-Packard + + + + + hp500fa +- <_description>Hewlett-Packard Omnibook 500 FA ++ Hewlett-Packard Omnibook 500 FA + Hewlett-Packard + + + + + hp5xx +- <_description>Hewlett-Packard Omnibook 5xx ++ Hewlett-Packard Omnibook 5xx + Hewlett-Packard + + + + + hpnx9020 +- <_description>Hewlett-Packard nx9020 ++ Hewlett-Packard nx9020 + Hewlett-Packard + + + + + hp6000 +- <_description>Hewlett-Packard Omnibook 6000/6100 ++ Hewlett-Packard Omnibook 6000/6100 + Hewlett-Packard + + + + + honeywell_euroboard +- <_description>Honeywell Euroboard ++ Honeywell Euroboard + Hewlett-Packard + + + + + hpmini110 +- <_description>Hewlett-Packard Mini 110 Notebook ++ Hewlett-Packard Mini 110 Notebook + Hewlett-Packard + + + + + rapidaccess +- <_description>IBM Rapid Access ++ IBM Rapid Access + Lenovo (previously IBM) + + + + + rapidaccess2 +- <_description>IBM Rapid Access II ++ IBM Rapid Access II + Lenovo (previously IBM) + + + + + thinkpad +- <_description>IBM ThinkPad 560Z/600/600E/A22E ++ IBM ThinkPad 560Z/600/600E/A22E + Lenovo (previously IBM) + + + + + thinkpad60 +- <_description>IBM ThinkPad R60/T60/R61/T61 ++ IBM ThinkPad R60/T60/R61/T61 + Lenovo (previously IBM) + + + + + thinkpadz60 +- <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t ++ IBM ThinkPad Z60m/Z60t/Z61m/Z61t + Lenovo (previously IBM) + + + + + ibm_spacesaver +- <_description>IBM Space Saver ++ IBM Space Saver + Lenovo (previously IBM) + + + + + logiaccess +- <_description>Logitech Access Keyboard ++ Logitech Access Keyboard + Logitech + + + + + logiclx300 +- <_description>Logitech Cordless Desktop LX-300 ++ Logitech Cordless Desktop LX-300 + Logitech + + + + + logii350 +- <_description>Logitech Internet 350 Keyboard ++ Logitech Internet 350 Keyboard + Logitech + 046d:c313 + +@@ -633,665 +633,665 @@ + + + logimel +- <_description>Logitech Media Elite Keyboard ++ Logitech Media Elite Keyboard + Logitech + + + + + logicd +- <_description>Logitech Cordless Desktop ++ Logitech Cordless Desktop + Logitech + + + + + logicd_it +- <_description>Logitech Cordless Desktop iTouch ++ Logitech Cordless Desktop iTouch + Logitech + + + + + logicd_nav +- <_description>Logitech Cordless Desktop Navigator ++ Logitech Cordless Desktop Navigator + Logitech + + + + + logicd_opt +- <_description>Logitech Cordless Desktop Optical ++ Logitech Cordless Desktop Optical + Logitech + + + + + logicda +- <_description>Logitech Cordless Desktop (alternate option) ++ Logitech Cordless Desktop (alternate option) + Logitech + + + + + logicdpa2 +- <_description>Logitech Cordless Desktop Pro (alternate option 2) ++ Logitech Cordless Desktop Pro (alternate option 2) + Logitech + + + + + logicfn +- <_description>Logitech Cordless Freedom/Desktop Navigator ++ Logitech Cordless Freedom/Desktop Navigator + Logitech + + + + + logicdn +- <_description>Logitech Cordless Desktop Navigator ++ Logitech Cordless Desktop Navigator + Logitech + + + + + logiitc +- <_description>Logitech iTouch Cordless Keyboard (model Y-RB6) ++ Logitech iTouch Cordless Keyboard (model Y-RB6) + Logitech + + + + + logiik +- <_description>Logitech Internet Keyboard ++ Logitech Internet Keyboard + Logitech + + + + + itouch +- <_description>Logitech iTouch ++ Logitech iTouch + Logitech + + + + + logicink +- <_description>Logitech Internet Navigator Keyboard ++ Logitech Internet Navigator Keyboard + Logitech + + + + + logiex110 +- <_description>Logitech Cordless Desktop EX110 ++ Logitech Cordless Desktop EX110 + Logitech + + + + + logiinkse +- <_description>Logitech iTouch Internet Navigator Keyboard SE ++ Logitech iTouch Internet Navigator Keyboard SE + Logitech + + + + + logiinkseusb +- <_description>Logitech iTouch Internet Navigator Keyboard SE (USB) ++ Logitech iTouch Internet Navigator Keyboard SE (USB) + Logitech + + + + + logiultrax +- <_description>Logitech Ultra-X Keyboard ++ Logitech Ultra-X Keyboard + Logitech + + + + + logiultraxc +- <_description>Logitech Ultra-X Cordless Media Desktop Keyboard ++ Logitech Ultra-X Cordless Media Desktop Keyboard + Logitech + + + + + logidinovo +- <_description>Logitech diNovo Keyboard ++ Logitech diNovo Keyboard + Logitech + + + + + logidinovoedge +- <_description>Logitech diNovo Edge Keyboard ++ Logitech diNovo Edge Keyboard + Logitech + + + + + mx1998 +- <_description>Memorex MX1998 ++ Memorex MX1998 + Memorex + + + + + mx2500 +- <_description>Memorex MX2500 EZ-Access Keyboard ++ Memorex MX2500 EZ-Access Keyboard + Memorex + + + + + mx2750 +- <_description>Memorex MX2750 ++ Memorex MX2750 + Memorex + + + + + microsoft4000 +- <_description>Microsoft Natural Wireless Ergonomic Keyboard 4000 ++ Microsoft Natural Wireless Ergonomic Keyboard 4000 + Microsoft Inc. + + + + + microsoft7000 +- <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000 ++ Microsoft Natural Wireless Ergonomic Keyboard 7000 + Microsoft Inc. + + + + + microsoftinet +- <_description>Microsoft Internet Keyboard ++ Microsoft Internet Keyboard + Microsoft Inc. + + + + + microsoftpro +- <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro ++ Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro + Microsoft Inc. + + + + + microsoftprousb +- <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro ++ Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro + Microsoft Inc. + + + + + microsoftprooem +- <_description>Microsoft Natural Keyboard Pro OEM ++ Microsoft Natural Keyboard Pro OEM + Microsoft Inc. + + + + + vsonku306 +- <_description>ViewSonic KU-306 Internet Keyboard ++ ViewSonic KU-306 Internet Keyboard + ViewSonic + + + + + microsoftprose +- <_description>Microsoft Internet Keyboard Pro, Swedish ++ Microsoft Internet Keyboard Pro, Swedish + Microsoft Inc. + + + + + microsoftoffice +- <_description>Microsoft Office Keyboard ++ Microsoft Office Keyboard + Microsoft Inc. + + + + + microsoftmult +- <_description>Microsoft Wireless Multimedia Keyboard 1.0A ++ Microsoft Wireless Multimedia Keyboard 1.0A + Microsoft Inc. + + + + + microsoftelite +- <_description>Microsoft Natural Keyboard Elite ++ Microsoft Natural Keyboard Elite + Microsoft Inc. + + + + + microsoftccurve2k +- <_description>Microsoft Comfort Curve Keyboard 2000 ++ Microsoft Comfort Curve Keyboard 2000 + Microsoft Inc. + + + + + oretec +- <_description>Ortek MCK-800 MM/Internet keyboard ++ Ortek MCK-800 MM/Internet keyboard + Ortek + + + + + propeller +- <_description>Propeller Voyager (KTEZ-1000) ++ Propeller Voyager (KTEZ-1000) + KeyTronic + + + + + qtronix +- <_description>QTronix Scorpius 98N+ ++ QTronix Scorpius 98N+ + QTronix + + + + + samsung4500 +- <_description>Samsung SDM 4500P ++ Samsung SDM 4500P + Samsung + + + + + samsung4510 +- <_description>Samsung SDM 4510P ++ Samsung SDM 4510P + Samsung + + + + + sanwaskbkg3 +- <_description>Sanwa Supply SKB-KG3 ++ Sanwa Supply SKB-KG3 + Sanwa Supply Inc. + + + + + sk1300 +- <_description>SK-1300 ++ SK-1300 + NEC + + + + + sk2500 +- <_description>SK-2500 ++ SK-2500 + NEC + + + + + sk6200 +- <_description>SK-6200 ++ SK-6200 + NEC + + + + + sk7100 +- <_description>SK-7100 ++ SK-7100 + NEC + + + + + sp_inet +- <_description>Super Power Multimedia Keyboard ++ Super Power Multimedia Keyboard + Generic + + + + + sven +- <_description>SVEN Ergonomic 2500 ++ SVEN Ergonomic 2500 + SVEN + + + + + sven303 +- <_description>SVEN Slim 303 ++ SVEN Slim 303 + SVEN + + + + + symplon +- <_description>Symplon PaceBook (tablet PC) ++ Symplon PaceBook (tablet PC) + Symplon + + + + + toshiba_s3000 +- <_description>Toshiba Satellite S3000 ++ Toshiba Satellite S3000 + Toshiba + + + + + trust +- <_description>Trust Wireless Keyboard Classic ++ Trust Wireless Keyboard Classic + Trust + + + + + trustda +- <_description>Trust Direct Access Keyboard ++ Trust Direct Access Keyboard + Trust + + + + + trust_slimline +- <_description>Trust Slimline ++ Trust Slimline + Trust + + + + + tm2020 +- <_description>TypeMatrix EZ-Reach 2020 ++ TypeMatrix EZ-Reach 2020 + TypeMatrix + + + + + tm2030PS2 +- <_description>TypeMatrix EZ-Reach 2030 PS2 ++ TypeMatrix EZ-Reach 2030 PS2 + TypeMatrix + + + + + tm2030USB +- <_description>TypeMatrix EZ-Reach 2030 USB ++ TypeMatrix EZ-Reach 2030 USB + TypeMatrix + + + + + tm2030USB-102 +- <_description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) ++ TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) + TypeMatrix + + + + + tm2030USB-106 +- <_description>TypeMatrix EZ-Reach 2030 USB (106:JP mode) ++ TypeMatrix EZ-Reach 2030 USB (106:JP mode) + TypeMatrix + + + + + yahoo +- <_description>Yahoo! Internet Keyboard ++ Yahoo! Internet Keyboard + Yahoo! + + + + + macbook78 +- <_description>MacBook/MacBook Pro ++ MacBook/MacBook Pro + Apple + + + + + macbook79 +- <_description>MacBook/MacBook Pro (Intl) ++ MacBook/MacBook Pro (Intl) + Apple + + + + + macintosh +- <_description>Macintosh ++ Macintosh + Apple + + + + + macintosh_old +- <_description>Macintosh Old ++ Macintosh Old + Apple + + + + + macintosh_hhk +- <_description>Happy Hacking Keyboard for Mac ++ Happy Hacking Keyboard for Mac + Fujitsu + + + + + acer_c300 +- <_description>Acer C300 ++ Acer C300 + Acer + + + + + acer_ferrari4k +- <_description>Acer Ferrari 4000 ++ Acer Ferrari 4000 + Acer + + + + + acer_laptop +- <_description>Acer Laptop ++ Acer Laptop + Acer + + + + + asus_laptop +- <_description>Asus Laptop ++ Asus Laptop + Asus + + + + + apple +- <_description>Apple ++ Apple + Apple + + + + + apple_laptop +- <_description>Apple Laptop ++ Apple Laptop + Apple + + + + + applealu_ansi +- <_description>Apple Aluminium Keyboard (ANSI) ++ Apple Aluminium Keyboard (ANSI) + Apple + + + + + applealu_iso +- <_description>Apple Aluminium Keyboard (ISO) ++ Apple Aluminium Keyboard (ISO) + Apple + + + + + applealu_jis +- <_description>Apple Aluminium Keyboard (JIS) ++ Apple Aluminium Keyboard (JIS) + Apple + + + + + silvercrest +- <_description>SILVERCREST Multimedia Wireless Keyboard ++ SILVERCREST Multimedia Wireless Keyboard + Silvercrest + + + + + emachines +- <_description>Laptop/notebook eMachines m68xx ++ Laptop/notebook eMachines m68xx + eMachines + + + + + benqx +- <_description>BenQ X-Touch ++ BenQ X-Touch + BenQ + + + + + benqx730 +- <_description>BenQ X-Touch 730 ++ BenQ X-Touch 730 + BenQ + + + + + benqx800 +- <_description>BenQ X-Touch 800 ++ BenQ X-Touch 800 + BenQ + + + + + hhk +- <_description>Happy Hacking Keyboard ++ Happy Hacking Keyboard + Fujitsu + + + + + classmate +- <_description>Classmate PC ++ Classmate PC + Intel + + + + + olpc +- <_description>OLPC ++ OLPC + OLPC + + + + + sun_type7_usb +- <_description>Sun Type 7 USB ++ Sun Type 7 USB + Sun Microsystems + + + + + sun_type7_euro_usb +- <_description>Sun Type 7 USB (European layout) ++ Sun Type 7 USB (European layout) + Sun Microsystems + + + + + sun_type7_unix_usb +- <_description>Sun Type 7 USB (Unix layout) ++ Sun Type 7 USB (Unix layout) + Sun Microsystems + + + + + sun_type7_jp_usb +- <_description>Sun Type 7 USB (Japanese layout) / Japanese 106-key ++ Sun Type 7 USB (Japanese layout) / Japanese 106-key + Sun Microsystems + + + + + sun_type6_usb +- <_description>Sun Type 6/7 USB ++ Sun Type 6/7 USB + Sun Microsystems + + + + + sun_type6_euro_usb +- <_description>Sun Type 6/7 USB (European layout) ++ Sun Type 6/7 USB (European layout) + Sun Microsystems + + + + + sun_type6_unix_usb +- <_description>Sun Type 6 USB (Unix layout) ++ Sun Type 6 USB (Unix layout) + Sun Microsystems + + + + + sun_type6_jp_usb +- <_description>Sun Type 6 USB (Japanese layout) ++ Sun Type 6 USB (Japanese layout) + Sun Microsystems + + + + + sun_type6_jp +- <_description>Sun Type 6 (Japanese layout) ++ Sun Type 6 (Japanese layout) + Sun Microsystems + + + + + targa_v811 +- <_description>Targa Visionary 811 ++ Targa Visionary 811 + Targa + + + + + unitekkb1925 +- <_description>Unitek KB-1925 ++ Unitek KB-1925 + Unitek Group + + + + + compalfl90 +- <_description>FL90 ++ FL90 + Compal Electronics Inc. + + + + + creativedw7000 +- <_description>Creative Desktop Wireless 7000 ++ Creative Desktop Wireless 7000 + Creative + + + + + htcdream +- <_description>Htc Dream phone ++ Htc Dream phone + htc + + +@@ -1300,9 +1300,9 @@ + + + us +- +- <_shortDescription>en +- <_description>English (US) ++ ++ en ++ English (US) + + eng + +@@ -1311,9 +1311,9 @@ + + + chr +- +- <_shortDescription>chr +- <_description>Cherokee ++ ++ chr ++ Cherokee + + chr + +@@ -1322,75 +1322,75 @@ + + + euro +- <_description>English (US, with euro on 5) ++ English (US, with euro on 5) + + + + + intl +- <_description>English (US, international with dead keys) ++ English (US, international with dead keys) + + + + + alt-intl +- <_description>English (US, alternative international) ++ English (US, alternative international) + + + + + colemak +- <_description>English (Colemak) ++ English (Colemak) + + + + + dvorak +- <_description>English (Dvorak) ++ English (Dvorak) + + + + + dvorak-intl +- <_description>English (Dvorak, international with dead keys) ++ English (Dvorak, international with dead keys) + + + + + dvorak-alt-intl +- <_description>English (Dvorak alternative international no dead keys) ++ English (Dvorak alternative international no dead keys) + + + + + dvorak-l +- <_description>English (left handed Dvorak) ++ English (left handed Dvorak) + + + + + dvorak-r +- <_description>English (right handed Dvorak) ++ English (right handed Dvorak) + + + + + dvorak-classic +- <_description>English (classic Dvorak) ++ English (classic Dvorak) + + + + + dvp +- <_description>English (programmer Dvorak) ++ English (programmer Dvorak) + + + + + rus +- +- <_shortDescription>ru +- <_description>Russian (US, phonetic) ++ ++ ru ++ Russian (US, phonetic) + + rus + +@@ -1399,13 +1399,13 @@ + + + mac +- <_description>English (Macintosh) ++ English (Macintosh) + + + + + altgr-intl +- <_description>English (international AltGr dead keys) ++ English (international AltGr dead keys) + eng + fra + ger +@@ -1414,13 +1414,13 @@ + + + olpc2 +- <_description>English (the divide/multiply keys toggle the layout) ++ English (the divide/multiply keys toggle the layout) + + + + + hbs +- <_description>Serbo-Croatian (US) ++ Serbo-Croatian (US) + eng + bos + hbs +@@ -1431,13 +1431,13 @@ + + + workman +- <_description>English (Workman) ++ English (Workman) + + + + + workman-intl +- <_description>English (Workman, international with dead keys) ++ English (Workman, international with dead keys) + + + +@@ -1445,17 +1445,17 @@ + + + af +- +- <_shortDescription>fa +- <_description>Afghani ++ ++ fa ++ Afghani + + + + + ps +- +- <_shortDescription>ps +- <_description>Pashto ++ ++ ps ++ Pashto + + pus + +@@ -1464,9 +1464,9 @@ + + + uz +- +- <_shortDescription>uz +- <_description>Uzbek (Afghanistan) ++ ++ uz ++ Uzbek (Afghanistan) + + uzb + +@@ -1475,9 +1475,9 @@ + + + olpc-ps +- +- <_shortDescription>ps +- <_description>Pashto (Afghanistan, OLPC) ++ ++ ps ++ Pashto (Afghanistan, OLPC) + + pus + +@@ -1486,17 +1486,17 @@ + + + fa-olpc +- +- <_shortDescription>fa +- <_description>Persian (Afghanistan, Dari OLPC) ++ ++ fa ++ Persian (Afghanistan, Dari OLPC) + + + + + uz-olpc +- +- <_shortDescription>uz +- <_description>Uzbek (Afghanistan, OLPC) ++ ++ uz ++ Uzbek (Afghanistan, OLPC) + + uzb + +@@ -1507,9 +1507,9 @@ + + + ara +- +- <_shortDescription>ar +- <_description>Arabic ++ ++ ar ++ Arabic + + AE + BH +@@ -1539,37 +1539,37 @@ + + + azerty +- <_description>Arabic (azerty) ++ Arabic (azerty) + + + + + azerty_digits +- <_description>Arabic (azerty/digits) ++ Arabic (azerty/digits) + + + + + digits +- <_description>Arabic (digits) ++ Arabic (digits) + + + + + qwerty +- <_description>Arabic (qwerty) ++ Arabic (qwerty) + + + + + qwerty_digits +- <_description>Arabic (qwerty/digits) ++ Arabic (qwerty/digits) + + + + + buckwalter +- <_description>Arabic (Buckwalter) ++ Arabic (Buckwalter) + + + +@@ -1577,9 +1577,9 @@ + + + al +- +- <_shortDescription>sq +- <_description>Albanian ++ ++ sq ++ Albanian + + alb + +@@ -1589,9 +1589,9 @@ + + + am +- +- <_shortDescription>hy +- <_description>Armenian ++ ++ hy ++ Armenian + + hye + +@@ -1600,31 +1600,31 @@ + + + phonetic +- <_description>Armenian (phonetic) ++ Armenian (phonetic) + + + + + phonetic-alt +- <_description>Armenian (alternative phonetic) ++ Armenian (alternative phonetic) + + + + + eastern +- <_description>Armenian (eastern) ++ Armenian (eastern) + + + + + western +- <_description>Armenian (western) ++ Armenian (western) + + + + + eastern-alt +- <_description>Armenian (alternative eastern) ++ Armenian (alternative eastern) + + + +@@ -1632,9 +1632,9 @@ + + + at +- +- <_shortDescription>de +- <_description>German (Austria) ++ ++ de ++ German (Austria) + + ger + +@@ -1643,19 +1643,19 @@ + + + nodeadkeys +- <_description>German (Austria, eliminate dead keys) ++ German (Austria, eliminate dead keys) + + + + + sundeadkeys +- <_description>German (Austria, Sun dead keys) ++ German (Austria, Sun dead keys) + + + + + mac +- <_description>German (Austria, Macintosh) ++ German (Austria, Macintosh) + + + +@@ -1663,9 +1663,9 @@ + + + az +- +- <_shortDescription>az +- <_description>Azerbaijani ++ ++ az ++ Azerbaijani + + aze + +@@ -1674,7 +1674,7 @@ + + + cyrillic +- <_description>Azerbaijani (Cyrillic) ++ Azerbaijani (Cyrillic) + + + +@@ -1682,9 +1682,9 @@ + + + by +- +- <_shortDescription>by +- <_description>Belarusian ++ ++ by ++ Belarusian + + bel + +@@ -1693,13 +1693,13 @@ + + + legacy +- <_description>Belarusian (legacy) ++ Belarusian (legacy) + + + + + latin +- <_description>Belarusian (Latin) ++ Belarusian (Latin) + + + +@@ -1707,9 +1707,9 @@ + + + be +- +- <_shortDescription>be +- <_description>Belgian ++ ++ be ++ Belgian + ger + nld + fra +@@ -1718,43 +1718,43 @@ + + + oss +- <_description>Belgian (alternative) ++ Belgian (alternative) + + + + + oss_latin9 +- <_description>Belgian (alternative, Latin-9 only) ++ Belgian (alternative, Latin-9 only) + + + + + oss_sundeadkeys +- <_description>Belgian (alternative, Sun dead keys) ++ Belgian (alternative, Sun dead keys) + + + + + iso-alternate +- <_description>Belgian (ISO alternate) ++ Belgian (ISO alternate) + + + + + nodeadkeys +- <_description>Belgian (eliminate dead keys) ++ Belgian (eliminate dead keys) + + + + + sundeadkeys +- <_description>Belgian (Sun dead keys) ++ Belgian (Sun dead keys) + + + + + wang +- <_description>Belgian (Wang model 724 azerty) ++ Belgian (Wang model 724 azerty) + + + +@@ -1762,9 +1762,9 @@ + + + bd +- +- <_shortDescription>bn +- <_description>Bangla ++ ++ bn ++ Bangla + + ben + +@@ -1773,7 +1773,7 @@ + + + probhat +- <_description>Bangla (Probhat) ++ Bangla (Probhat) + + + +@@ -1781,17 +1781,17 @@ + + + in +- +- <_shortDescription>in +- <_description>Indian ++ ++ in ++ Indian + + + + + ben +- +- <_shortDescription>bn +- <_description>Bangla (India) ++ ++ bn ++ Bangla (India) + + ben + +@@ -1800,9 +1800,9 @@ + + + ben_probhat +- +- <_shortDescription>bn +- <_description>Bangla (India, Probhat) ++ ++ bn ++ Bangla (India, Probhat) + + ben + +@@ -1811,28 +1811,28 @@ + + + ben_baishakhi +- <_description>Bangla (India, Baishakhi) ++ Bangla (India, Baishakhi) + ben + + + + + ben_bornona +- <_description>Bangla (India, Bornona) ++ Bangla (India, Bornona) + ben + + + + + ben_gitanjali +- <_description>Bangla (India, Uni Gitanjali) ++ Bangla (India, Uni Gitanjali) + ben + + + + + ben_inscript +- <_description>Bangla (India, Baishakhi Inscript) ++ Bangla (India, Baishakhi Inscript) + ben + + +@@ -1846,9 +1846,9 @@ + + + guj +- +- <_shortDescription>gu +- <_description>Gujarati ++ ++ gu ++ Gujarati + + guj + +@@ -1857,9 +1857,9 @@ + + + guru +- +- <_shortDescription>pa +- <_description>Punjabi (Gurmukhi) ++ ++ pa ++ Punjabi (Gurmukhi) + + pan + +@@ -1868,9 +1868,9 @@ + + + jhelum +- +- <_shortDescription>pa +- <_description>Punjabi (Gurmukhi Jhelum) ++ ++ pa ++ Punjabi (Gurmukhi Jhelum) + + pan + +@@ -1879,9 +1879,9 @@ + + + kan +- +- <_shortDescription>kn +- <_description>Kannada ++ ++ kn ++ Kannada + + kan + +@@ -1890,9 +1890,9 @@ + + + kan-kagapa +- +- <_shortDescription>kn +- <_description>Kannada (KaGaPa phonetic) ++ ++ kn ++ Kannada (KaGaPa phonetic) + + kan + +@@ -1901,9 +1901,9 @@ + + + mal +- +- <_shortDescription>ml +- <_description>Malayalam ++ ++ ml ++ Malayalam + + mal + +@@ -1912,9 +1912,9 @@ + + + mal_lalitha +- +- <_shortDescription>ml +- <_description>Malayalam (Lalitha) ++ ++ ml ++ Malayalam (Lalitha) + + mal + +@@ -1923,18 +1923,18 @@ + + + mal_enhanced +- +- <_shortDescription>ml +- <_description>Malayalam (enhanced Inscript with Rupee Sign) ++ ++ ml ++ Malayalam (enhanced Inscript with Rupee Sign) + mal + + + + + ori +- +- <_shortDescription>or +- <_description>Oriya ++ ++ or ++ Oriya + + ori + +@@ -1943,9 +1943,9 @@ + + + tam_unicode +- +- <_shortDescription>ta +- <_description>Tamil (Unicode) ++ ++ ta ++ Tamil (Unicode) + + tam + +@@ -1954,9 +1954,9 @@ + + + tam_keyboard_with_numerals +- +- <_shortDescription>ta +- <_description>Tamil (keyboard with numerals) ++ ++ ta ++ Tamil (keyboard with numerals) + + tam + +@@ -1965,9 +1965,9 @@ + + + tam_TAB +- +- <_shortDescription>ta +- <_description>Tamil (TAB typewriter) ++ ++ ta ++ Tamil (TAB typewriter) + + tam + +@@ -1976,9 +1976,9 @@ + + + tam_TSCII +- +- <_shortDescription>ta +- <_description>Tamil (TSCII typewriter) ++ ++ ta ++ Tamil (TSCII typewriter) + + tam + +@@ -1987,9 +1987,9 @@ + + + tam +- +- <_shortDescription>ta +- <_description>Tamil ++ ++ ta ++ Tamil + + tam + +@@ -1998,9 +1998,9 @@ + + + tel +- +- <_shortDescription>te +- <_description>Telugu ++ ++ te ++ Telugu + + tel + +@@ -2009,9 +2009,9 @@ + + + tel-kagapa +- +- <_shortDescription>te +- <_description>Telugu (KaGaPa phonetic) ++ ++ te ++ Telugu (KaGaPa phonetic) + + tel + +@@ -2020,9 +2020,9 @@ + + + urd-phonetic +- +- <_shortDescription>ur +- <_description>Urdu (phonetic) ++ ++ ur ++ Urdu (phonetic) + + urd + +@@ -2031,9 +2031,9 @@ + + + urd-phonetic3 +- +- <_shortDescription>ur +- <_description>Urdu (alternative phonetic) ++ ++ ur ++ Urdu (alternative phonetic) + + urd + +@@ -2042,9 +2042,9 @@ + + + urd-winkeys +- +- <_shortDescription>ur +- <_description>Urdu (WinKeys) ++ ++ ur ++ Urdu (WinKeys) + + urd + +@@ -2053,9 +2053,9 @@ + + + bolnagri +- +- <_shortDescription>hi +- <_description>Hindi (Bolnagri) ++ ++ hi ++ Hindi (Bolnagri) + + hin + +@@ -2064,9 +2064,9 @@ + + + hin-wx +- +- <_shortDescription>hi +- <_description>Hindi (Wx) ++ ++ hi ++ Hindi (Wx) + + hin + +@@ -2075,9 +2075,9 @@ + + + hin-kagapa +- +- <_shortDescription>hi +- <_description>Hindi (KaGaPa phonetic) ++ ++ hi ++ Hindi (KaGaPa phonetic) + + hin + +@@ -2086,9 +2086,9 @@ + + + san-kagapa +- +- <_shortDescription>sa +- <_description>Sanskrit (KaGaPa phonetic) ++ ++ sa ++ Sanskrit (KaGaPa phonetic) + + san + +@@ -2097,9 +2097,9 @@ + + + mar-kagapa +- +- <_shortDescription>mr +- <_description>Marathi (KaGaPa phonetic) ++ ++ mr ++ Marathi (KaGaPa phonetic) + + mar + +@@ -2108,9 +2108,9 @@ + + + eng +- +- <_shortDescription>en +- <_description>English (India, with RupeeSign) ++ ++ en ++ English (India, with RupeeSign) + + eng + +@@ -2121,9 +2121,9 @@ + + + ba +- +- <_shortDescription>bs +- <_description>Bosnian ++ ++ bs ++ Bosnian + + bos + +@@ -2132,25 +2132,25 @@ + + + alternatequotes +- <_description>Bosnian (use guillemets for quotes) ++ Bosnian (use guillemets for quotes) + + + + + unicode +- <_description>Bosnian (use Bosnian digraphs) ++ Bosnian (use Bosnian digraphs) + + + + + unicodeus +- <_description>Bosnian (US keyboard with Bosnian digraphs) ++ Bosnian (US keyboard with Bosnian digraphs) + + + + + us +- <_description>Bosnian (US keyboard with Bosnian letters) ++ Bosnian (US keyboard with Bosnian letters) + + + +@@ -2158,9 +2158,9 @@ + + + br +- +- <_shortDescription>pt +- <_description>Portuguese (Brazil) ++ ++ pt ++ Portuguese (Brazil) + + por + +@@ -2169,31 +2169,31 @@ + + + nodeadkeys +- <_description>Portuguese (Brazil, eliminate dead keys) ++ Portuguese (Brazil, eliminate dead keys) + + + + + dvorak +- <_description>Portuguese (Brazil, Dvorak) ++ Portuguese (Brazil, Dvorak) + + + + + nativo +- <_description>Portuguese (Brazil, Nativo) ++ Portuguese (Brazil, Nativo) + + + + + nativo-us +- <_description>Portuguese (Brazil, Nativo for US keyboards) ++ Portuguese (Brazil, Nativo for US keyboards) + + + + + nativo-epo +- <_description>Esperanto (Brazil, Nativo) ++ Esperanto (Brazil, Nativo) + + epo + +@@ -2204,9 +2204,9 @@ + + + bg +- +- <_shortDescription>bg +- <_description>Bulgarian ++ ++ bg ++ Bulgarian + + bul + +@@ -2215,13 +2215,13 @@ + + + phonetic +- <_description>Bulgarian (traditional phonetic) ++ Bulgarian (traditional phonetic) + + + + + bas_phonetic +- <_description>Bulgarian (new phonetic) ++ Bulgarian (new phonetic) + + + +@@ -2229,17 +2229,17 @@ + + + ma +- +- <_shortDescription>ar +- <_description>Arabic (Morocco) ++ ++ ar ++ Arabic (Morocco) + + + + + french +- +- <_shortDescription>fr +- <_description>French (Morocco) ++ ++ fr ++ French (Morocco) + + fra + +@@ -2248,9 +2248,9 @@ + + + tifinagh +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh) ++ ++ ber ++ Berber (Morocco, Tifinagh) + + ber + +@@ -2259,9 +2259,9 @@ + + + tifinagh-alt +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh alternative) ++ ++ ber ++ Berber (Morocco, Tifinagh alternative) + + ber + +@@ -2270,9 +2270,9 @@ + + + tifinagh-alt-phonetic +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh alternative phonetic) ++ ++ ber ++ Berber (Morocco, Tifinagh alternative phonetic) + + ber + +@@ -2281,9 +2281,9 @@ + + + tifinagh-extended +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh extended) ++ ++ ber ++ Berber (Morocco, Tifinagh extended) + + ber + +@@ -2292,9 +2292,9 @@ + + + tifinagh-phonetic +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh phonetic) ++ ++ ber ++ Berber (Morocco, Tifinagh phonetic) + + ber + +@@ -2303,9 +2303,9 @@ + + + tifinagh-extended-phonetic +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh extended phonetic) ++ ++ ber ++ Berber (Morocco, Tifinagh extended phonetic) + + ber + +@@ -2316,23 +2316,23 @@ + + + cm +- +- <_shortDescription>cm +- <_description>English (Cameroon) ++ ++ cm ++ English (Cameroon) + eng + + + + + french +- <_description>French (Cameroon) ++ French (Cameroon) + fra + + + + + qwerty +- <_description>Cameroon Multilingual (qwerty) ++ Cameroon Multilingual (qwerty) + + eng + bas +@@ -2369,7 +2369,7 @@ + + + azerty +- <_description>Cameroon Multilingual (azerty) ++ Cameroon Multilingual (azerty) + + fra + bas +@@ -2406,7 +2406,7 @@ + + + dvorak +- <_description>Cameroon Multilingual (Dvorak) ++ Cameroon Multilingual (Dvorak) + + + +@@ -2414,9 +2414,9 @@ + + + mm +- +- <_shortDescription>my +- <_description>Burmese ++ ++ my ++ Burmese + + mya + +@@ -2426,9 +2426,9 @@ + + + ca +- +- <_shortDescription>fr +- <_description>French (Canada) ++ ++ fr ++ French (Canada) + + fra + +@@ -2437,43 +2437,43 @@ + + + fr-dvorak +- +- <_shortDescription>fr +- <_description>French (Canada, Dvorak) ++ ++ fr ++ French (Canada, Dvorak) + + + + + fr-legacy +- +- <_shortDescription>fr +- <_description>French (Canada, legacy) ++ ++ fr ++ French (Canada, legacy) + + + + + multix +- <_description>Canadian Multilingual ++ Canadian Multilingual + + + + + multi +- <_description>Canadian Multilingual (first part) ++ Canadian Multilingual (first part) + + + + + multi-2gr +- <_description>Canadian Multilingual (second part) ++ Canadian Multilingual (second part) + + + + + ike +- +- <_shortDescription>ike +- <_description>Inuktitut ++ ++ ike ++ Inuktitut + + iku + +@@ -2482,9 +2482,9 @@ + + + eng +- +- <_shortDescription>en +- <_description>English (Canada) ++ ++ en ++ English (Canada) + + eng + +@@ -2495,9 +2495,9 @@ + + + cd +- +- <_shortDescription>fr +- <_description>French (Democratic Republic of the Congo) ++ ++ fr ++ French (Democratic Republic of the Congo) + + fra + +@@ -2507,9 +2507,9 @@ + + + cn +- +- <_shortDescription>zh +- <_description>Chinese ++ ++ zh ++ Chinese + + chi + +@@ -2518,7 +2518,7 @@ + + + tib +- <_description>Tibetan ++ Tibetan + + tib + +@@ -2527,7 +2527,7 @@ + + + tib_asciinum +- <_description>Tibetan (with ASCII numerals) ++ Tibetan (with ASCII numerals) + + tib + +@@ -2536,8 +2536,8 @@ + + + ug +- <_shortDescription>ug +- <_description>Uyghur ++ ug ++ Uyghur + + ug + +@@ -2548,9 +2548,9 @@ + + + hr +- +- <_shortDescription>hr +- <_description>Croatian ++ ++ hr ++ Croatian + + hrv + +@@ -2559,25 +2559,25 @@ + + + alternatequotes +- <_description>Croatian (use guillemets for quotes) ++ Croatian (use guillemets for quotes) + + + + + unicode +- <_description>Croatian (use Croatian digraphs) ++ Croatian (use Croatian digraphs) + + + + + unicodeus +- <_description>Croatian (US keyboard with Croatian digraphs) ++ Croatian (US keyboard with Croatian digraphs) + + + + + us +- <_description>Croatian (US keyboard with Croatian letters) ++ Croatian (US keyboard with Croatian letters) + + + +@@ -2585,9 +2585,9 @@ + + + cz +- +- <_shortDescription>cs +- <_description>Czech ++ ++ cs ++ Czech + + cze + +@@ -2596,31 +2596,31 @@ + + + bksl +- <_description>Czech (with <\|> key) ++ Czech (with <\|> key) + + + + + qwerty +- <_description>Czech (qwerty) ++ Czech (qwerty) + + + + + qwerty_bksl +- <_description>Czech (qwerty, extended Backslash) ++ Czech (qwerty, extended Backslash) + + + + + ucw +- <_description>Czech (UCW layout, accented letters only) ++ Czech (UCW layout, accented letters only) + + + + + dvorak-ucw +- <_description>Czech (US Dvorak with CZ UCW support) ++ Czech (US Dvorak with CZ UCW support) + + + +@@ -2628,9 +2628,9 @@ + + + dk +- +- <_shortDescription>da +- <_description>Danish ++ ++ da ++ Danish + + dan + +@@ -2639,25 +2639,25 @@ + + + nodeadkeys +- <_description>Danish (eliminate dead keys) ++ Danish (eliminate dead keys) + + + + + mac +- <_description>Danish (Macintosh) ++ Danish (Macintosh) + + + + + mac_nodeadkeys +- <_description>Danish (Macintosh, eliminate dead keys) ++ Danish (Macintosh, eliminate dead keys) + + + + + dvorak +- <_description>Danish (Dvorak) ++ Danish (Dvorak) + + + +@@ -2665,9 +2665,9 @@ + + + nl +- +- <_shortDescription>nl +- <_description>Dutch ++ ++ nl ++ Dutch + + nld + +@@ -2676,19 +2676,19 @@ + + + sundeadkeys +- <_description>Dutch (Sun dead keys) ++ Dutch (Sun dead keys) + + + + + mac +- <_description>Dutch (Macintosh) ++ Dutch (Macintosh) + + + + + std +- <_description>Dutch (standard) ++ Dutch (standard) + + + +@@ -2696,9 +2696,9 @@ + + + bt +- +- <_shortDescription>dz +- <_description>Dzongkha ++ ++ dz ++ Dzongkha + + dzo + +@@ -2707,9 +2707,9 @@ + + + ee +- +- <_shortDescription>et +- <_description>Estonian ++ ++ et ++ Estonian + + est + +@@ -2718,19 +2718,19 @@ + + + nodeadkeys +- <_description>Estonian (eliminate dead keys) ++ Estonian (eliminate dead keys) + + + + + dvorak +- <_description>Estonian (Dvorak) ++ Estonian (Dvorak) + + + + + us +- <_description>Estonian (US keyboard with Estonian letters) ++ Estonian (US keyboard with Estonian letters) + + + +@@ -2738,9 +2738,9 @@ + + + ir +- +- <_shortDescription>fa +- <_description>Persian ++ ++ fa ++ Persian + + per + +@@ -2749,15 +2749,15 @@ + + + pes_keypad +- <_description>Persian (with Persian Keypad) ++ Persian (with Persian Keypad) + + + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, Latin Q) ++ ++ ku ++ Kurdish (Iran, Latin Q) + + kur + +@@ -2766,9 +2766,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, F) ++ ++ ku ++ Kurdish (Iran, F) + + kur + +@@ -2777,9 +2777,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, Latin Alt-Q) ++ ++ ku ++ Kurdish (Iran, Latin Alt-Q) + + kur + +@@ -2788,9 +2788,9 @@ + + + ku_ara +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, Arabic-Latin) ++ ++ ku ++ Kurdish (Iran, Arabic-Latin) + + kur + +@@ -2801,9 +2801,9 @@ + + + iq +- +- <_shortDescription>ar +- <_description>Iraqi ++ ++ ar ++ Iraqi + ara + kur + +@@ -2811,9 +2811,9 @@ + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, Latin Q) ++ ++ ku ++ Kurdish (Iraq, Latin Q) + + kur + +@@ -2822,9 +2822,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, F) ++ ++ ku ++ Kurdish (Iraq, F) + + kur + +@@ -2833,9 +2833,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, Latin Alt-Q) ++ ++ ku ++ Kurdish (Iraq, Latin Alt-Q) + + kur + +@@ -2844,9 +2844,9 @@ + + + ku_ara +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, Arabic-Latin) ++ ++ ku ++ Kurdish (Iraq, Arabic-Latin) + + kur + +@@ -2857,9 +2857,9 @@ + + + fo +- +- <_shortDescription>fo +- <_description>Faroese ++ ++ fo ++ Faroese + + fao + +@@ -2868,7 +2868,7 @@ + + + nodeadkeys +- <_description>Faroese (eliminate dead keys) ++ Faroese (eliminate dead keys) + + + +@@ -2876,9 +2876,9 @@ + + + fi +- +- <_shortDescription>fi +- <_description>Finnish ++ ++ fi ++ Finnish + + fin + +@@ -2887,26 +2887,26 @@ + + + classic +- <_description>Finnish (classic) ++ Finnish (classic) + + + + + nodeadkeys +- <_description>Finnish (classic, eliminate dead keys) ++ Finnish (classic, eliminate dead keys) + + + + + smi +- <_description>Northern Saami (Finland) ++ Northern Saami (Finland) + sme + + + + + mac +- <_description>Finnish (Macintosh) ++ Finnish (Macintosh) + + + +@@ -2914,9 +2914,9 @@ + + + fr +- +- <_shortDescription>fr +- <_description>French ++ ++ fr ++ French + + fra + +@@ -2925,91 +2925,91 @@ + + + nodeadkeys +- <_description>French (eliminate dead keys) ++ French (eliminate dead keys) + + + + + sundeadkeys +- <_description>French (Sun dead keys) ++ French (Sun dead keys) + + + + + oss +- <_description>French (alternative) ++ French (alternative) + + + + + oss_latin9 +- <_description>French (alternative, Latin-9 only) ++ French (alternative, Latin-9 only) + + + + + oss_nodeadkeys +- <_description>French (alternative, eliminate dead keys) ++ French (alternative, eliminate dead keys) + + + + + oss_sundeadkeys +- <_description>French (alternative, Sun dead keys) ++ French (alternative, Sun dead keys) + + + + + latin9 +- <_description>French (legacy, alternative) ++ French (legacy, alternative) + + + + + latin9_nodeadkeys +- <_description>French (legacy, alternative, eliminate dead keys) ++ French (legacy, alternative, eliminate dead keys) + + + + + latin9_sundeadkeys +- <_description>French (legacy, alternative, Sun dead keys) ++ French (legacy, alternative, Sun dead keys) + + + + + bepo +- <_description>French (Bepo, ergonomic, Dvorak way) ++ French (Bepo, ergonomic, Dvorak way) + + + + + bepo_latin9 +- <_description>French (Bepo, ergonomic, Dvorak way, Latin-9 only) ++ French (Bepo, ergonomic, Dvorak way, Latin-9 only) + + + + + dvorak +- <_description>French (Dvorak) ++ French (Dvorak) + + + + + mac +- <_description>French (Macintosh) ++ French (Macintosh) + + + + + bre +- <_description>French (Breton) ++ French (Breton) + + + + + oci +- <_description>Occitan ++ Occitan + + oci + +@@ -3018,7 +3018,7 @@ + + + geo +- <_description>Georgian (France, AZERTY Tskapo) ++ Georgian (France, AZERTY Tskapo) + + geo + +@@ -3029,9 +3029,9 @@ + + + gh +- +- <_shortDescription>en +- <_description>English (Ghana) ++ ++ en ++ English (Ghana) + + eng + +@@ -3040,15 +3040,15 @@ + + + generic +- <_description>English (Ghana, multilingual) ++ English (Ghana, multilingual) + + + + + akan +- +- <_shortDescription>ak +- <_description>Akan ++ ++ ak ++ Akan + + aka + +@@ -3057,9 +3057,9 @@ + + + ewe +- +- <_shortDescription>ee +- <_description>Ewe ++ ++ ee ++ Ewe + + ewe + +@@ -3068,9 +3068,9 @@ + + + fula +- +- <_shortDescription>ff +- <_description>Fula ++ ++ ff ++ Fula + + ful + +@@ -3079,9 +3079,9 @@ + + + ga +- +- <_shortDescription>gaa +- <_description>Ga ++ ++ gaa ++ Ga + + gaa + +@@ -3090,9 +3090,9 @@ + + + hausa +- +- <_shortDescription>ha +- <_description>Hausa ++ ++ ha ++ Hausa + + hau + +@@ -3101,9 +3101,9 @@ + + + avn +- +- <_shortDescription>avn +- <_description>Avatime ++ ++ avn ++ Avatime + + avn + +@@ -3112,7 +3112,7 @@ + + + gillbt +- <_description>English (Ghana, GILLBT) ++ English (Ghana, GILLBT) + + + +@@ -3120,9 +3120,9 @@ + + + gn +- +- <_shortDescription>fr +- <_description>French (Guinea) ++ ++ fr ++ French (Guinea) + + fra + +@@ -3132,9 +3132,9 @@ + + + ge +- +- <_shortDescription>ka +- <_description>Georgian ++ ++ ka ++ Georgian + + geo + +@@ -3143,21 +3143,21 @@ + + + ergonomic +- <_description>Georgian (ergonomic) ++ Georgian (ergonomic) + + + + + mess +- <_description>Georgian (MESS) ++ Georgian (MESS) + + + + + ru +- +- <_shortDescription>ru +- <_description>Russian (Georgia) ++ ++ ru ++ Russian (Georgia) + + rus + +@@ -3166,7 +3166,7 @@ + + + os +- <_description>Ossetian (Georgia) ++ Ossetian (Georgia) + + oss + +@@ -3177,9 +3177,9 @@ + + + de +- +- <_shortDescription>de +- <_description>German ++ ++ de ++ German + + ger + +@@ -3188,75 +3188,75 @@ + + + deadacute +- <_description>German (dead acute) ++ German (dead acute) + + + + + deadgraveacute +- <_description>German (dead grave acute) ++ German (dead grave acute) + + + + + nodeadkeys +- <_description>German (eliminate dead keys) ++ German (eliminate dead keys) + + + + + T3 +- <_description>German (T3) ++ German (T3) + + + + + ro +- <_description>Romanian (Germany) ++ Romanian (Germany) + rum + + + + + ro_nodeadkeys +- <_description>Romanian (Germany, eliminate dead keys) ++ Romanian (Germany, eliminate dead keys) + rum + + + + + dvorak +- <_description>German (Dvorak) ++ German (Dvorak) + + + + + sundeadkeys +- <_description>German (Sun dead keys) ++ German (Sun dead keys) + + + + + neo +- <_description>German (Neo 2) ++ German (Neo 2) + + + + + mac +- <_description>German (Macintosh) ++ German (Macintosh) + + + + + mac_nodeadkeys +- <_description>German (Macintosh, eliminate dead keys) ++ German (Macintosh, eliminate dead keys) + + + + + dsb +- <_description>Lower Sorbian ++ Lower Sorbian + + dsb + +@@ -3265,7 +3265,7 @@ + + + dsb_qwertz +- <_description>Lower Sorbian (qwertz) ++ Lower Sorbian (qwertz) + + dsb + +@@ -3274,15 +3274,15 @@ + + + qwerty +- <_description>German (qwerty) ++ German (qwerty) + + + + + ru +- +- <_shortDescription>ru +- <_description>Russian (Germany, phonetic) ++ ++ ru ++ Russian (Germany, phonetic) + + rus + +@@ -3291,7 +3291,7 @@ + + + legacy +- <_description>German (legacy) ++ German (legacy) + + + +@@ -3299,9 +3299,9 @@ + + + gr +- +- <_shortDescription>gr +- <_description>Greek ++ ++ gr ++ Greek + + gre + +@@ -3310,25 +3310,25 @@ + + + simple +- <_description>Greek (simple) ++ Greek (simple) + + + + + extended +- <_description>Greek (extended) ++ Greek (extended) + + + + + nodeadkeys +- <_description>Greek (eliminate dead keys) ++ Greek (eliminate dead keys) + + + + + polytonic +- <_description>Greek (polytonic) ++ Greek (polytonic) + + + +@@ -3336,9 +3336,9 @@ + + + hu +- +- <_shortDescription>hu +- <_description>Hungarian ++ ++ hu ++ Hungarian + + hun + +@@ -3347,115 +3347,115 @@ + + + standard +- <_description>Hungarian (standard) ++ Hungarian (standard) + + + + + nodeadkeys +- <_description>Hungarian (eliminate dead keys) ++ Hungarian (eliminate dead keys) + + + + + qwerty +- <_description>Hungarian (qwerty) ++ Hungarian (qwerty) + + + + + 101_qwertz_comma_dead +- <_description>Hungarian (101/qwertz/comma/dead keys) ++ Hungarian (101/qwertz/comma/dead keys) + + + + + 101_qwertz_comma_nodead +- <_description>Hungarian (101/qwertz/comma/eliminate dead keys) ++ Hungarian (101/qwertz/comma/eliminate dead keys) + + + + + 101_qwertz_dot_dead +- <_description>Hungarian (101/qwertz/dot/dead keys) ++ Hungarian (101/qwertz/dot/dead keys) + + + + + 101_qwertz_dot_nodead +- <_description>Hungarian (101/qwertz/dot/eliminate dead keys) ++ Hungarian (101/qwertz/dot/eliminate dead keys) + + + + + 101_qwerty_comma_dead +- <_description>Hungarian (101/qwerty/comma/dead keys) ++ Hungarian (101/qwerty/comma/dead keys) + + + + + 101_qwerty_comma_nodead +- <_description>Hungarian (101/qwerty/comma/eliminate dead keys) ++ Hungarian (101/qwerty/comma/eliminate dead keys) + + + + + 101_qwerty_dot_dead +- <_description>Hungarian (101/qwerty/dot/dead keys) ++ Hungarian (101/qwerty/dot/dead keys) + + + + + 101_qwerty_dot_nodead +- <_description>Hungarian (101/qwerty/dot/eliminate dead keys) ++ Hungarian (101/qwerty/dot/eliminate dead keys) + + + + + 102_qwertz_comma_dead +- <_description>Hungarian (102/qwertz/comma/dead keys) ++ Hungarian (102/qwertz/comma/dead keys) + + + + + 102_qwertz_comma_nodead +- <_description>Hungarian (102/qwertz/comma/eliminate dead keys) ++ Hungarian (102/qwertz/comma/eliminate dead keys) + + + + + 102_qwertz_dot_dead +- <_description>Hungarian (102/qwertz/dot/dead keys) ++ Hungarian (102/qwertz/dot/dead keys) + + + + + 102_qwertz_dot_nodead +- <_description>Hungarian (102/qwertz/dot/eliminate dead keys) ++ Hungarian (102/qwertz/dot/eliminate dead keys) + + + + + 102_qwerty_comma_dead +- <_description>Hungarian (102/qwerty/comma/dead keys) ++ Hungarian (102/qwerty/comma/dead keys) + + + + + 102_qwerty_comma_nodead +- <_description>Hungarian (102/qwerty/comma/eliminate dead keys) ++ Hungarian (102/qwerty/comma/eliminate dead keys) + + + + + 102_qwerty_dot_dead +- <_description>Hungarian (102/qwerty/dot/dead keys) ++ Hungarian (102/qwerty/dot/dead keys) + + + + + 102_qwerty_dot_nodead +- <_description>Hungarian (102/qwerty/dot/eliminate dead keys) ++ Hungarian (102/qwerty/dot/eliminate dead keys) + + + +@@ -3463,9 +3463,9 @@ + + + is +- +- <_shortDescription>is +- <_description>Icelandic ++ ++ is ++ Icelandic + + ice + +@@ -3474,25 +3474,25 @@ + + + Sundeadkeys +- <_description>Icelandic (Sun dead keys) ++ Icelandic (Sun dead keys) + + + + + nodeadkeys +- <_description>Icelandic (eliminate dead keys) ++ Icelandic (eliminate dead keys) + + + + + mac +- <_description>Icelandic (Macintosh) ++ Icelandic (Macintosh) + + + + + dvorak +- <_description>Icelandic (Dvorak) ++ Icelandic (Dvorak) + + + +@@ -3500,9 +3500,9 @@ + + + il +- +- <_shortDescription>he +- <_description>Hebrew ++ ++ he ++ Hebrew + + heb + +@@ -3511,19 +3511,19 @@ + + + lyx +- <_description>Hebrew (lyx) ++ Hebrew (lyx) + + + + + phonetic +- <_description>Hebrew (phonetic) ++ Hebrew (phonetic) + + + + + biblical +- <_description>Hebrew (Biblical, Tiro) ++ Hebrew (Biblical, Tiro) + + + +@@ -3531,9 +3531,9 @@ + + + it +- +- <_shortDescription>it +- <_description>Italian ++ ++ it ++ Italian + + ita + +@@ -3542,25 +3542,25 @@ + + + nodeadkeys +- <_description>Italian (eliminate dead keys) ++ Italian (eliminate dead keys) + + + + + mac +- <_description>Italian (Macintosh) ++ Italian (Macintosh) + + + + + us +- <_description>Italian (US keyboard with Italian letters) ++ Italian (US keyboard with Italian letters) + + + + + geo +- <_description>Georgian (Italy) ++ Georgian (Italy) + + geo + +@@ -3569,7 +3569,7 @@ + + + ibm +- <_description>Italian (IBM 142) ++ Italian (IBM 142) + + + +@@ -3577,9 +3577,9 @@ + + + jp +- +- <_shortDescription>ja +- <_description>Japanese ++ ++ ja ++ Japanese + + jpn + +@@ -3588,31 +3588,31 @@ + + + kana +- <_description>Japanese (Kana) ++ Japanese (Kana) + + + + + kana86 +- <_description>Japanese (Kana 86) ++ Japanese (Kana 86) + + + + + OADG109A +- <_description>Japanese (OADG 109A) ++ Japanese (OADG 109A) + + + + + mac +- <_description>Japanese (Macintosh) ++ Japanese (Macintosh) + + + + + dvorak +- <_description>Japanese (Dvorak) ++ Japanese (Dvorak) + + + +@@ -3620,9 +3620,9 @@ + + + kg +- +- <_shortDescription>ki +- <_description>Kyrgyz ++ ++ ki ++ Kyrgyz + + kir + +@@ -3631,7 +3631,7 @@ + + + phonetic +- <_description>Kyrgyz (phonetic) ++ Kyrgyz (phonetic) + + + +@@ -3639,9 +3639,9 @@ + + + kh +- +- <_shortDescription>km +- <_description>Khmer (Cambodia) ++ ++ km ++ Khmer (Cambodia) + + khm + +@@ -3651,9 +3651,9 @@ + + + kz +- +- <_shortDescription>kk +- <_description>Kazakh ++ ++ kk ++ Kazakh + + kaz + +@@ -3662,9 +3662,9 @@ + + + ruskaz +- +- <_shortDescription>ru +- <_description>Russian (Kazakhstan, with Kazakh) ++ ++ ru ++ Russian (Kazakhstan, with Kazakh) + kaz + rus + +@@ -3672,7 +3672,7 @@ + + + kazrus +- <_description>Kazakh (with Russian) ++ Kazakh (with Russian) + kaz + rus + +@@ -3682,9 +3682,9 @@ + + + la +- +- <_shortDescription>lo +- <_description>Lao ++ ++ lo ++ Lao + + lao + +@@ -3693,7 +3693,7 @@ + + + stea +- <_description>Lao (STEA proposed standard layout) ++ Lao (STEA proposed standard layout) + lao + + +@@ -3703,9 +3703,9 @@ + + + latam +- +- <_shortDescription>es +- <_description>Spanish (Latin American) ++ ++ es ++ Spanish (Latin American) + + AR + BO +@@ -3737,19 +3737,19 @@ + + + nodeadkeys +- <_description>Spanish (Latin American, eliminate dead keys) ++ Spanish (Latin American, eliminate dead keys) + + + + + deadtilde +- <_description>Spanish (Latin American, include dead tilde) ++ Spanish (Latin American, include dead tilde) + + + + + sundeadkeys +- <_description>Spanish (Latin American, Sun dead keys) ++ Spanish (Latin American, Sun dead keys) + + + +@@ -3757,9 +3757,9 @@ + + + lt +- +- <_shortDescription>lt +- <_description>Lithuanian ++ ++ lt ++ Lithuanian + + lit + +@@ -3768,31 +3768,31 @@ + + + std +- <_description>Lithuanian (standard) ++ Lithuanian (standard) + + + + + us +- <_description>Lithuanian (US keyboard with Lithuanian letters) ++ Lithuanian (US keyboard with Lithuanian letters) + + + + + ibm +- <_description>Lithuanian (IBM LST 1205-92) ++ Lithuanian (IBM LST 1205-92) + + + + + lekp +- <_description>Lithuanian (LEKP) ++ Lithuanian (LEKP) + + + + + lekpa +- <_description>Lithuanian (LEKPa) ++ Lithuanian (LEKPa) + + + +@@ -3800,9 +3800,9 @@ + + + lv +- +- <_shortDescription>lv +- <_description>Latvian ++ ++ lv ++ Latvian + + lav + +@@ -3811,37 +3811,37 @@ + + + apostrophe +- <_description>Latvian (apostrophe variant) ++ Latvian (apostrophe variant) + + + + + tilde +- <_description>Latvian (tilde variant) ++ Latvian (tilde variant) + + + + + fkey +- <_description>Latvian (F variant) ++ Latvian (F variant) + + + + + modern +- <_description>Latvian (modern) ++ Latvian (modern) + + + + + ergonomic +- <_description>Latvian (ergonomic, ŪGJRMV) ++ Latvian (ergonomic, ŪGJRMV) + + + + + adapted +- <_description>Latvian (adapted) ++ Latvian (adapted) + + + +@@ -3849,9 +3849,9 @@ + + + mao +- +- <_shortDescription>mi +- <_description>Maori ++ ++ mi ++ Maori + + mao + +@@ -3861,9 +3861,9 @@ + + + me +- +- <_shortDescription>sr +- <_description>Montenegrin ++ ++ sr ++ Montenegrin + + srp + +@@ -3872,43 +3872,43 @@ + + + cyrillic +- <_description>Montenegrin (Cyrillic) ++ Montenegrin (Cyrillic) + + + + + cyrillicyz +- <_description>Montenegrin (Cyrillic, Z and ZHE swapped) ++ Montenegrin (Cyrillic, Z and ZHE swapped) + + + + + latinunicode +- <_description>Montenegrin (Latin Unicode) ++ Montenegrin (Latin Unicode) + + + + + latinyz +- <_description>Montenegrin (Latin qwerty) ++ Montenegrin (Latin qwerty) + + + + + latinunicodeyz +- <_description>Montenegrin (Latin Unicode qwerty) ++ Montenegrin (Latin Unicode qwerty) + + + + + cyrillicalternatequotes +- <_description>Montenegrin (Cyrillic with guillemets) ++ Montenegrin (Cyrillic with guillemets) + + + + + latinalternatequotes +- <_description>Montenegrin (Latin with guillemets) ++ Montenegrin (Latin with guillemets) + + + +@@ -3916,9 +3916,9 @@ + + + mk +- +- <_shortDescription>mk +- <_description>Macedonian ++ ++ mk ++ Macedonian + + mkd + +@@ -3927,7 +3927,7 @@ + + + nodeadkeys +- <_description>Macedonian (eliminate dead keys) ++ Macedonian (eliminate dead keys) + + + +@@ -3935,9 +3935,9 @@ + + + mt +- +- <_shortDescription>mt +- <_description>Maltese ++ ++ mt ++ Maltese + + mlt + +@@ -3946,7 +3946,7 @@ + + + us +- <_description>Maltese (with US layout) ++ Maltese (with US layout) + + + +@@ -3954,9 +3954,9 @@ + + + mn +- +- <_shortDescription>mn +- <_description>Mongolian ++ ++ mn ++ Mongolian + + mon + +@@ -3966,9 +3966,9 @@ + + + no +- +- <_shortDescription>no +- <_description>Norwegian ++ ++ no ++ Norwegian + + nor + nob +@@ -3979,19 +3979,19 @@ + + + nodeadkeys +- <_description>Norwegian (eliminate dead keys) ++ Norwegian (eliminate dead keys) + + + + + dvorak +- <_description>Norwegian (Dvorak) ++ Norwegian (Dvorak) + + + + + smi +- <_description>Northern Saami (Norway) ++ Northern Saami (Norway) + + sme + +@@ -4000,7 +4000,7 @@ + + + smi_nodeadkeys +- <_description>Northern Saami (Norway, eliminate dead keys) ++ Northern Saami (Norway, eliminate dead keys) + + sme + +@@ -4009,19 +4009,19 @@ + + + mac +- <_description>Norwegian (Macintosh) ++ Norwegian (Macintosh) + + + + + mac_nodeadkeys +- <_description>Norwegian (Macintosh, eliminate dead keys) ++ Norwegian (Macintosh, eliminate dead keys) + + + + + colemak +- <_description>Norwegian (Colemak) ++ Norwegian (Colemak) + + + +@@ -4029,9 +4029,9 @@ + + + pl +- +- <_shortDescription>pl +- <_description>Polish ++ ++ pl ++ Polish + + pol + +@@ -4040,37 +4040,37 @@ + + + legacy +- <_description>Polish (legacy) ++ Polish (legacy) + + + + + qwertz +- <_description>Polish (qwertz) ++ Polish (qwertz) + + + + + dvorak +- <_description>Polish (Dvorak) ++ Polish (Dvorak) + + + + + dvorak_quotes +- <_description>Polish (Dvorak, Polish quotes on quotemark key) ++ Polish (Dvorak, Polish quotes on quotemark key) + + + + + dvorak_altquotes +- <_description>Polish (Dvorak, Polish quotes on key 1) ++ Polish (Dvorak, Polish quotes on key 1) + + + + + csb +- <_description>Kashubian ++ Kashubian + + csb + +@@ -4086,9 +4086,9 @@ + + + ru_phonetic_dvorak +- +- <_shortDescription>ru +- <_description>Russian (Poland, phonetic Dvorak) ++ ++ ru ++ Russian (Poland, phonetic Dvorak) + + rus + +@@ -4097,7 +4097,7 @@ + + + dvp +- <_description>Polish (programmer Dvorak) ++ Polish (programmer Dvorak) + + + +@@ -4105,9 +4105,9 @@ + + + pt +- +- <_shortDescription>pt +- <_description>Portuguese ++ ++ pt ++ Portuguese + + por + +@@ -4116,49 +4116,49 @@ + + + nodeadkeys +- <_description>Portuguese (eliminate dead keys) ++ Portuguese (eliminate dead keys) + + + + + sundeadkeys +- <_description>Portuguese (Sun dead keys) ++ Portuguese (Sun dead keys) + + + + + mac +- <_description>Portuguese (Macintosh) ++ Portuguese (Macintosh) + + + + + mac_nodeadkeys +- <_description>Portuguese (Macintosh, eliminate dead keys) ++ Portuguese (Macintosh, eliminate dead keys) + + + + + mac_sundeadkeys +- <_description>Portuguese (Macintosh, Sun dead keys) ++ Portuguese (Macintosh, Sun dead keys) + + + + + nativo +- <_description>Portuguese (Nativo) ++ Portuguese (Nativo) + + + + + nativo-us +- <_description>Portuguese (Nativo for US keyboards) ++ Portuguese (Nativo for US keyboards) + + + + + nativo-epo +- <_description>Esperanto (Portugal, Nativo) ++ Esperanto (Portugal, Nativo) + + epo + +@@ -4169,9 +4169,9 @@ + + + ro +- +- <_shortDescription>ro +- <_description>Romanian ++ ++ ro ++ Romanian + + rum + +@@ -4180,25 +4180,25 @@ + + + cedilla +- <_description>Romanian (cedilla) ++ Romanian (cedilla) + + + + + std +- <_description>Romanian (standard) ++ Romanian (standard) + + + + + std_cedilla +- <_description>Romanian (standard cedilla) ++ Romanian (standard cedilla) + + + + + winkeys +- <_description>Romanian (WinKeys) ++ Romanian (WinKeys) + + + +@@ -4206,9 +4206,9 @@ + + + ru +- +- <_shortDescription>ru +- <_description>Russian ++ ++ ru ++ Russian + + rus + +@@ -4217,37 +4217,37 @@ + + + phonetic +- <_description>Russian (phonetic) ++ Russian (phonetic) + + + + + phonetic_winkeys +- <_description>Russian (phonetic WinKeys) ++ Russian (phonetic WinKeys) + + + + + typewriter +- <_description>Russian (typewriter) ++ Russian (typewriter) + + + + + legacy +- <_description>Russian (legacy) ++ Russian (legacy) + + + + + typewriter-legacy +- <_description>Russian (typewriter, legacy) ++ Russian (typewriter, legacy) + + + + + tt +- <_description>Tatar ++ Tatar + + tat + +@@ -4256,7 +4256,7 @@ + + + os_legacy +- <_description>Ossetian (legacy) ++ Ossetian (legacy) + + oss + +@@ -4265,7 +4265,7 @@ + + + os_winkeys +- <_description>Ossetian (WinKeys) ++ Ossetian (WinKeys) + + oss + +@@ -4274,7 +4274,7 @@ + + + cv +- <_description>Chuvash ++ Chuvash + + chv + +@@ -4283,7 +4283,7 @@ + + + cv_latin +- <_description>Chuvash (Latin) ++ Chuvash (Latin) + + chv + +@@ -4292,7 +4292,7 @@ + + + udm +- <_description>Udmurt ++ Udmurt + + udm + +@@ -4301,7 +4301,7 @@ + + + kom +- <_description>Komi ++ Komi + + kom + +@@ -4310,7 +4310,7 @@ + + + sah +- <_description>Yakut ++ Yakut + + sah + +@@ -4319,7 +4319,7 @@ + + + xal +- <_description>Kalmyk ++ Kalmyk + + xal + +@@ -4328,19 +4328,19 @@ + + + dos +- <_description>Russian (DOS) ++ Russian (DOS) + + + + + mac +- <_description>Russian (Macintosh) ++ Russian (Macintosh) + + + + + srp +- <_description>Serbian (Russia) ++ Serbian (Russia) + rus + srp + +@@ -4348,7 +4348,7 @@ + + + bak +- <_description>Bashkirian ++ Bashkirian + + bak + +@@ -4357,7 +4357,7 @@ + + + chm +- <_description>Mari ++ Mari + + chm + +@@ -4368,9 +4368,9 @@ + + + rs +- +- <_shortDescription>sr +- <_description>Serbian ++ ++ sr ++ Serbian + + srp + +@@ -4379,49 +4379,49 @@ + + + yz +- <_description>Serbian (Cyrillic, Z and ZHE swapped) ++ Serbian (Cyrillic, Z and ZHE swapped) + + + + + latin +- <_description>Serbian (Latin) ++ Serbian (Latin) + + + + + latinunicode +- <_description>Serbian (Latin Unicode) ++ Serbian (Latin Unicode) + + + + + latinyz +- <_description>Serbian (Latin qwerty) ++ Serbian (Latin qwerty) + + + + + latinunicodeyz +- <_description>Serbian (Latin Unicode qwerty) ++ Serbian (Latin Unicode qwerty) + + + + + alternatequotes +- <_description>Serbian (Cyrillic with guillemets) ++ Serbian (Cyrillic with guillemets) + + + + + latinalternatequotes +- <_description>Serbian (Latin with guillemets) ++ Serbian (Latin with guillemets) + + + + + rue +- <_description>Pannonian Rusyn ++ Pannonian Rusyn + + rue + +@@ -4432,9 +4432,9 @@ + + + si +- +- <_shortDescription>sl +- <_description>Slovenian ++ ++ sl ++ Slovenian + + slv + +@@ -4443,13 +4443,13 @@ + + + alternatequotes +- <_description>Slovenian (use guillemets for quotes) ++ Slovenian (use guillemets for quotes) + + + + + us +- <_description>Slovenian (US keyboard with Slovenian letters) ++ Slovenian (US keyboard with Slovenian letters) + + + +@@ -4457,9 +4457,9 @@ + + + sk +- +- <_shortDescription>sk +- <_description>Slovak ++ ++ sk ++ Slovak + + slo + +@@ -4468,19 +4468,19 @@ + + + bksl +- <_description>Slovak (extended Backslash) ++ Slovak (extended Backslash) + + + + + qwerty +- <_description>Slovak (qwerty) ++ Slovak (qwerty) + + + + + qwerty_bksl +- <_description>Slovak (qwerty, extended Backslash) ++ Slovak (qwerty, extended Backslash) + + + +@@ -4488,9 +4488,9 @@ + + + es +- +- <_shortDescription>es +- <_description>Spanish ++ ++ es ++ Spanish + + spa + +@@ -4499,31 +4499,31 @@ + + + nodeadkeys +- <_description>Spanish (eliminate dead keys) ++ Spanish (eliminate dead keys) + + + + + deadtilde +- <_description>Spanish (include dead tilde) ++ Spanish (include dead tilde) + + + + + sundeadkeys +- <_description>Spanish (Sun dead keys) ++ Spanish (Sun dead keys) + + + + + dvorak +- <_description>Spanish (Dvorak) ++ Spanish (Dvorak) + + + + + ast +- <_description>Asturian (Spain, with bottom-dot H and bottom-dot L) ++ Asturian (Spain, with bottom-dot H and bottom-dot L) + + ast + +@@ -4532,7 +4532,7 @@ + + + cat +- <_description>Catalan (Spain, with middle-dot L) ++ Catalan (Spain, with middle-dot L) + + cat + +@@ -4541,7 +4541,7 @@ + + + mac +- <_description>Spanish (Macintosh) ++ Spanish (Macintosh) + + + +@@ -4549,9 +4549,9 @@ + + + se +- +- <_shortDescription>sv +- <_description>Swedish ++ ++ sv ++ Swedish + + swe + +@@ -4560,21 +4560,21 @@ + + + nodeadkeys +- <_description>Swedish (eliminate dead keys) ++ Swedish (eliminate dead keys) + + + + + dvorak +- <_description>Swedish (Dvorak) ++ Swedish (Dvorak) + + + + + rus +- +- <_shortDescription>ru +- <_description>Russian (Sweden, phonetic) ++ ++ ru ++ Russian (Sweden, phonetic) + + rus + +@@ -4583,9 +4583,9 @@ + + + rus_nodeadkeys +- +- <_shortDescription>ru +- <_description>Russian (Sweden, phonetic, eliminate dead keys) ++ ++ ru ++ Russian (Sweden, phonetic, eliminate dead keys) + + rus + +@@ -4594,7 +4594,7 @@ + + + smi +- <_description>Northern Saami (Sweden) ++ Northern Saami (Sweden) + + sme + +@@ -4603,19 +4603,19 @@ + + + mac +- <_description>Swedish (Macintosh) ++ Swedish (Macintosh) + + + + + svdvorak +- <_description>Swedish (Svdvorak) ++ Swedish (Svdvorak) + + + + + swl +- <_description>Swedish Sign Language ++ Swedish Sign Language + swl + + +@@ -4624,9 +4624,9 @@ + + + ch +- +- <_shortDescription>de +- <_description>German (Switzerland) ++ ++ de ++ German (Switzerland) + ger + gsw + +@@ -4634,31 +4634,31 @@ + + + legacy +- <_description>German (Switzerland, legacy) ++ German (Switzerland, legacy) + + + + + de_nodeadkeys +- +- <_shortDescription>de +- <_description>German (Switzerland, eliminate dead keys) ++ ++ de ++ German (Switzerland, eliminate dead keys) + + + + + de_sundeadkeys +- +- <_shortDescription>de +- <_description>German (Switzerland, Sun dead keys) ++ ++ de ++ German (Switzerland, Sun dead keys) + + + + + fr +- +- <_shortDescription>fr +- <_description>French (Switzerland) ++ ++ fr ++ French (Switzerland) + + fra + +@@ -4667,9 +4667,9 @@ + + + fr_nodeadkeys +- +- <_shortDescription>fr +- <_description>French (Switzerland, eliminate dead keys) ++ ++ fr ++ French (Switzerland, eliminate dead keys) + + fra + +@@ -4678,9 +4678,9 @@ + + + fr_sundeadkeys +- +- <_shortDescription>fr +- <_description>French (Switzerland, Sun dead keys) ++ ++ fr ++ French (Switzerland, Sun dead keys) + + fra + +@@ -4689,9 +4689,9 @@ + + + fr_mac +- +- <_shortDescription>fr +- <_description>French (Switzerland, Macintosh) ++ ++ fr ++ French (Switzerland, Macintosh) + + fra + +@@ -4700,9 +4700,9 @@ + + + de_mac +- +- <_shortDescription>de +- <_description>German (Switzerland, Macintosh) ++ ++ de ++ German (Switzerland, Macintosh) + + + +@@ -4710,9 +4710,9 @@ + + + sy +- +- <_shortDescription>ar +- <_description>Arabic (Syria) ++ ++ ar ++ Arabic (Syria) + + syr + +@@ -4721,25 +4721,25 @@ + + + syc +- +- <_shortDescription>syc +- <_description>Syriac ++ ++ syc ++ Syriac + + + + + syc_phonetic +- +- <_shortDescription>syc +- <_description>Syriac (phonetic) ++ ++ syc ++ Syriac (phonetic) + + + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Syria, Latin Q) ++ ++ ku ++ Kurdish (Syria, Latin Q) + + kur + +@@ -4748,9 +4748,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Syria, F) ++ ++ ku ++ Kurdish (Syria, F) + + kur + +@@ -4759,9 +4759,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Syria, Latin Alt-Q) ++ ++ ku ++ Kurdish (Syria, Latin Alt-Q) + + kur + +@@ -4772,9 +4772,9 @@ + + + tj +- +- <_shortDescription>tg +- <_description>Tajik ++ ++ tg ++ Tajik + + tgk + +@@ -4783,7 +4783,7 @@ + + + legacy +- <_description>Tajik (legacy) ++ Tajik (legacy) + + + +@@ -4791,9 +4791,9 @@ + + + lk +- +- <_shortDescription>si +- <_description>Sinhala (phonetic) ++ ++ si ++ Sinhala (phonetic) + + sin + +@@ -4802,9 +4802,9 @@ + + + tam_unicode +- +- <_shortDescription>ta +- <_description>Tamil (Sri Lanka, Unicode) ++ ++ ta ++ Tamil (Sri Lanka, Unicode) + + tam + +@@ -4813,7 +4813,7 @@ + + + tam_TAB +- <_description>Tamil (Sri Lanka, TAB Typewriter) ++ Tamil (Sri Lanka, TAB Typewriter) + + tam + +@@ -4824,9 +4824,9 @@ + + + th +- +- <_shortDescription>th +- <_description>Thai ++ ++ th ++ Thai + + tha + +@@ -4835,13 +4835,13 @@ + + + tis +- <_description>Thai (TIS-820.2538) ++ Thai (TIS-820.2538) + + + + + pat +- <_description>Thai (Pattachote) ++ Thai (Pattachote) + + + +@@ -4849,9 +4849,9 @@ + + + tr +- +- <_shortDescription>tr +- <_description>Turkish ++ ++ tr ++ Turkish + + tur + +@@ -4860,27 +4860,27 @@ + + + f +- <_description>Turkish (F) ++ Turkish (F) + + + + + alt +- <_description>Turkish (Alt-Q) ++ Turkish (Alt-Q) + + + + + sundeadkeys +- <_description>Turkish (Sun dead keys) ++ Turkish (Sun dead keys) + + + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Turkey, Latin Q) ++ ++ ku ++ Kurdish (Turkey, Latin Q) + + kur + +@@ -4889,9 +4889,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Turkey, F) ++ ++ ku ++ Kurdish (Turkey, F) + + kur + +@@ -4900,9 +4900,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Turkey, Latin Alt-Q) ++ ++ ku ++ Kurdish (Turkey, Latin Alt-Q) + + kur + +@@ -4911,15 +4911,15 @@ + + + intl +- <_description>Turkish (international with dead keys) ++ Turkish (international with dead keys) + + + + + crh +- +- <_shortDescription>crh +- <_description>Crimean Tatar (Turkish Q) ++ ++ crh ++ Crimean Tatar (Turkish Q) + + crh + +@@ -4928,9 +4928,9 @@ + + + crh_f +- +- <_shortDescription>crh +- <_description>Crimean Tatar (Turkish F) ++ ++ crh ++ Crimean Tatar (Turkish F) + + crh + +@@ -4939,9 +4939,9 @@ + + + crh_alt +- +- <_shortDescription>crh +- <_description>Crimean Tatar (Turkish Alt-Q) ++ ++ crh ++ Crimean Tatar (Turkish Alt-Q) + + crh + +@@ -4952,9 +4952,9 @@ + + + tw +- +- <_shortDescription>zh +- <_description>Taiwanese ++ ++ zh ++ Taiwanese + + fox + +@@ -4963,7 +4963,7 @@ + + + indigenous +- <_description>Taiwanese (indigenous) ++ Taiwanese (indigenous) + + ami + tay +@@ -4987,9 +4987,9 @@ + + + saisiyat +- +- <_shortDescription>xsy +- <_description>Saisiyat (Taiwan) ++ ++ xsy ++ Saisiyat (Taiwan) + + xsy + +@@ -5000,9 +5000,9 @@ + + + ua +- +- <_shortDescription>uk +- <_description>Ukrainian ++ ++ uk ++ Ukrainian + + ukr + +@@ -5011,43 +5011,43 @@ + + + phonetic +- <_description>Ukrainian (phonetic) ++ Ukrainian (phonetic) + + + + + typewriter +- <_description>Ukrainian (typewriter) ++ Ukrainian (typewriter) + + + + + winkeys +- <_description>Ukrainian (WinKeys) ++ Ukrainian (WinKeys) + + + + + legacy +- <_description>Ukrainian (legacy) ++ Ukrainian (legacy) + + + + + rstu +- <_description>Ukrainian (standard RSTU) ++ Ukrainian (standard RSTU) + + + + + rstu_ru +- <_description>Russian (Ukraine, standard RSTU) ++ Russian (Ukraine, standard RSTU) + + + + + homophonic +- <_description>Ukrainian (homophonic) ++ Ukrainian (homophonic) + + + +@@ -5055,9 +5055,9 @@ + + + gb +- +- <_shortDescription>en +- <_description>English (UK) ++ ++ en ++ English (UK) + + eng + +@@ -5066,43 +5066,43 @@ + + + extd +- <_description>English (UK, extended WinKeys) ++ English (UK, extended WinKeys) + + + + + intl +- <_description>English (UK, international with dead keys) ++ English (UK, international with dead keys) + + + + + dvorak +- <_description>English (UK, Dvorak) ++ English (UK, Dvorak) + + + + + dvorakukp +- <_description>English (UK, Dvorak with UK punctuation) ++ English (UK, Dvorak with UK punctuation) + + + + + mac +- <_description>English (UK, Macintosh) ++ English (UK, Macintosh) + + + + + mac_intl +- <_description>English (UK, Macintosh international) ++ English (UK, Macintosh international) + + + + + colemak +- <_description>English (UK, Colemak) ++ English (UK, Colemak) + + + +@@ -5110,9 +5110,9 @@ + + + uz +- +- <_shortDescription>uz +- <_description>Uzbek ++ ++ uz ++ Uzbek + + uzb + +@@ -5121,7 +5121,7 @@ + + + latin +- <_description>Uzbek (Latin) ++ Uzbek (Latin) + + + +@@ -5129,9 +5129,9 @@ + + + vn +- +- <_shortDescription>vi +- <_description>Vietnamese ++ ++ vi ++ Vietnamese + + vie + +@@ -5141,9 +5141,9 @@ + + + kr +- +- <_shortDescription>ko +- <_description>Korean ++ ++ ko ++ Korean + + kor + +@@ -5152,7 +5152,7 @@ + + + kr104 +- <_description>Korean (101/104 key compatible) ++ Korean (101/104 key compatible) + + + +@@ -5160,9 +5160,9 @@ + + + nec_vndr/jp +- +- <_shortDescription>ja +- <_description>Japanese (PC-98xx Series) ++ ++ ja ++ Japanese (PC-98xx Series) + + JP + +@@ -5175,9 +5175,9 @@ + + + ie +- +- <_shortDescription>ie +- <_description>Irish ++ ++ ie ++ Irish + + eng + +@@ -5186,7 +5186,7 @@ + + + CloGaelach +- <_description>CloGaelach ++ CloGaelach + + gle + +@@ -5195,13 +5195,13 @@ + + + UnicodeExpert +- <_description>Irish (UnicodeExpert) ++ Irish (UnicodeExpert) + + + + + ogam +- <_description>Ogham ++ Ogham + + sga + +@@ -5210,7 +5210,7 @@ + + + ogam_is434 +- <_description>Ogham (IS434) ++ Ogham (IS434) + + sga + +@@ -5221,9 +5221,9 @@ + + + pk +- +- <_shortDescription>ur +- <_description>Urdu (Pakistan) ++ ++ ur ++ Urdu (Pakistan) + + urd + +@@ -5232,20 +5232,20 @@ + + + urd-crulp +- <_description>Urdu (Pakistan, CRULP) ++ Urdu (Pakistan, CRULP) + + + + + urd-nla +- <_description>Urdu (Pakistan, NLA) ++ Urdu (Pakistan, NLA) + + + + + ara +- <_shortDescription>ar +- <_description>Arabic (Pakistan) ++ ar ++ Arabic (Pakistan) + + ara + +@@ -5254,9 +5254,9 @@ + + + snd +- +- <_shortDescription>sd +- <_description>Sindhi ++ ++ sd ++ Sindhi + + snd + +@@ -5267,9 +5267,9 @@ + + + mv +- +- <_shortDescription>dv +- <_description>Dhivehi ++ ++ dv ++ Dhivehi + + div + +@@ -5279,9 +5279,9 @@ + + + za +- +- <_shortDescription>en +- <_description>English (South Africa) ++ ++ en ++ English (South Africa) + + eng + +@@ -5290,9 +5290,9 @@ + + + epo +- +- <_shortDescription>eo +- <_description>Esperanto ++ ++ eo ++ Esperanto + + epo + +@@ -5301,7 +5301,7 @@ + + + legacy +- <_description>Esperanto (displaced semicolon and quote, obsolete) ++ Esperanto (displaced semicolon and quote, obsolete) + + + +@@ -5309,9 +5309,9 @@ + + + np +- +- <_shortDescription>ne +- <_description>Nepali ++ ++ ne ++ Nepali + + nep + +@@ -5320,9 +5320,9 @@ + + + ng +- +- <_shortDescription>en +- <_description>English (Nigeria) ++ ++ en ++ English (Nigeria) + + eng + +@@ -5331,9 +5331,9 @@ + + + igbo +- +- <_shortDescription>ig +- <_description>Igbo ++ ++ ig ++ Igbo + + ibo + +@@ -5342,9 +5342,9 @@ + + + yoruba +- +- <_shortDescription>yo +- <_description>Yoruba ++ ++ yo ++ Yoruba + + yor + +@@ -5353,9 +5353,9 @@ + + + hausa +- +- <_shortDescription>ha +- <_description>Hausa ++ ++ ha ++ Hausa + + hau + +@@ -5366,9 +5366,9 @@ + + + et +- +- <_shortDescription>am +- <_description>Amharic ++ ++ am ++ Amharic + + amh + +@@ -5378,9 +5378,9 @@ + + + sn +- +- <_shortDescription>wo +- <_description>Wolof ++ ++ wo ++ Wolof + + wol + +@@ -5390,21 +5390,21 @@ + + + brai +- +- <_shortDescription>brl +- <_description>Braille ++ ++ brl ++ Braille + + + + + left_hand +- <_description>Braille (left hand) ++ Braille (left hand) + + + + + right_hand +- <_description>Braille (right hand) ++ Braille (right hand) + + + +@@ -5412,9 +5412,9 @@ + + + tm +- +- <_shortDescription>tk +- <_description>Turkmen ++ ++ tk ++ Turkmen + + tuk + +@@ -5423,7 +5423,7 @@ + + + alt +- <_description>Turkmen (Alt-Q) ++ Turkmen (Alt-Q) + + + +@@ -5431,9 +5431,9 @@ + + + ml +- +- <_shortDescription>bm +- <_description>Bambara ++ ++ bm ++ Bambara + + bam + +@@ -5442,9 +5442,9 @@ + + + fr-oss +- +- <_shortDescription>fr +- <_description>French (Mali, alternative) ++ ++ fr ++ French (Mali, alternative) + + fra + +@@ -5453,9 +5453,9 @@ + + + us-mac +- +- <_shortDescription>en +- <_description>English (Mali, US Macintosh) ++ ++ en ++ English (Mali, US Macintosh) + + eng + +@@ -5464,9 +5464,9 @@ + + + us-intl +- +- <_shortDescription>en +- <_description>English (Mali, US international) ++ ++ en ++ English (Mali, US international) + + eng + +@@ -5477,9 +5477,9 @@ + + + tz +- +- <_shortDescription>sw +- <_description>Swahili (Tanzania) ++ ++ sw ++ Swahili (Tanzania) + + swa + +@@ -5488,9 +5488,9 @@ + + + ke +- +- <_shortDescription>sw +- <_description>Swahili (Kenya) ++ ++ sw ++ Swahili (Kenya) + + swa + +@@ -5499,9 +5499,9 @@ + + + kik +- +- <_shortDescription>ki +- <_description>Kikuyu ++ ++ ki ++ Kikuyu + + kik + +@@ -5512,9 +5512,9 @@ + + + bw +- +- <_shortDescription>tn +- <_description>Tswana ++ ++ tn ++ Tswana + + tsn + +@@ -5523,9 +5523,9 @@ + + + ph +- +- <_shortDescription>ph +- <_description>Filipino ++ ++ ph ++ Filipino + eng + bik + ceb +@@ -5542,7 +5542,7 @@ + + + qwerty-bay +- <_description>Filipino (QWERTY Baybayin) ++ Filipino (QWERTY Baybayin) + bik + ceb + fil +@@ -5558,13 +5558,13 @@ + + + capewell-dvorak +- <_description>Filipino (Capewell-Dvorak Latin) ++ Filipino (Capewell-Dvorak Latin) + + + + + capewell-dvorak-bay +- <_description>Filipino (Capewell-Dvorak Baybayin) ++ Filipino (Capewell-Dvorak Baybayin) + bik + ceb + fil +@@ -5580,13 +5580,13 @@ + + + capewell-qwerf2k6 +- <_description>Filipino (Capewell-QWERF 2006 Latin) ++ Filipino (Capewell-QWERF 2006 Latin) + + + + + capewell-qwerf2k6-bay +- <_description>Filipino (Capewell-QWERF 2006 Baybayin) ++ Filipino (Capewell-QWERF 2006 Baybayin) + bik + ceb + fil +@@ -5602,13 +5602,13 @@ + + + colemak +- <_description>Filipino (Colemak Latin) ++ Filipino (Colemak Latin) + + + + + colemak-bay +- <_description>Filipino (Colemak Baybayin) ++ Filipino (Colemak Baybayin) + bik + ceb + fil +@@ -5624,13 +5624,13 @@ + + + dvorak +- <_description>Filipino (Dvorak Latin) ++ Filipino (Dvorak Latin) + + + + + dvorak-bay +- <_description>Filipino (Dvorak Baybayin) ++ Filipino (Dvorak Baybayin) + bik + ceb + fil +@@ -5648,16 +5648,16 @@ + + + md +- <_shortDescription>md +- <_description>Moldavian ++ md ++ Moldavian + rum + + + + + gag +- <_shortDescription>gag +- <_description>Moldavian (Gagauz) ++ gag ++ Moldavian (Gagauz) + gag + + +@@ -5666,1183 +5666,1142 @@ + + + +- ++ + + grp +- <_description>Switching to another layout ++ Switching to another layout + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- ++ + + lv3 +- <_description>Key to choose 3rd level ++ Key to choose 3rd level + + + + + + + + + + + + + + + + + + + + +- ++ + + ctrl +- <_description>Ctrl key position ++ Ctrl key position + + + + + + + + + + + + + + +- ++ + + grp_led +- <_description>Use keyboard LED to show alternative layout ++ Use keyboard LED to show alternative layout + + + + + + +- ++ + + keypad +- <_description>Layout of numeric keypad ++ Layout of numeric keypad + + + + + + + + + + +- ++ + +- ++ + + kpdl +- <_description>Numeric keypad delete key behaviour ++ Numeric keypad delete key behaviour + + + + + + + + + + + +- ++ + + caps +- <_description>Caps Lock key behavior ++ Caps Lock key behavior + + + + + + + + + + + + + + + + + +- ++ + + altwin +- <_description>Alt/Win key behavior ++ Alt/Win key behavior + + + + + + + + + + + + + +- ++ + + Compose key +- <_description>Position of Compose key ++ Position of Compose key + + + + + + + + + + + + + + + + + + + + + + + compat +- <_description>Miscellaneous compatibility options ++ Miscellaneous compatibility options + + + + + + + + + + + + + + + + + +- ++ + + currencysign +- <_description>Adding currency signs to certain keys ++ Adding currency signs to certain keys + + + + + + + + + + lv5 +- <_description>Key to choose 5th level ++ Key to choose 5th level + + + + + +- ++ + + +- ++ + + nbsp +- <_description>Using space key to input non-breakable space character ++ Using space key to input non-breakable space character + + + + + + + + + + + + + + + + + + + + + japan +- <_description>Japanese keyboard options ++ Japanese keyboard options + + + + + + + + esperanto +- <_description>Adding Esperanto supersigned letters ++ Adding Esperanto supersigned letters + + + + + + + + solaris +- <_description>Maintain key compatibility with old Solaris keycodes ++ Maintain key compatibility with old Solaris keycodes + + + + + + terminate +- <_description>Key sequence to kill the X server ++ Key sequence to kill the X server + + + + +- ++ +\ No newline at end of file -- cgit v1.2.3 From e9da3aa77efafebd9ec392d9898ed33619433c4c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 18:42:45 +0100 Subject: try to add support for graphical qemu --- package/base-files/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'package') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index ad09f8d3d..9323b25ad 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -75,6 +75,12 @@ endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC64),y) $(SED) 's#ttyS#hvc#g' $(IDIR_BASE_FILES)/etc/inittab endif +ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH4),y) + $(SED) 's#ttyS0#ttySC1#g' $(IDIR_BASE_FILES)/etc/inittab +endif +ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH4EB),y) + $(SED) 's#ttyS0#ttySC1#g' $(IDIR_BASE_FILES)/etc/inittab +endif ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y) $(SED) 's#ttyS#ttyUL#g' $(IDIR_BASE_FILES)/etc/inittab endif -- cgit v1.2.3 From ebe83aaf6705c22c6f7a28b27df0f83e91209b09 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 21:09:24 +0100 Subject: fix musl build --- package/rdate/Makefile | 2 +- package/rdate/patches/patch-arc4random_c | 41 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 package/rdate/patches/patch-arc4random_c (limited to 'package') diff --git a/package/rdate/Makefile b/package/rdate/Makefile index 1dd8d0222..a37cbdfbc 100644 --- a/package/rdate/Makefile +++ b/package/rdate/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rdate PKG_VERSION:= 20070817 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 9a6489d7de4311678a3fab001bb503df PKG_DESCR:= A small rdate and NTP client PKG_SECTION:= ntp diff --git a/package/rdate/patches/patch-arc4random_c b/package/rdate/patches/patch-arc4random_c new file mode 100644 index 000000000..e84a77832 --- /dev/null +++ b/package/rdate/patches/patch-arc4random_c @@ -0,0 +1,41 @@ +--- rdate.orig/arc4random.c 2007-05-15 00:15:12.000000000 +0200 ++++ rdate/arc4random.c 2014-03-03 07:27:38.000000000 +0100 +@@ -30,7 +30,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -97,30 +96,6 @@ arc4_stir(struct arc4_stream *as) + if (fd != -1) { + read(fd, rdat.rnd, sizeof(rdat.rnd)); + close(fd); +- } else { +- /* /dev/urandom failed? Maybe we're in a chroot. */ +-//#if defined(CTL_KERN) && defined(KERN_RANDOM) && defined(RANDOM_UUID) +-#ifdef _LINUX_SYSCTL_H +- /* XXX this is for Linux, which uses enums */ +- +- int mib[3]; +- size_t i, len; +- +- mib[0] = CTL_KERN; +- mib[1] = KERN_RANDOM; +- mib[2] = RANDOM_UUID; +- +- for (i = 0; i < sizeof(rdat.rnd) / sizeof(u_int); i ++) { +- len = sizeof(u_int); +- if (sysctl(mib, 3, &rdat.rnd[i], &len, NULL, 0) == -1) { +- fprintf(stderr, "warning: no entropy source\n"); +- break; +- } +- } +-#else +- /* XXX kFreeBSD doesn't seem to have KERN_ARND or so */ +- ; +-#endif + } + + arc4_stir_pid = getpid(); -- cgit v1.2.3 From 0693e599c648cbf8bdbd801e1eade92338e6af32 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 5 Mar 2014 11:54:26 +0100 Subject: fix gcc cross compilation --- package/gcc/Makefile | 10 ++++-- package/gcc/patches/4.8.2/gcc-cppflags.patch | 24 ++++++++++++++ package/gcc/patches/4.8.2/musl-sh.patch | 11 +++++++ package/gcc/patches/4.8.2/musl-stubs.patch | 49 ++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 package/gcc/patches/4.8.2/gcc-cppflags.patch create mode 100644 package/gcc/patches/4.8.2/musl-sh.patch create mode 100644 package/gcc/patches/4.8.2/musl-stubs.patch (limited to 'package') diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 6d8ee9620..c0c5f749a 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -21,9 +21,13 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,GXX,g++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CPPFLAGS:= '' -TARGET_CFLAGS:= '' -TARGET_CXXFLAGS:= '' +CPPFLAGS_FOR_BUILD:= -I$(STAGING_HOST_DIR)/include +CFLAGS_FOR_BUILD:= +LDFLAGS_FOR_BUILD:= +TARGET_CPPFLAGS:= +TARGET_CFLAGS:= +TARGET_LDFLAGS:= +TARGET_CXXFLAGS:= ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_MIPS_ABI) diff --git a/package/gcc/patches/4.8.2/gcc-cppflags.patch b/package/gcc/patches/4.8.2/gcc-cppflags.patch new file mode 100644 index 000000000..bc47be829 --- /dev/null +++ b/package/gcc/patches/4.8.2/gcc-cppflags.patch @@ -0,0 +1,24 @@ +diff -Nur gcc-4.8.2.orig/gcc/configure gcc-4.8.2/gcc/configure +--- gcc-4.8.2.orig/gcc/configure 2013-06-19 03:18:38.000000000 +0200 ++++ gcc-4.8.2/gcc/configure 2014-03-03 15:05:00.647062804 +0100 +@@ -11204,7 +11204,7 @@ + esac + saved_CFLAGS="${CFLAGS}" + CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ +- LDFLAGS="${LDFLAGS_FOR_BUILD}" \ ++ LDFLAGS="${LDFLAGS_FOR_BUILD}" CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \ + ${realsrcdir}/configure \ + --enable-languages=${enable_languages-all} \ + --target=$target_alias --host=$build_alias --build=$build_alias +diff -Nur gcc-4.8.2.orig/gcc/Makefile.in gcc-4.8.2/gcc/Makefile.in +--- gcc-4.8.2.orig/gcc/Makefile.in 2013-07-08 11:14:34.000000000 +0200 ++++ gcc-4.8.2/gcc/Makefile.in 2014-03-03 15:13:22.021327933 +0100 +@@ -996,7 +996,7 @@ + # Likewise. Put INCLUDES at the beginning: this way, if some autoconf macro + # puts -I options in CPPFLAGS, our include files in the srcdir will always + # win against random include files in /usr/include. +-ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) ++ALL_CPPFLAGS = $(INCLUDES) + + # This is the variable to use when using $(COMPILER). + ALL_COMPILERFLAGS = $(ALL_CXXFLAGS) diff --git a/package/gcc/patches/4.8.2/musl-sh.patch b/package/gcc/patches/4.8.2/musl-sh.patch new file mode 100644 index 000000000..237f76f63 --- /dev/null +++ b/package/gcc/patches/4.8.2/musl-sh.patch @@ -0,0 +1,11 @@ +diff -Nur gcc-4.8.2.orig/gcc/config/sh/linux.h gcc-4.8.2/gcc/config/sh/linux.h +--- gcc-4.8.2.orig/gcc/config/sh/linux.h 2013-03-14 04:01:53.000000000 +0100 ++++ gcc-4.8.2/gcc/config/sh/linux.h 2014-03-01 11:33:10.000000000 +0100 +@@ -44,6 +44,7 @@ + #define TARGET_ASM_FILE_END file_end_indicate_exec_stack + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh.so.1" + + #undef SUBTARGET_LINK_EMUL_SUFFIX + #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" diff --git a/package/gcc/patches/4.8.2/musl-stubs.patch b/package/gcc/patches/4.8.2/musl-stubs.patch new file mode 100644 index 000000000..35050fd9c --- /dev/null +++ b/package/gcc/patches/4.8.2/musl-stubs.patch @@ -0,0 +1,49 @@ +diff -Nur gcc-4.8.2.orig/gcc/config/m68k/linux.h gcc-4.8.2/gcc/config/m68k/linux.h +--- gcc-4.8.2.orig/gcc/config/m68k/linux.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.2/gcc/config/m68k/linux.h 2014-02-24 10:19:00.214399704 +0100 +@@ -72,6 +72,7 @@ + done. */ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-m68k.so.1" + + #undef LINK_SPEC + #define LINK_SPEC "-m m68kelf %{shared} \ +diff -Nur gcc-4.8.2.orig/gcc/config/mips/linux64.h gcc-4.8.2/gcc/config/mips/linux64.h +--- gcc-4.8.2.orig/gcc/config/mips/linux64.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.2/gcc/config/mips/linux64.h 2014-02-24 10:19:47.238583895 +0100 +@@ -27,6 +27,9 @@ + #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1" ++#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1" + #define GNU_USER_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +- BIONIC_DYNAMIC_LINKERN32) ++ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) +diff -Nur gcc-4.8.2.orig/gcc/config/sparc/linux64.h gcc-4.8.2/gcc/config/sparc/linux64.h +--- gcc-4.8.2.orig/gcc/config/sparc/linux64.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.2/gcc/config/sparc/linux64.h 2014-02-24 10:20:49.414827006 +0100 +@@ -94,6 +94,9 @@ + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-sparc.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-sparc.so.1" ++ + + #ifdef SPARC_BI_ARCH + +diff -Nur gcc-4.8.2.orig/gcc/config/sparc/linux.h gcc-4.8.2/gcc/config/sparc/linux.h +--- gcc-4.8.2.orig/gcc/config/sparc/linux.h 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.2/gcc/config/sparc/linux.h 2014-02-24 10:21:14.342924339 +0100 +@@ -84,6 +84,7 @@ + done. */ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sparc.so.1" + + #undef LINK_SPEC + #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ -- cgit v1.2.3