summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in5
-rw-r--r--gkb-new/AUTHORS2
-rw-r--r--gkb-new/Makefile.am9
-rw-r--r--gkb-new/README17
-rw-r--r--gkb-new/TODO11
-rw-r--r--gkb-new/xmodmap.sun/Makefile.am74
-rw-r--r--gkb-new/xmodmap.sun/base.xml.in530
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.am125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.az125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.be125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.bg125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.br125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.br-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.by125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.ca125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.cz125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.de125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.de-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.de-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.de_CH125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.dk125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.dk-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.dk-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.ee125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.es125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.es-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.es-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.fi125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.fr125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.fr-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.gb125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.gb-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.gb-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.hu125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.hu-lat1125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.il125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.is125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.it125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.it-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.it-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.jp125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.jp-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.lt125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.lv125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.mk125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.mn128
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.no125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.pl125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.pt125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.pt-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.ro125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.ru125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.se125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.se-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.se-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.si125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.sk125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.sr125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.th125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.tr125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.ua125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.us125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.us-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.us-type6122
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.us-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.vn125
-rw-r--r--gkb-new/xmodmap/Makefile.am36
-rw-r--r--gkb-new/xmodmap/base.xml.in677
-rw-r--r--gkb-new/xmodmap/xmodmap.am117
-rw-r--r--gkb-new/xmodmap/xmodmap.ar125
-rw-r--r--gkb-new/xmodmap/xmodmap.be120
-rw-r--r--gkb-new/xmodmap/xmodmap.bg120
-rw-r--r--gkb-new/xmodmap/xmodmap.br116
-rw-r--r--gkb-new/xmodmap/xmodmap.ch114
-rw-r--r--gkb-new/xmodmap/xmodmap.ch_de113
-rw-r--r--gkb-new/xmodmap/xmodmap.ch_fr113
-rw-r--r--gkb-new/xmodmap/xmodmap.cz119
-rw-r--r--gkb-new/xmodmap/xmodmap.de115
-rw-r--r--gkb-new/xmodmap/xmodmap.de-apple163
-rw-r--r--gkb-new/xmodmap/xmodmap.dk115
-rw-r--r--gkb-new/xmodmap/xmodmap.dvorak112
-rw-r--r--gkb-new/xmodmap/xmodmap.ee117
-rw-r--r--gkb-new/xmodmap/xmodmap.es120
-rw-r--r--gkb-new/xmodmap/xmodmap.es_x86129
-rw-r--r--gkb-new/xmodmap/xmodmap.fi113
-rw-r--r--gkb-new/xmodmap/xmodmap.fr112
-rw-r--r--gkb-new/xmodmap/xmodmap.fr-2112
-rw-r--r--gkb-new/xmodmap/xmodmap.fr_x86129
-rw-r--r--gkb-new/xmodmap/xmodmap.gb200
-rw-r--r--gkb-new/xmodmap/xmodmap.gb-102194
-rw-r--r--gkb-new/xmodmap/xmodmap.gb-105200
-rw-r--r--gkb-new/xmodmap/xmodmap.ge_la126
-rw-r--r--gkb-new/xmodmap/xmodmap.ge_ru131
-rw-r--r--gkb-new/xmodmap/xmodmap.gr121
-rw-r--r--gkb-new/xmodmap/xmodmap.hu116
-rw-r--r--gkb-new/xmodmap/xmodmap.hu-101-lat1106
-rw-r--r--gkb-new/xmodmap/xmodmap.hu-101-lat2106
-rw-r--r--gkb-new/xmodmap/xmodmap.hu-ibm104
-rw-r--r--gkb-new/xmodmap/xmodmap.hu-lat1112
-rw-r--r--gkb-new/xmodmap/xmodmap.hu-sun-lat2125
-rw-r--r--gkb-new/xmodmap/xmodmap.hu.old155
-rw-r--r--gkb-new/xmodmap/xmodmap.hu_latin1112
-rw-r--r--gkb-new/xmodmap/xmodmap.hu_x86129
-rw-r--r--gkb-new/xmodmap/xmodmap.il117
-rw-r--r--gkb-new/xmodmap/xmodmap.il_phonetic117
-rw-r--r--gkb-new/xmodmap/xmodmap.is127
-rw-r--r--gkb-new/xmodmap/xmodmap.it140
-rw-r--r--gkb-new/xmodmap/xmodmap.jp120
-rw-r--r--gkb-new/xmodmap/xmodmap.kr212
-rw-r--r--gkb-new/xmodmap/xmodmap.la114
-rw-r--r--gkb-new/xmodmap/xmodmap.lt114
-rw-r--r--gkb-new/xmodmap/xmodmap.lt_b120
-rw-r--r--gkb-new/xmodmap/xmodmap.lt_p120
-rw-r--r--gkb-new/xmodmap/xmodmap.mk115
-rw-r--r--gkb-new/xmodmap/xmodmap.mn121
-rw-r--r--gkb-new/xmodmap/xmodmap.mn-phonet117
-rw-r--r--gkb-new/xmodmap/xmodmap.mn-rev116
-rw-r--r--gkb-new/xmodmap/xmodmap.mn-uni121
-rw-r--r--gkb-new/xmodmap/xmodmap.nl114
-rw-r--r--gkb-new/xmodmap/xmodmap.no115
-rw-r--r--gkb-new/xmodmap/xmodmap.pl147
-rw-r--r--gkb-new/xmodmap/xmodmap.pl2111
-rw-r--r--gkb-new/xmodmap/xmodmap.pt112
-rw-r--r--gkb-new/xmodmap/xmodmap.pt-dead151
-rw-r--r--gkb-new/xmodmap/xmodmap.qc116
-rw-r--r--gkb-new/xmodmap/xmodmap.qc-2128
-rw-r--r--gkb-new/xmodmap/xmodmap.ro111
-rw-r--r--gkb-new/xmodmap/xmodmap.ru120
-rw-r--r--gkb-new/xmodmap/xmodmap.ru-rev109
-rw-r--r--gkb-new/xmodmap/xmodmap.ru_yawerty120
-rw-r--r--gkb-new/xmodmap/xmodmap.se117
-rw-r--r--gkb-new/xmodmap/xmodmap.sf113
-rw-r--r--gkb-new/xmodmap/xmodmap.sg113
-rw-r--r--gkb-new/xmodmap/xmodmap.si121
-rw-r--r--gkb-new/xmodmap/xmodmap.sk116
-rw-r--r--gkb-new/xmodmap/xmodmap.th127
-rw-r--r--gkb-new/xmodmap/xmodmap.tr_f119
-rw-r--r--gkb-new/xmodmap/xmodmap.tr_q115
-rw-r--r--gkb-new/xmodmap/xmodmap.uk111
-rw-r--r--gkb-new/xmodmap/xmodmap.uk_x86129
-rw-r--r--gkb-new/xmodmap/xmodmap.us114
-rw-r--r--gkb-new/xmodmap/xmodmap.us-101211
-rw-r--r--gkb-new/xmodmap/xmodmap.us-84158
-rw-r--r--gkb-new/xmodmap/xmodmap.us-dec183
-rw-r--r--gkb-new/xmodmap/xmodmap.us-ibm247
-rw-r--r--gkb-new/xmodmap/xmodmap.us-int114
-rw-r--r--gkb-new/xmodmap/xmodmap.us-mac234
-rw-r--r--gkb-new/xmodmap/xmodmap.us-sgi-101228
-rw-r--r--gkb-new/xmodmap/xmodmap.us-sun125
-rw-r--r--gkb-new/xmodmap/xmodmap.us.old211
-rw-r--r--gkb-new/xmodmap/xmodmap.us101A_x86129
-rw-r--r--gkb-new/xmodmap/xmodmap.us_intl118
-rw-r--r--gkb-new/xmodmap/xmodmap.yu115
-rw-r--r--gswitchit/Makefile.am1
-rw-r--r--gswitchit/help/C/gswitchit.xml217
-rw-r--r--gswitchit/help/C/legal.xml76
-rw-r--r--gswitchit/help/Makefile.am9
-rw-r--r--gswitchit/help/ca/ca.po286
-rw-r--r--gswitchit/help/cs/cs.po470
-rw-r--r--gswitchit/help/de/de.po486
-rw-r--r--gswitchit/help/el/el.po489
-rw-r--r--gswitchit/help/en_GB/en_GB.po241
-rw-r--r--gswitchit/help/es/es.po488
-rw-r--r--gswitchit/help/eu/eu.po244
-rw-r--r--gswitchit/help/fi/fi.po286
-rw-r--r--gswitchit/help/fr/fr.po491
-rw-r--r--gswitchit/help/gswitchit.omf.in9
-rw-r--r--gswitchit/help/oc/oc.po361
-rw-r--r--gswitchit/help/ru/ru.po362
-rw-r--r--gswitchit/help/sv/sv.po242
-rw-r--r--gswitchit/help/uk/uk.po488
-rw-r--r--gswitchit/help/zh_CN/zh_CN.po426
172 files changed, 0 insertions, 26650 deletions
diff --git a/configure.in b/configure.in
index f4c2212b..70cbe5e9 100644
--- a/configure.in
+++ b/configure.in
@@ -690,9 +690,6 @@ drivemount/help/Makefile
modemlights/Makefile
multiload/Makefile
multiload/docs/Makefile
-gkb-new/Makefile
-gkb-new/xmodmap/Makefile
-gkb-new/xmodmap.sun/Makefile
charpick/Makefile
charpick/help/Makefile
invest-applet/Makefile
@@ -717,8 +714,6 @@ stickynotes/Makefile
stickynotes/pixmaps/Makefile
stickynotes/docs/Makefile
stickynotes/data/Makefile
-gswitchit/Makefile
-gswitchit/help/Makefile
trashapplet/Makefile
trashapplet/src/Makefile
trashapplet/docs/Makefile
diff --git a/gkb-new/AUTHORS b/gkb-new/AUTHORS
deleted file mode 100644
index 708078cc..00000000
--- a/gkb-new/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Szabolcs Ban <[email protected]>
-Chema Celorio <[email protected]>
diff --git a/gkb-new/Makefile.am b/gkb-new/Makefile.am
deleted file mode 100644
index 236557ff..00000000
--- a/gkb-new/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-if GKB_SUN
-gkb_DDIRS= xmodmap.sun
-else
-gkb_DDIRS= xmodmap
-endif
-
-SUBDIRS= $(gkb_DDIRS)
-
--include $(top_srcdir)/git.mk
diff --git a/gkb-new/README b/gkb-new/README
deleted file mode 100644
index c3913c41..00000000
--- a/gkb-new/README
+++ /dev/null
@@ -1,17 +0,0 @@
-
-This is GKB, a Mate applet to change your keymap with a mouse-click
-or hotkey combination.
-
-Thanks for Balazs Nagy <[email protected]> for his major help at
-start and Charles Levert <[email protected]> for beautiful
-dynamic keyboard layout. I would like to say thanks to Emese Kovacs
-<[email protected]>, who helps me every day and to Chema Celorio
-<[email protected]> who is great in groupwork.
-
-Lot of thanx to Pablo Saratxaga <[email protected]> and
-Carlos Lopez <[email protected]> for many beauty
-flags.
-
-Feel free to bomb me any suggestions, ideas.
-
- Szabolcs Ban <[email protected]>
diff --git a/gkb-new/TODO b/gkb-new/TODO
deleted file mode 100644
index 6edb1585..00000000
--- a/gkb-new/TODO
+++ /dev/null
@@ -1,11 +0,0 @@
-- Dvorak layout
-- Support xkb variants
-- focus indication
-- popup window merge from GKB_UNSTABLE_2_2 branch
-- help merge from the GKB_UNSTABLE_2_2 branch
-- default layout saving to ~/.mate2/gkb_keymap for example
-- loading and saving user defined keyprops to user space (~/.mate2/gkb/)
-- add button disabling in prop-add.c by default (selected signal -> enabling
- the add button)
-- is this neccessary to open a new window to prop-add?
-- flags in prop-add (with gtk-tree-model?)
diff --git a/gkb-new/xmodmap.sun/Makefile.am b/gkb-new/xmodmap.sun/Makefile.am
deleted file mode 100644
index 15829d1c..00000000
--- a/gkb-new/xmodmap.sun/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-EXTRA_DIST = $(GKB_MAPS) $(xmm_xml_in_file)
-
-gkbmapsdir = $(datadir)/mate-xmodmap
-gkbmaps_DATA = $(GKB_MAPS) $(XMM_XML)
-
-GKB_MAPS = \
- xmodmap.am \
- xmodmap.az \
- xmodmap.be \
- xmodmap.bg \
- xmodmap.br \
- xmodmap.by \
- xmodmap.ca \
- xmodmap.cz \
- xmodmap.de \
- xmodmap.de_CH \
- xmodmap.dk \
- xmodmap.ee \
- xmodmap.es \
- xmodmap.fi \
- xmodmap.fr \
- xmodmap.gb \
- xmodmap.hu \
- xmodmap.hu-lat1 \
- xmodmap.il \
- xmodmap.is \
- xmodmap.it \
- xmodmap.jp \
- xmodmap.lt \
- xmodmap.lv \
- xmodmap.mk \
- xmodmap.mn \
- xmodmap.no \
- xmodmap.pl \
- xmodmap.pt \
- xmodmap.ro \
- xmodmap.ru \
- xmodmap.se \
- xmodmap.si \
- xmodmap.sk \
- xmodmap.sr \
- xmodmap.th \
- xmodmap.tr \
- xmodmap.ua \
- xmodmap.us \
- xmodmap.vn \
- xmodmap.br-usb \
- xmodmap.de-usb \
- xmodmap.dk-usb \
- xmodmap.es-usb \
- xmodmap.fr-usb \
- xmodmap.gb-usb \
- xmodmap.it-usb \
- xmodmap.se-usb \
- xmodmap.us-usb \
- xmodmap.de-type4 \
- xmodmap.dk-type4 \
- xmodmap.es-type4 \
- xmodmap.gb-type4 \
- xmodmap.it-type4 \
- xmodmap.jp-type4 \
- xmodmap.pt-type4 \
- xmodmap.se-type4 \
- xmodmap.us-type4 \
- xmodmap.us-type6
-
-xmm_xml_in_file = base.xml.in
-XMM_XML = $(xmm_xml_in_file:.xml.in=.xml)
-
-%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
- $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u \
- -c $(top_srcdir)/po/.intltool-merge-cache
-
--include $(top_srcdir)/git.mk
diff --git a/gkb-new/xmodmap.sun/base.xml.in b/gkb-new/xmodmap.sun/base.xml.in
deleted file mode 100644
index b4a0724f..00000000
--- a/gkb-new/xmodmap.sun/base.xml.in
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
-<xkbConfigRegistry>
- <modelList>
- <model>
- <configItem>
- <name>generic</name>
- <_description>Generic Keyboard</_description>
- </configItem>
- </model>
- </modelList>
- <layoutList>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Armenian Sun keymap</_shortDescription>
- <_description>Armenian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Azerbaijani Turkish Sun keymap</_shortDescription>
- <_description>Azerbaijani Turkish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Dutch Sun keymap</_shortDescription>
- <_description>Dutch Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Bulgarian Sun keymap</_shortDescription>
- <_description>Bulgarian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Brazil Portuguese Sun USB keymap</_shortDescription>
- <_description>Brazil Portuguese Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Brazil Portuguese Sun keymap</_shortDescription>
- <_description>Brazil Portuguese Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Belarusian Sun keymap</_shortDescription>
- <_description>Belarusian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Canadian Sun keymap</_shortDescription>
- <_description>Canadian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Swiss German Sun keymap</_shortDescription>
- <_description>Swiss German Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Czech Sun keymap</_shortDescription>
- <_description>Czech Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>German Sun Type-4 keymap</_shortDescription>
- <_description>German Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>German Sun USB keymap</_shortDescription>
- <_description>German Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>German Sun keymap</_shortDescription>
- <_description>German Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Danish Sun Type-4 keymap</_shortDescription>
- <_description>Danish Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Danish Sun USB keymap</_shortDescription>
- <_description>Danish Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Danish Sun keymap</_shortDescription>
- <_description>Danish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Estonian Sun keymap</_shortDescription>
- <_description>Estonian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Spanish Sun Type-4 keymap</_shortDescription>
- <_description>Spanish Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Spanish Sun USB keymap</_shortDescription>
- <_description>Spanish Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Spanish Sun keymap</_shortDescription>
- <_description>Spanish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Finnish Sun keymap</_shortDescription>
- <_description>Finnish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>French Sun USB keymap</_shortDescription>
- <_description>French Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>French Sun keymap</_shortDescription>
- <_description>French Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>British Sun Type-4 keymap</_shortDescription>
- <_description>British Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>British Sun USB keymap</_shortDescription>
- <_description>British Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>British Sun keymap</_shortDescription>
- <_description>British Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Hungarian latin2 Sun keymap</_shortDescription>
- <_description>Hungarian latin2 Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Hungarian type5 latin 1 keymap</_shortDescription>
- <_description>Hungarian type5 latin 1 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Hebrew Sun keymap</_shortDescription>
- <_description>Hebrew Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Icelandic Sun keymap</_shortDescription>
- <_description>Icelandic Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Italian Sun Type-4 keymap</_shortDescription>
- <_description>Italian Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Italian Sun USB keymap</_shortDescription>
- <_description>Italian Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Italian Sun keymap</_shortDescription>
- <_description>Italian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Japanese Sun Type-4 keymap</_shortDescription>
- <_description>Japanese Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Japanese Sun keymap</_shortDescription>
- <_description>Japanese Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Lithuanian Sun keymap</_shortDescription>
- <_description>Lithuanian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Latvian Sun keymap</_shortDescription>
- <_description>Latvian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Macedonian Sun keymap</_shortDescription>
- <_description>Macedonian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Norwegian Sun keymap</_shortDescription>
- <_description>Norwegian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Polish Sun keymap</_shortDescription>
- <_description>Polish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Portuguese Sun Type-4 keymap</_shortDescription>
- <_description>Portuguese Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Portuguese Sun keymap</_shortDescription>
- <_description>Portuguese Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Romanian Sun keymap</_shortDescription>
- <_description>Romanian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Russian Sun keymap</_shortDescription>
- <_description>Russian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Swedish Sun Type-4 keymap</_shortDescription>
- <_description>Swedish Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Swedish Sun USB keymap</_shortDescription>
- <_description>Swedish Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Swedish Sun keymap</_shortDescription>
- <_description>Swedish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Slovenian Sun keymap</_shortDescription>
- <_description>Slovenian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Slovenian Sun keymap</_shortDescription>
- <_description>Slovenian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Slovak Sun keymap</_shortDescription>
- <_description>Slovak Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Serbian Sun standard keymap</_shortDescription>
- <_description>Serbian Sun standard keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Thai Sun keymap</_shortDescription>
- <_description>Thai Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Turkish Sun keymap</_shortDescription>
- <_description>Turkish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Ukrainian Sun keymap</_shortDescription>
- <_description>Ukrainian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>US Sun type5 keymap</_shortDescription>
- <_description>US Sun type5 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>US Sun Type-4 keymap</_shortDescription>
- <_description>US Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>US Sun USB keymap</_shortDescription>
- <_description>US Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Vietnamese Sun keymap</_shortDescription>
- <_description>Vietnamese Sun keymap</_description>
- </configItem>
- </layout>
- </layoutList>
- <optionList>
- <group allowMultipleSelection="false">
- <configItem>
- <name>grp</name>
- <_description>Layout shift behavior</_description>
- </configItem>
- <option>
- <configItem>
- <name>grp:ralt_toggle</name>
- <_description>Right Alt key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:lalt_toggle</name>
- <_description>Left Alt key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:caps_toggle</name>
- <_description>CapsLock key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:shift_caps_toggle</name>
- <_description>Shift+CapsLock changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:shifts_toggle</name>
- <_description>Both Shift keys together change layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:alts_toggle</name>
- <_description>Both Alt keys together change layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:ctrls_toggle</name>
- <_description>Both Ctrl keys together change layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:ctrl_shift_toggle</name>
- <_description>Control+Shift changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:ctrl_alt_toggle</name>
- <_description>Alt+Control changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:alt_shift_toggle</name>
- <_description>Alt+Shift changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:menu_toggle</name>
- <_description>Menu key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:lwin_toggle</name>
- <_description>Left Win-key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:rwin_toggle</name>
- <_description>Right Win-key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:lshift_toggle</name>
- <_description>Left Shift key changes group.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:rshift_toggle</name>
- <_description>Right Shift key changes group.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:lctrl_toggle</name>
- <_description>Left Ctrl key changes group.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:rctrl_toggle</name>
- <_description>Right Ctrl key changes group.</_description>
- </configItem>
- </option>
- </group>
- </optionList>
-</xkbConfigRegistry>
diff --git a/gkb-new/xmodmap.sun/xmodmap.am b/gkb-new/xmodmap.sun/xmodmap.am
deleted file mode 100644
index 52b03df5..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.am
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam Armenian_fe Armenian_FE
-keycode 38 = 2 at Armenian_dza Armenian_DZA
-keycode 39 = 3 numbersign Armenian_en_dash Armenian_em_dash
-keycode 40 = 4 dollar Armenian_comma dollar
-keycode 41 = 5 percent Armenian_full_stop Armenian_ellipsis
-keycode 42 = 6 asciicircum Armenian_question percent
-keycode 43 = 7 ampersand Armenian_dot Armenian_ligature_ew
-keycode 44 = 8 asterisk Armenian_accent
-keycode 45 = 9 parenleft Armenian_parenright Armenian_parenleft
-keycode 46 = 0 parenright Armenian_o Armenian_O
-keycode 47 = minus underscore Armenian_e Armenian_E
-keycode 48 = equal plus Armenian_ghat Armenian_GHAT
-keycode 49 = grave asciitilde Armenian_separation_mark Armenian_exclam
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Armenian_tche Armenian_TCHE
-keycode 62 = w W Armenian_pyur Armenian_PYUR
-keycode 63 = e E Armenian_ben Armenian_BEN
-keycode 64 = r R Armenian_se Armenian_SE
-keycode 65 = t T Armenian_men Armenian_MEN
-keycode 66 = y Y Armenian_vo Armenian_VO
-keycode 67 = u U Armenian_vyun Armenian_VYUN
-keycode 68 = i I Armenian_ken Armenian_KEN
-keycode 69 = o O Armenian_at Armenian_AT
-keycode 70 = p P Armenian_to Armenian_TO
-keycode 71 = bracketleft braceleft Armenian_tsa Armenian_TSA
-keycode 72 = bracketright braceright Armenian_tso Armenian_TSO
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Armenian_je Armenian_JE
-keycode 85 = s S Armenian_vev Armenian_VEV
-keycode 86 = d D Armenian_gim Armenian_GIM
-keycode 87 = f F Armenian_yech Armenian_YECH
-keycode 88 = g G Armenian_ayb Armenian_AYB
-keycode 89 = h H Armenian_nu Armenian_NU
-keycode 90 = j J Armenian_ini Armenian_INI
-keycode 91 = k K Armenian_tyun Armenian_TYUN
-keycode 92 = l L Armenian_ho Armenian_HO
-keycode 93 = semicolon colon Armenian_pe Armenian_PE
-keycode 94 = apostrophe quotedbl Armenian_re Armenian_RE
-keycode 95 = backslash bar Armenian_guillemotright Armenian_guillemotleft
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Armenian_zhe Armenian_ZHE
-keycode 108 = x X Armenian_da Armenian_DA
-keycode 109 = c C Armenian_cha Armenian_CHA
-keycode 110 = v V Armenian_hi Armenian_HI
-keycode 111 = b B Armenian_za Armenian_ZA
-keycode 112 = n N Armenian_lyun Armenian_LYUN
-keycode 113 = m M Armenian_ke Armenian_KE
-keycode 114 = comma less Armenian_khe Armenian_KHE
-keycode 115 = period greater Armenian_sha Armenian_SHA
-keycode 116 = slash question Armenian_ra Armenian_RA
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.az b/gkb-new/xmodmap.sun/xmodmap.az
deleted file mode 100644
index 388575ba..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.az
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 apostrophe slash
-keycode 40 = 4 semicolon dollar
-keycode 41 = 5 percent sterling
-keycode 42 = 6 colon EuroSign periodcentered
-keycode 43 = 7 question ampersand
-keycode 44 = 8 asterisk asciicircum dead_circumflex
-keycode 45 = 9 parenleft numbersign
-keycode 46 = 0 parenright section
-keycode 47 = minus underscore hyphen
-keycode 48 = equal plus
-keycode 49 = grave asciitilde dead_grave dead_tilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = udiaeresis Udiaeresis w W
-keycode 63 = e E e E
-keycode 64 = r R registered
-keycode 65 = t T brokenbar brokenbar
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i Iabovedot
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = odiaeresis Odiaeresis bracketleft braceleft
-keycode 72 = gbreve Gbreve bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = idotless I semicolon colon
-keycode 94 = schwa SCHWA apostrophe quotedbl
-keycode 95 = gcaron Gcaron backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C copyright division
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M periodcentered currency
-keycode 114 = ccedilla Ccedilla comma less
-keycode 115 = scedilla Scedilla period greater
-keycode 116 = period comma
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.be b/gkb-new/xmodmap.sun/xmodmap.be
deleted file mode 100644
index 94e7c2c0..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.be
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = ampersand 1 bar
-keycode 38 = eacute 2 at
-keycode 39 = quotedbl 3 numbersign
-keycode 40 = apostrophe 4
-keycode 41 = parenleft 5
-keycode 42 = section 6 asciicircum
-keycode 43 = egrave 7
-keycode 44 = exclam 8
-keycode 45 = ccedilla 9 braceleft plusminus
-keycode 46 = agrave 0 braceright degree
-keycode 47 = parenright degree
-keycode 48 = minus underscore
-keycode 49 = twosuperior threesuperior acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = a A
-keycode 62 = z Z
-keycode 63 = e E EuroSign cent
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = dead_circumflex dead_diaeresis bracketleft
-keycode 72 = dollar asterisk bracketright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = q Q
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = m M
-keycode 94 = ugrave percent dead_acute
-keycode 95 = mu sterling dead_grave
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = w W
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = comma question dead_cedilla
-keycode 114 = semicolon period
-keycode 115 = colon slash
-keycode 116 = equal plus dead_tilde
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.bg b/gkb-new/xmodmap.sun/xmodmap.bg
deleted file mode 100644
index 7f37c50f..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.bg
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Alt_R Meta_R
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam multiply multiply
-keycode 38 = 2 at 2 question division division
-keycode 39 = 3 numbersign 3 plus plusminus plusminus
-keycode 40 = 4 dollar 4 quotedbl notsign notsign
-keycode 41 = 5 percent 5 percent
-keycode 42 = 6 asciicircum 6 equal notequal notequal
-keycode 43 = 7 ampersand 7 colon ampersand ampersand
-keycode 44 = 8 asterisk 8 slash asterisk asterisk
-keycode 45 = 9 parenleft 9 emdash bracketleft bracketleft
-keycode 46 = 0 parenright 0 numerosign bracketright bracketright
-keycode 47 = minus underscore minus I X X
-keycode 48 = equal plus period V L L
-keycode 49 = grave asciitilde parenleft parenright degree degree
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q comma Cyrillic_yeru apostrophe apostrophe
-keycode 62 = w W Cyrillic_u Cyrillic_U grave grave
-keycode 63 = e E Cyrillic_ie Cyrillic_IE EuroSign EuroSign
-keycode 64 = r R Cyrillic_i Cyrillic_I registered registered
-keycode 65 = t T Cyrillic_sha Cyrillic_SHA trademark trademark
-keycode 66 = y Y Cyrillic_shcha Cyrillic_SHCHA yen yen
-keycode 67 = u U Cyrillic_ka Cyrillic_KA doublelowquotemark doublelowquotemark
-keycode 68 = i I Cyrillic_es Cyrillic_ES leftdoublequotemark leftdoublequotemark
-keycode 69 = o O Cyrillic_de Cyrillic_DE rightdoublequotemark rightdoublequotemark
-keycode 70 = p P Cyrillic_ze Cyrillic_ZE
-keycode 71 = bracketleft braceleft Cyrillic_tse Cyrillic_TSE braceleft braceleft
-keycode 72 = bracketright braceright semicolon section braceright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_softsign Cyrillic_SOFTSIGN mu mu
-keycode 85 = s S Cyrillic_ya Cyrillic_YA sterling sterling
-keycode 86 = d D Cyrillic_a Cyrillic_A dollar dollar
-keycode 87 = f F Cyrillic_o Cyrillic_O cent cent
-keycode 88 = g G Cyrillic_zhe Cyrillic_ZHE Cyrillic_yeru Cyrillic_yeru
-keycode 89 = h H Cyrillic_ghe Cyrillic_GHE Cyrillic_YERU Cyrillic_YERU
-keycode 90 = j J Cyrillic_te Cyrillic_TE Cyrillic_e Cyrillic_e
-keycode 91 = k K Cyrillic_en Cyrillic_EN Cyrillic_E Cyrillic_E
-keycode 92 = l L Cyrillic_ve Cyrillic_VE numerosign numerosign
-keycode 93 = semicolon colon Cyrillic_em Cyrillic_EM section section
-keycode 94 = apostrophe quotedbl Cyrillic_che Cyrillic_CHE ellipsis ellipsis
-keycode 95 = backslash bar apostrophe Cyrillic_YERU bar bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Cyrillic_yu Cyrillic_YU emdash emdash
-keycode 108 = x X Cyrillic_shorti Cyrillic_SHORTI endash endash
-keycode 109 = c C Cyrillic_hardsign Cyrillic_HARDSIGN copyright copyright
-keycode 110 = v V Cyrillic_e Cyrillic_E
-keycode 111 = b B Cyrillic_ef Cyrillic_EF
-keycode 112 = n N Cyrillic_ha Cyrillic_HA less less
-keycode 113 = m M Cyrillic_pe Cyrillic_PE greater greater
-keycode 114 = comma less Cyrillic_er Cyrillic_ER guillemotleft guillemotleft
-keycode 115 = period greater Cyrillic_el Cyrillic_EL guillemotright guillemotright
-keycode 116 = slash question Cyrillic_be Cyrillic_BE backslash backslash
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space NoSymbol NoSymbol nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.br b/gkb-new/xmodmap.sun/xmodmap.br
deleted file mode 100644
index 20741cfb..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.br
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam onesuperior exclamdown
-keycode 38 = 2 at twosuperior onehalf
-keycode 39 = 3 numbersign threesuperior threequarters
-keycode 40 = 4 dollar sterling onequarter
-keycode 41 = 5 percent cent
-keycode 42 = 6 dead_diaeresis notsign diaeresis
-keycode 43 = 7 ampersand braceleft
-keycode 44 = 8 asterisk bracketleft
-keycode 45 = 9 parenleft bracketright
-keycode 46 = 0 parenright braceright
-keycode 47 = minus underscore backslash
-keycode 48 = equal plus section
-keycode 49 = apostrophe quotedbl acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete comma
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign
-keycode 64 = r R registered
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = dead_acute dead_grave acute grave
-keycode 72 = bracketleft braceleft ordfeminine
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = ccedilla Ccedilla
-keycode 94 = dead_tilde dead_circumflex asciitilde asciicircum
-keycode 95 = backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C copyright
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M mu
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = semicolon colon
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.br-usb b/gkb-new/xmodmap.sun/xmodmap.br-usb
deleted file mode 100644
index 5bb48be9..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.br-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 dollar section
-keycode 41 = 5 percent asciitilde
-keycode 42 = 6 ampersand asciicircum
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = quoteright question quoteleft
-keycode 53 = guillemotleft guillemotright
-keycode 54 = plus asterisk SunFA_Diaeresis
-keycode 55 = SunFA_Acute SunFA_Grave
-keycode 56 =
-keycode 57 = SunFA_Tilde SunFA_Circum
-keycode 58 = Ccedilla
-keycode 59 = masculine ordfeminine
-keycode 60 = backslash bar
-keycode 61 = comma semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
-keycode 107 = less greater
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.by b/gkb-new/xmodmap.sun/xmodmap.by
deleted file mode 100644
index ac7663d4..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.by
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam
-keycode 38 = 2 at 2 quotedbl
-keycode 39 = 3 numbersign 3 numbersign
-keycode 40 = 4 dollar 4 semicolon
-keycode 41 = 5 percent 5 percent
-keycode 42 = 6 asciicircum 6 colon
-keycode 43 = 7 ampersand 7 question
-keycode 44 = 8 asterisk 8 asterisk
-keycode 45 = 9 parenleft 9 parenleft
-keycode 46 = 0 parenright 0 parenright
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus equal plus
-keycode 49 = grave asciitilde Cyrillic_io Cyrillic_IO
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Cyrillic_shorti Cyrillic_SHORTI
-keycode 62 = w W Cyrillic_tse Cyrillic_TSE
-keycode 63 = e E Cyrillic_u Cyrillic_U
-keycode 64 = r R Cyrillic_ka Cyrillic_KA
-keycode 65 = t T Cyrillic_ie Cyrillic_IE
-keycode 66 = y Y Cyrillic_en Cyrillic_EN
-keycode 67 = u U Cyrillic_ghe Cyrillic_GHE
-keycode 68 = i I Cyrillic_sha Cyrillic_SHA
-keycode 69 = o O Byelorussian_shortu Byelorussian_SHORTU
-keycode 70 = p P Cyrillic_ze Cyrillic_ZE
-keycode 71 = bracketleft braceleft Cyrillic_ha Cyrillic_HA
-keycode 72 = bracketright braceright apostrophe apostrophe
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_ef Cyrillic_EF
-keycode 85 = s S Cyrillic_yeru Cyrillic_YERU
-keycode 86 = d D Cyrillic_ve Cyrillic_VE
-keycode 87 = f F Cyrillic_a Cyrillic_A
-keycode 88 = g G Cyrillic_pe Cyrillic_PE
-keycode 89 = h H Cyrillic_er Cyrillic_ER
-keycode 90 = j J Cyrillic_o Cyrillic_O
-keycode 91 = k K Cyrillic_el Cyrillic_EL
-keycode 92 = l L Cyrillic_de Cyrillic_DE
-keycode 93 = semicolon colon Cyrillic_zhe Cyrillic_ZHE
-keycode 94 = apostrophe quotedbl Cyrillic_e Cyrillic_E
-keycode 95 = backslash bar slash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Cyrillic_ya Cyrillic_YA
-keycode 108 = x X Cyrillic_che Cyrillic_CHE
-keycode 109 = c C Cyrillic_es Cyrillic_ES
-keycode 110 = v V Cyrillic_em Cyrillic_EM
-keycode 111 = b B Ukrainian_i Ukrainian_I
-keycode 112 = n N Cyrillic_te Cyrillic_TE
-keycode 113 = m M Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 114 = comma less Cyrillic_be Cyrillic_BE
-keycode 115 = period greater Cyrillic_yu Cyrillic_YU
-keycode 116 = slash question period comma
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.ca b/gkb-new/xmodmap.sun/xmodmap.ca
deleted file mode 100644
index c5903ae4..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.ca
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar onequarter currency
-keycode 41 = 5 percent
-keycode 42 = 6 question threequarters fiveeighths
-keycode 43 = 7 ampersand 7 seveneighths braceleft
-keycode 44 = 8 asterisk 8 trademark braceright
-keycode 45 = 9 parenleft 9 plusminus bracketleft
-keycode 46 = 0 parenright 0 parenright bracketright bracketright
-keycode 47 = minus underscore minus questiondown
-keycode 48 = equal plus dead_cedilla dead_ogonek notsign
-keycode 49 = slash backslash acute hyphen bar
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = dead_circumflex dead_diaeresis NoSymbol dead_abovering dead_grave
-keycode 72 = ccedilla Ccedilla dead_tilde dead_macron asciitilde
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D eth Dstroke
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K kra
-keycode 92 = l L
-keycode 93 = semicolon colon dead_acute dead_doubleacute degree
-keycode 94 = egrave Egrave acute dead_caron
-keycode 95 = agrave Agrave NoSymbol dead_breve
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z z Z guillemotleft guillemotleft
-keycode 108 = x X x X guillemotright guillemotright
-keycode 109 = c C
-keycode 110 = v V leftdoublequotemark leftsinglequotemark
-keycode 111 = b B rightdoublequotemark rightsinglequotemark
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma apostrophe horizconnector multiply less
-keycode 115 = period quotedbl periodcentered division greater
-keycode 116 = eacute Eacute NoSymbol dead_abovedot
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.cz b/gkb-new/xmodmap.sun/xmodmap.cz
deleted file mode 100644
index abde52df..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.cz
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = ISO_Level3_Shift ISO_Level3_Shift
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = plus 1 NoSymbol NoSymbol exclam dead_tilde
-keycode 38 = ecaron 2 NoSymbol NoSymbol at dead_caron
-keycode 39 = scaron 3 NoSymbol NoSymbol numbersign dead_circumflex
-keycode 40 = ccaron 4 NoSymbol NoSymbol dollar dead_breve
-keycode 41 = rcaron 5 NoSymbol NoSymbol percent dead_abovering
-keycode 42 = zcaron 6 NoSymbol NoSymbol asciicircum dead_ogonek
-keycode 43 = yacute 7 NoSymbol NoSymbol ampersand dead_grave
-keycode 44 = aacute 8 NoSymbol NoSymbol asterisk dead_abovedot
-keycode 45 = iacute 9 NoSymbol NoSymbol braceleft dead_acute
-keycode 46 = eacute 0 NoSymbol NoSymbol braceright dead_doubleacute
-keycode 47 = equal percent NoSymbol NoSymbol NoSymbol dead_diaeresis
-keycode 48 = dead_acute dead_caron NoSymbol NoSymbol dead_macron dead_cedilla
-keycode 49 = semicolon dead_abovering acute NoSymbol grave asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete comma NoSymbol NoSymbol KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q NoSymbol NoSymbol backslash
-keycode 62 = w W NoSymbol NoSymbol bar
-keycode 63 = e E NoSymbol NoSymbol EuroSign
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = uacute slash NoSymbol NoSymbol bracketleft division
-keycode 72 = parenright parenleft NoSymbol NoSymbol bracketright multiply
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A NoSymbol NoSymbol asciitilde
-keycode 85 = s S NoSymbol NoSymbol dstroke
-keycode 86 = d D NoSymbol NoSymbol Dstroke
-keycode 87 = f F NoSymbol NoSymbol bracketleft
-keycode 88 = g G NoSymbol NoSymbol bracketright
-keycode 89 = h H NoSymbol NoSymbol grave
-keycode 90 = j J NoSymbol NoSymbol apostrophe
-keycode 91 = k K NoSymbol NoSymbol lstroke
-keycode 92 = l L NoSymbol NoSymbol Lstroke
-keycode 93 = uring quotedbl NoSymbol NoSymbol dollar
-keycode 94 = section exclam acute NoSymbol apostrophe ssharp
-keycode 95 = dead_diaeresis apostrophe NoSymbol NoSymbol backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y NoSymbol NoSymbol degree
-keycode 108 = x X NoSymbol NoSymbol numbersign
-keycode 109 = c C NoSymbol NoSymbol ampersand
-keycode 110 = v V NoSymbol NoSymbol at
-keycode 111 = b B NoSymbol NoSymbol braceleft
-keycode 112 = n N NoSymbol NoSymbol braceright
-keycode 113 = m M NoSymbol NoSymbol asciicircum
-keycode 114 = comma question NoSymbol NoSymbol less
-keycode 115 = period colon NoSymbol NoSymbol greater
-keycode 116 = minus underscore NoSymbol NoSymbol asterisk
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space NoSymbol NoSymbol nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.de b/gkb-new/xmodmap.sun/xmodmap.de
deleted file mode 100644
index ff2b7aa0..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.de
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl twosuperior
-keycode 39 = 3 section threesuperior sterling
-keycode 40 = 4 dollar onequarter currency
-keycode 41 = 5 percent onehalf
-keycode 42 = 6 ampersand threequarters
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright plusminus
-keycode 46 = 0 equal braceright degree
-keycode 47 = ssharp question backslash questiondown
-keycode 48 = dead_acute dead_grave dead_cedilla
-keycode 49 = dead_circumflex degree notsign
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q at
-keycode 62 = w W
-keycode 63 = e E EuroSign
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = udiaeresis Udiaeresis dead_diaeresis
-keycode 72 = plus asterisk dead_tilde dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = odiaeresis Odiaeresis dead_acute
-keycode 94 = adiaeresis Adiaeresis dead_circumflex
-keycode 95 = numbersign apostrophe dead_grave
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y guillemotleft less
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M mu
-keycode 114 = comma semicolon
-keycode 115 = period colon periodcentered division
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.de-type4 b/gkb-new/xmodmap.sun/xmodmap.de-type4
deleted file mode 100644
index 3761e529..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.de-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = Alt_R
-keycode 21 = F6
-keycode 22 = bracketright braceright guillemotright
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = SunAltGraph
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl twosuperior
-keycode 39 = 3 section threesuperior
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash degree
-keycode 44 = 8 parenleft quoteleft
-keycode 45 = 9 parenright quoteright
-keycode 46 = 0 equal bar
-keycode 47 = ssharp question backslash
-keycode 48 = SunFA_Acute SunFA_Grave
-keycode 49 = numbersign asciicircum at
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Z
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = Udiaeresis
-keycode 72 = plus asterisk asciitilde
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Caps_Lock
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = Odiaeresis
-keycode 94 = Adiaeresis
-keycode 95 = bracketleft braceleft guillemotleft
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Y
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M NoSymbol mu
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 = less greater
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.de-usb b/gkb-new/xmodmap.sun/xmodmap.de-usb
deleted file mode 100644
index 1aa6089c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.de-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = m M mu
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = q Q at
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Z
-keycode 36 = Y
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl twosuperior
-keycode 39 = 3 section threesuperior
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = ssharp question backslash
-keycode 53 = SunFA_Acute SunFA_Grave
-keycode 54 = Udiaeresis
-keycode 55 = plus asterisk asciitilde
-keycode 56 =
-keycode 57 = numbersign quoteright quoteleft
-keycode 58 = Odiaeresis
-keycode 59 = Adiaeresis
-keycode 60 = asciicircum degree
-keycode 61 = comma semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Separator
-keycode 107 = less greater bar
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.de_CH b/gkb-new/xmodmap.sun/xmodmap.de_CH
deleted file mode 100644
index 72908bd2..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.de_CH
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 plus bar exclamdown
-keycode 38 = 2 quotedbl at oneeighth
-keycode 39 = 3 asterisk numbersign
-keycode 40 = 4 ccedilla
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand notsign
-keycode 43 = 7 slash brokenbar
-keycode 44 = 8 parenleft cent
-keycode 45 = 9 parenright
-keycode 46 = 0 equal
-keycode 47 = apostrophe question dead_acute
-keycode 48 = dead_circumflex dead_grave dead_tilde
-keycode 49 = section degree acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = udiaeresis egrave bracketleft
-keycode 72 = dead_diaeresis exclam bracketright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = odiaeresis eacute
-keycode 94 = adiaeresis agrave braceleft
-keycode 95 = dollar sterling braceright
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.dk b/gkb-new/xmodmap.sun/xmodmap.dk
deleted file mode 100644
index 802df960..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.dk
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam exclamdown onesuperior
-keycode 38 = 2 quotedbl at twosuperior
-keycode 39 = 3 numbersign sterling threesuperior
-keycode 40 = 4 currency dollar onequarter
-keycode 41 = 5 percent NoSymbol cent
-keycode 42 = 6 ampersand yen
-keycode 43 = 7 slash braceleft division
-keycode 44 = 8 parenleft bracketleft guillemotleft
-keycode 45 = 9 parenright bracketright guillemotright
-keycode 46 = 0 equal braceright degree
-keycode 47 = plus question plusminus questiondown
-keycode 48 = dead_acute dead_grave bar brokenbar
-keycode 49 = onehalf section threequarters paragraph
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R registered
-keycode 65 = t T thorn THORN
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O oe OE
-keycode 70 = p P
-keycode 71 = aring Aring
-keycode 72 = dead_diaeresis dead_circumflex dead_tilde dead_caron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A ordfeminine masculine
-keycode 85 = s S
-keycode 86 = d D eth ETH
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = ae AE
-keycode 94 = oslash Ooblique acute
-keycode 95 = apostrophe asterisk dead_doubleacute multiply
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C copyright
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon dead_cedilla dead_ogonek
-keycode 115 = period colon periodcentered dead_abovedot
-keycode 116 = minus underscore hyphen macron
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.dk-type4 b/gkb-new/xmodmap.sun/xmodmap.dk-type4
deleted file mode 100644
index c5f96b16..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.dk-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunCompose
-keycode 21 = F6
-keycode 22 = asciitilde asciicircum
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 currency dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = plus question
-keycode 48 = SunFA_Acute SunFA_Grave bar
-keycode 49 = quoteright asterisk quoteleft
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = Aring
-keycode 72 = SunFA_Diaeresis SunFA_Circum SunFA_Tilde
-keycode 73 = Delete
-keycode 74 = SunAltGraph
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Caps_Lock
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = AE
-keycode 94 = Ooblique
-keycode 95 = onehalf section
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 = less greater backslash
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.dk-usb b/gkb-new/xmodmap.sun/xmodmap.dk-usb
deleted file mode 100644
index f0b9d4e6..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.dk-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 =
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 currency dollar
-keycode 41 = 5 percent asciitilde
-keycode 42 = 6 ampersand asciicircum
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = plus question
-keycode 53 = SunFA_Acute SunFA_Grave bar
-keycode 54 = Aring
-keycode 55 = SunFA_Diaeresis SunFA_Circum SunFA_Tilde
-keycode 56 =
-keycode 57 = quoteright asterisk quoteleft
-keycode 58 = AE
-keycode 59 = Ooblique
-keycode 60 = onehalf section
-keycode 61 = comma semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Separator
-keycode 107 = less greater backslash
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.ee b/gkb-new/xmodmap.sun/xmodmap.ee
deleted file mode 100644
index 9f1addaf..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.ee
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 currency dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = plus question backslash
-keycode 48 = dead_acute dead_grave grave apostrophe
-keycode 49 = dead_caron dead_tilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = udiaeresis Udiaeresis
-keycode 72 = otilde Otilde section
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S scaron Scaron
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = odiaeresis Odiaeresis
-keycode 94 = adiaeresis Adiaeresis asciicircum
-keycode 95 = apostrophe asterisk onehalf
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z zcaron Zcaron
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon less
-keycode 115 = period colon greater
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.es b/gkb-new/xmodmap.sun/xmodmap.es
deleted file mode 100644
index 44835a0c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.es
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam bar exclamdown
-keycode 38 = 2 quotedbl at oneeighth
-keycode 39 = 3 periodcentered numbersign sterling
-keycode 40 = 4 dollar asciitilde dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand notsign fiveeighths
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright
-keycode 46 = 0 equal
-keycode 47 = apostrophe question
-keycode 48 = exclamdown questiondown asciitilde asciitilde
-keycode 49 = masculine ordfeminine backslash backslash
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = dead_grave dead_circumflex bracketleft dead_abovering
-keycode 72 = plus asterisk bracketright dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = ntilde Ntilde asciitilde dead_doubleacute
-keycode 94 = dead_acute dead_diaeresis braceleft braceleft
-keycode 95 = ccedilla Ccedilla braceright dead_breve
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.es-type4 b/gkb-new/xmodmap.sun/xmodmap.es-type4
deleted file mode 100644
index 07088b52..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.es-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunAltGraph
-keycode 21 = F6
-keycode 22 = bracketright braceright guillemotright
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 periodcentered numbersign
-keycode 40 = 4 dollar
-keycode 41 = 5 percent degree
-keycode 42 = 6 ampersand notsign
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright backslash
-keycode 46 = 0 equal bar
-keycode 47 = quoteright question quoteleft
-keycode 48 = exclamdown questiondown
-keycode 49 = Ccedilla
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O NoSymbol masculine
-keycode 70 = P
-keycode 71 = SunFA_Grave SunFA_Circum asciicircum
-keycode 72 = plus asterisk asciitilde
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Caps_Lock
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = Ntilde
-keycode 94 = SunFA_Acute SunFA_Diaeresis
-keycode 95 = bracketleft braceleft guillemotleft
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 = less greater
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.es-usb b/gkb-new/xmodmap.sun/xmodmap.es-usb
deleted file mode 100644
index 0be09a6f..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.es-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam bar
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 periodcentered numbersign
-keycode 40 = 4 dollar asciicircum
-keycode 41 = 5 percent asciitilde
-keycode 42 = 6 ampersand notsign
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright
-keycode 46 = 0 equal
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = quoteright question quoteleft
-keycode 53 = exclamdown questiondown
-keycode 54 = SunFA_Grave SunFA_Circum bracketleft
-keycode 55 = plus asterisk bracketright
-keycode 56 =
-keycode 57 = ccedilla Ccedilla braceright
-keycode 58 = Ntilde
-keycode 59 = SunFA_Acute SunFA_Diaeresis braceleft
-keycode 60 = masculine ordfeminine backslash
-keycode 61 = comma semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
-keycode 107 = less greater
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.fi b/gkb-new/xmodmap.sun/xmodmap.fi
deleted file mode 100644
index e4c7f31d..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.fi
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam exclamdown onesuperior
-keycode 38 = 2 quotedbl at twosuperior
-keycode 39 = 3 numbersign sterling threesuperior
-keycode 40 = 4 currency dollar onequarter
-keycode 41 = 5 percent NoSymbol cent
-keycode 42 = 6 ampersand yen
-keycode 43 = 7 slash braceleft division
-keycode 44 = 8 parenleft bracketleft guillemotleft
-keycode 45 = 9 parenright bracketright guillemotright
-keycode 46 = 0 equal braceright degree
-keycode 47 = plus question backslash questiondown
-keycode 48 = dead_acute dead_grave plusminus notsign
-keycode 49 = section onehalf paragraph threequarters
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R registered
-keycode 65 = t T thorn THORN
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O oe OE
-keycode 70 = p P
-keycode 71 = aring Aring
-keycode 72 = dead_diaeresis dead_circumflex dead_tilde dead_caron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A ordfeminine masculine
-keycode 85 = s S
-keycode 86 = d D eth ETH
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = odiaeresis Odiaeresis oslash Ooblique
-keycode 94 = adiaeresis Adiaeresis ae AE
-keycode 95 = apostrophe asterisk acute multiply
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C copyright
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon dead_cedilla dead_ogonek
-keycode 115 = period colon periodcentered dead_abovedot
-keycode 116 = minus underscore hyphen macron
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.fr b/gkb-new/xmodmap.sun/xmodmap.fr
deleted file mode 100644
index e2cb35d3..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.fr
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = ampersand 1 onesuperior exclamdown
-keycode 38 = eacute 2 asciitilde oneeighth
-keycode 39 = quotedbl 3 numbersign sterling
-keycode 40 = apostrophe 4 braceleft dollar
-keycode 41 = parenleft 5 bracketleft threeeighths
-keycode 42 = minus 6 bar fiveeighths
-keycode 43 = egrave 7 grave seveneighths
-keycode 44 = underscore 8 backslash trademark
-keycode 45 = ccedilla 9 asciicircum plusminus
-keycode 46 = agrave 0 at degree
-keycode 47 = parenright degree bracketright questiondown
-keycode 48 = equal plus braceright dead_ogonek
-keycode 49 = twosuperior asciitilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = a A ae AE
-keycode 62 = z Z guillemotleft less
-keycode 63 = e E EuroSign cent
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = dead_circumflex dead_diaeresis
-keycode 72 = dollar sterling currency dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = q Q at Greek_OMEGA
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = m M mu masculine
-keycode 94 = ugrave percent acute
-keycode 95 = asterisk mu
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = w W lstroke Lstroke
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = comma question dead_acute dead_doubleacute
-keycode 114 = semicolon period
-keycode 115 = colon slash
-keycode 116 = exclam section
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.fr-usb b/gkb-new/xmodmap.sun/xmodmap.fr-usb
deleted file mode 100644
index 34d8aa65..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.fr-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = Q
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = comma question
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = A
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = Z
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = W
-keycode 37 = ampersand 1
-keycode 38 = eacute 2 asciitilde
-keycode 39 = quotedbl 3 numbersign
-keycode 40 = quoteright 4 braceleft
-keycode 41 = parenleft 5 bracketleft
-keycode 42 = minus 6 bar
-keycode 43 = egrave 7 quoteleft
-keycode 44 = underscore 8 backslash
-keycode 45 = ccedilla 9 asciicircum
-keycode 46 = agrave 0 at
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = parenright degree bracketright
-keycode 53 = equal plus braceright
-keycode 54 = SunFA_Circum SunFA_Diaeresis
-keycode 55 = dollar sterling currency
-keycode 56 =
-keycode 57 = asterisk mu
-keycode 58 = M
-keycode 59 = ugrave percent
-keycode 60 = twosuperior
-keycode 61 = semicolon period
-keycode 62 = colon slash
-keycode 63 = exclam section
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
-keycode 107 = less greater
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.gb b/gkb-new/xmodmap.sun/xmodmap.gb
deleted file mode 100644
index 48c868d6..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.gb
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl
-keycode 39 = 3 sterling
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = grave notsign bar bar
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = semicolon colon
-keycode 94 = apostrophe at acute
-keycode 95 = numbersign asciitilde
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.gb-type4 b/gkb-new/xmodmap.sun/xmodmap.gb-type4
deleted file mode 100644
index 0f43e9e5..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.gb-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunAltGraph
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam brokenbar
-keycode 38 = 2 at
-keycode 39 = 3 sterling numbersign
-keycode 40 = 4 dollar currency
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore notsign
-keycode 48 = equal plus
-keycode 49 = quoteleft asciitilde
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = semicolon colon
-keycode 94 = quoteright quotedbl
-keycode 95 = backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.gb-usb b/gkb-new/xmodmap.sun/xmodmap.gb-usb
deleted file mode 100644
index 2ad137ef..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.gb-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl
-keycode 39 = 3 sterling
-keycode 40 = 4 dollar currency
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = minus underscore
-keycode 53 = equal plus
-keycode 54 = bracketleft braceleft
-keycode 55 = bracketright braceright
-keycode 56 =
-keycode 57 = numbersign asciitilde
-keycode 58 = semicolon colon
-keycode 59 = quoteright at
-keycode 60 = quoteleft notsign brokenbar
-keycode 61 = comma less
-keycode 62 = period greater
-keycode 63 = slash question
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
-keycode 107 = backslash bar
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 = Help
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 =
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.hu b/gkb-new/xmodmap.sun/xmodmap.hu
deleted file mode 100644
index ca7e541e..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.hu
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L Meta_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 apostrophe asciitilde dead_tilde
-keycode 38 = 2 quotedbl dead_caron caron
-keycode 39 = 3 plus asciicircum dead_circumflex
-keycode 40 = 4 exclam dead_breve breve
-keycode 41 = 5 percent dead_abovering degree
-keycode 42 = 6 slash dead_ogonek ogonek
-keycode 43 = 7 equal grave dead_grave
-keycode 44 = 8 parenleft dead_abovedot degree
-keycode 45 = 9 parenright dead_acute acute
-keycode 46 = odiaeresis Odiaeresis dead_doubleacute doubleacute
-keycode 47 = udiaeresis Udiaeresis dead_diaeresis diaeresis
-keycode 48 = oacute Oacute dead_cedilla cedilla
-keycode 49 = 0 section notsign
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete comma
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q backslash
-keycode 62 = w W bar
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I Iacute
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = odoubleacute Odoubleacute division
-keycode 72 = uacute Uacute multiply
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S dstroke
-keycode 86 = d D Dstroke
-keycode 87 = f F bracketleft
-keycode 88 = g G bracketright
-keycode 89 = h H
-keycode 90 = j J iacute
-keycode 91 = k K lstroke
-keycode 92 = l L Lstroke
-keycode 93 = eacute Eacute dollar
-keycode 94 = aacute Aacute ssharp
-keycode 95 = udoubleacute Udoubleacute currency
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y greater
-keycode 108 = x X numbersign
-keycode 109 = c C ampersand
-keycode 110 = v V at
-keycode 111 = b B braceleft
-keycode 112 = n N braceright
-keycode 113 = m M less
-keycode 114 = comma question semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore asterisk
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.hu-lat1 b/gkb-new/xmodmap.sun/xmodmap.hu-lat1
deleted file mode 100644
index b891cc6c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.hu-lat1
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L Meta_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 apostrophe asciitilde dead_tilde
-keycode 38 = 2 quotedbl dead_caron caron
-keycode 39 = 3 plus asciicircum dead_circumflex
-keycode 40 = 4 exclam dead_breve breve
-keycode 41 = 5 percent dead_abovering degree
-keycode 42 = 6 slash dead_ogonek ogonek
-keycode 43 = 7 equal grave dead_grave
-keycode 44 = 8 parenleft dead_abovedot degree
-keycode 45 = 9 parenright dead_acute acute
-keycode 46 = odiaeresis Odiaeresis dead_doubleacute doubleacute
-keycode 47 = udiaeresis Udiaeresis dead_diaeresis diaeresis
-keycode 48 = oacute Oacute dead_cedilla cedilla
-keycode 49 = 0 section notsign
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete comma
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q backslash
-keycode 62 = w W bar
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I Iacute
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = otilde Otilde division
-keycode 72 = uacute Uacute multiply
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S dstroke
-keycode 86 = d D Dstroke
-keycode 87 = f F bracketleft
-keycode 88 = g G bracketright
-keycode 89 = h H
-keycode 90 = j J iacute
-keycode 91 = k K lstroke
-keycode 92 = l L Lstroke
-keycode 93 = eacute Eacute dollar
-keycode 94 = aacute Aacute ssharp
-keycode 95 = ucirc Ucirc currency
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y greater
-keycode 108 = x X numbersign
-keycode 109 = c C ampersand
-keycode 110 = v V at
-keycode 111 = b B braceleft
-keycode 112 = n N braceright
-keycode 113 = m M less
-keycode 114 = comma question semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore asterisk
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.il b/gkb-new/xmodmap.sun/xmodmap.il
deleted file mode 100644
index 73bbe23d..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.il
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam
-keycode 38 = 2 at 2 at
-keycode 39 = 3 numbersign 3 numbersign
-keycode 40 = 4 dollar 4 dollar
-keycode 41 = 5 percent 5 percent
-keycode 42 = 6 asciicircum 6 asciicircum
-keycode 43 = 7 ampersand 7 ampersand
-keycode 44 = 8 asterisk 8 asterisk
-keycode 45 = 9 parenleft 9 parenleft
-keycode 46 = 0 parenright 0 parenright
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus equal plus
-keycode 49 = grave asciitilde semicolon asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q slash Q
-keycode 62 = w W apostrophe W
-keycode 63 = e E hebrew_qoph E
-keycode 64 = r R hebrew_resh R
-keycode 65 = t T hebrew_aleph T
-keycode 66 = y Y hebrew_tet Y
-keycode 67 = u U hebrew_waw U
-keycode 68 = i I hebrew_finalnun I
-keycode 69 = o O hebrew_finalmem O
-keycode 70 = p P hebrew_pe P
-keycode 71 = bracketleft braceleft bracketleft braceleft
-keycode 72 = bracketright braceright bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A hebrew_shin A
-keycode 85 = s S hebrew_dalet S
-keycode 86 = d D hebrew_gimel D
-keycode 87 = f F hebrew_kaph F
-keycode 88 = g G hebrew_ayin G
-keycode 89 = h H hebrew_yod H
-keycode 90 = j J hebrew_chet J
-keycode 91 = k K hebrew_lamed K
-keycode 92 = l L hebrew_finalkaph L
-keycode 93 = semicolon colon hebrew_finalpe colon
-keycode 94 = apostrophe quotedbl comma quotedbl
-keycode 95 = backslash bar backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z hebrew_zain Z
-keycode 108 = x X hebrew_samech X
-keycode 109 = c C hebrew_bet C
-keycode 110 = v V hebrew_he V
-keycode 111 = b B hebrew_nun B
-keycode 112 = n N hebrew_mem N
-keycode 113 = m M hebrew_zade M
-keycode 114 = comma less hebrew_taw less
-keycode 115 = period greater hebrew_finalzade greater
-keycode 116 = slash question period question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.is b/gkb-new/xmodmap.sun/xmodmap.is
deleted file mode 100644
index 87684142..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.is
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl twosuperior
-keycode 39 = 3 numbersign threesuperior sterling
-keycode 40 = 4 dollar onequarter currency
-keycode 41 = 5 percent onehalf
-keycode 42 = 6 ampersand threequarters
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright plusminus
-keycode 46 = 0 equal braceright degree
-keycode 47 = odiaeresis Odiaeresis backslash questiondown
-keycode 48 = minus underscore ccedilla
-keycode 49 = degree diaeresis notsign
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q at
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = eth ETH dead_diaeresis
-keycode 72 = apostrophe question asciitilde dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = ae AE
-keycode 94 = dead_acute Adiaeresis dead_circumflex
-keycode 95 = plus asterisk bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon
-keycode 115 = period colon periodcentered division
-keycode 116 = thorn THORN
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.it b/gkb-new/xmodmap.sun/xmodmap.it
deleted file mode 100644
index c91f713c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.it
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl
-keycode 39 = 3 sterling
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright
-keycode 46 = 0 equal
-keycode 47 = apostrophe question grave questiondown
-keycode 48 = igrave asciicircum asciitilde dead_ogonek
-keycode 49 = backslash bar acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = egrave eacute bracketleft dead_abovering
-keycode 72 = plus asterisk bracketright dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = ograve ccedilla at dead_doubleacute
-keycode 94 = agrave degree numbersign numbersign
-keycode 95 = ugrave section
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.it-type4 b/gkb-new/xmodmap.sun/xmodmap.it-type4
deleted file mode 100644
index e53c6949..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.it-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunAltGraph
-keycode 21 = F6
-keycode 22 = bracketright braceright guillemotright
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl twosuperior
-keycode 39 = 3 sterling threesuperior
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand notsign
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright backslash
-keycode 46 = 0 equal bar
-keycode 47 = quoteright question quoteleft
-keycode 48 = igrave asciicircum
-keycode 49 = ugrave section
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = egrave eacute
-keycode 72 = plus asterisk asciitilde
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Caps_Lock
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = ograve ccedilla at
-keycode 94 = agrave degree numbersign
-keycode 95 = bracketleft braceleft guillemotleft
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 = less greater
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.it-usb b/gkb-new/xmodmap.sun/xmodmap.it-usb
deleted file mode 100644
index c7e45ec2..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.it-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl
-keycode 39 = 3 sterling
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft braceleft
-keycode 45 = 9 parenright braceright
-keycode 46 = 0 equal
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = quoteright question quoteleft
-keycode 53 = igrave asciicircum
-keycode 54 = egrave eacute bracketleft
-keycode 55 = plus asterisk bracketright
-keycode 56 =
-keycode 57 = ugrave section asciitilde
-keycode 58 = ograve ccedilla at
-keycode 59 = agrave degree numbersign
-keycode 60 = backslash bar
-keycode 61 = comma semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
-keycode 107 = less greater
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.jp b/gkb-new/xmodmap.sun/xmodmap.jp
deleted file mode 100644
index 712f699d..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.jp
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Alt_R Meta_R
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L Meta_L
-keycode 27 = Up
-keycode 28 = Pause Break Break
-keycode 29 = Print Execute Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam kana_NU
-keycode 38 = 2 quotedbl kana_FU
-keycode 39 = 3 numbersign kana_A kana_a
-keycode 40 = 4 dollar kana_U kana_u
-keycode 41 = 5 percent kana_E kana_e
-keycode 42 = 6 ampersand kana_O kana_o
-keycode 43 = 7 apostrophe kana_YA kana_ya
-keycode 44 = 8 parenleft kana_YU kana_yu
-keycode 45 = 9 parenright kana_YO kana_yo
-keycode 46 = 0 asciitilde kana_WA kana_WO
-keycode 47 = minus equal kana_HO
-keycode 48 = asciicircum asciitilde kana_HE
-keycode 49 = grave asciitilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q kana_TA
-keycode 62 = w W kana_TE
-keycode 63 = e E kana_I kana_i
-keycode 64 = r R kana_SU
-keycode 65 = t T kana_KA
-keycode 66 = y Y kana_N
-keycode 67 = u U kana_NA
-keycode 68 = i I kana_NI
-keycode 69 = o O kana_RA
-keycode 70 = p P kana_SE
-keycode 71 = at grave voicedsound
-keycode 72 = bracketleft braceleft semivoicedsound kana_openingbracket
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A kana_CHI
-keycode 85 = s S kana_TO
-keycode 86 = d D kana_SHI
-keycode 87 = f F kana_HA
-keycode 88 = g G kana_KI
-keycode 89 = h H kana_KU
-keycode 90 = j J kana_MA
-keycode 91 = k K kana_NO
-keycode 92 = l L kana_RI
-keycode 93 = semicolon plus kana_RE
-keycode 94 = colon asterisk kana_KE
-keycode 95 = backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z kana_TSU kana_tsu
-keycode 108 = x X kana_SA
-keycode 109 = c C kana_SO
-keycode 110 = v V kana_HI
-keycode 111 = b B kana_KO
-keycode 112 = n N kana_MI
-keycode 113 = m M kana_MO
-keycode 114 = comma less kana_NE kana_comma
-keycode 115 = period greater kana_RU kana_fullstop
-keycode 116 = slash question kana_ME kana_conjunctive
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock Eisu_toggle
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.jp-type4 b/gkb-new/xmodmap.sun/xmodmap.jp-type4
deleted file mode 100644
index 2e3a8c74..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.jp-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunAltGraph
-keycode 21 = F6
-keycode 22 = Linefeed
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam kana_NU
-keycode 38 = 2 quotedbl kana_FU
-keycode 39 = 3 numbersign kana_A kana_a
-keycode 40 = 4 dollar kana_U kana_u
-keycode 41 = 5 percent kana_E kana_e
-keycode 42 = 6 ampersand kana_O kana_o
-keycode 43 = 7 quoteright kana_YA kana_ya
-keycode 44 = 8 parenleft kana_YU kana_yu
-keycode 45 = 9 parenright kana_YO kana_yo
-keycode 46 = 0 0 kana_WA kana_WO
-keycode 47 = minus equal kana_HO
-keycode 48 = asciicircum asciitilde kana_HE
-keycode 49 = bracketright braceright kana_MU kana_closingbracket
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = q Q kana_TA
-keycode 62 = w W kana_TE
-keycode 63 = e E kana_I kana_i
-keycode 64 = r R kana_SU
-keycode 65 = t T kana_KA
-keycode 66 = y Y kana_N
-keycode 67 = u U kana_NA
-keycode 68 = i I kana_NI
-keycode 69 = o O kana_RA
-keycode 70 = p P kana_SE
-keycode 71 = at quoteleft voicedsound
-keycode 72 = bracketleft braceleft semivoicedsound kana_openingbracket
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A kana_CHI
-keycode 85 = s S kana_TO
-keycode 86 = d D kana_SHI
-keycode 87 = f F kana_HA
-keycode 88 = g G kana_KI
-keycode 89 = h H kana_KU
-keycode 90 = j J kana_MA
-keycode 91 = k K kana_NO
-keycode 92 = l L kana_RI
-keycode 93 = semicolon plus kana_RE
-keycode 94 = colon asterisk kana_KE
-keycode 95 = backslash bar prolongedsound
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z kana_TSU kana_tsu
-keycode 108 = x X kana_SA
-keycode 109 = c C kana_SO
-keycode 110 = v V kana_HI
-keycode 111 = b B kana_KO
-keycode 112 = n N kana_MI
-keycode 113 = m M kana_MO
-keycode 114 = comma less kana_NE kana_comma
-keycode 115 = period greater kana_RU kana_fullstop
-keycode 116 = slash question kana_ME kana_conjunctive
-keycode 117 = Shift_R
-keycode 118 = backslash underscore kana_RO
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 = Execute
-keycode 123 = Kanji
-keycode 124 = Henkan_Mode
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.lt b/gkb-new/xmodmap.sun/xmodmap.lt
deleted file mode 100644
index b321630b..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.lt
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam aogonek Aogonek
-keycode 38 = 2 at ccaron Ccaron
-keycode 39 = 3 numbersign eogonek Eogonek
-keycode 40 = 4 dollar eabovedot Eabovedot
-keycode 41 = 5 percent iogonek Iogonek
-keycode 42 = 6 asciicircum scaron Scaron
-keycode 43 = 7 ampersand uogonek Uogonek
-keycode 44 = 8 asterisk umacron Umacron
-keycode 45 = 9 parenleft doublelowquotemark parenleft
-keycode 46 = 0 parenright leftdoublequotemark parenright
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus zcaron Zcaron
-keycode 49 = grave asciitilde grave asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q q Q
-keycode 62 = w W w W
-keycode 63 = e E e E
-keycode 64 = r R r R
-keycode 65 = t T t T
-keycode 66 = y Y y Y
-keycode 67 = u U u U
-keycode 68 = i I i I
-keycode 69 = o O o O
-keycode 70 = p P p P
-keycode 71 = bracketleft braceleft bracketleft braceleft
-keycode 72 = bracketright braceright bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A a A
-keycode 85 = s S s S
-keycode 86 = d D d D
-keycode 87 = f F f F
-keycode 88 = g G g G
-keycode 89 = h H h H
-keycode 90 = j J j J
-keycode 91 = k K k K
-keycode 92 = l L l L
-keycode 93 = semicolon colon semicolon colon
-keycode 94 = apostrophe quotedbl apostrophe quotedbl
-keycode 95 = backslash bar backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z z Z
-keycode 108 = x X x X
-keycode 109 = c C c C
-keycode 110 = v V v V
-keycode 111 = b B b B
-keycode 112 = n N n N
-keycode 113 = m M m M
-keycode 114 = comma less comma less
-keycode 115 = period greater period greater
-keycode 116 = slash question slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.lv b/gkb-new/xmodmap.sun/xmodmap.lv
deleted file mode 100644
index 847b335b..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.lv
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar EuroSign cent
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = grave asciitilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E emacron Emacron
-keycode 64 = r R rcedilla Rcedilla
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U umacron Umacron
-keycode 68 = i I imacron Imacron
-keycode 69 = o O omacron Omacron
-keycode 70 = p P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A amacron Amacron
-keycode 85 = s S scaron Scaron
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G gcedilla Gcedilla
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K kcedilla Kcedilla
-keycode 92 = l L lcedilla Lcedilla
-keycode 93 = semicolon colon
-keycode 94 = apostrophe quotedbl leftdoublequotemark doublelowquotemark
-keycode 95 = backslash bar
-keycode 96 = Return ISO_Next_Group
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z zcaron Zcaron
-keycode 108 = x X
-keycode 109 = c C ccaron Ccaron
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N ncedilla Ncedilla
-keycode 113 = m M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.mk b/gkb-new/xmodmap.sun/xmodmap.mk
deleted file mode 100644
index 70faf23c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.mk
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam
-keycode 38 = 2 at 2 doublelowquotemark
-keycode 39 = 3 numbersign 3 leftdoublequotemark
-keycode 40 = 4 dollar 4 dollar
-keycode 41 = 5 percent 5 percent
-keycode 42 = 6 asciicircum 6 asciicircum
-keycode 43 = 7 ampersand 7 ampersand
-keycode 44 = 8 asterisk 8 asterisk
-keycode 45 = 9 parenleft 9 parenleft
-keycode 46 = 0 parenright 0 parenright
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus equal plus
-keycode 49 = grave asciitilde grave asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Cyrillic_lje Cyrillic_LJE
-keycode 62 = w W Cyrillic_nje Cyrillic_NJE
-keycode 63 = e E Cyrillic_ie Cyrillic_IE
-keycode 64 = r R Cyrillic_er Cyrillic_ER
-keycode 65 = t T Cyrillic_te Cyrillic_TE
-keycode 66 = y Y Macedonia_dse Macedonia_DSE
-keycode 67 = u U Cyrillic_u Cyrillic_U
-keycode 68 = i I Cyrillic_i Cyrillic_I
-keycode 69 = o O Cyrillic_o Cyrillic_O
-keycode 70 = p P Cyrillic_pe Cyrillic_PE
-keycode 71 = bracketleft braceleft Cyrillic_sha Cyrillic_SHA
-keycode 72 = bracketright braceright Macedonia_gje Macedonia_GJE
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_a Cyrillic_A
-keycode 85 = s S Cyrillic_es Cyrillic_ES
-keycode 86 = d D Cyrillic_de Cyrillic_DE
-keycode 87 = f F Cyrillic_ef Cyrillic_EF
-keycode 88 = g G Cyrillic_ghe Cyrillic_GHE
-keycode 89 = h H Cyrillic_ha Cyrillic_HA
-keycode 90 = j J Cyrillic_je Cyrillic_JE
-keycode 91 = k K Cyrillic_ka Cyrillic_KA
-keycode 92 = l L Cyrillic_el Cyrillic_EL
-keycode 93 = semicolon colon Cyrillic_che Cyrillic_CHE
-keycode 94 = apostrophe quotedbl Macedonia_kje Macedonia_KJE
-keycode 95 = backslash bar Cyrillic_zhe Cyrillic_ZHE
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Cyrillic_ze Cyrillic_ZE
-keycode 108 = x X Cyrillic_dzhe Cyrillic_DZHE
-keycode 109 = c C Cyrillic_tse Cyrillic_TSE
-keycode 110 = v V Cyrillic_ve Cyrillic_VE
-keycode 111 = b B Cyrillic_be Cyrillic_BE
-keycode 112 = n N Cyrillic_en Cyrillic_EN
-keycode 113 = m M Cyrillic_em Cyrillic_EM
-keycode 114 = comma less comma semicolon
-keycode 115 = period greater period colon
-keycode 116 = slash question slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.mn b/gkb-new/xmodmap.sun/xmodmap.mn
deleted file mode 100644
index f17e21ae..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.mn
+++ /dev/null
@@ -1,128 +0,0 @@
-! Mongolian cyrillic keymap
-! Generated by Sanlig Badral <[email protected]>
-
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 numerosign
-keycode 38 = 2 at 2 minus
-keycode 39 = 3 numbersign 3 quotedbl
-keycode 40 = 4 dollar 4 U20AE
-keycode 41 = 5 percent 5 colon
-keycode 42 = 6 asciicircum 6 period
-keycode 43 = 7 ampersand 7 underscore
-keycode 44 = 8 asterisk 8 comma
-keycode 45 = 9 parenleft 9 percent
-keycode 46 = 0 parenright 0 question
-keycode 47 = minus underscore Cyrillic_ie Cyrillic_IE
-keycode 48 = equal plus Cyrillic_shcha Cyrillic_SHCHA
-keycode 49 = grave asciitilde Cyrillic_yu Cyrillic_YU
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Cyrillic_ef Cyrillic_EF
-keycode 62 = w W Cyrillic_tse Cyrillic_TSE
-keycode 63 = e E Cyrillic_u Cyrillic_U
-keycode 64 = r R Cyrillic_zhe Cyrillic_ZHE
-keycode 65 = t T Cyrillic_e Cyrillic_E
-keycode 66 = y Y Cyrillic_en Cyrillic_EN
-keycode 67 = u U Cyrillic_ghe Cyrillic_GHE
-keycode 68 = i I Cyrillic_sha Cyrillic_SHA
-keycode 69 = o O U04AF U04AE
-keycode 70 = p P Cyrillic_ze Cyrillic_ZE
-keycode 71 = bracketleft braceleft Cyrillic_ka Cyrillic_KA
-keycode 72 = bracketright braceright Cyrillic_hardsign Cyrillic_HARDSIGN
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_shorti Cyrillic_SHORTI
-keycode 85 = s S Cyrillic_yeru Cyrillic_YERU
-keycode 86 = d D Cyrillic_be Cyrillic_BE
-keycode 87 = f F U04E9 U04E8
-keycode 88 = g G Cyrillic_a Cyrillic_A
-keycode 89 = h H Cyrillic_ha Cyrillic_HA
-keycode 90 = j J CCyrillic_er Cyrillic_ER
-keycode 91 = k K Cyrillic_o Cyrillic_O
-keycode 92 = l L Cyrillic_el Cyrillic_EL
-keycode 93 = semicolon colon Cyrillic_de Cyrillic_DE
-keycode 94 = apostrophe quotedbl Cyrillic_pe Cyrillic_PE
-keycode 95 = backslash bar backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Cyrillic_ya Cyrillic_YA
-keycode 108 = x X Cyrillic_che Cyrillic_CHE
-keycode 109 = c C Cyrillic_io Cyrillic_IO
-keycode 110 = v V Cyrillic_es Cyrillic_ES
-keycode 111 = b B Cyrillic_em Cyrillic_EM
-keycode 112 = n N Cyrillic_i Cyrillic_I
-keycode 113 = m M Cyrillic_te Cyrillic_TE
-keycode 114 = comma less Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 115 = period greater Cyrillic_ve Cyrillic_VE
-keycode 116 = slash question slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.no b/gkb-new/xmodmap.sun/xmodmap.no
deleted file mode 100644
index 7e81c43f..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.no
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam exclamdown onesuperior
-keycode 38 = 2 quotedbl at twosuperior
-keycode 39 = 3 numbersign sterling threesuperior
-keycode 40 = 4 currency dollar onequarter
-keycode 41 = 5 percent NoSymbol cent
-keycode 42 = 6 ampersand yen
-keycode 43 = 7 slash braceleft division
-keycode 44 = 8 parenleft bracketleft guillemotleft
-keycode 45 = 9 parenright bracketright guillemotright
-keycode 46 = 0 equal braceright degree
-keycode 47 = plus question plusminus questiondown
-keycode 48 = backslash dead_grave dead_acute notsign
-keycode 49 = bar section brokenbar paragraph
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R registered
-keycode 65 = t T thorn THORN
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O oe OE
-keycode 70 = p P
-keycode 71 = aring Aring
-keycode 72 = dead_diaeresis dead_circumflex dead_tilde dead_caron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A ordfeminine masculine
-keycode 85 = s S
-keycode 86 = d D eth ETH
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = oslash Ooblique
-keycode 94 = ae AE acute
-keycode 95 = apostrophe asterisk dead_doubleacute multiply
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C copyright
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon dead_cedilla dead_ogonek
-keycode 115 = period colon periodcentered dead_abovedot
-keycode 116 = minus underscore hyphen macron
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.pl b/gkb-new/xmodmap.sun/xmodmap.pl
deleted file mode 100644
index 45178942..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = grave asciitilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E eogonek Eogonek
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O oacute Oacute
-keycode 70 = p P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A aogonek Aogonek
-keycode 85 = s S sacute Sacute
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L lstroke Lstroke
-keycode 93 = semicolon colon
-keycode 94 = apostrophe quotedbl acute
-keycode 95 = backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z zabovedot Zabovedot
-keycode 108 = x X zacute Zacute
-keycode 109 = c C cacute Cacute
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N nacute Nacute
-keycode 113 = m M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.pt b/gkb-new/xmodmap.sun/xmodmap.pt
deleted file mode 100644
index 528149eb..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.pt
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at oneeighth
-keycode 39 = 3 numbersign sterling sterling
-keycode 40 = 4 dollar section dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright
-keycode 46 = 0 equal
-keycode 47 = apostrophe question
-keycode 48 = guillemotleft guillemotright
-keycode 49 = backslash bar acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = plus asterisk dead_diaeresis
-keycode 72 = dead_acute dead_grave
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = ccedilla Ccedilla
-keycode 94 = masculine ordfeminine acute
-keycode 95 = dead_tilde dead_circumflex
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.pt-type4 b/gkb-new/xmodmap.sun/xmodmap.pt-type4
deleted file mode 100644
index c8306939..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.pt-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunAltGraph
-keycode 21 = F6
-keycode 22 = bracketright braceright guillemotright
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 dollar section
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand notsign
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright backslash
-keycode 46 = 0 equal bar
-keycode 47 = quoteright question quoteleft
-keycode 48 = exclamdown questiondown
-keycode 49 = SunFA_Tilde SunFA_Circum asciicircum
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = SunFA_Diaeresis asterisk plus
-keycode 72 = SunFA_Acute SunFA_Grave asciitilde
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Caps_Lock
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = Ccedilla
-keycode 94 = masculine ordfeminine
-keycode 95 = bracketleft braceleft guillemotleft
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 = less greater
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.ro b/gkb-new/xmodmap.sun/xmodmap.ro
deleted file mode 100644
index cbfeb914..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.ro
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = grave asciitilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q acircumflex Acircumflex
-keycode 62 = w W
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T tcedilla Tcedilla
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I icircumflex Icircumflex
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A abreve Abreve
-keycode 85 = s S scedilla Scedilla
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = semicolon colon
-keycode 94 = apostrophe quotedbl acute
-keycode 95 = backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.ru b/gkb-new/xmodmap.sun/xmodmap.ru
deleted file mode 100644
index 3fe3fb1c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.ru
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam
-keycode 38 = 2 at 2 quotedbl
-keycode 39 = 3 numbersign 3 apostrophe
-keycode 40 = 4 dollar 4 asterisk
-keycode 41 = 5 percent 5 colon
-keycode 42 = 6 asciicircum 6 comma
-keycode 43 = 7 ampersand 7 period
-keycode 44 = 8 asterisk 8 semicolon
-keycode 45 = 9 parenleft 9 parenleft
-keycode 46 = 0 parenright 0 parenright
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus equal plus
-keycode 49 = grave asciitilde Cyrillic_io Cyrillic_IO
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Cyrillic_shorti Cyrillic_SHORTI
-keycode 62 = w W Cyrillic_tse Cyrillic_TSE
-keycode 63 = e E Cyrillic_u Cyrillic_U
-keycode 64 = r R Cyrillic_ka Cyrillic_KA
-keycode 65 = t T Cyrillic_ie Cyrillic_IE
-keycode 66 = y Y Cyrillic_en Cyrillic_EN
-keycode 67 = u U Cyrillic_ghe Cyrillic_GHE
-keycode 68 = i I Cyrillic_sha Cyrillic_SHA
-keycode 69 = o O Cyrillic_shcha Cyrillic_SHCHA
-keycode 70 = p P Cyrillic_ze Cyrillic_ZE
-keycode 71 = bracketleft braceleft Cyrillic_ha Cyrillic_HA
-keycode 72 = bracketright braceright Cyrillic_hardsign Cyrillic_HARDSIGN
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_ef Cyrillic_EF
-keycode 85 = s S Cyrillic_yeru Cyrillic_YERU
-keycode 86 = d D Cyrillic_ve Cyrillic_VE
-keycode 87 = f F Cyrillic_a Cyrillic_A
-keycode 88 = g G Cyrillic_pe Cyrillic_PE
-keycode 89 = h H Cyrillic_er Cyrillic_ER
-keycode 90 = j J Cyrillic_o Cyrillic_O
-keycode 91 = k K Cyrillic_el Cyrillic_EL
-keycode 92 = l L Cyrillic_de Cyrillic_DE
-keycode 93 = semicolon colon Cyrillic_zhe Cyrillic_ZHE
-keycode 94 = apostrophe quotedbl Cyrillic_e Cyrillic_E
-keycode 95 = backslash bar backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Cyrillic_ya Cyrillic_YA
-keycode 108 = x X Cyrillic_che Cyrillic_CHE
-keycode 109 = c C Cyrillic_es Cyrillic_ES
-keycode 110 = v V Cyrillic_em Cyrillic_EM
-keycode 111 = b B Cyrillic_i Cyrillic_I
-keycode 112 = n N Cyrillic_te Cyrillic_TE
-keycode 113 = m M Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 114 = comma less Cyrillic_be Cyrillic_BE
-keycode 115 = period greater Cyrillic_yu Cyrillic_YU
-keycode 116 = slash question slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.se b/gkb-new/xmodmap.sun/xmodmap.se
deleted file mode 100644
index e4c7f31d..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.se
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam exclamdown onesuperior
-keycode 38 = 2 quotedbl at twosuperior
-keycode 39 = 3 numbersign sterling threesuperior
-keycode 40 = 4 currency dollar onequarter
-keycode 41 = 5 percent NoSymbol cent
-keycode 42 = 6 ampersand yen
-keycode 43 = 7 slash braceleft division
-keycode 44 = 8 parenleft bracketleft guillemotleft
-keycode 45 = 9 parenright bracketright guillemotright
-keycode 46 = 0 equal braceright degree
-keycode 47 = plus question backslash questiondown
-keycode 48 = dead_acute dead_grave plusminus notsign
-keycode 49 = section onehalf paragraph threequarters
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R registered
-keycode 65 = t T thorn THORN
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O oe OE
-keycode 70 = p P
-keycode 71 = aring Aring
-keycode 72 = dead_diaeresis dead_circumflex dead_tilde dead_caron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A ordfeminine masculine
-keycode 85 = s S
-keycode 86 = d D eth ETH
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = odiaeresis Odiaeresis oslash Ooblique
-keycode 94 = adiaeresis Adiaeresis ae AE
-keycode 95 = apostrophe asterisk acute multiply
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C copyright
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon dead_cedilla dead_ogonek
-keycode 115 = period colon periodcentered dead_abovedot
-keycode 116 = minus underscore hyphen macron
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.se-type4 b/gkb-new/xmodmap.sun/xmodmap.se-type4
deleted file mode 100644
index fe666065..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.se-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunCompose
-keycode 21 = F6
-keycode 22 = asciitilde asciicircum
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 currency dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = plus question backslash
-keycode 48 = SunFA_Acute SunFA_Grave
-keycode 49 = quoteright asterisk quoteleft
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = Aring
-keycode 72 = SunFA_Diaeresis SunFA_Circum SunFA_Tilde
-keycode 73 = Delete
-keycode 74 = SunAltGraph
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Caps_Lock
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = Odiaeresis
-keycode 94 = Adiaeresis
-keycode 95 = section onehalf
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 = less greater bar
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.se-usb b/gkb-new/xmodmap.sun/xmodmap.se-usb
deleted file mode 100644
index 91f74de1..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.se-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 currency dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = plus question backslash
-keycode 53 = SunFA_Acute SunFA_Grave
-keycode 54 = Aring
-keycode 55 = SunFA_Diaeresis asciicircum asciitilde
-keycode 56 =
-keycode 57 = quoteright asterisk quoteleft
-keycode 58 = Odiaeresis
-keycode 59 = Adiaeresis
-keycode 60 = section onehalf
-keycode 61 = comma semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Separator
-keycode 107 = less greater bar
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.si b/gkb-new/xmodmap.sun/xmodmap.si
deleted file mode 100644
index 5e7ba48b..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.si
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam asciitilde dead_tilde
-keycode 38 = 2 quotedbl dead_caron caron
-keycode 39 = 3 numbersign asciicircum dead_circumflex
-keycode 40 = 4 dollar dead_breve breve
-keycode 41 = 5 percent degree dead_abovering
-keycode 42 = 6 ampersand dead_ogonek ogonek
-keycode 43 = 7 slash grave dead_grave
-keycode 44 = 8 parenleft dead_abovedot abovedot
-keycode 45 = 9 parenright dead_acute apostrophe
-keycode 46 = 0 equal dead_doubleacute doubleacute
-keycode 47 = apostrophe question dead_diaeresis diaeresis
-keycode 48 = plus asterisk dead_cedilla cedilla
-keycode 49 = dead_cedilla dead_diaeresis acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q backslash
-keycode 62 = w W bar
-keycode 63 = e E EuroSign
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = scaron Scaron division
-keycode 72 = dstroke Dstroke multiply dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F bracketleft
-keycode 88 = g G bracketright
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K lstroke
-keycode 92 = l L Lstroke
-keycode 93 = ccaron Ccaron
-keycode 94 = cacute Cacute ssharp
-keycode 95 = zcaron Zcaron currency
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V at
-keycode 111 = b B braceleft
-keycode 112 = n N braceright
-keycode 113 = m M section
-keycode 114 = comma semicolon
-keycode 115 = period colon periodcentered
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.sk b/gkb-new/xmodmap.sun/xmodmap.sk
deleted file mode 100644
index f332e876..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.sk
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = ISO_Level3_Shift ISO_Level3_Shift
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = plus 1 NoSymbol NoSymbol exclam dead_tilde
-keycode 38 = lacute 2 NoSymbol NoSymbol at dead_caron
-keycode 39 = scaron 3 NoSymbol NoSymbol numbersign dead_circumflex
-keycode 40 = ccaron 4 NoSymbol NoSymbol dollar dead_breve
-keycode 41 = tcaron 5 NoSymbol NoSymbol percent dead_abovering
-keycode 42 = zcaron 6 NoSymbol NoSymbol asciicircum dead_ogonek
-keycode 43 = yacute 7 NoSymbol NoSymbol ampersand dead_grave
-keycode 44 = aacute 8 NoSymbol NoSymbol asterisk dead_abovedot
-keycode 45 = iacute 9 NoSymbol NoSymbol braceleft dead_acute
-keycode 46 = eacute 0 NoSymbol NoSymbol braceright dead_doubleacute
-keycode 47 = equal percent NoSymbol NoSymbol NoSymbol dead_diaeresis
-keycode 48 = dead_acute dead_caron NoSymbol NoSymbol dead_macron dead_cedilla
-keycode 49 = semicolon dead_abovering acute NoSymbol grave asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete comma NoSymbol NoSymbol KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q NoSymbol NoSymbol backslash
-keycode 62 = w W NoSymbol NoSymbol bar
-keycode 63 = e E NoSymbol NoSymbol EuroSign
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = uacute slash NoSymbol NoSymbol bracketleft division
-keycode 72 = adiaeresis parenleft NoSymbol NoSymbol bracketright multiply
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A NoSymbol NoSymbol asciitilde
-keycode 85 = s S NoSymbol NoSymbol dstroke
-keycode 86 = d D NoSymbol NoSymbol Dstroke
-keycode 87 = f F NoSymbol NoSymbol bracketleft
-keycode 88 = g G NoSymbol NoSymbol bracketright
-keycode 89 = h H NoSymbol NoSymbol grave
-keycode 90 = j J NoSymbol NoSymbol apostrophe
-keycode 91 = k K NoSymbol NoSymbol lstroke
-keycode 92 = l L NoSymbol NoSymbol Lstroke
-keycode 93 = ocircumflex quotedbl NoSymbol NoSymbol dollar
-keycode 94 = section exclam acute NoSymbol apostrophe ssharp
-keycode 95 = ncaron parenright NoSymbol NoSymbol backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y NoSymbol NoSymbol degree
-keycode 108 = x X NoSymbol NoSymbol numbersign
-keycode 109 = c C NoSymbol NoSymbol ampersand
-keycode 110 = v V NoSymbol NoSymbol at
-keycode 111 = b B NoSymbol NoSymbol braceleft
-keycode 112 = n N NoSymbol NoSymbol braceright
-keycode 113 = m M NoSymbol NoSymbol asciicircum
-keycode 114 = comma question NoSymbol NoSymbol less
-keycode 115 = period colon NoSymbol NoSymbol greater
-keycode 116 = minus underscore NoSymbol NoSymbol asterisk
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space NoSymbol NoSymbol nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.sr b/gkb-new/xmodmap.sun/xmodmap.sr
deleted file mode 100644
index 27dd5bb7..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.sr
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam
-keycode 38 = 2 at 2 quotedbl
-keycode 39 = 3 numbersign 3 numbersign
-keycode 40 = 4 dollar 4 dollar
-keycode 41 = 5 percent 5 percent
-keycode 42 = 6 asciicircum 6 ampersand
-keycode 43 = 7 ampersand 7 slash
-keycode 44 = 8 asterisk 8 parenleft
-keycode 45 = 9 parenleft 9 parenright
-keycode 46 = 0 parenright 0 equal
-keycode 47 = minus underscore apostrophe question
-keycode 48 = equal plus plus asterisk
-keycode 49 = grave asciitilde grave asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Cyrillic_lje Cyrillic_LJE
-keycode 62 = w W Cyrillic_nje Cyrillic_NJE
-keycode 63 = e E Cyrillic_ie Cyrillic_IE
-keycode 64 = r R Cyrillic_er Cyrillic_ER
-keycode 65 = t T Cyrillic_te Cyrillic_TE
-keycode 66 = y Y Cyrillic_ze Cyrillic_ZE
-keycode 67 = u U Cyrillic_u Cyrillic_U
-keycode 68 = i I Cyrillic_i Cyrillic_I
-keycode 69 = o O Cyrillic_o Cyrillic_O
-keycode 70 = p P Cyrillic_pe Cyrillic_PE
-keycode 71 = bracketleft braceleft Cyrillic_sha Cyrillic_SHA
-keycode 72 = bracketright braceright bracketleft bracketright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_a Cyrillic_A
-keycode 85 = s S Cyrillic_es Cyrillic_ES
-keycode 86 = d D Cyrillic_de Cyrillic_DE
-keycode 87 = f F Cyrillic_ef Cyrillic_EF
-keycode 88 = g G Cyrillic_ghe Cyrillic_GHE
-keycode 89 = h H Cyrillic_ha Cyrillic_HA
-keycode 90 = j J Cyrillic_je Cyrillic_JE
-keycode 91 = k K Cyrillic_ka Cyrillic_KA
-keycode 92 = l L Cyrillic_el Cyrillic_EL
-keycode 93 = semicolon colon Cyrillic_che Cyrillic_CHE
-keycode 94 = apostrophe quotedbl Serbian_tshe Serbian_TSHE
-keycode 95 = backslash bar minus underscore
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Serbian_dje Serbian_DJE
-keycode 108 = x X Cyrillic_dzhe Cyrillic_DZHE
-keycode 109 = c C Cyrillic_tse Cyrillic_TSE
-keycode 110 = v V Cyrillic_zhe Cyrillic_ZHE
-keycode 111 = b B Cyrillic_be Cyrillic_BE
-keycode 112 = n N Cyrillic_en Cyrillic_EN
-keycode 113 = m M Cyrillic_em Cyrillic_EM
-keycode 114 = comma less comma semicolon
-keycode 115 = period greater period colon
-keycode 116 = slash question Cyrillic_zhe Cyrillic_ZHE
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.th b/gkb-new/xmodmap.sun/xmodmap.th
deleted file mode 100644
index d0a5e518..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.th
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam Thai_lakkhangyao plus
-keycode 38 = 2 at slash Thai_leknung
-keycode 39 = 3 numbersign minus Thai_leksong
-keycode 40 = 4 dollar Thai_phosamphao Thai_leksam
-keycode 41 = 5 percent Thai_thothung Thai_leksi
-keycode 42 = 6 asciicircum Thai_sarau Thai_sarauu
-keycode 43 = 7 ampersand Thai_saraue Thai_baht
-keycode 44 = 8 asterisk Thai_khokhwai Thai_lekha
-keycode 45 = 9 parenleft Thai_totao Thai_lekhok
-keycode 46 = 0 parenright Thai_chochan Thai_lekchet
-keycode 47 = minus underscore Thai_khokhai Thai_lekpaet
-keycode 48 = equal plus Thai_chochang Thai_lekkao
-keycode 49 = grave asciitilde underscore percent
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Thai_maiyamok Thai_leksun
-keycode 62 = w W Thai_saraaimaimalai quotedbl
-keycode 63 = e E Thai_saraam Thai_dochada
-keycode 64 = r R Thai_phophan Thai_thonangmontho
-keycode 65 = t T Thai_saraa Thai_thothong
-keycode 66 = y Y Thai_maihanakat Thai_nikhahit
-keycode 67 = u U Thai_saraii Thai_maitri
-keycode 68 = i I Thai_rorua Thai_nonen
-keycode 69 = o O Thai_nonu Thai_paiyannoi
-keycode 70 = p P Thai_yoyak Thai_yoying
-keycode 71 = bracketleft braceleft Thai_bobaimai Thai_thothan
-keycode 72 = bracketright braceright Thai_loling comma
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Thai_fofan Thai_ru
-keycode 85 = s S Thai_hohip Thai_khorakhang
-keycode 86 = d D Thai_kokai Thai_topatak
-keycode 87 = f F Thai_dodek Thai_sarao
-keycode 88 = g G Thai_sarae Thai_chochoe
-keycode 89 = h H Thai_maitho Thai_maitaikhu
-keycode 90 = j J Thai_maiek Thai_maichattawa
-keycode 91 = k K Thai_saraaa Thai_sorusi
-keycode 92 = l L Thai_sosua Thai_sosala
-keycode 93 = semicolon colon Thai_wowaen Thai_soso
-keycode 94 = apostrophe quotedbl Thai_ngongu period
-keycode 95 = backslash bar Thai_khokhuat Thai_khokhon
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L ISO_First_Group
-keycode 107 = z Z Thai_phophung parenleft
-keycode 108 = x X Thai_popla parenright
-keycode 109 = c C Thai_saraae Thai_choching
-keycode 110 = v V Thai_oang Thai_honokhuk
-keycode 111 = b B Thai_sarai Thai_phinthu
-keycode 112 = n N Thai_sarauee Thai_thanthakhat
-keycode 113 = m M Thai_thothahan question
-keycode 114 = comma less Thai_moma Thai_thophuthao
-keycode 115 = period greater Thai_saraaimaimuan Thai_lochula
-keycode 116 = slash question Thai_fofa Thai_lu
-keycode 117 = Shift_R ISO_Last_Group
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.tr b/gkb-new/xmodmap.sun/xmodmap.tr
deleted file mode 100644
index 8f5b1ad8..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.tr
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 apostrophe twosuperior
-keycode 39 = 3 asciicircum numbersign
-keycode 40 = 4 plus dollar
-keycode 41 = 5 percent onehalf
-keycode 42 = 6 ampersand threequarters
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright plusminus
-keycode 46 = 0 equal braceright degree
-keycode 47 = asterisk question backslash questiondown
-keycode 48 = minus underscore
-keycode 49 = quotedbl eacute notsign
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Separator
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q at
-keycode 62 = w W
-keycode 63 = e E EuroSign
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = yacute I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = eth ETH dead_diaeresis
-keycode 72 = udiaeresis Udiaeresis asciitilde dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = thorn THORN acute
-keycode 94 = i Yacute dead_circumflex
-keycode 95 = comma semicolon grave
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M mu
-keycode 114 = odiaeresis Odiaeresis
-keycode 115 = ccedilla Ccedilla periodcentered division
-keycode 116 = period colon slash
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.ua b/gkb-new/xmodmap.sun/xmodmap.ua
deleted file mode 100644
index 5108850d..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.ua
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam
-keycode 38 = 2 at 2 quotedbl
-keycode 39 = 3 numbersign 3 apostrophe
-keycode 40 = 4 dollar 4 asterisk
-keycode 41 = 5 percent 5 colon
-keycode 42 = 6 asciicircum 6 comma
-keycode 43 = 7 ampersand 7 period
-keycode 44 = 8 asterisk 8 semicolon
-keycode 45 = 9 parenleft 9 parenleft
-keycode 46 = 0 parenright 0 parenright
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus equal plus
-keycode 49 = grave asciitilde Ukrainian_ghe_with_upturn Ukrainian_GHE_WITH_UPTURN
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Cyrillic_shorti Cyrillic_SHORTI
-keycode 62 = w W Cyrillic_tse Cyrillic_TSE
-keycode 63 = e E Cyrillic_u Cyrillic_U
-keycode 64 = r R Cyrillic_ka Cyrillic_KA
-keycode 65 = t T Cyrillic_ie Cyrillic_IE
-keycode 66 = y Y Cyrillic_en Cyrillic_EN
-keycode 67 = u U Cyrillic_ghe Cyrillic_GHE
-keycode 68 = i I Cyrillic_sha Cyrillic_SHA
-keycode 69 = o O Cyrillic_shcha Cyrillic_SHCHA
-keycode 70 = p P Cyrillic_ze Cyrillic_ZE
-keycode 71 = bracketleft braceleft Cyrillic_ha Cyrillic_HA
-keycode 72 = bracketright braceright Ukrainian_yi Ukrainian_YI
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_ef Cyrillic_EF
-keycode 85 = s S Ukrainian_i Ukrainian_I
-keycode 86 = d D Cyrillic_ve Cyrillic_VE
-keycode 87 = f F Cyrillic_a Cyrillic_A
-keycode 88 = g G Cyrillic_pe Cyrillic_PE
-keycode 89 = h H Cyrillic_er Cyrillic_ER
-keycode 90 = j J Cyrillic_o Cyrillic_O
-keycode 91 = k K Cyrillic_el Cyrillic_EL
-keycode 92 = l L Cyrillic_de Cyrillic_DE
-keycode 93 = semicolon colon Cyrillic_zhe Cyrillic_ZHE
-keycode 94 = apostrophe quotedbl Ukrainian_ie Ukrainian_IE
-keycode 95 = backslash bar backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Cyrillic_ya Cyrillic_YA
-keycode 108 = x X Cyrillic_che Cyrillic_CHE
-keycode 109 = c C Cyrillic_es Cyrillic_ES
-keycode 110 = v V Cyrillic_em Cyrillic_EM
-keycode 111 = b B Cyrillic_i Cyrillic_I
-keycode 112 = n N Cyrillic_te Cyrillic_TE
-keycode 113 = m M Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 114 = comma less Cyrillic_be Cyrillic_BE
-keycode 115 = period greater Cyrillic_yu Cyrillic_YU
-keycode 116 = slash question slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.us b/gkb-new/xmodmap.sun/xmodmap.us
deleted file mode 100644
index 741ff45f..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.us
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = grave asciitilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = semicolon colon
-keycode 94 = apostrophe quotedbl acute
-keycode 95 = backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.us-type4 b/gkb-new/xmodmap.sun/xmodmap.us-type4
deleted file mode 100644
index 45611225..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.us-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunAltGraph
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar currency
-keycode 41 = 5 percent currency
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = quoteleft asciitilde
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = semicolon colon
-keycode 94 = quoteright quotedbl
-keycode 95 = backslash bar brokenbar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.us-type6 b/gkb-new/xmodmap.sun/xmodmap.us-type6
deleted file mode 100644
index 7eaf6f2c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.us-type6
+++ /dev/null
@@ -1,122 +0,0 @@
-#############################################################
-# Xmodmap file for Hungarian layout on Sun Ray thin clients #
-# #
-# created by Janos Cserep <[email protected]> #
-# #
-#############################################################
-
-keycode 124 = Help
-keycode 48 = Escape
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 60 = 0 section
-keycode 37 = 1 quoteright asciitilde
-keycode 38 = 2 quotedbl
-keycode 39 = 3 plus asciicircum
-keycode 40 = 4 exclam
-keycode 41 = 5 percent degree
-keycode 42 = 6 slash
-keycode 43 = 7 equal quoteleft
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright acute
-keycode 46 = odiaeresis Odiaeresis doubleacute
-keycode 52 = udiaeresis Udiaeresis diaeresis
-keycode 53 = oacute Oacute asciitilde
-keycode 49 = BackSpace
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 125 = L3 L3 SunProps
-keycode 129 = L4 L4 SunUndo
-keycode 50 = Tab
-keycode 27 = q Q backslash
-keycode 33 = w W bar
-keycode 15 = E
-keycode 28 = R
-keycode 30 = T
-keycode 35 = Z
-keycode 31 = u U EuroSign
-keycode 19 = I
-keycode 25 = O
-keycode 26 = P
-keycode 54 = odoubleacute Odoubleacute division
-keycode 55 = uacute Uacute multiply
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 94 = KP_Add
-keycode 126 = L5 L5 SunFront
-keycode 131 = L6 L6 SunCopy
-keycode 64 = Caps_Lock
-keycode 11 = A
-keycode 29 = s S dstroke
-keycode 14 = d D Dstroke
-keycode 16 = f F bracketleft
-keycode 17 = g G bracketright
-keycode 18 = H
-keycode 20 = j J iacute
-keycode 21 = k K
-keycode 22 = L
-keycode 58 = eacute Eacute dollar
-keycode 59 = aacute Aacute ssharp
-keycode 56 = udoubleacute Udoubleacute backslash
-keycode 47 = Return
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 123 = L7 L7 SunOpen
-keycode 132 = L8 L8 SunPaste
-keycode 232 = Shift_L
-keycode 107 = iacute Iacute less
-keycode 36 = y Y greater
-keycode 34 = x X numbersign
-keycode 13 = c C ampersand
-keycode 32 = v V at
-keycode 12 = b B braceleft
-keycode 24 = n N braceright
-keycode 23 = M
-keycode 61 = comma question semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore asterisk
-keycode 236 = Shift_R
-keycode 89 = Up
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 95 = KP_Enter
-keycode 133 = L9 L9 SunFind
-keycode 130 = L10 L10 SunCut
-keycode 231 = Control_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 51 = space
-keycode 238 = Meta_R
-keycode 108 = SunCompose
-keycode 237 = SunAltGraph
-keycode 87 = Left
-keycode 88 = Down
-keycode 86 = Right
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
diff --git a/gkb-new/xmodmap.sun/xmodmap.us-usb b/gkb-new/xmodmap.sun/xmodmap.us-usb
deleted file mode 100644
index c430b9cd..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.us-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar currency
-keycode 41 = 5 percent currency
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = minus underscore
-keycode 53 = equal plus
-keycode 54 = bracketleft braceleft
-keycode 55 = bracketright braceright
-keycode 56 = backslash bar brokenbar
-keycode 57 =
-keycode 58 = semicolon colon
-keycode 59 = quoteright quotedbl
-keycode 60 = quoteleft asciitilde
-keycode 61 = comma less
-keycode 62 = period greater
-keycode 63 = slash question
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
-keycode 107 =
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 = Control_R
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.vn b/gkb-new/xmodmap.sun/xmodmap.vn
deleted file mode 100644
index 0348222c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.vn
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam abreve Abreve
-keycode 38 = 2 at acircumflex Acircumflex
-keycode 39 = 3 numbersign ecircumflex Ecircumflex
-keycode 40 = 4 dollar ocircumflex Ocircumflex
-keycode 41 = 5 percent dead_grave percent
-keycode 42 = 6 asciicircum dead_hook asciicircum
-keycode 43 = 7 ampersand dead_tilde ampersand
-keycode 44 = 8 asterisk dead_acute asterisk
-keycode 45 = 9 parenleft dead_belowdot parenleft
-keycode 46 = 0 parenright dstroke Dstroke
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus equal plus
-keycode 49 = grave asciitilde grave asciitilde
-keycode 50 = BackSpace NoSymbol BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab Tab ISO_Left_Tab
-keycode 61 = q Q q Q
-keycode 62 = w W w W
-keycode 63 = e E e E
-keycode 64 = r R r R
-keycode 65 = t T t T
-keycode 66 = y Y y Y
-keycode 67 = u U u U
-keycode 68 = i I i I
-keycode 69 = o O o O
-keycode 70 = p P p P
-keycode 71 = bracketleft braceleft uhorn Uhorn
-keycode 72 = bracketright braceright ohorn Ohorn
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L NoSymbol Control_L
-keycode 84 = a A a A
-keycode 85 = s S s S
-keycode 86 = d D d D
-keycode 87 = f F f F
-keycode 88 = g G g G
-keycode 89 = h H h H
-keycode 90 = j J j J
-keycode 91 = k K k K
-keycode 92 = l L l L
-keycode 93 = semicolon colon semicolon colon
-keycode 94 = apostrophe quotedbl apostrophe quotedbl
-keycode 95 = backslash bar backslash bar
-keycode 96 = Return NoSymbol Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L NoSymbol Shift_L
-keycode 107 = z Z z Z
-keycode 108 = x X x X
-keycode 109 = c C c C
-keycode 110 = v V v V
-keycode 111 = b B b B
-keycode 112 = n N n N
-keycode 113 = m M m M
-keycode 114 = comma less comma less
-keycode 115 = period greater period greater
-keycode 116 = slash question slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L ISO_Next_Group
-keycode 127 = Meta_L
-keycode 128 = space NoSymbol space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap/Makefile.am b/gkb-new/xmodmap/Makefile.am
deleted file mode 100644
index e5b8b1ed..00000000
--- a/gkb-new/xmodmap/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-EXTRA_DIST = $(GKB_MAPS) $(xmm_xml_in_file)
-
-gkbmapsdir = $(datadir)/mate/xmodmap
-gkbmaps_DATA = $(GKB_MAPS) $(XMM_XML)
-
-GKB_MAPS = \
- xmodmap.am xmodmap.be xmodmap.bg xmodmap.br xmodmap.ch xmodmap.ch_de \
- xmodmap.ch_fr xmodmap.cz xmodmap.de xmodmap.de-apple xmodmap.dk \
- xmodmap.dvorak xmodmap.ee xmodmap.es xmodmap.fi xmodmap.fr \
- xmodmap.fr-2 xmodmap.gb xmodmap.gb-102 xmodmap.gb-105 xmodmap.ge_la \
- xmodmap.ge_ru xmodmap.gr xmodmap.hu xmodmap.hu-101-lat1 \
- xmodmap.hu-101-lat2 xmodmap.hu-ibm xmodmap.hu-lat1 \
- xmodmap.hu-sun-lat2 xmodmap.hu.old xmodmap.hu_latin1 xmodmap.il \
- xmodmap.il_phonetic xmodmap.is xmodmap.it xmodmap.jp xmodmap.la \
- xmodmap.lt xmodmap.lt_b xmodmap.lt_p xmodmap.nl xmodmap.no \
- xmodmap.pl xmodmap.pl2 xmodmap.pt xmodmap.pt-dead xmodmap.qc \
- xmodmap.qc-2 xmodmap.ru xmodmap.ru_yawerty xmodmap.se xmodmap.sf \
- xmodmap.sg xmodmap.si xmodmap.sk xmodmap.th xmodmap.tr_f \
- xmodmap.tr_q xmodmap.uk xmodmap.us xmodmap.us-101 xmodmap.us-84 \
- xmodmap.us-dec xmodmap.us-ibm xmodmap.us-int xmodmap.us-mac \
- xmodmap.us-sgi-101 xmodmap.us-sun xmodmap.us.old xmodmap.us_intl \
- xmodmap.yu xmodmap.ro xmodmap.mk xmodmap.ru-rev xmodmap.es_x86 \
- xmodmap.fr_x86 xmodmap.uk_x86 xmodmap.us101A_x86 xmodmap.hu_x86 \
- xmodmap.ar xmodmap.kr xmodmap.mn-rev xmodmap.mn xmodmap.mn-phonet \
- xmodmap.mn-uni
-
-xmm_xml_in_file = base.xml.in
-XMM_XML = $(xmm_xml_in_file:.xml.in=.xml)
-
-%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
- $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u \
- -c $(top_srcdir)/po/.intltool-merge-cache
-
-CLEANFILES = base.xml
-
--include $(top_srcdir)/git.mk
diff --git a/gkb-new/xmodmap/base.xml.in b/gkb-new/xmodmap/base.xml.in
deleted file mode 100644
index 983b0927..00000000
--- a/gkb-new/xmodmap/base.xml.in
+++ /dev/null
@@ -1,677 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
-<xkbConfigRegistry>
- <modelList>
- <model>
- <configItem>
- <name>generic</name>
- <_description>Generic Keyboard</_description>
- </configItem>
- </model>
- </modelList>
- <layoutList>
- <layout>
- <configItem>
- <name>ar</name>
- <_shortDescription>Arabic keymap</_shortDescription>
- <_description>Arabic keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>am</name>
- <_shortDescription>Armenian</_shortDescription>
- <_description>Armenian</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>es</name>
- <_shortDescription>Basque</_shortDescription>
- <_description>Basque</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>be</name>
- <_shortDescription>Belgian</_shortDescription>
- <_description>Belgian</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>bg</name>
- <_shortDescription>Bulgarian keymap</_shortDescription>
- <_description>Bulgarian keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>br</name>
- <_shortDescription>Brazil Portuguese keymap</_shortDescription>
- <_description>Brazil Portuguese keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>ru_yawerty</name>
- <_shortDescription>Bulgarian Cyrillic</_shortDescription>
- <_description>Bulgarian Cyrillic</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>ch</name>
- <_shortDescription>Swiss keymap</_shortDescription>
- <_description>Swiss keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>cz</name>
- <_shortDescription>Czech keymap</_shortDescription>
- <_description>Czech keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>de</name>
- <_shortDescription>German keymap</_shortDescription>
- <_description>German keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>dk</name>
- <_shortDescription>Danish keymap</_shortDescription>
- <_description>Danish keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>ee</name>
- <_shortDescription>Estonian keymap</_shortDescription>
- <_description>Estonian keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>es</name>
- <_shortDescription>Spanish keymap</_shortDescription>
- <_description>Spanish keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>fi</name>
- <_shortDescription>Finnish keymap</_shortDescription>
- <_description>Finnish keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>sf</name>
- <_shortDescription>French Swiss</_shortDescription>
- <_description>French Swiss</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>qc-2</name>
- <_shortDescription>French-Canadian 105-key</_shortDescription>
- <_description>French-Canadian 105-key</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>sf</name>
- <_shortDescription>French Swiss keymap</_shortDescription>
- <_description>French Swiss keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>fr</name>
- <_shortDescription>French keymap</_shortDescription>
- <_description>French keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>gb-102</name>
- <_shortDescription>GB 102-key</_shortDescription>
- <_description>GB 102-key</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>gb</name>
- <_shortDescription>English keymap</_shortDescription>
- <_description>English keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>gb-105</name>
- <_shortDescription>GB 105-key</_shortDescription>
- <_description>GB 105-key</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>ge</name>
- <_shortDescription>Georgian keymap</_shortDescription>
- <_description>Georgian keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>ge_la</name>
- <_shortDescription>Georgian Latin</_shortDescription>
- <_description>Georgian Latin</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>ge_ru</name>
- <_shortDescription>Georgian Russian layout</_shortDescription>
- <_description>Georgian Russian layout</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>sg</name>
- <_shortDescription>German</_shortDescription>
- <_description>German</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>sg</name>
- <_shortDescription>German Swiss with Euro</_shortDescription>
- <_description>German Swiss with Euro</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>gr</name>
- <_shortDescription>Greek keymap</_shortDescription>
- <_description>Greek keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>hu-101-lat1</name>
- <_shortDescription>Hungarian 101-key latin 1</_shortDescription>
- <_description>Hungarian 101-key latin 1</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>hu-lat1</name>
- <_shortDescription>Hungarian latin1</_shortDescription>
- <_description>Hungarian latin1</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>hu-101-lat2</name>
- <_shortDescription>Hungarian 101-key latin 2</_shortDescription>
- <_description>Hungarian 101-key latin 2</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>hu</name>
- <_shortDescription>Hungarian 105-key latin 2</_shortDescription>
- <_description>Hungarian 105-key latin 2</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>hu-lat1</name>
- <_shortDescription>Hungarian 105-key latin 1</_shortDescription>
- <_description>Hungarian 105-key latin 1</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>hu-sun-lat2</name>
- <_shortDescription>Sun (!not PC!) type5 Hungarian latin 2</_shortDescription>
- <_description>Sun (!not PC!) type5 Hungarian latin 2</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>hu_x86</name>
- <_shortDescription>Hungarian PC/AT 101 keyboard</_shortDescription>
- <_description>Hungarian PC/AT 101 keyboard</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>il</name>
- <_shortDescription>Hebrew keymap</_shortDescription>
- <_description>Hebrew keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>is</name>
- <_shortDescription>Icelandic keymap</_shortDescription>
- <_description>Icelandic keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>it</name>
- <_shortDescription>Italian keymap</_shortDescription>
- <_description>Italian keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>jp</name>
- <_shortDescription>Japanese keymap</_shortDescription>
- <_description>Japanese keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>la</name>
- <_shortDescription>Lao keymap</_shortDescription>
- <_description>Lao keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>lt</name>
- <_shortDescription>Lithuanian keymap</_shortDescription>
- <_description>Lithuanian keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>mk</name>
- <_shortDescription>Macedonian</_shortDescription>
- <_description>Macedonian</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>nl</name>
- <_shortDescription>Dutch keymap</_shortDescription>
- <_description>Dutch keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>no</name>
- <_shortDescription>Norwegian</_shortDescription>
- <_description>Norwegian</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>pl2</name>
- <_shortDescription>Polish deadkeys</_shortDescription>
- <_description>Polish deadkeys</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>pl</name>
- <_shortDescription>Polish</_shortDescription>
- <_description>Polish</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>pt-dead</name>
- <_shortDescription>Portugal Deadkeys</_shortDescription>
- <_description>Portugal Deadkeys</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>pt</name>
- <_shortDescription>Portugal</_shortDescription>
- <_description>Portugal</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>pt</name>
- <_shortDescription>Portuguese keymap</_shortDescription>
- <_description>Portuguese keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>ru</name>
- <_shortDescription>Russian keymap</_shortDescription>
- <_description>Russian keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>ru-rev</name>
- <_shortDescription>Plain Russian keymap</_shortDescription>
- <_description>Plain Russian keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>ru</name>
- <_shortDescription>Russian Cyrillic</_shortDescription>
- <_description>Russian Cyrillic</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>se</name>
- <_shortDescription>Swedish keymap</_shortDescription>
- <_description>Swedish keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>si</name>
- <_shortDescription>Slovenian keymap</_shortDescription>
- <_description>Slovenian keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>sk</name>
- <_shortDescription>Slovak keymap</_shortDescription>
- <_description>Slovak keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>si</name>
- <_shortDescription>Slovenian</_shortDescription>
- <_description>Slovenian</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>se</name>
- <_shortDescription>Swedish</_shortDescription>
- <_description>Swedish</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>th2</name>
- <_shortDescription>Thai</_shortDescription>
- <_description>Thai</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>th</name>
- <_shortDescription>Thai Kedmanee</_shortDescription>
- <_description>Thai Kedmanee</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>th</name>
- <_shortDescription>Thai keymap</_shortDescription>
- <_description>Thai keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>tr_f</name>
- <_shortDescription>Turkish "F" keyboard</_shortDescription>
- <_description>Turkish "F" keyboard</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>tr_q</name>
- <_shortDescription>Turkish "Q" keyboard</_shortDescription>
- <_description>Turkish "Q" keyboard</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>tr</name>
- <_shortDescription>Turkish keymap</_shortDescription>
- <_description>Turkish keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>uk</name>
- <_shortDescription>UK 105-key</_shortDescription>
- <_description>UK 105-key</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>uk_x86</name>
- <_shortDescription>UK PC/AT keyboard</_shortDescription>
- <_description>UK PC/AT keyboard</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>us101A_x86</name>
- <_shortDescription>US PC/AT 101 keyboard</_shortDescription>
- <_description>US PC/AT 101 keyboard</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>us-101</name>
- <_shortDescription>US 101-key keyboard</_shortDescription>
- <_description>US 101-key keyboard</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>us-84</name>
- <_shortDescription>US 84-key</_shortDescription>
- <_description>US 84-key</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>us-dec</name>
- <_shortDescription>US DEC 450</_shortDescription>
- <_description>US DEC 450</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>us-ibm</name>
- <_shortDescription>US IBM RS/6000</_shortDescription>
- <_description>US IBM RS/6000</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>us-int</name>
- <_shortDescription>US International</_shortDescription>
- <_description>US International</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>us</name>
- <_shortDescription>US 105-key keyboard (with windows keys)</_shortDescription>
- <_description>US 105-key keyboard (with windows keys)</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>us-mac</name>
- <_shortDescription>US Macintosh</_shortDescription>
- <_description>US Macintosh</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>us-sgi-101</name>
- <_shortDescription>US Silicon Graphics 101-key</_shortDescription>
- <_description>US Silicon Graphics 101-key</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>us-sun</name>
- <_shortDescription>US Sun type5</_shortDescription>
- <_description>US Sun type5</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>yu</name>
- <_shortDescription>Serbian keymap</_shortDescription>
- <_description>Serbian keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>yu</name>
- <_shortDescription>Serbian keymap</_shortDescription>
- <_description>Serbian keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>mn</name>
- <_shortDescription>Mongolian alt keymap</_shortDescription>
- <_description>Mongolian alt keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>mn-phone</name>
- <_shortDescription>Mongolian phonetic keymap</_shortDescription>
- <_description>Mongolian phonetic keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name>mn-rev</name>
- <_shortDescription>Mongolian keymap</_shortDescription>
- <_description>Mongolian keymap</_description>
- </configItem>
- </layout>
- </layoutList>
- <optionList>
- <group allowMultipleSelection="false">
- <configItem>
- <name>grp</name>
- <_description>Layout shift behavior</_description>
- </configItem>
- <option>
- <configItem>
- <name>grp:ralt_toggle</name>
- <_description>Right Alt key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:lalt_toggle</name>
- <_description>Left Alt key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:caps_toggle</name>
- <_description>CapsLock key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:shift_caps_toggle</name>
- <_description>Shift+CapsLock changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:shifts_toggle</name>
- <_description>Both Shift keys together change layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:alts_toggle</name>
- <_description>Both Alt keys together change layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:ctrls_toggle</name>
- <_description>Both Ctrl keys together change layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:ctrl_shift_toggle</name>
- <_description>Control+Shift changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:ctrl_alt_toggle</name>
- <_description>Alt+Control changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:alt_shift_toggle</name>
- <_description>Alt+Shift changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:menu_toggle</name>
- <_description>Menu key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:lwin_toggle</name>
- <_description>Left Win-key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:rwin_toggle</name>
- <_description>Right Win-key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:lshift_toggle</name>
- <_description>Left Shift key changes group.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:rshift_toggle</name>
- <_description>Right Shift key changes group.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:lctrl_toggle</name>
- <_description>Left Ctrl key changes group.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:rctrl_toggle</name>
- <_description>Right Ctrl key changes group.</_description>
- </configItem>
- </option>
- </group>
- </optionList>
-</xkbConfigRegistry>
diff --git a/gkb-new/xmodmap/xmodmap.am b/gkb-new/xmodmap/xmodmap.am
deleted file mode 100644
index 6f0b61cb..00000000
--- a/gkb-new/xmodmap/xmodmap.am
+++ /dev/null
@@ -1,117 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] Mon Nov 22 22:45:08 CET 1999
-clear Mod1
-clear Mod2
-clear Lock
-clear Control
-! Armenian keyboard by Pablo Saratxaga <[email protected]>
-! layout info from: http://moon.yerphi.am/~hovik/Armenian/Tables.html
-! Armenian mode is toggled by
-! Right_Ctrl key and shifted by AltGr key.
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 exclam 0xd7 0xd6
-keycode 11 = 2 at 0xe7 0xe6
-keycode 12 = 3 numbersign 0xc5 0xc4
-keycode 13 = 4 dollar 0xd3 0xd2
-keycode 14 = 5 percent 0xdb 0xda
-keycode 15 = 6 asciicircum 0xe9 0xe8
-keycode 16 = 7 ampersand 0xf1 0xf0
-keycode 17 = 8 asterisk 0xf3 0xf2
-keycode 18 = 9 parenleft 0xbf 0xbe
-keycode 19 = 0 parenright 0xd5 0xd4
-keycode 20 = minus underscore 0xac 0xa8
-keycode 21 = equal plus 0xa5 0xa4
-keycode 22 = BackSpace BackSpace BackSpace BackSpace
-keycode 23 = Tab Tab Tab Tab
-keycode 24 = q Q 0xf7 0xf6
-keycode 25 = w W 0xb5 0xb4
-keycode 26 = e E 0xeb 0xea
-keycode 27 = r R 0xd9 0xd8
-keycode 28 = t T 0xe1 0xe0
-keycode 29 = y Y 0xf5 0xf4
-keycode 30 = u U 0xcf 0xce
-keycode 31 = i I 0xc1 0xc0
-keycode 32 = o O 0xc3 0xc2
-keycode 33 = p P 0xcd 0xcc
-keycode 34 = bracketleft braceleft 0xfb 0xfa
-keycode 35 = bracketright braceright 0xfd 0xfc
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A 0xed 0xec
-keycode 39 = s S 0xb7 0xb6
-keycode 40 = d D 0xbb 0xba
-keycode 41 = f F 0xb3 0xb2
-keycode 42 = g G 0xdd 0xdc
-keycode 43 = h H 0xc7 0xc6
-keycode 44 = j J 0xef 0xee
-keycode 45 = k K 0xd1 0xd0
-keycode 46 = l L 0xe5 0xe4
-keycode 47 = semicolon colon 0xa3 0xad
-keycode 48 = apostrophe quotedbl 0xb0 0xfe
-keycode 49 = grave asciitilde 0xaa 0xaf
-keycode 50 = Shift_L
-keycode 51 = backslash bar 0xae 0xa2
-keycode 52 = z Z 0xb9 0xb8
-keycode 53 = x X 0xe3 0xe2
-keycode 54 = c C 0xbd 0xbc
-keycode 55 = v V 0xc9 0xc8
-keycode 56 = b B 0xf9 0xf8
-keycode 57 = n N 0xcb 0xca
-keycode 58 = m M 0xdf 0xde
-keycode 59 = comma less 0xab 0xa7
-keycode 60 = period greater 0xa9 0xa6
-keycode 61 = slash question 0xb1 0xa1
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11 F1 F11
-keycode 68 = F2 F12 F2 F12
-keycode 69 = F3 F13 F3 F13
-keycode 70 = F4 F14 F4 F14
-keycode 71 = F5 F15 F5 F15
-keycode 72 = F6 F16 F6 F16
-keycode 73 = F7 F17 F7 F17
-keycode 74 = F8 F18 F8 F18
-keycode 75 = F9 F19 F9 F19
-keycode 76 = F10 F20 F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater 0xaa 0xaf
-keycode 95 = F11 F11 F11 F11
-keycode 96 = F12 F12 F12 F12
-keycode 108 = KP_Enter
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! left windows key
-! right windows key
-keycode 116 = Mode_switch
-! menu key (on windows keyboars)
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-add Lock = Control_R
-add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.ar b/gkb-new/xmodmap/xmodmap.ar
deleted file mode 100644
index 7e62f0a0..00000000
--- a/gkb-new/xmodmap/xmodmap.ar
+++ /dev/null
@@ -1,125 +0,0 @@
-! Arabic Keyboard
-! contributed by: Isam Bayazidi <[email protected]>
-!
-!
-!clear Mod1
-!clear Mod2
-!clear Lock
-!clear Control
-!charset "iso-8859-6"
-keycode 9 = Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 at
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar
-keycode 14 = 5 percent
-keycode 15 = 6 asciicircum
-keycode 16 = 7 ampersand
-keycode 17 = 8 asterisk
-keycode 18 = 9 parenleft
-keycode 19 = 0 parenright
-keycode 20 = minus underscore
-keycode 21 = equal plus
-keycode 22 = BackSpace BackSpace
-keycode 23 = Tab Tab
-keycode 24 = Arabic_dad Arabic_fatha
-keycode 25 = Arabic_sad Arabic_fathatan
-keycode 26 = Arabic_theh Arabic_damma
-keycode 27 = Arabic_qaf Arabic_dammatan
-keycode 28 = Arabic_feh UFEF9
-keycode 29 = Arabic_ghain Arabic_hamzaunderalef
-keycode 30 = Arabic_ain grave
-keycode 31 = Arabic_ha division
-keycode 32 = Arabic_khah multiply
-keycode 33 = Arabic_hah Arabic_semicolon
-keycode 34 = Arabic_jeem braceleft
-keycode 35 = Arabic_dal braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = Arabic_sheen backslash
-keycode 39 = Arabic_seen S
-keycode 40 = Arabic_yeh bracketleft
-keycode 41 = Arabic_beh bracketright
-keycode 42 = Arabic_lam UFEF7
-keycode 43 = Arabic_alef Arabic_hamzaonalef
-keycode 44 = Arabic_teh Arabic_tatweel
-keycode 45 = Arabic_noon Arabic_comma
-keycode 46 = Arabic_meem slash
-keycode 47 = Arabic_kaf colon
-keycode 48 = Arabic_tah quotedbl
-keycode 49 = Arabic_thal Arabic_shadda
-keycode 50 = Shift_L
-keycode 51 = less greater
-keycode 52 = Arabic_hamzaonyeh asciitilde
-keycode 53 = Arabic_hamza Arabic_sukun
-keycode 54 = Arabic_hamzaonwaw Arabic_kasra
-keycode 55 = Arabic_ra Arabic_kasratan
-keycode 56 = UFEFB UFEF5
-keycode 57 = Arabic_alefmaksura Arabic_maddaonalef
-keycode 58 = Arabic_tehmarbuta apostrophe
-keycode 59 = Arabic_waw comma
-keycode 60 = Arabic_zain period
-keycode 61 = Arabic_zah Arabic_question_mark
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock Pointer_EnableKeys
-keycode 78 = Scroll_Lock
-keycode 79 = KP_Home KP_7
-keycode 80 = KP_Up KP_8
-keycode 81 = KP_Prior KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_Left KP_4
-keycode 84 = KP_Begin KP_5
-keycode 85 = KP_Right KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_End KP_1
-keycode 88 = KP_Down KP_2
-keycode 89 = KP_Next KP_3
-keycode 90 = KP_Insert KP_0
-keycode 91 = KP_Delete KP_Decimal
-keycode 92 = Print Sys_Req
-keycode 93 =
-keycode 94 = NoSymbol NoSymbol bar brokenbar
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 101 =
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause Break
-keycode 111 = Print Sys_Req
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch Multi_key
-keycode 114 = Pause Break
-!
-! left windows key
-! right windows key
-keycode 116 = Mode_switch
-! menu key (on windows keyboars)
-keycode 117 = Multi_key
-!add Mod1 = Alt_L
-!add Mod2 = Mode_switch Control_R
-!add Lock = Control_R
-!add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.be b/gkb-new/xmodmap/xmodmap.be
deleted file mode 100644
index 236e3ee9..00000000
--- a/gkb-new/xmodmap/xmodmap.be
+++ /dev/null
@@ -1,120 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] Tue Nov 12 01:39:34 MET 1996
-clear Mod1
-clear Mod2
-!
-keycode 8 =
-keycode 9 = Escape
-keycode 10 = ampersand 1 bar
-keycode 11 = eacute 2 at
-keycode 12 = quotedbl 3 numbersign
-keycode 13 = apostrophe 4 braceleft
-keycode 14 = parenleft 5
-keycode 15 = asciicircum 6 asciicircum
-keycode 16 = egrave 7
-keycode 17 = exclam 8
-keycode 18 = ccedilla 9 braceleft
-keycode 19 = agrave 0 braceright
-keycode 20 = parenright degree
-keycode 21 = minus underscore
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = a
-keycode 25 = z
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = dead_circumflex dead_diaeresis bracketleft
-keycode 35 = dollar asterisk bracketright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = q
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = m
-keycode 48 = ugrave percent dead_acute
-keycode 49 = twosuperior threesuperior
-keycode 50 = Shift_L
-keycode 51 = mu sterling dead_grave
-keycode 52 = w
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = comma question dead_cedilla
-keycode 59 = semicolon period
-keycode 60 = colon slash Multi_key
-keycode 61 = equal plus dead_tilde
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 92 = 0x1007ff00
-keycode 93 =
-keycode 94 = less greater backslash
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 101 = Begin
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause
-keycode 111 = Print
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.bg b/gkb-new/xmodmap/xmodmap.bg
deleted file mode 100644
index be6889d0..00000000
--- a/gkb-new/xmodmap/xmodmap.bg
+++ /dev/null
@@ -1,120 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:11:58 CET 1998
-clear Mod1
-clear Mod2
-clear Lock
-clear Control
-! Bulgarian Cyrillic keyboard.map. "Cyrillic" mode is toggled by
-! Right_Ctrl key and shifted by AltGr key. Eugene Crosser's `ru.map'
-! was used as a template. Note that this is a "phonetic" keyboard,
-! not a `BDS' one! --L.Georgiev
-!
-! Changed from hexa values to keysysms -- Pablo Saratxaga
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 exclam 1 exclam
-keycode 11 = 2 at 2 at
-keycode 12 = 3 numbersign 3 numbersign
-keycode 13 = 4 dollar 4 dollar
-keycode 14 = 5 percent 5 percent
-keycode 15 = 6 asciicircum 6 asciicircum
-keycode 16 = 7 ampersand 7 ampersand
-keycode 17 = 8 asterisk 8 asterisk
-keycode 18 = 9 parenleft 9 parenleft
-keycode 19 = 0 parenright 0 parenright
-keycode 20 = minus underscore minus underscore
-keycode 21 = Cyrillic_yu Cyrillic_YU
-keycode 22 = BackSpace Delete BackSpace Delete
-keycode 23 = Tab Tab Tab Tab
-keycode 24 = Cyrillic_ya Cyrillic_YA
-keycode 25 = Cyrillic_ve Cyrillic_VE
-keycode 26 = Cyrillic_ie Cyrillic_IE
-keycode 27 = Cyrillic_er Cyrillic_ER
-keycode 28 = Cyrillic_te Cyrillic_TE
-keycode 29 = Cyrillic_hardsign Cyrillic_HARDSIGN
-keycode 30 = Cyrillic_u Cyrillic_U
-keycode 31 = Cyrillic_i Cyrillic_I
-keycode 32 = Cyrillic_o Cyrillic_O
-keycode 33 = Cyrillic_pe Cyrillic_PE
-keycode 34 = bracketleft braceleft Cyrillic_sha Cyrillic_SHA
-keycode 35 = bracketright braceright Cyrillic_shcha Cyrillic_SHCHA
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = Cyrillic_a Cyrillic_A
-keycode 39 = Cyrillic_es Cyrillic_ES
-keycode 40 = Cyrillic_de Cyrillic_DE
-keycode 41 = Cyrillic_ef Cyrillic_EF
-keycode 42 = Cyrillic_ghe Cyrillic_GHE
-keycode 43 = Cyrillic_ha Cyrillic_HA
-keycode 44 = Cyrillic_shorti Cyrillic_SHORTI
-keycode 45 = Cyrillic_ka Cyrillic_KA
-keycode 46 = Cyrillic_el Cyrillic_EL
-keycode 47 = semicolon colon semicolon colon
-keycode 48 = apostrophe quotedbl apostrophe quotedbl
-keycode 49 = Cyrillic_che Cyrillic_CHE
-keycode 50 = Shift_L
-keycode 51 = backslash bar backslash bar
-keycode 52 = Cyrillic_ze Cyrillic_ZE
-keycode 53 = Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 54 = Cyrillic_tse Cyrillic_TSE
-keycode 55 = Cyrillic_zhe Cyrillic_ZHE
-keycode 56 = Cyrillic_be Cyrillic_BE
-keycode 57 = Cyrillic_en Cyrillic_EN
-keycode 58 = Cyrillic_em Cyrillic_EM
-keycode 59 = comma less comma less
-keycode 60 = period greater period greater
-keycode 61 = slash question slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11 F1 F11
-keycode 68 = F2 F12 F2 F12
-keycode 69 = F3 F13 F3 F13
-keycode 70 = F4 F14 F4 F14
-keycode 71 = F5 F15 F5 F15
-keycode 72 = F6 F16 F6 F16
-keycode 73 = F7 F17 F7 F17
-keycode 74 = F8 F18 F8 F18
-keycode 75 = F9 F19 F9 F19
-keycode 76 = F10 F20 F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater
-keycode 95 = F11 F11 F11 F11
-keycode 96 = F12 F12 F12 F12
-keycode 108 = KP_Enter
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-add Lock = Control_R
-add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.br b/gkb-new/xmodmap/xmodmap.br
deleted file mode 100644
index 5265511b..00000000
--- a/gkb-new/xmodmap/xmodmap.br
+++ /dev/null
@@ -1,116 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] Mon Nov 22 18:06:16 CET 1999
-clear Mod1
-clear Mod2
-! br-abnt2.kmap
-! Mapa para teclados ABNT2
-! Antonio Dias <[email protected]>
-!
-! (slightly adapted, aeb)
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 at at
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar dollar
-keycode 14 = 5 percent
-keycode 15 = 6 asciicircum
-keycode 16 = 7 ampersand braceleft
-keycode 17 = 8 asterisk bracketleft
-keycode 18 = 9 parenleft bracketright
-keycode 19 = 0 parenright braceright
-keycode 20 = minus underscore backslash
-keycode 21 = equal plus
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = dead_acute dead_grave
-keycode 35 = bracketleft braceleft ordfeminine
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = ccedilla Ccedilla
-keycode 48 = dead_tilde dead_circumflex
-keycode 49 = apostrophe quotedbl
-keycode 50 = Shift_L
-keycode 51 = bracketright braceright masculine
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma less
-keycode 60 = period greater Multi_key
-keycode 61 = semicolon colon
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = backslash bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.ch b/gkb-new/xmodmap/xmodmap.ch
deleted file mode 100644
index 1331a048..00000000
--- a/gkb-new/xmodmap/xmodmap.ch
+++ /dev/null
@@ -1,114 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:11:59 CET 1998
-clear Mod1
-clear Mod2
-! Swiss keyboard
-!charset "iso-8859-1"
-keycode 9 = Escape Escape
-keycode 10 = 1 plus bar
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 asterisk numbersign
-keycode 13 = 4 ccedilla
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand notsign
-keycode 16 = 7 slash bar
-keycode 17 = 8 parenleft cent
-keycode 18 = 9 parenright
-keycode 19 = 0 equal
-keycode 20 = apostrophe question dead_acute
-keycode 21 = dead_circumflex dead_grave dead_tilde
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E EuroSign
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = udiaeresis egrave bracketleft
-keycode 35 = dead_diaeresis exclam bracketright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = odiaeresis eacute
-keycode 48 = adiaeresis agrave braceleft
-keycode 49 = section degree
-keycode 50 = Shift_L
-keycode 51 = dollar sterling braceright
-keycode 52 = y
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater backslash
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-!
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.ch_de b/gkb-new/xmodmap/xmodmap.ch_de
deleted file mode 100644
index e47b755c..00000000
--- a/gkb-new/xmodmap/xmodmap.ch_de
+++ /dev/null
@@ -1,113 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] jue ago 27 23:12:26 CEST 1998
-clear Mod1
-clear Mod2
-! German Swiz
-keycode 9 = Escape Escape
-keycode 10 = 1 plus bar
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 asterisk numbersign
-keycode 13 = 4 ccedilla
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand notsign
-keycode 16 = 7 slash bar
-keycode 17 = 8 parenleft cent
-keycode 18 = 9 parenright
-keycode 19 = 0 equal
-keycode 20 = apostrophe question dead_acute
-keycode 21 = dead_circumflex dead_grave dead_tilde
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = udiaeresis egrave bracketleft
-keycode 35 = dead_diaeresis exclam bracketright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = odiaeresis eacute
-keycode 48 = adiaeresis agrave braceleft
-keycode 49 = section degree
-keycode 50 = Shift_L
-keycode 51 = dollar sterling braceright
-keycode 52 = y
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = less greater backslash
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.ch_fr b/gkb-new/xmodmap/xmodmap.ch_fr
deleted file mode 100644
index 9a924675..00000000
--- a/gkb-new/xmodmap/xmodmap.ch_fr
+++ /dev/null
@@ -1,113 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] Tue Jun 30 02:16:04 CEST 1998
-clear Mod1
-clear Mod2
-! French Swiz
-keycode 9 = Escape Escape
-keycode 10 = 1 plus bar
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 asterisk numbersign
-keycode 13 = 4 ccedilla
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand notsign
-keycode 16 = 7 slash bar
-keycode 17 = 8 parenleft cent
-keycode 18 = 9 parenright
-keycode 19 = 0 equal
-keycode 20 = apostrophe question dead_acute
-keycode 21 = dead_circumflex dead_grave dead_tilde
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = egrave udiaeresis bracketleft
-keycode 35 = dead_diaeresis exclam bracketright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = eacute odiaeresis
-keycode 48 = agrave adiaeresis braceleft
-keycode 49 = section degree
-keycode 50 = Shift_L
-keycode 51 = dollar sterling braceright
-keycode 52 = y
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = less greater backslash
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.cz b/gkb-new/xmodmap/xmodmap.cz
deleted file mode 100644
index 785dd048..00000000
--- a/gkb-new/xmodmap/xmodmap.cz
+++ /dev/null
@@ -1,119 +0,0 @@
-! Czech keyboard map.
-!
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:00 CET 1998
-!
-! made some little corrections -- Pablo Saratxaga <[email protected]>
-!
-clear Mod1
-clear Mod2
-! Czek keyboard
-!charset "iso-8859-2"
-keycode 9 = Escape Escape
-keycode 10 = plus 1 asciitilde
-keycode 11 = ecaron 2 dead_caron
-keycode 12 = scaron 3 asciicircum
-keycode 13 = ccaron 4 dead_breve
-keycode 14 = rcaron 5 degree
-keycode 15 = zcaron 6 dead_ogonek
-keycode 16 = yacute 7 dead_grave
-keycode 17 = aacute 8 dead_abovedot
-keycode 18 = iacute 9 dead_acute
-keycode 19 = eacute 0 dead_doubleacute
-keycode 20 = equal percent dead_diaeresis
-keycode 21 = dead_acute dead_caron dead_cedilla
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q Q backslash
-keycode 25 = w W bar
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = uacute slash division
-keycode 35 = parenright parenleft
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s S dstroke Dstroke
-keycode 40 = d D Dstroke dstroke
-keycode 41 = f F bracketleft
-keycode 42 = g G bracketright
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k K lstroke Lstroke
-keycode 46 = l L Lstroke lstroke
-keycode 47 = uring quotedbl dollar
-keycode 48 = section exclam ssharp
-keycode 49 = semicolon degree
-keycode 50 = Shift_L
-keycode 51 = dead_diaeresis dead_acute currency
-keycode 52 = y Y greater
-keycode 53 = x X numbersign
-keycode 54 = c
-keycode 55 = v V at
-keycode 56 = b B braceleft
-keycode 57 = n N braceright
-keycode 58 = m
-keycode 59 = comma question
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = ampersand asterisk less
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-!
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.de b/gkb-new/xmodmap/xmodmap.de
deleted file mode 100644
index e9fd02a6..00000000
--- a/gkb-new/xmodmap/xmodmap.de
+++ /dev/null
@@ -1,115 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:00 CET 1998
-clear Mod1
-clear Mod2
-! de-latin1.map: German keymap
-! Some changes due to Olaf Flebbe ([email protected])
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 quotedbl twosuperior
-keycode 12 = 3 section threesuperior
-keycode 13 = 4 dollar dollar
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand
-keycode 16 = 7 slash braceleft
-keycode 17 = 8 parenleft bracketleft
-keycode 18 = 9 parenright bracketright
-keycode 19 = 0 equal braceright
-keycode 20 = ssharp question backslash
-keycode 21 = dead_acute dead_grave
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q Q at
-keycode 25 = w
-keycode 26 = e
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = udiaeresis Udiaeresis
-keycode 35 = plus asterisk dead_tilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = odiaeresis Odiaeresis
-keycode 48 = adiaeresis Adiaeresis
-keycode 49 = dead_circumflex degree
-keycode 50 = Shift_L
-keycode 51 = numbersign apostrophe
-keycode 52 = y
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-!
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.de-apple b/gkb-new/xmodmap/xmodmap.de-apple
deleted file mode 100644
index 3064420d..00000000
--- a/gkb-new/xmodmap/xmodmap.de-apple
+++ /dev/null
@@ -1,163 +0,0 @@
-!
-! This is an `xmodmap' input file for Apple Extended II (MkLinux; German) keyboards.
-! Automatically generated on Mon Oct 19 17:28:33 1998 by root with
-! XKeyCaps 2.37; Copyright (c) 1997 Jamie Zawinski <[email protected]>.
-! http://home.netscape.com/people/jwz/xkeycaps/
-!
-! Edited by Bernard Piller <[email protected]>
-! http://www.bmpsystems.com
-!
-! This file makes the following changes:
-!
-! The "Syst.Anfr. F14" key generates Scroll_Lock, and the Mod5 modifier
-! The "Pause F15" key generates Pause
-! The "" 2" key generates 2 and quotedbl
-! The "� 3" key generates 3 and at
-! The "& 6" key generates 6 and ampersand
-! The "/ 7" key generates 7 and slash
-! The "( 8" key generates 8 and parenleft
-! The ") 9" key generates 9 and parenright
-! The "= 0" key generates 0 and equal
-! The "? �" key generates asciitilde and question
-! The "` '" key generates apostrophe and grave
-! The "NumLock" key generates Num_Lock, and the Mod4 modifier
-! The "Z" key generates z
-! The "�" key generates bar and backslash
-! The "* +" key generates plus and asterisk
-! The "�" key generates braceleft and bracketleft
-! The "� '" key generates braceright and bracketright
-! The "' #" key generates numbersign and asciicircum
-! The "> <" key generates less and greater
-! The "Y" key generates y
-! The "; ," key generates comma and semicolon
-! The ": ." key generates period and colon
-! The "_ -" key generates minus and underscore
-! The "Shift" key generates Shift_L, and has no modifiers
-! The "Ctrl" key generates Shift_R, and the Shift/Control modifiers
-! The "alt" key generates Mode_switch, and the Mod2 modifier
-! The "%" key generates Meta_L, and has no modifiers
-! The "%" key generates Meta_L, and has no modifiers
-! The "alt gr" key generates Mode_switch
-! The "Ctrl" key generates Shift_R, and has no modifiers
-
-keycode 0x3D = Escape
-keycode 0x82 = F1
-keycode 0x80 = F2
-keycode 0x6B = F3
-keycode 0x7E = F4
-keycode 0x68 = F5
-keycode 0x69 = F6
-keycode 0x6A = F7
-keycode 0x6C = F8
-keycode 0x6D = F9
-keycode 0x75 = F10
-keycode 0x6F = F11
-keycode 0x77 = F12
-keycode 0x71 = F1
-keycode 0x73 = Scroll_Lock
-keycode 0x79 = Pause
-keycode 0x12 = NoSymbol
-keycode 0x1A = 1 exclam
-keycode 0x1B = 2 quotedbl
-keycode 0x1C = 3 at
-keycode 0x1D = 4 dollar
-keycode 0x1F = 5 percent
-keycode 0x1E = 6 ampersand
-keycode 0x22 = 7 slash
-keycode 0x24 = 8 parenleft
-keycode 0x21 = 9 parenright
-keycode 0x25 = 0 equal
-keycode 0x23 = asciitilde question
-keycode 0x20 = apostrophe grave
-keycode 0x3B = BackSpace
-keycode 0x7A = Insert
-keycode 0x7B = Home
-keycode 0x7C = Prior
-keycode 0x4F = Num_Lock
-keycode 0x59 = KP_Equal
-keycode 0x53 = KP_Divide
-keycode 0x4B = KP_Multiply
-keycode 0x38 = Tab
-keycode 0x14 = q
-keycode 0x15 = w
-keycode 0x16 = e
-keycode 0x17 = r
-keycode 0x19 = t
-keycode 0x18 = z
-keycode 0x28 = u
-keycode 0x2A = i
-keycode 0x27 = o
-keycode 0x2B = p
-keycode 0x29 = bar backslash
-keycode 0x26 = plus asterisk
-keycode 0x2C = Return
-keycode 0x7D = Delete
-keycode 0x7F = End
-keycode 0x81 = Next
-keycode 0x61 = KP_7
-keycode 0x63 = KP_8
-keycode 0x64 = KP_9
-keycode 0x56 = KP_Subtract
-keycode 0x41 = Caps_Lock
-keycode 0x08 = a
-keycode 0x09 = s
-keycode 0x0A = d
-keycode 0x0B = f
-keycode 0x0D = g
-keycode 0x0C = h
-keycode 0x2E = j
-keycode 0x30 = k
-keycode 0x2D = l
-keycode 0x31 = braceleft bracketleft
-keycode 0x2F = braceright bracketright
-keycode 0x32 = numbersign asciicircum
-keycode 0x5E = KP_4
-keycode 0x5F = KP_5
-keycode 0x60 = KP_6
-keycode 0x4D = KP_Add
-keycode 0x40 = Shift_L
-keycode 0x3A = less greater
-keycode 0x0E = y
-keycode 0x0F = x
-keycode 0x10 = c
-keycode 0x11 = v
-keycode 0x13 = b
-keycode 0x35 = n
-keycode 0x36 = m
-keycode 0x33 = comma semicolon
-keycode 0x37 = period colon
-keycode 0x34 = minus underscore
-keycode 0x40 = Shift_L
-keycode 0x46 = Up
-keycode 0x5B = KP_1
-keycode 0x5C = KP_2
-keycode 0x5D = KP_3
-keycode 0x54 = KP_Enter
-keycode 0x3E = Shift_R
-keycode 0x42 = Mode_switch
-keycode 0x3F = Meta_L
-keycode 0x39 = space
-keycode 0x3F = Meta_L
-keycode 0x42 = Mode_switch
-keycode 0x3E = Shift_R
-keycode 0x43 = Left
-keycode 0x45 = Down
-keycode 0x44 = Right
-keycode 0x5A = KP_0
-keycode 0x49 = KP_Decimal
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift = Shift_L Shift_R Shift_R
-add Lock = Caps_Lock
-add Control = Shift_R Shift_R Control_R
-add Mod2 = Mode_switch
-add Mod4 = Num_Lock
-add Mod5 = Scroll_Lock
diff --git a/gkb-new/xmodmap/xmodmap.dk b/gkb-new/xmodmap/xmodmap.dk
deleted file mode 100644
index 031e4ae4..00000000
--- a/gkb-new/xmodmap/xmodmap.dk
+++ /dev/null
@@ -1,115 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:02 CET 1998
-clear Mod1
-clear Mod2
-! danish keymap
-! with dead accents
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 numbersign sterling
-keycode 13 = 4 dollar dollar
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand
-keycode 16 = 7 slash braceleft
-keycode 17 = 8 parenleft bracketleft
-keycode 18 = 9 parenright bracketright
-keycode 19 = 0 equal braceright
-keycode 20 = plus question
-keycode 21 = dead_acute dead_grave bar
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = aring Aring
-keycode 35 = dead_diaeresis dead_circumflex dead_tilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = ae AE
-keycode 48 = oslash
-keycode 49 = onehalf section
-keycode 50 = Shift_L
-keycode 51 = apostrophe asterisk
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = less greater backslash
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-!
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.dvorak b/gkb-new/xmodmap/xmodmap.dvorak
deleted file mode 100644
index 303aba40..00000000
--- a/gkb-new/xmodmap/xmodmap.dvorak
+++ /dev/null
@@ -1,112 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:02 CET 1998
-clear Mod1
-clear Mod2
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 at at
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar dollar
-keycode 14 = 5 percent
-keycode 15 = 6 asciicircum
-keycode 16 = 7 ampersand braceleft
-keycode 17 = 8 asterisk bracketleft
-keycode 18 = 9 parenleft bracketright
-keycode 19 = 0 parenright braceright
-keycode 20 = bracketleft braceleft
-keycode 21 = bracketright braceright asciitilde
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = apostrophe quotedbl
-keycode 25 = comma less
-keycode 26 = period greater
-keycode 27 = p
-keycode 28 = y
-keycode 29 = f
-keycode 30 = g
-keycode 31 = c
-keycode 32 = r
-keycode 33 = l
-keycode 34 = slash question
-keycode 35 = equal plus
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = o
-keycode 40 = e
-keycode 41 = u
-keycode 42 = i
-keycode 43 = d
-keycode 44 = h
-keycode 45 = t
-keycode 46 = n
-keycode 47 = s
-keycode 48 = minus underscore backslash
-keycode 49 = grave asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar
-keycode 52 = semicolon colon
-keycode 53 = q
-keycode 54 = j
-keycode 55 = k
-keycode 56 = x
-keycode 57 = b
-keycode 58 = m
-keycode 59 = w
-keycode 60 = v
-keycode 61 = z
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-!
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.ee b/gkb-new/xmodmap/xmodmap.ee
deleted file mode 100644
index e887926d..00000000
--- a/gkb-new/xmodmap/xmodmap.ee
+++ /dev/null
@@ -1,117 +0,0 @@
-! Almost correct version of xmodmap.ee
-! generated from xmodmap.fi 1999-09-28 00:05 CET
-!
-! Estonian uses iso-8859-15, so I changed some keysyms to iso8859-15 ones
-! Pablo Saratxaga ([email protected])
-!
-clear Mod1
-clear Mod2
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 numbersign sterling
-keycode 13 = 4 dollar dollar
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand
-keycode 16 = 7 slash braceleft
-keycode 17 = 8 parenleft bracketleft
-keycode 18 = 9 parenright bracketright
-keycode 19 = 0 equal braceright
-keycode 20 = plus question backslash
-keycode 21 = dead_acute dead_grave
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E EuroSign
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = udiaeresis Udiaeresis
-keycode 35 = otilde Otilde section
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s S scaron Scaron
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = odiaeresis Odiaeresis
-keycode 48 = adiaeresis Adiaeresis
-keycode 49 = asciicircum asciitilde
-keycode 50 = Shift_L
-keycode 51 = apostrophe asterisk oe
-keycode 52 = z Z zcaron Zcaron
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-!
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.es b/gkb-new/xmodmap/xmodmap.es
deleted file mode 100644
index 24f69045..00000000
--- a/gkb-new/xmodmap/xmodmap.es
+++ /dev/null
@@ -1,120 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] mi� jul 29 13:46:38 CEST 1998
-clear Mod1
-clear Mod2
-! Spanish keymap, note the spanish IBM keyboard lacks an ascitilde (~), I
-! have used ALT-Gr 4 as per IBM/AIX and some sun keyboards. ascitilde is also
-! on ALT-Gr-exclamdown for compatibility with Julio Sanchez' Spanish keymap.
-!
-! Jon Tombs <[email protected]> with corrections from
-! Julio Sanchez <[email protected]>
-! otros toquecitos por mi <[email protected]>
-!
-keycode 8 =
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam bar
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 periodcentered numbersign
-keycode 13 = 4 dollar asciitilde
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand notsign
-keycode 16 = 7 slash braceleft
-keycode 17 = 8 parenleft bracketleft
-keycode 18 = 9 parenright bracketright
-keycode 19 = 0 equal braceright
-keycode 20 = apostrophe question backslash
-keycode 21 = exclamdown questiondown asciitilde
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = dead_acute dead_circumflex bracketleft
-keycode 35 = plus asterisk bracketright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = ntilde Ntilde
-keycode 48 = dead_acute dead_diaeresis braceleft
-keycode 49 = masculine ordfeminine backslash
-keycode 50 = Shift_L
-keycode 51 = ccedilla Ccedilla braceright
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater
-keycode 95 = F11
-keycode 96 = F12
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Find
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 115 = Select
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.es_x86 b/gkb-new/xmodmap/xmodmap.es_x86
deleted file mode 100644
index 7440b33a..00000000
--- a/gkb-new/xmodmap/xmodmap.es_x86
+++ /dev/null
@@ -1,129 +0,0 @@
-keycode 8 = masculine ordfeminine backslash
-keycode 9 = 1 exclam bar
-keycode 10 = 2 quotedbl at
-keycode 11 = 3 periodcentered numbersign
-keycode 12 = 4 dollar asciicircum
-keycode 13 = 5 percent asciitilde
-keycode 14 = 6 asciicircum
-keycode 15 = 7 ampersand
-keycode 16 = 8 asterisk
-keycode 17 = 9 parenleft
-keycode 18 = 0 parenright
-keycode 19 = minus underscore
-keycode 20 = equal plus
-keycode 21 =
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = Q
-keycode 25 = W
-keycode 26 = e E currency
-keycode 27 = R
-keycode 28 = T
-keycode 29 = Y
-keycode 30 = U
-keycode 31 = I
-keycode 32 = O
-keycode 33 = P
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright
-keycode 36 = numbersign asciitilde
-keycode 37 = Caps_Lock
-keycode 38 = A
-keycode 39 = S
-keycode 40 = D
-keycode 41 = F
-keycode 42 = G
-keycode 43 = H
-keycode 44 = J
-keycode 45 = K
-keycode 46 = L
-keycode 47 = semicolon colon
-keycode 48 = quoteright at
-keycode 49 =
-keycode 50 = Return
-keycode 51 = Shift_L
-keycode 52 = backslash bar
-keycode 53 = Z
-keycode 54 = X
-keycode 55 = C
-keycode 56 = V
-keycode 57 = B
-keycode 58 = N
-keycode 59 = M
-keycode 60 = comma less
-keycode 61 = period greater
-keycode 62 = slash question
-keycode 63 =
-keycode 64 = Shift_R
-keycode 65 = Control_L
-keycode 66 =
-keycode 67 = Alt_L
-keycode 68 = space
-keycode 69 = SunAltGraph
-keycode 70 =
-keycode 71 = Control_R
-keycode 72 =
-keycode 73 =
-keycode 74 =
-keycode 75 =
-keycode 76 =
-keycode 77 =
-keycode 78 =
-keycode 79 =
-keycode 80 =
-keycode 81 =
-keycode 82 = Insert
-keycode 83 = Delete
-keycode 84 =
-keycode 85 =
-keycode 86 = Left
-keycode 87 = Home
-keycode 88 = End
-keycode 89 =
-keycode 90 = Up
-keycode 91 = Down
-keycode 92 = Prior
-keycode 93 = Next
-keycode 94 =
-keycode 95 =
-keycode 96 = Right
-keycode 97 = Num_Lock
-keycode 98 = Home KP_7 KP_7
-keycode 99 = Left KP_4 KP_4
-keycode 100 = End KP_1 KP_1
-keycode 101 =
-keycode 102 = KP_Divide
-keycode 103 = Up KP_8 KP_8
-keycode 104 = KP_5 KP_5 KP_5
-keycode 105 = Down KP_2 KP_2
-keycode 106 = KP_Insert KP_0 KP_0
-keycode 107 = KP_Multiply
-keycode 108 = Prior KP_9 KP_9
-keycode 109 = Right KP_6 KP_6
-keycode 110 = Next KP_3 KP_3
-keycode 111 = Delete KP_Decimal KP_Decimal
-keycode 112 = KP_Subtract
-keycode 113 = KP_Add
-keycode 114 =
-keycode 115 = KP_Enter
-keycode 116 =
-keycode 117 = Escape
-keycode 118 =
-keycode 119 = F1
-keycode 120 = F2
-keycode 121 = F3
-keycode 122 = F4
-keycode 123 = F5
-keycode 124 = F6
-keycode 125 = F7
-keycode 126 = F8
-keycode 127 = F9
-keycode 128 = F10
-keycode 129 = SunF36
-keycode 130 = SunF37
-keycode 131 = Print SunSys_Req
-keycode 132 = Scroll_Lock
-keycode 133 = Pause Break
-keycode 134 =
-keycode 135 = Multi_key
-keycode 136 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.fi b/gkb-new/xmodmap/xmodmap.fi
deleted file mode 100644
index d111d61c..00000000
--- a/gkb-new/xmodmap/xmodmap.fi
+++ /dev/null
@@ -1,113 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:03 CET 1998
-clear Mod1
-clear Mod2
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 numbersign sterling
-keycode 13 = 4 dollar dollar
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand
-keycode 16 = 7 slash braceleft
-keycode 17 = 8 parenleft bracketleft
-keycode 18 = 9 parenright bracketright
-keycode 19 = 0 equal braceright
-keycode 20 = plus question backslash
-keycode 21 = dead_acute dead_grave
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = aring Aring
-keycode 35 = dead_diaeresis dead_circumflex dead_tilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = odiaeresis Odiaeresis
-keycode 48 = adiaeresis Adiaeresis
-keycode 49 = section onehalf
-keycode 50 = Shift_L
-keycode 51 = apostrophe asterisk
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-!
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.fr b/gkb-new/xmodmap/xmodmap.fr
deleted file mode 100644
index 8456e5a6..00000000
--- a/gkb-new/xmodmap/xmodmap.fr
+++ /dev/null
@@ -1,112 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] Wed Sep 4 03:01:13 MET DST 1996
-clear Mod1
-clear Mod2
-keycode 9 = Escape Escape
-keycode 10 = ampersand 1
-keycode 11 = eacute 2 dead_tilde
-keycode 12 = quotedbl 3 numbersign
-keycode 13 = apostrophe 4 braceleft
-keycode 14 = parenleft 5 bracketleft
-keycode 15 = minus 6 bar
-keycode 16 = egrave 7 dead_grave
-keycode 17 = underscore 8 backslash
-keycode 18 = ccedilla 9 asciicircum
-keycode 19 = agrave 0 at
-keycode 20 = parenright degree bracketright
-keycode 21 = equal plus braceright
-keycode 22 = BackSpace
-keycode 23 = Tab Tab
-keycode 24 = a
-keycode 25 = z
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = dead_circumflex dead_diaeresis
-keycode 35 = dollar sterling currency
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = q
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = m M
-keycode 48 = ugrave percent
-keycode 49 = twosuperior
-keycode 50 = Shift_L
-keycode 51 = asterisk mu
-keycode 52 = w
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = comma question dead_cedilla
-keycode 59 = semicolon period
-keycode 60 = colon slash Multi_key
-keycode 61 = exclam section
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 92 = Sys_Req
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.fr-2 b/gkb-new/xmodmap/xmodmap.fr-2
deleted file mode 100644
index e80308ea..00000000
--- a/gkb-new/xmodmap/xmodmap.fr-2
+++ /dev/null
@@ -1,112 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] Wed Sep 4 03:01:13 MET DST 1996
-clear Mod1
-clear Mod2
-keycode 9 = Escape Escape
-keycode 10 = ampersand 1
-keycode 11 = eacute 2 dead_tilde
-keycode 12 = quotedbl 3 numbersign
-keycode 13 = apostrophe 4 braceleft
-keycode 14 = parenleft 5 bracketleft
-keycode 15 = minus 6 bar
-keycode 16 = egrave 7 dead_grave
-keycode 17 = underscore 8 backslash
-keycode 18 = ccedilla 9 asciicircum
-keycode 19 = agrave 0 at
-keycode 20 = parenright degree bracketright
-keycode 21 = equal plus braceright
-keycode 22 = BackSpace
-keycode 23 = Tab Tab
-keycode 24 = a
-keycode 25 = z
-keycode 26 = e E EuroSign
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = dead_circumflex dead_diaeresis
-keycode 35 = dollar sterling currency
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = q
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = m M
-keycode 48 = ugrave percent
-keycode 49 = twosuperior
-keycode 50 = Shift_L
-keycode 51 = asterisk mu
-keycode 52 = w
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = comma question dead_cedilla
-keycode 59 = semicolon period
-keycode 60 = colon slash Multi_key
-keycode 61 = exclam section
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 92 = Sys_Req
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.fr_x86 b/gkb-new/xmodmap/xmodmap.fr_x86
deleted file mode 100644
index 5b98bfe8..00000000
--- a/gkb-new/xmodmap/xmodmap.fr_x86
+++ /dev/null
@@ -1,129 +0,0 @@
-keycode 8 = twosuperior
-keycode 9 = ampersand 1
-keycode 10 = eacute 2 asciitilde
-keycode 11 = quotedbl 3 numbersign
-keycode 12 = quoteright 4 braceleft
-keycode 13 = parenleft 5 bracketleft
-keycode 14 = minus 6 bar
-keycode 15 = egrave 7 quoteleft
-keycode 16 = underscore 8 backslash
-keycode 17 = ccedilla 9 asciicircum
-keycode 18 = agrave 0 at
-keycode 19 = parenright degree bracketright
-keycode 20 = equal plus braceright
-keycode 21 =
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = A
-keycode 25 = Z
-keycode 26 = e E currency
-keycode 27 = R
-keycode 28 = T
-keycode 29 = Y
-keycode 30 = U
-keycode 31 = I
-keycode 32 = O
-keycode 33 = P
-keycode 34 = SunFA_Circum SunFA_Diaeresis
-keycode 35 = dollar sterling currency
-keycode 36 = asterisk mu
-keycode 37 = Caps_Lock
-keycode 38 = Q
-keycode 39 = S
-keycode 40 = D
-keycode 41 = F
-keycode 42 = G
-keycode 43 = H
-keycode 44 = J
-keycode 45 = K
-keycode 46 = L
-keycode 47 = M
-keycode 48 = ugrave percent
-keycode 49 =
-keycode 50 = Return
-keycode 51 = Shift_L
-keycode 52 = less greater
-keycode 53 = W
-keycode 54 = X
-keycode 55 = C
-keycode 56 = V
-keycode 57 = B
-keycode 58 = N
-keycode 59 = comma question
-keycode 60 = semicolon period
-keycode 61 = colon slash
-keycode 62 = exclam section
-keycode 63 =
-keycode 64 = Shift_R
-keycode 65 = Control_L
-keycode 66 =
-keycode 67 = Alt_L
-keycode 68 = space
-keycode 69 = SunAltGraph
-keycode 70 =
-keycode 71 = Control_R
-keycode 72 =
-keycode 73 =
-keycode 74 =
-keycode 75 =
-keycode 76 =
-keycode 77 =
-keycode 78 =
-keycode 79 =
-keycode 80 =
-keycode 81 =
-keycode 82 = Insert
-keycode 83 = Delete
-keycode 84 =
-keycode 85 =
-keycode 86 = Left
-keycode 87 = Home
-keycode 88 = End
-keycode 89 =
-keycode 90 = Up
-keycode 91 = Down
-keycode 92 = Prior
-keycode 93 = Next
-keycode 94 =
-keycode 95 =
-keycode 96 = Right
-keycode 97 = Num_Lock
-keycode 98 = Home KP_7 KP_7
-keycode 99 = Left KP_4 KP_4
-keycode 100 = End KP_1 KP_1
-keycode 101 =
-keycode 102 = KP_Divide
-keycode 103 = Up KP_8 KP_8
-keycode 104 = KP_5 KP_5 KP_5
-keycode 105 = Down KP_2 KP_2
-keycode 106 = KP_Insert KP_0 KP_0
-keycode 107 = KP_Multiply
-keycode 108 = Prior KP_9 KP_9
-keycode 109 = Right KP_6 KP_6
-keycode 110 = Next KP_3 KP_3
-keycode 111 = Delete KP_Decimal KP_Decimal
-keycode 112 = KP_Subtract
-keycode 113 = KP_Add
-keycode 114 =
-keycode 115 = KP_Enter
-keycode 116 =
-keycode 117 = Escape
-keycode 118 =
-keycode 119 = F1
-keycode 120 = F2
-keycode 121 = F3
-keycode 122 = F4
-keycode 123 = F5
-keycode 124 = F6
-keycode 125 = F7
-keycode 126 = F8
-keycode 127 = F9
-keycode 128 = F10
-keycode 129 = SunF36
-keycode 130 = SunF37
-keycode 131 = Print SunSys_Req
-keycode 132 = Scroll_Lock
-keycode 133 = Pause Break
-keycode 134 =
-keycode 135 = Multi_key
-keycode 136 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.gb b/gkb-new/xmodmap/xmodmap.gb
deleted file mode 100644
index 7cc8eaa7..00000000
--- a/gkb-new/xmodmap/xmodmap.gb
+++ /dev/null
@@ -1,200 +0,0 @@
-!
-! This is an `xmodmap' input file for
-! PC 105 key, wide Delete, tall Enter (XFree86; United Kingdom) keyboards.
-! Automatically generated on Sat Oct 28 17:08:31 2000 by root with
-! XKeyCaps 2.46; Copyright (c) 1999 Jamie Zawinski <[email protected]>.
-! http://www.jwz.org/xkeycaps/
-!
-! This file makes the following changes:
-!
-! The "Print Scrn " key generates Print and Sys_Req
-! The "Scroll Lock" key generates Scroll_Lock, and the Mod5 modifier
-! The "Pause Break" key generates Pause and Break
-! The "� `" key generates 0, section, and notsign
-! The "! 1" key generates 1, apostrophe, asciitilde, and dead_tilde
-! The "" 2" key generates 2, quotedbl, caron, and dead_caron
-! The "� 3" key generates 3, plus, asciicircum, and dead_circumflex
-! The "$ 4" key generates 4, exclam, breve, and dead_breve
-! The "% 5" key generates 5, percent, degree, and dead_abovering
-! The "^ 6" key generates 6, slash, ogonek, and dead_ogonek
-! The "& 7" key generates 7, equal, grave, and dead_grave
-! The "* 8" key generates 8, parenleft, abovedot, and dead_abovedot
-! The "( 9" key generates 9, parenright, acute, and dead_acute
-! The ") 0" key generates odiaeresis, Odiaeresis, doubleacute, and dead_doubleacute
-! The "_ -" key generates udiaeresis, Udiaeresis, diaeresis, and dead_diaeresis
-! The "+ =" key generates oacute, Oacute, cedilla, and dead_cedilla
-! The "Backspace" key generates BackSpace
-! The "Num Lock" key generates Num_Lock and Pointer_EnableKeys, and the Mod2 modifier
-! The "Tab" key generates Tab and ISO_Left_Tab
-! The "Q" key generates q, Q, backslash, and Greek_OMEGA
-! The "W" key generates w, W, bar, and Lstroke
-! The "R" key generates r, R, paragraph, and registered
-! The "T" key generates t, T, tslash, and Tslash
-! The "Y" key generates z, Z, leftarrow, and yen
-! The "U" key generates u, U, downarrow, and uparrow
-! The "I" key generates i, I, Iacute, and idotless
-! The "O" key generates o, O, oslash, and Ooblique
-! The "P" key generates p, P, thorn, and THORN
-! The "{ [" key generates otilde, Otilde, division, and dead_abovering
-! The "} ]" key generates uacute, Uacute, multiply, and dead_macron
-! The "7 Home" key generates KP_Home and KP_7
-! The "8 UpArrow" key generates KP_Up and KP_8
-! The "9 PgUp" key generates KP_Prior and KP_9
-! The "A" key generates a, A, ae, and AE
-! The "S" key generates s, S, dstroke, and section
-! The "D" key generates d, D, Dstroke, and ETH
-! The "F" key generates f, F, bracketleft, and ordfeminine
-! The "G" key generates g, G, bracketright, and ENG
-! The "H" key generates h, H, hstroke, and Hstroke
-! The "J" key generates j, J, and iacute
-! The "K" key generates k, K, lstroke, and ampersand
-! The "L" key generates l, L, Lstroke, and Lstroke
-! The ": ;" key generates eacute, Eacute, dollar, and dead_doubleacute
-! The "@ '" key generates aacute, Aacute, ssharp, and dead_caron
-! The "~ #" key generates ucircumflex, Ucircumflex, currency, and dead_breve
-! The "4 LeftArrow" key generates KP_Left and KP_4
-! The "5" key generates KP_Begin and KP_5
-! The "6 RightArrow" key generates KP_Right and KP_6
-! The "| \" key generates iacute, Iacute, and less
-! The "Z" key generates y, Y, greater, and less
-! The "X" key generates x, X, numbersign, and greater
-! The "C" key generates c, C, ampersand, and copyright
-! The "V" key generates v, V, at, and grave
-! The "B" key generates b, B, braceleft, and apostrophe
-! The "N" key generates n, N, and braceright
-! The "M" key generates m, M, mu, and masculine
-! The "< ," key generates comma, question, semicolon, and multiply
-! The "> ." key generates period, colon, periodcentered, and division
-! The "? /" key generates minus, underscore, asterisk, and dead_abovedot
-! The "1 End" key generates KP_End and KP_1
-! The "2 DownArrow" key generates KP_Down and KP_2
-! The "3 PgDn" key generates KP_Next and KP_3
-! The "=/+/" key generates NoSymbol, and has no modifiers
-! The "Alt Gr" key generates Mode_switch and Multi_key, and the Mod3 modifier
-! The "=/+/" key generates NoSymbol, and has no modifiers
-! The "##" key generates NoSymbol
-! The "0 Ins" key generates KP_Insert and KP_0
-! The ". Del" key generates KP_Delete and KP_Decimal
-
-keycode 0x09 = Escape
-keycode 0x43 = F1
-keycode 0x44 = F2
-keycode 0x45 = F3
-keycode 0x46 = F4
-keycode 0x47 = F5
-keycode 0x48 = F6
-keycode 0x49 = F7
-keycode 0x4A = F8
-keycode 0x4B = F9
-keycode 0x4C = F10
-keycode 0x5F = F11
-keycode 0x60 = F12
-keycode 0x6F = Print Sys_Req
-keycode 0x4E = Scroll_Lock
-keycode 0x6E = Pause Break
-keycode 0x31 = 0 section notsign
-keycode 0x0A = 1 apostrophe asciitilde dead_tilde
-keycode 0x0B = 2 quotedbl caron dead_caron
-keycode 0x0C = 3 plus asciicircum dead_circumflex
-keycode 0x0D = 4 exclam breve dead_breve
-keycode 0x0E = 5 percent degree dead_abovering
-keycode 0x0F = 6 slash ogonek dead_ogonek
-keycode 0x10 = 7 equal grave dead_grave
-keycode 0x11 = 8 parenleft abovedot dead_abovedot
-keycode 0x12 = 9 parenright acute dead_acute
-keycode 0x13 = odiaeresis Odiaeresis doubleacute dead_doubleacute
-keycode 0x14 = udiaeresis Udiaeresis diaeresis dead_diaeresis
-keycode 0x15 = oacute Oacute cedilla dead_cedilla
-keycode 0x16 = BackSpace
-keycode 0x6A = Insert
-keycode 0x61 = Home
-keycode 0x63 = Prior
-keycode 0x4D = Num_Lock Pointer_EnableKeys
-keycode 0x70 = KP_Divide
-keycode 0x3F = KP_Multiply
-keycode 0x52 = KP_Subtract
-keycode 0x17 = Tab ISO_Left_Tab
-keycode 0x18 = q Q backslash Greek_OMEGA
-keycode 0x19 = w W bar Lstroke
-keycode 0x1A = e E
-keycode 0x1B = r R paragraph registered
-keycode 0x1C = t T tslash Tslash
-keycode 0x1D = y Y leftarrow yen
-keycode 0x1E = u U downarrow uparrow
-keycode 0x1F = i I Iacute idotless
-keycode 0x20 = o O oslash Ooblique
-keycode 0x21 = p P thorn THORN
-keycode 0x22 = otilde Otilde division dead_abovering
-keycode 0x23 = uacute Uacute multiply dead_macron
-keycode 0x24 = Return
-keycode 0x6B = Delete
-keycode 0x67 = End
-keycode 0x69 = Next
-keycode 0x4F = KP_Home KP_7
-keycode 0x50 = KP_Up KP_8
-keycode 0x51 = KP_Prior KP_9
-keycode 0x56 = KP_Add
-keycode 0x42 = Caps_Lock
-keycode 0x26 = a A ae AE
-keycode 0x27 = s S dstroke section
-keycode 0x28 = d D Dstroke ETH
-keycode 0x29 = f F bracketleft ordfeminine
-keycode 0x2A = g G bracketright ENG
-keycode 0x2B = h H hstroke Hstroke
-keycode 0x2C = j J iacute
-keycode 0x2D = k K lstroke ampersand
-keycode 0x2E = l L Lstroke Lstroke
-keycode 0x2F = eacute Eacute dollar dead_doubleacute
-keycode 0x30 = aacute Aacute ssharp dead_caron
-keycode 0x33 = ucircumflex Ucircumflex currency dead_breve
-keycode 0x53 = KP_Left KP_4
-keycode 0x54 = KP_Begin KP_5
-keycode 0x55 = KP_Right KP_6
-keycode 0x32 = Shift_L
-keycode 0x5E = iacute Iacute less
-keycode 0x34 = z Z greater less
-keycode 0x35 = x X numbersign greater
-keycode 0x36 = c C ampersand copyright
-keycode 0x37 = v V at grave
-keycode 0x38 = b B braceleft apostrophe
-keycode 0x39 = n N braceright
-keycode 0x3A = m M mu masculine
-keycode 0x3B = comma question semicolon multiply
-keycode 0x3C = period colon periodcentered division
-keycode 0x3D = minus underscore asterisk dead_abovedot
-keycode 0x3E = Shift_R
-keycode 0x62 = Up
-keycode 0x57 = KP_End KP_1
-keycode 0x58 = KP_Down KP_2
-keycode 0x59 = KP_Next KP_3
-keycode 0x6C = KP_Enter
-keycode 0x25 = Control_L
-keycode 0x73 = NoSymbol
-keycode 0x40 = Alt_L Meta_L
-keycode 0x41 = space
-keycode 0x71 = Mode_switch Multi_key
-keycode 0x74 = NoSymbol
-keycode 0x75 = NoSymbol
-keycode 0x6D = Control_R
-keycode 0x64 = Left
-keycode 0x68 = Down
-keycode 0x66 = Right
-keycode 0x5A = KP_Insert KP_0
-keycode 0x5B = KP_Delete KP_Decimal
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift = Shift_L Shift_R
-add Lock = Caps_Lock
-add Control = Control_L Control_R
-add Mod1 = Alt_L
-add Mod2 = Num_Lock
-add Mod3 = Mode_switch
-add Mod5 = Scroll_Lock
diff --git a/gkb-new/xmodmap/xmodmap.gb-102 b/gkb-new/xmodmap/xmodmap.gb-102
deleted file mode 100644
index 494237c8..00000000
--- a/gkb-new/xmodmap/xmodmap.gb-102
+++ /dev/null
@@ -1,194 +0,0 @@
-!
-! This is an `xmodmap' input file for
-! PC 102 key, wide Delete, tall Enter (XFree86; United Kingdom) keyboards.
-! Automatically generated on Sat Oct 28 17:09:35 2000 by root with
-! XKeyCaps 2.46; Copyright (c) 1999 Jamie Zawinski <[email protected]>.
-! http://www.jwz.org/xkeycaps/
-!
-! This file makes the following changes:
-!
-! The "Print" key generates Print and Sys_Req
-! The "Scroll Lock" key generates Scroll_Lock, and the Mod5 modifier
-! The "Pause" key generates Pause and Break
-! The "� `" key generates 0, section, and notsign
-! The "! 1" key generates 1, apostrophe, asciitilde, and dead_tilde
-! The "" 2" key generates 2, quotedbl, caron, and dead_caron
-! The "� 3" key generates 3, plus, asciicircum, and dead_circumflex
-! The "$ 4" key generates 4, exclam, breve, and dead_breve
-! The "% 5" key generates 5, percent, degree, and dead_abovering
-! The "^ 6" key generates 6, slash, ogonek, and dead_ogonek
-! The "& 7" key generates 7, equal, grave, and dead_grave
-! The "* 8" key generates 8, parenleft, abovedot, and dead_abovedot
-! The "( 9" key generates 9, parenright, acute, and dead_acute
-! The ") 0" key generates odiaeresis, Odiaeresis, doubleacute, and dead_doubleacute
-! The "_ -" key generates udiaeresis, Udiaeresis, diaeresis, and dead_diaeresis
-! The "+ =" key generates oacute, Oacute, cedilla, and dead_cedilla
-! The "Backspace" key generates BackSpace
-! The "Num Lock" key generates Num_Lock and Pointer_EnableKeys, and the Mod2 modifier
-! The "Tab" key generates Tab and ISO_Left_Tab
-! The "Q" key generates q, Q, backslash, and Greek_OMEGA
-! The "W" key generates w, W, bar, and Lstroke
-! The "R" key generates r, R, paragraph, and registered
-! The "T" key generates t, T, tslash, and Tslash
-! The "Y" key generates z, Z, leftarrow, and yen
-! The "U" key generates u, U, downarrow, and uparrow
-! The "I" key generates i, I, Iacute, and idotless
-! The "O" key generates o, O, oslash, and Ooblique
-! The "P" key generates p, P, thorn, and THORN
-! The "{ [" key generates otilde, Otilde, division, and dead_abovering
-! The "} ]" key generates uacute, Uacute, multiply, and dead_macron
-! The "7 Home" key generates KP_Home and KP_7
-! The "8 UpArrow" key generates KP_Up and KP_8
-! The "9 Pg Up" key generates KP_Prior and KP_9
-! The "A" key generates a, A, ae, and AE
-! The "S" key generates s, S, dstroke, and section
-! The "D" key generates d, D, Dstroke, and ETH
-! The "F" key generates f, F, bracketleft, and ordfeminine
-! The "G" key generates g, G, bracketright, and ENG
-! The "H" key generates h, H, hstroke, and Hstroke
-! The "J" key generates j, J, and iacute
-! The "K" key generates k, K, lstroke, and ampersand
-! The "L" key generates l, L, Lstroke, and Lstroke
-! The ": ;" key generates eacute, Eacute, dollar, and dead_doubleacute
-! The "@ '" key generates aacute, Aacute, ssharp, and dead_caron
-! The "~ #" key generates ucircumflex, Ucircumflex, currency, and dead_breve
-! The "4 LeftArrow" key generates KP_Left and KP_4
-! The "5" key generates KP_Begin and KP_5
-! The "6 RightArrow" key generates KP_Right and KP_6
-! The "| \" key generates iacute, Iacute, and less
-! The "Z" key generates y, Y, greater, and less
-! The "X" key generates x, X, numbersign, and greater
-! The "C" key generates c, C, ampersand, and copyright
-! The "V" key generates v, V, at, and grave
-! The "B" key generates b, B, braceleft, and apostrophe
-! The "N" key generates n, N, and braceright
-! The "M" key generates m, M, mu, and masculine
-! The "< ," key generates comma, question, semicolon, and multiply
-! The "> ." key generates period, colon, periodcentered, and division
-! The "? /" key generates minus, underscore, asterisk, and dead_abovedot
-! The "1 End" key generates KP_End and KP_1
-! The "2 DownArrow" key generates KP_Down and KP_2
-! The "3 Pg Dn" key generates KP_Next and KP_3
-! The "Alt Gr" key generates Mode_switch and Multi_key, and the Mod3 modifier
-! The "0 Ins" key generates KP_Insert and KP_0
-! The ". Del" key generates KP_Delete and KP_Decimal
-
-keycode 0x09 = Escape
-keycode 0x43 = F1
-keycode 0x44 = F2
-keycode 0x45 = F3
-keycode 0x46 = F4
-keycode 0x47 = F5
-keycode 0x48 = F6
-keycode 0x49 = F7
-keycode 0x4A = F8
-keycode 0x4B = F9
-keycode 0x4C = F10
-keycode 0x5F = F11
-keycode 0x60 = F12
-keycode 0x6F = Print Sys_Req
-keycode 0x4E = Scroll_Lock
-keycode 0x6E = Pause Break
-keycode 0x31 = 0 section notsign
-keycode 0x0A = 1 apostrophe asciitilde dead_tilde
-keycode 0x0B = 2 quotedbl caron dead_caron
-keycode 0x0C = 3 plus asciicircum dead_circumflex
-keycode 0x0D = 4 exclam breve dead_breve
-keycode 0x0E = 5 percent degree dead_abovering
-keycode 0x0F = 6 slash ogonek dead_ogonek
-keycode 0x10 = 7 equal grave dead_grave
-keycode 0x11 = 8 parenleft abovedot dead_abovedot
-keycode 0x12 = 9 parenright acute dead_acute
-keycode 0x13 = odiaeresis Odiaeresis doubleacute dead_doubleacute
-keycode 0x14 = udiaeresis Udiaeresis diaeresis dead_diaeresis
-keycode 0x15 = oacute Oacute cedilla dead_cedilla
-keycode 0x16 = BackSpace
-keycode 0x6A = Insert
-keycode 0x61 = Home
-keycode 0x63 = Prior
-keycode 0x4D = Num_Lock Pointer_EnableKeys
-keycode 0x70 = KP_Divide
-keycode 0x3F = KP_Multiply
-keycode 0x52 = KP_Subtract
-keycode 0x17 = Tab ISO_Left_Tab
-keycode 0x18 = q Q backslash Greek_OMEGA
-keycode 0x19 = w W bar Lstroke
-keycode 0x1A = e E
-keycode 0x1B = r R paragraph registered
-keycode 0x1C = t T tslash Tslash
-keycode 0x1D = z Z leftarrow yen
-keycode 0x1E = u U downarrow uparrow
-keycode 0x1F = i I Iacute idotless
-keycode 0x20 = o O oslash Ooblique
-keycode 0x21 = p P thorn THORN
-keycode 0x22 = otilde Otilde division dead_abovering
-keycode 0x23 = uacute Uacute multiply dead_macron
-keycode 0x24 = Return
-keycode 0x6B = Delete
-keycode 0x67 = End
-keycode 0x69 = Next
-keycode 0x4F = KP_Home KP_7
-keycode 0x50 = KP_Up KP_8
-keycode 0x51 = KP_Prior KP_9
-keycode 0x56 = KP_Add
-keycode 0x42 = Caps_Lock
-keycode 0x26 = a A ae AE
-keycode 0x27 = s S dstroke section
-keycode 0x28 = d D Dstroke ETH
-keycode 0x29 = f F bracketleft ordfeminine
-keycode 0x2A = g G bracketright ENG
-keycode 0x2B = h H hstroke Hstroke
-keycode 0x2C = j J iacute
-keycode 0x2D = k K lstroke ampersand
-keycode 0x2E = l L Lstroke Lstroke
-keycode 0x2F = eacute Eacute dollar dead_doubleacute
-keycode 0x30 = aacute Aacute ssharp dead_caron
-keycode 0x33 = ucircumflex Ucircumflex currency dead_breve
-keycode 0x53 = KP_Left KP_4
-keycode 0x54 = KP_Begin KP_5
-keycode 0x55 = KP_Right KP_6
-keycode 0x32 = Shift_L
-keycode 0x5E = iacute Iacute less
-keycode 0x34 = y Y greater less
-keycode 0x35 = x X numbersign greater
-keycode 0x36 = c C ampersand copyright
-keycode 0x37 = v V at grave
-keycode 0x38 = b B braceleft apostrophe
-keycode 0x39 = n N braceright
-keycode 0x3A = m M mu masculine
-keycode 0x3B = comma question semicolon multiply
-keycode 0x3C = period colon periodcentered division
-keycode 0x3D = minus underscore asterisk dead_abovedot
-keycode 0x3E = Shift_R
-keycode 0x62 = Up
-keycode 0x57 = KP_End KP_1
-keycode 0x58 = KP_Down KP_2
-keycode 0x59 = KP_Next KP_3
-keycode 0x6C = KP_Enter
-keycode 0x25 = Control_L
-keycode 0x40 = Alt_L Meta_L
-keycode 0x41 = space
-keycode 0x71 = Mode_switch Multi_key
-keycode 0x6D = Control_R
-keycode 0x64 = Left
-keycode 0x68 = Down
-keycode 0x66 = Right
-keycode 0x5A = KP_Insert KP_0
-keycode 0x5B = KP_Delete KP_Decimal
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift = Shift_L Shift_R
-add Lock = Caps_Lock
-add Control = Control_L Control_R
-add Mod1 = Alt_L
-add Mod2 = Num_Lock
-add Mod3 = Mode_switch
-add Mod5 = Scroll_Lock
diff --git a/gkb-new/xmodmap/xmodmap.gb-105 b/gkb-new/xmodmap/xmodmap.gb-105
deleted file mode 100644
index b736f2f2..00000000
--- a/gkb-new/xmodmap/xmodmap.gb-105
+++ /dev/null
@@ -1,200 +0,0 @@
-!
-! This is an `xmodmap' input file for
-! PC 105 key, wide Delete, tall Enter (XFree86; United Kingdom) keyboards.
-! Automatically generated on Sat Oct 28 17:08:31 2000 by root with
-! XKeyCaps 2.46; Copyright (c) 1999 Jamie Zawinski <[email protected]>.
-! http://www.jwz.org/xkeycaps/
-!
-! This file makes the following changes:
-!
-! The "Print Scrn " key generates Print and Sys_Req
-! The "Scroll Lock" key generates Scroll_Lock, and the Mod5 modifier
-! The "Pause Break" key generates Pause and Break
-! The "� `" key generates 0, section, and notsign
-! The "! 1" key generates 1, apostrophe, asciitilde, and dead_tilde
-! The "" 2" key generates 2, quotedbl, caron, and dead_caron
-! The "� 3" key generates 3, plus, asciicircum, and dead_circumflex
-! The "$ 4" key generates 4, exclam, breve, and dead_breve
-! The "% 5" key generates 5, percent, degree, and dead_abovering
-! The "^ 6" key generates 6, slash, ogonek, and dead_ogonek
-! The "& 7" key generates 7, equal, grave, and dead_grave
-! The "* 8" key generates 8, parenleft, abovedot, and dead_abovedot
-! The "( 9" key generates 9, parenright, acute, and dead_acute
-! The ") 0" key generates odiaeresis, Odiaeresis, doubleacute, and dead_doubleacute
-! The "_ -" key generates udiaeresis, Udiaeresis, diaeresis, and dead_diaeresis
-! The "+ =" key generates oacute, Oacute, cedilla, and dead_cedilla
-! The "Backspace" key generates BackSpace
-! The "Num Lock" key generates Num_Lock and Pointer_EnableKeys, and the Mod2 modifier
-! The "Tab" key generates Tab and ISO_Left_Tab
-! The "Q" key generates q, Q, backslash, and Greek_OMEGA
-! The "W" key generates w, W, bar, and Lstroke
-! The "R" key generates r, R, paragraph, and registered
-! The "T" key generates t, T, tslash, and Tslash
-! The "Y" key generates z, Z, leftarrow, and yen
-! The "U" key generates u, U, downarrow, and uparrow
-! The "I" key generates i, I, Iacute, and idotless
-! The "O" key generates o, O, oslash, and Ooblique
-! The "P" key generates p, P, thorn, and THORN
-! The "{ [" key generates otilde, Otilde, division, and dead_abovering
-! The "} ]" key generates uacute, Uacute, multiply, and dead_macron
-! The "7 Home" key generates KP_Home and KP_7
-! The "8 UpArrow" key generates KP_Up and KP_8
-! The "9 PgUp" key generates KP_Prior and KP_9
-! The "A" key generates a, A, ae, and AE
-! The "S" key generates s, S, dstroke, and section
-! The "D" key generates d, D, Dstroke, and ETH
-! The "F" key generates f, F, bracketleft, and ordfeminine
-! The "G" key generates g, G, bracketright, and ENG
-! The "H" key generates h, H, hstroke, and Hstroke
-! The "J" key generates j, J, and iacute
-! The "K" key generates k, K, lstroke, and ampersand
-! The "L" key generates l, L, Lstroke, and Lstroke
-! The ": ;" key generates eacute, Eacute, dollar, and dead_doubleacute
-! The "@ '" key generates aacute, Aacute, ssharp, and dead_caron
-! The "~ #" key generates ucircumflex, Ucircumflex, currency, and dead_breve
-! The "4 LeftArrow" key generates KP_Left and KP_4
-! The "5" key generates KP_Begin and KP_5
-! The "6 RightArrow" key generates KP_Right and KP_6
-! The "| \" key generates iacute, Iacute, and less
-! The "Z" key generates y, Y, greater, and less
-! The "X" key generates x, X, numbersign, and greater
-! The "C" key generates c, C, ampersand, and copyright
-! The "V" key generates v, V, at, and grave
-! The "B" key generates b, B, braceleft, and apostrophe
-! The "N" key generates n, N, and braceright
-! The "M" key generates m, M, mu, and masculine
-! The "< ," key generates comma, question, semicolon, and multiply
-! The "> ." key generates period, colon, periodcentered, and division
-! The "? /" key generates minus, underscore, asterisk, and dead_abovedot
-! The "1 End" key generates KP_End and KP_1
-! The "2 DownArrow" key generates KP_Down and KP_2
-! The "3 PgDn" key generates KP_Next and KP_3
-! The "=/+/" key generates NoSymbol, and has no modifiers
-! The "Alt Gr" key generates Mode_switch and Multi_key, and the Mod3 modifier
-! The "=/+/" key generates NoSymbol, and has no modifiers
-! The "##" key generates NoSymbol
-! The "0 Ins" key generates KP_Insert and KP_0
-! The ". Del" key generates KP_Delete and KP_Decimal
-
-keycode 0x09 = Escape
-keycode 0x43 = F1
-keycode 0x44 = F2
-keycode 0x45 = F3
-keycode 0x46 = F4
-keycode 0x47 = F5
-keycode 0x48 = F6
-keycode 0x49 = F7
-keycode 0x4A = F8
-keycode 0x4B = F9
-keycode 0x4C = F10
-keycode 0x5F = F11
-keycode 0x60 = F12
-keycode 0x6F = Print Sys_Req
-keycode 0x4E = Scroll_Lock
-keycode 0x6E = Pause Break
-keycode 0x31 = 0 section notsign
-keycode 0x0A = 1 apostrophe asciitilde dead_tilde
-keycode 0x0B = 2 quotedbl caron dead_caron
-keycode 0x0C = 3 plus asciicircum dead_circumflex
-keycode 0x0D = 4 exclam breve dead_breve
-keycode 0x0E = 5 percent degree dead_abovering
-keycode 0x0F = 6 slash ogonek dead_ogonek
-keycode 0x10 = 7 equal grave dead_grave
-keycode 0x11 = 8 parenleft abovedot dead_abovedot
-keycode 0x12 = 9 parenright acute dead_acute
-keycode 0x13 = odiaeresis Odiaeresis doubleacute dead_doubleacute
-keycode 0x14 = udiaeresis Udiaeresis diaeresis dead_diaeresis
-keycode 0x15 = oacute Oacute cedilla dead_cedilla
-keycode 0x16 = BackSpace
-keycode 0x6A = Insert
-keycode 0x61 = Home
-keycode 0x63 = Prior
-keycode 0x4D = Num_Lock Pointer_EnableKeys
-keycode 0x70 = KP_Divide
-keycode 0x3F = KP_Multiply
-keycode 0x52 = KP_Subtract
-keycode 0x17 = Tab ISO_Left_Tab
-keycode 0x18 = q Q backslash Greek_OMEGA
-keycode 0x19 = w W bar Lstroke
-keycode 0x1A = e E
-keycode 0x1B = r R paragraph registered
-keycode 0x1C = t T tslash Tslash
-keycode 0x1D = z Z leftarrow yen
-keycode 0x1E = u U downarrow uparrow
-keycode 0x1F = i I Iacute idotless
-keycode 0x20 = o O oslash Ooblique
-keycode 0x21 = p P thorn THORN
-keycode 0x22 = otilde Otilde division dead_abovering
-keycode 0x23 = uacute Uacute multiply dead_macron
-keycode 0x24 = Return
-keycode 0x6B = Delete
-keycode 0x67 = End
-keycode 0x69 = Next
-keycode 0x4F = KP_Home KP_7
-keycode 0x50 = KP_Up KP_8
-keycode 0x51 = KP_Prior KP_9
-keycode 0x56 = KP_Add
-keycode 0x42 = Caps_Lock
-keycode 0x26 = a A ae AE
-keycode 0x27 = s S dstroke section
-keycode 0x28 = d D Dstroke ETH
-keycode 0x29 = f F bracketleft ordfeminine
-keycode 0x2A = g G bracketright ENG
-keycode 0x2B = h H hstroke Hstroke
-keycode 0x2C = j J iacute
-keycode 0x2D = k K lstroke ampersand
-keycode 0x2E = l L Lstroke Lstroke
-keycode 0x2F = eacute Eacute dollar dead_doubleacute
-keycode 0x30 = aacute Aacute ssharp dead_caron
-keycode 0x33 = ucircumflex Ucircumflex currency dead_breve
-keycode 0x53 = KP_Left KP_4
-keycode 0x54 = KP_Begin KP_5
-keycode 0x55 = KP_Right KP_6
-keycode 0x32 = Shift_L
-keycode 0x5E = iacute Iacute less
-keycode 0x34 = y Y greater less
-keycode 0x35 = x X numbersign greater
-keycode 0x36 = c C ampersand copyright
-keycode 0x37 = v V at grave
-keycode 0x38 = b B braceleft apostrophe
-keycode 0x39 = n N braceright
-keycode 0x3A = m M mu masculine
-keycode 0x3B = comma question semicolon multiply
-keycode 0x3C = period colon periodcentered division
-keycode 0x3D = minus underscore asterisk dead_abovedot
-keycode 0x3E = Shift_R
-keycode 0x62 = Up
-keycode 0x57 = KP_End KP_1
-keycode 0x58 = KP_Down KP_2
-keycode 0x59 = KP_Next KP_3
-keycode 0x6C = KP_Enter
-keycode 0x25 = Control_L
-keycode 0x73 = NoSymbol
-keycode 0x40 = Alt_L Meta_L
-keycode 0x41 = space
-keycode 0x71 = Mode_switch Multi_key
-keycode 0x74 = NoSymbol
-keycode 0x75 = NoSymbol
-keycode 0x6D = Control_R
-keycode 0x64 = Left
-keycode 0x68 = Down
-keycode 0x66 = Right
-keycode 0x5A = KP_Insert KP_0
-keycode 0x5B = KP_Delete KP_Decimal
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift = Shift_L Shift_R
-add Lock = Caps_Lock
-add Control = Control_L Control_R
-add Mod1 = Alt_L
-add Mod2 = Num_Lock
-add Mod3 = Mode_switch
-add Mod5 = Scroll_Lock
diff --git a/gkb-new/xmodmap/xmodmap.ge_la b/gkb-new/xmodmap/xmodmap.ge_la
deleted file mode 100644
index 985f656a..00000000
--- a/gkb-new/xmodmap/xmodmap.ge_la
+++ /dev/null
@@ -1,126 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] Tue Nov 23 00:33:31 CET 1999
-clear Mod1
-clear Mod2
-! Georgian keyboard map, in the so called "latin" layout.
-! 1999, Pablo Saratxaga <[email protected]>
-!
-! Georgian mode is toggled by Right_Ctrl key and shifted by AltGr key.
-! uppercase in georgian mode gives the lower case ascii, this can be useful
-! to type whithout switching mode.
-!
-! the layout has been copied from
-! http://members.tripod.com/~beso/html/L-K-COD.HTM
-! with some few changes it is:
-!
-! `~�� 1!1! 2@2@ 3 3 4$4$ 5% 6^6^ 7&7& 8*8* 9(9( 0)0) -_-_ =+=+ \|\| BackSp
-! Tab qQ�q wW�� eE�e rR�r tT�� yY�� uU�u iI�i oO�o Pp�p [{[{ ]}]}
-! CapsLock aA�a sS�� dD�d fF�f gG�g hH�h jJ�� kK�k lL�l ;:;: '"'" Return
-! Shift ���� zZ�� xX�x cC�� vV�v bB�b nN�n mM�m ,<,< .>.> /?/? Shift
-! Ctrl Alt Space Space Space NonBreakingSpace� ModeShift ModeLock
-!
-! the chars ���������� are not mapped...
-!
-!charset "georgian-academy"
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 exclam 1 exclam
-keycode 11 = 2 at 2 at
-keycode 12 = 3 numbersign 3 numbersign
-keycode 13 = 4 dollar 4 dollar
-keycode 14 = 5 percent 5 percent
-keycode 15 = 6 asciicircum 6 asciicircum
-keycode 16 = 7 ampersand 7 ampersand
-keycode 17 = 8 asterisk 8 asterisk
-keycode 18 = 9 parenleft 9 parenleft
-keycode 19 = 0 parenright 0 parenright
-keycode 20 = minus underscore minus underscore
-keycode 21 = equal plus equal plus
-keycode 22 = BackSpace Delete BackSpace Delete
-keycode 23 = Tab Tab Tab Tab
-keycode 24 = q Q 0xd5 q
-keycode 25 = w W 0xdc 0xdd
-keycode 26 = e E 0xc4 e
-keycode 27 = r R 0xd0 r
-keycode 28 = t T 0xd2 0xd6
-keycode 29 = y Y 0xd7 0xc7
-keycode 30 = u U 0xd3 u
-keycode 31 = i I 0xc8 i
-keycode 32 = o O 0xcd o
-keycode 33 = p P 0xce p
-keycode 34 = bracketleft braceleft bracketleft braceleft
-keycode 35 = bracketright braceright bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A 0xc0 a
-keycode 39 = s S 0xd1 0xd8
-keycode 40 = d D 0xc3 d
-keycode 41 = f F 0xd4 f
-keycode 42 = g G 0xc2 g
-keycode 43 = h H 0xe0 h
-keycode 44 = j J 0xdf 0xcf
-keycode 45 = k K 0xc9 k
-keycode 46 = l L 0xca l
-keycode 47 = semicolon colon semicolon colon
-keycode 48 = apostrophe quotedbl apostrophe quotedbl
-keycode 49 = grave asciitilde 0xeb 0xec
-keycode 50 = Shift_L
-keycode 51 = backslash bar backslash bar
-keycode 52 = z Z 0xc6 0xdb
-keycode 53 = x X 0xde x
-keycode 54 = c C 0xda 0xd9
-keycode 55 = v V 0xc5 v
-keycode 56 = b B 0xc1 b
-keycode 57 = n N 0xcc n
-keycode 58 = m M 0xcb m
-keycode 59 = comma less comma less
-keycode 60 = period greater period greater
-keycode 61 = slash question slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = 0xab 0xbb 0xe7 0xe8
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 116 = Mode_switch
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.ge_ru b/gkb-new/xmodmap/xmodmap.ge_ru
deleted file mode 100644
index 6c2362b2..00000000
--- a/gkb-new/xmodmap/xmodmap.ge_ru
+++ /dev/null
@@ -1,131 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] dju mai 27 17:45:55 CEST 1999
-clear Mod1
-clear Mod2
-clear Lock
-clear Control
-! Georgian keyboard map, in the so called "russian" layout.
-! 1999, Pablo Saratxaga <[email protected]>
-!
-! Georgian mode is toggled by Right_Ctrl key and shifted by AltGr key.
-! uppercase in georgian mode gives the lower case ascii, this can be useful
-! to type whithout switching mode.
-!
-! the layout has been copied from
-! http://members.tripod.com/~beso/html/RU-K-COD.HTM
-! with some few changes it is:
-!
-! `~^~ 1!1! 2@2� 3 3� 4$4; 5%5: 6^6, 7&7. 8*8* 9(9( 0)0) -_-_ =+ | \|�� BackSp
-! Tab qQ�q wW�w eE�e rR�r tT�t yY�y uU�u iI�i oO�p [{�[ ]}�]
-! CapsLock aA�a sS�s dD�d fF�f gG�g hH�h jJ�j kK�k lL�; ;:�: '"�% Return
-! Shift ���� zZ�z xX�x cC�c vV�v bB�b nN�n mM�m ,<�< .>�> /?�? Shift
-! Ctrl Alt Space Space Space NonBreakingSpace� ModeShift ModeLock
-!
-!
-!charset "georgian-academy"
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 exclam 1 exclam
-keycode 11 = 2 at 2 0xeb
-keycode 12 = 3 numbersign 3 0xec
-keycode 13 = 4 dollar 4 semicolon
-keycode 14 = 5 percent 5 colon
-keycode 15 = 6 asciicircum 6 comma
-keycode 16 = 7 ampersand 7 period
-keycode 17 = 8 asterisk 8 asterisk
-keycode 18 = 9 parenleft 9 parenleft
-keycode 19 = 0 parenright 0 parenright
-keycode 20 = minus underscore minus underscore
-keycode 21 = equal plus numbersign bar
-keycode 22 = BackSpace Delete BackSpace Delete
-keycode 23 = Tab Tab Tab Tab
-keycode 24 = q Q 0xd6 q
-keycode 25 = w W 0xda w
-keycode 26 = e E 0xd3 e
-keycode 27 = r R 0xc9 r
-keycode 28 = t T 0xc4 t
-keycode 29 = y Y 0xcc y
-keycode 30 = u U 0xc2 u
-keycode 31 = i I 0xd8 i
-keycode 32 = o O 0xdc o
-keycode 33 = p P 0xc6 p
-keycode 34 = bracketleft braceleft 0xde bracketleft
-keycode 35 = bracketright braceright 0xdf bracketright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A 0xd4 a
-keycode 39 = s S 0xc7 s
-keycode 40 = d D 0xc5 d
-keycode 41 = f F 0xc0 f
-keycode 42 = g G 0xce g
-keycode 43 = h H 0xd0 h
-keycode 44 = j J 0xcd j
-keycode 45 = k K 0xca k
-keycode 46 = l L 0xc3 l
-keycode 47 = semicolon colon 0xcf semicolon
-keycode 48 = apostrophe quotedbl 0xdb percent
-keycode 49 = grave asciitilde asciicircum asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar 0xe9 0xea
-keycode 52 = z Z 0xdd z
-keycode 53 = x X 0xd9 x
-keycode 54 = c C 0xd1 c
-keycode 55 = v V 0xcb v
-keycode 56 = b B 0xc8 b
-keycode 57 = n N 0xd2 n
-keycode 58 = m M 0xd5 m
-keycode 59 = comma less 0xc1 less
-keycode 60 = period greater 0xd7 greater
-keycode 61 = slash question 0xe0 question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space space 0xa0
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = 0xab 0xbb 0xe7 0xe8
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 116 = Mode_switch
-keycode 117 = Multi_key
-!
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-add Lock = Control_R
-add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.gr b/gkb-new/xmodmap/xmodmap.gr
deleted file mode 100644
index 9b12fccc..00000000
--- a/gkb-new/xmodmap/xmodmap.gr
+++ /dev/null
@@ -1,121 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:24:01 CET 1998
-clear Mod1
-clear Mod2
-clear Lock
-clear Control
-! Improved from gr.map by [email protected] Tue Apr 5 17:20:51 1994
-! by Pablo Saratxaga (������ ��������� ;+) ) <[email protected]>
-!
-! This is an iso-8859-7 mapping. Use together with "setfont iso07.*"
-! activated by sending Esc ( K to the console.
-!
-!charset "iso-8859-7"
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 exclam 1 exclam
-keycode 11 = 2 at 2 at
-keycode 12 = 3 numbersign 3 numbersign
-keycode 13 = 4 dollar 4 dollar
-keycode 14 = 5 percent 5 percent
-keycode 15 = 6 asciicircum 6 asciicircum
-keycode 16 = 7 ampersand 7 ampersand
-keycode 17 = 8 asterisk 8 asterisk
-keycode 18 = 9 parenleft 9 parenleft
-keycode 19 = 0 parenright 0 parenright
-keycode 20 = minus underscore minus underscore
-keycode 21 = equal plus equal plus
-keycode 22 = BackSpace Delete BackSpace Delete
-keycode 23 = Tab Tab Tab Tab
-keycode 24 = q Q semicolon colon
-keycode 25 = w W Greek_finalsmallsigma dead_circumflex
-keycode 26 = e E Greek_epsilon Greek_EPSILON
-keycode 27 = r R Greek_rho Greek_rho
-keycode 28 = t T Greek_tau Greek_TAU
-keycode 29 = y Y Greek_upsilon Greek_UPSILON
-keycode 30 = u U Greek_theta Greek_THETA
-keycode 31 = i I Greek_iota Greek_IOTA
-keycode 32 = o O Greek_omicron Greek_OMICRON
-keycode 33 = p P Greek_pi Greek_PI
-keycode 34 = bracketleft braceleft bracketleft braceleft
-keycode 35 = bracketright braceright bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A Greek_alpha Greek_ALPHA
-keycode 39 = s S Greek_sigma Greek_SIGMA
-keycode 40 = d D Greek_delta Greek_DELTA
-keycode 41 = f F Greek_phi Greek_PHI
-keycode 42 = g G Greek_gamma Greek_GAMMA
-keycode 43 = h H Greek_eta Greek_ETA
-keycode 44 = j J Greek_xi Greek_XI
-keycode 45 = k K Greek_kappa Greek_KAPPA
-keycode 46 = l L Greek_lamda Greek_LAMDA
-keycode 47 = semicolon colon dead_acute dead_diaeresis
-keycode 48 = apostrophe quotedbl apostrophe quotedbl
-keycode 49 = grave asciitilde grave asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar backslash bar
-keycode 52 = z Z Greek_zeta Greek_ZETA
-keycode 53 = x X Greek_chi Greek_CHI
-keycode 54 = c C Greek_psi Greek_PSI
-keycode 55 = v V Greek_omega Greek_OMEGA
-keycode 56 = b B Greek_beta Greek_BETA
-keycode 57 = n N Greek_nu Greek_NU
-keycode 58 = m M Greek_mu Greek_MU
-keycode 59 = comma less comma less
-keycode 60 = period greater period greater
-keycode 61 = slash question slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11 F1 F11
-keycode 68 = F2 F12 F2 F12
-keycode 69 = F3 F13 F3 F13
-keycode 70 = F4 F14 F4 F14
-keycode 71 = F5 F15 F5 F15
-keycode 72 = F6 F16 F6 F16
-keycode 73 = F7 F17 F7 F17
-keycode 74 = F8 F18 F8 F18
-keycode 75 = F9 F19 F9 F19
-keycode 76 = F10 F20 F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater less greater
-keycode 95 = F11 F11 F11 F11
-keycode 96 = F12 F12 F12 F12
-keycode 108 = KP_Enter
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-!
-! left windows key
-! right windows key
-keycode 116 = Mode_switch
-! menu key (on windows keyboars)
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-add Lock = Control_R
-add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.hu b/gkb-new/xmodmap/xmodmap.hu
deleted file mode 100644
index c06d5c62..00000000
--- a/gkb-new/xmodmap/xmodmap.hu
+++ /dev/null
@@ -1,116 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:04 CET 1998
-clear Mod1
-clear Mod2
-!
-! Hungarian keytable by DOS standards (iso8859-2)
-!
-! Levardy Zoltan ([email protected])
-!
-!charset "iso-8859-2"
-keycode 9 = Escape
-keycode 10 = 1 apostrophe asciitilde
-keycode 11 = 2 quotedbl dead_caron
-keycode 12 = 3 plus asciicircum
-keycode 13 = 4 exclam dead_breve
-keycode 14 = 5 percent degree
-keycode 15 = 6 slash dead_ogonek
-keycode 16 = 7 equal dead_grave
-keycode 17 = 8 parenleft dead_abovedot
-keycode 18 = 9 parenright dead_acute
-keycode 19 = odiaeresis Odiaeresis dead_doubleacute
-keycode 20 = udiaeresis Udiaeresis dead_diaeresis
-keycode 21 = oacute Oacute dead_cedilla
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q Q backslash
-keycode 25 = w W bar
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i I Iacute iacute
-keycode 32 = o
-keycode 33 = p
-keycode 34 = odoubleacute Odoubleacute division
-keycode 35 = uacute Uacute
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s S dstroke
-keycode 40 = d D Dstroke
-keycode 41 = f F bracketleft
-keycode 42 = g G bracketright
-keycode 43 = h
-keycode 44 = j J iacute Iacute
-keycode 45 = k K lstroke Lstroke
-keycode 46 = l L Lstroke lstroke
-keycode 47 = eacute Eacute dollar
-keycode 48 = aacute Aacute ssharp
-keycode 49 = 0 section
-keycode 50 = Shift_L
-keycode 51 = udoubleacute Udoubleacute currency
-keycode 52 = y Y greater
-keycode 53 = x X numbersign
-keycode 54 = c C ampersand
-keycode 55 = v V at
-keycode 56 = b B braceleft
-keycode 57 = n N braceright
-keycode 58 = m M less
-keycode 59 = comma question semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore asterisk
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = iacute Iacute less
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-! as dead_ogonek, dead_caron, dead_breve and dead_doubleacute doesn't exist
-! (yet), I put also compose lines for use with respectively dead_cedilla,
-! dead_circumflex, dead_tilde and dead_tilde
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.hu-101-lat1 b/gkb-new/xmodmap/xmodmap.hu-101-lat1
deleted file mode 100644
index ff5be2cf..00000000
--- a/gkb-new/xmodmap/xmodmap.hu-101-lat1
+++ /dev/null
@@ -1,106 +0,0 @@
-clear Mod1
-clear Mod2
-keycode 9 = Escape
-keycode 10 = 1 apostrophe asciitilde
-keycode 11 = 2 quotedbl
-keycode 12 = 3 plus asciicircum
-keycode 13 = 4 exclam
-keycode 14 = 5 percent
-keycode 15 = 6 slash
-keycode 16 = 7 equal grave
-keycode 17 = 8 parenleft
-keycode 18 = 9 parenright
-keycode 19 = odiaeresis Odiaeresis
-keycode 20 = udiaeresis Udiaeresis
-keycode 21 = oacute Oacute
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = q Q backslash
-keycode 25 = w W bar
-keycode 26 = e E asciicircum
-keycode 27 = r R
-keycode 28 = t T
-keycode 29 = z Z
-keycode 30 = u U
-keycode 31 = i I Iacute iacute
-keycode 32 = o O
-keycode 33 = p P
-keycode 34 = otilde Otilde division
-keycode 35 = uacute Uacute multiply
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A less
-keycode 39 = s S
-keycode 40 = d D
-keycode 41 = f F bracketleft
-keycode 42 = g G bracketright
-keycode 43 = h H
-keycode 44 = j J iacute Iacute
-keycode 45 = k K
-keycode 46 = l L
-keycode 47 = eacute Eacute dollar
-keycode 48 = aacute Aacute ssharp
-keycode 49 = 0 section
-keycode 50 = Shift_L
-keycode 51 = ucircumflex Ucircumflex currency
-keycode 52 = y Y greater
-keycode 53 = x X numbersign
-keycode 54 = c C ampersand
-keycode 55 = v V at
-keycode 56 = b B braceleft
-keycode 57 = n N braceright
-keycode 58 = m M less
-keycode 59 = comma question semicolon
-keycode 60 = period colon
-keycode 61 = minus underscore asterisk
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock
-keycode 78 = Mode_switch
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = iacute Iacute less
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.hu-101-lat2 b/gkb-new/xmodmap/xmodmap.hu-101-lat2
deleted file mode 100644
index ab9cd090..00000000
--- a/gkb-new/xmodmap/xmodmap.hu-101-lat2
+++ /dev/null
@@ -1,106 +0,0 @@
-clear Mod1
-clear Mod2
-keycode 9 = Escape
-keycode 10 = 1 apostrophe asciitilde
-keycode 11 = 2 quotedbl
-keycode 12 = 3 plus asciicircum
-keycode 13 = 4 exclam
-keycode 14 = 5 percent
-keycode 15 = 6 slash
-keycode 16 = 7 equal grave
-keycode 17 = 8 parenleft
-keycode 18 = 9 parenright
-keycode 19 = odiaeresis Odiaeresis
-keycode 20 = udiaeresis Udiaeresis
-keycode 21 = oacute Oacute
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = q Q backslash
-keycode 25 = w W bar
-keycode 26 = e E asciicircum
-keycode 27 = r R
-keycode 28 = t T
-keycode 29 = z Z
-keycode 30 = u U
-keycode 31 = i I Iacute iacute
-keycode 32 = o O
-keycode 33 = p P
-keycode 34 = odoubleacute Odoubleacute division
-keycode 35 = uacute Uacute multiply
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A less
-keycode 39 = s S
-keycode 40 = d D
-keycode 41 = f F bracketleft
-keycode 42 = g G bracketright
-keycode 43 = h H
-keycode 44 = j J iacute Iacute
-keycode 45 = k K
-keycode 46 = l L
-keycode 47 = eacute Eacute dollar
-keycode 48 = aacute Aacute ssharp
-keycode 49 = 0 section
-keycode 50 = Shift_L
-keycode 51 = udoubleacute Udoubleacute currency
-keycode 52 = y Y greater
-keycode 53 = x X numbersign
-keycode 54 = c C ampersand
-keycode 55 = v V at
-keycode 56 = b B braceleft
-keycode 57 = n N braceright
-keycode 58 = m M less
-keycode 59 = comma question semicolon
-keycode 60 = period colon
-keycode 61 = minus underscore asterisk
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock
-keycode 78 = Mode_switch
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = iacute Iacute less
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-add mod1 = Alt_L
-add mod5 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.hu-ibm b/gkb-new/xmodmap/xmodmap.hu-ibm
deleted file mode 100644
index f7bd5943..00000000
--- a/gkb-new/xmodmap/xmodmap.hu-ibm
+++ /dev/null
@@ -1,104 +0,0 @@
-keycode 9 = 0 section notsign
-keycode 10 = 1 apostrophe asciitilde dead_tilde
-keycode 11 = 2 quotedbl caron dead_caron
-keycode 12 = 3 plus asciicircum dead_circumflex
-keycode 13 = 4 exclam breve dead_breve
-keycode 14 = 5 percent degree dead_abovering
-keycode 15 = 6 slash ogonek dead_ogonek
-keycode 16 = 7 equal grave dead_grave
-keycode 17 = 8 parenleft abovedot dead_abovedot
-keycode 18 = 9 parenright acute dead_acute
-keycode 19 = odiaeresis Odiaeresis doubleacute dead_doubleacute
-keycode 20 = udiaeresis Udiaeresis diaeresis dead_diaeresis
-keycode 21 = oacute Oacute cedilla dead_cedilla
-keycode 23 = BackSpace
-keycode 24 = Tab
-keycode 25 = q Q backslash Greek_OMEGA
-keycode 26 = w W bar Lstroke
-keycode 27 = e E EuroSign
-keycode 28 = r R paragraph registered
-keycode 29 = t T tslash Tslash
-keycode 30 = z Z leftarrow yen
-keycode 31 = u U downarrow uparrow
-keycode 32 = i I Iacute idotless
-keycode 33 = o O oslash Ooblique
-keycode 34 = p P thorn THORN
-keycode 35 = odoubleacute Odoubleacute division dead_abovering
-keycode 36 = uacute Uacute multiply dead_macron
-keycode 37 = udoubleacute Udoubleacute currency dead_breve
-keycode 38 = Caps_Lock
-keycode 39 = a A ae AE
-keycode 40 = s S dstroke section
-keycode 41 = d D Dstroke ETH
-keycode 42 = f F bracketleft ordfeminine
-keycode 43 = g G bracketright ENG
-keycode 44 = h H hstroke Hstroke
-keycode 45 = j J iacute
-keycode 46 = k K lstroke ampersand
-keycode 47 = l L Lstroke Lstroke
-keycode 48 = eacute Eacute dollar dead_doubleacute
-keycode 49 = aacute Aacute ssharp dead_caron
-keycode 51 = Return Return
-keycode 52 = Shift_L
-keycode 54 = y Y greater less
-keycode 55 = x X numbersign greater
-keycode 56 = c C ampersand copyright
-keycode 57 = v V at grave
-keycode 58 = b B braceleft apostrophe
-keycode 59 = n N braceright
-keycode 60 = m M mu masculine
-keycode 61 = comma question semicolon multiply
-keycode 62 = period colon periodcentered division
-keycode 63 = minus underscore asterisk dead_abovedot
-keycode 65 = Shift_R
-keycode 66 = Control_L
-keycode 68 = Alt_L
-keycode 69 = space space
-keycode 70 = Alt_R
-keycode 72 = Execute
-keycode 83 = Insert
-keycode 84 = Delete
-keycode 87 = Left
-keycode 88 = Home
-keycode 89 = End
-keycode 91 = Up
-keycode 92 = Down
-keycode 93 = Prior
-keycode 94 = Next
-keycode 97 = Right
-keycode 98 = Num_Lock
-keycode 99 = KP_7
-keycode 100 = KP_4
-keycode 101 = KP_1
-keycode 103 = KP_Divide
-keycode 104 = KP_8
-keycode 105 = KP_5
-keycode 106 = KP_2
-keycode 107 = KP_0
-keycode 108 = KP_Multiply
-keycode 109 = KP_9
-keycode 110 = KP_6
-keycode 111 = KP_3
-keycode 112 = KP_Decimal
-keycode 113 = KP_Subtract
-keycode 114 = KP_Add
-keycode 116 = KP_Enter
-keycode 118 = Escape
-keycode 120 = F1
-keycode 121 = F2
-keycode 122 = F3
-keycode 123 = F4
-keycode 124 = F5
-keycode 125 = F6
-keycode 126 = F7
-keycode 127 = F8
-keycode 128 = F9
-keycode 129 = F10
-keycode 130 = F11
-keycode 131 = F12
-keycode 132 = Print
-keycode 133 = Cancel
-keycode 134 = Pause
-keycode 139 = Multi_key
-keycode 140 = Kanji
-keycode 141 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.hu-lat1 b/gkb-new/xmodmap/xmodmap.hu-lat1
deleted file mode 100644
index 4f4bcc18..00000000
--- a/gkb-new/xmodmap/xmodmap.hu-lat1
+++ /dev/null
@@ -1,112 +0,0 @@
-clear Mod1
-clear Mod2
-!
-! Hungarian keytable using latin1 (iso-8859-1) keysysms
-!
-! Levardy Zoltan ([email protected])
-! Converted to latin1 by Pablo Saratxaga <[email protected]>
-!
-!charset "iso-8859-2"
-keycode 9 = Escape
-keycode 10 = 1 apostrophe asciitilde
-keycode 11 = 2 quotedbl dead_caron
-keycode 12 = 3 plus asciicircum
-keycode 13 = 4 exclam dead_breve
-keycode 14 = 5 percent degree
-keycode 15 = 6 slash dead_ogonek
-keycode 16 = 7 equal dead_grave
-keycode 17 = 8 parenleft dead_abovedot
-keycode 18 = 9 parenright dead_acute
-keycode 19 = odiaeresis Odiaeresis dead_doubleacute
-keycode 20 = udiaeresis Udiaeresis dead_diaeresis
-keycode 21 = oacute Oacute dead_cedilla
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q Q backslash
-keycode 25 = w W bar
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i I Iacute iacute
-keycode 32 = o
-keycode 33 = p
-keycode 34 = otilde Otilde division
-keycode 35 = uacute Uacute
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s S dstroke
-keycode 40 = d D Dstroke
-keycode 41 = f F bracketleft
-keycode 42 = g G bracketright
-keycode 43 = h
-keycode 44 = j J iacute Iacute
-keycode 45 = k K threesuperior sterling
-keycode 46 = l L sterling threesuperior
-keycode 47 = eacute Eacute dollar
-keycode 48 = aacute Aacute ssharp
-keycode 49 = 0 section
-keycode 50 = Shift_L
-keycode 51 = ucircumflex Ucircumflex currency
-keycode 52 = y Y greater
-keycode 53 = x X numbersign
-keycode 54 = c C ampersand
-keycode 55 = v V at
-keycode 56 = b B braceleft
-keycode 57 = n N braceright
-keycode 58 = m M less
-keycode 59 = comma question semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore asterisk
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = iacute Iacute less
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.hu-sun-lat2 b/gkb-new/xmodmap/xmodmap.hu-sun-lat2
deleted file mode 100644
index 27386be9..00000000
--- a/gkb-new/xmodmap/xmodmap.hu-sun-lat2
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = F11 F11 Cancel
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = F12 F12 Redo
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = F21 F21 Pause Break
-keycode 29 = F22 F22 Print SunSys_Req
-keycode 30 = F23 F23 Scroll_Lock
-keycode 31 = Left
-keycode 32 = F13 F13 SunProps
-keycode 33 = F14 F14 Undo
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 apostrophe asciitilde dead_tilde
-keycode 38 = 2 quotedbl caron dead_caron
-keycode 39 = 3 plus asciicircum dead_circumflex
-keycode 40 = 4 exclam breve dead_breve
-keycode 41 = 5 percent degree dead_abovering
-keycode 42 = 6 slash ogonek dead_ogonek
-keycode 43 = 7 equal grave dead_grave
-keycode 44 = 8 parenleft abovedot dead_abovedot
-keycode 45 = 9 parenright acute dead_acute
-keycode 46 = odiaeresis Odiaeresis doubleacute dead_doubleacute
-keycode 47 = udiaeresis Udiaeresis diaeresis dead_diaeresis
-keycode 48 = oacute Oacute cedilla dead_cedilla
-keycode 49 = 0 section notsign
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = F25 F25 KP_Divide
-keycode 54 = F26 F26 KP_Multiply
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = F15 F15 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = F16 F16 SunCopy
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q backslash Greek_OMEGA
-keycode 62 = w W bar Lstroke
-keycode 63 = e E
-keycode 64 = r R paragraph registered
-keycode 65 = t T tslash Tslash
-keycode 66 = z Z leftarrow yen
-keycode 67 = u U downarrow uparrow
-keycode 68 = i I Iacute idotless
-keycode 69 = o O oslash Ooblique
-keycode 70 = p P thorn THORN
-keycode 71 = odoubleacute Odoubleacute division dead_abovering
-keycode 72 = uacute Uacute multiply dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = F27 F27 KP_7 Home
-keycode 76 = Up F28 KP_8
-keycode 77 = F29 F29 KP_9 Prior
-keycode 78 = F24 F24 KP_Subtract
-keycode 79 = F17 F17 SunOpen
-keycode 80 = F18 F18 SunPaste
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A ae AE
-keycode 85 = s S dstroke section
-keycode 86 = d D Dstroke ETH
-keycode 87 = f F bracketleft ordfeminine
-keycode 88 = g G bracketright ENG
-keycode 89 = h H hstroke Hstroke
-keycode 90 = j J iacute
-keycode 91 = k K lstroke ampersand
-keycode 92 = l L Lstroke Lstroke
-keycode 93 = eacute Eacute dollar dead_doubleacute
-keycode 94 = aacute Aacute ssharp dead_caron
-keycode 95 = udoubleacute Udoubleacute currency dead_breve
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left F30 KP_4
-keycode 99 = F31 F31 KP_5
-keycode 100 = Right F32 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = F19 F19 Find
-keycode 103 = Prior
-keycode 104 = F20 F20 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y greater less
-keycode 108 = x X numbersign greater
-keycode 109 = c C ampersand copyright
-keycode 110 = v V at grave
-keycode 111 = b B braceleft apostrophe
-keycode 112 = n N braceright
-keycode 113 = m M mu masculine
-keycode 114 = comma question semicolon multiply
-keycode 115 = period colon periodcentered division
-keycode 116 = minus underscore asterisk dead_abovedot
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = F33 F33 KP_1 End
-keycode 120 = Down F34 KP_2
-keycode 121 = F35 F35 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = iacute Iacute less
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap/xmodmap.hu.old b/gkb-new/xmodmap/xmodmap.hu.old
deleted file mode 100644
index 2a3721f6..00000000
--- a/gkb-new/xmodmap/xmodmap.hu.old
+++ /dev/null
@@ -1,155 +0,0 @@
-! xmodmap hungarian version,
-! written by Zoltan Vorosbaranyi ([email protected]) 1995
-! modified by Peter Soos ([email protected]) 1996
-! for standard hungarian 102-key 'board (may be used for 101-key 'board too)
-!
-! Added mappings for 101-key keyboards:
-! AltGr E --> ^
-! AltGr A --> <
-! AltGr J --> �
-! AltGr I --> � (it should be �)
-!
-! Note: AltGr Shift I --> �
-! AltGr Shift J --> �
-!
-clear shift
-clear lock
-clear control
-clear mod1
-clear mod2
-clear mod3
-clear mod4
-clear mod5
-!
-keycode 8 =
-keycode 9 = Escape
-keycode 10 = 1 apostrophe asciitilde
-keycode 11 = 2 quotedbl
-keycode 12 = 3 plus asciicircum
-keycode 13 = 4 exclam
-keycode 14 = 5 percent
-keycode 15 = 6 slash
-keycode 16 = 7 equal grave
-keycode 17 = 8 parenleft
-keycode 18 = 9 parenright
-keycode 19 = odiaeresis Odiaeresis
-keycode 20 = udiaeresis Udiaeresis
-keycode 21 = oacute Oacute
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = q Q backslash
-keycode 25 = w W bar
-keycode 26 = e E asciicircum
-keycode 27 = r R
-keycode 28 = t T
-keycode 29 = z Z
-keycode 30 = u U
-keycode 31 = i I Iacute
-keycode 32 = o O
-keycode 33 = p P
-keycode 34 = otilde Otilde division
-keycode 35 = uacute Uacute multiply
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A less
-keycode 39 = s S
-keycode 40 = d D
-keycode 41 = f F bracketleft
-keycode 42 = g G bracketright
-keycode 43 = h H
-keycode 44 = j J iacute
-keycode 45 = k K
-keycode 46 = l L
-keycode 47 = eacute Eacute dollar
-keycode 48 = aacute Aacute ssharp
-keycode 49 = 0 section
-keycode 50 = Shift_L
-keycode 51 = ucircumflex Ucircumflex currency
-keycode 52 = y Y greater
-keycode 53 = x X numbersign
-keycode 54 = c C ampersand
-keycode 55 = v V at
-keycode 56 = b B braceleft
-keycode 57 = n N braceright
-keycode 58 = m M
-keycode 59 = comma question semicolon
-keycode 60 = period colon
-keycode 61 = minus underscore asterisk
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock
-keycode 78 = Mode_switch
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 92 =
-keycode 93 =
-keycode 94 = iacute Iacute less
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 101 =
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause
-keycode 111 =
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 =
-keycode 126 =
-keycode 127 =
-keycode 128 =
-keycode 129 =
-keycode 130 =
-keycode 131 =
-keycode 132 =
-keycode 133 =
-keycode 134 =
-add shift = Shift_L Shift_R
-add lock = Caps_Lock
-add control = Control_L Control_R
-add mod1 = Alt_L Alt_R
-add mod5 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.hu_latin1 b/gkb-new/xmodmap/xmodmap.hu_latin1
deleted file mode 100644
index 731613d3..00000000
--- a/gkb-new/xmodmap/xmodmap.hu_latin1
+++ /dev/null
@@ -1,112 +0,0 @@
-clear Mod1
-clear Mod2
-!
-! Hungarian keytable using latin1 (iso-8859-1) keysysms
-!
-! Levardy Zoltan ([email protected])
-! Converted to latin1 by Pablo Saratxaga <[email protected]>
-!
-!charset "iso-8859-2"
-keycode 9 = Escape
-keycode 10 = 1 apostrophe asciitilde
-keycode 11 = 2 quotedbl dead_caron
-keycode 12 = 3 plus dead_circumflex
-keycode 13 = 4 exclam dead_breve
-keycode 14 = 5 percent degree
-keycode 15 = 6 slash dead_ogonek
-keycode 16 = 7 equal dead_grave
-keycode 17 = 8 parenleft dead_abovedot
-keycode 18 = 9 parenright dead_acute
-keycode 19 = odiaeresis Odiaeresis dead_doubleacute
-keycode 20 = udiaeresis Udiaeresis dead_diaeresis
-keycode 21 = oacute Oacute dead_cedilla
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q Q backslash
-keycode 25 = w W bar
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i I iacute Iacute
-keycode 32 = o
-keycode 33 = p
-keycode 34 = otilde Otilde division
-keycode 35 = uacute Uacute
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s S dstroke
-keycode 40 = d D Dstroke
-keycode 41 = f F bracketleft
-keycode 42 = g G bracketright
-keycode 43 = h
-keycode 44 = j J Iacute iacute
-keycode 45 = k K threesuperior sterling
-keycode 46 = l L sterling threesuperior
-keycode 47 = eacute Eacute dollar
-keycode 48 = aacute Aacute ssharp
-keycode 49 = 0 section
-keycode 50 = Shift_L
-keycode 51 = ucircumflex Ucircumflex currency
-keycode 52 = y Y greater
-keycode 53 = x X numbersign
-keycode 54 = c C ampersand
-keycode 55 = v V at
-keycode 56 = b B braceleft
-keycode 57 = n N braceright
-keycode 58 = m M less
-keycode 59 = comma question semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore asterisk
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = iacute Iacute less
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.hu_x86 b/gkb-new/xmodmap/xmodmap.hu_x86
deleted file mode 100644
index 6745dab8..00000000
--- a/gkb-new/xmodmap/xmodmap.hu_x86
+++ /dev/null
@@ -1,129 +0,0 @@
-keycode 8 = 0 section
-keycode 9 = 1 abovedot asciitilde
-keycode 10 = 2 quotedbl dead_caron
-keycode 11 = 3 plus dead_circumflex
-keycode 12 = 4 exclam dead_breve
-keycode 13 = 5 percent dead_degree
-keycode 14 = 6 slash dead_ogonek
-keycode 15 = 7 equal grave
-keycode 16 = 8 parenleft dead_hypen
-keycode 17 = 9 parenright SunFA_Acute
-keycode 18 = odiaeresis Odiaeresis dead_doubleacute
-keycode 19 = udiaeresis Udiaeresis SunFA_Diaeresis
-keycode 20 = oacute Oacute dead_cedilla
-keycode 21 =
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = q Q backslash
-keycode 25 = w W bar
-keycode 26 = e E
-keycode 27 = r R
-keycode 28 = t T
-keycode 29 = z Z
-keycode 30 = u U
-keycode 31 = i I
-keycode 32 = o O
-keycode 33 = p P
-keycode 34 = odoubleacute Odoubleacute division
-keycode 35 = uacute Uacute multiply
-keycode 36 = udoubleacute Udoubleacute currency
-keycode 37 = Caps_Lock
-keycode 38 = a A
-keycode 39 = s S dstroke
-keycode 40 = d D Dstroke
-keycode 41 = f F bracketleft
-keycode 42 = g G bracketright
-keycode 43 = h Ha iacute
-keycode 44 = j J
-keycode 45 = k K lstroke
-keycode 46 = l L Lstroke
-keycode 47 = eacute Eacute dollar
-keycode 48 = aacute Aacute ssharp
-keycode 49 =
-keycode 50 = Return
-keycode 51 = Shift_L
-keycode 52 =
-keycode 53 = y Y greater
-keycode 54 = x X numbersign
-keycode 55 = c C ampersand
-keycode 56 = v V at
-keycode 57 = b B braceleft
-keycode 58 = n N braceright
-keycode 59 = m M less
-keycode 60 = comma question semicolon
-keycode 61 = period colon greater
-keycode 62 = minus underscore asterisk
-keycode 63 =
-keycode 64 = Shift_R
-keycode 65 = Control_L
-keycode 66 =
-keycode 67 = Alt_L
-keycode 68 = space
-keycode 69 = SunAltGraph
-keycode 70 =
-keycode 71 = Control_R
-keycode 72 =
-keycode 73 =
-keycode 74 =
-keycode 75 =
-keycode 76 =
-keycode 77 =
-keycode 78 =
-keycode 79 =
-keycode 80 =
-keycode 81 =
-keycode 82 = Insert
-keycode 83 = Delete
-keycode 84 =
-keycode 85 =
-keycode 86 = Left
-keycode 87 = Home
-keycode 88 = End
-keycode 89 =
-keycode 90 = Up
-keycode 91 = Down
-keycode 92 = Prior
-keycode 93 = Next
-keycode 94 =
-keycode 95 =
-keycode 96 = Right
-keycode 97 = Num_Lock
-keycode 98 = Home KP_7 KP_7
-keycode 99 = Left KP_4 KP_4
-keycode 100 = End KP_1 KP_1
-keycode 101 =
-keycode 102 = KP_Divide
-keycode 103 = Up KP_8 KP_8
-keycode 104 = KP_5 KP_5 KP_5
-keycode 105 = Down KP_2 KP_2
-keycode 106 = KP_Insert KP_0 KP_0
-keycode 107 = KP_Multiply
-keycode 108 = Prior KP_9 KP_9
-keycode 109 = Right KP_6 KP_6
-keycode 110 = Next KP_3 KP_3
-keycode 111 = Delete KP_Separator KP_Separator
-keycode 112 = KP_Subtract
-keycode 113 = KP_Add
-keycode 114 =
-keycode 115 = KP_Enter
-keycode 116 =
-keycode 117 = Escape
-keycode 118 =
-keycode 119 = F1
-keycode 120 = F2
-keycode 121 = F3
-keycode 122 = F4
-keycode 123 = F5
-keycode 124 = F6
-keycode 125 = F7
-keycode 126 = F8
-keycode 127 = F9
-keycode 128 = F10
-keycode 129 = SunF36
-keycode 130 = SunF37
-keycode 131 = Print SunSys_Req
-keycode 132 = Scroll_Lock
-keycode 133 = Pause Break
-keycode 134 =
-keycode 135 = Multi_key
-keycode 136 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.il b/gkb-new/xmodmap/xmodmap.il
deleted file mode 100644
index 16e8bc03..00000000
--- a/gkb-new/xmodmap/xmodmap.il
+++ /dev/null
@@ -1,117 +0,0 @@
-! Israeli keyboard
-! from description contributed by Tzafrir Cohen <[email protected]>
-!
-!
-clear Mod1
-clear Mod2
-clear Lock
-clear Control
-!charset "iso-8859-8"
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 exclam 1 exclam
-keycode 11 = 2 at 2 at
-keycode 12 = 3 numbersign 3 numbersign
-keycode 13 = 4 dollar 4 dollar
-keycode 14 = 5 percent 5 percent
-keycode 15 = 6 asciicircum 6 asciicircum
-keycode 16 = 7 ampersand 7 ampersand
-keycode 17 = 8 asterisk 8 asterisk
-keycode 18 = 9 parenleft 9 parenleft
-keycode 19 = 0 parenright 0 parenright
-keycode 20 = minus underscore minus underscore
-keycode 21 = equal plus
-keycode 22 = BackSpace BackSpace BackSpace BackSpace
-keycode 23 = Tab Tab Tab Tab
-keycode 24 = q Q slash q
-keycode 25 = w W apostrophe w
-keycode 26 = e E hebrew_qoph e
-keycode 27 = r R hebrew_resh r
-keycode 28 = t T hebrew_aleph t
-keycode 29 = y Y hebrew_tet y
-keycode 30 = u U hebrew_waw u
-keycode 31 = i I hebrew_finalnun i
-keycode 32 = o O hebrew_finalmem o
-keycode 33 = p P hebrew_pe p
-keycode 34 = bracketleft braceleft bracketleft braceleft
-keycode 35 = bracketright braceright bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A hebrew_shin a
-keycode 39 = s S hebrew_dalet s
-keycode 40 = d D hebrew_gimel d
-keycode 41 = f F hebrew_kaph f
-keycode 42 = g G hebrew_ayin g
-keycode 43 = h H hebrew_yod h
-keycode 44 = j J hebrew_chet j
-keycode 45 = k K hebrew_lamed k
-keycode 46 = l L hebrew_finalkaph l
-keycode 47 = semicolon colon hebrew_finalpe colon
-keycode 48 = apostrophe quotedbl comma quotedbl
-keycode 49 = grave asciitilde semicolon asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar backslash bar
-keycode 52 = z Z hebrew_zain z
-keycode 53 = x X hebrew_samech x
-keycode 54 = c C hebrew_bet c
-keycode 55 = v V hebrew_he v
-keycode 56 = b B hebrew_nun b
-keycode 57 = n N hebrew_mem n
-keycode 58 = m M hebrew_zade m
-keycode 59 = comma less hebrew_taw less
-keycode 60 = period greater hebrew_finalzade greater
-keycode 61 = slash question period question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11 F1 F11
-keycode 68 = F2 F12 F2 F12
-keycode 69 = F3 F13 F3 F13
-keycode 70 = F4 F14 F4 F14
-keycode 71 = F5 F15 F5 F15
-keycode 72 = F6 F16 F6 F16
-keycode 73 = F7 F17 F7 F17
-keycode 74 = F8 F18 F8 F18
-keycode 75 = F9 F19 F9 F19
-keycode 76 = F10 F20 F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater less greater
-keycode 95 = F11 F11 F11 F11
-keycode 96 = F12 F12 F12 F12
-keycode 108 = KP_Enter
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-!
-! left windows key
-! right windows key
-keycode 116 = Mode_switch
-! menu key (on windows keyboars)
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-add Lock = Control_R
-add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.il_phonetic b/gkb-new/xmodmap/xmodmap.il_phonetic
deleted file mode 100644
index 7e333dbe..00000000
--- a/gkb-new/xmodmap/xmodmap.il_phonetic
+++ /dev/null
@@ -1,117 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:05 CET 1998
-clear Mod1
-clear Mod2
-clear Lock
-clear Control
-! Israeli iso-8859-8 keyboard. Improved from the hebrew.map found in Slackware
-! by Pablo Saratxaga <[email protected]>
-!charset "iso-8859-8"
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 exclam 1 exclam
-keycode 11 = 2 at 2 at
-keycode 12 = 3 numbersign 3 numbersign
-keycode 13 = 4 dollar 4 dollar
-keycode 14 = 5 percent 5 percent
-keycode 15 = 6 asciicircum 6 asciicircum
-keycode 16 = 7 ampersand 7 ampersand
-keycode 17 = 8 asterisk 8 asterisk
-keycode 18 = 9 parenleft 9 parenleft
-keycode 19 = 0 parenright 0 parenright
-keycode 20 = minus underscore minus underscore
-keycode 21 = equal plus hebrew_doublelowline hebrew_doublelowline
-keycode 22 = BackSpace BackSpace BackSpace BackSpace
-keycode 23 = Tab Tab Tab Tab
-keycode 24 = q Q hebrew_qoph hebrew_qoph
-keycode 25 = w W hebrew_waw hebrew_waw
-keycode 26 = e E hebrew_aleph hebrew_aleph
-keycode 27 = r R hebrew_resh hebrew_resh
-keycode 28 = t T hebrew_taw hebrew_tet
-keycode 29 = y Y hebrew_ayin hebrew_ayin
-keycode 30 = u U hebrew_waw hebrew_waw
-keycode 31 = i I hebrew_yod hebrew_yod
-keycode 32 = o O hebrew_samech hebrew_samech
-keycode 33 = p P hebrew_pe hebrew_finalpe
-keycode 34 = bracketleft braceleft bracketleft braceleft
-keycode 35 = bracketright braceright bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A hebrew_aleph hebrew_aleph
-keycode 39 = s S hebrew_shin hebrew_shin
-keycode 40 = d D hebrew_dalet hebrew_dalet
-keycode 41 = f F hebrew_pe hebrew_finalpe
-keycode 42 = g G hebrew_gimel hebrew_gimel
-keycode 43 = h H hebrew_he hebrew_he
-keycode 44 = j J hebrew_yod hebrew_yod
-keycode 45 = k K hebrew_kaph hebrew_finalkaph
-keycode 46 = l L hebrew_lamed hebrew_lamed
-keycode 47 = semicolon colon semicolon colon
-keycode 48 = apostrophe quotedbl apostrophe quotedbl
-keycode 49 = grave asciitilde asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar backslash bar
-keycode 52 = z Z hebrew_zain hebrew_zain
-keycode 53 = x X hebrew_chet hebrew_chet
-keycode 54 = c C hebrew_zade hebrew_finalzade
-keycode 55 = v V hebrew_waw hebrew_waw
-keycode 56 = b B hebrew_bet hebrew_bet
-keycode 57 = n N hebrew_nun hebrew_finalnun
-keycode 58 = m M hebrew_mem hebrew_finalmem
-keycode 59 = comma less comma less
-keycode 60 = period greater period greater
-keycode 61 = slash question slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11 F1 F11
-keycode 68 = F2 F12 F2 F12
-keycode 69 = F3 F13 F3 F13
-keycode 70 = F4 F14 F4 F14
-keycode 71 = F5 F15 F5 F15
-keycode 72 = F6 F16 F6 F16
-keycode 73 = F7 F17 F7 F17
-keycode 74 = F8 F18 F8 F18
-keycode 75 = F9 F19 F9 F19
-keycode 76 = F10 F20 F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater less greater
-keycode 95 = F11 F11 F11 F11
-keycode 96 = F12 F12 F12 F12
-keycode 108 = KP_Enter
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-!
-! left windows key
-! right windows key
-keycode 116 = Mode_switch
-! menu key (on windows keyboars)
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-add Lock = Control_R
-add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.is b/gkb-new/xmodmap/xmodmap.is
deleted file mode 100644
index 2c05b875..00000000
--- a/gkb-new/xmodmap/xmodmap.is
+++ /dev/null
@@ -1,127 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:05 CET 1998
-clear Mod1
-clear Mod2
-! This mainly follows
-! is-latin1.map: Icelandic keyboard for Latin 1 character set
-! Kristjan Jonsson ([email protected])
-! but also has some features of "ice-latin1.map' as submitted
-! by Einar Indridason ([email protected])
-!
-! Where the two maps differed, the version of the latter map
-! is given as comment - the main difference is that the latter
-! map tends to make Alt and Altgr synonyms.
-!
-! Note that this map uses the right control key as Alt
-! will not be able to produce < and > using this keymap.
-! - aeb, 950825
-! charset "iso-8859-1"
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam onesuperior
-keycode 11 = 2 quotedbl twosuperior
-keycode 12 = 3 numbersign threesuperior
-keycode 13 = 4 dollar onequarter
-keycode 14 = 5 percent onehalf
-keycode 15 = 6 ampersand threequarters
-keycode 16 = 7 slash braceleft
-keycode 17 = 8 parenleft bracketleft
-keycode 18 = 9 parenright bracketright
-keycode 19 = 0 equal braceright
-keycode 20 = odiaeresis Odiaeresis backslash
-keycode 21 = minus underscore hyphen
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q Q at
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = eth ETH
-keycode 35 = apostrophe question asciitilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = ae AE
-keycode 48 = dead_acute asciicircum
-! keycode 40 = dead_acute dead_acute asciicircum
-keycode 49 = degree dead_diaeresis bar
-! keycode 41 = apostrophe asciitilde
-keycode 50 = Shift_L
-keycode 51 = plus asterisk grave
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon guillemotleft
-keycode 60 = period colon guillemotright
-keycode 61 = thorn THORN
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.it b/gkb-new/xmodmap/xmodmap.it
deleted file mode 100644
index c52720c5..00000000
--- a/gkb-new/xmodmap/xmodmap.it
+++ /dev/null
@@ -1,140 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:06 CET 1998
-clear Mod1
-clear Mod2
-! Italian keymap with emacs enhancements
-! Beta version Mon May 2 19:57:25 WET DST 1994
-! Available for anon. ftp at cnuce_arch.cnr.it:/pub/Linux-local/kbd/it.map
-!
-! Based on all other keymaps available in Slackware-1.2.0.
-!
-! '@', ' ', '[', and ']' are obtained by AltGr with the appropriate key.
-!
-! I have added '{', '}', '~', '`', iacute and uacute.
-! They can be obtained by AltGr-(, AltGr-), AltGr-=, AltGr-', AltGr-igrave
-! and AltGr-ugrave respectively.
-!
-! I have also added most Alt-Shift and Ctrl-Alt codes needed for emacs
-! with the standard keymap of the fundamental mode.
-!
-! Place in your ~/.emacs the following two lines:
-! (standard-display-european t)
-! (set-input-mode nil nil 1)
-!
-! Place in your /usr/lib/X11/Xconfig:
-! LeftAlt Meta
-! RightAlt ModeShift
-!
-! To use high characters with other programs, read the documentation ;-)
-! Please report all bugs and improvement proposals to the address below.
-!
-! Buona fortuna,
-! Dario Besseghini <[email protected]>
-!
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 quotedbl
-keycode 12 = 3 sterling
-keycode 13 = 4 dollar
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand
-keycode 16 = 7 slash
-keycode 17 = 8 parenleft braceleft
-keycode 18 = 9 parenright braceright
-keycode 19 = 0 equal asciitilde
-keycode 20 = apostrophe question grave
-keycode 21 = igrave asciicircum iacute
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = egrave eacute bracketleft
-keycode 35 = plus asterisk bracketright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = ograve ccedilla at
-keycode 48 = agrave degree numbersign
-keycode 49 = backslash bar
-keycode 50 = Shift_L
-keycode 51 = ugrave section uacute
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.jp b/gkb-new/xmodmap/xmodmap.jp
deleted file mode 100644
index c2ae0d00..00000000
--- a/gkb-new/xmodmap/xmodmap.jp
+++ /dev/null
@@ -1,120 +0,0 @@
-! Converted by Yukihiro Nakai <[email protected]>
-! Send bugs or reports to me.
-!
-! 03 Jul 2000
-clear Mod1
-clear Mod2
-keycode 9 = Escape
-keycode 10 = 1 exclam kana_NU exclamdown
-keycode 11 = 2 quotedbl kana_FU oneeighth
-keycode 12 = 3 numbersign kana_A kana_a
-keycode 13 = 4 dollar kana_U kana_u
-keycode 14 = 5 percent kana_E kana_e
-keycode 15 = 6 ampersand kana_O kana_o
-keycode 16 = 7 apostrophe kana_YA kana_ya
-keycode 17 = 8 parenleft kana_YU kana_yu
-keycode 18 = 9 parenright kana_YO kana_yo
-keycode 19 = 0 asciitilde kana_WA kana_WO
-keycode 20 = minus equal kana_HO questiondown
-keycode 21 = asciicircum asciitilde kana_HE dead_ogonek
-keycode 22 = BackSpace
-keycode 23 = Tab ISO_Left_Tab
-keycode 24 = q Q kana_TA Greek_OMEGA
-keycode 25 = w W kana_TE Lstroke
-keycode 26 = e E kana_I kana_i
-keycode 27 = r R kana_SU registered
-keycode 28 = t T kana_KA Tslash
-keycode 29 = y Y kana_N yen
-keycode 30 = u U kana_NA uparrow
-keycode 31 = i I kana_NI idotless
-keycode 32 = o O kana_RA Ooblique
-keycode 33 = p P kana_SE THORN
-keycode 34 = at grave voicedsound dead_abovering
-keycode 35 = bracketleft braceleft semivoicedsound kana_openingbracket
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A kana_CHI AE
-keycode 39 = s S kana_TO section
-keycode 40 = d D kana_SHI ETH
-keycode 41 = f F kana_HA ordfeminine
-keycode 42 = g G kana_KI ENG
-keycode 43 = h H kana_KU Hstroke
-keycode 44 = j J kana_MA
-keycode 45 = k K kana_NO ampersand
-keycode 46 = l L kana_RI Lstroke
-keycode 47 = semicolon plus kana_RE dead_doubleacute
-keycode 48 = colon asterisk kana_KE dead_caron
-keycode 49 = Zenkaku_Hankaku Kanji
-keycode 50 = Shift_L
-keycode 51 = bracketright braceright kana_MU kana_closingbracket
-keycode 52 = z Z kana_TSU kana_tsu
-keycode 53 = x X kana_SA greater
-keycode 54 = c C kana_SO copyright
-keycode 55 = v V kana_HI grave
-keycode 56 = b B kana_KO apostrophe
-keycode 57 = n N kana_MI
-keycode 58 = m M kana_MO masculine
-keycode 59 = comma less kana_NE kana_comma
-keycode 60 = period greater kana_RU kana_fullstop
-keycode 61 = slash question kana_ME kana_conjunctive
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock Eisu_toggle
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock Pointer_EnableKeys
-keycode 78 = Scroll_Lock
-keycode 79 = KP_Home KP_7
-keycode 80 = KP_Up KP_8
-keycode 81 = KP_Prior KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_Left KP_4
-keycode 84 = KP_Begin KP_5
-keycode 85 = KP_Right KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_End KP_1
-keycode 88 = KP_Down KP_2
-keycode 89 = KP_Next KP_3
-keycode 90 = KP_Insert KP_0
-keycode 91 = KP_Delete KP_Decimal
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause Break
-keycode 111 = Print Execute
-keycode 112 = KP_Divide
-keycode 113 = Alt_R Meta_R
-keycode 120 = Hiragana_Katakana Romaji
-keycode 123 = backslash underscore kana_RO
-keycode 129 = Henkan_Mode Mode_switch
-keycode 131 = Muhenkan
-keycode 133 = backslash bar prolongedsound
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.kr b/gkb-new/xmodmap/xmodmap.kr
deleted file mode 100644
index 95310f21..00000000
--- a/gkb-new/xmodmap/xmodmap.kr
+++ /dev/null
@@ -1,212 +0,0 @@
-! Modified by Donggyoo Lee <[email protected]>
-!
-! modified from standard key mapping for XFree86 (for US keyboards).
-!
-! First, clear the modifiers
-!
-clear shift
-clear lock
-clear control
-clear mod1
-clear mod2
-clear mod3
-clear mod4
-clear mod5
-!
-! Set the mapping for each key
-!
-keycode 8 =
-keycode 9 = Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 at
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar
-keycode 14 = 5 percent
-keycode 15 = 6 asciicircum
-keycode 16 = 7 ampersand
-keycode 17 = 8 asterisk
-keycode 18 = 9 parenleft
-keycode 19 = 0 parenright
-keycode 20 = minus underscore
-keycode 21 = equal plus
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = q Q
-keycode 25 = w W
-keycode 26 = e E
-keycode 27 = r R
-keycode 28 = t T
-keycode 29 = y Y
-keycode 30 = u U
-keycode 31 = i I
-keycode 32 = o O
-keycode 33 = p P
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A
-keycode 39 = s S
-keycode 40 = d D
-keycode 41 = f F
-keycode 42 = g G
-keycode 43 = h H
-keycode 44 = j J
-keycode 45 = k K
-keycode 46 = l L
-keycode 47 = semicolon colon
-keycode 48 = apostrophe quotedbl
-keycode 49 = grave asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar
-keycode 52 = z Z
-keycode 53 = x X
-keycode 54 = c C
-keycode 55 = v V
-keycode 56 = b B
-keycode 57 = n N
-keycode 58 = m M
-keycode 59 = comma less
-keycode 60 = period greater
-keycode 61 = slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock
-keycode 78 = Multi_key
-keycode 79 = KP_Home KP_7
-keycode 80 = KP_Up KP_8
-keycode 81 = KP_Prior KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_Left KP_4
-keycode 84 = NoSymbol KP_5
-keycode 85 = KP_Right KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_End KP_1
-keycode 88 = KP_Down KP_2
-keycode 89 = KP_Next KP_3
-keycode 90 = KP_Insert KP_0
-keycode 91 = KP_Delete KP_Decimal
-!keycode 92 = X386Sys_Req
-keycode 93 =
-keycode 94 =
-keycode 95 = F11
-keycode 96 = F12
-! keycodes 97-107 are not available on 84-key keyboards
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 101 = Begin
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause
-keycode 111 = Print
-keycode 112 = KP_Divide
-keycode 113 = Alt_R Meta_R
-keycode 114 = Break
-! keycodes 115-117 are only available on some extended keyboards
-! (e.g., Microsoft's ergonomic keyboard).
-keycode 115 = Meta_L
-keycode 116 = Meta_R
-keycode 117 = Menu
-! KS 103(106) Keyboard on South Korea have two toggle keys
-! in addition to us-101(us-104) keys.
-! Hangul_Hanja : toggle between Korean alphabet and Chinease alphabet
-! Hangul : toggle between Korean alphabet and English alphabet
-keycode 121 = Hangul_Hanja
-keycode 122 = Hangul
-!
-! Set the modifiers
-!
-add shift = Shift_L Shift_R
-add lock = Caps_Lock
-add control = Control_L Control_R
-add mod1 = Alt_L Alt_R
-! If you have ServerNumlock set in your XF86Config, you can comment out
-add mod2 = Num_Lock
-!
-!
-!
-! If you use any of the special default key mappings in Xconfig, they should be
-! duplicated in this file. Mappings should be added before the section above
-! which sets the modifiers.
-!
-! For the key specs:
-! LeftAlt => keycode 64
-! RightAlt => keycode 113
-! AltGr => keycode 113
-! ScrollLock => keycode 78
-! RightCtl => keycode 109
-!
-! For the mappings:
-! Meta => Alt_L Meta_L
-! Alt_R Meta_R
-! Compose => Multi_key
-! ModeShift => Mode_switch
-! ModeLock => Mode_switch X386Mode_Lock
-! ScrollLock => Scroll_Lock
-! Control => Control_R
-!
-! If you use ModeShift or ModeLock, the following modifier must be set:
-!
-!add mod5 = Mode_switch
-!
-! For example, to get the equivalent of:
-!
-! ScrollLock ModeLock
-! RightAlt ModeShift
-! LeftAlt Meta
-! RightCtl Compose
-!
-! use the following:
-!
-!keycode 78 = Mode_switch X386Mode_Lock
-!keycode 113 = Mode_switch
-!keycode 64 = Alt_L Meta_L
-!keycode 109 = Multi_key
-!
-!add mod5 = Mode_switch
-
-! When using ServerNumLock in your XF86Config, the following codes/symbols
-! are available in place of 79-81, 83-85, 87-91
-!keycode 136 = KP_7
-!keycode 137 = KP_8
-!keycode 138 = KP_9
-!keycode 139 = KP_4
-!keycode 140 = KP_5
-!keycode 141 = KP_6
-!keycode 142 = KP_1
-!keycode 143 = KP_2
-!keycode 144 = KP_3
-!keycode 145 = KP_0
-!keycode 146 = KP_Decimal
-!keycode 147 = Home
-!keycode 148 = Up
-!keycode 149 = Prior
-!keycode 150 = Left
-!keycode 151 = Begin
-!keycode 152 = Right
-!keycode 153 = End
-!keycode 154 = Down
-!keycode 155 = Next
-!keycode 156 = Insert
-!keycode 157 = Delete
diff --git a/gkb-new/xmodmap/xmodmap.la b/gkb-new/xmodmap/xmodmap.la
deleted file mode 100644
index 53bb29de..00000000
--- a/gkb-new/xmodmap/xmodmap.la
+++ /dev/null
@@ -1,114 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:06 CET 1998
-clear Mod1
-clear Mod2
-! la-latin1.map by Pablo Saratxaga <[email protected]>
-! Teclado LATINOAMERICANO
-!charset "iso-8859-1"
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 quotedbl
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand
-keycode 16 = 7 slash
-keycode 17 = 8 parenleft
-keycode 18 = 9 parenright
-keycode 19 = 0 equal
-keycode 20 = apostrophe question backslash
-keycode 21 = questiondown exclamdown
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q Q at
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = dead_acute dead_diaeresis
-keycode 35 = plus asterisk dead_tilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = ntilde Ntilde
-keycode 48 = braceleft bracketleft dead_circumflex
-keycode 49 = bar degree notsign
-keycode 50 = Shift_L
-keycode 51 = braceright bracketright dead_grave
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.lt b/gkb-new/xmodmap/xmodmap.lt
deleted file mode 100644
index da18b58f..00000000
--- a/gkb-new/xmodmap/xmodmap.lt
+++ /dev/null
@@ -1,114 +0,0 @@
-!
-! Lithuanian keyboard (AZERTY layout)
-!
-!
-clear Mod1
-clear Mod2
-!
-keycode 9 = Escape Escape
-keycode 10 = exclam 1
-keycode 11 = quotedbl 2 at
-keycode 12 = slash 3 numbersign
-keycode 13 = semicolon 4 dollar
-keycode 14 = colon 5 percent
-keycode 15 = comma 6 asciicircum
-keycode 16 = period 7 ampersand
-keycode 17 = question 8 asterisk
-keycode 18 = parenleft 9
-keycode 19 = parenright 0
-keycode 20 = underscore minus minus underscore
-keycode 21 = plus equal equal plus
-keycode 22 = BackSpace
-keycode 23 = Tab Tab
-keycode 24 = aogonek Aogonek q Q
-keycode 25 = zcaron Zcaron w W
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = iogonek Iogonek bracketleft braceleft
-keycode 35 = leftdoublequotemark doublelowquotemark bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = uogonek Uogonek semicolon colon
-keycode 48 = eabovedot Eabovedot apostrophe quotedbl
-keycode 49 = grave asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar
-keycode 52 = z
-keycode 53 = umacron Umacron x X
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = ccaron Ccaron comma less
-keycode 60 = scaron Scaron period greater
-keycode 61 = eogonek Eogonek slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.lt_b b/gkb-new/xmodmap/xmodmap.lt_b
deleted file mode 100644
index 453b4213..00000000
--- a/gkb-new/xmodmap/xmodmap.lt_b
+++ /dev/null
@@ -1,120 +0,0 @@
-!
-! Lithuanian keyboard ("numeric row" QWERTY layout)
-!
-! Right_Ctrl allows switching between US and Lithuanina layouts.
-!
-clear Mod1
-clear Mod2
-clear Lock
-clear Control
-!
-keycode 9 = Escape Escape
-keycode 10 = aogonek Aogonek 1 exclam
-keycode 11 = ccaron Ccaron 2 at
-keycode 12 = eogonek Eogonek 3 numbersign
-keycode 13 = eabovedot Eabovedot 4 dollar
-keycode 14 = iogonek Iogonek 5 percent
-keycode 15 = scaron Scaron 6 asciicircum
-keycode 16 = uogonek Uogonek 7 ampersand
-keycode 17 = umacron Umacron 8 asterisk
-keycode 18 = doublelowquotemark parenleft 9 parenleft
-keycode 19 = leftdoublequotemark parenright 0 parenright
-keycode 20 = minus underscore minus underscore
-keycode 21 = zcaron Zcaron equal plus
-keycode 22 = BackSpace
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright asciitilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = semicolon colon
-keycode 48 = apostrophe quotedbl
-keycode 49 = grave asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma less
-keycode 60 = period greater Multi_key
-keycode 61 = slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-!
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-add Lock = Control_R
-add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.lt_p b/gkb-new/xmodmap/xmodmap.lt_p
deleted file mode 100644
index 6b585daa..00000000
--- a/gkb-new/xmodmap/xmodmap.lt_p
+++ /dev/null
@@ -1,120 +0,0 @@
-!
-! Lithuanian keyboard ("phonetic" QWERTY layout)
-!
-! Right_Ctrl allows switching between US and Lithuanina layouts.
-!
-clear Mod1
-clear Mod2
-clear Lock
-clear Control
-!
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 at
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar currency
-keycode 14 = 5 percent
-keycode 15 = 6 asciicircum
-keycode 16 = 7 ampersand
-keycode 17 = 8 asterisk
-keycode 18 = 9 parenleft
-keycode 19 = 0 parenright
-keycode 20 = minus underscore
-keycode 21 = equal plus
-keycode 22 = BackSpace
-keycode 23 = Tab Tab
-keycode 24 = q Q umacron Umacron
-keycode 25 = w W eabovedot Eabovedot
-keycode 26 = e E eogonek Eogonek
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u U uogonek Uogonek
-keycode 31 = i I iogonek Iogonek
-keycode 32 = o
-keycode 33 = p
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A aogonek Aogonek
-keycode 39 = s S scaron Scaron
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = semicolon colon
-keycode 48 = apostrophe quotedbl leftdoublequotemark doublelowquotemark
-keycode 49 = grave asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar
-keycode 52 = z Z zcaron Zcaron
-keycode 53 = x
-keycode 54 = c C ccaron Ccaron
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma less
-keycode 60 = period greater Multi_key
-keycode 61 = slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-!
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-add Lock = Control_R
-add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.mk b/gkb-new/xmodmap/xmodmap.mk
deleted file mode 100644
index 8065f7e4..00000000
--- a/gkb-new/xmodmap/xmodmap.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! Author: Damjan Georgievski <[email protected]>
-! Macedonian cyrillic keyboard map.
-! This file uses the X11 keysysms for cyrillic letters.
-! (This map is specially edited for MATEs gxkb)
-!
-!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 0x09 = Escape
-keycode 0x0A = 1 exclam
-keycode 0x0B = 2 doublelowquotemark 2 at
-keycode 0x0C = 3 leftdoublequotemark 3 numbersign
-keycode 0x0D = 4 dollar
-keycode 0x0E = 5 percent
-keycode 0x0F = 6 asciicircum
-keycode 0x10 = 7 ampersand
-keycode 0x11 = 8 asterisk
-keycode 0x12 = 9 parenleft
-keycode 0x13 = 0 parenright
-keycode 0x14 = minus underscore
-keycode 0x15 = equal plus
-keycode 0x16 = BackSpace
-keycode 0x17 = Tab ISO_Left_Tab
-keycode 0x18 = Cyrillic_lje Cyrillic_LJE q Q
-keycode 0x19 = Cyrillic_nje Cyrillic_NJE w W
-keycode 0x1A = Cyrillic_ie Cyrillic_IE e E
-keycode 0x1B = Cyrillic_er Cyrillic_ER r R
-keycode 0x1C = Cyrillic_te Cyrillic_TE t T
-keycode 0x1D = Macedonia_dse Macedonia_DSE y Y
-keycode 0x1E = Cyrillic_u Cyrillic_U u U
-keycode 0x1F = Cyrillic_i Cyrillic_I i I
-keycode 0x20 = Cyrillic_o Cyrillic_O o O
-keycode 0x21 = Cyrillic_pe Cyrillic_PE p P
-keycode 0x22 = Cyrillic_sha Cyrillic_SHA bracketleft braceleft
-keycode 0x23 = Macedonia_gje Macedonia_GJE bracketright braceright
-keycode 0x24 = Return
-keycode 0x25 = Control_L
-keycode 0x26 = Cyrillic_a Cyrillic_A a A
-keycode 0x27 = Cyrillic_es Cyrillic_ES s S
-keycode 0x28 = Cyrillic_de Cyrillic_DE d D
-keycode 0x29 = Cyrillic_ef Cyrillic_EF f F
-keycode 0x2A = Cyrillic_ghe Cyrillic_GHE g G
-keycode 0x2B = Cyrillic_ha Cyrillic_HA h H
-keycode 0x2C = Cyrillic_je Cyrillic_JE j J
-keycode 0x2D = Cyrillic_ka Cyrillic_KA k K
-keycode 0x2E = Cyrillic_el Cyrillic_EL l L
-keycode 0x2F = Cyrillic_che Cyrillic_CHE semicolon colon
-keycode 0x30 = Macedonia_kje Macedonia_KJE apostrophe quotedbl
-keycode 0x31 = grave asciitilde
-keycode 0x32 = Shift_L
-keycode 0x33 = Cyrillic_zhe Cyrillic_ZHE backslash bar
-keycode 0x34 = Cyrillic_ze Cyrillic_ZE z Z
-keycode 0x35 = Cyrillic_dzhe Cyrillic_DZHE x X
-keycode 0x36 = Cyrillic_tse Cyrillic_TSE c C
-keycode 0x37 = Cyrillic_ve Cyrillic_VE v V
-keycode 0x38 = Cyrillic_be Cyrillic_BE b B
-keycode 0x39 = Cyrillic_en Cyrillic_EN n N
-keycode 0x3A = Cyrillic_em Cyrillic_EM m M
-keycode 0x3B = comma semicolon comma less
-keycode 0x3C = period colon period greater
-keycode 0x3D = slash question
-keycode 0x3E = Shift_R
-keycode 0x3F = KP_Multiply
-keycode 0x40 = Alt_L Meta_L
-keycode 0x41 = space
-keycode 0x42 = Shift_Lock
-keycode 0x43 = F1
-keycode 0x44 = F2
-keycode 0x45 = F3
-keycode 0x46 = F4
-keycode 0x47 = F5
-keycode 0x48 = F6
-keycode 0x49 = F7
-keycode 0x4A = F8
-keycode 0x4B = F9
-keycode 0x4C = F10
-keycode 0x5F = F11
-keycode 0x60 = F12
-keycode 0x4D = Num_Lock Pointer_EnableKeys
-keycode 0x4E = Scroll_Lock
-keycode 0x4F = KP_Home KP_7
-keycode 0x50 = KP_Up KP_8
-keycode 0x51 = KP_Prior KP_9
-keycode 0x52 = KP_Subtract
-keycode 0x53 = KP_Left KP_4
-keycode 0x54 = KP_Begin KP_5
-keycode 0x55 = KP_Right KP_6
-keycode 0x56 = KP_Add
-keycode 0x57 = KP_End KP_1
-keycode 0x58 = KP_Down KP_2
-keycode 0x59 = KP_Next KP_3
-keycode 0x5A = KP_Insert KP_0
-keycode 0x5B = KP_Delete KP_Decimal
-keycode 0x61 = Home
-keycode 0x62 = Up
-keycode 0x63 = Prior
-keycode 0x64 = Left
-keycode 0x66 = Right
-keycode 0x67 = End
-keycode 0x68 = Down
-keycode 0x69 = Next
-keycode 0x6A = Insert
-keycode 0x6B = Delete
-keycode 0x6C = KP_Enter
-keycode 0x6D = Control_R
-keycode 0x6E = Pause Break
-keycode 0x6F = Print Execute
-keycode 0x70 = KP_Divide
-!!! Need comments on usage of this keys
-keycode 0x71 = Mode_switch Meta_R
-keycode 0x73 = Mode_switch
-keycode 0x74 = Multi_key
-keycode 0x75 = ISO_Next_Group
-!!!
-
diff --git a/gkb-new/xmodmap/xmodmap.mn b/gkb-new/xmodmap/xmodmap.mn
deleted file mode 100644
index 61ca61b2..00000000
--- a/gkb-new/xmodmap/xmodmap.mn
+++ /dev/null
@@ -1,121 +0,0 @@
-! Mongolian cyrillic keymap
-! Generated by Sanlig Badral <[email protected]>
-! 2002/12/8
-!
-
-clear Mod1
-clear Mod2
-clear Lock
-clear Control
-
-!charset "iso-10646-1"
-
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 exclam 1 numerosign
-keycode 11 = 2 at 2 minus
-keycode 12 = 3 numbersign 3 quotedbl
-keycode 13 = 4 dollar 4 U20AE
-keycode 14 = 5 percent 5 colon
-keycode 15 = 6 asciicircum 6 period
-keycode 16 = 7 ampersand 7 underscore
-keycode 17 = 8 asterisk 8 comma
-keycode 18 = 9 parenleft 9 percent
-keycode 19 = 0 parenright 0 question
-keycode 20 = minus underscore Cyrillic_ie Cyrillic_IE
-keycode 21 = equal plus Cyrillic_shcha Cyrillic_SHCHA
-keycode 22 = BackSpace BackSpace BackSpace BackSpace
-keycode 23 = Tab Tab Tab Tab
-keycode 24 = q Q Cyrillic_ef Cyrillic_EF
-keycode 25 = w W Cyrillic_tse Cyrillic_TSE
-keycode 26 = e E Cyrillic_u Cyrillic_U
-keycode 27 = r R Cyrillic_zhe Cyrillic_ZHE
-keycode 28 = t T Cyrillic_e Cyrillic_E
-keycode 29 = y Y Cyrillic_en Cyrillic_EN
-keycode 30 = u U Cyrillic_ghe Cyrillic_GHE
-keycode 31 = i I Cyrillic_sha Cyrillic_SHA
-keycode 32 = o O U04AF U04AE
-keycode 33 = p P Cyrillic_ze Cyrillic_ZE
-keycode 34 = bracketleft braceleft Cyrillic_ka Cyrillic_KA
-keycode 35 = bracketright braceright Cyrillic_hardsign Cyrillic_HARDSIGN
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A Cyrillic_shorti Cyrillic_SHORTI
-keycode 39 = s S Cyrillic_yeru Cyrillic_YERU
-keycode 40 = d D Cyrillic_be Cyrillic_BE
-keycode 41 = f F 0x010004e9 0x010004e8
-keycode 42 = g G Cyrillic_a Cyrillic_A
-keycode 43 = h H Cyrillic_ha Cyrillic_HA
-keycode 44 = j J Cyrillic_er Cyrillic_ER
-keycode 45 = k K Cyrillic_o Cyrillic_O
-keycode 46 = l L Cyrillic_el Cyrillic_EL
-keycode 47 = semicolon colon Cyrillic_de Cyrillic_DE
-keycode 48 = apostrophe quotedbl Cyrillic_pe Cyrillic_PE
-keycode 49 = grave asciitilde parenleft parenright
-keycode 50 = Shift_L
-keycode 51 = backslash bar exclam bar
-keycode 52 = z Z Cyrillic_ya Cyrillic_YA
-keycode 53 = x X Cyrillic_che Cyrillic_CHE
-keycode 54 = c C Cyrillic_io Cyrillic_IO
-keycode 55 = v V Cyrillic_es Cyrillic_ES
-keycode 56 = b B Cyrillic_em Cyrillic_EM
-keycode 57 = n N Cyrillic_i Cyrillic_I
-keycode 58 = m M Cyrillic_te Cyrillic_TE
-keycode 59 = comma less Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 60 = period greater Cyrillic_ve Cyrillic_VE
-keycode 61 = slash period Cyrillic_yu Cyrillic_YU
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11 F1 F11
-keycode 68 = F2 F12 F2 F12
-keycode 69 = F3 F13 F3 F13
-keycode 70 = F4 F14 F4 F14
-keycode 71 = F5 F15 F5 F15
-keycode 72 = F6 F16 F6 F16
-keycode 73 = F7 F17 F7 F17
-keycode 74 = F8 F18 F8 F18
-keycode 75 = F9 F19 F9 F19
-keycode 76 = F10 F20 F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar brokenbar
-keycode 95 = F11 F11 F11 F11
-keycode 96 = F12 F12 F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-!
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-add Lock = Control_R
-add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.mn-phonet b/gkb-new/xmodmap/xmodmap.mn-phonet
deleted file mode 100644
index cc32019f..00000000
--- a/gkb-new/xmodmap/xmodmap.mn-phonet
+++ /dev/null
@@ -1,117 +0,0 @@
-! Mongolian cyrillic keymap fixed
-! Generated by Sanlig Badral <[email protected]>
-! 2002/12/8
-!
-clear Mod1
-clear Mod2
-clear Lock
-clear Control
-
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 exclam 1 exclam
-keycode 11 = 2 at 2 at
-keycode 12 = 3 numbersign 3 numbersign
-keycode 13 = 4 dollar 4 dollar
-keycode 14 = 5 percent 5 percent
-keycode 15 = 6 asciicircum 6 asciicircum
-keycode 16 = 7 ampersand 7 ampersand
-keycode 17 = 8 asterisk 8 asterisk
-keycode 18 = 9 parenleft 9 parenleft
-keycode 19 = 0 parenright 0 parenright
-keycode 20 = minus underscore Cyrillic_ie Cyrillic_IE
-keycode 21 = equal plus Cyrillic_yu Cyrillic_YU
-keycode 22 = BackSpace Delete BackSpace Delete
-keycode 23 = Tab Tab Tab Tab
-keycode 24 = q Q 0x010004e9 0x010004e8
-keycode 25 = w W Cyrillic_ve Cyrillic_VE
-keycode 26 = e E Cyrillic_e Cyrillic_E
-keycode 27 = r R Cyrillic_er Cyrillic_ER
-keycode 28 = t T Cyrillic_te Cyrillic_TE
-keycode 29 = y Y Cyrillic_ya Cyrillic_YA
-keycode 30 = u U Cyrillic_u Cyrillic_U
-keycode 31 = i I Cyrillic_i Cyrillic_I
-keycode 32 = o O Cyrillic_o Cyrillic_O
-keycode 33 = p P Cyrillic_pe Cyrillic_PE
-keycode 34 = bracketleft braceleft Cyrillic_sha Cyrillic_SHA
-keycode 35 = bracketright braceright Cyrillic_hardsign Cyrillic_HARDSIGN
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A Cyrillic_a Cyrillic_A
-keycode 39 = s S Cyrillic_es Cyrillic_ES
-keycode 40 = d D Cyrillic_de Cyrillic_DE
-keycode 41 = f F Cyrillic_ef Cyrillic_EF
-keycode 42 = g G Cyrillic_ghe Cyrillic_GHE
-keycode 43 = h H Cyrillic_ha Cyrillic_HA
-keycode 44 = j J Cyrillic_zhe Cyrillic_ZHE
-keycode 45 = k K Cyrillic_ka Cyrillic_KA
-keycode 46 = l L Cyrillic_el Cyrillic_EL
-keycode 47 = semicolon colon Cyrillic_shorti Cyrillic_SHORTI
-keycode 48 = apostrophe quotedbl Cyrillic_yeru Cyrillic_YERU
-keycode 49 = grave asciitilde Cyrillic_che Cyrillic_CHE
-keycode 50 = Shift_L
-keycode 51 = backslash bar backslash bar
-keycode 52 = z Z Cyrillic_ze Cyrillic_ZE
-keycode 53 = x X Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 54 = c C Cyrillic_tse Cyrillic_TSE
-keycode 55 = v V 0x010004af 0x010004ae
-keycode 56 = b B Cyrillic_be Cyrillic_BE
-keycode 57 = n N Cyrillic_en Cyrillic_EN
-keycode 58 = m M Cyrillic_em Cyrillic_EM
-keycode 59 = comma less Cyrillic_io Cyrillic_IO
-keycode 60 = period greater period comma
-keycode 61 = slash question slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11 F1 F11
-keycode 68 = F2 F12 F2 F12
-keycode 69 = F3 F13 F3 F13
-keycode 70 = F4 F14 F4 F14
-keycode 71 = F5 F15 F5 F15
-keycode 72 = F6 F16 F6 F16
-keycode 73 = F7 F17 F7 F17
-keycode 74 = F8 F18 F8 F18
-keycode 75 = F9 F19 F9 F19
-keycode 76 = F10 F20 F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater
-keycode 95 = F11 F11 F11 F11
-keycode 96 = F12 F12 F12 F12
-keycode 108 = KP_Enter
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-add Lock = Control_R
-add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.mn-rev b/gkb-new/xmodmap/xmodmap.mn-rev
deleted file mode 100644
index 4ced932b..00000000
--- a/gkb-new/xmodmap/xmodmap.mn-rev
+++ /dev/null
@@ -1,116 +0,0 @@
-! Mongolian cyrillic keymap reverted
-! Generated by Sanlig Badral <[email protected]>
-! 2002/12/8
-!
-!charset "iso-8859-5" + barred o, straight u from "iso-10646-1"
-!charset "iso-10646-1"
-
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 numerosign 1 exclam
-keycode 11 = 2 minus 2 at
-keycode 12 = 3 quotedbl 3 numbersign
-keycode 13 = 4 U20AE 4 dollar
-keycode 14 = 5 colon 5 percent
-keycode 15 = 6 period 6 asciicircum
-keycode 16 = 7 underscore 7 ampersand
-keycode 17 = 8 comma 8 asterisk
-keycode 18 = 9 percent 9 parenleft
-keycode 19 = 0 question 0 parenright
-keycode 20 = Cyrillic_ie Cyrillic_IE minus underscore
-keycode 21 = Cyrillic_shcha Cyrillic_SHCHA equal plus
-keycode 22 = BackSpace BackSpace BackSpace BackSpace
-keycode 23 = Tab ISO_Left_Tab
-keycode 24 = Cyrillic_ef Cyrillic_EF q Q
-keycode 25 = Cyrillic_tse Cyrillic_TSE w W
-keycode 26 = Cyrillic_u Cyrillic_U e E
-keycode 27 = Cyrillic_zhe Cyrillic_ZHE r R
-keycode 28 = Cyrillic_e Cyrillic_E t T
-keycode 29 = Cyrillic_en Cyrillic_EN y Y
-keycode 30 = Cyrillic_ghe Cyrillic_GHE u U
-keycode 31 = Cyrillic_sha Cyrillic_SHA i I
-keycode 32 = U04AF U04AE o O
-keycode 33 = Cyrillic_ze Cyrillic_ZE p P
-keycode 34 = Cyrillic_ka Cyrillic_KA bracketleft braceleft
-keycode 35 = Cyrillic_hardsign Cyrillic_HARDSIGN bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = Cyrillic_shorti Cyrillic_SHORTI a A
-keycode 39 = Cyrillic_yeru Cyrillic_YERU s S
-keycode 40 = Cyrillic_be Cyrillic_BE d D
-keycode 41 = U04E9 U04E8 f F
-keycode 42 = Cyrillic_a Cyrillic_A g G
-keycode 43 = Cyrillic_ha Cyrillic_HA h H
-keycode 44 = Cyrillic_er Cyrillic_ER j J
-keycode 45 = Cyrillic_o Cyrillic_O k K
-keycode 46 = Cyrillic_el Cyrillic_EL l L
-keycode 47 = Cyrillic_de Cyrillic_DE semicolon colon
-keycode 48 = Cyrillic_pe Cyrillic_PE apostrophe quotedbl
-keycode 49 = parenleft parenright grave asciitilde
-keycode 50 = Shift_L ISO_Prev_Group
-keycode 51 = backslash bar backslash bar
-keycode 52 = Cyrillic_ya Cyrillic_YA z Z
-keycode 53 = Cyrillic_che Cyrillic_CHE x X
-keycode 54 = Cyrillic_io Cyrillic_IO c C
-keycode 55 = Cyrillic_es Cyrillic_ES v V
-keycode 56 = Cyrillic_em Cyrillic_EM b B
-keycode 57 = Cyrillic_i Cyrillic_I b B
-keycode 58 = Cyrillic_te Cyrillic_TE m M
-keycode 59 = Cyrillic_softsign Cyrillic_SOFTSIGN comma less
-keycode 60 = Cyrillic_ve Cyrillic_VE period greater
-keycode 61 = Cyrillic_yu Cyrillic_YU slash question
-keycode 62 = Shift_R ISO_Next_Group
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock Pointer_EnableKeys
-keycode 78 = Scroll_Lock
-keycode 79 = KP_Home KP_7
-keycode 80 = KP_Up KP_8
-keycode 81 = KP_Prior KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_Left KP_4
-keycode 84 = KP_Begin KP_5
-keycode 85 = KP_Right KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_End KP_1
-keycode 88 = KP_Down KP_2
-keycode 89 = KP_Next KP_3
-keycode 90 = KP_Insert KP_0
-keycode 91 = KP_Delete KP_Decimal
-keycode 92 = Print Sys_Req
-keycode 93 =
-keycode 94 = less greater slash bar
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 101 =
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause Break
-keycode 111 = Print Sys_Req
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Pause Break
-keycode 115 = Super_L
-keycode 116 = Multi_key
-keycode 117 = Menu
diff --git a/gkb-new/xmodmap/xmodmap.mn-uni b/gkb-new/xmodmap/xmodmap.mn-uni
deleted file mode 100644
index e7848680..00000000
--- a/gkb-new/xmodmap/xmodmap.mn-uni
+++ /dev/null
@@ -1,121 +0,0 @@
-! Mongolian cyrillic keymap reverted
-! Generated by Sanlig Badral <[email protected]>
-! 2002/12/8
-!
-
-!clear Mod1
-!clear Mod2
-!clear Lock
-!clear Control
-
-!charset "iso-10646-1"
-
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 numerosign 1 exclam
-keycode 11 = 2 minus 2 at
-keycode 12 = 3 quotedbl 3 numbersign
-keycode 13 = 4 U20AE 4 dollar
-keycode 14 = 5 colon 5 percent
-keycode 15 = 6 period 6 asciicircum
-keycode 16 = 7 underscore 7 ampersand
-keycode 17 = 8 comma 8 asterisk
-keycode 18 = 9 percent 9 parenleft
-keycode 19 = 0 question 0 parenright
-keycode 20 = U0435 U0415 minus underscore
-keycode 21 = U0449 U0429 equal plus
-keycode 22 = BackSpace BackSpace BackSpace BackSpace
-keycode 23 = Tab ISO_Left_Tab
-keycode 24 = U0444 U0424 q Q
-keycode 25 = U0446 U0426 w W
-keycode 26 = U0443 U0423 e E
-keycode 27 = U0436 U0416 r R
-keycode 28 = U044D U042D t T
-keycode 29 = U043D U041D y Y
-keycode 30 = U0433 U0413 u U
-keycode 31 = U0448 U0428 i I
-keycode 32 = U04AF U04AE o O
-keycode 33 = U0437 U0417 p P
-keycode 34 = U043A U041A bracketleft braceleft
-keycode 35 = U044A U042A bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = U0439 U0419 a A
-keycode 39 = U044B U042B s S
-keycode 40 = U0431 U0411 d D
-keycode 41 = U04E9 U04E8 f F
-keycode 42 = U0430 U0410 g G
-keycode 43 = U0445 U0425 h H
-keycode 44 = U0440 U0420 j J
-keycode 45 = U043E U041E k K
-keycode 46 = U043B U041B l L
-keycode 47 = U0434 U0414 semicolon colon
-keycode 48 = U043F U041F apostrophe quotedbl
-keycode 49 = parenleft parenright grave asciitilde
-keycode 50 = Shift_L ISO_Prev_Group
-keycode 51 = backslash bar backslash bar
-keycode 52 = U044F U042F
-keycode 53 = U0447 U0427 x X
-keycode 54 = U0451 U0401 c C
-keycode 55 = U0441 U0421 v V
-keycode 56 = U043C U041C b B
-keycode 57 = U0438 U0418 n N
-keycode 58 = U0442 U0422 m M
-keycode 59 = U044C U042C comma less
-keycode 60 = U0432 U0412 period greater
-keycode 61 = U044E U042E slash question
-keycode 62 = Shift_R ISO_Next_Group
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock Pointer_EnableKeys
-keycode 78 = Scroll_Lock
-keycode 79 = KP_Home KP_7
-keycode 80 = KP_Up KP_8
-keycode 81 = KP_Prior KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_Left KP_4
-keycode 84 = KP_Begin KP_5
-keycode 85 = KP_Right KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_End KP_1
-keycode 88 = KP_Down KP_2
-keycode 89 = KP_Next KP_3
-keycode 90 = KP_Insert KP_0
-keycode 91 = KP_Delete KP_Decimal
-keycode 92 = Print Sys_Req
-keycode 93 =
-keycode 94 = less greater slash bar
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 101 =
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause Break
-keycode 111 = Print Sys_Req
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Pause Break
-keycode 115 = Super_L
-keycode 116 = Multi_key
-keycode 117 = Menu
diff --git a/gkb-new/xmodmap/xmodmap.nl b/gkb-new/xmodmap/xmodmap.nl
deleted file mode 100644
index b23cc4a9..00000000
--- a/gkb-new/xmodmap/xmodmap.nl
+++ /dev/null
@@ -1,114 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:06 CET 1998
-clear Mod1
-clear Mod2
-! Nederland Keyboard
-!charset "iso-8859-1"
-keycode 9 = Escape
-keycode 10 = 1 exclam onesuperior
-keycode 11 = 2 quotedbl twosuperior
-keycode 12 = 3 numbersign threesuperior
-keycode 13 = 4 dollar onequarter
-keycode 14 = 5 percent onehalf
-keycode 15 = 6 ampersand threequarters
-keycode 16 = 7 underscore sterling
-keycode 17 = 8 parenleft braceleft
-keycode 18 = 9 parenright braceright
-keycode 19 = 0 apostrophe
-keycode 20 = slash question backslash
-keycode 21 = degree dead_tilde dead_cedilla
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E eacute Eacute
-keycode 27 = r R paragraph registered
-keycode 28 = t T thorn THORN
-keycode 29 = y Y ydiaeresis yen
-keycode 30 = u U udiaeresis Udiaeresis
-keycode 31 = i I idiaeresis Idiaeresis
-keycode 32 = o O ograve Ograve
-keycode 33 = p P paragraph
-keycode 34 = dead_diaeresis dead_tilde asciitilde asciicircum
-keycode 35 = asterisk bar
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A aacute Aacute
-keycode 39 = s S ssharp
-keycode 40 = d D eth ETH
-keycode 41 = f F ordfeminine ordfeminine
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = plus plusminus
-keycode 48 = apostrophe grave dead_acute dead_grave
-keycode 49 = at section notsign
-keycode 50 = Shift_L
-keycode 51 = less greater
-keycode 52 = z Z guillemotleft
-keycode 53 = x X guillemotright
-keycode 54 = c C cent copyright
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n N ntilde Ntilde
-keycode 58 = m M Greek_mu masculine
-keycode 59 = comma semicolon cedilla guillemotleft
-keycode 60 = period colon periodcentered guillemotright
-keycode 61 = minus equal hyphen
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space nobreakspace nobreakspace
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = bracketleft bracketright bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.no b/gkb-new/xmodmap/xmodmap.no
deleted file mode 100644
index adcf8fc7..00000000
--- a/gkb-new/xmodmap/xmodmap.no
+++ /dev/null
@@ -1,115 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:07 CET 1998
-clear Mod1
-clear Mod2
-! /usr/lib/kbd/keytables/no-latin1.map
-!
-! Send comments to Kjetil T. Homme <[email protected]>
-keycode 9 = Escape
-keycode 10 = 1 exclam exclamdown onesuperior
-keycode 11 = 2 quotedbl at twosuperior
-keycode 12 = 3 numbersign sterling threesuperior
-keycode 13 = 4 dollar currency onequarter
-keycode 14 = 5 percent onehalf onehalf
-keycode 15 = 6 ampersand threequarters threequarters
-keycode 16 = 7 slash braceleft division
-keycode 17 = 8 parenleft bracketleft
-keycode 18 = 9 parenright bracketright
-keycode 19 = 0 equal braceright
-keycode 20 = plus question plusminus questiondown
-keycode 21 = backslash grave dead_acute dead_grave
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E eacute Eacute
-keycode 27 = r R registered
-keycode 28 = t T thorn THORN
-keycode 29 = y Y ydiaeresis yen
-keycode 30 = u U udiaeresis Udiaeresis
-keycode 31 = i I idiaeresis Idiaeresis
-keycode 32 = o O ograve Ograve
-keycode 33 = p P paragraph
-keycode 34 = aring Aring braceright bracketright
-keycode 35 = asciitilde asciicircum dead_diaeresis dead_tilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A aacute Aacute
-keycode 39 = s S ssharp
-keycode 40 = d D eth ETH
-keycode 41 = f F ordfeminine ordfeminine
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = oslash Ooblique bar backslash
-keycode 48 = ae AE braceleft bracketleft
-keycode 49 = bar section brokenbar paragraph
-keycode 50 = Shift_L
-keycode 51 = apostrophe asterisk dead_circumflex multiply
-keycode 52 = z
-keycode 53 = x X multiply
-keycode 54 = c C ccedilla copyright
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n N ntilde Ntilde
-keycode 58 = m M Greek_mu masculine
-keycode 59 = comma semicolon cedilla guillemotleft
-keycode 60 = period colon periodcentered guillemotright
-keycode 61 = minus underscore hyphen
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space nobreakspace nobreakspace
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = less greater guillemotleft guillemotright
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.pl b/gkb-new/xmodmap/xmodmap.pl
deleted file mode 100644
index 75987c8c..00000000
--- a/gkb-new/xmodmap/xmodmap.pl
+++ /dev/null
@@ -1,147 +0,0 @@
-!
-! This is an `xmodmap' input file
-! for PC 101 key keyboard #2 (Linux/XFree86 US layout) keyboards.
-! This file was automatically generated on Wed Nov 2 10:29:07 1994
-! by Ryszard Mikke with XKeyCaps 2.11;
-! Copyright 1991-1994 Jamie Zawinski <[email protected]>.
-!
-! The file used wrongly latin1 keysysms instead of latin2 ones !!
-! I corrected on 1999-10-07 -- Pablo Saratxaga <[email protected]>
-!
-! This file makes the following changes:
-!
-! The "& 7" key generates 7, ampersand, and section
-! The "E" key generates e, E, eogonek, and Eogonek
-! The "O" key generates o, O, oacute, and Oacute
-! The "A" key generates a, A, aogonek, and Aogonek
-! The "S" key generates s, S, sacute, and Sacute
-! The "L" key generates l, L, lstroke, and Lstroke
-! The "Z" key generates z, Z, zabovedot, and Zabovedot
-! The "X" key generates x, X, zacute, and Zacute
-! The "C" key generates c, C, cacute, and Cacute
-! The "N" key generates n, N, nacute, and Nacute
-! The "AltGr" key generates Mode_switch
-
-keycode 0x09 = Escape
-keycode 0x43 = F1
-keycode 0x44 = F2
-keycode 0x45 = F3
-keycode 0x46 = F4
-keycode 0x47 = F5
-keycode 0x48 = F6
-keycode 0x49 = F7
-keycode 0x4A = F8
-keycode 0x4B = F9
-keycode 0x4C = F10
-keycode 0x5F = F11
-keycode 0x60 = F12
-keycode 0x6F = Print
-keycode 0x4E = Multi_key
-keycode 0x6E = Pause
-keycode 0x31 = grave asciitilde
-keycode 0x0A = 1 exclam
-keycode 0x0B = 2 at
-keycode 0x0C = 3 numbersign
-keycode 0x0D = 4 dollar
-keycode 0x0E = 5 percent
-keycode 0x0F = 6 asciicircum
-keycode 0x10 = 7 ampersand section
-keycode 0x11 = 8 asterisk
-keycode 0x12 = 9 parenleft
-keycode 0x13 = 0 parenright
-keycode 0x14 = minus underscore
-keycode 0x15 = equal plus
-keycode 0x33 = backslash bar
-keycode 0x16 = BackSpace
-keycode 0x6A = Insert
-keycode 0x61 = Home
-keycode 0x63 = Prior
-keycode 0x4D = Num_Lock
-keycode 0x70 = KP_Divide
-keycode 0x3F = KP_Multiply
-keycode 0x52 = KP_Subtract
-keycode 0x17 = Tab
-keycode 0x18 = Q
-keycode 0x19 = W
-keycode 0x1A = e E eogonek Eogonek
-keycode 0x1B = R
-keycode 0x1C = T
-keycode 0x1D = Y
-keycode 0x1E = U
-keycode 0x1F = I
-keycode 0x20 = o O oacute Oacute
-keycode 0x21 = P
-keycode 0x22 = bracketleft braceleft
-keycode 0x23 = bracketright braceright
-keycode 0x24 = Return
-keycode 0x6B = Delete
-keycode 0x67 = End
-keycode 0x69 = Next
-keycode 0x4F = KP_7
-keycode 0x50 = KP_8
-keycode 0x51 = KP_9
-keycode 0x56 = KP_Add
-keycode 0x42 = Caps_Lock
-keycode 0x26 = a A aogonek Aogonek
-keycode 0x27 = s S sacute Sacute
-keycode 0x28 = D
-keycode 0x29 = F
-keycode 0x2A = G
-keycode 0x2B = H
-keycode 0x2C = J
-keycode 0x2D = K
-keycode 0x2E = l L lstroke Lstroke
-keycode 0x2F = semicolon colon
-keycode 0x30 = apostrophe quotedbl
-keycode 0x53 = KP_4
-keycode 0x54 = KP_5
-keycode 0x55 = KP_6
-keycode 0x32 = Shift_L
-keycode 0x34 = z Z zabovedot Zabovedot
-keycode 0x35 = x X zacute Zacute
-keycode 0x36 = c C cacute Cacute
-keycode 0x37 = V
-keycode 0x38 = B
-keycode 0x39 = n N nacute Nacute
-keycode 0x3A = M
-keycode 0x3B = comma less
-keycode 0x3C = period greater Multi_key
-keycode 0x3D = slash question
-keycode 0x3E = Shift_R
-keycode 0x62 = Up
-keycode 0x57 = KP_1
-keycode 0x58 = KP_2
-keycode 0x59 = KP_3
-keycode 0x6C = KP_Enter
-keycode 0x25 = Control_L
-keycode 0x40 = Alt_L Meta_L
-keycode 0x41 = space
-keycode 0x71 = Mode_switch
-keycode 0x6D = Control_R
-keycode 0x64 = Left
-keycode 0x68 = Down
-keycode 0x66 = Right
-keycode 0x5A = KP_0
-keycode 0x5B = KP_Decimal
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift = Shift_L Shift_R
-add Lock = Caps_Lock
-add Control = Control_L Control_R
-add Mod1 = Alt_L
-!Mode_switch
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.pl2 b/gkb-new/xmodmap/xmodmap.pl2
deleted file mode 100644
index a7ad3a0c..00000000
--- a/gkb-new/xmodmap/xmodmap.pl2
+++ /dev/null
@@ -1,111 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vin dja 7 00:22:38 CET 2000
-clear Mod1
-clear Mod2
-! Polish keyboard
-! Adapted whith dead_* keys and other changes (copied from the picture in
-! the MS-DOS 6.2 manual)
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam asciitilde
-keycode 11 = 2 quotedbl dead_caron
-keycode 12 = 3 numbersign dead_circumflex
-keycode 13 = 4 dollar dead_breve
-keycode 14 = 5 percent degree
-keycode 15 = 6 ampersand dead_ogonek
-keycode 16 = 7 slash dead_grave
-keycode 17 = 8 parenleft abovedot
-keycode 18 = 9 parenright dead_acute
-keycode 19 = 0 equal dead_doubleacute
-keycode 20 = plus question dead_diaeresis
-keycode 21 = apostrophe asterisk dead_cedilla
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q Q backslash
-keycode 25 = w W bar
-keycode 26 = e
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = zabovedot nacute division
-keycode 35 = sacute cacute multiply
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s S dstroke
-keycode 40 = d D Dstroke
-keycode 41 = f F bracketleft
-keycode 42 = g G bracketright
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = lstroke Lstroke dollar
-keycode 48 = aogonek eogonek ssharp
-keycode 49 = abovedot dead_ogonek
-keycode 50 = Shift_L
-keycode 51 = oacute zacute
-keycode 52 = y
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v V at
-keycode 56 = b B braceleft
-keycode 57 = n N braceright
-keycode 58 = m M section
-keycode 59 = comma semicolon
-keycode 60 = period colon
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! as dead_ogonek, dead_caron, dead_breve and dead_doubleacute doesn't exist
-! (yet), I put also compose lines for use with respectively dead_cedilla,
-! dead_circumflex, dead_tilde and dead_tilde
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.pt b/gkb-new/xmodmap/xmodmap.pt
deleted file mode 100644
index 10b018a6..00000000
--- a/gkb-new/xmodmap/xmodmap.pt
+++ /dev/null
@@ -1,112 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] jue oct 1 15:18:27 CEST 1998
-clear Mod1
-clear Mod2
-! Portugal keyboard
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam bar
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 numbersign sterling
-keycode 13 = 4 dollar section
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand notsign
-keycode 16 = 7 slash braceleft
-keycode 17 = 8 parenleft bracketleft
-keycode 18 = 9 parenright bracketright
-keycode 19 = 0 equal braceright
-keycode 20 = apostrophe question backslash
-keycode 21 = guillemotleft guillemotright
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = plus asterisk dead_diaeresis
-keycode 35 = dead_acute dead_grave grave
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = ccedilla Ccedilla ntilde Ntilde
-keycode 48 = masculine ordfeminine
-keycode 49 = backslash bar
-keycode 50 = Shift_L
-keycode 51 = dead_tilde dead_circumflex asciitilde asciicircum
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.pt-dead b/gkb-new/xmodmap/xmodmap.pt-dead
deleted file mode 100644
index 2ebf5b81..00000000
--- a/gkb-new/xmodmap/xmodmap.pt-dead
+++ /dev/null
@@ -1,151 +0,0 @@
-! Mapa para o teclado Portugu�s em X.
-! Suporta todos os caracteres impressos num teclado portugu�s padr�o.
-!
-! Nota: est�o tamb�m mapeados alguns caracteres que n�o aparecem
-! impressos no teclado, mas que podem ser �teis. Todos eles
-! s�o obtidos premindo altgr juntamente com a tecla principal:
-!
-! altgr + \ : � (nega��o)
-! altgr + 1 : � (exclama��o invertida)
-! altgr + 5 : � (dois em expoente)
-! altgr + 6 : � (tr�s em expoente)
-! altgr + ' : � (interroga��o invertida)
-! altgr + q : � (um quarto)
-! altgr + w : � (dois quartos)
-! altgr + e : � (tr�s quartos)
-! altgr + r : � (marca registada)
-! altgr + t : � (thorn)
-! altgr + y : � (yen)
-! altgr + o : � (o cortado)
-! altgr + p : � (par�grafo)
-! altgr + a : � (o sueco)
-! altgr + s : � (esszed)
-! altgr + d : � (eth)
-! altgr + � : � (grau)
-! altgr + c : � (centavo)
-! altgr + m : � (mu)
-! altgr + . : � (ponto centrado)
-! altgr + - : � (macron)
-!
-! Dario Teixeira ([email protected])
-
-!
-! Desactivar modificadores
-!
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam exclamdown
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 numbersign sterling
-keycode 13 = 4 dollar section
-keycode 14 = 5 percent twosuperior
-keycode 15 = 6 ampersand threesuperior
-keycode 16 = 7 slash braceleft
-keycode 17 = 8 parenleft bracketleft
-keycode 18 = 9 parenright bracketright
-keycode 19 = 0 equal braceright
-keycode 20 = apostrophe question questiondown
-keycode 21 = guillemotleft guillemotright plusminus
-keycode 24 = q Q onequarter
-keycode 25 = w W onehalf
-keycode 26 = e E threequarters
-keycode 27 = r R registered
-keycode 28 = t T thorn
-keycode 29 = y Y yen
-keycode 30 = u U
-keycode 31 = i I
-keycode 32 = o O oslash Ooblique
-keycode 33 = p P paragraph
-keycode 34 = plus asterisk dead_diaeresis
-keycode 35 = dead_acute dead_grave
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A aring Aring
-keycode 39 = s S ssharp
-keycode 40 = d D ETH
-keycode 41 = f F
-keycode 42 = g G
-keycode 43 = h H
-keycode 44 = j J
-keycode 45 = k K
-keycode 46 = l L
-keycode 47 = ccedilla Ccedilla
-keycode 48 = masculine ordfeminine degree
-keycode 49 = backslash bar notsign
-keycode 50 = Shift_L
-keycode 51 = dead_tilde dead_circumflex
-keycode 52 = z Z
-keycode 53 = x X
-keycode 54 = c C cent
-keycode 55 = v V
-keycode 56 = b B
-keycode 57 = n N
-keycode 58 = m M mu
-keycode 59 = comma semicolon
-keycode 60 = period colon periodcentered
-keycode 61 = minus underscore macron
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Multi_key
-keycode 79 = KP_Home KP_7
-keycode 80 = KP_Up KP_8
-keycode 81 = KP_Prior KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_Left KP_4
-keycode 84 = NoSymbol KP_5
-keycode 85 = KP_Right KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_End KP_1
-keycode 88 = KP_Down KP_2
-keycode 89 = KP_Next KP_3
-keycode 90 = KP_Insert KP_0
-keycode 91 = KP_Delete KP_Decimal
-keycode 92 =
-keycode 93 =
-keycode 94 = less greater
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 101 = Begin
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause Break
-keycode 111 = Print Execute
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-
-!
-! Desactivar teclas especiais do windows
-!
-
-
-keycode 115 =
-keycode 116 =
-keycode 117 =
-
-!
-! Atribuir os modificadores
-!
diff --git a/gkb-new/xmodmap/xmodmap.qc b/gkb-new/xmodmap/xmodmap.qc
deleted file mode 100644
index 4b3d1562..00000000
--- a/gkb-new/xmodmap/xmodmap.qc
+++ /dev/null
@@ -1,116 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] Wed Jun 11 20:44:54 MET DST 1997
-clear Mod1
-clear Mod2
-!
-! French-Canadian keymap
-!
-! From: [email protected] (Christian Saucier)
-! Date: Thu, 7 Jul 1994 22:12:34 -0400 (EDT)
-!
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam plusminus
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 slash sterling
-keycode 13 = 4 dollar cent
-keycode 14 = 5 percent currency
-keycode 15 = 6 question notsign
-keycode 16 = 7 ampersand brokenbar
-keycode 17 = 8 asterisk twosuperior
-keycode 18 = 9 parenleft threesuperior
-keycode 19 = 0 parenright onequarter
-keycode 20 = minus underscore onehalf
-keycode 21 = equal plus threequarters
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o O section
-keycode 33 = p P paragraph
-keycode 34 = dead_circumflex asciicircum bracketleft
-keycode 35 = dead_cedilla dead_diaeresis bracketright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = semicolon colon asciitilde
-keycode 48 = dead_grave grave braceleft
-keycode 49 = numbersign bar backslash
-keycode 50 = Shift_L
-keycode 51 = less greater braceright
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m M mu
-keycode 59 = comma apostrophe underscore
-keycode 60 = period periodcentered Multi_key
-keycode 61 = eacute Eacute dead_acute
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = guillemotleft guillemotright degree
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.qc-2 b/gkb-new/xmodmap/xmodmap.qc-2
deleted file mode 100644
index 5629d32c..00000000
--- a/gkb-new/xmodmap/xmodmap.qc-2
+++ /dev/null
@@ -1,128 +0,0 @@
-
-keycode 8 =
-keycode 9 = Escape
-keycode 10 = 1 exclam plusminus
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 slash sterling
-keycode 13 = 4 dollar cent
-keycode 14 = 5 percent currency
-keycode 15 = 6 question notsign
-keycode 16 = 7 ampersand brokenbar
-keycode 17 = 8 asterisk twosuperior
-keycode 18 = 9 parenleft threesuperior
-keycode 19 = 0 parenright onequarter
-keycode 20 = minus underscore onehalf
-keycode 21 = equal plus threequarters
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = q Q q
-keycode 25 = w W w
-keycode 26 = e E e
-keycode 27 = r R r
-keycode 28 = t T t
-keycode 29 = y Y y
-keycode 30 = u U u
-keycode 31 = i I i
-keycode 32 = o O section
-keycode 33 = p P paragraph
-keycode 34 = dead_circumflex asciicircum bracketleft
-keycode 35 = dead_cedilla dead_diaeresis bracketright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A a
-keycode 39 = s S s
-keycode 40 = d D d
-keycode 41 = f F f
-keycode 42 = g G g
-keycode 43 = h H h
-keycode 44 = j J j
-keycode 45 = k K k
-keycode 46 = l L l
-keycode 47 = semicolon colon asciitilde
-keycode 48 = dead_grave grave braceleft
-keycode 49 = numbersign bar backslash
-keycode 50 = Shift_L
-keycode 51 = less greater braceright
-keycode 52 = z Z z
-keycode 53 = x X x
-keycode 54 = c C c
-keycode 55 = v V guillemotleft
-keycode 56 = b B guillemotright
-keycode 57 = n N n
-keycode 58 = m M mu
-keycode 59 = comma apostrophe underscore
-keycode 60 = period periodcentered
-keycode 61 = eacute Eacute dead_acute
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Mode_switch XF86ModeLock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 92 =
-keycode 93 =
-keycode 94 = guillemotleft guillemotright degree
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 101 =
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause
-keycode 111 =
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 =
-keycode 126 =
-keycode 127 =
-keycode 128 =
-keycode 129 =
-keycode 130 =
-keycode 131 =
-keycode 132 =
-keycode 133 =
-keycode 134 =
diff --git a/gkb-new/xmodmap/xmodmap.ro b/gkb-new/xmodmap/xmodmap.ro
deleted file mode 100644
index d27611d4..00000000
--- a/gkb-new/xmodmap/xmodmap.ro
+++ /dev/null
@@ -1,111 +0,0 @@
-! Romanian layout from Adrian Dimulescu <[email protected]>
-! generated by xmodmap -pke
-!
-keycode 8 =
-keycode 9 = Escape
-keycode 10 = 1 exclam onesuperior exclamdown
-keycode 11 = 2 quotedbl twosuperior oneeighth
-keycode 12 = 3 numbersign threesuperior sterling
-keycode 13 = 4 dollar onequarter dollar
-keycode 14 = 5 percent onehalf threeeighths
-keycode 15 = 6 ampersand threequarters fiveeighths
-keycode 16 = 7 slash braceleft seveneighths
-keycode 17 = 8 parenleft bracketleft trademark
-keycode 18 = 9 parenright bracketright plusminus
-keycode 19 = 0 equal braceright degree
-keycode 20 = plus question backslash questiondown
-keycode 21 = apostrophe asterisk dead_cedilla dead_ogonek
-keycode 22 = BackSpace
-keycode 23 = Tab ISO_Left_Tab
-keycode 24 = q Q at Greek_OMEGA
-keycode 25 = w W lstroke Lstroke
-keycode 26 = e E
-keycode 27 = r R paragraph registered
-keycode 28 = t T tslash Tslash
-keycode 29 = z Z leftarrow yen
-keycode 30 = u U downarrow uparrow
-keycode 31 = i I rightarrow idotless
-keycode 32 = o O oslash Ooblique
-keycode 33 = p P thorn THORN
-keycode 34 = atilde Atilde dead_diaeresis dead_abovering
-keycode 35 = icircumflex Icircumflex dead_tilde dead_macron
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A ae AE
-keycode 39 = s S ssharp section
-keycode 40 = d D eth ETH
-keycode 41 = f F dstroke ordfeminine
-keycode 42 = g G eng ENG
-keycode 43 = h H hstroke Hstroke
-keycode 44 = j J
-keycode 45 = k K kra ampersand
-keycode 46 = l L lstroke Lstroke
-keycode 47 = masculine ordfeminine dead_acute dead_doubleacute
-keycode 48 = thorn THORN dead_circumflex dead_caron
-keycode 49 = bracketright bracketleft notsign
-keycode 50 = Shift_L
-keycode 51 = acircumflex Acircumflex b c
-keycode 52 = y Y guillemotleft less
-keycode 53 = x X guillemotright greater
-keycode 54 = c C cent copyright
-keycode 55 = v V leftdoublequotemark grave
-keycode 56 = b B rightdoublequotemark apostrophe
-keycode 57 = n N
-keycode 58 = m M mu masculine
-keycode 59 = comma semicolon horizconnector multiply
-keycode 60 = period colon periodcentered division
-keycode 61 = minus underscore dead_belowdot dead_abovedot
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock Pointer_EnableKeys
-keycode 78 = Scroll_Lock
-keycode 79 = KP_Home KP_7
-keycode 80 = KP_Up KP_8
-keycode 81 = KP_Prior KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_Left KP_4
-keycode 84 = KP_Begin KP_5
-keycode 85 = KP_Right KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_End KP_1
-keycode 88 = KP_Down KP_2
-keycode 89 = KP_Next KP_3
-keycode 90 = KP_Insert KP_0
-keycode 91 = KP_Delete KP_Decimal
-keycode 92 = Print Sys_Req
-keycode 93 =
-keycode 94 =
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 101 =
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause Break
-keycode 111 = Print Sys_Req
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch Multi_key
-keycode 114 = Pause Break
diff --git a/gkb-new/xmodmap/xmodmap.ru b/gkb-new/xmodmap/xmodmap.ru
deleted file mode 100644
index 1cd8cb58..00000000
--- a/gkb-new/xmodmap/xmodmap.ru
+++ /dev/null
@@ -1,120 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] Thu Jun 12 00:28:41 MET DST 1997
-clear Mod1
-clear Mod2
-clear Lock
-clear Control
-! Russian Cyrillic keyboard.map. "Cyrillic" mode is toggled by
-! Right_Ctrl key and shifted by AltGr key.
-!
-! This file uses the X11 keysysms for cyrillic letters
-!
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 exclam 1 exclam
-keycode 11 = 2 at 2 quotedbl
-keycode 12 = 3 numbersign 3 question
-keycode 13 = 4 dollar 4 semicolon
-keycode 14 = 5 percent 5 colon
-keycode 15 = 6 asciicircum 6 comma
-keycode 16 = 7 ampersand 7 period
-keycode 17 = 8 asterisk 8 asterisk
-keycode 18 = 9 parenleft 9 parenleft
-keycode 19 = 0 parenright 0 parenright
-keycode 20 = minus underscore minus underscore
-keycode 21 = equal plus equal plus
-keycode 22 = BackSpace BackSpace BackSpace BackSpace
-keycode 23 = Tab Tab Tab Tab
-keycode 24 = q Q Cyrillic_shorti Cyrillic_SHORTI
-keycode 25 = w W Cyrillic_tse Cyrillic_TSE
-keycode 26 = e E Cyrillic_u Cyrillic_U
-keycode 27 = r R Cyrillic_ka Cyrillic_KA
-keycode 28 = t T Cyrillic_ie Cyrillic_IE
-keycode 29 = y Y Cyrillic_en Cyrillic_EN
-keycode 30 = u U Cyrillic_ghe Cyrillic_GHE
-keycode 31 = i I Cyrillic_sha Cyrillic_SHA
-keycode 32 = o O Cyrillic_shcha Cyrillic_SHCHA
-keycode 33 = p P Cyrillic_ze Cyrillic_ZE
-keycode 34 = bracketleft braceleft Cyrillic_ha Cyrillic_HA
-keycode 35 = bracketright braceright Cyrillic_hardsign Cyrillic_HARDSIGN
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A Cyrillic_ef Cyrillic_EF
-keycode 39 = s S Cyrillic_yeru Cyrillic_YERU
-keycode 40 = d D Cyrillic_ve Cyrillic_VE
-keycode 41 = f F Cyrillic_a Cyrillic_A
-keycode 42 = g G Cyrillic_pe Cyrillic_PE
-keycode 43 = h H Cyrillic_er Cyrillic_ER
-keycode 44 = j J Cyrillic_o Cyrillic_O
-keycode 45 = k K Cyrillic_el Cyrillic_EL
-keycode 46 = l L Cyrillic_de Cyrillic_DE
-keycode 47 = semicolon colon Cyrillic_zhe Cyrillic_ZHE
-keycode 48 = apostrophe quotedbl Cyrillic_e Cyrillic_E
-keycode 49 = grave asciitilde Cyrillic_io Cyrillic_IO
-keycode 50 = Shift_L
-keycode 51 = backslash bar slash bar
-keycode 52 = z Z Cyrillic_ya Cyrillic_YA
-keycode 53 = x X Cyrillic_che Cyrillic_CHE
-keycode 54 = c C Cyrillic_es Cyrillic_ES
-keycode 55 = v V Cyrillic_em Cyrillic_EM
-keycode 56 = b B Cyrillic_i Cyrillic_I
-keycode 57 = n N Cyrillic_te Cyrillic_TE
-keycode 58 = m M Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 59 = comma less Cyrillic_be Cyrillic_BE
-keycode 60 = period greater Cyrillic_yu Cyrillic_YU
-keycode 61 = slash question period comma
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11 F1 F11
-keycode 68 = F2 F12 F2 F12
-keycode 69 = F3 F13 F3 F13
-keycode 70 = F4 F14 F4 F14
-keycode 71 = F5 F15 F5 F15
-keycode 72 = F6 F16 F6 F16
-keycode 73 = F7 F17 F7 F17
-keycode 74 = F8 F18 F8 F18
-keycode 75 = F9 F19 F9 F19
-keycode 76 = F10 F20 F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar brokenbar
-keycode 95 = F11 F11 F11 F11
-keycode 96 = F12 F12 F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-!
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-add Lock = Control_R
-add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.ru-rev b/gkb-new/xmodmap/xmodmap.ru-rev
deleted file mode 100644
index e7188f54..00000000
--- a/gkb-new/xmodmap/xmodmap.ru-rev
+++ /dev/null
@@ -1,109 +0,0 @@
-keycode 9 = Escape
-keycode 10 = 1 exclam 1 exclam
-keycode 11 = 2 at 2 quotedbl
-keycode 12 = 3 numbersign 3 numbersign
-keycode 13 = 4 dollar 4 asterisk
-keycode 14 = 5 percent 5 colon
-keycode 15 = 6 asciicircum 6 comma
-keycode 16 = 7 ampersand 7 period
-keycode 17 = 8 asterisk 8 semicolon
-keycode 18 = 9 parenleft 9 parenleft
-keycode 19 = 0 parenright 0 parenright
-keycode 20 = minus underscore minus underscore
-keycode 21 = equal plus equal plus
-keycode 22 = BackSpace
-keycode 23 = Tab ISO_Left_Tab
-keycode 24 = Cyrillic_shorti Cyrillic_SHORTI q Q
-keycode 25 = Cyrillic_tse Cyrillic_TSE w W
-keycode 26 = Cyrillic_u Cyrillic_U e E
-keycode 27 = Cyrillic_ka Cyrillic_KA r R
-keycode 28 = Cyrillic_ie Cyrillic_IE t T
-keycode 29 = Cyrillic_en Cyrillic_EN y Y
-keycode 30 = Cyrillic_ghe Cyrillic_GHE u U
-keycode 31 = Cyrillic_sha Cyrillic_SHA i I
-keycode 32 = Cyrillic_shcha Cyrillic_SHCHA o O
-keycode 33 = Cyrillic_ze Cyrillic_ZE p P
-keycode 34 = Cyrillic_ha Cyrillic_HA bracketleft braceleft
-keycode 35 = Cyrillic_hardsign Cyrillic_HARDSIGN bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = Cyrillic_ef Cyrillic_EF a A
-keycode 39 = Cyrillic_yeru Cyrillic_YERU s S
-keycode 40 = Cyrillic_ve Cyrillic_VE d D
-keycode 41 = Cyrillic_a Cyrillic_A f F
-keycode 42 = Cyrillic_pe Cyrillic_PE g G
-keycode 43 = Cyrillic_er Cyrillic_ER h H
-keycode 44 = Cyrillic_o Cyrillic_O j J
-keycode 45 = Cyrillic_el Cyrillic_EL k K
-keycode 46 = Cyrillic_de Cyrillic_DE l L
-keycode 47 = Cyrillic_zhe Cyrillic_ZHE semicolon colon
-keycode 48 = Cyrillic_e Cyrillic_E apostrophe quotedbl
-keycode 49 = Cyrillic_io Cyrillic_IO grave asciitilde
-keycode 50 = Shift_L ISO_Prev_Group
-keycode 51 = backslash bar backslash bar
-keycode 52 = Cyrillic_ya Cyrillic_YA z Z
-keycode 53 = Cyrillic_che Cyrillic_CHE x X
-keycode 54 = Cyrillic_es Cyrillic_ES c C
-keycode 55 = Cyrillic_em Cyrillic_EM v V
-keycode 56 = Cyrillic_i Cyrillic_I b B
-keycode 57 = Cyrillic_te Cyrillic_TE n N
-keycode 58 = Cyrillic_softsign Cyrillic_SOFTSIGN m M
-keycode 59 = Cyrillic_be Cyrillic_BE comma less
-keycode 60 = Cyrillic_yu Cyrillic_YU period greater
-keycode 61 = slash question slash question
-keycode 62 = Shift_R ISO_Next_Group
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock Pointer_EnableKeys
-keycode 78 = Scroll_Lock
-keycode 79 = KP_Home KP_7
-keycode 80 = KP_Up KP_8
-keycode 81 = KP_Prior KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_Left KP_4
-keycode 84 = KP_Begin KP_5
-keycode 85 = KP_Right KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_End KP_1
-keycode 88 = KP_Down KP_2
-keycode 89 = KP_Next KP_3
-keycode 90 = KP_Insert KP_0
-keycode 91 = KP_Delete KP_Decimal
-keycode 92 = Print Sys_Req
-keycode 93 =
-keycode 94 = less greater slash bar
-keycode 95 = F11
-keycode 96 = F12
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 101 =
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause Break
-keycode 111 = Print Sys_Req
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Pause Break
-keycode 115 = Super_L
-keycode 116 = Multi_key
-keycode 117 = Menu
diff --git a/gkb-new/xmodmap/xmodmap.ru_yawerty b/gkb-new/xmodmap/xmodmap.ru_yawerty
deleted file mode 100644
index 3b7ee93a..00000000
--- a/gkb-new/xmodmap/xmodmap.ru_yawerty
+++ /dev/null
@@ -1,120 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:11:58 CET 1998
-clear Mod1
-clear Mod2
-clear Lock
-clear Control
-! Bulgarian Cyrillic keyboard.map. "Cyrillic" mode is toggled by
-! Right_Ctrl key and shifted by AltGr key. Eugene Crosser's `ru.map'
-! was used as a template. Note that this is a "phonetic" keyboard,
-! not a `BDS' one! --L.Georgiev
-!
-! Changed from hexa values to keysysms -- Pablo Saratxaga
-keycode 9 = Escape Escape Escape Escape
-keycode 10 = 1 exclam 1 exclam
-keycode 11 = 2 at 2 at
-keycode 12 = 3 numbersign 3 numbersign
-keycode 13 = 4 dollar 4 dollar
-keycode 14 = 5 percent 5 percent
-keycode 15 = 6 asciicircum 6 asciicircum
-keycode 16 = 7 ampersand 7 ampersand
-keycode 17 = 8 asterisk 8 asterisk
-keycode 18 = 9 parenleft 9 parenleft
-keycode 19 = 0 parenright 0 parenright
-keycode 20 = minus underscore minus underscore
-keycode 21 = equal plus Cyrillic_yu Cyrillic_YU
-keycode 22 = BackSpace Delete BackSpace Delete
-keycode 23 = Tab Tab Tab Tab
-keycode 24 = q Q Cyrillic_ya Cyrillic_YA
-keycode 25 = w W Cyrillic_ve Cyrillic_VE
-keycode 26 = e E Cyrillic_ie Cyrillic_IE
-keycode 27 = r R Cyrillic_er Cyrillic_ER
-keycode 28 = t T Cyrillic_te Cyrillic_TE
-keycode 29 = y Y Cyrillic_hardsign Cyrillic_HARDSIGN
-keycode 30 = u U Cyrillic_u Cyrillic_U
-keycode 31 = i I Cyrillic_i Cyrillic_I
-keycode 32 = o O Cyrillic_o Cyrillic_O
-keycode 33 = p P Cyrillic_pe Cyrillic_PE
-keycode 34 = bracketleft braceleft Cyrillic_sha Cyrillic_SHA
-keycode 35 = bracketright braceright Cyrillic_shcha Cyrillic_SHCHA
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A Cyrillic_a Cyrillic_A
-keycode 39 = s S Cyrillic_es Cyrillic_ES
-keycode 40 = d D Cyrillic_de Cyrillic_DE
-keycode 41 = f F Cyrillic_ef Cyrillic_EF
-keycode 42 = g G Cyrillic_ghe Cyrillic_GHE
-keycode 43 = h H Cyrillic_ha Cyrillic_HA
-keycode 44 = j J Cyrillic_shorti Cyrillic_SHORTI
-keycode 45 = k K Cyrillic_ka Cyrillic_KA
-keycode 46 = l L Cyrillic_el Cyrillic_EL
-keycode 47 = semicolon colon semicolon colon
-keycode 48 = apostrophe quotedbl apostrophe quotedbl
-keycode 49 = grave asciitilde Cyrillic_che Cyrillic_CHE
-keycode 50 = Shift_L
-keycode 51 = backslash bar backslash bar
-keycode 52 = z Z Cyrillic_ze Cyrillic_ZE
-keycode 53 = x X Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 54 = c C Cyrillic_tse Cyrillic_TSE
-keycode 55 = v V Cyrillic_zhe Cyrillic_ZHE
-keycode 56 = b B Cyrillic_be Cyrillic_BE
-keycode 57 = n N Cyrillic_en Cyrillic_EN
-keycode 58 = m M Cyrillic_em Cyrillic_EM
-keycode 59 = comma less comma less
-keycode 60 = period greater period greater
-keycode 61 = slash question slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11 F1 F11
-keycode 68 = F2 F12 F2 F12
-keycode 69 = F3 F13 F3 F13
-keycode 70 = F4 F14 F4 F14
-keycode 71 = F5 F15 F5 F15
-keycode 72 = F6 F16 F6 F16
-keycode 73 = F7 F17 F7 F17
-keycode 74 = F8 F18 F8 F18
-keycode 75 = F9 F19 F9 F19
-keycode 76 = F10 F20 F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater
-keycode 95 = F11 F11 F11 F11
-keycode 96 = F12 F12 F12 F12
-keycode 108 = KP_Enter
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-add Lock = Control_R
-add Control = Control_L
diff --git a/gkb-new/xmodmap/xmodmap.se b/gkb-new/xmodmap/xmodmap.se
deleted file mode 100644
index 4f39d0ea..00000000
--- a/gkb-new/xmodmap/xmodmap.se
+++ /dev/null
@@ -1,117 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:10 CET 1998
-clear Mod1
-clear Mod2
-! The Swedish and Finnish keyboards are the same (or so they tell me)
-! and the Finnish map should do for Sweden as well. Below a Swedish map
-! contributed by Andreas Almroth ([email protected]) on 950507
-! where no AltGr is used to get the three national characters.
-!charset "iso-8859-1"
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 numbersign sterling
-keycode 13 = 4 ccedilla dollar
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand notsign
-keycode 16 = 7 slash braceleft
-keycode 17 = 8 parenleft bracketleft
-keycode 18 = 9 parenright
-keycode 19 = 0 equal
-keycode 20 = plus question backslash
-keycode 21 = dead_acute dead_grave
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = aring Aring
-keycode 35 = dead_diaeresis asciicircum asciitilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = odiaeresis Odiaeresis
-keycode 48 = adiaeresis Adiaeresis
-keycode 49 = section degree
-keycode 50 = Shift_L
-keycode 51 = apostrophe asterisk
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.sf b/gkb-new/xmodmap/xmodmap.sf
deleted file mode 100644
index 370116e6..00000000
--- a/gkb-new/xmodmap/xmodmap.sf
+++ /dev/null
@@ -1,113 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] Tue Jun 30 02:16:04 CEST 1998
-clear Mod1
-clear Mod2
-! French Swiz
-keycode 9 = Escape Escape
-keycode 10 = 1 plus bar
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 asterisk numbersign
-keycode 13 = 4 ccedilla
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand notsign
-keycode 16 = 7 slash bar
-keycode 17 = 8 parenleft cent
-keycode 18 = 9 parenright
-keycode 19 = 0 equal
-keycode 20 = apostrophe question dead_acute
-keycode 21 = dead_circumflex dead_grave dead_tilde
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E EuroSign
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = egrave udiaeresis bracketleft
-keycode 35 = dead_diaeresis exclam bracketright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = eacute odiaeresis
-keycode 48 = agrave adiaeresis braceleft
-keycode 49 = section degree
-keycode 50 = Shift_L
-keycode 51 = dollar sterling braceright
-keycode 52 = y
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = less greater backslash
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.sg b/gkb-new/xmodmap/xmodmap.sg
deleted file mode 100644
index b5ee4e25..00000000
--- a/gkb-new/xmodmap/xmodmap.sg
+++ /dev/null
@@ -1,113 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] jue ago 27 23:12:26 CEST 1998
-clear Mod1
-clear Mod2
-! German Swiz
-keycode 9 = Escape Escape
-keycode 10 = 1 plus bar
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 asterisk numbersign
-keycode 13 = 4 ccedilla
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand notsign
-keycode 16 = 7 slash bar
-keycode 17 = 8 parenleft cent
-keycode 18 = 9 parenright
-keycode 19 = 0 equal
-keycode 20 = apostrophe question dead_acute
-keycode 21 = dead_circumflex dead_grave dead_tilde
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E EuroSign
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = udiaeresis egrave bracketleft
-keycode 35 = dead_diaeresis exclam bracketright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = odiaeresis eacute
-keycode 48 = adiaeresis agrave braceleft
-keycode 49 = section degree
-keycode 50 = Shift_L
-keycode 51 = dollar sterling braceright
-keycode 52 = y
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = less greater backslash
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.si b/gkb-new/xmodmap/xmodmap.si
deleted file mode 100644
index 8398da0e..00000000
--- a/gkb-new/xmodmap/xmodmap.si
+++ /dev/null
@@ -1,121 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:11 CET 1998
-clear Mod1
-clear Mod2
-! From: Primoz Peterlin <[email protected]>
-! Date: Tue, 10 Jan 95 22:22:55 MET
-!
-! Following is the Slovene keytable. You are free to include it
-! with the next release of kbd. BTW: Pavel Zaboj's ISO 8859-2
-! fonts have misplaced Rcaron at 0xEB in place of ediaeresis
-! (actually, I have only checked lat2-16).
-!
-!charset "iso-8859-2"
-keycode 9 = Escape
-keycode 10 = 1 exclam asciitilde
-keycode 11 = 2 quotedbl dead_caron
-keycode 12 = 3 numbersign asciicircum
-keycode 13 = 4 dollar dead_breve
-keycode 14 = 5 percent degree
-keycode 15 = 6 ampersand dead_ogonek
-keycode 16 = 7 slash dead_grave
-keycode 17 = 8 parenleft dead_abovedot
-keycode 18 = 9 parenright dead_acute
-keycode 19 = 0 equal dead_doubleacute
-keycode 20 = apostrophe question dead_diaeresis
-keycode 21 = plus asterisk dead_cedilla
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q Q backslash
-keycode 25 = w W bar
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = scaron Scaron division
-keycode 35 = dstroke Dstroke
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f F bracketleft
-keycode 42 = g G bracketright
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k K lstroke
-keycode 46 = l L Lstroke
-keycode 47 = ccaron Ccaron
-keycode 48 = cacute Cacute ssharp
-keycode 49 = cedilla diaeresis
-keycode 50 = Shift_L
-keycode 51 = zcaron Zcaron currency
-keycode 52 = y
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v V at
-keycode 56 = b B braceleft
-keycode 57 = n N braceright
-keycode 58 = m M section
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 91 = KP_Decimal
-keycode 94 = less greater
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.sk b/gkb-new/xmodmap/xmodmap.sk
deleted file mode 100644
index 2d74cf86..00000000
--- a/gkb-new/xmodmap/xmodmap.sk
+++ /dev/null
@@ -1,116 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:11 CET 1998
-!
-! Little fixes: Marcel Telka <[email protected]>, 2001
-!
-clear Mod1
-clear Mod2
-! Slovak keyboard
-!charset "iso-8859-2"
-keycode 9 = Escape Escape
-keycode 10 = plus 1 asciitilde
-keycode 11 = lcaron 2 dead_caron
-keycode 12 = scaron 3 asciicircum
-keycode 13 = ccaron 4 dead_breve
-keycode 14 = tcaron 5 degree
-keycode 15 = zcaron 6 dead_ogonek
-keycode 16 = yacute 7 dead_grave
-keycode 17 = aacute 8 dead_abovedot
-keycode 18 = iacute 9 dead_acute
-keycode 19 = eacute 0 dead_doubleacute
-keycode 20 = equal percent dead_diaeresis
-keycode 21 = dead_acute dead_caron dead_cedilla
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q Q backslash
-keycode 25 = w W bar
-keycode 26 = e E EuroSign
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = uacute slash division
-keycode 35 = adiaeresis parenleft multiply
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s S dstroke
-keycode 40 = d D Dstroke
-keycode 41 = f F bracketleft
-keycode 42 = g G bracketright
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k K lstroke
-keycode 46 = l L Lstroke
-keycode 47 = ocircumflex quotedbl dollar
-keycode 48 = section exclam ssharp
-keycode 49 = semicolon degree
-keycode 50 = Shift_L
-keycode 51 = ncaron parenright currency
-keycode 52 = y Y greater
-keycode 53 = x X numbersign
-keycode 54 = c C ampersand
-keycode 55 = v V at
-keycode 56 = b B braceleft
-keycode 57 = n N braceright
-keycode 58 = m
-keycode 59 = comma question less
-keycode 60 = period colon greater
-keycode 61 = minus underscore asterisk
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = ampersand asterisk less
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.th b/gkb-new/xmodmap/xmodmap.th
deleted file mode 100644
index 1025de8e..00000000
--- a/gkb-new/xmodmap/xmodmap.th
+++ /dev/null
@@ -1,127 +0,0 @@
-!
-! Linux/XFree86 Thai Kedmanee layout (based on US keyboard)
-! Generated on Mon May 26 22:59:56 1997
-! by Poonlap Veeratanabutr ([email protected])
-! Use ScrollLock to switch to Thai keyboard.
-! This file will work with XFree86 only.
-!
-! converted to Thai keysysm 1999-10-30 - Pablo Saratxaga <[email protected]>
-!
-
-keycode 0x09 = Escape
-keycode 0x43 = F1
-keycode 0x44 = F2
-keycode 0x45 = F3
-keycode 0x46 = F4
-keycode 0x47 = F5
-keycode 0x48 = F6
-keycode 0x49 = F7
-keycode 0x4A = F8
-keycode 0x4B = F9
-keycode 0x4C = F10
-keycode 0x5F = F11
-keycode 0x60 = F12
-keycode 0x6F = Print
-keycode 0x4E = Mode_switch
-keycode 0x6E = Pause
-keycode 0x31 = grave asciitilde minus percent
-keycode 0x0A = 1 exclam Thai_lakkhangyao plus
-keycode 0x0B = 2 at slash Thai_leknung
-keycode 0x0C = 3 numbersign underscore Thai_leksong
-keycode 0x0D = 4 dollar Thai_phosamphao Thai_leksam
-keycode 0x0E = 5 percent Thai_thothung Thai_leksi
-keycode 0x0F = 6 asciicircum Thai_sarau Thai_sarauu
-keycode 0x10 = 7 ampersand Thai_saraue Thai_baht
-keycode 0x11 = 8 asterisk Thai_khokhwai Thai_lekha
-keycode 0x12 = 9 parenleft Thai_totao Thai_lekhok
-keycode 0x13 = 0 parenright Thai_chochan Thai_lekchet
-keycode 0x14 = minus underscore Thai_khokhai Thai_lekpaet
-keycode 0x15 = equal plus Thai_chochang Thai_lekkao
-keycode 0x33 = backslash bar Thai_khokhuat Thai_khokhon
-keycode 0x16 = BackSpace
-keycode 0x6A = Insert
-keycode 0x61 = Home
-keycode 0x63 = Prior
-keycode 0x4D = Num_Lock
-keycode 0x70 = KP_Divide
-keycode 0x3F = KP_Multiply
-keycode 0x52 = KP_Subtract
-keycode 0x17 = Tab
-keycode 0x18 = q Q Thai_maiyamok Thai_leksun
-keycode 0x19 = w W Thai_saraaimaimalai quotedbl
-keycode 0x1A = e E Thai_saraam Thai_dochada
-keycode 0x1B = r R Thai_phophan Thai_thonangmontho
-keycode 0x1C = t T Thai_saraa Thai_thothong
-keycode 0x1D = y Y Thai_maihanakat Thai_nikhahit
-keycode 0x1E = u U Thai_saraii Thai_maitri
-keycode 0x1F = i I Thai_rorua Thai_nonen
-keycode 0x20 = o O Thai_nonu Thai_paiyannoi
-keycode 0x21 = p P Thai_yoyak Thai_yoying
-keycode 0x22 = bracketleft braceleft Thai_bobaimai Thai_thothan
-keycode 0x23 = bracketright braceright Thai_loling comma
-keycode 0x24 = Return
-keycode 0x6B = Delete
-keycode 0x67 = End
-keycode 0x69 = Next
-keycode 0x4F = KP_7
-keycode 0x50 = KP_8
-keycode 0x51 = KP_9
-keycode 0x56 = KP_Add
-keycode 0x42 = Caps_Lock
-keycode 0x26 = a A Thai_fofan Thai_ru
-keycode 0x27 = s S Thai_hohip Thai_khorakhang
-keycode 0x28 = d D Thai_kokai Thai_topatak
-keycode 0x29 = f F Thai_dodek Thai_sarao
-keycode 0x2A = g G Thai_sarae Thai_chochoe
-keycode 0x2B = h H Thai_maitho Thai_maitaikhu
-keycode 0x2C = j J Thai_maiek Thai_maichattawa
-keycode 0x2D = k K Thai_saraaa Thai_sorusi
-keycode 0x2E = l L Thai_sosua Thai_sosala
-keycode 0x2F = semicolon colon Thai_wowaen Thai_soso
-keycode 0x30 = apostrophe quotedbl Thai_ngongu period
-keycode 0x53 = KP_4
-keycode 0x54 = KP_5
-keycode 0x55 = KP_6
-keycode 0x32 = Shift_L
-keycode 0x34 = z Z Thai_phophung parenleft
-keycode 0x35 = x X Thai_popla parenright
-keycode 0x36 = c C Thai_saraae Thai_choching
-keycode 0x37 = v V Thai_oang Thai_honokhuk
-keycode 0x38 = b B Thai_sarai Thai_phinthu
-keycode 0x39 = n N Thai_sarauee Thai_thanthakhat
-keycode 0x3A = m M Thai_thothahan question
-keycode 0x3B = comma less Thai_moma Thai_thophuthao
-keycode 0x3C = period greater Thai_saraaimaimuan Thai_lochula
-keycode 0x3D = slash question Thai_fofa Thai_lu
-keycode 0x3E = Shift_R
-keycode 0x62 = Up
-keycode 0x57 = KP_1
-keycode 0x58 = KP_2
-keycode 0x59 = KP_3
-keycode 0x6C = KP_Enter
-keycode 0x25 = Control_L
-keycode 0x40 = Alt_L Meta_L
-keycode 0x41 = space
-keycode 0x71 = Mode_switch
-keycode 0x6D = Control_R
-keycode 0x64 = Left
-keycode 0x68 = Down
-keycode 0x66 = Right
-keycode 0x5A = KP_0
-keycode 0x5B = KP_Decimal
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift = Shift_L Shift_R
-add Lock = Caps_Lock Control_R
-add Control = Control_L
-add Mod1 = Alt_L
-add Mod2 = Mode_switch Control_R
-
diff --git a/gkb-new/xmodmap/xmodmap.tr_f b/gkb-new/xmodmap/xmodmap.tr_f
deleted file mode 100644
index 22b4552f..00000000
--- a/gkb-new/xmodmap/xmodmap.tr_f
+++ /dev/null
@@ -1,119 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] Thu Jun 12 00:28:24 MET DST 1997
-clear Mod1
-clear Mod2
-clear Lock
-! turkish "F" keyboard, copyed from LyX turkish keyboard description
-! right Ctrl key switches to an almost US keyboard (number row is mangled
-! us keyboard mode, this to allow simple access by AltGr while in turkish
-! mode to all needed symbols)
-!
-! Pablo Saratxaga <[email protected]>
-! iso-8859-9 is not yet known by loadkeys
-! charset "iso-8859-9"
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 apostrophe at
-keycode 12 = 3 dead_circumflex numbersign
-keycode 13 = 4 plus dollar
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand asciicircum
-keycode 16 = 7 slash braceleft
-keycode 17 = 8 parenleft bracketleft
-keycode 18 = 9 parenright bracketright
-keycode 19 = 0 equal braceright
-keycode 20 = asterisk question backslash
-keycode 21 = minus underscore
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = f F q Q
-keycode 25 = g G w W
-keycode 26 = gbreve Gbreve e E
-keycode 27 = idotless I r R
-keycode 28 = o O t T
-keycode 29 = d D y Y
-keycode 30 = r R u U
-keycode 31 = n N i I
-keycode 32 = h H o O
-keycode 33 = p
-keycode 34 = q Q bracketleft braceleft
-keycode 35 = w W bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = u U a A
-keycode 39 = i Iabovedot s S
-keycode 40 = e E d D
-keycode 41 = a A f F
-keycode 42 = g
-keycode 43 = t T h H
-keycode 44 = k K j J
-keycode 45 = m M k K
-keycode 46 = l
-keycode 47 = y Y semicolon colon
-keycode 48 = scedilla Scedilla apostrophe quotedbl
-keycode 49 = backslash quotedbl grave asciitilde
-keycode 50 = Shift_L
-keycode 51 = x X backslash bar
-keycode 52 = j J z Z
-keycode 53 = odiaeresis Odiaeresis x X
-keycode 54 = v V c C
-keycode 55 = c C v V
-keycode 56 = ccedilla Ccedilla b B
-keycode 57 = z Z n N
-keycode 58 = s S m M
-keycode 59 = b B comma less
-keycode 60 = period colon period greater
-keycode 61 = comma semicolon slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
-add Lock = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.tr_q b/gkb-new/xmodmap/xmodmap.tr_q
deleted file mode 100644
index 6d49df06..00000000
--- a/gkb-new/xmodmap/xmodmap.tr_q
+++ /dev/null
@@ -1,115 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] Thu Jun 12 00:28:13 MET DST 1997
-clear Mod1
-clear Mod2
-! turkish "Q" keyboard, copyed from LyX turkish keyboard description
-!
-! Pablo Saratxaga <[email protected]>
-! iso-8859-9 is not yet known by loadkeys
-! charset "iso-8859-9"
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 apostrophe at
-keycode 12 = 3 dead_circumflex numbersign
-keycode 13 = 4 plus dollar
-keycode 14 = 5 percent
-keycode 15 = 6 ampersand asciicircum
-keycode 16 = 7 slash braceleft
-keycode 17 = 8 parenleft bracketleft
-keycode 18 = 9 parenright bracketright
-keycode 19 = 0 equal braceright
-keycode 20 = asterisk question backslash
-keycode 21 = minus underscore
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = idotless I
-keycode 32 = o
-keycode 33 = p
-keycode 34 = gbreve Gbreve
-keycode 35 = udiaeresis Udiaeresis asciitilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = scedilla Scedilla
-keycode 48 = i Iabovedot
-keycode 49 = backslash quotedbl asciitilde
-keycode 50 = Shift_L
-keycode 51 = comma semicolon bar
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = odiaeresis Odiaeresis less
-keycode 60 = ccedilla Ccedilla greater
-keycode 61 = period colon
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.uk b/gkb-new/xmodmap/xmodmap.uk
deleted file mode 100644
index 2afc52df..00000000
--- a/gkb-new/xmodmap/xmodmap.uk
+++ /dev/null
@@ -1,111 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:13 CET 1998
-clear Mod1
-clear Mod2
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 quotedbl at
-keycode 12 = 3 sterling
-keycode 13 = 4 dollar dollar
-keycode 14 = 5 percent
-keycode 15 = 6 asciicircum
-keycode 16 = 7 ampersand braceleft
-keycode 17 = 8 asterisk bracketleft
-keycode 18 = 9 parenleft bracketright
-keycode 19 = 0 parenright braceright
-keycode 20 = minus underscore backslash
-keycode 21 = equal plus
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright asciitilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = semicolon colon
-keycode 48 = apostrophe at
-keycode 49 = grave asciitilde
-keycode 50 = Shift_L
-keycode 51 = numbersign asciitilde
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma less
-keycode 60 = period greater Multi_key
-keycode 61 = slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = backslash bar bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.uk_x86 b/gkb-new/xmodmap/xmodmap.uk_x86
deleted file mode 100644
index fd4c4256..00000000
--- a/gkb-new/xmodmap/xmodmap.uk_x86
+++ /dev/null
@@ -1,129 +0,0 @@
-keycode 8 = quoteleft notsign brokenbar
-keycode 9 = 1 exclam
-keycode 10 = 2 quotedbl
-keycode 11 = 3 sterling
-keycode 12 = 4 dollar currency
-keycode 13 = 5 percent
-keycode 14 = 6 asciicircum
-keycode 15 = 7 ampersand
-keycode 16 = 8 asterisk
-keycode 17 = 9 parenleft
-keycode 18 = 0 parenright
-keycode 19 = minus underscore
-keycode 20 = equal plus
-keycode 21 =
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = Q
-keycode 25 = W
-keycode 26 = e E currency
-keycode 27 = R
-keycode 28 = T
-keycode 29 = Y
-keycode 30 = U
-keycode 31 = I
-keycode 32 = O
-keycode 33 = P
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright
-keycode 36 = numbersign asciitilde
-keycode 37 = Caps_Lock
-keycode 38 = A
-keycode 39 = S
-keycode 40 = D
-keycode 41 = F
-keycode 42 = G
-keycode 43 = H
-keycode 44 = J
-keycode 45 = K
-keycode 46 = L
-keycode 47 = semicolon colon
-keycode 48 = quoteright at
-keycode 49 =
-keycode 50 = Return
-keycode 51 = Shift_L
-keycode 52 = backslash bar
-keycode 53 = Z
-keycode 54 = X
-keycode 55 = C
-keycode 56 = V
-keycode 57 = B
-keycode 58 = N
-keycode 59 = M
-keycode 60 = comma less
-keycode 61 = period greater
-keycode 62 = slash question
-keycode 63 =
-keycode 64 = Shift_R
-keycode 65 = Control_L
-keycode 66 =
-keycode 67 = Alt_L
-keycode 68 = space
-keycode 69 = SunAltGraph
-keycode 70 =
-keycode 71 = Control_R
-keycode 72 =
-keycode 73 =
-keycode 74 =
-keycode 75 =
-keycode 76 =
-keycode 77 =
-keycode 78 =
-keycode 79 =
-keycode 80 =
-keycode 81 =
-keycode 82 = Insert
-keycode 83 = Delete
-keycode 84 =
-keycode 85 =
-keycode 86 = Left
-keycode 87 = Home
-keycode 88 = End
-keycode 89 =
-keycode 90 = Up
-keycode 91 = Down
-keycode 92 = Prior
-keycode 93 = Next
-keycode 94 =
-keycode 95 =
-keycode 96 = Right
-keycode 97 = Num_Lock
-keycode 98 = Home KP_7 KP_7
-keycode 99 = Left KP_4 KP_4
-keycode 100 = End KP_1 KP_1
-keycode 101 =
-keycode 102 = KP_Divide
-keycode 103 = Up KP_8 KP_8
-keycode 104 = KP_5 KP_5 KP_5
-keycode 105 = Down KP_2 KP_2
-keycode 106 = KP_Insert KP_0 KP_0
-keycode 107 = KP_Multiply
-keycode 108 = Prior KP_9 KP_9
-keycode 109 = Right KP_6 KP_6
-keycode 110 = Next KP_3 KP_3
-keycode 111 = Delete KP_Decimal KP_Decimal
-keycode 112 = KP_Subtract
-keycode 113 = KP_Add
-keycode 114 =
-keycode 115 = KP_Enter
-keycode 116 =
-keycode 117 = Escape
-keycode 118 =
-keycode 119 = F1
-keycode 120 = F2
-keycode 121 = F3
-keycode 122 = F4
-keycode 123 = F5
-keycode 124 = F6
-keycode 125 = F7
-keycode 126 = F8
-keycode 127 = F9
-keycode 128 = F10
-keycode 129 = SunF36
-keycode 130 = SunF37
-keycode 131 = Print SunSys_Req
-keycode 132 = Scroll_Lock
-keycode 133 = Pause Break
-keycode 134 =
-keycode 135 = Multi_key
-keycode 136 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.us b/gkb-new/xmodmap/xmodmap.us
deleted file mode 100644
index 56dbd344..00000000
--- a/gkb-new/xmodmap/xmodmap.us
+++ /dev/null
@@ -1,114 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:24:27 CET 1998
-clear Mod1
-clear Mod2
-! us.map
-! with some additions from [email protected] (Daniel Quinlan)
-! 14 Mar 1994
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 at at
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar dollar
-keycode 14 = 5 percent
-keycode 15 = 6 asciicircum
-keycode 16 = 7 ampersand braceleft
-keycode 17 = 8 asterisk bracketleft
-keycode 18 = 9 parenleft bracketright
-keycode 19 = 0 parenright braceright
-keycode 20 = minus underscore backslash
-keycode 21 = equal plus
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright asciitilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = semicolon colon
-keycode 48 = apostrophe quotedbl
-keycode 49 = grave asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma less
-keycode 60 = period greater Multi_key
-keycode 61 = slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.us-101 b/gkb-new/xmodmap/xmodmap.us-101
deleted file mode 100644
index c497e0df..00000000
--- a/gkb-new/xmodmap/xmodmap.us-101
+++ /dev/null
@@ -1,211 +0,0 @@
-!
-! $XFree86: xc/programs/Xserver/hw/xfree86/etc/xmodmap.std,v 3.5 1996/12/23 06:47:28 dawes Exp $
-!
-! Standard key mapping for XFree86 (for US keyboards).
-!
-! This file can be fed to xmodmap to restore the default mapping.
-!
-! $XConsortium: xmodmap.std /main/7 1996/02/21 17:48:55 kaleb $
-!
-! First, clear the modifiers
-!
-clear shift
-clear lock
-clear control
-clear mod1
-clear mod2
-clear mod3
-clear mod4
-clear mod5
-!
-! Set the mapping for each key
-!
-keycode 8 =
-keycode 9 = Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 at
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar
-keycode 14 = 5 percent
-keycode 15 = 6 asciicircum
-keycode 16 = 7 ampersand
-keycode 17 = 8 asterisk
-keycode 18 = 9 parenleft
-keycode 19 = 0 parenright
-keycode 20 = minus underscore
-keycode 21 = equal plus
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = q Q
-keycode 25 = w W
-keycode 26 = e E
-keycode 27 = r R
-keycode 28 = t T
-keycode 29 = y Y
-keycode 30 = u U
-keycode 31 = i I
-keycode 32 = o O
-keycode 33 = p P
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A
-keycode 39 = s S
-keycode 40 = d D
-keycode 41 = f F
-keycode 42 = g G
-keycode 43 = h H
-keycode 44 = j J
-keycode 45 = k K
-keycode 46 = l L
-keycode 47 = semicolon colon
-keycode 48 = apostrophe quotedbl
-keycode 49 = grave asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar
-keycode 52 = z Z
-keycode 53 = x X
-keycode 54 = c C
-keycode 55 = v V
-keycode 56 = b B
-keycode 57 = n N
-keycode 58 = m M
-keycode 59 = comma less
-keycode 60 = period greater
-keycode 61 = slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock
-keycode 78 = Multi_key
-keycode 79 = KP_Home KP_7
-keycode 80 = KP_Up KP_8
-keycode 81 = KP_Prior KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_Left KP_4
-keycode 84 = NoSymbol KP_5
-keycode 85 = KP_Right KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_End KP_1
-keycode 88 = KP_Down KP_2
-keycode 89 = KP_Next KP_3
-keycode 90 = KP_Insert KP_0
-keycode 91 = KP_Delete KP_Decimal
-!keycode 92 = X386Sys_Req
-keycode 93 =
-keycode 94 =
-keycode 95 = F11
-keycode 96 = F12
-! keycodes 97-107 are not available on 84-key keyboards
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 101 = Begin
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause
-keycode 111 = Print
-keycode 112 = KP_Divide
-keycode 113 = Alt_R Meta_R
-keycode 114 = Break
-! keycodes 115-117 are only available on some extended keyboards
-! (e.g., Microsoft's ergonomic keyboard).
-keycode 115 = Meta_L
-keycode 116 = Meta_R
-keycode 117 = Menu
-!
-! Set the modifiers
-!
-add shift = Shift_L Shift_R
-add lock = Caps_Lock
-add control = Control_L Control_R
-add mod1 = Alt_L Alt_R
-! If you have ServerNumlock set in your XF86Config, you can comment out
-add mod2 = Num_Lock
-!
-!
-!
-! If you use any of the special default key mappings in Xconfig, they should be
-! duplicated in this file. Mappings should be added before the section above
-! which sets the modifiers.
-!
-! For the key specs:
-! LeftAlt => keycode 64
-! RightAlt => keycode 113
-! AltGr => keycode 113
-! ScrollLock => keycode 78
-! RightCtl => keycode 109
-!
-! For the mappings:
-! Meta => Alt_L Meta_L
-! Alt_R Meta_R
-! Compose => Multi_key
-! ModeShift => Mode_switch
-! ModeLock => Mode_switch X386Mode_Lock
-! ScrollLock => Scroll_Lock
-! Control => Control_R
-!
-! If you use ModeShift or ModeLock, the following modifier must be set:
-!
-!add mod5 = Mode_switch
-!
-! For example, to get the equivalent of:
-!
-! ScrollLock ModeLock
-! RightAlt ModeShift
-! LeftAlt Meta
-! RightCtl Compose
-!
-! use the following:
-!
-!keycode 78 = Mode_switch X386Mode_Lock
-!keycode 113 = Mode_switch
-!keycode 64 = Alt_L Meta_L
-!keycode 109 = Multi_key
-!
-!add mod5 = Mode_switch
-
-! When using ServerNumLock in your XF86Config, the following codes/symbols
-! are available in place of 79-81, 83-85, 87-91
-!keycode 136 = KP_7
-!keycode 137 = KP_8
-!keycode 138 = KP_9
-!keycode 139 = KP_4
-!keycode 140 = KP_5
-!keycode 141 = KP_6
-!keycode 142 = KP_1
-!keycode 143 = KP_2
-!keycode 144 = KP_3
-!keycode 145 = KP_0
-!keycode 146 = KP_Decimal
-!keycode 147 = Home
-!keycode 148 = Up
-!keycode 149 = Prior
-!keycode 150 = Left
-!keycode 151 = Begin
-!keycode 152 = Right
-!keycode 153 = End
-!keycode 154 = Down
-!keycode 155 = Next
-!keycode 156 = Insert
-!keycode 157 = Delete
diff --git a/gkb-new/xmodmap/xmodmap.us-84 b/gkb-new/xmodmap/xmodmap.us-84
deleted file mode 100644
index 4bbaf711..00000000
--- a/gkb-new/xmodmap/xmodmap.us-84
+++ /dev/null
@@ -1,158 +0,0 @@
-!
-! This is an `xmodmap' input file for PC 84 key PC/AT (XFree86; US) keyboards.
-! Automatically generated on Sat Oct 28 17:10:23 2000 by root with
-! XKeyCaps 2.46; Copyright (c) 1999 Jamie Zawinski <[email protected]>.
-! http://www.jwz.org/xkeycaps/
-!
-! This file makes the following changes:
-!
-! The "~ `" key generates 0, section, and notsign
-! The "! 1" key generates 1, apostrophe, asciitilde, and dead_tilde
-! The "@ 2" key generates 2, quotedbl, caron, and dead_caron
-! The "# 3" key generates 3, plus, asciicircum, and dead_circumflex
-! The "$ 4" key generates 4, exclam, breve, and dead_breve
-! The "% 5" key generates 5, percent, degree, and dead_abovering
-! The "^ 6" key generates 6, slash, ogonek, and dead_ogonek
-! The "& 7" key generates 7, equal, grave, and dead_grave
-! The "* 8" key generates 8, parenleft, abovedot, and dead_abovedot
-! The "( 9" key generates 9, parenright, acute, and dead_acute
-! The ") 0" key generates odiaeresis, Odiaeresis, doubleacute, and dead_doubleacute
-! The "_ -" key generates udiaeresis, Udiaeresis, diaeresis, and dead_diaeresis
-! The "+ =" key generates oacute, Oacute, cedilla, and dead_cedilla
-! The "| \" key generates ucircumflex, Ucircumflex, currency, and dead_breve
-! The "Sys Req" key generates Print and Sys_Req
-! The "Q" key generates q, Q, backslash, and Greek_OMEGA
-! The "W" key generates w, W, bar, and Lstroke
-! The "R" key generates r, R, paragraph, and registered
-! The "T" key generates t, T, tslash, and Tslash
-! The "Y" key generates z, Z, leftarrow, and yen
-! The "U" key generates u, U, downarrow, and uparrow
-! The "I" key generates i, I, Iacute, and idotless
-! The "O" key generates o, O, oslash, and Ooblique
-! The "P" key generates p, P, thorn, and THORN
-! The "{ [" key generates otilde, Otilde, division, and dead_abovering
-! The "} ]" key generates uacute, Uacute, multiply, and dead_macron
-! The "A" key generates a, A, ae, and AE
-! The "S" key generates s, S, dstroke, and section
-! The "D" key generates d, D, Dstroke, and ETH
-! The "F" key generates f, F, bracketleft, and ordfeminine
-! The "G" key generates g, G, bracketright, and ENG
-! The "H" key generates h, H, hstroke, and Hstroke
-! The "J" key generates j, J, and iacute
-! The "K" key generates k, K, lstroke, and ampersand
-! The "L" key generates l, L, Lstroke, and Lstroke
-! The ": ;" key generates eacute, Eacute, dollar, and dead_doubleacute
-! The "" '" key generates aacute, Aacute, ssharp, and dead_caron
-! The "Z" key generates y, Y, greater, and less
-! The "X" key generates x, X, numbersign, and greater
-! The "C" key generates c, C, ampersand, and copyright
-! The "V" key generates v, V, at, and grave
-! The "B" key generates b, B, braceleft, and apostrophe
-! The "N" key generates n, N, and braceright
-! The "M" key generates m, M, mu, and masculine
-! The "< ," key generates comma, question, semicolon, and multiply
-! The "> ." key generates period, colon, periodcentered, and division
-! The "? /" key generates minus, underscore, asterisk, and dead_abovedot
-! The "Alt" key generates Alt_L and Meta_L
-
-keycode 0x43 = F1
-keycode 0x44 = F2
-keycode 0x31 = 0 section notsign
-keycode 0x0A = 1 apostrophe asciitilde dead_tilde
-keycode 0x0B = 2 quotedbl caron dead_caron
-keycode 0x0C = 3 plus asciicircum dead_circumflex
-keycode 0x0D = 4 exclam breve dead_breve
-keycode 0x0E = 5 percent degree dead_abovering
-keycode 0x0F = 6 slash ogonek dead_ogonek
-keycode 0x10 = 7 equal grave dead_grave
-keycode 0x11 = 8 parenleft abovedot dead_abovedot
-keycode 0x12 = 9 parenright acute dead_acute
-keycode 0x13 = odiaeresis Odiaeresis doubleacute dead_doubleacute
-keycode 0x14 = udiaeresis Udiaeresis diaeresis dead_diaeresis
-keycode 0x15 = oacute Oacute cedilla dead_cedilla
-keycode 0x33 = ucircumflex Ucircumflex currency dead_breve
-keycode 0x16 = BackSpace
-keycode 0x09 = Escape
-keycode 0x4D = Num_Lock Pointer_EnableKeys
-keycode 0x4E = Scroll_Lock
-keycode 0x5C = Print Sys_Req
-keycode 0x45 = F3
-keycode 0x46 = F4
-keycode 0x17 = Tab ISO_Left_Tab
-keycode 0x18 = q Q backslash Greek_OMEGA
-keycode 0x19 = w W bar Lstroke
-keycode 0x1A = e E
-keycode 0x1B = r R paragraph registered
-keycode 0x1C = t T tslash Tslash
-keycode 0x1D = z Z leftarrow yen
-keycode 0x1E = u U downarrow uparrow
-keycode 0x1F = i I Iacute idotless
-keycode 0x20 = o O oslash Ooblique
-keycode 0x21 = p P thorn THORN
-keycode 0x22 = otilde Otilde division dead_abovering
-keycode 0x23 = uacute Uacute multiply dead_macron
-keycode 0x24 = Return
-keycode 0x4F = KP_Home KP_7
-keycode 0x50 = KP_Up KP_8
-keycode 0x51 = KP_Prior KP_9
-keycode 0x3F = KP_Multiply
-keycode 0x47 = F5
-keycode 0x48 = F6
-keycode 0x25 = Control_L
-keycode 0x26 = a A ae AE
-keycode 0x27 = s S dstroke section
-keycode 0x28 = d D Dstroke ETH
-keycode 0x29 = f F bracketleft ordfeminine
-keycode 0x2A = g G bracketright ENG
-keycode 0x2B = h H hstroke Hstroke
-keycode 0x2C = j J iacute
-keycode 0x2D = k K lstroke ampersand
-keycode 0x2E = l L Lstroke Lstroke
-keycode 0x2F = eacute Eacute dollar dead_doubleacute
-keycode 0x30 = aacute Aacute ssharp dead_caron
-keycode 0x53 = KP_Left KP_4
-keycode 0x54 = KP_Begin KP_5
-keycode 0x55 = KP_Right KP_6
-keycode 0x52 = KP_Subtract
-keycode 0x49 = F7
-keycode 0x4A = F8
-keycode 0x32 = Shift_L
-keycode 0x34 = y Y greater less
-keycode 0x35 = x X numbersign greater
-keycode 0x36 = c C ampersand copyright
-keycode 0x37 = v V at grave
-keycode 0x38 = b B braceleft apostrophe
-keycode 0x39 = n N braceright
-keycode 0x3A = m M mu masculine
-keycode 0x3B = comma question semicolon multiply
-keycode 0x3C = period colon periodcentered division
-keycode 0x3D = minus underscore asterisk dead_abovedot
-keycode 0x3E = Shift_R
-keycode 0x57 = KP_End KP_1
-keycode 0x58 = KP_Down KP_2
-keycode 0x59 = KP_Next KP_3
-keycode 0x56 = KP_Add
-keycode 0x4B = F9
-keycode 0x4C = F10
-keycode 0x40 = Alt_L Meta_L
-keycode 0x41 = space
-keycode 0x42 = Caps_Lock
-keycode 0x5A = KP_Insert KP_0
-keycode 0x5B = KP_Delete KP_Decimal
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift = Shift_L Shift_R
-add Lock = Caps_Lock
-add Control = Control_L Control_R
-add Mod1 = Alt_L
-add Mod2 = Num_Lock
-add Mod3 = Mode_switch
-add Mod5 = Scroll_Lock
diff --git a/gkb-new/xmodmap/xmodmap.us-dec b/gkb-new/xmodmap/xmodmap.us-dec
deleted file mode 100644
index dd8a1d5b..00000000
--- a/gkb-new/xmodmap/xmodmap.us-dec
+++ /dev/null
@@ -1,183 +0,0 @@
-!
-! This is an `xmodmap' input file for Digital LK450 (XFree86) keyboards.
-! Automatically generated on Sat Oct 28 17:11:10 2000 by root with
-! XKeyCaps 2.46; Copyright (c) 1999 Jamie Zawinski <[email protected]>.
-! http://www.jwz.org/xkeycaps/
-!
-! This file makes the following changes:
-!
-! The "F18 PrtSc" key generates Print and Sys_Req
-! The "! 1" key generates 1, apostrophe, asciitilde, and dead_tilde
-! The "@ 2" key generates 2, quotedbl, caron, and dead_caron
-! The "# 3" key generates 3, plus, asciicircum, and dead_circumflex
-! The "$ 4" key generates 4, exclam, breve, and dead_breve
-! The "% 5" key generates 5, percent, degree, and dead_abovering
-! The "^ 6" key generates 6, slash, ogonek, and dead_ogonek
-! The "& 7" key generates 7, equal, grave, and dead_grave
-! The "* 8" key generates 8, parenleft, abovedot, and dead_abovedot
-! The "( 9" key generates 9, parenright, acute, and dead_acute
-! The ") 0" key generates odiaeresis, Odiaeresis, doubleacute, and dead_doubleacute
-! The "_ -" key generates udiaeresis, Udiaeresis, diaeresis, and dead_diaeresis
-! The "+ =" key generates oacute, Oacute, cedilla, and dead_cedilla
-! The "PF4" key generates KP_Subtract
-! The "Q" key generates q, Q, backslash, and Greek_OMEGA
-! The "W" key generates w, W, bar, and Lstroke
-! The "R" key generates r, R, paragraph, and registered
-! The "T" key generates t, T, tslash, and Tslash
-! The "Y" key generates z, Z, leftarrow, and yen
-! The "U" key generates u, U, downarrow, and uparrow
-! The "I" key generates i, I, Iacute, and idotless
-! The "O" key generates o, O, oslash, and Ooblique
-! The "P" key generates p, P, thorn, and THORN
-! The "{ [" key generates otilde, Otilde, division, and dead_abovering
-! The "} ]" key generates uacute, Uacute, multiply, and dead_macron
-! The "-" key generates NoSymbol
-! The "A" key generates a, A, ae, and AE
-! The "S" key generates s, S, dstroke, and section
-! The "D" key generates d, D, Dstroke, and ETH
-! The "F" key generates f, F, bracketleft, and ordfeminine
-! The "G" key generates g, G, bracketright, and ENG
-! The "H" key generates h, H, hstroke, and Hstroke
-! The "J" key generates j, J, and iacute
-! The "K" key generates k, K, lstroke, and ampersand
-! The "L" key generates l, L, Lstroke, and Lstroke
-! The ": ;" key generates eacute, Eacute, dollar, and dead_doubleacute
-! The "" '" key generates aacute, Aacute, ssharp, and dead_caron
-! The "| \" key generates ucircumflex, Ucircumflex, currency, and dead_breve
-! The "~ `" key generates 0, section, and notsign
-! The "Z" key generates y, Y, greater, and less
-! The "X" key generates x, X, numbersign, and greater
-! The "C" key generates c, C, ampersand, and copyright
-! The "V" key generates v, V, at, and grave
-! The "B" key generates b, B, braceleft, and apostrophe
-! The "N" key generates n, N, and braceright
-! The "M" key generates m, M, mu, and masculine
-! The "< ," key generates comma, question, semicolon, and multiply
-! The "> ." key generates period, colon, periodcentered, and division
-! The "? /" key generates minus, underscore, asterisk, and dead_abovedot
-! The "Alt Function" key generates Mode_switch and Multi_key, and the Mod3 modifier
-
-keycode 0x43 = F1
-keycode 0x44 = F2
-keycode 0x45 = F3
-keycode 0x46 = F4
-keycode 0x47 = F5
-keycode 0x48 = F6
-keycode 0x49 = F7
-keycode 0x4A = F8
-keycode 0x4B = F9
-keycode 0x4C = F10
-keycode 0x5F = F11
-keycode 0x60 = F12
-keycode 0x76 = NoSymbol
-keycode 0x77 = NoSymbol
-keycode 0x78 = NoSymbol
-keycode 0x79 = NoSymbol
-keycode 0x7A = NoSymbol
-keycode 0x6F = Print Sys_Req
-keycode 0x4E = Scroll_Lock
-keycode 0x6E = Pause Break
-keycode 0x09 = Escape
-keycode 0x0A = 1 apostrophe asciitilde dead_tilde
-keycode 0x0B = 2 quotedbl caron dead_caron
-keycode 0x0C = 3 plus asciicircum dead_circumflex
-keycode 0x0D = 4 exclam breve dead_breve
-keycode 0x0E = 5 percent degree dead_abovering
-keycode 0x0F = 6 slash ogonek dead_ogonek
-keycode 0x10 = 7 equal grave dead_grave
-keycode 0x11 = 8 parenleft abovedot dead_abovedot
-keycode 0x12 = 9 parenright acute dead_acute
-keycode 0x13 = odiaeresis Odiaeresis doubleacute dead_doubleacute
-keycode 0x14 = udiaeresis Udiaeresis diaeresis dead_diaeresis
-keycode 0x15 = oacute Oacute cedilla dead_cedilla
-keycode 0x16 = BackSpace
-keycode 0x61 = Home
-keycode 0x6A = Insert
-keycode 0x6B = Delete
-keycode 0x4D = Num_Lock Pointer_EnableKeys
-keycode 0x70 = KP_Divide
-keycode 0x3F = KP_Multiply
-keycode 0x52 = KP_Subtract
-keycode 0x17 = Tab ISO_Left_Tab
-keycode 0x18 = q Q backslash Greek_OMEGA
-keycode 0x19 = w W bar Lstroke
-keycode 0x1A = e E
-keycode 0x1B = r R paragraph registered
-keycode 0x1C = t T tslash Tslash
-keycode 0x1D = z Z leftarrow yen
-keycode 0x1E = u U downarrow uparrow
-keycode 0x1F = i I Iacute idotless
-keycode 0x20 = o O oslash Ooblique
-keycode 0x21 = p P thorn THORN
-keycode 0x22 = otilde Otilde division dead_abovering
-keycode 0x23 = uacute Uacute multiply dead_macron
-keycode 0x24 = Return
-keycode 0x67 = End
-keycode 0x63 = Prior
-keycode 0x69 = Next
-keycode 0x4F = KP_Home KP_7
-keycode 0x50 = KP_Up KP_8
-keycode 0x51 = KP_Prior KP_9
-keycode 0x7B = NoSymbol
-keycode 0x25 = Control_L
-keycode 0x42 = Caps_Lock
-keycode 0x26 = a A ae AE
-keycode 0x27 = s S dstroke section
-keycode 0x28 = d D Dstroke ETH
-keycode 0x29 = f F bracketleft ordfeminine
-keycode 0x2A = g G bracketright ENG
-keycode 0x2B = h H hstroke Hstroke
-keycode 0x2C = j J iacute
-keycode 0x2D = k K lstroke ampersand
-keycode 0x2E = l L Lstroke Lstroke
-keycode 0x2F = eacute Eacute dollar dead_doubleacute
-keycode 0x30 = aacute Aacute ssharp dead_caron
-keycode 0x33 = ucircumflex Ucircumflex currency dead_breve
-keycode 0x62 = Up
-keycode 0x53 = KP_Left KP_4
-keycode 0x54 = KP_Begin KP_5
-keycode 0x55 = KP_Right KP_6
-keycode 0x56 = KP_Add
-keycode 0x32 = Shift_L
-keycode 0x31 = 0 section notsign
-keycode 0x34 = y Y greater less
-keycode 0x35 = x X numbersign greater
-keycode 0x36 = c C ampersand copyright
-keycode 0x37 = v V at grave
-keycode 0x38 = b B braceleft apostrophe
-keycode 0x39 = n N braceright
-keycode 0x3A = m M mu masculine
-keycode 0x3B = comma question semicolon multiply
-keycode 0x3C = period colon periodcentered division
-keycode 0x3D = minus underscore asterisk dead_abovedot
-keycode 0x3E = Shift_R
-keycode 0x64 = Left
-keycode 0x68 = Down
-keycode 0x66 = Right
-keycode 0x57 = KP_End KP_1
-keycode 0x58 = KP_Down KP_2
-keycode 0x59 = KP_Next KP_3
-keycode 0x6C = KP_Enter
-keycode 0x40 = Alt_L Meta_L
-keycode 0x41 = space
-keycode 0x71 = Mode_switch Multi_key
-keycode 0x6D = Control_R
-keycode 0x5A = KP_Insert KP_0
-keycode 0x5B = KP_Delete KP_Decimal
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift = Shift_L Shift_R
-add Lock = Caps_Lock
-add Control = Control_L Control_R
-add Mod1 = Alt_L
-add Mod2 = Num_Lock
-add Mod3 = Mode_switch
-add Mod5 = Scroll_Lock
diff --git a/gkb-new/xmodmap/xmodmap.us-ibm b/gkb-new/xmodmap/xmodmap.us-ibm
deleted file mode 100644
index 5accd24e..00000000
--- a/gkb-new/xmodmap/xmodmap.us-ibm
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 = grave asciitilde
-keycode 10 = 1 exclam
-keycode 11 = 2 at
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar
-keycode 14 = 5 percent
-keycode 15 = 6 asciicircum
-keycode 16 = 7 ampersand
-keycode 17 = 8 asterisk
-keycode 18 = 9 parenleft
-keycode 19 = 0 parenright
-keycode 20 = minus underscore
-keycode 21 = equal plus
-keycode 22 =
-keycode 23 = BackSpace
-keycode 24 = Tab
-keycode 25 = q Q
-keycode 26 = w W
-keycode 27 = e E EuroSign
-keycode 28 = r R
-keycode 29 = t T
-keycode 30 = y Y
-keycode 31 = u U
-keycode 32 = i I
-keycode 33 = o O
-keycode 34 = p P
-keycode 35 = bracketleft braceleft
-keycode 36 = bracketright braceright
-keycode 37 = backslash bar
-keycode 38 = Caps_Lock
-keycode 39 = a A
-keycode 40 = s S
-keycode 41 = d D
-keycode 42 = f F
-keycode 43 = g G
-keycode 44 = h H
-keycode 45 = j J
-keycode 46 = k K
-keycode 47 = l L
-keycode 48 = semicolon colon
-keycode 49 = apostrophe quotedbl
-keycode 50 =
-keycode 51 = Return Return
-keycode 52 = Shift_L
-keycode 53 =
-keycode 54 = z Z
-keycode 55 = x X
-keycode 56 = c C
-keycode 57 = v V
-keycode 58 = b B
-keycode 59 = n N
-keycode 60 = m M
-keycode 61 = comma less
-keycode 62 = period greater
-keycode 63 = slash question
-keycode 64 =
-keycode 65 = Shift_R
-keycode 66 = Control_L
-keycode 67 =
-keycode 68 = Alt_L
-keycode 69 = space space
-keycode 70 = Alt_R
-keycode 71 =
-keycode 72 = Execute
-keycode 73 =
-keycode 74 =
-keycode 75 =
-keycode 76 =
-keycode 77 =
-keycode 78 =
-keycode 79 =
-keycode 80 =
-keycode 81 =
-keycode 82 =
-keycode 83 = Insert
-keycode 84 = Delete
-keycode 85 =
-keycode 86 =
-keycode 87 = Left
-keycode 88 = Home
-keycode 89 = End
-keycode 90 =
-keycode 91 = Up
-keycode 92 = Down
-keycode 93 = Prior
-keycode 94 = Next
-keycode 95 =
-keycode 96 =
-keycode 97 = Right
-keycode 98 = Num_Lock
-keycode 99 = KP_7
-keycode 100 = KP_4
-keycode 101 = KP_1
-keycode 102 =
-keycode 103 = KP_Divide
-keycode 104 = KP_8
-keycode 105 = KP_5
-keycode 106 = KP_2
-keycode 107 = KP_0
-keycode 108 = KP_Multiply
-keycode 109 = KP_9
-keycode 110 = KP_6
-keycode 111 = KP_3
-keycode 112 = KP_Decimal
-keycode 113 = KP_Subtract
-keycode 114 = KP_Add
-keycode 115 =
-keycode 116 = KP_Enter
-keycode 117 =
-keycode 118 = Escape
-keycode 119 =
-keycode 120 = F1
-keycode 121 = F2
-keycode 122 = F3
-keycode 123 = F4
-keycode 124 = F5
-keycode 125 = F6
-keycode 126 = F7
-keycode 127 = F8
-keycode 128 = F9
-keycode 129 = F10
-keycode 130 = F11
-keycode 131 = F12
-keycode 132 = Print
-keycode 133 = Cancel
-keycode 134 = Pause
-keycode 135 =
-keycode 136 =
-keycode 137 =
-keycode 138 =
-keycode 139 = Multi_key
-keycode 140 = Kanji
-keycode 141 = Mode_switch
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 =
-keycode 232 =
-keycode 233 =
-keycode 234 =
-keycode 235 =
-keycode 236 =
-keycode 237 =
-keycode 238 =
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap/xmodmap.us-int b/gkb-new/xmodmap/xmodmap.us-int
deleted file mode 100644
index 3e79d095..00000000
--- a/gkb-new/xmodmap/xmodmap.us-int
+++ /dev/null
@@ -1,114 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:24:27 CET 1998
-clear Mod1
-clear Mod2
-! us.map
-! with some additions from [email protected] (Daniel Quinlan)
-! 14 Mar 1994
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 at at
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar dollar
-keycode 14 = 5 percent
-keycode 15 = 6 dead_circumflex asciicircum
-keycode 16 = 7 ampersand braceleft
-keycode 17 = 8 asterisk bracketleft
-keycode 18 = 9 parenleft bracketright
-keycode 19 = 0 parenright braceright
-keycode 20 = minus underscore backslash
-keycode 21 = equal plus
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright asciitilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = semicolon colon
-keycode 48 = dead_acute dead_diaeresis apostrophe quotedbl
-keycode 49 = dead_grave dead_tilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma less dead_cedilla
-keycode 60 = period greater Multi_key
-keycode 61 = slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.us-mac b/gkb-new/xmodmap/xmodmap.us-mac
deleted file mode 100644
index f5645cb9..00000000
--- a/gkb-new/xmodmap/xmodmap.us-mac
+++ /dev/null
@@ -1,234 +0,0 @@
-!
-! This is an `xmodmap' input file for Apple Extended II (MkLinux; US) keyboards.
-! Automatically generated on Sat Oct 28 17:11:43 2000 by root with
-! XKeyCaps 2.46; Copyright (c) 1999 Jamie Zawinski <[email protected]>.
-! http://www.jwz.org/xkeycaps/
-!
-! This file makes the following changes:
-!
-! The "Esc" key generates minus, underscore, asterisk, and dead_abovedot
-! The "F1" key generates NoSymbol
-! The "F2" key generates NoSymbol
-! The "F3" key generates Delete
-! The "F4" key generates NoSymbol
-! The "F5" key generates Down
-! The "F6" key generates Next
-! The "F7" key generates Insert
-! The "F8" key generates KP_Enter
-! The "F9" key generates Control_R, and the Control modifier
-! The "F10" key generates NoSymbol
-! The "F11" key generates Print and Sys_Req
-! The "F12" key generates NoSymbol
-! The "Print Screen" key generates Mode_switch and Multi_key, and the Mod3 modifier
-! The "Scroll Lock" key generates NoSymbol
-! The "Pause F15" key generates NoSymbol
-! The "~ `" key generates m, M, mu, and masculine
-! The "! 1" key generates e and E
-! The "@ 2" key generates r, R, paragraph, and registered
-! The "# 3" key generates t, T, tslash, and Tslash
-! The "$ 4" key generates z, Z, leftarrow, and yen
-! The "% 5" key generates i, I, Iacute, and idotless
-! The "^ 6" key generates u, U, downarrow, and uparrow
-! The "& 7" key generates otilde, Otilde, division, and dead_abovering
-! The "* 8" key generates Return
-! The "( 9" key generates p, P, thorn, and THORN
-! The ") 0" key generates Control_L, and the Control modifier
-! The "_ -" key generates uacute, Uacute, multiply, and dead_macron
-! The "+ =" key generates o, O, oslash, and Ooblique
-! The "BackSpace" key generates comma, question, semicolon, and multiply
-! The "Insert" key generates NoSymbol
-! The "Home" key generates NoSymbol
-! The "Prior" key generates NoSymbol
-! The "NumLock" key generates KP_Home and KP_7
-! The "=" key generates KP_Next and KP_3
-! The "/" key generates KP_Left and KP_4
-! The "*" key generates F9
-! The "Tab" key generates b, B, braceleft, and apostrophe
-! The "Q" key generates udiaeresis, Udiaeresis, diaeresis, and dead_diaeresis
-! The "W" key generates oacute, Oacute, cedilla, and dead_cedilla
-! The "E" key generates BackSpace
-! The "R" key generates Tab and ISO_Left_Tab
-! The "T" key generates w, W, bar, and Lstroke
-! The "Y" key generates q, Q, backslash, and Greek_OMEGA
-! The "U" key generates d, D, Dstroke, and ETH
-! The "I" key generates g, G, bracketright, and ENG
-! The "O" key generates s, S, dstroke, and section
-! The "P" key generates h, H, hstroke, and Hstroke
-! The "{ [" key generates f, F, bracketleft, and ordfeminine
-! The "} ]" key generates a, A, ae, and AE
-! The "| \" key generates Shift_L, and the Shift modifier
-! The "Del" key generates NoSymbol
-! The "End" key generates NoSymbol
-! The "Next" key generates NoSymbol
-! The "7" key generates Home
-! The "8" key generates Prior
-! The "9" key generates Left
-! The "-" key generates KP_Add
-! The "Caps Lock" key generates space, and has no modifiers
-! The "A" key generates NoSymbol
-! The "S" key generates Escape
-! The "D" key generates 1, apostrophe, asciitilde, and dead_tilde
-! The "F" key generates 2, quotedbl, caron, and dead_caron
-! The "G" key generates 4, exclam, breve, and dead_breve
-! The "H" key generates 3, plus, asciicircum, and dead_circumflex
-! The "J" key generates l, L, Lstroke, and Lstroke
-! The "K" key generates aacute, Aacute, ssharp, and dead_caron
-! The "L" key generates k, K, lstroke, and ampersand
-! The ": ;" key generates 0, section, and notsign
-! The "" '" key generates eacute, Eacute, dollar, and dead_doubleacute
-! The "Return" key generates j, J, and iacute
-! The "4" key generates iacute, Iacute, and less
-! The "5" key generates F11
-! The "6" key generates F12
-! The "+" key generates Num_Lock and Pointer_EnableKeys, and the Mod2 modifier
-! The "Shift" key generates Alt_L and Meta_L, and the Mod1 modifier
-! The "Z" key generates 5, percent, degree, and dead_abovering
-! The "X" key generates 6, slash, ogonek, and dead_ogonek
-! The "C" key generates 7, equal, grave, and dead_grave
-! The "V" key generates 8, parenleft, abovedot, and dead_abovedot
-! The "B" key generates odiaeresis, Odiaeresis, doubleacute, and dead_doubleacute
-! The "N" key generates x, X, numbersign, and greater
-! The "M" key generates c, C, ampersand, and copyright
-! The "< ," key generates ucircumflex, Ucircumflex, currency, and dead_breve
-! The "> ." key generates v, V, at, and grave
-! The "? /" key generates y, Y, greater, and less
-! The "Shift" key generates Alt_L and Meta_L, and has no modifiers
-! The "UpArrow" key generates F4
-! The "1" key generates KP_Delete and KP_Decimal
-! The "2" key generates Print and Sys_Req
-! The "3" key generates NoSymbol
-! The "Enter" key generates KP_Begin and KP_5
-! The "Ctrl" key generates Shift_R, and the Shift modifier
-! The "alt" key generates Caps_Lock, and the Lock modifier
-! The "%" key generates KP_Multiply, and has no modifiers
-! The "space" key generates n, N, and braceright
-! The "%" key generates KP_Multiply, and has no modifiers
-! The "alt gr" key generates Caps_Lock
-! The "Ctrl" key generates Shift_R, and has no modifiers
-! The "LeftArrow" key generates F1
-! The "DownArrow" key generates F3
-! The "RightArrow" key generates F2
-! The "0" key generates KP_Insert and KP_0
-! The "." key generates F7
-
-keycode 0x3D = minus underscore asterisk dead_abovedot
-keycode 0x82 = NoSymbol
-keycode 0x80 = NoSymbol
-keycode 0x6B = Delete
-keycode 0x7E = NoSymbol
-keycode 0x68 = Down
-keycode 0x69 = Next
-keycode 0x6A = Insert
-keycode 0x6C = KP_Enter
-keycode 0x6D = Control_R
-keycode 0x75 = NoSymbol
-keycode 0x6F = Print Sys_Req
-keycode 0x77 = NoSymbol
-keycode 0x71 = Mode_switch Multi_key
-keycode 0x73 = NoSymbol
-keycode 0x79 = NoSymbol
-keycode 0x3A = m M mu masculine
-keycode 0x1A = e E
-keycode 0x1B = r R paragraph registered
-keycode 0x1C = t T tslash Tslash
-keycode 0x1D = z Z leftarrow yen
-keycode 0x1F = i I Iacute idotless
-keycode 0x1E = u U downarrow uparrow
-keycode 0x22 = otilde Otilde division dead_abovering
-keycode 0x24 = Return
-keycode 0x21 = p P thorn THORN
-keycode 0x25 = Control_L
-keycode 0x23 = uacute Uacute multiply dead_macron
-keycode 0x20 = o O oslash Ooblique
-keycode 0x3B = comma question semicolon multiply
-keycode 0x7A = NoSymbol
-keycode 0x7B = NoSymbol
-keycode 0x7C = NoSymbol
-keycode 0x4F = KP_Home KP_7
-keycode 0x59 = KP_Next KP_3
-keycode 0x53 = KP_Left KP_4
-keycode 0x4B = F9
-keycode 0x38 = b B braceleft apostrophe
-keycode 0x14 = udiaeresis Udiaeresis diaeresis dead_diaeresis
-keycode 0x15 = oacute Oacute cedilla dead_cedilla
-keycode 0x16 = BackSpace
-keycode 0x17 = Tab ISO_Left_Tab
-keycode 0x19 = w W bar Lstroke
-keycode 0x18 = q Q backslash Greek_OMEGA
-keycode 0x28 = d D Dstroke ETH
-keycode 0x2A = g G bracketright ENG
-keycode 0x27 = s S dstroke section
-keycode 0x2B = h H hstroke Hstroke
-keycode 0x29 = f F bracketleft ordfeminine
-keycode 0x26 = a A ae AE
-keycode 0x32 = Shift_L
-keycode 0x7D = NoSymbol
-keycode 0x7F = NoSymbol
-keycode 0x81 = NoSymbol
-keycode 0x61 = Home
-keycode 0x63 = Prior
-keycode 0x64 = Left
-keycode 0x56 = KP_Add
-keycode 0x41 = space
-keycode 0x08 = NoSymbol
-keycode 0x09 = Escape
-keycode 0x0A = 1 apostrophe asciitilde dead_tilde
-keycode 0x0B = 2 quotedbl caron dead_caron
-keycode 0x0D = 4 exclam breve dead_breve
-keycode 0x0C = 3 plus asciicircum dead_circumflex
-keycode 0x2E = l L Lstroke Lstroke
-keycode 0x30 = aacute Aacute ssharp dead_caron
-keycode 0x2D = k K lstroke ampersand
-keycode 0x31 = 0 section notsign
-keycode 0x2F = eacute Eacute dollar dead_doubleacute
-keycode 0x2C = j J iacute
-keycode 0x5E = iacute Iacute less
-keycode 0x5F = F11
-keycode 0x60 = F12
-keycode 0x4D = Num_Lock Pointer_EnableKeys
-keycode 0x40 = Alt_L Meta_L
-keycode 0x0E = 5 percent degree dead_abovering
-keycode 0x0F = 6 slash ogonek dead_ogonek
-keycode 0x10 = 7 equal grave dead_grave
-keycode 0x11 = 8 parenleft abovedot dead_abovedot
-keycode 0x13 = odiaeresis Odiaeresis doubleacute dead_doubleacute
-keycode 0x35 = x X numbersign greater
-keycode 0x36 = c C ampersand copyright
-keycode 0x33 = ucircumflex Ucircumflex currency dead_breve
-keycode 0x37 = v V at grave
-keycode 0x34 = y Y greater less
-keycode 0x40 = Alt_L Meta_L
-keycode 0x46 = F4
-keycode 0x5B = KP_Delete KP_Decimal
-keycode 0x5C = Print Sys_Req
-keycode 0x5D = NoSymbol
-keycode 0x54 = KP_Begin KP_5
-keycode 0x3E = Shift_R
-keycode 0x42 = Caps_Lock
-keycode 0x3F = KP_Multiply
-keycode 0x39 = n N braceright
-keycode 0x3F = KP_Multiply
-keycode 0x42 = Caps_Lock
-keycode 0x3E = Shift_R
-keycode 0x43 = F1
-keycode 0x45 = F3
-keycode 0x44 = F2
-keycode 0x5A = KP_Insert KP_0
-keycode 0x49 = F7
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift = Shift_L Shift_R
-add Lock = Caps_Lock
-add Control = Control_L Control_R
-add Mod1 = Alt_L
-add Mod2 = Num_Lock
-add Mod3 = Mode_switch
-add Mod5 = Scroll_Lock
diff --git a/gkb-new/xmodmap/xmodmap.us-sgi-101 b/gkb-new/xmodmap/xmodmap.us-sgi-101
deleted file mode 100644
index 09f78904..00000000
--- a/gkb-new/xmodmap/xmodmap.us-sgi-101
+++ /dev/null
@@ -1,228 +0,0 @@
-!
-! This is an `xmodmap' input file for
-! Silicon Graphics 101 key (Irix 5.2, 6.3; US) keyboards.
-! Automatically generated on Sat Oct 28 17:12:11 2000 by root with
-! XKeyCaps 2.46; Copyright (c) 1999 Jamie Zawinski <[email protected]>.
-! http://www.jwz.org/xkeycaps/
-!
-! This file makes the following changes:
-!
-! The "Esc" key generates 7, equal, grave, and dead_grave
-! The "F1" key generates 6, slash, ogonek, and dead_ogonek
-! The "F2" key generates Tab and ISO_Left_Tab
-! The "F3" key generates i, I, Iacute, and idotless
-! The "F4" key generates s, S, dstroke, and section
-! The "F5" key generates eacute, Eacute, dollar, and dead_doubleacute
-! The "F6" key generates v, V, at, and grave
-! The "F7" key generates KP_Multiply
-! The "F8" key generates F5
-! The "F9" key generates KP_Home and KP_7
-! The "F10" key generates KP_End and KP_1
-! The "F11" key generates iacute, Iacute, and less
-! The "F12" key generates Right
-! The "Print Sys_req" key generates F11
-! The "Scroll" key generates End, and has no modifiers
-! The "Pause Break" key generates Insert
-! The "~ `" key generates BackSpace
-! The "! 1" key generates u, U, downarrow, and uparrow
-! The "@ 2" key generates a, A, ae, and AE
-! The "# 3" key generates l, L, Lstroke, and Lstroke
-! The "$ 4" key generates k, K, lstroke, and ampersand
-! The "% 5" key generates c, C, ampersand, and copyright
-! The "^ 6" key generates Shift_R, and the Shift modifier
-! The "& 7" key generates F3
-! The "* 8" key generates F4
-! The "( 9" key generates Scroll_Lock, and the Mod5 modifier
-! The ") 0" key generates Num_Lock and Pointer_EnableKeys, and the Mod2 modifier
-! The "_ -" key generates KP_Add
-! The "+ =" key generates NoSymbol
-! The "Backspace" key generates Pause and Break
-! The "Insert" key generates Print and Sys_Req
-! The "Home" key generates NoSymbol
-! The "PgUp" key generates NoSymbol
-! The "Num" key generates NoSymbol, and has no modifiers
-! The "/" key generates NoSymbol
-! The "*" key generates NoSymbol
-! The "-" key generates NoSymbol
-! The "Tab" key generates oacute, Oacute, cedilla, and dead_cedilla
-! The "Q" key generates z, Z, leftarrow, and yen
-! The "W" key generates Control_L, and the Control modifier
-! The "E" key generates j, J, and iacute
-! The "R" key generates x, X, numbersign, and greater
-! The "T" key generates y, Y, greater, and less
-! The "Y" key generates minus, underscore, asterisk, and dead_abovedot
-! The "U" key generates F2
-! The "I" key generates F9
-! The "O" key generates F10
-! The "P" key generates KP_Right and KP_6
-! The "{ [" key generates Print and Sys_Req
-! The "} ]" key generates Prior
-! The "| \" key generates Left
-! The "Delete" key generates KP_Enter
-! The "End" key generates Control_R, and the Control modifier
-! The "PgDn" key generates NoSymbol
-! The "7 Home" key generates NoSymbol
-! The "8 UpArrow" key generates NoSymbol
-! The "9 PgUp" key generates NoSymbol
-! The "+" key generates NoSymbol
-! The "Caps Lock" key generates t, T, tslash, and Tslash, and has no modifiers
-! The "A" key generates Return
-! The "S" key generates uacute, Uacute, multiply, and dead_macron
-! The "D" key generates h, H, hstroke, and Hstroke
-! The "F" key generates ucircumflex, Ucircumflex, currency, and dead_breve
-! The "G" key generates period, colon, periodcentered, and division
-! The "H" key generates comma, question, semicolon, and multiply
-! The "J" key generates F1
-! The "K" key generates F8
-! The "L" key generates KP_Left and KP_4
-! The ": ;" key generates KP_Begin and KP_5
-! The "" '" key generates KP_Insert and KP_0
-! The "Enter" key generates Up
-! The "4 LeftArrow" key generates NoSymbol
-! The "5" key generates NoSymbol
-! The "6 RightArrow" key generates NoSymbol
-! The "Shift" key generates e and E, and has no modifiers
-! The "Z" key generates otilde, Otilde, division, and dead_abovering
-! The "X" key generates g, G, bracketright, and ENG
-! The "C" key generates f, F, bracketleft, and ordfeminine
-! The "V" key generates Shift_L, and the Shift modifier
-! The "B" key generates m, M, mu, and masculine
-! The "N" key generates n, N, and braceright
-! The "M" key generates Caps_Lock, and the Lock modifier
-! The "< ," key generates F7
-! The "> ." key generates KP_Prior and KP_9
-! The "? /" key generates KP_Subtract
-! The "Shift" key generates Home, and has no modifiers
-! The "UpArrow" key generates Delete
-! The "1 End" key generates Mode_switch and Multi_key, and the Mod3 modifier
-! The "2 DownArrow" key generates NoSymbol
-! The "3 PgDn" key generates NoSymbol
-! The "Enter" key generates NoSymbol
-! The "Ctrl" key generates w, W, bar, and Lstroke, and has no modifiers
-! The "Alt" key generates p, P, thorn, and THORN, and has no modifiers
-! The "space" key generates 0, section, and notsign
-! The "Alt" key generates space, and has no modifiers
-! The "Ctrl" key generates F12, and has no modifiers
-! The "LeftArrow" key generates Next
-! The "RightArrow" key generates Pause and Break
-! The "0 Ins" key generates NoSymbol
-! The ". Del" key generates NoSymbol
-
-keycode 0x10 = 7 equal grave dead_grave
-keycode 0x0F = 6 slash ogonek dead_ogonek
-keycode 0x17 = Tab ISO_Left_Tab
-keycode 0x1F = i I Iacute idotless
-keycode 0x27 = s S dstroke section
-keycode 0x2F = eacute Eacute dollar dead_doubleacute
-keycode 0x37 = v V at grave
-keycode 0x3F = KP_Multiply
-keycode 0x47 = F5
-keycode 0x4F = KP_Home KP_7
-keycode 0x57 = KP_End KP_1
-keycode 0x5E = iacute Iacute less
-keycode 0x66 = Right
-keycode 0x5F = F11
-keycode 0x67 = End
-keycode 0x6A = Insert
-keycode 0x16 = BackSpace
-keycode 0x1E = u U downarrow uparrow
-keycode 0x26 = a A ae AE
-keycode 0x2E = l L Lstroke Lstroke
-keycode 0x2D = k K lstroke ampersand
-keycode 0x36 = c C ampersand copyright
-keycode 0x3E = Shift_R
-keycode 0x45 = F3
-keycode 0x46 = F4
-keycode 0x4E = Scroll_Lock
-keycode 0x4D = Num_Lock Pointer_EnableKeys
-keycode 0x56 = KP_Add
-keycode 0x5D = NoSymbol
-keycode 0x6E = Pause Break
-keycode 0x6F = Print Sys_Req
-keycode 0x76 = NoSymbol
-keycode 0x77 = NoSymbol
-keycode 0x7E = NoSymbol
-keycode 0x7F = NoSymbol
-keycode 0x86 = NoSymbol
-keycode 0x8C = NoSymbol
-keycode 0x15 = oacute Oacute cedilla dead_cedilla
-keycode 0x1D = z Z leftarrow yen
-keycode 0x25 = Control_L
-keycode 0x2C = j J iacute
-keycode 0x35 = x X numbersign greater
-keycode 0x34 = y Y greater less
-keycode 0x3D = minus underscore asterisk dead_abovedot
-keycode 0x44 = F2
-keycode 0x4B = F9
-keycode 0x4C = F10
-keycode 0x55 = KP_Right KP_6
-keycode 0x5C = Print Sys_Req
-keycode 0x63 = Prior
-keycode 0x64 = Left
-keycode 0x6C = KP_Enter
-keycode 0x6D = Control_R
-keycode 0x75 = NoSymbol
-keycode 0x74 = NoSymbol
-keycode 0x7D = NoSymbol
-keycode 0x85 = NoSymbol
-keycode 0x84 = NoSymbol
-keycode 0x1C = t T tslash Tslash
-keycode 0x24 = Return
-keycode 0x23 = uacute Uacute multiply dead_macron
-keycode 0x2B = h H hstroke Hstroke
-keycode 0x33 = ucircumflex Ucircumflex currency dead_breve
-keycode 0x3C = period colon periodcentered division
-keycode 0x3B = comma question semicolon multiply
-keycode 0x43 = F1
-keycode 0x4A = F8
-keycode 0x53 = KP_Left KP_4
-keycode 0x54 = KP_Begin KP_5
-keycode 0x5A = KP_Insert KP_0
-keycode 0x62 = Up
-keycode 0x73 = NoSymbol
-keycode 0x7B = NoSymbol
-keycode 0x7C = NoSymbol
-keycode 0x1A = e E
-keycode 0x22 = otilde Otilde division dead_abovering
-keycode 0x2A = g G bracketright ENG
-keycode 0x29 = f F bracketleft ordfeminine
-keycode 0x32 = Shift_L
-keycode 0x3A = m M mu masculine
-keycode 0x39 = n N braceright
-keycode 0x42 = Caps_Lock
-keycode 0x49 = F7
-keycode 0x51 = KP_Prior KP_9
-keycode 0x52 = KP_Subtract
-keycode 0x61 = Home
-keycode 0x6B = Delete
-keycode 0x71 = Mode_switch Multi_key
-keycode 0x7A = NoSymbol
-keycode 0x82 = NoSymbol
-keycode 0x81 = NoSymbol
-keycode 0x19 = w W bar Lstroke
-keycode 0x21 = p P thorn THORN
-keycode 0x31 = 0 section notsign
-keycode 0x41 = space
-keycode 0x60 = F12
-keycode 0x69 = Next
-keycode 0x68 = Down
-keycode 0x72 = Pause Break
-keycode 0x78 = NoSymbol
-keycode 0x79 = NoSymbol
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift = Shift_L Shift_R
-add Lock = Caps_Lock
-add Control = Control_L Control_R
-add Mod1 = Alt_L
-add Mod2 = Num_Lock
-add Mod3 = Mode_switch
-add Mod5 = Scroll_Lock
diff --git a/gkb-new/xmodmap/xmodmap.us-sun b/gkb-new/xmodmap/xmodmap.us-sun
deleted file mode 100644
index b86fa415..00000000
--- a/gkb-new/xmodmap/xmodmap.us-sun
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = F11 F11 Cancel
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = F12 F12 Redo
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = F21 F21 Pause Break
-keycode 29 = F22 F22 Print SunSys_Req
-keycode 30 = F23 F23 Scroll_Lock
-keycode 31 = Left
-keycode 32 = F13 F13 SunProps
-keycode 33 = F14 F14 Undo
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar currency
-keycode 41 = 5 percent currency
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = grave asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = F25 F25 KP_Divide
-keycode 54 = F26 F26 KP_Multiply
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = F15 F15 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = F16 F16 SunCopy
-keycode 59 = Home
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = F27 F27 KP_7 Home
-keycode 76 = Up F28 KP_8
-keycode 77 = F29 F29 KP_9 Prior
-keycode 78 = F24 F24 KP_Subtract
-keycode 79 = F17 F17 SunOpen
-keycode 80 = F18 F18 SunPaste
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = semicolon colon
-keycode 94 = apostrophe quotedbl
-keycode 95 = backslash bar brokenbar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left F30 KP_4
-keycode 99 = F31 F31 KP_5
-keycode 100 = Right F32 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = F19 F19 Find
-keycode 103 = Prior
-keycode 104 = F20 F20 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = F33 F33 KP_1 End
-keycode 120 = Down F34 KP_2
-keycode 121 = F35 F35 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap/xmodmap.us.old b/gkb-new/xmodmap/xmodmap.us.old
deleted file mode 100644
index c497e0df..00000000
--- a/gkb-new/xmodmap/xmodmap.us.old
+++ /dev/null
@@ -1,211 +0,0 @@
-!
-! $XFree86: xc/programs/Xserver/hw/xfree86/etc/xmodmap.std,v 3.5 1996/12/23 06:47:28 dawes Exp $
-!
-! Standard key mapping for XFree86 (for US keyboards).
-!
-! This file can be fed to xmodmap to restore the default mapping.
-!
-! $XConsortium: xmodmap.std /main/7 1996/02/21 17:48:55 kaleb $
-!
-! First, clear the modifiers
-!
-clear shift
-clear lock
-clear control
-clear mod1
-clear mod2
-clear mod3
-clear mod4
-clear mod5
-!
-! Set the mapping for each key
-!
-keycode 8 =
-keycode 9 = Escape
-keycode 10 = 1 exclam
-keycode 11 = 2 at
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar
-keycode 14 = 5 percent
-keycode 15 = 6 asciicircum
-keycode 16 = 7 ampersand
-keycode 17 = 8 asterisk
-keycode 18 = 9 parenleft
-keycode 19 = 0 parenright
-keycode 20 = minus underscore
-keycode 21 = equal plus
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = q Q
-keycode 25 = w W
-keycode 26 = e E
-keycode 27 = r R
-keycode 28 = t T
-keycode 29 = y Y
-keycode 30 = u U
-keycode 31 = i I
-keycode 32 = o O
-keycode 33 = p P
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a A
-keycode 39 = s S
-keycode 40 = d D
-keycode 41 = f F
-keycode 42 = g G
-keycode 43 = h H
-keycode 44 = j J
-keycode 45 = k K
-keycode 46 = l L
-keycode 47 = semicolon colon
-keycode 48 = apostrophe quotedbl
-keycode 49 = grave asciitilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar
-keycode 52 = z Z
-keycode 53 = x X
-keycode 54 = c C
-keycode 55 = v V
-keycode 56 = b B
-keycode 57 = n N
-keycode 58 = m M
-keycode 59 = comma less
-keycode 60 = period greater
-keycode 61 = slash question
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space
-keycode 66 = Caps_Lock
-keycode 67 = F1
-keycode 68 = F2
-keycode 69 = F3
-keycode 70 = F4
-keycode 71 = F5
-keycode 72 = F6
-keycode 73 = F7
-keycode 74 = F8
-keycode 75 = F9
-keycode 76 = F10
-keycode 77 = Num_Lock
-keycode 78 = Multi_key
-keycode 79 = KP_Home KP_7
-keycode 80 = KP_Up KP_8
-keycode 81 = KP_Prior KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_Left KP_4
-keycode 84 = NoSymbol KP_5
-keycode 85 = KP_Right KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_End KP_1
-keycode 88 = KP_Down KP_2
-keycode 89 = KP_Next KP_3
-keycode 90 = KP_Insert KP_0
-keycode 91 = KP_Delete KP_Decimal
-!keycode 92 = X386Sys_Req
-keycode 93 =
-keycode 94 =
-keycode 95 = F11
-keycode 96 = F12
-! keycodes 97-107 are not available on 84-key keyboards
-keycode 97 = Home
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 101 = Begin
-keycode 102 = Right
-keycode 103 = End
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-keycode 107 = Delete
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 110 = Pause
-keycode 111 = Print
-keycode 112 = KP_Divide
-keycode 113 = Alt_R Meta_R
-keycode 114 = Break
-! keycodes 115-117 are only available on some extended keyboards
-! (e.g., Microsoft's ergonomic keyboard).
-keycode 115 = Meta_L
-keycode 116 = Meta_R
-keycode 117 = Menu
-!
-! Set the modifiers
-!
-add shift = Shift_L Shift_R
-add lock = Caps_Lock
-add control = Control_L Control_R
-add mod1 = Alt_L Alt_R
-! If you have ServerNumlock set in your XF86Config, you can comment out
-add mod2 = Num_Lock
-!
-!
-!
-! If you use any of the special default key mappings in Xconfig, they should be
-! duplicated in this file. Mappings should be added before the section above
-! which sets the modifiers.
-!
-! For the key specs:
-! LeftAlt => keycode 64
-! RightAlt => keycode 113
-! AltGr => keycode 113
-! ScrollLock => keycode 78
-! RightCtl => keycode 109
-!
-! For the mappings:
-! Meta => Alt_L Meta_L
-! Alt_R Meta_R
-! Compose => Multi_key
-! ModeShift => Mode_switch
-! ModeLock => Mode_switch X386Mode_Lock
-! ScrollLock => Scroll_Lock
-! Control => Control_R
-!
-! If you use ModeShift or ModeLock, the following modifier must be set:
-!
-!add mod5 = Mode_switch
-!
-! For example, to get the equivalent of:
-!
-! ScrollLock ModeLock
-! RightAlt ModeShift
-! LeftAlt Meta
-! RightCtl Compose
-!
-! use the following:
-!
-!keycode 78 = Mode_switch X386Mode_Lock
-!keycode 113 = Mode_switch
-!keycode 64 = Alt_L Meta_L
-!keycode 109 = Multi_key
-!
-!add mod5 = Mode_switch
-
-! When using ServerNumLock in your XF86Config, the following codes/symbols
-! are available in place of 79-81, 83-85, 87-91
-!keycode 136 = KP_7
-!keycode 137 = KP_8
-!keycode 138 = KP_9
-!keycode 139 = KP_4
-!keycode 140 = KP_5
-!keycode 141 = KP_6
-!keycode 142 = KP_1
-!keycode 143 = KP_2
-!keycode 144 = KP_3
-!keycode 145 = KP_0
-!keycode 146 = KP_Decimal
-!keycode 147 = Home
-!keycode 148 = Up
-!keycode 149 = Prior
-!keycode 150 = Left
-!keycode 151 = Begin
-!keycode 152 = Right
-!keycode 153 = End
-!keycode 154 = Down
-!keycode 155 = Next
-!keycode 156 = Insert
-!keycode 157 = Delete
diff --git a/gkb-new/xmodmap/xmodmap.us101A_x86 b/gkb-new/xmodmap/xmodmap.us101A_x86
deleted file mode 100644
index 0a5fcf8b..00000000
--- a/gkb-new/xmodmap/xmodmap.us101A_x86
+++ /dev/null
@@ -1,129 +0,0 @@
-keycode 8 = quoteleft asciitilde
-keycode 9 = 1 exclam
-keycode 10 = 2 at
-keycode 11 = 3 numbersign currency
-keycode 12 = 4 dollar currency
-keycode 13 = 5 percent
-keycode 14 = 6 asciicircum
-keycode 15 = 7 ampersand
-keycode 16 = 8 asterisk
-keycode 17 = 9 parenleft
-keycode 18 = 0 parenright
-keycode 19 = minus underscore
-keycode 20 = equal plus
-keycode 21 =
-keycode 22 = BackSpace
-keycode 23 = Tab
-keycode 24 = Q
-keycode 25 = W
-keycode 26 = e E currency
-keycode 27 = R
-keycode 28 = T
-keycode 29 = Y
-keycode 30 = U
-keycode 31 = I
-keycode 32 = O
-keycode 33 = P
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright
-keycode 36 = backslash bar brokenbar
-keycode 37 = Caps_Lock
-keycode 38 = A
-keycode 39 = S
-keycode 40 = D
-keycode 41 = F
-keycode 42 = G
-keycode 43 = H
-keycode 44 = J
-keycode 45 = K
-keycode 46 = L
-keycode 47 = semicolon colon
-keycode 48 = quoteright quotedbl
-keycode 49 =
-keycode 50 = Return
-keycode 51 = Shift_L
-keycode 52 =
-keycode 53 = Z
-keycode 54 = X
-keycode 55 = C
-keycode 56 = V
-keycode 57 = B
-keycode 58 = N
-keycode 59 = M
-keycode 60 = comma less
-keycode 61 = period greater
-keycode 62 = slash question
-keycode 63 =
-keycode 64 = Shift_R
-keycode 65 = Control_L
-keycode 66 =
-keycode 67 = Alt_L
-keycode 68 = space
-keycode 69 = Alt_R
-keycode 70 =
-keycode 71 = Control_R
-keycode 72 =
-keycode 73 =
-keycode 74 =
-keycode 75 =
-keycode 76 =
-keycode 77 =
-keycode 78 =
-keycode 79 =
-keycode 80 =
-keycode 81 =
-keycode 82 = Insert
-keycode 83 = Delete
-keycode 84 =
-keycode 85 =
-keycode 86 = Left
-keycode 87 = Home
-keycode 88 = End
-keycode 89 =
-keycode 90 = Up
-keycode 91 = Down
-keycode 92 = Prior
-keycode 93 = Next
-keycode 94 =
-keycode 95 =
-keycode 96 = Right
-keycode 97 = Num_Lock
-keycode 98 = Home KP_7 KP_7
-keycode 99 = Left KP_4 KP_4
-keycode 100 = End KP_1 KP_1
-keycode 101 =
-keycode 102 = KP_Divide
-keycode 103 = Up KP_8 KP_8
-keycode 104 = KP_5 KP_5 KP_5
-keycode 105 = Down KP_2 KP_2
-keycode 106 = KP_Insert KP_0 KP_0
-keycode 107 = KP_Multiply
-keycode 108 = Prior KP_9 KP_9
-keycode 109 = Right KP_6 KP_6
-keycode 110 = Next KP_3 KP_3
-keycode 111 = Delete KP_Decimal KP_Decimal
-keycode 112 = KP_Subtract
-keycode 113 = KP_Add
-keycode 114 =
-keycode 115 = KP_Enter
-keycode 116 =
-keycode 117 = Escape
-keycode 118 =
-keycode 119 = F1
-keycode 120 = F2
-keycode 121 = F3
-keycode 122 = F4
-keycode 123 = F5
-keycode 124 = F6
-keycode 125 = F7
-keycode 126 = F8
-keycode 127 = F9
-keycode 128 = F10
-keycode 129 = SunF36
-keycode 130 = SunF37
-keycode 131 = Print SunSys_Req
-keycode 132 = Scroll_Lock
-keycode 133 = Pause Break
-keycode 134 =
-keycode 135 = Multi_key
-keycode 136 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.us_intl b/gkb-new/xmodmap/xmodmap.us_intl
deleted file mode 100644
index c9e4d4dd..00000000
--- a/gkb-new/xmodmap/xmodmap.us_intl
+++ /dev/null
@@ -1,118 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:24:27 CET 1998
-clear Mod1
-clear Mod2
-! us.map
-! with some additions from [email protected] (Daniel Quinlan)
-! 14 Mar 1994
-! xmodmap.us-int
-! with some additions from [email protected] (Roberto Jimeno)
-! 12 Oct 2003: Keycode 59 has dead_cedilla cedilla, and 61 has questiondown.
-! 17 Oct 2003: Keycode 10 has exclamdown, and 59 got fixed for plain cedilla.
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam exclamdown
-keycode 11 = 2 at at
-keycode 12 = 3 numbersign
-keycode 13 = 4 dollar dollar
-keycode 14 = 5 percent
-keycode 15 = 6 dead_circumflex asciicircum
-keycode 16 = 7 ampersand braceleft
-keycode 17 = 8 asterisk bracketleft
-keycode 18 = 9 parenleft bracketright
-keycode 19 = 0 parenright braceright
-keycode 20 = minus underscore backslash
-keycode 21 = equal plus
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q
-keycode 25 = w
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = y
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = bracketleft braceleft
-keycode 35 = bracketright braceright asciitilde
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f
-keycode 42 = g
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k
-keycode 46 = l
-keycode 47 = semicolon colon
-keycode 48 = dead_acute dead_diaeresis apostrophe quotedbl
-keycode 49 = dead_grave dead_tilde
-keycode 50 = Shift_L
-keycode 51 = backslash bar
-keycode 52 = z
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v
-keycode 56 = b
-keycode 57 = n
-keycode 58 = m
-keycode 59 = comma less dead_cedilla
-keycode 60 = period greater Multi_key
-keycode 61 = slash question questiondown
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gkb-new/xmodmap/xmodmap.yu b/gkb-new/xmodmap/xmodmap.yu
deleted file mode 100644
index b9d2db8a..00000000
--- a/gkb-new/xmodmap/xmodmap.yu
+++ /dev/null
@@ -1,115 +0,0 @@
-! Converted keytable file to xmodmap file
-! with mk_modmap by [email protected] vie nov 27 02:12:14 CET 1998
-clear Mod1
-clear Mod2
-! Yugoslav keyboard (latin)
-! Adapted whith dead_* keys and other changes (copied from the picture in
-! the MS-DOS 6.2 manual)
-!charset "iso-8859-2"
-keycode 9 = Escape Escape
-keycode 10 = 1 exclam asciitilde
-keycode 11 = 2 quotedbl dead_caron
-keycode 12 = 3 numbersign dead_circumflex
-keycode 13 = 4 dollar dead_breve
-keycode 14 = 5 percent degree
-keycode 15 = 6 ampersand dead_ogonek
-keycode 16 = 7 slash dead_grave
-keycode 17 = 8 parenleft dead_abovedot
-keycode 18 = 9 parenright dead_acute
-keycode 19 = 0 equal dead_doubleacute
-keycode 20 = apostrophe question dead_diaeresis
-keycode 21 = plus asterisk dead_cedilla
-keycode 22 = BackSpace Delete
-keycode 23 = Tab Tab
-keycode 24 = q Q backslash
-keycode 25 = w W bar
-keycode 26 = e E currency
-keycode 27 = r
-keycode 28 = t
-keycode 29 = z
-keycode 30 = u
-keycode 31 = i
-keycode 32 = o
-keycode 33 = p
-keycode 34 = scaron Scaron division
-keycode 35 = dstroke Dstroke multiply
-keycode 36 = Return
-keycode 37 = Control_L
-keycode 38 = a
-keycode 39 = s
-keycode 40 = d
-keycode 41 = f F bracketleft
-keycode 42 = g G bracketright
-keycode 43 = h
-keycode 44 = j
-keycode 45 = k K lstroke
-keycode 46 = l L Lstroke
-keycode 47 = ccaron Ccaron
-keycode 48 = cacute Cacute ssharp
-keycode 49 = dead_diaeresis dead_cedilla
-keycode 50 = Shift_L
-keycode 51 = zcaron Zcaron
-keycode 52 = y
-keycode 53 = x
-keycode 54 = c
-keycode 55 = v V at
-keycode 56 = b B braceleft
-keycode 57 = n N braceright
-keycode 58 = m M section
-keycode 59 = comma semicolon
-keycode 60 = period colon Multi_key
-keycode 61 = minus underscore
-keycode 62 = Shift_R
-keycode 63 = KP_Multiply
-keycode 64 = Alt_L Meta_L
-keycode 65 = space space
-keycode 66 = Caps_Lock
-keycode 67 = F1 F11
-keycode 68 = F2 F12
-keycode 69 = F3 F13
-keycode 70 = F4 F14
-keycode 71 = F5 F15
-keycode 72 = F6 F16
-keycode 73 = F7 F17
-keycode 74 = F8 F18
-keycode 75 = F9 F19
-keycode 76 = F10 F20
-keycode 77 = Num_Lock
-keycode 78 = Scroll_Lock
-keycode 79 = KP_7
-keycode 80 = KP_8
-keycode 81 = KP_9
-keycode 82 = KP_Subtract
-keycode 83 = KP_4
-keycode 84 = KP_5
-keycode 85 = KP_6
-keycode 86 = KP_Add
-keycode 87 = KP_1
-keycode 88 = KP_2
-keycode 89 = KP_3
-keycode 90 = KP_0
-keycode 94 = less greater bar
-keycode 95 = F11 F11
-keycode 96 = F12 F12
-keycode 108 = KP_Enter
-keycode 109 = Control_R
-keycode 112 = KP_Divide
-keycode 113 = Mode_switch
-keycode 114 = Break
-keycode 110 = Find
-keycode 98 = Up
-keycode 99 = Prior
-keycode 100 = Left
-keycode 102 = Right
-keycode 115 = Select
-keycode 104 = Down
-keycode 105 = Next
-keycode 106 = Insert
-! right windows-logo key
-! in "windows" keyboards the postion of the key is annoying, is where AltGr
-! usually resides, so go definie it as AltGr
-keycode 116 = Mode_switch
-! right windows-menu key, redefined as Compose key
-keycode 117 = Multi_key
-add Mod1 = Alt_L
-add Mod2 = Mode_switch
diff --git a/gswitchit/Makefile.am b/gswitchit/Makefile.am
deleted file mode 100644
index 15831f86..00000000
--- a/gswitchit/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = help
diff --git a/gswitchit/help/C/gswitchit.xml b/gswitchit/help/C/gswitchit.xml
deleted file mode 100644
index 17c2edab..00000000
--- a/gswitchit/help/C/gswitchit.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- -*- indent-tabs-mode: nil -*- -->
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY legal SYSTEM "legal.xml">
- <!ENTITY appletversion "2.8">
- <!ENTITY manrevision "2.8">
- <!ENTITY date "August 2004">
- <!ENTITY applet "Keyboard Indicator">
- <!ENTITY ug "MATE Desktop User Guide">
-]>
-<!--
-(Do not remove this comment block.)
-Maintained by the MATE Documentation Project
-http://developer.mate.org/projects/gdp
-Template version: 2.0 beta
-Template last modified Feb 12, 2002
--->
-
-<article id="index" lang="en">
-<!-- please do not change the id; for translations, change lang to -->
-<!-- appropriate code -->
-<articleinfo>
- <title>&applet; Manual</title>
- <abstract role="description">
- <para>The &applet; shows the active keyboard group and
- enables switching between different groups.</para>
- </abstract>
-
- <copyright>
- <year>2004</year>
- <holder>Angela Boyle</holder>
- </copyright>
- <copyright>
- <year>2004</year>
- <holder>Sergey Udaltsov</holder>
- </copyright>
- <!-- translators: uncomment this:
- <copyright>
- <year>2003</year>
- <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
- </copyright>
- -->
-
- <publisher role="maintainer">
- <publishername>MATE Documentation Project</publishername>
- </publisher>
-
- <revhistory>
- <revision>
- <revnumber>2.8</revnumber>
- <date>2004-08</date>
- </revision>
- </revhistory>
-
- &legal;
- <!-- This file contains link to license for the documentation (GNU FDL), and
- other legal stuff such as "NO WARRANTY" statement. Please do not change
- any of this. -->
-
- <authorgroup>
- <author>
- <firstname>Angela</firstname>
- <surname>Boyle</surname>
- <affiliation>
- <address><email>[email protected]</email></address>
- </affiliation>
- </author>
- <author>
- <firstname>Sergey</firstname>
- <surname>Udaltsov</surname>
- <affiliation>
- <address><email>[email protected]</email></address>
- </affiliation>
- </author>
- <!-- This is appropriate place for other contributors: translators,
- maintainers, etc. Commented out by default.
- <othercredit role="translator">
- <firstname>Latin</firstname>
- <surname>Translator 1</surname>
- <affiliation>
- <orgname>Latin Translation Team</orgname>
- <address> <email>[email protected]</email> </address>
- </affiliation>
- <contrib>Latin translation</contrib>
- </othercredit>
- -->
- </authorgroup>
-
- <releaseinfo revision="2.26" role="review"/>
-
- <releaseinfo>This manual describes version &appletversion; of the
- &applet; applet.</releaseinfo>
-
- <legalnotice>
- <title>Feedback</title>
- <para>To report a bug or make a suggestion regarding the &applet;
- applet or this manual, follow the directions in the
- <ulink url="ghelp:mate-feedback" type="help">MATE Feedback
- Page</ulink>.</para>
- <!-- Translators may also add here feedback address for translations -->
- </legalnotice>
-</articleinfo>
-
-<indexterm>
- <primary>Keyboard Indicator</primary>
-</indexterm>
-
-<sect1 id="gswitchit-applet-intro">
- <title>Introduction</title>
-
- <para><application>&applet;</application> indicates the active keyboard group.
- The applet shows you which group you are currently using. Aside from the
- standard applet popup menu functions, the <application>&applet;</application>
- applet popup menu allows you to launch the applet Preferences tool and to
- switch between language groups.</para>
-
- <para>To add <application>&applet;</application> to a panel,
- right-click on the panel, then choose <guimenuitem>Add to
- Panel</guimenuitem>. Select <application>&applet;</application>
- in the <application>Add to the panel</application> dialog, then
- click <guibutton>OK</guibutton>. For more on this, see <ulink type="help" url="ghelp:user-guide?panels-addobject">Adding an Object to a Panel</ulink>.</para>
-
- <para>To open the <application>Keyboard</application> preference tool, choose
- <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup
- menu. You may need to go to this dialog to be able to configure the keyboard
- (choose model, layouts, options, etc.). For help with setting
- Keyboard preferences, see
- <ulink url="ghelp:user-guide?prefs-keyboard">Configuring Keyboard
- Preferences</ulink>.</para>
-</sect1>
-
-<sect1 id="gswitchit-applet-switching">
- <title>Switching Language</title>
-
- <para>First, you must know that a group is a set of characters, whether it be
- for a language or non-language-related set of characters, like a dvorak. Each
- language may have more than one subset, and each subset is called a group.
- There are many ways you can switch the group that you are using on your
- keyboard.</para>
-
- <variablelist>
- <varlistentry>
- <term>Mouse Click</term>
- <listitem><para>You can switch between groups with a single click on the
- applet's panel icon. The groups switch in a cycle determined by the
- current configuration.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>Popup Menu</term>
- <listitem><para>To pick a specific group, select
- <guisubmenu>Groups</guisubmenu> from the popup menu. From there,
- choose the group you want to switch to.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>Keyboard</term>
- <listitem><para>In the <application>Keyboard</application>
- preference tool, you can set
- which key that you would like to use to switch groups on your keyboard. Choose
- <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup
- menu, and choose the key you want to use in the <ulink url="ghelp:user-guide#prefs-keyboard-layoutoptions"><guilabel>Layout Options</guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>.</para></listitem>
- </varlistentry>
- </variablelist>
- <para>To add other layouts to the list, open the <application>Keyboard</application> preference tool. Choose other layouts in the <ulink url="ghelp:user-guide#prefs-keyboard-layouts"><guilabel>Layouts</guilabel> tab</ulink>.</para>
-</sect1>
-
-<sect1 id="layout-view">
- <title>Layout View</title>
- <para>Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to see a diagram of your current keyboard layout.</para>
- <para>In the <guilabel>Layout View</guilabel> window, press a key on your keyboard to highlight its representation in the diagram.</para>
- <para>Each key in the diagram has up to four characters. These can be produced with different keyboard modifiers, as follows:</para>
- <itemizedlist>
- <listitem><para>For the character shown in the bottom left, press the key alone.</para></listitem>
- <listitem><para>For the character shown in the top left, press the key with <keycap>Shift</keycap>.</para></listitem>
- <listitem><para>For the character shown in the bottom right, press the key with the third level modifier.</para></listitem>
- <listitem><para>For the character shown in the top right, press the key with <keycap>Shift</keycap> and the third level modifier.</para></listitem>
- </itemizedlist>
- <note><para>By default, no key is assigned to act as a third-level modifier. You can assign a key to act as a third level modifier in the <ulink type="help" url="ghelp:user-guide?prefs-keyboard-layoutoptions">Keyboard Layout Options Preferences</ulink>.</para></note>
-
-
-</sect1>
-
-<sect1 id="gswitchit-applet-plugins">
- <title>Plugins</title>
- <para>To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog,
- select <guimenuitem>Plugins</guimenuitem> from the popup menu. Your current
- plugins are shown in the <guilabel>Active plugins</guilabel> area.</para>
- <variablelist>
- <varlistentry>
- <term>Adding a New Plugin</term>
- <listitem><para>Click <guibutton>Add</guibutton>. In the <guilabel>Add
- Plugin</guilabel> window, select one of the plugins in the
- <guilabel>Available plugins</guilabel> area and click the
- <guibutton>OK</guibutton> button.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>Removing a Plugin</term>
- <listitem><para>Select the plugin in the <guilabel>Active
- plugins</guilabel> area that you do not want anymore and
- click <guibutton>Remove</guibutton>.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>Moving Items in the Plugin List</term>
- <listitem><para>To move items up and down the plugin list in the
- <guilabel>Active plugins</guilabel> area, select the plugin you
- want to move, and click <guibutton>Up</guibutton> or
- <guibutton>Down</guibutton>. You can use the arrows on the keyboard
- to move the selection point up and down.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>Changing the Properties of a Plugin</term>
- <listitem><para>To change the properties of the plugins, select
- the plugin you want and click <guibutton>Properties</guibutton>.
- The properties vary for each plugin.</para></listitem>
- </varlistentry>
- </variablelist>
-</sect1>
-</article>
diff --git a/gswitchit/help/C/legal.xml b/gswitchit/help/C/legal.xml
deleted file mode 100644
index 29f07269..00000000
--- a/gswitchit/help/C/legal.xml
+++ /dev/null
@@ -1,76 +0,0 @@
- <legalnotice id="legalnotice">
- <para>
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the GNU Free Documentation
- License (GFDL), Version 1.1 or any later version published
- by the Free Software Foundation with no Invariant Sections,
- no Front-Cover Texts, and no Back-Cover Texts. You can find
- a copy of the GFDL at this <ulink type="help"
- url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
- distributed with this manual.
- </para>
- <para> This manual is part of a collection of MATE manuals
- distributed under the GFDL. If you want to distribute this
- manual separately from the collection, you can do so by
- adding a copy of the license to the manual, as described in
- section 6 of the license.
- </para>
-
- <para>
- Many of the names used by companies to distinguish their
- products and services are claimed as trademarks. Where those
- names appear in any MATE documentation, and the members of
- the MATE Documentation Project are made aware of those
- trademarks, then the names are in capital letters or initial
- capital letters.
- </para>
-
- <para>
- DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
- UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
- WITH THE FURTHER UNDERSTANDING THAT:
-
- <orderedlist>
- <listitem>
- <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
- WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
- IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
- THAT THE DOCUMENT OR MODIFIED VERSION OF THE
- DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
- A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
- RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
- OF THE DOCUMENT OR MODIFIED VERSION OF THE
- DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
- MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
- YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
- CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
- SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
- OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
- VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
- EXCEPT UNDER THIS DISCLAIMER; AND
- </para>
- </listitem>
- <listitem>
- <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
- THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
- CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
- INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
- DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
- OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
- PARTIES, BE LIABLE TO ANY PERSON FOR ANY
- DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
- CONSEQUENTIAL DAMAGES OF ANY CHARACTER
- INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
- OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
- MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
- LOSSES ARISING OUT OF OR RELATING TO USE OF THE
- DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
- EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
- THE POSSIBILITY OF SUCH DAMAGES.
- </para>
- </listitem>
- </orderedlist>
- </para>
- </legalnotice>
- \ No newline at end of file
diff --git a/gswitchit/help/Makefile.am b/gswitchit/help/Makefile.am
deleted file mode 100644
index d6f24959..00000000
--- a/gswitchit/help/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
-
-DOC_MODULE = gswitchit
-DOC_ENTITIES = legal.xml
-
-DOC_LINGUAS = ca cs de el en_GB es eu fi fr oc ru sv uk zh_CN
-
--include $(top_srcdir)/git.mk
diff --git a/gswitchit/help/ca/ca.po b/gswitchit/help/ca/ca.po
deleted file mode 100644
index 3eb37b5a..00000000
--- a/gswitchit/help/ca/ca.po
+++ /dev/null
@@ -1,286 +0,0 @@
-# gswitchit-help translation to Catalan.
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Gil Forcada <[email protected]>, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gswitchit-help\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-09 12:32+0100\n"
-"PO-Revision-Date: 2008-01-13 21:14+0100\n"
-"Last-Translator: Gil Forcada <[email protected]>\n"
-"Language-Team: Catalan <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "Manual del l'indicador del teclat"
-
-#: C/gswitchit.xml:25(para)
-msgid "The Keyboard Indicator shows the active keyboard group and enables switching between different groups."
-msgstr "L'indicador del teclat mostra el grup de teclat actiu i us permet canviar entre diferents grups."
-
-#: C/gswitchit.xml:30(year) C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "Projecte de documentació del MATE"
-
-#: C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "2004-08"
-
-#: C/gswitchit.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr ""
-"Teniu permís per a copiar, distribuir i/o modificar aquest document, sota "
-"els termes de la Llicència de documentació lliure GNU (GFDL), versió 1.1 o "
-"qualsevol versió publicada posteriorment per la Free Software Foundation, "
-"sense seccions invariants, sense texts de portada i sense texts de "
-"contraportada. Podeu trobar una còpia de la GFDL en aquest <ulink type=\"help"
-"\" url=\"ghelp:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït "
-"amb aquest manual."
-
-#: C/gswitchit.xml:12(para)
-msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
-msgstr ""
-"Aquest manual forma part d'una col·lecció de manuals del MATE distribuïts "
-"sota la GFDL. Si voleu distribuir aquest manual independentment de la "
-"col·lecció, podeu fer-ho afegint una còpia de la llicència al manual, tal "
-"com es descriu a la secció 6 de la llicència."
-
-#: C/gswitchit.xml:19(para)
-msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any MATE documentation, and the members of the MATE Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
-msgstr ""
-"Molts dels noms que les empreses utilitzen per a distingir els seus "
-"productes i serveis es consideren marques comercials. Quan aquests noms "
-"apareguin en qualsevol documentació del MATE, si els membres del Projecte "
-"de documentació del MATE han estat avisats pel que fa a les marques, els "
-"noms apareixeran en majúscules o amb les inicials en majúscules."
-
-#: C/gswitchit.xml:35(para)
-msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-"EL DOCUMENT S'OFEREIX «TAL COM ÉS», SENSE CAP TIPUS DE GARANTIA, NI "
-"EXPLÍCITA NI IMPLÍCITA; AIXÒ INCLOU, SENSE LIMITAR-S'HI, LES GARANTIES QUE "
-"EL DOCUMENT O LA VERSIÓ MODIFICADA DEL DOCUMENT NO TINGUI DEFECTES, SIGUI "
-"COMERCIALITZABLE, SIGUI ADEQUAT PER A UN ÚS CONCRET O NO INFRINGEIXI CAP "
-"LLEI. TOT EL RISC PEL QUE FA A LA QUALITAT, EXACTITUD I RENDIMENT DEL "
-"DOCUMENT O LA VERSIÓ MODIFICADA DEL DOCUMENT ÉS VOSTRE. EN CAS QUE EL "
-"DOCUMENT RESULTÉS DEFECTUÓS EN QUALSEVOL ASPECTE, VÓS (NO PAS L'ESCRIPTOR "
-"INICIAL, L'AUTOR O CAP ALTRE COL·LABORADOR) ASSUMIU TOT EL COST DE "
-"MANTENIMENT, REPARACIÓ O CORRECCIÓ. AQUESTA RENÚNCIA DE GARANTIA CONSTITUEIX "
-"UNA PART ESSENCIAL D'AQUESTA LLICÈNCIA. NO S'AUTORITZA L'ÚS DE CAP DOCUMENT "
-"O VERSIÓ MODIFICADA DEL DOCUMENT EXCEPTE SOTA AQUESTA RENÚNCIA DE GARANTIA; "
-"I "
-
-#: C/gswitchit.xml:55(para)
-msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-"EN CAP CAS I SOTA CAP INTERPRETACIÓ LEGAL, JA SIGUI PER AGREUJAMENT "
-"(INCLOENT-HI LA NEGLIGÈNCIA), CONTRACTE O ALTRE CAS, L'AUTOR, L'ESCRIPTOR "
-"ORIGINAL, QUALSEVOL DELS COL·LABORADORS O DISTRIBUÏDORS DEL DOCUMENT O UNA "
-"VERSIÓ MODIFICADA DEL DOCUMENT NI CAP PROVEÏDOR D'AQUESTES PARTS NO SERAN "
-"RESPONSABLES DAVANT DE NINGÚ PER CAP DANY DIRECTE, INDIRECTE, ESPECIAL, "
-"ACCIDENTAL O CONSECUTIU DE QUALSEVOL TIPUS; AIXÒ INCLOU, SENSE LIMITAR-S'HI, "
-"ELS DANYS PER PÈRDUA DE CLIENTS, INTERRUPCIONS DE LA FEINA, FALLADA O "
-"MALFUNCIONAMENT DE L'ORDINADOR, O QUALSEVOL ALTRA PÈRDUA O DANY RELACIONAT "
-"AMB L'ÚS DEL DOCUMENT I LES VERSIONS MODIFICADES DEL DOCUMENT, FINS I TOT SI "
-"S'HA INFORMAT AQUESTA PART DE LA POSSIBILITAT D'AQUESTS DANYS."
-
-#: C/gswitchit.xml:28(para)
-msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
-msgstr ""
-"EL DOCUMENT I LES VERSIONS MODIFICADES DEL DOCUMENT S'OFEREIXEN SOTA ELS "
-"TERMES DE LA LLICÈNCIA DE DOCUMENTACIÓ LLIURE DE GNU, TENINT EN COMPTE QUE: "
-"<placeholder-1/>"
-
-#: C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: C/gswitchit.xml:65(email)
-
-#: C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: C/gswitchit.xml:72(email)
-
-#: C/gswitchit.xml:89(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr "Aquest manual descriu la versió 2.8 de la miniaplicació de l'indicador del teclat."
-
-#: C/gswitchit.xml:93(title)
-msgid "Feedback"
-msgstr "Comentaris"
-
-#: C/gswitchit.xml:94(para)
-msgid "To report a bug or make a suggestion regarding the Keyboard Indicator applet or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Per a informar d'un error o fer un suggeriment sobre la miniaplicació de l'indicador del teclat o aquest manual, seguiu les indicacions de la <ulink url=\"ghelp:mate-feedback\" type=\"help\">Pàgina de suggeriments del MATE</ulink>."
-
-#: C/gswitchit.xml:103(primary)
-msgid "Keyboard Indicator"
-msgstr "Indicador del teclat"
-
-#: C/gswitchit.xml:107(title)
-msgid "Introduction"
-msgstr "Introducció"
-
-#: C/gswitchit.xml:109(para)
-msgid "<application>Keyboard Indicator</application> indicates the active keyboard group. The applet shows you which group you are currently using. Aside from the standard applet popup menu functions, the <application>Keyboard Indicator</application> applet popup menu allows you to launch the applet Preferences tool and to switch between language groups."
-msgstr "L'<application>indicador del teclat</application> indica el grup de teclat actiu. La miniaplicació us mostra quin grup utilitzeu actualment. Apart de les funcions del menú emergent estàndards de les miniaplicacions, el menú emergent de la miniaplicació de l'<application>indicador del teclat</application> us permet obrir l'eina de preferències de la miniaplicació i canviar entre grups d'idiomes."
-
-#: C/gswitchit.xml:115(para)
-msgid "To add <application>Keyboard Indicator</application> to a panel, right-click on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select <application>Keyboard Indicator</application> in the <application>Add to the panel</application> dialog, then click <guibutton>OK</guibutton>. For more on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject\">Adding an Object to a Panel</ulink>."
-msgstr "Per a afegir l'<application>indicador del teclat</application> al quadre, feu clic amb el botó secundari en el quadre i escolliu <guimenuitem>Afegeix al quadre</guimenuitem>. Seleccioneu l'<application>Indicador del teclat</application> en el diàleg <application>Afegeix al quadre</application> i després feu clic a <guibutton>D'acord</guibutton>. Per a més informació al respecte, vegeu <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject\">Afegir un objecte al quadre</ulink>."
-
-#: C/gswitchit.xml:121(para)
-msgid "To open the <application>Keyboard</application> preference tool, choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup menu. You may need to go to this dialog to be able to configure the keyboard (choose model, layouts, options, etc.). For help with setting Keyboard preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring Keyboard Preferences</ulink>."
-msgstr "Per a obrir l'eina de preferències del <application>teclat</application>, escolliu <guimenuitem>Preferències del teclat</guimenuitem> en el menú emergent de la miniaplicació. Heu d'utilitzar aquest diàleg per a poder configurar el teclat (escollir el model, les disposicions, les opcions, etc.). Vegeu la <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuració de les preferències del teclat</ulink> per a més informació sobre les preferències del teclat."
-
-#: C/gswitchit.xml:131(title)
-msgid "Switching Language"
-msgstr "Canviar l'idioma"
-
-#: C/gswitchit.xml:133(para)
-msgid "First, you must know that a group is a set of characters, whether it be for a language or non-language-related set of characters, like a dvorak. Each language may have more than one subset, and each subset is called a group. There are many ways you can switch the group that you are using on your keyboard."
-msgstr "Primer, heu de saber que un grup és un conjunt caràcters, tan si és un conjunt de caràcters d'un idioma o no té cap relació amb un idioma en concret, com el Dvorak per exemple. Cada idioma pot tenir més d'un subconjunt i cada un d'aquests és un grup. Teniu moltes maneres per a poder canviar el grup que utilitzeu actualment en el teclat."
-
-#: C/gswitchit.xml:141(term)
-msgid "Mouse Click"
-msgstr "Amb el ratolí"
-
-#: C/gswitchit.xml:142(para)
-msgid "You can switch between groups with a single click on the applet's panel icon. The groups switch in a cycle determined by the current configuration."
-msgstr "Podeu canviar entre grups si feu un clic en la icona de la miniaplicació en el quadre. Els grups es canvien de manera cíclica, determinada per la configuració actual."
-
-#: C/gswitchit.xml:147(term)
-msgid "Popup Menu"
-msgstr "Menú emergent"
-
-#: C/gswitchit.xml:148(para)
-msgid "To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the popup menu. From there, choose the group you want to switch to."
-msgstr "Per a especificar un grup en concret, seleccioneu <guisubmenu>Grups</guisubmenu> en el menú emergent. Des d'allà podeu seleccionar el grup al que voleu canviar."
-
-#: C/gswitchit.xml:153(term)
-msgid "Keyboard"
-msgstr "Teclat"
-
-#: C/gswitchit.xml:154(para)
-msgid "In the <application>Keyboard</application> preference tool, you can set which key that you would like to use to switch groups on your keyboard. Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup menu, and choose the key you want to use in the <ulink url=\"ghelp:user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr "En l'eina de preferències del <application>teclat</application> podeu establir quina tecla voleu fer servir per a canviar entre grups de teclat. Escolliu <guimenuitem>Preferències del teclat</guimenuitem> en el menú emergent de la miniaplicació i escolliu la tecla que voleu utilitzar a <guilabel>Canvi de grup/Comportament de blocatge</guilabel> que està a la pestanya <ulink url=\"ghelp:user-guide#prefs-keyboard-layoutoptions\"><guilabel>Opcions de la disposició</guilabel></ulink>."
-
-#: C/gswitchit.xml:161(para)
-msgid "To add other layouts to the list, open the <application>Keyboard</application> preference tool. Choose other layouts in the <ulink url=\"ghelp:user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr "Per a afegir altres disposicions a la llista, obriu l'eina de preferències del <application>teclat</application>. Escolliu altres disposicions en la <ulink url=\"ghelp:user-guide#prefs-keyboard-layouts\">pestanya <guilabel>Disposicions</guilabel></ulink>."
-
-#: C/gswitchit.xml:165(title)
-msgid "Layout View"
-msgstr "Visualització de la disposició"
-
-#: C/gswitchit.xml:166(para)
-msgid "Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to see a diagram of your current keyboard layout."
-msgstr "Escolliu <guimenuitem>Mostra la disposició actual</guimenuitem> des del menú emergent de la miniaplicació per a veure un diagrama de la disposició del teclat actual."
-
-#: C/gswitchit.xml:167(para)
-msgid "In the <guilabel>Layout View</guilabel> window, press a key on your keyboard to highlight its representation in the diagram."
-msgstr "En la finestra <guilabel>Disposició del teclat</guilabel>, premeu una tecla del teclat perquè es ressalti la representació en el diagrama."
-
-#: C/gswitchit.xml:168(para)
-msgid "Each key in the diagram has up to four characters. These can be produced with different keyboard modifiers, as follows:"
-msgstr "Cada tecla en el diagrama té fins a quatre caràcters. Es poden fer amb diferents modificadors del teclat, com segueix:"
-
-#: C/gswitchit.xml:170(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr "Pel caràcter que es mostra a baix a l'esquerra, premeu la tecla."
-
-#: C/gswitchit.xml:171(para)
-msgid "For the character shown in the top left, press the key with <keycap>Shift</keycap>."
-msgstr "Pel caràcter que es mostra a dalt a l'esquerra, premeu la tecla amb la tecla de <keycap>majúscules</keycap>."
-
-#: C/gswitchit.xml:172(para)
-msgid "For the character shown in the bottom right, press the key with the third level modifier."
-msgstr "Pel caràcter que es mostra a baix a la dreta, premeu la tecla amb la modificadora de tercer nivell."
-
-#: C/gswitchit.xml:173(para)
-msgid "For the character shown in the top right, press the key with <keycap>Shift</keycap> and the third level modifier."
-msgstr "Pel caràcter que es mostra a dalt a la dreta, premeu la tecla amb la tecla de <keycap>majúscules</keycap> i la modificadora de tercer nivell."
-
-#: C/gswitchit.xml:175(para)
-msgid "By default, no key is assigned to act as a third-level modifier. You can assign a key to act as a third level modifier in the <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout Options Preferences</ulink>."
-msgstr "Per defecte, no hi ha cap tecla assignada com a modificadora de tercer nivell. Podeu assignar una tecla com a modificadora de tercer nivell en les <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">preferències de les opcions de la disposició del teclat</ulink>."
-
-#: C/gswitchit.xml:181(title)
-msgid "Plugins"
-msgstr "Connectors"
-
-#: C/gswitchit.xml:182(para)
-msgid "To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select <guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr "Per a obrir el diàleg de <guilabel>Connectors de l'indicador del teclat</guilabel>, seleccioneu en el menú emergent l'opció de <guimenuitem>Connectors</guimenuitem>. A l'àrea de <guilabel>Connectors actius</guilabel> es mostren els connectors activats."
-
-#: C/gswitchit.xml:187(term)
-msgid "Adding a New Plugin"
-msgstr "Afegir connectors nous"
-
-#: C/gswitchit.xml:188(para)
-msgid "Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> window, select one of the plugins in the <guilabel>Available plugins</guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr "Feu clic a <guibutton>Afegeix</guibutton>. En la finestra d'<guilabel>Afegeix un connector</guilabel>, seleccioneu un connector de l'àrea de <guilabel>Connectors disponibles</guilabel> i feu clic en el botó <guibutton>D'acord</guibutton>."
-
-#: C/gswitchit.xml:194(term)
-msgid "Removing a Plugin"
-msgstr "Suprimir un connector"
-
-#: C/gswitchit.xml:195(para)
-msgid "Select the plugin in the <guilabel>Active plugins</guilabel> area that you do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr "Seleccioneu el connector que ja no voleu més en l'àrea de <guilabel>Connectors actius</guilabel> i feu clic a <guibutton>Suprimeix</guibutton>."
-
-#: C/gswitchit.xml:200(term)
-msgid "Moving Items in the Plugin List"
-msgstr "Moure els elements en la llista de connectors"
-
-#: C/gswitchit.xml:201(para)
-msgid "To move items up and down the plugin list in the <guilabel>Active plugins</guilabel> area, select the plugin you want to move, and click <guibutton>Up</guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the keyboard to move the selection point up and down."
-msgstr "Per a moure els elements cap amunt i cap avall en la llista de connectors de l'àrea de <guilabel>Connectors actius</guilabel>, seleccioneu el connector que voleu moure i feu clic a <guibutton>Puja</guibutton> o <guibutton>Baixa</guibutton>. Podeu fer servir les fletxes del teclat per a moure el punt de selecció cap amunt o cap avall."
-
-#: C/gswitchit.xml:208(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "Canviar les propietats d'un connector"
-
-#: C/gswitchit.xml:209(para)
-msgid "To change the properties of the plugins, select the plugin you want and click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr "Per a canviar les propietats dels connectors, seleccioneu el connector que voleu i feu clic a <guibutton>Propietats</guibutton>. Les propietats canvien segons cada connector."
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr "Gil Forcada <[email protected]>, 2008"
-
diff --git a/gswitchit/help/cs/cs.po b/gswitchit/help/cs/cs.po
deleted file mode 100644
index 309b280a..00000000
--- a/gswitchit/help/cs/cs.po
+++ /dev/null
@@ -1,470 +0,0 @@
-# This is the Czech translation of gswitchit docs.
-# Lucas Lommer <[email protected]>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: mate-applets mate-2-28\n"
-"POT-Creation-Date: 2009-07-16 10:58+0000\n"
-"PO-Revision-Date: 2009-07-17 07:44+0100\n"
-"Last-Translator: Marek Černocký <[email protected]>\n"
-"Language-Team: Czech <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Poedit-Language: Czech\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "Příručka Indikátoru klávesnice"
-
-#: C/gswitchit.xml:25(para)
-msgid ""
-"The Keyboard Indicator shows the active keyboard group and enables switching "
-"between different groups."
-msgstr ""
-"Indikátor klávesnice zobrazuje právě používané rozložení klávesnice a "
-"umožňuje přepínat mezi různými skupinami."
-
-#: C/gswitchit.xml:30(year) C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "Dokumentační projekt MATE"
-
-#: C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "srpen 2004"
-
-#: C/gswitchit.xml:2(para)
-msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-"later version published by the Free Software Foundation with no Invariant "
-"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
-"in the file COPYING-DOCS distributed with this manual."
-msgstr ""
-"Máte právo kopírovat, distribuovat a/nebo upravovat tento dokument v souladu "
-"s licencí GNU Free Documentation License (GFDL), verze 1.1 nebo jakékoliv "
-"pozdější vydané Free Software Foundation bez neměnných sekcí, textů přebalu "
-"vpředu nebo vzadu. Kopii licence GFDL naleznete pod <ulink type=\"help\" url="
-"\"ghelp:fdl\">tímto odkazem</ulink> nebo v souboru COPYING-DOCS dodávaném s "
-"touto příručkou."
-
-#: C/gswitchit.xml:12(para)
-msgid ""
-"This manual is part of a collection of MATE manuals distributed under the "
-"GFDL. If you want to distribute this manual separately from the collection, "
-"you can do so by adding a copy of the license to the manual, as described in "
-"section 6 of the license."
-msgstr ""
-"Tato příručka je součástí kolekce příruček MATE, distribuovaných pod "
-"licencí GNU FDL. Pokud chcete tento dokument šířit odděleně od kolekce, "
-"musíte přiložit kopii licence dle popisu v sekci 6 dané licence."
-
-#: C/gswitchit.xml:19(para)
-msgid ""
-"Many of the names used by companies to distinguish their products and "
-"services are claimed as trademarks. Where those names appear in any MATE "
-"documentation, and the members of the MATE Documentation Project are made "
-"aware of those trademarks, then the names are in capital letters or initial "
-"capital letters."
-msgstr ""
-"Mnoho užívaných jmen určených k zviditelnění produktů nebo služeb jsou "
-"ochranné známky. Na místech, kde jsou tato jména v dokumentaci užita a "
-"členové Dokumentačního projektu MATE jsou si vědomi skutečnosti, že se "
-"jedná o ochrannou známku, je takové jméno psáno velkými písmeny celé nebo s "
-"velkým písmenem na začátku."
-
-#: C/gswitchit.xml:35(para)
-msgid ""
-"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-"DOKUMENT JE POSKYTOVÁN V PODOBĚ „JAK JE“ BEZ ZÁRUKY V JAKÉKOLIV PODOBĚ, "
-"NEPOSKYTUJÍ SE ANI ODVOZENÉ ZÁRUKY, ZÁRUKY, ŽE DOKUMENT, NEBO JEHO UPRAVENÁ "
-"VERZE, JE BEZCHYBNÝ NEBO ZÁRUKY PRODEJNOSTI, VHODNOSTI PRO URČITÝ ÚČEL NEBO "
-"NEPORUŠENOSTI. RIZIKO NEKVALITY, NEPŘESNOSTI A ŠPATNÉHO PROVEDENÍ DOKUMENTU, "
-"NEBO JEHO UPRAVENÉ VERZE, LEŽÍ NA VÁS. POKUD KVŮLI TOMUTO DOKUMENTU, NEBO "
-"JEHO UPRAVENÉ VERZI, NASTANE PROBLÉM, VY (NIKOLIV PŮVODNÍ AUTOR NEBO "
-"JAKÝKOLIV PŘISPĚVATEL) PŘEBÍRÁTE JAKÉKOLIV NÁKLADY ZA NUTNÉ ÚPRAVY, OPRAVY "
-"ČI SLUŽBY. TOTO PROHLÁŠENÍ O ZÁRUCE PŘEDSTAVUJE ZÁKLADNÍ SOUČÁST TÉTO "
-"LICENCE. BEZ TOHOTO PROHLÁŠENÍ NENÍ, PODLE TÉTO DOHODY, POVOLENO UŽÍVÁNÍ ANI "
-"ÚPRAVY TOHOTO DOKUMENTU; DÁLE"
-
-#: C/gswitchit.xml:55(para)
-msgid ""
-"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-"POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-"ZA ŽÁDNÝCH OKOLNOSTÍ A ŽÁDNÝCH PRÁVNÍCH PŘEDPOKLADŮ, AŤ SE JEDNÁ O PŘEČIN "
-"(VČETNĚ NEDBALOSTNÍCH), SMLOUVU NEBO JINÉ, NENÍ AUTOR, PŮVODNÍ PISATEL, "
-"KTERÝKOLIV PŘISPĚVATEL NEBO KTERÝKOLIV DISTRIBUTOR TOHOTO DOKUMENTU NEBO "
-"UPRAVENÉ VERZE DOKUMENTU NEBO KTERÝKOLIV DODAVATEL NĚKTERÉ Z TĚCHTO STRAN "
-"ODPOVĚDNÝ NĚJAKÉ OSOBĚ ZA PŘÍMÉ, NEPŘÍMÉ, SPECIÁLNÍ, NAHODILÉ NEBO NÁSLEDNÉ "
-"ŠKODY JAKÉHOKOLIV CHARAKTERU, VČETNĚ, ALE NEJEN, ZA POŠKOZENÍ ZE ZTRÁTY "
-"DOBRÉHO JMÉNA, PŘERUŠENÍ PRÁCE, PORUCHY NEBO NESPRÁVNÉ FUNKCE POČÍTAČE NEBO "
-"JINÉHO A VŠECH DALŠÍCH ŠKOD NEBO ZTRÁT VYVSTÁVAJÍCÍCH Z NEBO VZTAHUJÍCÍCH SE "
-"K POUŽÍVÁNÍ TOHOTO DOKUMENTU NEBO UPRAVENÝCH VERZÍ DOKUMENTU, I KDYŽ BY "
-"TAKOVÁTO STRANA BYLA INFORMOVANÁ O MOŽNOSTI TAKOVÉHOTO POŠKOZENÍ."
-
-#: C/gswitchit.xml:28(para)
-msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-"<placeholder-1/>"
-msgstr ""
-"DOKUMENT A JEHO UPRAVENÉ VERZE JSOU ŠÍŘENY V SOULADU SE ZNĚNÍM LICENCE GNU "
-"FREE DOCUMENTATION LICENSE S NÁSLEDUJÍCÍM USTANOVENÍM: <placeholder-1/>"
-
-#: C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: C/gswitchit.xml:65(email)
-
-#: C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: C/gswitchit.xml:72(email)
-
-#: C/gswitchit.xml:91(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr "Tato příručka popisuje applet Indikátor klávesnice ve verzi 2.8."
-
-#: C/gswitchit.xml:95(title)
-msgid "Feedback"
-msgstr "Ohlasy"
-
-#: C/gswitchit.xml:96(para)
-msgid ""
-"To report a bug or make a suggestion regarding the Keyboard Indicator applet "
-"or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
-"feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr ""
-"Pokud chcete oznámit chybu nebo navrhnout vylepšení vztahující se k appletu "
-"Indikátor klávesnice nebo této příručce, postupujte dle instrukcí na stránce "
-"<ulink url=\"ghelp:mate-feedback\" type=\"help\">Stránka ohlasů MATE</"
-"ulink>."
-
-#: C/gswitchit.xml:105(primary)
-msgid "Keyboard Indicator"
-msgstr "Indikátor klávesnice"
-
-#: C/gswitchit.xml:109(title)
-msgid "Introduction"
-msgstr "Úvod"
-
-#: C/gswitchit.xml:111(para)
-msgid ""
-"<application>Keyboard Indicator</application> indicates the active keyboard "
-"group. The applet shows you which group you are currently using. Aside from "
-"the standard applet popup menu functions, the <application>Keyboard "
-"Indicator</application> applet popup menu allows you to launch the applet "
-"Preferences tool and to switch between language groups."
-msgstr ""
-"<application>Indikátor klávesnice</application> zobrazuje aktuálně vybranou "
-"skupinu. Applet zobrazuje skupinu, kterou právě používáte. Krom běžných "
-"položek kontextového menu appletu vám <application>Indikátor klávesnice</"
-"application> navíc umožňuje otevřít nastavení appletu a přepínat mezi "
-"skupinami jazyků."
-
-#: C/gswitchit.xml:117(para)
-msgid ""
-"To add <application>Keyboard Indicator</application> to a panel, right-click "
-"on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select "
-"<application>Keyboard Indicator</application> in the <application>Add to the "
-"panel</application> dialog, then click <guibutton>OK</guibutton>. For more "
-"on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject"
-"\">Adding an Object to a Panel</ulink>."
-msgstr ""
-"Pokud chcete přidat <application>Indikátor klávesnice</application> na "
-"panel, klepněte na něj pravým tlačítkem a zvolte <guimenuitem>Přidat na "
-"panel</guimenuitem>. V okně <application>Přidat na panel</application> "
-"zvolte ze seznamu <application>Indikátor klávesnice</application> a klepněte "
-"na tlačítko <guibutton>Přidat</guibutton>. Více informací popisuje <ulink "
-"type=\"help\" url=\"ghelp:user-guide?panels-addobject\">Přidávání objektu na "
-"panel</ulink>."
-
-#: C/gswitchit.xml:123(para)
-msgid ""
-"To open the <application>Keyboard</application> preference tool, choose "
-"<guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup "
-"menu. You may need to go to this dialog to be able to configure the keyboard "
-"(choose model, layouts, options, etc.). For help with setting Keyboard "
-"preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring "
-"Keyboard Preferences</ulink>."
-msgstr ""
-"Pokud chcete otevřít nástroj nastavení <application>Klávesnice</"
-"application>, zvolte z kontextové nabídky appletu <guimenuitem>Předvolby "
-"klávesnice</guimenuitem>. V tomto okně lze nastavit konfiguraci klávesnice "
-"(vybrat model, rozložení, vlastnosti atd.). Nápovědu týkající se nastavení "
-"klávesnice popisuje <ulink url=\"ghelp:user-guide?prefs-keyboard"
-"\">Konfigurace nastavení klávesnice</ulink>."
-
-#: C/gswitchit.xml:133(title)
-msgid "Switching Language"
-msgstr "Přepínání jazyka"
-
-#: C/gswitchit.xml:135(para)
-msgid ""
-"First, you must know that a group is a set of characters, whether it be for "
-"a language or non-language-related set of characters, like a dvorak. Each "
-"language may have more than one subset, and each subset is called a group. "
-"There are many ways you can switch the group that you are using on your "
-"keyboard."
-msgstr ""
-"První, co byste měli vědět je, že skupina je sada znaků bez rozdílu, zda "
-"nějakého jazyka nebo s jazykem nesouvisející, jako například Dvorak. Každý "
-"jazyk může obsahovat jednu nebo více sad a každá tato sada se nazývá "
-"skupina. Existuje mnoho způsobů, jak přepínat skupiny, které používáte na "
-"klávesnici."
-
-#: C/gswitchit.xml:143(term)
-msgid "Mouse Click"
-msgstr "Klepnutí myší"
-
-#: C/gswitchit.xml:144(para)
-msgid ""
-"You can switch between groups with a single click on the applet's panel "
-"icon. The groups switch in a cycle determined by the current configuration."
-msgstr ""
-"Přepínat mezi skupinami můžete prostým klepnutím na ikonu appletu v panelu. "
-"Skupiny se přepínají v cyklu, který závisí na aktuálním nastavení skupin."
-
-#: C/gswitchit.xml:149(term)
-msgid "Popup Menu"
-msgstr "Kontextová nabídka"
-
-#: C/gswitchit.xml:150(para)
-msgid ""
-"To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the "
-"popup menu. From there, choose the group you want to switch to."
-msgstr ""
-"Pokud chcete vybrat konkrétní skupinu, zvolte z kontextové nabídky appletu "
-"položku <guisubmenu>Skupiny</guisubmenu>. Ze zobrazené nabídky vyberte "
-"požadovanou skupinu."
-
-#: C/gswitchit.xml:155(term)
-msgid "Keyboard"
-msgstr "Klávesnice"
-
-#: C/gswitchit.xml:156(para)
-msgid ""
-"In the <application>Keyboard</application> preference tool, you can set "
-"which key that you would like to use to switch groups on your keyboard. "
-"Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet "
-"popup menu, and choose the key you want to use in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</"
-"guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr ""
-"V nástroji nastavení <application>Klávesnice</application> si můžete "
-"nastavit, pomocí jaké klávesové zkratky budete měnit rozložení klávesnice. Z "
-"kontextové nabídky appletu zvolte <guimenuitem>Předvolby klávesnice</"
-"guimenuitem> a na kartě <ulink url=\"ghelp:user-guide#prefs-keyboard-"
-"layoutoptions\"><guilabel>Rozložení</guilabel></ulink> klepněte na tlačítko "
-"<guibutton>Možnosti rozložení</guibutton>. Nastavení se nachází ve skupině "
-"<guilabel>Chování skupiny Shift/Lock</guilabel>."
-
-#: C/gswitchit.xml:163(para)
-msgid ""
-"To add other layouts to the list, open the <application>Keyboard</"
-"application> preference tool. Choose other layouts in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr ""
-"Pokud chcete do seznamu přidat další rozložení, otevřete nástroj nastavení "
-"<application>Klávesnice</application>. Nastavení je umístěno na <ulink url="
-"\"ghelp:user-guide#prefs-keyboard-layouts\">kartě <guilabel>Rozložení</"
-"guilabel></ulink>."
-
-#: C/gswitchit.xml:167(title)
-msgid "Layout View"
-msgstr "Prohlídka rozložení"
-
-#: C/gswitchit.xml:168(para)
-msgid ""
-"Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to "
-"see a diagram of your current keyboard layout."
-msgstr ""
-"Z kontextové nabídky appletu zvolte <guimenuitem>Zobrazit aktuální "
-"rozložení</guimenuitem> a zobrazí se nákres rozložení klávesnice."
-
-#: C/gswitchit.xml:169(para)
-msgid ""
-"In the <guilabel>Layout View</guilabel> window, press a key on your keyboard "
-"to highlight its representation in the diagram."
-msgstr ""
-"V okně <guilabel>Rozložení klávesnice</guilabel> je po stisknutí libovolné "
-"klávesy na klávesnici vyznačeno její umístění v nákresu."
-
-#: C/gswitchit.xml:170(para)
-msgid ""
-"Each key in the diagram has up to four characters. These can be produced "
-"with different keyboard modifiers, as follows:"
-msgstr ""
-"Každá klávesa nákresu má nejvíce čtyři znaky. Ty lze postupně zapsat pomocí "
-"různých modifikátorů klávesnice takto:"
-
-#: C/gswitchit.xml:172(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr ""
-"Znak zobrazený vlevo dole lze zapsat prostým stisknutím samotné klávesy."
-
-#: C/gswitchit.xml:173(para)
-msgid ""
-"For the character shown in the top left, press the key with <keycap>Shift</"
-"keycap>."
-msgstr ""
-"Znak zobrazený vlevo nahoře lze zapsat stisknutím klávesy zároveň s klávesou "
-"<keycap>Shift</keycap>."
-
-#: C/gswitchit.xml:174(para)
-msgid ""
-"For the character shown in the bottom right, press the key with the third "
-"level modifier."
-msgstr ""
-"Znak zobrazený vpravo dole lze zapsat stisknutím klávesy zároveň s klávesou "
-"modifikátoru pro třetí úroveň."
-
-#: C/gswitchit.xml:175(para)
-msgid ""
-"For the character shown in the top right, press the key with <keycap>Shift</"
-"keycap> and the third level modifier."
-msgstr ""
-"Znak zobrazený vpravo nahoře lze zapsat stisknutím klávesy zároveň s "
-"klávesou <keycap>Shift</keycap> a modifikátoru pro třetí úroveň."
-
-#: C/gswitchit.xml:177(para)
-msgid ""
-"By default, no key is assigned to act as a third-level modifier. You can "
-"assign a key to act as a third level modifier in the <ulink type=\"help\" "
-"url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout "
-"Options Preferences</ulink>."
-msgstr ""
-"Ve výchozím nastavení není modifikátor třetí úrovně přiřazen žádné klávese. "
-"Pokud chcete přiřadit nějaké klávese funkci modifikátoru pro třetí úroveň, "
-"použijte <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-"
-"layoutoptions\">možnosti nastavení rozložení klávesnice</ulink>."
-
-#: C/gswitchit.xml:183(title)
-msgid "Plugins"
-msgstr "Zásuvné moduly"
-
-#: C/gswitchit.xml:184(para)
-msgid ""
-"To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select "
-"<guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins "
-"are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr ""
-"Zvolením položky <guimenuitem>Zásuvné moduly</guimenuitem> z kontextové "
-"nabídky otevřete okno <guilabel>Zásuvné moduly indikátoru klávesnice</"
-"guilabel>. Aktuálně používané moduly jsou vypsány v políčku "
-"<guilabel>Aktivní zásuvné moduly</guilabel>."
-
-#: C/gswitchit.xml:189(term)
-msgid "Adding a New Plugin"
-msgstr "Přidání nového zásuvného modulu"
-
-#: C/gswitchit.xml:190(para)
-msgid ""
-"Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> "
-"window, select one of the plugins in the <guilabel>Available plugins</"
-"guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr ""
-"Klepněte na tlačítko <guibutton>Přidat</guibutton>, v nově otevřeném okně "
-"<guilabel>Přidat zásuvný modul</guilabel> vyberte libovolný modul ze seznamu "
-"<guilabel>Dostupné zásuvné moduly</guilabel> a klepněte na tlačítko "
-"<guibutton>Budiž</guibutton>."
-
-#: C/gswitchit.xml:196(term)
-msgid "Removing a Plugin"
-msgstr "Odstranění zásuvného modulu"
-
-#: C/gswitchit.xml:197(para)
-msgid ""
-"Select the plugin in the <guilabel>Active plugins</guilabel> area that you "
-"do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr ""
-"Vyberte v seznamu <guilabel>Aktivních zásuvných modulů</guilabel> ten, který "
-"chcete odebrat a klepněte na tlačítko <guibutton>Odstranit</guibutton>."
-
-#: C/gswitchit.xml:202(term)
-msgid "Moving Items in the Plugin List"
-msgstr "Změna pořadí v seznamu aktivních zásuvných modulů"
-
-#: C/gswitchit.xml:203(para)
-msgid ""
-"To move items up and down the plugin list in the <guilabel>Active plugins</"
-"guilabel> area, select the plugin you want to move, and click <guibutton>Up</"
-"guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the "
-"keyboard to move the selection point up and down."
-msgstr ""
-"Pokud chcete změnit pozici nějakého modulu v seznamu <guilabel>Aktivních "
-"zásuvných modulů</guilabel>, vyberte jej a klepněte na tlačítko "
-"<guibutton>Výš</guibutton> nebo <guibutton>Níž</guibutton>. Také můžete k "
-"přesunu výběru použít kurzorové klávesy se šipkami."
-
-#: C/gswitchit.xml:210(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "Změna vlastností zásuvného modulu"
-
-#: C/gswitchit.xml:211(para)
-msgid ""
-"To change the properties of the plugins, select the plugin you want and "
-"click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr ""
-"Pokud chcete změnit vlastnosti zásuvného modulu, vyberte jej ze seznamu a "
-"klepněte na tlačítko <guibutton>Vlastnosti</guibutton>. Možnosti nastavení "
-"se liší pro každý zásuvný modul."
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr "Lucas Lommer <[email protected]>, 2009."
diff --git a/gswitchit/help/de/de.po b/gswitchit/help/de/de.po
deleted file mode 100644
index 970043ff..00000000
--- a/gswitchit/help/de/de.po
+++ /dev/null
@@ -1,486 +0,0 @@
-# German translation of the accessx-status manual.
-# Mario Blättermann <[email protected]>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2009-02-05 19:31+0000\n"
-"PO-Revision-Date: 2009-02-08 17:16+0100\n"
-"Last-Translator: Mario Blättermann <[email protected]>\n"
-"Language-Team: German <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
-
-#: C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "Tastaturindikator-Applet-Handbuch"
-
-#: C/gswitchit.xml:25(para)
-msgid ""
-"The Keyboard Indicator shows the active keyboard group and enables switching "
-"between different groups."
-msgstr ""
-"Der Tastaturindikator zeigt die aktive Tastaturgruppe an und ermöglicht Ihnen "
-"den Wechsel zwischen verschiedenen Gruppen."
-
-#: C/gswitchit.xml:30(year) C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "MATE-Dokumentationsprojekt"
-
-#: C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "August 2004"
-
-#: C/gswitchit.xml:2(para)
-msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-"later version published by the Free Software Foundation with no Invariant "
-"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in "
-"the file COPYING-DOCS distributed with this manual."
-msgstr ""
-"Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free "
-"Documentation License (GFDL), Version 1.1 oder jeder späteren, von der Free "
-"Software Foundation veröffentlichten Version ohne unveränderbare Abschnitte "
-"sowie ohne Texte auf dem vorderen und hinteren Buchdeckel kopiert, verteilt "
-"und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem "
-"<ulink type=\"help\" url=\"ghelp:fdl\">Link</ulink> oder in der mit diesem "
-"Handbuch gelieferten Datei COPYING-DOCS."
-
-#: C/gswitchit.xml:12(para)
-msgid ""
-"This manual is part of a collection of MATE manuals distributed under the "
-"GFDL. If you want to distribute this manual separately from the collection, "
-"you can do so by adding a copy of the license to the manual, as described in "
-"section 6 of the license."
-msgstr ""
-"Dieses Handbuch ist Teil einer Sammlung von MATE-Handbüchern, die unter der "
-"GFDL veröffentlicht werden. Wenn Sie dieses Handbuch getrennt von der "
-"Sammlung weiterverbreiten möchten, können Sie das tun, indem Sie eine Kopie "
-"der Lizenz zum Handbuch hinzufügen, wie es in Abschnitt 6 der Lizenz "
-"beschrieben ist."
-
-#: C/gswitchit.xml:19(para)
-msgid ""
-"Many of the names used by companies to distinguish their products and "
-"services are claimed as trademarks. Where those names appear in any MATE "
-"documentation, and the members of the MATE Documentation Project are made "
-"aware of those trademarks, then the names are in capital letters or initial "
-"capital letters."
-msgstr ""
-"Viele der Namen, die von Unternehmen verwendet werden, um ihre Produkte und "
-"Dienstleistungen von anderen zu unterscheiden, sind eingetragene "
-"Warenzeichen. An den Stellen, an denen diese Namen in einer MATE-"
-"Dokumentation erscheinen, werden die Namen in Großbuchstaben oder mit einem "
-"großen Anfangsbuchstaben geschrieben, wenn das MATE-Dokumentationsprojekt "
-"auf diese Warenzeichen hingewiesen wird."
-
-#: C/gswitchit.xml:35(para)
-msgid ""
-"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK "
-"AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED "
-"VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION "
-"PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY "
-"CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR "
-"CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS "
-"LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS "
-"AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-"DIESES DOKUMENT WIRD »WIE VORLIEGEND« GELIEFERT, OHNE GARANTIEN IRGENDEINER "
-"ART, SOWOHL AUSDRÜCKLICH GENANNTE ALS AUCH ANGEDEUTETE. DIES BEZIEHT SICH "
-"AUCH OHNE EINSCHRÄNKUNG AUF GARANTIEN, DASS DIESES DOKUMENT ODER VERÄNDERTE "
-"FASSUNGEN DIESES DOKUMENTS FREI VON HANDELSDEFEKTEN, FÜR EINEN BESTIMMTEN "
-"ZWECK GEEIGNET IST ODER DASS ES KEINE RECHTE DRITTER VERLETZT. DAS VOLLE "
-"RISIKO WAS QUALITÄT, GENAUIGKEIT UND LEISTUNG DES DOKUMENTS ODER VERÄNDERTE "
-"FASSUNGEN DES DOKUMENTS LIEGT BEI IHNEN. SOLLTE EIN DOKUMENT ODER EINE "
-"VERÄNDERTE FASSUNG DAVON FEHLER IRGENDEINER ART BEINHALTEN, TRAGEN SIE (NICHT "
-"DER URSPRUNGSAUTOR, DER AUTOR ODER EIN MITWIRKENDER) DIE KOSTEN FÜR "
-"NOTWENDIGE DIENSTLEISTUNGEN, REPARATUREN ODER FEHLERKORREKTUREN. DIESER "
-"HAFTUNGSAUSSCHLUSS IST EIN ESSENZIELLER TEIL DIESER LIZENZ. DIE VERWENDUNG "
-"EINES DOKUMENTS ODER EINER VERÄNDERTEN VERSION DES DOKUMENTS IST NICHT "
-"GESTATTET AUßER UNTER BEACHTUNG DIESES HAFTUNGSAUSSCHLUSSES UND"
-
-#: C/gswitchit.xml:55(para)
-msgid ""
-"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR "
-"ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY "
-"CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK "
-"STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR "
-"LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-"POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-"UNTER KEINEN UMSTÄNDEN UND AUF BASIS KEINER RECHTSGRUNDLAGE, EGAL OB DURCH "
-"UNERLAUBTEN HANDLUNGEN (EINSCHLIEßLICH FAHRLÄSSIGKEIT), VERTRAG ODER "
-"ANDERWEITIG KANN DER AUTOR, URSPRUNGSAUTOR, EIN MITWIRKENDER ODER EIN "
-"VERTRIEBSPARTNER DIESES DOKUMENTS ODER EINER VERÄNDERTEN FASSUNG DES "
-"DOKUMENTS ODER EIN ZULIEFERER EINER DIESER PARTEIEN, HAFTBAR GEMACHT WERDEN "
-"FÜR DIREKTE, INDIREKTE, SPEZIELLE, VERSEHENTLICHE ODER FOLGESCHÄDEN JEGLICHER "
-"ART, EINSCHLIEßLICH UND OHNE EINSCHRÄNKUNGEN SCHÄDEN DURCH VERLUST VON "
-"KULANZ, ARBEITSAUSFALL, COMPUTERVERSAGEN ODER COMPUTERFEHLFUNKTIONEN ODER "
-"ALLE ANDEREN SCHÄDEN ODER VERLUSTE, DIE SICH AUS ODER IN VERBINDUNG MIT DER "
-"VERWENDUNG DES DOKUMENTS UND VERÄNDERTER FASSUNGEN DES DOKUMENTS ERGEBEN, "
-"AUCH WENN DIE OBEN GENANNTEN PARTEIEN ÜBER DIE MÖGLICHKEIT SOLCHER SCHÄDEN "
-"INFORMIERT WAREN."
-
-#: C/gswitchit.xml:28(para)
-msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-"<placeholder-1/>"
-msgstr ""
-"DAS DOKUMENT UND VERÄNDERTE FASSUNGEN DES DOKUMENTS WERDEN UNTER DEN "
-"BEDINGUNGEN DER GNU FREE DOCUMENTATION LICENSE ZUR VERFÜGUNG GESTELLT MIT DEM "
-"WEITERGEHENDEN VERSTÄNDNIS, DASS: <placeholder-1/>"
-
-#: C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: C/gswitchit.xml:65(email)
-
-#: C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: C/gswitchit.xml:72(email)
-
-#: C/gswitchit.xml:89(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr "Dieses Handbuch beschreibt Version 2.8 des Tastaturindikator-Applets."
-
-#: C/gswitchit.xml:93(title)
-msgid "Feedback"
-msgstr "Rückmeldungen"
-
-#: C/gswitchit.xml:94(para)
-msgid ""
-"To report a bug or make a suggestion regarding the Keyboard Indicator applet "
-"or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback"
-"\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr ""
-"Um einen Fehler zu melden oder einen Vorschlag zum Tastaturindikator-Applet "
-"oder zu diesem Handbuch zu machen, folgen Sie den Anweisungen auf der <ulink "
-"url=\"ghelp:mate-feedback\" type=\"help\">MATE-Seite für Rückmeldungen</"
-"ulink>."
-
-#: C/gswitchit.xml:103(primary)
-msgid "Keyboard Indicator"
-msgstr "Tastaturindikator"
-
-#: C/gswitchit.xml:107(title)
-msgid "Introduction"
-msgstr "Einführung"
-
-#: C/gswitchit.xml:109(para)
-msgid ""
-"<application>Keyboard Indicator</application> indicates the active keyboard "
-"group. The applet shows you which group you are currently using. Aside from "
-"the standard applet popup menu functions, the <application>Keyboard "
-"Indicator</application> applet popup menu allows you to launch the applet "
-"Preferences tool and to switch between language groups."
-msgstr ""
-"Der <application>Tastaturindikator</application> stellt die aktive "
-"Tastaturbelegungsgruppe dar. Das Applet zeigt an, welche Gruppe Sie "
-"gegenwärtig benutzen. Zusätzlich zu den Standardfunktionen eines Applet-"
-"Kontextmenüs erlaubt Ihnen der <application>Tastaturindikator</application> "
-"auch das Öffnen eines Einstellungswerkzeugs und den Wechsel zwischen "
-"Sprachgruppen."
-
-#: C/gswitchit.xml:115(para)
-msgid ""
-"To add <application>Keyboard Indicator</application> to a panel, right-click "
-"on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select "
-"<application>Keyboard Indicator</application> in the <application>Add to the "
-"panel</application> dialog, then click <guibutton>OK</guibutton>. For more on "
-"this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject"
-"\">Adding an Object to a Panel</ulink>."
-msgstr ""
-"Um den <application>Tastaturindikator</application> zu einem Panel "
-"hinzuzufügen, klicken Sie mit der rechten Maustaste auf das Panel und wählen "
-"dann aus dem Kontextmenü <guimenuitem>Zum Panel hinzufügen</guimenuitem>. "
-"Wählen Sie <application>Tastaturindikator</application> im Dialog "
-"<application>Zum Panel hinzufügen</application>. Klicken Sie dann auf "
-"<guibutton>Hinzufügen</guibutton>. Weitere Informationen darüber finden Sie "
-"in <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject\">Hinzufügen "
-"eines Objekts zu einem Panel</ulink>."
-
-#: C/gswitchit.xml:121(para)
-msgid ""
-"To open the <application>Keyboard</application> preference tool, choose "
-"<guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup "
-"menu. You may need to go to this dialog to be able to configure the keyboard "
-"(choose model, layouts, options, etc.). For help with setting Keyboard "
-"preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring "
-"Keyboard Preferences</ulink>."
-msgstr ""
-"Um das Einstellungswerkzeug <application>Tastatur</application> zu öffnen, "
-"wählen Sie <guimenuitem>Tastatureinstellungen</guimenuitem> im Kontextmenü "
-"des Applets. Es könnte notwendig sein, diesen Dialog zu öffnen, um die "
-"Tastatureinstellungen zu ändern (Modell, Belegungen, Optionen usw.). Hilfe zu "
-"den Tastatureinstellungen finden Sie in <ulink url=\"ghelp:user-guide?prefs-"
-"keyboard\">Tastatureinstellungen</ulink>."
-
-#: C/gswitchit.xml:131(title)
-msgid "Switching Language"
-msgstr "Ändern der Sprache"
-
-#: C/gswitchit.xml:133(para)
-msgid ""
-"First, you must know that a group is a set of characters, whether it be for a "
-"language or non-language-related set of characters, like a dvorak. Each "
-"language may have more than one subset, and each subset is called a group. "
-"There are many ways you can switch the group that you are using on your "
-"keyboard."
-msgstr ""
-"Zunächst sollten Sie wissen, dass eine Gruppe ein Zeichensatz ist, sei es ein "
-"sprachbezogener oder auch ein nicht sprachbezogener Zeichensatz, z.B. Dvorak. "
-"Jede Sprache kann mehr als einen Teilzeichensatz enthalten, und jeder dieser "
-"Teilsätze wird als Gruppe bezeichnet. Es gibt mehrere Möglichkeiten, die "
-"verwendeten Gruppen auf Ihrer Tastatur zu wechseln."
-
-#: C/gswitchit.xml:141(term)
-msgid "Mouse Click"
-msgstr "Mausklick"
-
-#: C/gswitchit.xml:142(para)
-msgid ""
-"You can switch between groups with a single click on the applet's panel icon. "
-"The groups switch in a cycle determined by the current configuration."
-msgstr ""
-"Sie können durch Anklicken des Symbols des Applets im Panel die Gruppen "
-"wechseln. Die Gruppen werden gemäß der in der aktuellen Konfiguration "
-"festgelegten Reihenfolge gewechselt."
-
-#: C/gswitchit.xml:147(term)
-msgid "Popup Menu"
-msgstr "Kontextmenü"
-
-#: C/gswitchit.xml:148(para)
-msgid ""
-"To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the "
-"popup menu. From there, choose the group you want to switch to."
-msgstr ""
-"Um eine bestimmte Gruppe zu wählen, wählen Sie <guisubmenu>Gruppen</"
-"guisubmenu> aus dem Kontextmenü. Von hier aus können Sie die Gruppe "
-"auswählen, zu der Sie wechseln wollen."
-
-#: C/gswitchit.xml:153(term)
-msgid "Keyboard"
-msgstr "Tastatur"
-
-# Sobald es eine Übersetzung für Group Shift/Lock behavior gibt, bitte ändern.
-#: C/gswitchit.xml:154(para)
-msgid ""
-"In the <application>Keyboard</application> preference tool, you can set which "
-"key that you would like to use to switch groups on your keyboard. Choose "
-"<guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup "
-"menu, and choose the key you want to use in the <ulink url=\"ghelp:user-"
-"guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</guilabel></"
-"ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr ""
-"Im Einstellungswerkzeug <application>Tastatur</application> können Sie "
-"festlegen, welche Taste Ihrer Tastatur Sie zum Wechseln der Gruppen verwenden "
-"wollen. Wählen Sie <guimenuitem>Tastatureinstellungen</guimenuitem> im "
-"Kontextmenü des Applets. Anschließend wählen Sie im Reiter <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layoutoptions\"><guilabel>Belegungsoptionen</"
-"guilabel></ulink> unter <guilabel>Group Shift/Lock behavior</guilabel>die "
-"gewünschteTaste aus."
-
-#: C/gswitchit.xml:161(para)
-msgid ""
-"To add other layouts to the list, open the <application>Keyboard</"
-"application> preference tool. Choose other layouts in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr ""
-"Um weitere Belegungen zur Liste hinzuzufügen, öffnen Sie das "
-"Einstellungswerkzeug <application>Tastatur</application>. Im Reiter <ulink "
-"url=\"ghelp:user-guide#prefs-keyboard-layouts\"><guilabel>Belegungen</"
-"guilabel></ulink> können Sie weitere Belegungen auswählen."
-
-#: C/gswitchit.xml:165(title)
-msgid "Layout View"
-msgstr "Belegungsansicht"
-
-#: C/gswitchit.xml:166(para)
-msgid ""
-"Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to "
-"see a diagram of your current keyboard layout."
-msgstr ""
-"Wählen Sie <guimenuitem>Aktuelles Layout anzeigen</guimenuitem>, um ein "
-"Diagramm Ihrer gegenwärtigen Tastaturbelegung anzuzeigen."
-
-#: C/gswitchit.xml:167(para)
-msgid ""
-"In the <guilabel>Layout View</guilabel> window, press a key on your keyboard "
-"to highlight its representation in the diagram."
-msgstr ""
-"Im Fenster <guilabel>Tastatur-Layout</guilabel> drücken Sie eine Taste Ihrer "
-"Tastatur, um deren Entsprechung im Diagramm hervorzuheben."
-
-#: C/gswitchit.xml:168(para)
-msgid ""
-"Each key in the diagram has up to four characters. These can be produced with "
-"different keyboard modifiers, as follows:"
-msgstr ""
-"Jede Taste im Diagramm verfügt über bis zu vier Zeichen. Diese können wie "
-"folgt über Modifikationstasten erzeugt werden:"
-
-#: C/gswitchit.xml:170(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr ""
-"Um das links unten angezeigte Zeichen zu erzeugen, drücken Sie die Taste "
-"allein."
-
-#: C/gswitchit.xml:171(para)
-msgid ""
-"For the character shown in the top left, press the key with <keycap>Shift</"
-"keycap>."
-msgstr ""
-"Um das links oben angezeigte Zeichen zu erzeugen, drücken Sie die Taste "
-"zusammen mit der <keycap>Umschalttaste</keycap>."
-
-#: C/gswitchit.xml:172(para)
-msgid ""
-"For the character shown in the bottom right, press the key with the third "
-"level modifier."
-msgstr ""
-"Um das rechts unten angezeigte Zeichen zu erzeugen, drücken Sie die Taste "
-"zusammen mit der Modifikationstaste der dritten Ebene."
-
-#: C/gswitchit.xml:173(para)
-msgid ""
-"For the character shown in the top right, press the key with <keycap>Shift</"
-"keycap> and the third level modifier."
-msgstr ""
-"Um das rechts oben angezeigte Zeichen zu erzeugen, drücken Sie die Taste "
-"zusammen mit der <keycap>Umschalttaste</keycap> und der Modifikationstaste "
-"der dritten Ebene."
-
-#: C/gswitchit.xml:175(para)
-msgid ""
-"By default, no key is assigned to act as a third-level modifier. You can "
-"assign a key to act as a third level modifier in the <ulink type=\"help\" url="
-"\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout Options "
-"Preferences</ulink>."
-msgstr ""
-"Standardmäßig ist keine Taste als Modifikationstaste der dritten Ebene "
-"zugeordnet. Wie Sie dies zuordnen können, lesen Sie in den <ulink type=\"help"
-"\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Einstellungen der "
-"Tastaturbelegung</ulink>."
-
-#: C/gswitchit.xml:181(title)
-msgid "Plugins"
-msgstr "Plugins"
-
-#: C/gswitchit.xml:182(para)
-msgid ""
-"To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select "
-"<guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins "
-"are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr ""
-"Um den Dialog <guilabel>Tastaturindikator-Plugins</guilabel> zu öffnen, "
-"wählen Sie <guimenuitem>Plugins</guimenuitem> aus dem Kontextmenü. Die "
-"aktuellen Plugins werden im Bereich <guilabel>Aktive Plugins</guilabel> "
-"angezeigt."
-
-#: C/gswitchit.xml:187(term)
-msgid "Adding a New Plugin"
-msgstr "Hinzufügen eines neuen Plugins"
-
-#: C/gswitchit.xml:188(para)
-msgid ""
-"Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> "
-"window, select one of the plugins in the <guilabel>Available plugins</"
-"guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr ""
-"Klicken Sie auf <guibutton>Hinzufügen</guibutton>. Im Fenster "
-"<guilabel>Plugin hinzufügen</guilabel> können Sie eines der Plugins im "
-"Bereich <guilabel>Verfügbare Plugins</guilabel> auswählen. Klicken Sie dann "
-"auf <guibutton>Hinzufügen</guibutton>."
-
-#: C/gswitchit.xml:194(term)
-msgid "Removing a Plugin"
-msgstr "Entfernen eines Plugins"
-
-#: C/gswitchit.xml:195(para)
-msgid ""
-"Select the plugin in the <guilabel>Active plugins</guilabel> area that you do "
-"not want anymore and click <guibutton>Remove</guibutton>."
-msgstr ""
-"Wählen Sie das nicht mehr benötigte Plugin im Bereich <guilabel>Aktive "
-"Plugins</guilabel> aus und klicken Sie auf <guibutton>Löschen</guibutton>."
-
-#: C/gswitchit.xml:200(term)
-msgid "Moving Items in the Plugin List"
-msgstr "Verschieben von Einträgen in der Plugin-Liste"
-
-#: C/gswitchit.xml:201(para)
-msgid ""
-"To move items up and down the plugin list in the <guilabel>Active plugins</"
-"guilabel> area, select the plugin you want to move, and click <guibutton>Up</"
-"guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the "
-"keyboard to move the selection point up and down."
-msgstr ""
-"Um Plugins innerhalb der Plugin-Liste nach oben oder unten zu verschieben, "
-"wählen Sie das zu verschiebende Plugin aus und klicken Sie auf "
-"<guibutton>Nach oben</guibutton> oder <guibutton>Nach unten</guibutton>. Sie "
-"können auch die Pfeiltasten Ihrer Tastatur verwenden, um das ausgewählte "
-"Plugin nach oben oder nach unten zu verschieben."
-
-#: C/gswitchit.xml:208(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "Ändern der Eigenschaften eines Plugins"
-
-#: C/gswitchit.xml:209(para)
-msgid ""
-"To change the properties of the plugins, select the plugin you want and click "
-"<guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr ""
-"Um die Eigenschaften eines Plugins zu ändern, wählen Sie das gewünschte "
-"Plugin aus und klicken anschließend auf <guibutton>Eigenschaften</guibutton>. "
-"Die änderbaren Eigenschaften sind nicht für alle Plugins in gleichem Umfang "
-"verfügbar."
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr "Mario Blättermann <[email protected]>, 2009"
diff --git a/gswitchit/help/el/el.po b/gswitchit/help/el/el.po
deleted file mode 100644
index f687aa6f..00000000
--- a/gswitchit/help/el/el.po
+++ /dev/null
@@ -1,489 +0,0 @@
-# Greek translation of gswitchit documentation.
-# Copyright (C) Free Software Foundation, 2007.
-# This file is distributed under the same license as the PACKAGE package.
-# Dimitrios Typaldos <[email protected]>, 2007.
-#
-# Μάριος Ζηντίλης <[email protected]>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: gswitchit.docs\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-03 21:51+0000\n"
-"PO-Revision-Date: 2009-08-27 02:09+0300\n"
-"Last-Translator: Μάριος Ζηντίλης <[email protected]>\n"
-"Language-Team: Greek <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.2\n"
-
-#: C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "Ένδειξη Γλώσσας Πληκτρολογίου"
-
-#: C/gswitchit.xml:25(para)
-msgid ""
-"The Keyboard Indicator shows the active keyboard group and enables switching "
-"between different groups."
-msgstr ""
-"Η ένδειξη γλώσσας πληκτρολογίου παρουσιάζει την ενεργή ομάδα πληκτρολογίου "
-"και παρέχει δυνατότητα εναλλαγών ανάμεσα σε διάφορες ομάδες."
-
-#: C/gswitchit.xml:30(year) C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "Έργο Τεκμηρίωσης MATE"
-
-#: C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "2004-08"
-
-#: C/gswitchit.xml:2(para)
-msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-"later version published by the Free Software Foundation with no Invariant "
-"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
-"in the file COPYING-DOCS distributed with this manual."
-msgstr ""
-"Σας παρέχεται άδεια να αντιγράψετε, διανείμετε ή/και να τροποποιήσετε το "
-"υπάρχον κείμενο υπό τους όρους της άδειας GNU Free Documentation License "
-"(GFDL), έκδοση 1.1, ή οποιαδήποτε μεταγενέστερη έκδοση που να έχει εκδοθεί "
-"από το Free Software Foundation υπό τις προϋποθέσεις no Invariant Sections, "
-"no Front-Cover Texts, και no Back-Cover Texts. Μπορείτε να βρείτε αντίγραφο "
-"του GFDL σε αυτό το <ulink type=\"help\" url=\"ghelp:fdl\">σύνδεσμο</ulink> "
-"ή στο αρχείο COPYING-DOCS όπως διανέμεται με αυτή την τεκμηρίωση."
-
-#: C/gswitchit.xml:12(para)
-msgid ""
-"This manual is part of a collection of MATE manuals distributed under the "
-"GFDL. If you want to distribute this manual separately from the collection, "
-"you can do so by adding a copy of the license to the manual, as described in "
-"section 6 of the license."
-msgstr ""
-"Αυτή η τεκμηρίωση είναι μέρος της συλλογής τεκμηρίωσης του MATE όπως "
-"διανέμεται υπό τους όρους του GFDL. Εάν επιθυμείτε να διανείμετε αυτή την "
-"τεκμηρίωση ξεχωριστά από την συλλογή, μπορείτε να το κάνετε εάν η τεκμηρίωση "
-"συνοδεύεται από αντίγραφο της άδειας (GFDL) όπως περιγράφεται στον τομέα 6 "
-"της άδειας."
-
-#: C/gswitchit.xml:19(para)
-msgid ""
-"Many of the names used by companies to distinguish their products and "
-"services are claimed as trademarks. Where those names appear in any MATE "
-"documentation, and the members of the MATE Documentation Project are made "
-"aware of those trademarks, then the names are in capital letters or initial "
-"capital letters."
-msgstr ""
-"Πολλά από τα ονόματα που χρησιμοποιούνται από εταιρίες για να ξεχωρίσουν τα "
-"προϊόντα και τις υπηρεσίες είναι σήματα κατατεθέν. Όπου αυτά τα ονόματα "
-"εμφανίζονται στην τεκμηρίωση MATE, και τα μέλη της ομάδας τεκμηρίωσης MATE "
-"έχουν γνώση αυτών, τότε αυτά αναγράφονται με κεφαλαίους χαρακτήρες ή με "
-"αρχικούς κεφαλαίους χαρακτήρες."
-
-#: C/gswitchit.xml:35(para)
-msgid ""
-"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-"Η ΤΕΚΜΗΡΙΩΣΗ ΑΥΤΗ ΠΑΡΕΧΕΤΑΙ \"ΩΣ ΕΧΕΙ\", ΧΩΡΙΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ ΟΤΙ ΜΠΟΡΕΙ ΝΑ "
-"ΕΞΥΠΗΡΕΤΗΣΕΙ ΚΑΠΟΙΟ ΣΚΟΠΟ Η ΟΤΙ ΕΙΝΑΙ ΧΩΡΙΣ ΣΦΑΛΜΑ. ΟΛΟΚΛΗΡΗ Η ΕΥΘΥΝΗ ΓΙΑ "
-"ΤΗΝ ΠΟΙΟΤΗΤΑ, ΑΚΡΙΒΕΙΑ ΚΑΙ ΛΕΙΤΟΥΡΓΙΚΟΤΗΤΑ ΤΗΣ ΤΕΚΜΗΡΙΩΣΗΣ Ή ΠΑΡΑΛΛΑΓΩΝ "
-"ΑΥΤΗΣ ΑΝΗΚΕΙ ΣΕ ΕΣΑΣ. ΕΑΝ Η ΤΕΚΜΗΡΙΩΣΗ ΑΥΤΗ Ή ΠΑΡΑΛΛΑΓΗ ΑΥΤΗΣ ΕΙΝΑΙ ΛΑΘΟΣ "
-"ΚΑΤΑ ΚΑΠΟΙΟ ΤΡΟΠΟ ΕΣΕΙΣ ΑΝΑΛΑΜΒΑΝΕΤΕ ΤΗΝ ΕΥΘΥΝΗ ΤΗΣ ΔΙΟΡΘΩΣΗΣ. Η ΑΠΑΛΛΑΓΗ "
-"ΕΥΘΥΝΗΣ ΠΟΥ ΣΥΝΟΔΕΥΕΙ ΑΥΤΗ ΤΗΝ ΤΕΚΜΗΡΙΩΣΗ ΕΙΝΑΙ ΑΝΑΠΟΣΠΑΣΤΟ ΚΟΜΜΑΤΙ ΑΥΤΗΣ. "
-"ΚΑΜΙΑ ΧΡΗΣΗ ΤΗΣ ΤΕΚΜΗΡΙΩΣΗΣ Ή ΠΑΡΑΛΛΑΓΩΝ ΑΥΤΗΣ ΔΕΝ ΕΠΙΤΡΕΠΕΤΑΙ ΠΑΡΑ ΜΟΝΟ ΕΑΝ "
-"ΣΥΝΟΔΕΥΕΤΑΙ ΑΠΟ ΤΗΝ ΑΠΑΛΛΑΓΗ ΕΥΘΥΝΗΣ ΚΑΙ"
-
-#: C/gswitchit.xml:55(para)
-msgid ""
-"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-"POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-"ΣΕ ΚΑΜΙΑ ΠΕΡΙΠΤΩΣΗ ΚΑΙ ΥΠΟ ΚΑΜΙΑ ΝΟΜΙΚΗ ΣΥΝΘΗΚΗ, ΕΙΤΕ ΜΕΣΩ ΣΥΜΒΟΛΑΙΩΝ Ή "
-"ΑΛΛΙΩΣ, ΔΕΝ ΕΥΘΥΝΟΝΤΑΙ Ο ΣΥΓΓΡΑΦΕΑΣ, Ο ΔΙΑΝΟΜΕΑΣ, Η ΑΛΛΟΣ ΣΥΝΥΠΕΥΘΥΝΟΣ ΓΙΑ "
-"ΤΗΝ ΣΥΓΓΡΑΦΗ ΤΗΣ ΤΕΚΜΗΡΙΩΣΗΣ, ΓΙΑ ΕΜΜΕΣΕΣ Η ΑΜΕΣΕΣ, ΤΥΧΑΙΕΣ Ή ΜΗ ΖΗΜΙΕΣ "
-"ΠΑΝΤΩΣ ΦΥΣΕΩΣ ΠΟΥ ΠΡΟΕΡΧΟΝΤΑΙ ΑΠΟ ΤΗΝ ΧΡΗΣΗ ΤΗΣ ΤΕΚΜΗΡΙΩΣΗΣ ΚΑΙ/Ή ΠΑΡΑΛΛΑΓΩΝ "
-"ΑΥΤΗΣ ΑΚΟΜΑ ΚΑΙ ΕΑΝ ΕΧΕΙ ΥΠΑΡΞΕΙ ΠΡΟΕΙΔΟΠΟΙΗΣΗ ΓΙΑ ΤΗΝ ΠΙΘΑΝΟΤΗΤΑ ΥΠΑΡΞΗΣ "
-"ΤΕΤΟΙΩΝ ΖΗΜΙΩΝ."
-
-#: C/gswitchit.xml:28(para)
-msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-"<placeholder-1/>"
-msgstr ""
-"ΤΟ ΈΓΓΡΑΦΟ ΚΑΙ ΤΡΟΠΟΠΟΙΗΜΕΝΕΣ ΕΚΔΟΣΕΙΣ ΑΥΤΟΥ ΠΑΡΕΧΟΝΤΑΙ ΥΠΟ ΤΟΥΣ ΟΡΟΥΣ ΤΗΣ "
-"ΑΔΕΙΑΣ GNU FREE DOCUMENTATION ΜΕ ΤΗΝ ΠΕΡΑΙΤΕΡΩ ΔΙΕΥΚΡΙΝΙΣΗ ΟΤΙ: <placeholder-"
-"1/>"
-
-#: C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: C/gswitchit.xml:65(email)
-
-#: C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: C/gswitchit.xml:72(email)
-
-#: C/gswitchit.xml:89(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr ""
-"Αυτό το εγχειρίδιο περιγράφει την έκδοση 2.8 της μικροεφαρμογής Ένδειξης "
-"Γλώσσας Πληκτρολογίου."
-
-#: C/gswitchit.xml:93(title)
-msgid "Feedback"
-msgstr "Ανάδραση"
-
-#: C/gswitchit.xml:94(para)
-msgid ""
-"To report a bug or make a suggestion regarding the Keyboard Indicator applet "
-"or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
-"feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr ""
-"Για να αναφέρετε ένα σφάλμα ή να κάνετε μια πρόταση σχετικά με τη "
-"μικροεφαρμογή Ένδειξης γλώσσας πληκτρολογίου ή αυτή την τεκμηρίωση, "
-"ακολουθήστε τις οδηγίες στη σελίδα <ulink url=\"ghelp:mate-feedback\" type="
-"\"help\">ανάδρασης MATE </ulink>."
-
-#: C/gswitchit.xml:103(primary)
-msgid "Keyboard Indicator"
-msgstr "Ένδειξη γλώσσας πληκτρολογίου"
-
-#: C/gswitchit.xml:107(title)
-msgid "Introduction"
-msgstr "Εισαγωγή"
-
-#: C/gswitchit.xml:109(para)
-msgid ""
-"<application>Keyboard Indicator</application> indicates the active keyboard "
-"group. The applet shows you which group you are currently using. Aside from "
-"the standard applet popup menu functions, the <application>Keyboard "
-"Indicator</application> applet popup menu allows you to launch the applet "
-"Preferences tool and to switch between language groups."
-msgstr ""
-"Το <application>Πληκτρολόγιο</application> υποδεικνύει την ενεργή ομάδα "
-"πληκτρολογίου. Η μικροεφαρμογή σας δείχνει ποια ομάδα είναι ενεργή. Πέρα από "
-"τις προκαθορισμένες λειτουργίες στο αναδυόμενο μενού, η μικροεφαρμογή "
-"<application>Πληκτρολόγιο</application> σας επιτρέπει μέσα από αυτό την "
-"ενεργοποίηση του εργαλείου Προτιμήσεων και την εναλλαγή ανάμεσα σε διάφορες "
-"ομάδες γλωσσών."
-
-#: C/gswitchit.xml:115(para)
-msgid ""
-"To add <application>Keyboard Indicator</application> to a panel, right-click "
-"on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select "
-"<application>Keyboard Indicator</application> in the <application>Add to the "
-"panel</application> dialog, then click <guibutton>OK</guibutton>. For more "
-"on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject"
-"\">Adding an Object to a Panel</ulink>."
-msgstr ""
-"Για να προσθέσετε στον πίνακα εφαρμογών τη μικροεφαρμογή "
-"<application>Ένδειξη γλώσσας πληκτρολογίου</application> σε ένα πίνακα "
-"εφαρμογών, κάντε δεξί κλικ πάνω στον πίνακα εφαρμογών και επιλέξτε "
-"<guimenuitem>Προσθήκη στον πίνακα εφαρμογών</guimenuitem>. Επιλέξτε την "
-"μικροεφαρμογή <application>Ένδειξη γλώσσας πληκτρολογίου</application> στον "
-"διάλογο του <application>Προσθήκη στον πίνακα εφαρμογών</application>, "
-"έπειτα κάντε κλικ στο <guibutton>Εντάξει</guibutton>. Για περισσότερες "
-"πληροφορίες πάνω σε αυτό, ανατρέξτε στο <ulink type=\"help\" url=\"ghelp:"
-"user-guide?panels-addobject\">Προσθήκη αντικειμένου στον πίνακα εφαρμογών</"
-"ulink>."
-
-#: C/gswitchit.xml:121(para)
-msgid ""
-"To open the <application>Keyboard</application> preference tool, choose "
-"<guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup "
-"menu. You may need to go to this dialog to be able to configure the keyboard "
-"(choose model, layouts, options, etc.). For help with setting Keyboard "
-"preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring "
-"Keyboard Preferences</ulink>."
-msgstr ""
-"Για την ενεργοποίηση του εργαλείου προτιμήσεων για το "
-"<application>Πληκτρολόγιο</application>, επιλέξτε <guimenuitem>Προτιμήσεις "
-"πληκτρολογίου</guimenuitem> στο αναδυόμενο μενού μικροεφαρμογών. Μπορεί να "
-"χρειαστεί να επισκεφτείτε αυτό το διάλογο για τη διαμόρφωση του "
-"πληκτρολογίου (επιλογή μοντέλου, διατάξεων, επιλογών, κλπ.). Για βοήθεια "
-"πάνω στις ρυθμίσεις προτιμήσεων του πληκτρολογίου, ανατρέξτε στο <ulink url="
-"\"ghelp:user-guide?prefs-keyboard\">Ρυθμίσεις Προτιμήσεων Πληκτρολογίου</"
-"ulink>."
-
-#
-#: C/gswitchit.xml:131(title)
-msgid "Switching Language"
-msgstr "Εναλλαγή γλώσσας"
-
-#: C/gswitchit.xml:133(para)
-msgid ""
-"First, you must know that a group is a set of characters, whether it be for "
-"a language or non-language-related set of characters, like a dvorak. Each "
-"language may have more than one subset, and each subset is called a group. "
-"There are many ways you can switch the group that you are using on your "
-"keyboard."
-msgstr ""
-"Αρχικά, πρέπει να γνωρίζετε ότι μία ομάδα είναι ένα σύνολο χαρακτήρων, που "
-"αντιστοιχεί σε ένα σετ χαρακτήρων, σχετικά ή ανεξάρτητα με κάποια γλώσσα, "
-"όπως μία διάταξη πληκτρολογίου. Κάθε γλώσσα μπορεί να διαθέτει περισσότερα "
-"από ένα υποσύνολα, και καθένα από αυτά ονομάζεται ομάδα. Υπάρχουν πολλοί "
-"τρόποι να αλλάζετε την ομάδα που χρησιμοποιείτε στο πληκτρολόγιό σας."
-
-#: C/gswitchit.xml:141(term)
-msgid "Mouse Click"
-msgstr "Κλικ ποντικιού"
-
-#: C/gswitchit.xml:142(para)
-msgid ""
-"You can switch between groups with a single click on the applet's panel "
-"icon. The groups switch in a cycle determined by the current configuration."
-msgstr ""
-"Μπορείτε να εναλλάσεστε μεταξύ ομάδων με ένα μόνο κλικ στο σχετικό εικονίδιο "
-"του πίνακα εφαρμογών. Οι ομάδες εναλλάσονται κυκλικά όπως έχει καθοριστεί "
-"στην τρέχουσα διαμόρφωση."
-
-#: C/gswitchit.xml:147(term)
-msgid "Popup Menu"
-msgstr "Αναδυόμενο Μενού"
-
-#: C/gswitchit.xml:148(para)
-msgid ""
-"To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the "
-"popup menu. From there, choose the group you want to switch to."
-msgstr ""
-"Για την ενεργοποίηση μίας συγκεκριμένης ομάδας, επιλέξτε <guisubmenu>Ομάδες "
-"</guisubmenu> από το αναδυόμενο μενού. Από εκείνο το σημείο, επιλέξτε την "
-"ομάδα στην οποία επιθυμείτε να μεταβείτε."
-
-#: C/gswitchit.xml:153(term)
-msgid "Keyboard"
-msgstr "Πληκτρολόγιο"
-
-#: C/gswitchit.xml:154(para)
-msgid ""
-"In the <application>Keyboard</application> preference tool, you can set "
-"which key that you would like to use to switch groups on your keyboard. "
-"Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet "
-"popup menu, and choose the key you want to use in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</"
-"guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr ""
-"Στο εργαλείο προτιμήσεων για το <application>Πληκτρολόγιο</application>, "
-"μπορείτε να καθορίσετε το πλήκτρο που επιθυμείτε να χρησιμοποιείται για την "
-"εναλλαγή μεταξύ των ομάδων του πληκτρολογίου σας. Επιλέξτε "
-"<guimenuitem>Άνοιγμα προτιμήσεων πληκτρολογίου</guimenuitem> στο αναδυόμενο "
-"μενού μικροεφαρμογών, και κατόπιν καθορίστε το πλήκτρο που επιθυμείτε να "
-"χρησιμοποιείτε στην καρτέλα <ulink url=\"ghelp:user-guide#prefs-keyboard-"
-"layoutoptions\"><guilabel>Επιλογές Διάταξης</guilabel></ulink>, στην ένδειξη "
-"<guilabel>Group Shift/Lock behavior</guilabel>."
-
-#: C/gswitchit.xml:161(para)
-msgid ""
-"To add other layouts to the list, open the <application>Keyboard</"
-"application> preference tool. Choose other layouts in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr ""
-"Για προσθήκη επιπρόσθετων διατάξεων στη λίστα, ανοίξτε το εργαλείο "
-"<application>Προτιμήσεις πληκτρολογίου</application>. Κατόπιν επιλέξτε άλλες "
-"διατάξεις πληκτρολογίου στην <ulink url=\"ghelp:user-guide#prefs-keyboard-"
-"layouts\"><guilabel>Διατάξεις</guilabel>καρτέλα</ulink>."
-
-#: C/gswitchit.xml:165(title)
-msgid "Layout View"
-msgstr "Εμφάνιση τρέχουσας διάταξης"
-
-#: C/gswitchit.xml:166(para)
-msgid ""
-"Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to "
-"see a diagram of your current keyboard layout."
-msgstr ""
-"Επιλέξτε <guimenuitem>Εμφάνιση τρέχουσας διάταξης</guimenuitem> από το "
-"αναδυόμενο μενού της μικροεφαρμογής για να δείτε ένα σχεδιάγραμμα της "
-"τρέχουσας διάταξης του πληκτρολογίου σας."
-
-#: C/gswitchit.xml:167(para)
-msgid ""
-"In the <guilabel>Layout View</guilabel> window, press a key on your keyboard "
-"to highlight its representation in the diagram."
-msgstr ""
-"Στο παράθυρο <guilabel>Εμφάνιση τρέχουσας διάταξης</guilabel>, πιέστε ένα "
-"πλήκτρο στο πληκτρολόγιό σας για να δείτε την αναπαράσταση της λειτουργίας "
-"του στο σχεδιάγραμμα."
-
-#: C/gswitchit.xml:168(para)
-msgid ""
-"Each key in the diagram has up to four characters. These can be produced "
-"with different keyboard modifiers, as follows:"
-msgstr ""
-"Κάθε πλήκτρο μπορεί να αντιστοιχίζεται μέχρι και σε τέσσερις χαρακτήρες. "
-"Αυτοί μπορούν να εμφανιστούν με διάφορους μετατροπείς πληκτρολογίου, όπως θα "
-"δείτε παρακάτω:"
-
-#: C/gswitchit.xml:170(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr ""
-"Για το χαρακτήρα που εμφανίζεται στο κάτω αριστερό μέρος, πιέστε μόνο το "
-"πλήκτρο."
-
-#: C/gswitchit.xml:171(para)
-msgid ""
-"For the character shown in the top left, press the key with <keycap>Shift</"
-"keycap>."
-msgstr ""
-"Για το χαρακτήρα που εμφανίζεται στο επάνω αριστερό μέρος, πιέστε το πλήκτρο "
-"με <keycap>Shift</keycap>."
-
-#: C/gswitchit.xml:172(para)
-msgid ""
-"For the character shown in the bottom right, press the key with the third "
-"level modifier."
-msgstr ""
-"Για το χαρακτήρα που εμφανίζεται στο κάτω δεξί μέρος, πιέστε το πλήκτρο με "
-"το μετατροπέα τρίτης βαθμίδας."
-
-#: C/gswitchit.xml:173(para)
-msgid ""
-"For the character shown in the top right, press the key with <keycap>Shift</"
-"keycap> and the third level modifier."
-msgstr ""
-"Για το χαρακτήρα που εμφανίζεται στο επάνω δεξί μέρος, πιέστε το πλήκτρο με "
-"<keycap>Shift</keycap> και το μετατροπέα τρίτης βαθμίδας."
-
-#: C/gswitchit.xml:175(para)
-msgid ""
-"By default, no key is assigned to act as a third-level modifier. You can "
-"assign a key to act as a third level modifier in the <ulink type=\"help\" "
-"url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout "
-"Options Preferences</ulink>."
-msgstr ""
-"Ως προεπιλογή, κανένα πλήκτρο δεν έχει καθοριστεί ως μετατροπέας τρίτης "
-"βαθμίδας. Μπορείτε να καθορίσετε κάποιο πλήκτρο με αυτήν την ιδιότητα στις "
-"<ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions"
-"\">Επιλογές Διάταξης Προτιμήσεων Πληκτρολογίου</ulink>."
-
-#: C/gswitchit.xml:181(title)
-msgid "Plugins"
-msgstr "Πρόσθετες λειτουργίες"
-
-#: C/gswitchit.xml:182(para)
-msgid ""
-"To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select "
-"<guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins "
-"are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr ""
-"Για ενεργοποιήση του διαλόγου <guilabel>Πρόσθετες λειτουργίες ένδειξης "
-"γλώσσας πληκτρολογίου</guilabel>, επιλέξτε <guimenuitem>Πρόσθετες "
-"λειτουργίες</guimenuitem> από το αναδυόμενο μενού. Οι τρέχουσες πρόσθετες "
-"λειτουργίες εμφανίζονται στο χώρο <guilabel>Ενεργές πρόσθετες λειτουργίες</"
-"guilabel>."
-
-#: C/gswitchit.xml:187(term)
-msgid "Adding a New Plugin"
-msgstr "Εισαγωγή Πρόσθετης Λειτουργίας"
-
-#: C/gswitchit.xml:188(para)
-msgid ""
-"Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> "
-"window, select one of the plugins in the <guilabel>Available plugins</"
-"guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr ""
-"Επιλέξτε <guibutton>Προσθήκη</guibutton>. Στο παράθυρο <guilabel>Προσθήκη "
-"νέας λειτουργίας</guilabel>, επιλέξτε μία εφαρμογή στο χώρο "
-"<guilabel>Διαθέσιμες εφαρμογές</guilabel> και κάντε κλικ στο κουμπί "
-"<guibutton>Εντάξει</guibutton>."
-
-#: C/gswitchit.xml:194(term)
-msgid "Removing a Plugin"
-msgstr "Απομάκρυνση Πρόσθετης Λειτουργίας"
-
-#: C/gswitchit.xml:195(para)
-msgid ""
-"Select the plugin in the <guilabel>Active plugins</guilabel> area that you "
-"do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr ""
-"Επιλέξτε την πρόσθετη λειτουργία που δεν επιθυμείτε πλέον στο χώρο "
-"<guilabel>Ενεργές πρόσθετες λειτουργίες</guilabel> και κάντε κλικ στο "
-"<guibutton>Απομάκρυνση</guibutton>."
-
-#: C/gswitchit.xml:200(term)
-msgid "Moving Items in the Plugin List"
-msgstr "Μετακίνηση στη Λίστα Πρόσθετων Λειτουργιών"
-
-#: C/gswitchit.xml:201(para)
-msgid ""
-"To move items up and down the plugin list in the <guilabel>Active plugins</"
-"guilabel> area, select the plugin you want to move, and click <guibutton>Up</"
-"guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the "
-"keyboard to move the selection point up and down."
-msgstr ""
-"Για τη μετακίνηση αντικειμένων πάνω και κάτω μέσα στη λίστα των πρόσθετων "
-"λειτουργιών στο χώρο <guilabel>Ενεργές πρόσθετες λειτουργίες</guilabel>, "
-"επιλέξτε τη συγκεκριμένη εφαρμογή που θέλετε να μετακινήσετε, και κάντε κλικ "
-"στην επιλογή <guibutton>Πάνω</guibutton> ή <guibutton>Κάτω</guibutton>."
-
-#: C/gswitchit.xml:208(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "Αλλαγή ιδιοτήτων Πρόσθετης Λειτουργίας"
-
-#: C/gswitchit.xml:209(para)
-msgid ""
-"To change the properties of the plugins, select the plugin you want and "
-"click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr ""
-"Για αλλαγή ιδιοτήτων στις πρόσθετες λειτουργίες, επιλέξτε τη λειτουργία που "
-"επιθυμείτε και κάντε κλικ στις <guibutton>Ιδιότητες</guibutton>. Οι "
-"ιδιότητες είναι διαφορετικές για κάθε πρόσθετη λειτουργία."
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr ""
-"Ελληνική μεταφραστική ομάδα MATE - http://www.mate.gr/\n"
-" Δημήτριος Τυπάλδος <[email protected]>"
diff --git a/gswitchit/help/en_GB/en_GB.po b/gswitchit/help/en_GB/en_GB.po
deleted file mode 100644
index 6428dd8f..00000000
--- a/gswitchit/help/en_GB/en_GB.po
+++ /dev/null
@@ -1,241 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: keyboard-indicator-doc\n"
-"POT-Creation-Date: 2007-01-25 06:57+0000\n"
-"PO-Revision-Date: 2007-01-25 08:14-0000\n"
-"Last-Translator: David Lodge <[email protected]>\n"
-"Language-Team: en_GB <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "Keyboard Indicator Manual"
-
-#: C/gswitchit.xml:25(para)
-msgid "The Keyboard Indicator shows the active keyboard group and enables switching between different groups."
-msgstr "The Keyboard Indicator shows the active keyboard group and enables switching between different groups."
-
-#: C/gswitchit.xml:30(year)
-#: C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "MATE Documentation Project"
-
-#: C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "2004-08"
-
-#: C/gswitchit.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation Licence (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-
-#: C/gswitchit.xml:12(para)
-msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
-msgstr "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the licence to the manual, as described in section 6 of the licence."
-
-#: C/gswitchit.xml:19(para)
-msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any MATE documentation, and the members of the MATE Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
-msgstr "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any MATE documentation, and the members of the MATE Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
-
-#: C/gswitchit.xml:35(para)
-msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENCE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORISED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-
-#: C/gswitchit.xml:55(para)
-msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
-msgstr "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
-
-#: C/gswitchit.xml:28(para)
-msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
-msgstr "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENCE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
-
-#: C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: C/gswitchit.xml:65(email)
-
-#: C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: C/gswitchit.xml:72(email)
-
-#: C/gswitchit.xml:89(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr "This manual describes version 2.8 of the Keyboard Indicator applet."
-
-#: C/gswitchit.xml:93(title)
-msgid "Feedback"
-msgstr "Feedback"
-
-#: C/gswitchit.xml:94(para)
-msgid "To report a bug or make a suggestion regarding the Keyboard Indicator applet or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "To report a bug or make a suggestion regarding the Keyboard Indicator applet or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-
-#: C/gswitchit.xml:103(primary)
-msgid "Keyboard Indicator"
-msgstr "Keyboard Indicator"
-
-#: C/gswitchit.xml:107(title)
-msgid "Introduction"
-msgstr "Introduction"
-
-#: C/gswitchit.xml:109(para)
-msgid "<application>Keyboard Indicator</application> indicates the active keyboard group. The applet shows you which group you are currently using. Aside from the standard applet popup menu functions, the <application>Keyboard Indicator</application> applet popup menu allows you to launch the applet Preferences tool and to switch between language groups."
-msgstr "<application>Keyboard Indicator</application> indicates the active keyboard group. The applet shows you which group you are currently using. Aside from the standard applet pop-up menu functions, the <application>Keyboard Indicator</application> applet pop-up menu allows you to launch the applet Preferences tool and to switch between language groups."
-
-#: C/gswitchit.xml:115(para)
-msgid "To add <application>Keyboard Indicator</application> to a panel, right-click on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select <application>Keyboard Indicator</application> in the <application>Add to the panel</application> dialog, then click <guibutton>OK</guibutton>. For more on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject\">Adding an Object to a Panel</ulink>."
-msgstr "To add <application>Keyboard Indicator</application> to a panel, right-click on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select <application>Keyboard Indicator</application> in the <application>Add to the panel</application> dialogue, then click <guibutton>OK</guibutton>. For more on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject\">Adding an Object to a Panel</ulink>."
-
-#: C/gswitchit.xml:121(para)
-msgid "To open the <application>Keyboard</application> preference tool, choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup menu. You may need to go to this dialog to be able to configure the keyboard (choose model, layouts, options, etc.). For help with setting Keyboard preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring Keyboard Preferences</ulink>."
-msgstr "To open the <application>Keyboard</application> preference tool, choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet pop-up menu. You may need to go to this dialogue to be able to configure the keyboard (choose model, layouts, options, etc.). For help with setting Keyboard preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring Keyboard Preferences</ulink>."
-
-#: C/gswitchit.xml:131(title)
-msgid "Switching Language"
-msgstr "Switching Language"
-
-#: C/gswitchit.xml:133(para)
-msgid "First, you must know that a group is a set of characters, whether it be for a language or non-language-related set of characters, like a dvorak. Each language may have more than one subset, and each subset is called a group. There are many ways you can switch the group that you are using on your keyboard."
-msgstr "First, you must know that a group is a set of characters, whether it be for a language or non-language-related set of characters, like a dvorak. Each language may have more than one subset, and each subset is called a group. There are many ways you can switch the group that you are using on your keyboard."
-
-#: C/gswitchit.xml:141(term)
-msgid "Mouse Click"
-msgstr "Mouse Click"
-
-#: C/gswitchit.xml:142(para)
-msgid "You can switch between groups with a single click on the applet's panel icon. The groups switch in a cycle determined by the current configuration."
-msgstr "You can switch between groups with a single click on the applet's panel icon. The groups switch in a cycle determined by the current configuration."
-
-#: C/gswitchit.xml:147(term)
-msgid "Popup Menu"
-msgstr "Popup Menu"
-
-#: C/gswitchit.xml:148(para)
-msgid "To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the popup menu. From there, choose the group you want to switch to."
-msgstr "To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the pop-up menu. From there, choose the group you want to switch to."
-
-#: C/gswitchit.xml:153(term)
-msgid "Keyboard"
-msgstr "Keyboard"
-
-#: C/gswitchit.xml:154(para)
-msgid "In the <application>Keyboard</application> preference tool, you can set which key that you would like to use to switch groups on your keyboard. Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup menu, and choose the key you want to use in the <ulink url=\"ghelp:user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr "In the <application>Keyboard</application> preference tool, you can set which key that you would like to use to switch groups on your keyboard. Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet pop-up menu, and choose the key you want to use in the <ulink url=\"ghelp:user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-
-#: C/gswitchit.xml:161(para)
-msgid "To add other layouts to the list, open the <application>Keyboard</application> preference tool. Choose other layouts in the <ulink url=\"ghelp:user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr "To add other layouts to the list, open the <application>Keyboard</application> preference tool. Choose other layouts in the <ulink url=\"ghelp:user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-
-#: C/gswitchit.xml:165(title)
-msgid "Layout View"
-msgstr "Layout View"
-
-#: C/gswitchit.xml:166(para)
-msgid "Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to see a diagram of your current keyboard layout."
-msgstr "Choose <guimenuitem>Layout View</guimenuitem> from the applet pop-up menu to see a diagram of your current keyboard layout."
-
-#: C/gswitchit.xml:167(para)
-msgid "In the <guilabel>Layout View</guilabel> window, press a key on your keyboard to highlight its representation in the diagram."
-msgstr "In the <guilabel>Layout View</guilabel> window, press a key on your keyboard to highlight its representation in the diagram."
-
-#: C/gswitchit.xml:168(para)
-msgid "Each key in the diagram has up to four characters. These can be produced with different keyboard modifiers, as follows:"
-msgstr "Each key in the diagram has up to four characters. These can be produced with different keyboard modifiers, as follows:"
-
-#: C/gswitchit.xml:170(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr "For the character shown in the bottom left, press the key alone."
-
-#: C/gswitchit.xml:171(para)
-msgid "For the character shown in the top left, press the key with <keycap>Shift</keycap>."
-msgstr "For the character shown in the top left, press the key with <keycap>Shift</keycap>."
-
-#: C/gswitchit.xml:172(para)
-msgid "For the character shown in the bottom right, press the key with the third level modifier."
-msgstr "For the character shown in the bottom right, press the key with the third level modifier."
-
-#: C/gswitchit.xml:173(para)
-msgid "For the character shown in the top right, press the key with <keycap>Shift</keycap> and the third level modifier."
-msgstr "For the character shown in the top right, press the key with <keycap>Shift</keycap> and the third level modifier."
-
-#: C/gswitchit.xml:175(para)
-msgid "By default, no key is assigned to act as a third-level modifier. You can assign a key to act as a third level modifier in the <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout Options Preferences</ulink>."
-msgstr "By default, no key is assigned to act as a third-level modifier. You can assign a key to act as a third level modifier in the <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout Options Preferences</ulink>."
-
-#: C/gswitchit.xml:181(title)
-msgid "Plugins"
-msgstr "Plug-ins"
-
-#: C/gswitchit.xml:182(para)
-msgid "To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select <guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr "To open the <guilabel>Keyboard Indicator Plug-ins</guilabel> dialogue, select <guimenuitem>Plug-ins</guimenuitem> from the pop-up menu. Your current plug-ins are shown in the <guilabel>Active plug-ins</guilabel> area."
-
-#: C/gswitchit.xml:187(term)
-msgid "Adding a New Plugin"
-msgstr "Adding a New Plugin"
-
-#: C/gswitchit.xml:188(para)
-msgid "Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> window, select one of the plugins in the <guilabel>Available plugins</guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr "Click <guibutton>Add</guibutton>. In the <guilabel>Add Plug-in</guilabel> window, select one of the plug-ins in the <guilabel>Available plug-ins</guilabel> area and click the <guibutton>OK</guibutton> button."
-
-#: C/gswitchit.xml:194(term)
-msgid "Removing a Plugin"
-msgstr "Removing a Plug-in"
-
-#: C/gswitchit.xml:195(para)
-msgid "Select the plugin in the <guilabel>Active plugins</guilabel> area that you do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr "Select the plug-in in the <guilabel>Active plug-ins</guilabel> area that you do not want anymore and click <guibutton>Remove</guibutton>."
-
-#: C/gswitchit.xml:200(term)
-msgid "Moving Items in the Plugin List"
-msgstr "Moving Items in the Plug-in List"
-
-#: C/gswitchit.xml:201(para)
-msgid "To move items up and down the plugin list in the <guilabel>Active plugins</guilabel> area, select the plugin you want to move, and click <guibutton>Up</guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the keyboard to move the selection point up and down."
-msgstr "To move items up and down the plug-in list in the <guilabel>Active plug-ins</guilabel> area, select the plug-in you want to move, and click <guibutton>Up</guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the keyboard to move the selection point up and down."
-
-#: C/gswitchit.xml:208(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "Changing the Properties of a Plug-in"
-
-#: C/gswitchit.xml:209(para)
-msgid "To change the properties of the plugins, select the plugin you want and click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr "To change the properties of the plug-ins, select the plug-in you want and click <guibutton>Properties</guibutton>. The properties vary for each plug-in."
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr "David Lodge <[email protected]>"
-
diff --git a/gswitchit/help/es/es.po b/gswitchit/help/es/es.po
deleted file mode 100644
index c5857756..00000000
--- a/gswitchit/help/es/es.po
+++ /dev/null
@@ -1,488 +0,0 @@
-# translation of gswitchit.HEAD.po to Español
-# translation of es.po to
-#
-# Francisco Javier F. Serrador <[email protected]>, 2005, 2006.
-# Jorge González <[email protected]>, 2007.
-# Jorge González <[email protected]>, 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: gswitchit.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-17 21:31+0100\n"
-"PO-Revision-Date: 2008-03-05 11:36+0100\n"
-"Last-Translator: Jorge González <[email protected]>\n"
-"Language-Team: Español <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "Manual del Indicador del teclado"
-
-#: C/gswitchit.xml:25(para)
-msgid ""
-"The Keyboard Indicator shows the active keyboard group and enables switching "
-"between different groups."
-msgstr ""
-"El Indicador del teclado muestra el grupo activo del teclado y activa el "
-"cambio entre diferentes grupos."
-
-#: C/gswitchit.xml:30(year) C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "Proyecto de documentación de MATE"
-
-#: C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "2004-08"
-
-#: C/gswitchit.xml:2(para)
-msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-"later version published by the Free Software Foundation with no Invariant "
-"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
-"in the file COPYING-DOCS distributed with this manual."
-msgstr ""
-"Se concede permiso para copiar, distribuir o modificar este documento según "
-"las condiciones de la GNU Free Documentation License (GFDL), Versión 1.1 o "
-"cualquier versión posterior publicada por la Free Software Foundation sin "
-"Secciones invariantes, Textos de portada y Textos de contraportada. "
-"Encontrará una copia de la GFDL en este <ulink type=\"help\" url=\"ghelp:fdl"
-"\">enlace</ulink> o en el archivo COPYING-DOCS distribuido con este manual."
-
-#: C/gswitchit.xml:12(para)
-msgid ""
-"This manual is part of a collection of MATE manuals distributed under the "
-"GFDL. If you want to distribute this manual separately from the collection, "
-"you can do so by adding a copy of the license to the manual, as described in "
-"section 6 of the license."
-msgstr ""
-"Este manual forma parte de una colección de documentos de MATE distribuidos "
-"según la GFDL. Si desea distribuir este manual de forma independiente de la "
-"colección, puede hacerlo agregando una copia de la licencia al documento, "
-"según se describe en la sección 6 de la misma."
-
-#: C/gswitchit.xml:19(para)
-msgid ""
-"Many of the names used by companies to distinguish their products and "
-"services are claimed as trademarks. Where those names appear in any MATE "
-"documentation, and the members of the MATE Documentation Project are made "
-"aware of those trademarks, then the names are in capital letters or initial "
-"capital letters."
-msgstr ""
-"Muchos de los nombres utilizados por las empresas para distinguir sus "
-"productos y servicios se consideran marcas comerciales. Cuando estos nombres "
-"aparezcan en la documentación de MATE, y siempre que se haya informado a "
-"los miembros del Proyecto de documentación de MATE de dichas marcas "
-"comerciales, los nombres aparecerán en mayúsculas o con las iniciales en "
-"mayúsculas."
-
-#: C/gswitchit.xml:35(para)
-msgid ""
-"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-"EL DOCUMENTO SE ENTREGA \"TAL CUAL\", SIN GARANTÍA DE NINGÚN TIPO, NI "
-"EXPLÍCITA NI IMPLÍCITA INCLUYENDO, SIN LIMITACIÓN, GARANTÍA DE QUE EL "
-"DOCUMENTO O VERSIÓN MODIFICADA DE ÉSTE CAREZCA DE DEFECTOS EN EL MOMENTO DE "
-"SU VENTA, SEA ADECUADO A UN FIN CONCRETO O INCUMPLA ALGUNA NORMATIVA. TODO "
-"EL RIESGO RELATIVO A LA CALIDAD, PRECISIÓN Y UTILIDAD DEL DOCUMENTO O SU "
-"VERSIÓN MODIFICADA RECAE EN USTED. SI CUALQUIER DOCUMENTO O VERSIÓN "
-"MODIFICADA DE AQUÉL RESULTARA DEFECTUOSO EN CUALQUIER ASPECTO, USTED (Y NO "
-"EL REDACTOR INICIAL, AUTOR O AUTOR DE APORTACIONES) ASUMIRÁ LOS COSTES DE "
-"TODA REPARACIÓN, MANTENIMIENTO O CORRECCIÓN NECESARIOS. ESTA EXENCIÓN DE "
-"RESPONSABILIDAD SOBRE LA GARANTÍA ES UNA PARTE ESENCIAL DE ESTA LICENCIA. NO "
-"SE AUTORIZA EL USO DE NINGÚN DOCUMENTO NI VERSIÓN MODIFICADA DE ÉSTE POR EL "
-"PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO DE LA EXENCIÓN DE RESPONSABILIDAD;Y"
-
-#: C/gswitchit.xml:55(para)
-msgid ""
-"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-"POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-"EN NINGUNA CIRCUNSTANCIA NI BAJO NINGUNA TEORÍA LEGAL, SEA POR ERROR "
-"(INCLUYENDO NEGLIGENCIA) CONTRATO O DOCUMENTO DE OTRO TIPO, EL AUTOR, EL "
-"ESCRITOR INICIAL, EL AUTOR DE APORTACIONES NI NINGÚN DISTRIBUIDOR DEL "
-"DOCUMENTO O VERSIÓN MODIFICADA DEL DOCUMENTO, NI NINGÚN PROVEEDOR DE NINGUNA "
-"DE ESAS PARTES, SERÁ RESPONSABLE ANTE NINGUNA PERSONA POR NINGÚN DAÑO "
-"DIRECTO, INDIRECTO, ESPECIAL, INCIDENTAL O DERIVADO DE NINGÚN TIPO, "
-"INCLUYENDO, SIN LIMITACIÓN DAÑOS POR PÉRDIDA DE FONDO DE COMERCIO, PARO "
-"TÉCNICO, FALLO INFORMÁTICO O AVERÍA O CUALQUIER OTRO POSIBLE DAÑO O AVERÍA "
-"DERIVADO O RELACIONADO CON EL USO DEL DOCUMENTO O SUS VERSIONES MODIFICADAS, "
-"AUNQUE DICHA PARTE HAYA SIDO INFORMADA DE LA POSIBILIDAD DE QUE SE "
-"PRODUJESEN ESOS DAÑOS."
-
-#: C/gswitchit.xml:28(para)
-msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-"<placeholder-1/>"
-msgstr ""
-"ESTE DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO SE OFRECEN SEGÚN LAS "
-"CONDICIONES ESTABLECIDAS EN LA LICENCIA DE DOCUMENTACIÓN LIBRE DE GNU (GFDL) "
-"Y TENIENDO EN CUENTA QUE: <placeholder-1/>"
-
-#: C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: C/gswitchit.xml:65(email)
-
-#: C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: C/gswitchit.xml:72(email)
-
-#: C/gswitchit.xml:89(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr ""
-"Este manual describe la versión 2.8 de la miniaplicación Indicador del "
-"teclado."
-
-#: C/gswitchit.xml:93(title)
-msgid "Feedback"
-msgstr "Comentarios"
-
-#: C/gswitchit.xml:94(para)
-msgid ""
-"To report a bug or make a suggestion regarding the Keyboard Indicator applet "
-"or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
-"feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr ""
-"Para informar de un fallo, o hacer alguna sugerencia concerniente a la "
-"miniaplicación «Indicador del teclado» o este manual, siga las indicaciones "
-"en la <ulink url=\"ghelp:mate-feedback\" type=\"help\">Página de contacto "
-"de MATE</ulink>."
-
-#: C/gswitchit.xml:103(primary)
-msgid "Keyboard Indicator"
-msgstr "Indicador del teclado"
-
-#: C/gswitchit.xml:107(title)
-msgid "Introduction"
-msgstr "Introducción"
-
-#: C/gswitchit.xml:109(para)
-msgid ""
-"<application>Keyboard Indicator</application> indicates the active keyboard "
-"group. The applet shows you which group you are currently using. Aside from "
-"the standard applet popup menu functions, the <application>Keyboard "
-"Indicator</application> applet popup menu allows you to launch the applet "
-"Preferences tool and to switch between language groups."
-msgstr ""
-"El <application>Indicador del teclado</application> indica el grupo de "
-"teclado activo. La miniaplicación muestra qué grupo está usando actualmente. "
-"Además de las funciones estándar del menú emergente, el menú emergente de la "
-"miniaplicación <application>Indicador del teclado</application> le permite "
-"lanzar la herramienta de Preferencias de la miniaplicación y cambiar entre "
-"los grupos de idioma."
-
-#: C/gswitchit.xml:115(para)
-msgid ""
-"To add <application>Keyboard Indicator</application> to a panel, right-click "
-"on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select "
-"<application>Keyboard Indicator</application> in the <application>Add to the "
-"panel</application> dialog, then click <guibutton>OK</guibutton>. For more "
-"on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject"
-"\">Adding an Object to a Panel</ulink>."
-msgstr ""
-"Para añadir un <application>Indicador del teclado</application> a un panel, "
-"pulse con el botón derecho en el panel, después elija <guimenuitem>Añadir al "
-"panel</guimenuitem>. Seleccione <application>Indicador del teclado</"
-"application> en el diálogo <application>Añadir al panel</application>, "
-"después pulse <guibutton>Aceptar</guibutton>. Para más información acerca de "
-"ésto, vea <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject"
-"\">Añadir un objeto a un panel</ulink>."
-
-#: C/gswitchit.xml:121(para)
-msgid ""
-"To open the <application>Keyboard</application> preference tool, choose "
-"<guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup "
-"menu. You may need to go to this dialog to be able to configure the keyboard "
-"(choose model, layouts, options, etc.). For help with setting Keyboard "
-"preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring "
-"Keyboard Preferences</ulink>."
-msgstr ""
-"Para abrir la herramienta de preferencias del <application>Teclado</"
-"application>, elija <guimenuitem>Abrir preferencias del teclado</"
-"guimenuitem> en el menú emergente de la miniaplicación. Quizá necesite ir a "
-"este diálogo para ser capaz de configurar el teclado (elegir modelo, "
-"distribuciones, opciones, etc). Para ver la ayuda acerca de establecer "
-"preferencias del teclado, vea <ulink url=\"ghelp:user-guide?prefs-keyboard"
-"\">Configurar las preferencias del teclado</ulink>."
-
-#: C/gswitchit.xml:131(title)
-msgid "Switching Language"
-msgstr "Cambiar idioma"
-
-#: C/gswitchit.xml:133(para)
-msgid ""
-"First, you must know that a group is a set of characters, whether it be for "
-"a language or non-language-related set of characters, like a dvorak. Each "
-"language may have more than one subset, and each subset is called a group. "
-"There are many ways you can switch the group that you are using on your "
-"keyboard."
-msgstr ""
-"Primero, debe saber que un grupo es un conjunto de caracteres, tanto para un "
-"idioma como para un conjunto de caracteres no relacionado con un idioma, "
-"como dvorak. Cada idioma quizá tenga más de un subconjunto, y cada uno de "
-"estos subconjuntos se llama grupo. Hay muchas formas en las que puede "
-"cambiar el grupo que está usando en su teclado."
-
-#: C/gswitchit.xml:141(term)
-msgid "Mouse Click"
-msgstr "Pulsación con el ratón"
-
-#: C/gswitchit.xml:142(para)
-msgid ""
-"You can switch between groups with a single click on the applet's panel "
-"icon. The groups switch in a cycle determined by the current configuration."
-msgstr ""
-"Puede cambiar entre los grupo con una sola pulsación del ratón en el icono "
-"del panel de la miniaplicación. Los grupos cambian en un ciclo determinado "
-"por la configuración actual."
-
-#: C/gswitchit.xml:147(term)
-msgid "Popup Menu"
-msgstr "Menú emergente"
-
-#: C/gswitchit.xml:148(para)
-msgid ""
-"To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the "
-"popup menu. From there, choose the group you want to switch to."
-msgstr ""
-"Para escoger un grupo específico, seleccione <guisubmenu>Grupos</guisubmenu> "
-"del menú emergente. Desde allí, elija el grupo al que quiere cambiar."
-
-#: C/gswitchit.xml:153(term)
-msgid "Keyboard"
-msgstr "Teclado"
-
-#: C/gswitchit.xml:154(para)
-msgid ""
-"In the <application>Keyboard</application> preference tool, you can set "
-"which key that you would like to use to switch groups on your keyboard. "
-"Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet "
-"popup menu, and choose the key you want to use in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</"
-"guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr ""
-"En la herramienta de preferencias del <application>Teclado</application>, "
-"puede establecer qué tecla quiere usar para cambiar entre los grupos de su "
-"teclado. Elija <guimenuitem>Abrir preferencias del teclado</guimenuitem> en "
-"el menú emergente de la miniaplicación y elija la tecla que quiera usar en "
-"la solapa<ulink url=\"ghelp:user-guide#prefs-keyboard-layoutoptions"
-"\"><guilabel>Opciones de distribución</guilabel></ulink>, bajo "
-"<guilabel>Comportamiento de cambio de grupo</guilabel>."
-
-#: C/gswitchit.xml:161(para)
-msgid ""
-"To add other layouts to the list, open the <application>Keyboard</"
-"application> preference tool. Choose other layouts in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr ""
-"Para añadir otras distribuciones a la lista, abra la herramienta de "
-"preferencias <application>Teclado</application>. Elija otras distribuciones "
-"en la solapa <ulink url=\"ghelp:user-guide#prefs-keyboard-layouts"
-"\"><guilabel>Distribuciones</guilabel></ulink>."
-
-#: C/gswitchit.xml:165(title)
-msgid "Layout View"
-msgstr "Vista de distribuciones"
-
-#: C/gswitchit.xml:166(para)
-msgid ""
-"Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to "
-"see a diagram of your current keyboard layout."
-msgstr ""
-"Elija <guimenuitem>Vista de distribuciones</guimenuitem> del menú emergente "
-"de miniaplicaciones para ver un diagrama de su distribución de teclas actual."
-
-#: C/gswitchit.xml:167(para)
-msgid ""
-"In the <guilabel>Layout View</guilabel> window, press a key on your keyboard "
-"to highlight its representation in the diagram."
-msgstr ""
-"En la ventana de <guilabel>Vista de distribuciones</guilabel>, pulse una "
-"tecla en su teclado para resaltar su representación en el diagrama."
-
-#: C/gswitchit.xml:168(para)
-msgid ""
-"Each key in the diagram has up to four characters. These can be produced "
-"with different keyboard modifiers, as follows:"
-msgstr ""
-"Cata tecla en el diagrama tiene hasta cuatro caracteres. Estos pueden "
-"producirse con modificadores del teclado diferentes, tal como sigue:"
-
-#: C/gswitchit.xml:170(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr ""
-"Para el carácter mostrado en la parte inferior izquierda, pulse la tecla "
-"sola."
-
-#: C/gswitchit.xml:171(para)
-msgid ""
-"For the character shown in the top left, press the key with <keycap>Shift</"
-"keycap>."
-msgstr ""
-"Para el carácter mostrado en la parte superior izquierda, pulse la tecla con "
-"<keycap>Mayús.</keycap>."
-
-#: C/gswitchit.xml:172(para)
-msgid ""
-"For the character shown in the bottom right, press the key with the third "
-"level modifier."
-msgstr ""
-"Para el carácter mostrado en la parte inferior izquierda, pulse la tecla con "
-"el modificador de tercer nivel."
-
-#: C/gswitchit.xml:173(para)
-msgid ""
-"For the character shown in the top right, press the key with <keycap>Shift</"
-"keycap> and the third level modifier."
-msgstr ""
-"Para el carácter mostrado en la parte superior derecha, pulse la tecla con "
-"<keycap>Mayús.</keycap> y el modificador de tercer nivel."
-
-#: C/gswitchit.xml:175(para)
-msgid ""
-"By default, no key is assigned to act as a third-level modifier. You can "
-"assign a key to act as a third level modifier in the <ulink type=\"help\" "
-"url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout "
-"Options Preferences</ulink>."
-msgstr ""
-"Por omisión, no hay ninguna tecla asignada para actuar como modificador de "
-"tercer nivel. Puede asignar una tecla para actuar como modificador de tercer "
-"nivel en las <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-"
-"layoutoptions\">Preferencias de las opciones de distribución de teclado</"
-"ulink>."
-
-#: C/gswitchit.xml:181(title)
-msgid "Plugins"
-msgstr "Complementos"
-
-#: C/gswitchit.xml:182(para)
-msgid ""
-"To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select "
-"<guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins "
-"are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr ""
-"Para abrir el diálogo de <guilabel>Complementos del indicador del teclado</"
-"guilabel>, seleccione <guimenuitem>Complementos </guimenuitem> del menú "
-"emergente. Sus complementos actuales se muestran en el área "
-"<guilabel>Complementos activos</guilabel>."
-
-#: C/gswitchit.xml:187(term)
-msgid "Adding a New Plugin"
-msgstr "Añadir un complemento nuevo"
-
-#: C/gswitchit.xml:188(para)
-msgid ""
-"Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> "
-"window, select one of the plugins in the <guilabel>Available plugins</"
-"guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr ""
-"Pulse <guibutton>Añadir</guibutton>. En la ventana <guilabel>Añadir "
-"complemento</guilabel> , seleccione uno de los complementos en el área "
-"<guilabel>Complementos disponibles</guilabel> y pulse el botón "
-"<guibutton>Aceptar</guibutton>."
-
-#: C/gswitchit.xml:194(term)
-msgid "Removing a Plugin"
-msgstr "Quitar un complemento"
-
-#: C/gswitchit.xml:195(para)
-msgid ""
-"Select the plugin in the <guilabel>Active plugins</guilabel> area that you "
-"do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr ""
-"Seleccione el complemento en el área de <guilabel>Complementos activos</"
-"guilabel> que no quiera más y pulse <guibutton>Quitar</guibutton>."
-
-#: C/gswitchit.xml:200(term)
-msgid "Moving Items in the Plugin List"
-msgstr "Mover elementos en la lista de complementos"
-
-#: C/gswitchit.xml:201(para)
-msgid ""
-"To move items up and down the plugin list in the <guilabel>Active plugins</"
-"guilabel> area, select the plugin you want to move, and click <guibutton>Up</"
-"guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the "
-"keyboard to move the selection point up and down."
-msgstr ""
-"Para subir y bajar elementos en la lista de complementos en el área de "
-"<guilabel>complementos activos</guilabel>, seleccione el complemento que "
-"quiere mover, y pulse <guibutton>Subir</guibutton> o <guibutton>Bajar</"
-"guibutton>. Puede usar las flechas en el teclado para mover el punto de "
-"selección arriba y abajo."
-
-#: C/gswitchit.xml:208(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "Cambiar las propiedades de un complemento"
-
-#: C/gswitchit.xml:209(para)
-msgid ""
-"To change the properties of the plugins, select the plugin you want and "
-"click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr ""
-"Para cambiar las propiedades de los complementos, seleccione el complemento "
-"que quiere y pulse <guibutton>Propiedades</guibutton>. Las propiedades varían "
-"con cada complemento."
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr ""
-"Jorge González <[email protected]>, 2008.\n"
-"Francisco Javier F. Serrador <[email protected]>, 2005-2006."
-
diff --git a/gswitchit/help/eu/eu.po b/gswitchit/help/eu/eu.po
deleted file mode 100644
index 64edbc11..00000000
--- a/gswitchit/help/eu/eu.po
+++ /dev/null
@@ -1,244 +0,0 @@
-# translation of gswitchit_help.HEAD.po to Basque
-# Iñaki Larrañaga Murgoitio <[email protected]>, 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: gswitchit_help.HEAD\n"
-"POT-Creation-Date: 2007-09-04 03:33+0100\n"
-"PO-Revision-Date: 2008-12-14 19:33+0100\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio <[email protected]>\n"
-"Language-Team: Basque <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "Teklatu-adierazlearen eskuliburua"
-
-#: C/gswitchit.xml:25(para)
-msgid "The Keyboard Indicator shows the active keyboard group and enables switching between different groups."
-msgstr "Teklatu-adierazleak teklatu aktiboen taldea erakusten du, eta taldeen artean aldatzeko aukera ematen du."
-
-#: C/gswitchit.xml:30(year) C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "MATEren dokumentazio-proiektua"
-
-#: C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "2004-08"
-
-#: C/gswitchit.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr "Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko Free Software Foundation-ek argitaratutako GNU Dokumentazio Librearen Lizentziaren 1.1. bertsioan edo berriago batean ezarritako baldintzak betetzen badira; Atal Aldaezinik, Aurreko azaleko testurik eta Atzeko azaleko testurik gabe. GFDL lizentziaren kopia <ulink type=\"help\" url=\"ghelp:fdl\">esteka</ulink> honetan edo eskuliburu honekin batera ematen den COPYING-DOCS fitxategian aurkituko duzu."
-
-#: C/gswitchit.xml:12(para)
-msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
-msgstr "Eskuliburu hau GFDL lizentziarekin banatzen diren MATE eskuliburuen bildumakoa da. Eskuliburu hau bildumatik bereizita banatu nahi baduzu, bana dezakezu, baina eskuliburuari lizentziaren kopia bat gehitu beharko diozu, lizentzian bertan 6. atalean azaltzen den bezala."
-
-#: C/gswitchit.xml:19(para)
-msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any MATE documentation, and the members of the MATE Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
-msgstr "Enpresek euren produktu eta zerbitzuak bereizteko erabiltzen dituzten izen asko marka erregistratu moduan hartu behar dira. Izen horiek MATEren edozein agiritan agertzen direnean, eta MATEren Dokumentazio Proiektuko kideak marka komertzialak direla konturatu badira, orduan izen horiek maiuskulaz idatzita egongo dira, osorik edo hasierako letra maiuskulaz jarrita."
-
-#: C/gswitchit.xml:35(para)
-msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr "DOKUMENTUA \"DAGOEN-DAGOENEAN\" EMATEN DA, INOLAKO BERMERIK GABE, EZ ESPRESUKI ADIERAZITAKORIK ETA EZ INPLIZITURIK ERE; BESTEAK BESTE (MUGARIK GABE), EZ DA BERMATZEN DOKUMENTUA EDO BERTSIO ALDATUA AKATSIK GABEA DENIK, MERKATURATZEKO EDO XEDE JAKIN BATERAKO EGOKIA DENIK EDO ARAURIK HAUSTEN EZ DUENIK. DOKUMENTUAREN EDO DOKUMENTUAREN BERTSIO ALDATUAREN KALITATEARI, ZEHAZTASUNARI ETA PERFORMANTZIARI BURUZKO ERANTZUKIZUN OSOA ZUREA DA. DOKUMENTUREN BATEK EDO BERTSIO ALDATUREN BATEK EDOZEIN MOTATAKO AKATSIK IZANEZ GERO, ZUK (EZ HASIERAKO IDAZLEAK, EZ EGILEAK ETA EZ INONGO KOLABORATZAILEK) ZEURE GAIN HARTU BEHARKO DUZU BERRIKUSTEKO, KONPONTZEKO EDO ZUZENTZEKO BEHARREZKO ZERBITZU GUZTIEN KOSTUA. BERME-UKATZE HAU LIZENTZIA HONEN FUNTSEZKO ZATIA DA. EZ DA BAIMENIK EMATEN EZEIN DOKUMENTU EDO BERTSIO ALDATU ERABILTZEKO, BALDIN ETA EZ BADA BERME-UKATZE HAU ONARTZEN."
-
-#: C/gswitchit.xml:55(para)
-msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
-msgstr "EZINGO DA INONGO ZIRKUNSTANTZIA EDO LEGE-TEORIARIK OINARRI HARTU --EZ ERANTZUKIZUN ZIBILARI BURUZKORIK (ZABARKERIA BARNE HARTUTA) EZ KONTRATUARI BURUZKORIK, EZ BESTERIK-- DOKUMENTU HONEN EDO BERTSIO ALDATU BATEN EGILEA, HASIERAKO IDAZLEA, EDOZEIN KOLABORATZAILE EDO BANATZAILE, EDO ALDERDI HORIEN EDOZEIN HORNITZAILE BESTE PERTSONA BATEN AURREAN ERANTZULE EGITEKO, PERTSONA HORREK EDOZEIN MOTATAKO KALTE ZUZENEKO, ZEHARKAKO, BEREZI, INTZIDENTAL EDO ONDORIOZKOAK JASAN DITUELAKO, BESTEAK BESTE (MUGARIK GABE), BEZEROAK GALTZEAREN, LANA ETEN BEHARRAREN, ORDENAGAILUAK EZ IBILTZEAREN EDO GAIZKI IBILTZEAREN ONDORIOZKO KALTEAK, EDO DOKUMENTUA NAHIZ HAREN BERTSIO ALDATUAK ERABILTZETIK ONDORIOZTATZEN DIREN EDO ERABILERA HORREKIN ZERIKUSIA DUEN EDOZEIN KALTE EDO GALERA, ALDERDIARI KALTE HORIEK GERTA ZITEZKEELA ADITZERA EMAN BAZAIO ERE."
-
-#: C/gswitchit.xml:28(para)
-msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
-msgstr "DOKUMENTUA ETA DOKUMENTUAREN BERTSIO ALDATUAK GNU DOKUMENTAZIO LIBREAREN LIZENTZIAREN BALDINTZEN ARABERA EMATEN DIRA, ETA ONDOREN ZEHAZTEN DIRENAK ONARTZERA BEHARTZEN DUTE: <placeholder-1/>"
-
-#: C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: C/gswitchit.xml:65(email)
-
-#: C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: C/gswitchit.xml:72(email)
-
-#: C/gswitchit.xml:89(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr "Eskuliburu honetan Teklatu-adierazlearen miniaplikazioaren 2.8 bertsioa azaltzen da."
-
-#: C/gswitchit.xml:93(title)
-msgid "Feedback"
-msgstr "Ohar-bidaltzea"
-
-#: C/gswitchit.xml:94(para)
-msgid "To report a bug or make a suggestion regarding the Keyboard Indicator applet or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Teklatu-adierazlearen miniaplikazioari edo eskuliburu honi buruzko akatsen berri emateko edo oharrak bidaltzeko, <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATEra oharrak bidaltzeko orrian</ulink> aurkituko dituzu argibideak."
-
-#: C/gswitchit.xml:103(primary)
-msgid "Keyboard Indicator"
-msgstr "Teklatu-adierazlea"
-
-#: C/gswitchit.xml:107(title)
-msgid "Introduction"
-msgstr "Sarrera"
-
-#: C/gswitchit.xml:109(para)
-msgid "<application>Keyboard Indicator</application> indicates the active keyboard group. The applet shows you which group you are currently using. Aside from the standard applet popup menu functions, the <application>Keyboard Indicator</application> applet popup menu allows you to launch the applet Preferences tool and to switch between language groups."
-msgstr "<application>Teklatu-adierazleak</application> teklatu aktiboen taldea adierazten du. Miniaplikazioak erakusten du erabiltzen ari zaren taldea. Miniaplikazio estandarraren laster-menuaz gain, <application>Teklatu-adierazlearen</application> miniaplikazioaren laster-menuak aukera ematen dizu miniaplikazioaren Hobespenen tresna abiarazteko, eta hizkuntza taldeen artean aldatzeko."
-
-#: C/gswitchit.xml:115(para)
-msgid "To add <application>Keyboard Indicator</application> to a panel, right-click on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select <application>Keyboard Indicator</application> in the <application>Add to the panel</application> dialog, then click <guibutton>OK</guibutton>. For more on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject\">Adding an Object to a Panel</ulink>."
-msgstr "<application>Teklatu-adierazlea</application> panel batean gehitzeko, egin klik eskuin-botoiarekin panelean, eta aukeratu <guimenuitem>Gehitu panelari</guimenuitem>. Hautatu <application>Teklatu-adierazlea</application>, <application>Gehitu panelari</application> elkarrizketan, eta hautatu <guibutton>Ados</guibutton>. Informazio gehiago lortzeko, ikus <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject\">Objektu bat panel bati gehitzea</ulink>."
-
-#: C/gswitchit.xml:121(para)
-msgid "To open the <application>Keyboard</application> preference tool, choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup menu. You may need to go to this dialog to be able to configure the keyboard (choose model, layouts, options, etc.). For help with setting Keyboard preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring Keyboard Preferences</ulink>."
-msgstr "<application>Teklatua</application> hobespen-tresna irekitzeko, aukeratu <guimenuitem>Ireki Teklatuaren hobespenak</guimenuitem>, miniaplikazioaren laster-menuan. Baliteke elkarrizketa horretan konfiguratu behar izatea teklatua (aukeratu modeloa, diseinuak, aukerak, etab.). Teklatuaren hobespenak ezartzeari buruzko laguntza lortzeko, ikus <ulink url=\"ghelp:user-guide?prefs-keyboard\">Teklatuaren hobespenak konfiguratzea</ulink>."
-
-#: C/gswitchit.xml:131(title)
-msgid "Switching Language"
-msgstr "Hizkuntza aldatzea"
-
-#: C/gswitchit.xml:133(para)
-msgid "First, you must know that a group is a set of characters, whether it be for a language or non-language-related set of characters, like a dvorak. Each language may have more than one subset, and each subset is called a group. There are many ways you can switch the group that you are using on your keyboard."
-msgstr "Lehenik eta behin, talde bat karaktere multzo bat da, hizkuntza batentzat edo hizkuntzarekin lotu gabeko karaktere multzo batentzat, dvorak-entzat esate baterako. Hizkuntza bakoitzak azpimultzo bat baino gehiago izan dezake, eta azpimultzo bakoitzari talde esaten zaio. Modu bat baino gehiago dago teklatuan erabiltzen ari zaren taldea aldatzeko."
-
-#: C/gswitchit.xml:141(term)
-msgid "Mouse Click"
-msgstr "Saguarekin klik egitea"
-
-#: C/gswitchit.xml:142(para)
-msgid "You can switch between groups with a single click on the applet's panel icon. The groups switch in a cycle determined by the current configuration."
-msgstr "Miniaplikazioaren panel-ikonoan klik eginez taldeen artean alda zaitezke. Uneko konfigurazioak erabakitzen du taldeak aldatzeko zikloa."
-
-#: C/gswitchit.xml:147(term)
-msgid "Popup Menu"
-msgstr "Laster-menua"
-
-#: C/gswitchit.xml:148(para)
-msgid "To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the popup menu. From there, choose the group you want to switch to."
-msgstr "Talde jakin bat aukeratzeko, hautatu laster-menuko <guisubmenu>Taldeak</guisubmenu>. Han, aukeratu joan nahi duzun taldea."
-
-#: C/gswitchit.xml:153(term)
-msgid "Keyboard"
-msgstr "Teklatua"
-
-#: C/gswitchit.xml:154(para)
-msgid "In the <application>Keyboard</application> preference tool, you can set which key that you would like to use to switch groups on your keyboard. Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup menu, and choose the key you want to use in the <ulink url=\"ghelp:user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr "<application>Teklatua</application> hobespen-tresnan, teklatuko taldeen artean aldatzeko erabili nahi duzun tekla ezar dezakezu. Aukeratu miniaplikazioaren laster-menuko <guimenuitem>Ireki Teklatuaren hobespenak</guimenuitem>, eta hautatu erabili nahi duzun tekla <ulink url=\"ghelp:user-guide#prefs-keyboard-layoutoptions\"><guilabel>Esleipen-aukerak</guilabel></ulink> fitxan, <guilabel>Taldea aldatzeko portaera</guilabel>ren azpian."
-
-#: C/gswitchit.xml:161(para)
-msgid "To add other layouts to the list, open the <application>Keyboard</application> preference tool. Choose other layouts in the <ulink url=\"ghelp:user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr "Beste esleipen batzuk zerrendan gehitzeko, ireki <application>Teklatua</application> hobespen-tresna. Itxi <ulink url=\"ghelp:user-guide#prefs-keyboard-layouts\"><guilabel>Esleipenak</guilabel></ulink> fitxako beste esleipenak."
-
-#: C/gswitchit.xml:165(title)
-msgid "Layout View"
-msgstr "Esleipen-ikuspegia"
-
-#: C/gswitchit.xml:166(para)
-msgid "Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to see a diagram of your current keyboard layout."
-msgstr "Aukeratu miniaplikazioaren laster-menuko <guimenuitem>Esleipen-ikuspegia</guimenuitem>, uneko teklatu-esleipenen diagrama bat ikusteko."
-
-#: C/gswitchit.xml:167(para)
-msgid "In the <guilabel>Layout View</guilabel> window, press a key on your keyboard to highlight its representation in the diagram."
-msgstr "<guilabel>Esleipen-ikuspegia</guilabel> leihoan, sakatu teklatuko tekla bat, haren adierazpena diagraman nabarmentzeko."
-
-#: C/gswitchit.xml:168(para)
-msgid "Each key in the diagram has up to four characters. These can be produced with different keyboard modifiers, as follows:"
-msgstr "Diagramako tekla bakoitzak lau karaktere arte ditu. Hainbat teklatu-aldatzailek sor ditzakete, esate baterako:"
-
-#: C/gswitchit.xml:170(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr "Ezker-behealdeko karaktererako, sakatu tekla bakarrik."
-
-#: C/gswitchit.xml:171(para)
-msgid "For the character shown in the top left, press the key with <keycap>Shift</keycap>."
-msgstr "Ezker-goialdeko karaktererako, sakatu tekla <keycap>Maius</keycap> teklarekin."
-
-#: C/gswitchit.xml:172(para)
-msgid "For the character shown in the bottom right, press the key with the third level modifier."
-msgstr "Eskuin-behealdeko karaktererako, sakatu tekla hirugarren mailako aldatzailearekin."
-
-#: C/gswitchit.xml:173(para)
-msgid "For the character shown in the top right, press the key with <keycap>Shift</keycap> and the third level modifier."
-msgstr "Eskuin-goialdeko karaktererako, sakatu tekla, <keycap>Maius</keycap> eta hirugarren mailako aldatzailea."
-
-#: C/gswitchit.xml:175(para)
-msgid "By default, no key is assigned to act as a third-level modifier. You can assign a key to act as a third level modifier in the <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout Options Preferences</ulink>."
-msgstr "Lehenespenez, ez da teklarik esleitzen hirugarren mailako aldatzaile gisa jarduteko. Tekla bat hirugarren mailako aldatzaile gisa esleitzeko, erabili <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Teklatuaren diseinuaren aukera-hobespenak</ulink>."
-
-#: C/gswitchit.xml:181(title)
-msgid "Plugins"
-msgstr "Pluginak"
-
-#: C/gswitchit.xml:182(para)
-msgid "To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select <guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr "<guilabel>Teklatu-adierazlearen pluginak</guilabel> elkarrizketa irekitzeko, hautatu laster-menuko <guimenuitem>Pluginak</guimenuitem>. Uneko pluginak <guilabel>Plugin aktiboen</guilabel> arean ikusten dira."
-
-#: C/gswitchit.xml:187(term)
-msgid "Adding a New Plugin"
-msgstr "Pluginak gehitzea"
-
-#: C/gswitchit.xml:188(para)
-msgid "Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> window, select one of the plugins in the <guilabel>Available plugins</guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr "Sakatu <guibutton>Gehitu</guibutton>. <guilabel>Gehitu plugina</guilabel> leihoan, hautatu <guilabel>Erabilgarri dauden pluginak</guilabel> area, eta egin klik <guibutton>Ados</guibutton> botoian."
-
-#: C/gswitchit.xml:194(term)
-msgid "Removing a Plugin"
-msgstr "Pluginak kentzea"
-
-#: C/gswitchit.xml:195(para)
-msgid "Select the plugin in the <guilabel>Active plugins</guilabel> area that you do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr "Hautatu kendu nahi duzun plugina, <guilabel>Plugin aktiboak</guilabel> arean, eta hautatu <guibutton>Kendu</guibutton>."
-
-#: C/gswitchit.xml:200(term)
-msgid "Moving Items in the Plugin List"
-msgstr "Pluginen zerrendako elementuak lekuz aldatzea"
-
-#: C/gswitchit.xml:201(para)
-msgid "To move items up and down the plugin list in the <guilabel>Active plugins</guilabel> area, select the plugin you want to move, and click <guibutton>Up</guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the keyboard to move the selection point up and down."
-msgstr "<guilabel>Plugin aktiboen</guilabel> areako plugin-zerrendako elementuak gora eta behera mugitzeko, hautatu mugitu nahi duzun plugina, eta egin klik <guibutton>Gora</guibutton> edo <guibutton>Behera</guibutton> botoietan. Teklatuko gezi-teklak erabil ditzakezu hautapen-puntua gora eta behera mugitzeko."
-
-#: C/gswitchit.xml:208(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "Plugin baten propietateak aldatzea"
-
-#: C/gswitchit.xml:209(para)
-msgid "To change the properties of the plugins, select the plugin you want and click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr "Pluginen propietateak aldatzeko, hautatu nahi duzun plugina, eta egin klik <guibutton>Propietateak</guibutton> botoian. Plugin bakoitzak bere propietateak ditu."
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr "Hizkuntza Politikarako Sailburuordetza [email protected]<>, 2008."
-
diff --git a/gswitchit/help/fi/fi.po b/gswitchit/help/fi/fi.po
deleted file mode 100644
index 08036c63..00000000
--- a/gswitchit/help/fi/fi.po
+++ /dev/null
@@ -1,286 +0,0 @@
-# charpick's Finnish translation.
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# Jukka Heikkilä <[email protected]>, 2008.
-# Tommi Vainikainen <[email protected]> (Legal Notices), 2006.
-#
-
-msgid ""
-msgstr ""
-"Project-Id-Version: mate-applets-gswitchit\n"
-"POT-Creation-Date: 2008-04-04 04:07+0100\n"
-"PO-Revision-Date: 2008-04-04 118:12+0200\n"
-"Last-Translator: Jukka Heikkilä <[email protected]>\n"
-"Language-Team: Finnish <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "Näppäimistön asettelu -sovelman käyttöohje"
-
-#: C/gswitchit.xml:25(para)
-msgid "The Keyboard Indicator shows the active keyboard group and enables switching between different groups."
-msgstr "Näppäimistön asettelu näyttää aktiivisen näppäimistöryhmän ja mahdollistaa vaihdon eri näppäimistöryhmien välillä."
-
-#: C/gswitchit.xml:30(year) C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "Mate dokumentointiprojekti"
-
-#: C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "2004-08"
-
-#: C/gswitchit.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr ""
-"Tätä asiakirjaa saa kopioida, jakaa edelleen ja/tai muokata Free Software "
-"Foundationin julkaiseman GNU Free Documentation Licensen (GFDL) version 1.1 "
-"tai valinnaisesti myöhemmän version mukaisesti, ilman vaatimuksia "
-"muuttamattomista osioista ja etu- tai takakansiteksteistä. Kopion GFDL:stä "
-"voi nähdä napsauttamalla <ulink type=\"help\" url=\"ghelp:fdl\">tätä "
-"linkkiä</ulink>, tai lukemalla ohjeen mukana toimitetun COPYING-DOCS-nimisen "
-"tiedoston."
-
-#: C/gswitchit.xml:12(para)
-msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
-msgstr ""
-"Tämä käyttöohje on osa Maten käyttöohjekokoelmaa ja levitetään GFDL-"
-"lisenssin alaisena. Jos haluat levittää tätä käyttöohjetta erillään "
-"kokoelmasta, voit tehdä sen liittämällä lisenssin kopion ohjeen mukaan, "
-"kuten lisenssin luku 6 sanelee."
-
-#: C/gswitchit.xml:19(para)
-msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any MATE documentation, and the members of the MATE Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
-msgstr ""
-"Monet tuotteiden ja palveluiden nimet ovat tuotemerkkejä. Maten "
-"dokumentointiprojektissa nämä nimet pyritään kirjoittamaan suuraakkosin tai "
-"isolla alkukirjaimella, sikäli kun projektin jäsenet tietävät kyseisistä "
-"tuotemerkeistä."
-
-#: C/gswitchit.xml:35(para)
-msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-"ASIAKIRJA TARJOTAAN SELLAISENAAN, ILMAN MINKÄÄNLAISTA KIRJATTUA TAI "
-"KONKLUDENTTISTA RAJATONTA TAKUUTA ASIAKIRJAN TAI SEN MUOKATUN VERSION "
-"VIRHEETTÖMYYDESTÄ, SOPIVUUDESTA KAUPALLISEEN KÄYTTÖÖN TAI TIETTYYN "
-"KÄYTTÖTARKOITUKSEEN TAI LOUKKAAMATTOMUUDESTA. TÄYSI VASTUU ASIAKIRJAN TAI "
-"SEN MUOKATUN VERSION LAADUSTA, TARKKUUDESTA JA TOIMIVUUDESTA ON KÄYTTÄJÄLLÄ. "
-"JOS ASIAKIRJA TAI SEN MUOKATTU VERSIO OSOITTAUTUU JOLLAKIN TAVALLA "
-"VIRHEELLISEKSI, KÄYTTÄJÄ (EI ALKUPERÄINEN KIRJOITTAJA TAI MUU TEKIJÄ) VASTAA "
-"PALVELUJEN, KORJAUSTEN TAI OIKAISUJEN KUSTANNUKSISTA. TÄMÄ "
-"VASTUUVAPAUSLAUSEKE ON EROTTAMATON OSA LISENSSIÄ. ASIAKIRJAN TAI SEN "
-"MUOKATTUJEN VERSIOIDEN KÄYTTÖ ON SALLITTUA VAIN TÄMÄN VASTUUVAPAUSLAUSEKKEEN "
-"NOJALLA; SEKÄ"
-
-#: C/gswitchit.xml:55(para)
-msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-"MISSÄÄN OLOSUHTEISSA TAI MINKÄÄN OIKEUSLAITOKSEN ALAISUUDESSA, NIIN "
-"OIKEUSLOUKKAUKSISSA (MUKAAN LUKIEN HUOLIMATTOMUUS), SOPIMUS TAI MUUTOIN, "
-"ASIAKIRJAN TAI SEN MUOKATUN VERSION TEKIJÄ, ALKUPERÄINEN KIRJOITTAJA, KUKAAN "
-"AVUSTAJAISTA, KUKAAN LEVITTÄJÄ TAIKKA KUKAAN TARJOAJA EI OLE VASTUUSSA "
-"KENELLEKKÄÄN SUORASTA, EPÄSUORASTA, ERITYISESTÄ, TAPATURMAISESTA TAI "
-"VÄLILLISESTÄ VAHINGOSTA SISÄLTÄEN RAJOITUKSETTA VAHINGOT LIIKEARVON "
-"MENETYKSESTÄ, TYÖN KESKEYTYMISESTÄ, TIETOKONEVIRHEESTÄ TAI -HÄIRIÖSTÄ TAIKKA "
-"MISTÄÄN MUUSTA VAHINGOSTA TAI MENETYKSESTÄ, JOKA ILMENEE TAI LIITTYY "
-"ASIAKIRJAN TAI SEN MUOKATUN VERSION KÄYTTÖÖN EDES SILLOIN KUN OSAPUOLTA ON "
-"OLLUT TIETOINEN TÄLLAISEN VAHINGON MAHDOLLISUUDESTA."
-
-#: C/gswitchit.xml:28(para)
-msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
-msgstr ""
-"ASIAKIRJA SEKÄ MUOKATUT VERSIOT ASIAKIRJASTA TARJOTAAN GNU FREE "
-"DOCUMENTATION LICENSEN EHDOIN SEKÄ YMMÄRTÄEN ETTÄ: <placeholder-1/>"
-
-#: C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: C/gswitchit.xml:65(email)
-
-#: C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: C/gswitchit.xml:72(email)
-
-#: C/gswitchit.xml:89(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr "Tämä käyttöohje kuvaa Näppäimistön asettelu -sovelman version 2.8."
-
-#: C/gswitchit.xml:93(title)
-msgid "Feedback"
-msgstr "Palaute"
-
-#: C/gswitchit.xml:94(para)
-msgid "To report a bug or make a suggestion regarding the Keyboard Indicator applet or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "Ilmoittaaksesi viasta tai tehdäksesi ehdotuksen koskien Näppäimistön asettelu -sovellusta tai tätä käyttöohjetta, seuraa ohjeita <ulink url=\"ghelp:mate-feedback\" type=\"help\">Mate palautesivulla</ulink>."
-
-#: C/gswitchit.xml:103(primary)
-msgid "Keyboard Indicator"
-msgstr "Näppäimistön asettelu"
-
-#: C/gswitchit.xml:107(title)
-msgid "Introduction"
-msgstr "Johdanto"
-
-#: C/gswitchit.xml:109(para)
-msgid "<application>Keyboard Indicator</application> indicates the active keyboard group. The applet shows you which group you are currently using. Aside from the standard applet popup menu functions, the <application>Keyboard Indicator</application> applet popup menu allows you to launch the applet Preferences tool and to switch between language groups."
-msgstr "<application>Näppäimistön asettelu</application> -sovelma näyttää aktiivisen näppäimistöryhmän. Sovellus näyttää sinulle, mitä näppäimistöasettelua tällä hetkellä käytät. Poiketen normaalien sovelluksien alasvetovalikkojen funktioista, <application>Näppäimistön asettelu</application> -sovellus antaa mahdollisuuden käynnistää Asetustyökalun ja vaihtaa kieliryhmien välillä."
-
-#: C/gswitchit.xml:115(para)
-msgid "To add <application>Keyboard Indicator</application> to a panel, right-click on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select <application>Keyboard Indicator</application> in the <application>Add to the panel</application> dialog, then click <guibutton>OK</guibutton>. For more on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject\">Adding an Object to a Panel</ulink>."
-msgstr "Lisätäksesi <application>Näppäimistön asettelu</application> -sovelluksen paneeliin, paina hiiren oikeata näppäintä paneelin päällä ja valitse <guimenuitem>Lisää paneeliin</guimenuitem>. Valitse <application>Näppäimistön asettelu</application>, <application>Lisää paneeliin</application> -valintaikkunasta ja napsauta <guibutton>OK</guibutton>."
-
-#: C/gswitchit.xml:121(para)
-msgid "To open the <application>Keyboard</application> preference tool, choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup menu. You may need to go to this dialog to be able to configure the keyboard (choose model, layouts, options, etc.). For help with setting Keyboard preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring Keyboard Preferences</ulink>."
-msgstr "Avataksesi <application>Näppäimistön</application> asetustyökalun, valitse sovelluksen alasvetovalikosta <guimenuitem>Näppäimistön asetukset</guimenuitem>. Voit joutua käyttämään tätä valikkoikkunaa muuttaaksesi näppäimistön asetuksia (valitaksesi mallin, asettelun, asetukset jne.). Löytääksesi apua koskien näppäimistön asetuksia, katso <ulink url=\"ghelp:user-guide?prefs-keyboard\">Näppäimistön asetuksien muuttaminen</ulink>."
-
-#: C/gswitchit.xml:131(title)
-msgid "Switching Language"
-msgstr "Kielen vaihtaminen"
-
-#: C/gswitchit.xml:133(para)
-msgid "First, you must know that a group is a set of characters, whether it be for a language or non-language-related set of characters, like a dvorak. Each language may have more than one subset, and each subset is called a group. There are many ways you can switch the group that you are using on your keyboard."
-msgstr "Ensimmäiseksi sinun täytyy tietää, että ryhmä on yhteen kuuluva nippu merkkejä, jotka ovat kieleen liittyviä tai ei kieleen liittyviä merkkejä, kuten Dvorak. Jokaisella kielellä saattaa olla useampikin, kuin yksi merkistöosajoukko ja näitä merkistöosajoukkoja kutsutaan ryhmiksi. Löytyy monia tapoja, kuinka voit vaihtaa käytössä olevaa näppäimistöryhmää."
-
-#: C/gswitchit.xml:141(term)
-msgid "Mouse Click"
-msgstr "Hiiren napsautus"
-
-#: C/gswitchit.xml:142(para)
-msgid "You can switch between groups with a single click on the applet's panel icon. The groups switch in a cycle determined by the current configuration."
-msgstr "Voit vaihtaa ryhmien välillä kerta-napsautuksella paneelissa olevasta sovelluksen kuvakkeesta. Ryhmät vaihtuvat kiertävästi riippuen sen hetkisistä asetuksista."
-
-#: C/gswitchit.xml:147(term)
-msgid "Popup Menu"
-msgstr "Ponnahdysvalikko"
-
-#: C/gswitchit.xml:148(para)
-msgid "To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the popup menu. From there, choose the group you want to switch to."
-msgstr "Valitaksesi tietyn ryhmän, valitse ponnahdusvalikosta <guisubmenu>Ryhmät</guisubmenu> -valinta. Sieltä voit valita ryhmän, johonka haluat vaihtaa."
-
-#: C/gswitchit.xml:153(term)
-msgid "Keyboard"
-msgstr "Näppäimistö"
-
-#: C/gswitchit.xml:154(para)
-msgid "In the <application>Keyboard</application> preference tool, you can set which key that you would like to use to switch groups on your keyboard. Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup menu, and choose the key you want to use in the <ulink url=\"ghelp:user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr "<application>Näppäimistö</application> -asetustyökalun avulla voit asettaa haluamasi pikanäppäimen, millä voit vaihtaa näppäimistösi ryhmiä. Valitse <guimenuitem>Näppäimistön asetukset</guimenuitem> -valinta sovelluksen ponnahdusvalikosta ja voit valita, <ulink url=\"ghelp:user-guide#prefs-keyboard-layoutoptions\"><guilabel>Näppäimistön asetukset</guilabel></ulink> -välilehdeltä, <guilabel>Ryhmien vaihto/lukitustoiminta</guilabel> -valinnan alta, mitä näppäintä haluat käyttää."
-
-#: C/gswitchit.xml:161(para)
-msgid "To add other layouts to the list, open the <application>Keyboard</application> preference tool. Choose other layouts in the <ulink url=\"ghelp:user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr "Lisätäksesi listaan muita asetteluja, avaa <application>Näppäimistö</application> -asetustyökalu. Valitse muut asettelut <ulink url=\"ghelp:user-guide#prefs-keyboard-layouts\"><guilabel>Asettelut</guilabel> -välilehdeltä</ulink>."
-
-#: C/gswitchit.xml:165(title)
-msgid "Layout View"
-msgstr "Asettelu -näkymä"
-
-#: C/gswitchit.xml:166(para)
-msgid "Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to see a diagram of your current keyboard layout."
-msgstr "Valitse <guimenuitem>Näytä nykyinen asettelu</guimenuitem> -valinta sovelluksen ponnahdusvalikosta nähdäksesi tämänhetkisen näppäimistösi asettelun."
-
-#: C/gswitchit.xml:167(para)
-msgid "In the <guilabel>Layout View</guilabel> window, press a key on your keyboard to highlight its representation in the diagram."
-msgstr "<guilabel>Näppäimistön asettelu</guilabel> -ikkunassa painaessasi näppäimistösi näppäimiä, näet asettelussa siitä vasteen."
-
-#: C/gswitchit.xml:168(para)
-msgid "Each key in the diagram has up to four characters. These can be produced with different keyboard modifiers, as follows:"
-msgstr "Jokaisessa asetelman näppäimessä on jopa neljä merkkiä. Nämä voidaan tuottaa eri näppäimistö muuttujien avulla seuraavasti:"
-
-#: C/gswitchit.xml:170(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr "Alhaalla vasemmalla olevan merkin saat painamalla pelkkää näppäintä yksinään."
-
-#: C/gswitchit.xml:171(para)
-msgid "For the character shown in the top left, press the key with <keycap>Shift</keycap>."
-msgstr "Ylävasemmalla olevan merkin saat painamalla <keycap>Vaihto</keycap> -näppäintä ja merkkinäppäintä."
-
-#: C/gswitchit.xml:172(para)
-msgid "For the character shown in the bottom right, press the key with the third level modifier."
-msgstr "Alaoikealla olevan merkin saat painamalla kolmannen tason valitsija -näppäintä ja merkkinäppäintä."
-
-#: C/gswitchit.xml:173(para)
-msgid "For the character shown in the top right, press the key with <keycap>Shift</keycap> and the third level modifier."
-msgstr "Yläoikealla olevan merkin saat painamalla <keycap>Vaihto</keycap> -näppäintä ja kolmannen tason valitsija -näppäintä, sekä merkkinäppäintä."
-
-#: C/gswitchit.xml:175(para)
-msgid "By default, no key is assigned to act as a third-level modifier. You can assign a key to act as a third level modifier in the <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout Options Preferences</ulink>."
-msgstr "Kolmannen tason valitsija -näppäintä ei ole asetettu oletuksena. Voit määrittää näppäimen toimimaan kolmannen tason muuttujanäppäimenä <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Näppäimistön asettelujen valinnoista</ulink>."
-
-#: C/gswitchit.xml:181(title)
-msgid "Plugins"
-msgstr "Liitännäiset"
-
-#: C/gswitchit.xml:182(para)
-msgid "To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select <guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr "Avataksesi <guilabel>Näppäimistön asettelu liitennäiset</guilabel> -valintaikkunan, valitse <guimenuitem>Liitännäiset</guimenuitem> -valinta alasvetovalikosta. Senhetkiset liitenäiset näet kohdasta <guilabel>Aktiiviset liitännäiset</guilabel>."
-
-#: C/gswitchit.xml:187(term)
-msgid "Adding a New Plugin"
-msgstr "Uuden liitännäisen lisääminen"
-
-#: C/gswitchit.xml:188(para)
-msgid "Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> window, select one of the plugins in the <guilabel>Available plugins</guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr "Napsauta <guibutton>Lisää</guibutton>. Valitse <guilabel>Lisää liitännäinen</guilabel> -ikkunassa yksi liitännäisistä, jotka on <guilabel>Käytettävissä olevat liitännäiset</guilabel> -alueella ja valitse <guibutton>OK</guibutton> -painiketta."
-
-#: C/gswitchit.xml:194(term)
-msgid "Removing a Plugin"
-msgstr "Liitännäisen poisto"
-
-#: C/gswitchit.xml:195(para)
-msgid "Select the plugin in the <guilabel>Active plugins</guilabel> area that you do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr "Valitse poistettava liitännäinen <guilabel>Aktiiviset liitännäiset</guilabel> -alueelta ja napsauta <guibutton>Poista</guibutton> -painiketta."
-
-#: C/gswitchit.xml:200(term)
-msgid "Moving Items in the Plugin List"
-msgstr "Liitännäisten siirtäminen listassa"
-
-#: C/gswitchit.xml:201(para)
-msgid "To move items up and down the plugin list in the <guilabel>Active plugins</guilabel> area, select the plugin you want to move, and click <guibutton>Up</guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the keyboard to move the selection point up and down."
-msgstr "Siirtääksesi liitännäisiä ylös ja alas <guilabel>Aktiivisten liitännäisten</guilabel> -listassa, valitse liitännäinen, jota haluat siirtää ja napsauta <guibutton>Ylös-</guibutton> tai <guibutton>Alas</guibutton> -painiketta. Voit siirtää valitsinta näppäimistön nuolinäppäimillä ylös ja alas."
-
-#: C/gswitchit.xml:208(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "Liitännäisten asetuksien muuttaminen"
-
-#: C/gswitchit.xml:209(para)
-msgid "To change the properties of the plugins, select the plugin you want and click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr "Muuttaaksesi liitännäisten asetuksia, valitse haluamasi liitännäinen ja napsauta <guibutton>Asetukset</guibutton> -painiketta. Asetukset vaihtelevat liitännäisestä riippuen."
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr ""
-"Jukka Heikkilä <[email protected]>, 2008\n"
-"Tommi Vainikainen <[email protected]> (Legal Notices), 2006"
diff --git a/gswitchit/help/fr/fr.po b/gswitchit/help/fr/fr.po
deleted file mode 100644
index e800d9d2..00000000
--- a/gswitchit/help/fr/fr.po
+++ /dev/null
@@ -1,491 +0,0 @@
-# French translation of applets-gswitchit documentation.
-# Copyright (C) 2005-2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gswitchit applet
-# documentation.
-#
-# Christophe Bliard <[email protected]>, 2005, 2006.
-# Vincent Untz <[email protected]>, 2005.
-# Jonathan Ernst <[email protected]>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gswitchit fr\n"
-"POT-Creation-Date: 2006-11-19 13:04+0100\n"
-"PO-Revision-Date: 2006-07-25 20:48+0100\n"
-"Last-Translator: Christophe Bliard <[email protected]>\n"
-"Language-Team: MATE French Team <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "Indicateur de claviers"
-
-#: ../C/gswitchit.xml:25(para)
-msgid ""
-"The Keyboard Indicator shows the active keyboard group and enables switching "
-"between different groups."
-msgstr ""
-"L'Indicateur de claviers affiche le groupe de clavier actif et permet de "
-"passer d'un groupe à un autre."
-
-#: ../C/gswitchit.xml:30(year) ../C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: ../C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: ../C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: ../C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "Projet de documentation MATE"
-
-#: ../C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: ../C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "08/2004"
-
-#: ../C/gswitchit.xml:2(para)
-msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-"later version published by the Free Software Foundation with no Invariant "
-"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
-"in the file COPYING-DOCS distributed with this manual."
-msgstr ""
-"Permission vous est donnée de copier, distribuer et/ou modifier ce document "
-"selon les termes de la Licence GNU Free Documentation License, Version 1.1 "
-"ou ultérieure publiée par la Free Software Foundation sans section "
-"inaltérable, sans texte de première page de couverture ni texte de dernière "
-"page de couverture. Vous trouverez un exemplaire de cette licence en suivant "
-"ce <ulink type=\"help\" url=\"ghelp:fdl\">lien</ulink> ou dans le fichier "
-"COPYING-DOCS fourni avec le présent manuel."
-
-#: ../C/gswitchit.xml:12(para)
-msgid ""
-"This manual is part of a collection of MATE manuals distributed under the "
-"GFDL. If you want to distribute this manual separately from the collection, "
-"you can do so by adding a copy of the license to the manual, as described in "
-"section 6 of the license."
-msgstr ""
-"Ce manuel fait partie de la collection de manuels MATE distribués selon les "
-"termes de la licence de documentation libre GNU. Si vous souhaitez "
-"distribuer ce manuel indépendamment de la collection, vous devez joindre un "
-"exemplaire de la licence au document, comme indiqué dans la section 6 de "
-"celle-ci."
-
-#: ../C/gswitchit.xml:19(para)
-msgid ""
-"Many of the names used by companies to distinguish their products and "
-"services are claimed as trademarks. Where those names appear in any MATE "
-"documentation, and the members of the MATE Documentation Project are made "
-"aware of those trademarks, then the names are in capital letters or initial "
-"capital letters."
-msgstr ""
-"La plupart des noms utilisés par les entreprises pour leurs produits et "
-"leurs services sont des marques déposées. Lorsque ces noms apparaissent dans "
-"la documentation MATE et que les membres du projet de documentation MATE "
-"sont informés de l'existence de ces marques déposées, ces noms apparaissent "
-"en majuscules, ou la première lettre en majuscule."
-
-#: ../C/gswitchit.xml:35(para)
-msgid ""
-"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-"LE PRÉSENT DOCUMENT EST FOURNI « TEL QUEL », SANS AUCUNE GARANTIE, EXPRESSE "
-"OU IMPLICITE, Y COMPRIS, ET SANS LIMITATION, LES GARANTIES DE "
-"MARCHANDABILITÉ, D'ADÉQUATION À UN OBJECTIF PARTICULIER OU DE NON INFRACTION "
-"DU DOCUMENT OU DE SA VERSION MODIFIÉE. L'UTILISATEUR ASSUME TOUT RISQUE "
-"RELATIF À LA QUALITÉ, À LA PERTINENCE ET À LA PERFORMANCE DU DOCUMENT OU DE "
-"SA VERSION DE MISE À JOUR. SI LE DOCUMENT OU SA VERSION MODIFIÉE S'AVÉRAIT "
-"DÉFECTUEUSE, L'UTILISATEUR (ET NON LE RÉDACTEUR INITIAL, L'AUTEUR, NI TOUT "
-"AUTRE PARTICIPANT) ENDOSSERA LES COÛTS DE TOUTE INTERVENTION, RÉPARATION OU "
-"CORRECTION NÉCESSAIRE. CETTE DÉNÉGATION DE RESPONSABILITÉ CONSTITUE UNE "
-"PARTIE ESSENTIELLE DE CETTE LICENCE. AUCUNE UTILISATION DE CE DOCUMENT OU DE "
-"SA VERSION MODIFIÉE N'EST AUTORISÉE AUX TERMES DU PRÉSENT ACCORD, EXCEPTÉ "
-"SOUS CETTE DÉNÉGATION DE RESPONSABILITÉ ; "
-
-#: ../C/gswitchit.xml:55(para)
-msgid ""
-"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-"POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-"EN AUCUNE CIRCONSTANCE ET SOUS AUCUNE INTERPRÉTATION DE LA LOI, QU'IL "
-"S'AGISSE DE RESPONSABILITÉ CIVILE (Y COMPRIS LA NÉGLIGENCE), CONTRACTUELLE "
-"OU AUTRE, L'AUTEUR, LE RÉDACTEUR INITIAL, TOUT PARTICIPANT ET TOUT "
-"DISTRIBUTEUR DE CE DOCUMENTOU DE SA VERSION DE MISE À JOUR AINSI QUE TOUT "
-"FOURNISSEUR DE QUELQUE PARTIE QUE CE SOIT NE POURRONT ÊTRE TENUS "
-"RESPONSABLES À L'ÉGARD DE QUICONQUE POUR TOUT DOMMAGE DIRECT, INDIRECT, "
-"PARTICULIER OU ACCIDENTEL DE TOUT TYPE Y COMPRIS, SANS LIMITATION, LES "
-"DOMMAGES LIÉS À LA PERTE DE CLIENTÈLE, AUX ARRÊTS DE TRAVAIL, AUX "
-"DÉFAILLANCES ET AUX DYSFONCTIONNEMENTS INFORMATIQUES OU TOUT AUTRE DOMMAGE "
-"OU PERTE LIÉE À L'UTILISATION DU PRÉSENT DOCUMENT ET DE SES VERSIONS DE MISE "
-"À JOUR, ET CE MÊME SI CES PARTIES ONT ÉTÉ INFORMÉES DE LA POSSIBILITÉ DE "
-"TELS DOMMAGES."
-
-#: ../C/gswitchit.xml:28(para)
-msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-"<placeholder-1/>"
-msgstr ""
-"LE PRÉSENT DOCUMENT ET SES VERSIONS DE MISE À JOUR SONT FOURNIS SOUS LES "
-"CONDITIONS DE L'ACCORD DE LICENCE DE DOCUMENTATION LIBRE GNU, SACHANT QUE : "
-"<placeholder-1/>"
-
-#: ../C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: ../C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: ../C/gswitchit.xml:65(email)
-
-#: ../C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: ../C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: ../C/gswitchit.xml:72(email)
-
-#: ../C/gswitchit.xml:89(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr "Ce manuel documente la version 2.8 de l'applet Indicateur de claviers."
-
-#: ../C/gswitchit.xml:93(title)
-msgid "Feedback"
-msgstr "Votre avis"
-
-#: ../C/gswitchit.xml:94(para)
-msgid ""
-"To report a bug or make a suggestion regarding the Keyboard Indicator applet "
-"or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
-"feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr ""
-"Pour rapporter un bogue ou émettre une suggestion concernant le visionneur "
-"de journaux système ou ce manuel, procédez comme indiqué sur la <ulink url="
-"\"ghelp:mate-feedback\" type=\"help\">Page de réactions sur MATE</ulink>."
-
-#: ../C/gswitchit.xml:103(primary)
-msgid "Keyboard Indicator"
-msgstr "Indicateur de claviers"
-
-#: ../C/gswitchit.xml:107(title)
-msgid "Introduction"
-msgstr "Introduction"
-
-#: ../C/gswitchit.xml:109(para)
-msgid ""
-"<application>Keyboard Indicator</application> indicates the active keyboard "
-"group. The applet shows you which group you are currently using. Aside from "
-"the standard applet popup menu functions, the <application>Keyboard "
-"Indicator</application> applet popup menu allows you to launch the applet "
-"Preferences tool and to switch between language groups."
-msgstr ""
-"<application>Indicateur de claviers</application> indique le groupe de "
-"clavier actif. L'applet affiche le groupe que vous utilisez actuellement. En "
-"plus des fonctions standard proposées dans le menu contextuel de chaque "
-"applet, le menu de <application>Indicateur de claviers</application> vous "
-"permet de lancer la fenêtre de préférences de l'applet et de passer d'un "
-"groupe de langue à un autre."
-
-#: ../C/gswitchit.xml:115(para)
-msgid ""
-"To add <application>Keyboard Indicator</application> to a panel, right-click "
-"on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select "
-"<application>Keyboard Indicator</application> in the <application>Add to the "
-"panel</application> dialog, then click <guibutton>OK</guibutton>. For more "
-"on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject"
-"\">Adding an Object to a Panel</ulink>."
-msgstr ""
-"Pour ajouter l'applet <application>Indicateur de claviers</application> à un "
-"tableau de bord, cliquez avec le bouton droit sur celui-ci, puis choisissez "
-"<guimenuitem>Ajouter au tableau de bord</guimenuitem>. Sélectionnez "
-"<application>Indicateur de claviers</application> dans la boîte de dialogue "
-"<application>Ajouter au tableau de bord</application>, puis cliquez sur le "
-"bouton <guibutton>Ajouter</guibutton>. Pour plus d'informations\t, référez-"
-"vous à <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject"
-"\">Ajouter un objet au tableau de bord</ulink>."
-
-#: ../C/gswitchit.xml:121(para)
-msgid ""
-"To open the <application>Keyboard</application> preference tool, choose "
-"<guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup "
-"menu. You may need to go to this dialog to be able to configure the keyboard "
-"(choose model, layouts, options, etc.). For help with setting Keyboard "
-"preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring "
-"Keyboard Preferences</ulink>."
-msgstr ""
-"Pour ouvrir les préférences <application>Clavier</application>, choisissez "
-"<guimenuitem>Ouvrir les préférences du clavier</guimenuitem> dans le menu "
-"contextuel de l'applet. Vous aurez peut-être besoin d'utiliser cette boîte "
-"de dialogue pour configurer le clavier (choisir le modèle, l'agencements, "
-"les options, etc.). Pour obtenir de l'aide sur la définition des préférences "
-"du clavier, référez-vous à <ulink url=\"ghelp:user-guide?prefs-keyboard"
-"\">Configuration des propriétés du clavier</ulink>."
-
-#: ../C/gswitchit.xml:131(title)
-msgid "Switching Language"
-msgstr "Changement de langue"
-
-#: ../C/gswitchit.xml:133(para)
-msgid ""
-"First, you must know that a group is a set of characters, whether it be for "
-"a language or non-language-related set of characters, like a dvorak. Each "
-"language may have more than one subset, and each subset is called a group. "
-"There are many ways you can switch the group that you are using on your "
-"keyboard."
-msgstr ""
-"Tout d'abord, il faut savoir qu'un groupe est un ensemble de caractères, que "
-"cet ensemble soit relatif à une langue ou pas, comme avec le dvorak. Chaque "
-"langue peut avoir plusieurs sous-ensembles, et chaque sous-ensemble est "
-"appelé un groupe. Vous pouvez changer le groupe que vous utilisez avec votre "
-"clavier de plusieurs façons :"
-
-#: ../C/gswitchit.xml:141(term)
-msgid "Mouse Click"
-msgstr "Clic de souris"
-
-#: ../C/gswitchit.xml:142(para)
-msgid ""
-"You can switch between groups with a single click on the applet's panel "
-"icon. The groups switch in a cycle determined by the current configuration."
-msgstr ""
-"Vous pouvez passer d'un groupe à un autre d'un simple clic sur l'icône de "
-"l'applet. Les groupes passent de l'un à l'autre, en boucle, dans un ordre "
-"déterminé par la configuration ;"
-
-#: ../C/gswitchit.xml:147(term)
-msgid "Popup Menu"
-msgstr "Menu contextuel"
-
-#: ../C/gswitchit.xml:148(para)
-msgid ""
-"To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the "
-"popup menu. From there, choose the group you want to switch to."
-msgstr ""
-"Pour utiliser un groupe précis, sélectionnez <guisubmenu>Groupes</"
-"guisubmenu> à partir du menu contextuel. Ensuite, choisissez le groupe à "
-"utiliser ;"
-
-#: ../C/gswitchit.xml:153(term)
-msgid "Keyboard"
-msgstr "Clavier"
-
-#: ../C/gswitchit.xml:154(para)
-msgid ""
-"In the <application>Keyboard</application> preference tool, you can set "
-"which key that you would like to use to switch groups on your keyboard. "
-"Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet "
-"popup menu, and choose the key you want to use in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</"
-"guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr ""
-"Dans les préférences <application>Clavier</application>, vous pouvez définir "
-"quelle touche utiliser pour passer d'un groupe à un autre avec votre "
-"clavier. Choisissez <guimenuitem>Ouvrir les préférences du clavier</"
-"guimenuitem> à partir du menu contextuel de l'applet, et sélectionnez la "
-"touche à utilisez dans l'onglet <ulink url=\"ghelp:user-guide#prefs-keyboard-"
-"layoutoptions\"><guilabel>Options de l'agencement</guilabel></ulink>, sous "
-"<guilabel>Combinaisons pour changer de groupe</guilabel>."
-
-#: ../C/gswitchit.xml:161(para)
-msgid ""
-"To add other layouts to the list, open the <application>Keyboard</"
-"application> preference tool. Choose other layouts in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr ""
-"Pour ajouter d'autres agencements à la liste, ouvrez les préférences "
-"<application>Clavier</application>. Choisissez d'autres agencements dans "
-"<ulink url=\"ghelp:user-guide#prefs-keyboard-layouts\">l'onglet "
-"<guilabel>Agencements</guilabel></ulink>."
-
-#: ../C/gswitchit.xml:165(title)
-msgid "Layout View"
-msgstr "Vue de l'agencement"
-
-#: ../C/gswitchit.xml:166(para)
-msgid ""
-"Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to "
-"see a diagram of your current keyboard layout."
-msgstr ""
-"Choisissez <guimenuitem>Vue de l'agencement</guimenuitem> depuis le menu "
-"contextuel de l'applet pour afficher un schéma de l'agencement actuel de "
-"votre clavier."
-
-#: ../C/gswitchit.xml:167(para)
-msgid ""
-"In the <guilabel>Layout View</guilabel> window, press a key on your keyboard "
-"to highlight its representation in the diagram."
-msgstr ""
-"Dans la fenêtre <guilabel>Agencement du clavier</guilabel>, appuyez sur une "
-"touche de votre clavier pour mettre en surbrillance sa représentation dans "
-"le schéma."
-
-#: ../C/gswitchit.xml:168(para)
-msgid ""
-"Each key in the diagram has up to four characters. These can be produced "
-"with different keyboard modifiers, as follows:"
-msgstr ""
-"Chaque touche du schéma possède jusqu'à quatre caractères. Vous pouvez "
-"entrer ces caractères avec différentes combinaisons de touches :"
-
-#: ../C/gswitchit.xml:170(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr ""
-"Pour le caractère du coin inférieur gauche, appuyez simplement sur la touche."
-
-#: ../C/gswitchit.xml:171(para)
-msgid ""
-"For the character shown in the top left, press the key with <keycap>Shift</"
-"keycap>."
-msgstr ""
-"Pour le caractère du coin supérieur gauche, appuyez sur la touche en "
-"maintenant la touche <keycap>Majuscule</keycap> enfoncée."
-
-#: ../C/gswitchit.xml:172(para)
-msgid ""
-"For the character shown in the bottom right, press the key with the third "
-"level modifier."
-msgstr ""
-"Pour le caractère du coin inférieur droit, appuyez sur la touche en "
-"maintenant la touche <keycap>Alt Gr</keycap> enfoncée."
-
-#: ../C/gswitchit.xml:173(para)
-msgid ""
-"For the character shown in the top right, press the key with <keycap>Shift</"
-"keycap> and the third level modifier."
-msgstr ""
-"Pour le caractère du coin inférieur droit, appuyez sur la touche en "
-"maintenant à la fois les touches <keycap>Majuscule</keycap> et <keycap>Alt "
-"Gr</keycap> enfoncées."
-
-#: ../C/gswitchit.xml:175(para)
-msgid ""
-"By default, no key is assigned to act as a third-level modifier. You can "
-"assign a key to act as a third level modifier in the <ulink type=\"help\" "
-"url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout "
-"Options Preferences</ulink>."
-msgstr ""
-"Par défaut, le sélecteur du 3ème niveau est affecté à la touche <keycap>Alt "
-"Gr</keycap>. Vous pouvez utiliser une autre touche dans les <ulink type="
-"\"help\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Préférences "
-"des options d'agencement du clavier</ulink>."
-
-#: ../C/gswitchit.xml:181(title)
-msgid "Plugins"
-msgstr "Greffons"
-
-#: ../C/gswitchit.xml:182(para)
-msgid ""
-"To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select "
-"<guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins "
-"are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr ""
-"Pour ouvrir la boîte de dialogue <guilabel>Greffons d'indicateur de "
-"claviers</guilabel>, sélectionnez <guimenuitem>Greffons</guimenuitem> à "
-"partir du menu contextuel. Vos plugins utilisés actuellement sont affichés "
-"dans la zone <guilabel>Greffons actifs</guilabel>."
-
-#: ../C/gswitchit.xml:187(term)
-msgid "Adding a New Plugin"
-msgstr "Ajout d'un nouveau greffon"
-
-#: ../C/gswitchit.xml:188(para)
-msgid ""
-"Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> "
-"window, select one of the plugins in the <guilabel>Available plugins</"
-"guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr ""
-"Cliquez sur <guibutton>Ajouter</guibutton>. Dans la fenêtre "
-"<guilabel>Ajouter un greffon</guilabel>, sélectionnez l'un des greffons de "
-"la zone <guilabel>Greffons disponibles</guilabel> et cliquez sur le bouton "
-"<guibutton>Valider</guibutton>."
-
-#: ../C/gswitchit.xml:194(term)
-msgid "Removing a Plugin"
-msgstr "Retrait d'un greffon"
-
-#: ../C/gswitchit.xml:195(para)
-msgid ""
-"Select the plugin in the <guilabel>Active plugins</guilabel> area that you "
-"do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr ""
-"Sélectionnez le greffon dont vous ne voulez plus dans la zone "
-"<guilabel>Greffons actifs</guilabel> et cliquez sur <guibutton>Enlever</"
-"guibutton>."
-
-#: ../C/gswitchit.xml:200(term)
-msgid "Moving Items in the Plugin List"
-msgstr "Déplacement d'éléments dans la liste des greffons"
-
-#: ../C/gswitchit.xml:201(para)
-msgid ""
-"To move items up and down the plugin list in the <guilabel>Active plugins</"
-"guilabel> area, select the plugin you want to move, and click <guibutton>Up</"
-"guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the "
-"keyboard to move the selection point up and down."
-msgstr ""
-"Pour monter ou descendre des éléments dans la liste des greffons de la zone "
-"<guilabel>Greffons actifs</guilabel>, sélectionnez le greffon à déplacer, et "
-"cliquez sur <guibutton>Monter</guibutton> ou <guibutton>Descendre</"
-"guibutton>. Vous pouvez utiliser les touches fléchées du clavier pour "
-"déplacer la sélection."
-
-#: ../C/gswitchit.xml:208(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "Changement des propriétés d'un greffon"
-
-#: ../C/gswitchit.xml:209(para)
-msgid ""
-"To change the properties of the plugins, select the plugin you want and "
-"click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr ""
-"Pour changer les propriétés d'un greffon, sélectionnez le et cliquez sur "
-"<guibutton>Propriétés</guibutton>. Les propriétés varient suivant chaque "
-"greffon."
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: ../C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr ""
-"Christophe Bliard <[email protected]>, 2005, 2006.\n"
-"Vincent Untz <[email protected]>, 2005.\n"
-"Jonathan Ernst <[email protected]>, 2006."
diff --git a/gswitchit/help/gswitchit.omf.in b/gswitchit/help/gswitchit.omf.in
deleted file mode 100644
index 5209b5b8..00000000
--- a/gswitchit/help/gswitchit.omf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omf>
- <resource>
- <subject category="GNOME|Applets|Utility"/>
- <type>user's guide</type>
- <relation seriesid="ba45ca86-0560-11d9-936c-b93f52abd21f"/>
- <rights type="GNU FDL" license.version="1.1" holder="Angela Boyle"/>
- </resource>
-</omf>
diff --git a/gswitchit/help/oc/oc.po b/gswitchit/help/oc/oc.po
deleted file mode 100644
index 554dbc35..00000000
--- a/gswitchit/help/oc/oc.po
+++ /dev/null
@@ -1,361 +0,0 @@
-# Translation of oc.po to Occitan
-# Occitan translation of applets-gswitchit documentation.
-# Copyright (C) 2005-2006, 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gswitchit applet
-# documentation.
-#
-# Yannig MARCHEGAY ([email protected]> - 2006-2007
-#
-# Yannig Marchegay (Kokoyaya) <[email protected]>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: oc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-22 12:13+0100\n"
-"PO-Revision-Date: 2007-11-20 14:30+0100\n"
-"Last-Translator: Yannig Marchegay (Kokoyaya) <[email protected]>\n"
-"Language-Team: Occitan <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);X-Generator: KBabel 1.11.4\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr ""
-
-#: C/gswitchit.xml:25(para)
-msgid ""
-"The Keyboard Indicator shows the active keyboard group and enables switching "
-"between different groups."
-msgstr ""
-
-#: C/gswitchit.xml:30(year) C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "Projècte de documentacion de MATE"
-
-#: C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "08/2004"
-
-#: C/gswitchit.xml:2(para)
-msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-"later version published by the Free Software Foundation with no Invariant "
-"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
-"in the file COPYING-DOCS distributed with this manual."
-msgstr ""
-
-#: C/gswitchit.xml:12(para)
-msgid ""
-"This manual is part of a collection of MATE manuals distributed under the "
-"GFDL. If you want to distribute this manual separately from the collection, "
-"you can do so by adding a copy of the license to the manual, as described in "
-"section 6 of the license."
-msgstr ""
-
-#: C/gswitchit.xml:19(para)
-msgid ""
-"Many of the names used by companies to distinguish their products and "
-"services are claimed as trademarks. Where those names appear in any MATE "
-"documentation, and the members of the MATE Documentation Project are made "
-"aware of those trademarks, then the names are in capital letters or initial "
-"capital letters."
-msgstr ""
-
-#: C/gswitchit.xml:35(para)
-msgid ""
-"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-
-#: C/gswitchit.xml:55(para)
-msgid ""
-"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-"POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-
-#: C/gswitchit.xml:28(para)
-msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-"<placeholder-1/>"
-msgstr ""
-
-#: C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: C/gswitchit.xml:65(email)
-
-#: C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: C/gswitchit.xml:72(email)
-
-#: C/gswitchit.xml:89(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr ""
-
-#: C/gswitchit.xml:93(title)
-msgid "Feedback"
-msgstr ""
-
-#: C/gswitchit.xml:94(para)
-msgid ""
-"To report a bug or make a suggestion regarding the Keyboard Indicator applet "
-"or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
-"feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr ""
-
-#: C/gswitchit.xml:103(primary)
-msgid "Keyboard Indicator"
-msgstr "Indicador de clavièr"
-
-#: C/gswitchit.xml:107(title)
-msgid "Introduction"
-msgstr "Introduccion"
-
-#: C/gswitchit.xml:109(para)
-msgid ""
-"<application>Keyboard Indicator</application> indicates the active keyboard "
-"group. The applet shows you which group you are currently using. Aside from "
-"the standard applet popup menu functions, the <application>Keyboard "
-"Indicator</application> applet popup menu allows you to launch the applet "
-"Preferences tool and to switch between language groups."
-msgstr ""
-
-#: C/gswitchit.xml:115(para)
-msgid ""
-"To add <application>Keyboard Indicator</application> to a panel, right-click "
-"on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select "
-"<application>Keyboard Indicator</application> in the <application>Add to the "
-"panel</application> dialog, then click <guibutton>OK</guibutton>. For more "
-"on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject"
-"\">Adding an Object to a Panel</ulink>."
-msgstr ""
-
-#: C/gswitchit.xml:121(para)
-msgid ""
-"To open the <application>Keyboard</application> preference tool, choose "
-"<guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup "
-"menu. You may need to go to this dialog to be able to configure the keyboard "
-"(choose model, layouts, options, etc.). For help with setting Keyboard "
-"preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring "
-"Keyboard Preferences</ulink>."
-msgstr ""
-
-#: C/gswitchit.xml:131(title)
-msgid "Switching Language"
-msgstr ""
-
-#: C/gswitchit.xml:133(para)
-msgid ""
-"First, you must know that a group is a set of characters, whether it be for "
-"a language or non-language-related set of characters, like a dvorak. Each "
-"language may have more than one subset, and each subset is called a group. "
-"There are many ways you can switch the group that you are using on your "
-"keyboard."
-msgstr ""
-
-#: C/gswitchit.xml:141(term)
-msgid "Mouse Click"
-msgstr ""
-
-#: C/gswitchit.xml:142(para)
-msgid ""
-"You can switch between groups with a single click on the applet's panel "
-"icon. The groups switch in a cycle determined by the current configuration."
-msgstr ""
-
-#: C/gswitchit.xml:147(term)
-msgid "Popup Menu"
-msgstr ""
-
-#: C/gswitchit.xml:148(para)
-msgid ""
-"To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the "
-"popup menu. From there, choose the group you want to switch to."
-msgstr ""
-
-#: C/gswitchit.xml:153(term)
-msgid "Keyboard"
-msgstr "Clavièr"
-
-#: C/gswitchit.xml:154(para)
-msgid ""
-"In the <application>Keyboard</application> preference tool, you can set "
-"which key that you would like to use to switch groups on your keyboard. "
-"Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet "
-"popup menu, and choose the key you want to use in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</"
-"guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr ""
-
-#: C/gswitchit.xml:161(para)
-msgid ""
-"To add other layouts to the list, open the <application>Keyboard</"
-"application> preference tool. Choose other layouts in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr ""
-
-#: C/gswitchit.xml:165(title)
-msgid "Layout View"
-msgstr ""
-
-#: C/gswitchit.xml:166(para)
-msgid ""
-"Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to "
-"see a diagram of your current keyboard layout."
-msgstr ""
-
-#: C/gswitchit.xml:167(para)
-msgid ""
-"In the <guilabel>Layout View</guilabel> window, press a key on your keyboard "
-"to highlight its representation in the diagram."
-msgstr ""
-
-#: C/gswitchit.xml:168(para)
-msgid ""
-"Each key in the diagram has up to four characters. These can be produced "
-"with different keyboard modifiers, as follows:"
-msgstr ""
-
-#: C/gswitchit.xml:170(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr ""
-
-#: C/gswitchit.xml:171(para)
-msgid ""
-"For the character shown in the top left, press the key with <keycap>Shift</"
-"keycap>."
-msgstr ""
-
-#: C/gswitchit.xml:172(para)
-msgid ""
-"For the character shown in the bottom right, press the key with the third "
-"level modifier."
-msgstr ""
-
-#: C/gswitchit.xml:173(para)
-msgid ""
-"For the character shown in the top right, press the key with <keycap>Shift</"
-"keycap> and the third level modifier."
-msgstr ""
-
-#: C/gswitchit.xml:175(para)
-msgid ""
-"By default, no key is assigned to act as a third-level modifier. You can "
-"assign a key to act as a third level modifier in the <ulink type=\"help\" "
-"url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout "
-"Options Preferences</ulink>."
-msgstr ""
-
-#: C/gswitchit.xml:181(title)
-msgid "Plugins"
-msgstr "Ajustons"
-
-#: C/gswitchit.xml:182(para)
-msgid ""
-"To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select "
-"<guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins "
-"are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr ""
-
-#: C/gswitchit.xml:187(term)
-msgid "Adding a New Plugin"
-msgstr ""
-
-#: C/gswitchit.xml:188(para)
-msgid ""
-"Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> "
-"window, select one of the plugins in the <guilabel>Available plugins</"
-"guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr ""
-
-#: C/gswitchit.xml:194(term)
-msgid "Removing a Plugin"
-msgstr ""
-
-#: C/gswitchit.xml:195(para)
-msgid ""
-"Select the plugin in the <guilabel>Active plugins</guilabel> area that you "
-"do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr ""
-
-#: C/gswitchit.xml:200(term)
-msgid "Moving Items in the Plugin List"
-msgstr ""
-
-#: C/gswitchit.xml:201(para)
-msgid ""
-"To move items up and down the plugin list in the <guilabel>Active plugins</"
-"guilabel> area, select the plugin you want to move, and click <guibutton>Up</"
-"guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the "
-"keyboard to move the selection point up and down."
-msgstr ""
-
-#: C/gswitchit.xml:208(term)
-msgid "Changing the Properties of a Plugin"
-msgstr ""
-
-#: C/gswitchit.xml:209(para)
-msgid ""
-"To change the properties of the plugins, select the plugin you want and "
-"click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr ""
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr "Yannig Marchegay (Kokoyaya) <[email protected]>"
-
diff --git a/gswitchit/help/ru/ru.po b/gswitchit/help/ru/ru.po
deleted file mode 100644
index 7bd9e1b5..00000000
--- a/gswitchit/help/ru/ru.po
+++ /dev/null
@@ -1,362 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gswitchit.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-22 11:21+0300\n"
-"PO-Revision-Date: 2007-01-22 08:04+0300\n"
-"Last-Translator: Timur Salikhov <[email protected]>\n"
-"Language-Team: Russian <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "Руководство по индикатору раскладок клавиатуры"
-
-#: ../C/gswitchit.xml:25(para)
-msgid ""
-"The Keyboard Indicator shows the active keyboard group and enables switching "
-"between different groups."
-msgstr ""
-"Клавиатурный индикатор показывает активную раскладку клавиатуры и позволяет "
-"переключаться между несколькими раскладками."
-
-#: ../C/gswitchit.xml:30(year) ../C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: ../C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: ../C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: ../C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "Проект документации MATE"
-
-#: ../C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: ../C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "2004-08"
-
-#: ../C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: ../C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: ../C/gswitchit.xml:65(email)
-
-#: ../C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: ../C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: ../C/gswitchit.xml:72(email)
-
-#: ../C/gswitchit.xml:89(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr ""
-"Данное руководство описывает версию апплета Клавиатурного индикатора 2.8."
-
-#: ../C/gswitchit.xml:93(title)
-msgid "Feedback"
-msgstr "Обратная связь"
-
-#: ../C/gswitchit.xml:94(para)
-msgid ""
-"To report a bug or make a suggestion regarding the Keyboard Indicator applet "
-"or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
-"feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr ""
-"Чтобы сообщить об ошибке или внести предложение по усовершенствованию "
-"апплета клавиатурного индикатора или данного руководства, посмотрите <ulink "
-"url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-
-#: ../C/gswitchit.xml:103(primary)
-msgid "Keyboard Indicator"
-msgstr "Индикатор раскладки клавиатуры"
-
-#: ../C/gswitchit.xml:107(title)
-msgid "Introduction"
-msgstr "Введение"
-
-#: ../C/gswitchit.xml:109(para)
-msgid ""
-"<application>Keyboard Indicator</application> indicates the active keyboard "
-"group. The applet shows you which group you are currently using. Aside from "
-"the standard applet popup menu functions, the <application>Keyboard "
-"Indicator</application> applet popup menu allows you to launch the applet "
-"Preferences tool and to switch between language groups."
-msgstr ""
-"<application>Индикатор раскладки клавиатуры</application> показывает "
-"активную клавиатурную раскладку. То есть ту, которая используется вами в "
-"данный момент. Наряду со стандартными функциями контекстного меню, апплет "
-"позволяет переключаться между раскладками, а также запустить инструмент "
-"настройки клавиатуры."
-
-#: ../C/gswitchit.xml:115(para)
-msgid ""
-"To add <application>Keyboard Indicator</application> to a panel, right-click "
-"on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select "
-"<application>Keyboard Indicator</application> in the <application>Add to the "
-"panel</application> dialog, then click <guibutton>OK</guibutton>. For more "
-"on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject"
-"\">Adding an Object to a Panel</ulink>."
-msgstr ""
-"Чтобы добавить <application>Индикатор раскладки</application> на панель, "
-"щелкните правой кнопкой мыши на панели и выберите <guimenuitem>Добавить на "
-"панель</guimenuitem>. В появившемся диалоговом окне выберите "
-"<application>Индикатор раскладок клавиатуры</application>, затем нажмите "
-"<guibutton>OK</guibutton>. Для дополнительной информации смотрите <ulink "
-"type=\"help\" url=\"ghelp:user-guide?panels-addobject\">Добавление объекта "
-"на панель</ulink>."
-
-#: ../C/gswitchit.xml:121(para)
-msgid ""
-"To open the <application>Keyboard</application> preference tool, choose "
-"<guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup "
-"menu. You may need to go to this dialog to be able to configure the keyboard "
-"(choose model, layouts, options, etc.). For help with setting Keyboard "
-"preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring "
-"Keyboard Preferences</ulink>."
-msgstr ""
-"Чтобы открыть инструмент <application>Настойки клавиатуры</application>, "
-"выберите пункт <guimenuitem>Параметры клавиатуры</guimenuitem> из "
-"контекстного меню. Этот инструмент может понадобиться вам для тонкой "
-"настройки вашей клавиатуры (модель, раскладки и другие параметры). За "
-"помощью по установке параметров клавиатуры, обратитесь к главе <ulink url="
-"\"ghelp:user-guide?prefs-keyboard\">Параметры клавиатуры</ulink>."
-
-#: ../C/gswitchit.xml:131(title)
-msgid "Switching Language"
-msgstr "Переключение раскладок"
-
-#: ../C/gswitchit.xml:133(para)
-msgid ""
-"First, you must know that a group is a set of characters, whether it be for "
-"a language or non-language-related set of characters, like a dvorak. Each "
-"language may have more than one subset, and each subset is called a group. "
-"There are many ways you can switch the group that you are using on your "
-"keyboard."
-msgstr ""
-"Первое, что нужно знать, раскладка ― это набор символов. Набор может быть "
-"для конкретного языка, либо быть от языка не зависимым, как, например, "
-"дворак. Каждый язык может иметь несколько таких наборов, каждый набор и есть "
-"раскладка. Существует несколько способов сменить текущую раскладку."
-
-#: ../C/gswitchit.xml:141(term)
-msgid "Mouse Click"
-msgstr "Щелчок мыши"
-
-#: ../C/gswitchit.xml:142(para)
-msgid ""
-"You can switch between groups with a single click on the applet's panel "
-"icon. The groups switch in a cycle determined by the current configuration."
-msgstr ""
-"Можно переключаться между раскладками щелкнув мышкой на апплете. Раскладки "
-"будут сменяться циклически, как определено в текущей конфигурации."
-
-#: ../C/gswitchit.xml:147(term)
-msgid "Popup Menu"
-msgstr "Контекстное меню"
-
-#: ../C/gswitchit.xml:148(para)
-msgid ""
-"To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the "
-"popup menu. From there, choose the group you want to switch to."
-msgstr ""
-"Чтобы переключить раскладку, можно выбрать пункт <guisubmenu>Переключиться "
-"на группу</guisubmenu> из контекстного меню и, затем, выбрать нужную "
-"раскладку из списка."
-
-#: ../C/gswitchit.xml:153(term)
-msgid "Keyboard"
-msgstr "Клавиатура"
-
-#: ../C/gswitchit.xml:154(para)
-msgid ""
-"In the <application>Keyboard</application> preference tool, you can set "
-"which key that you would like to use to switch groups on your keyboard. "
-"Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet "
-"popup menu, and choose the key you want to use in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</"
-"guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr ""
-"Используя инструмент <application>Настройки клавиатуры</application>, можно "
-"установить комбинацию клавиш, которая переключала бы раскладки с клавиатуры. "
-"Выберите <guimenuitem>Параметры клавиатуры</guimenuitem> в контекстном меню "
-"апплета, затем выберите комбинацию клавиш, которую хотели бы использовать на "
-"вкладке <ulink url=\"ghelp:user-guide#prefs-keyboard-layoutoptions"
-"\"><guilabel>Параметры раскладки</guilabel></ulink>, в группе "
-"<guilabel>Функции смены раскладки</guilabel>."
-
-#: ../C/gswitchit.xml:161(para)
-msgid ""
-"To add other layouts to the list, open the <application>Keyboard</"
-"application> preference tool. Choose other layouts in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr ""
-"Для пополнения списка раскладок, откройте <application>Настройки клавиатуры</"
-"application>. Выберите нужную раскладку на <ulink url=\"ghelp:user-"
-"guide#prefs-keyboard-layouts\">вкладке <guilabel>Раскладки</guilabel></"
-"ulink>."
-
-#: ../C/gswitchit.xml:165(title)
-msgid "Layout View"
-msgstr "Просмотр раскладки"
-
-#: ../C/gswitchit.xml:166(para)
-msgid ""
-"Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to "
-"see a diagram of your current keyboard layout."
-msgstr ""
-"Выберите пункт <guimenuitem>Отобразить текущую раскладку</guimenuitem> из "
-"контекстного меню, чтобы увидеть диаграмму текущей раскладки клавиатуры."
-
-#: ../C/gswitchit.xml:167(para)
-msgid ""
-"In the <guilabel>Layout View</guilabel> window, press a key on your keyboard "
-"to highlight its representation in the diagram."
-msgstr ""
-"В окне <guilabel>Раскладка клавиатуры</guilabel>, нажатие клавиш клавиатуры "
-"подсвечивает соответствующие представления этих клавиш на диаграмме."
-
-#: ../C/gswitchit.xml:168(para)
-msgid ""
-"Each key in the diagram has up to four characters. These can be produced "
-"with different keyboard modifiers, as follows:"
-msgstr ""
-"Каждая клавиша на диаграмме имеет более четырёх значений, благодаря клавишам "
-"модификаторам:"
-
-#: ../C/gswitchit.xml:170(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr ""
-"Символ, нарисованный на клавише внизу слева, вводится нажатием, собственно, "
-"на эту клавишу."
-
-#: ../C/gswitchit.xml:171(para)
-msgid ""
-"For the character shown in the top left, press the key with <keycap>Shift</"
-"keycap>."
-msgstr ""
-"Символ, нарисованный вверху слева, вводится с клавишей <keycap>Shift</"
-"keycap>."
-
-#: ../C/gswitchit.xml:172(para)
-msgid ""
-"For the character shown in the bottom right, press the key with the third "
-"level modifier."
-msgstr ""
-"Символ снизу справа вводится нажатием соответствующей клавиши и клавиши "
-"модификатора 3-го уровня."
-
-#: ../C/gswitchit.xml:173(para)
-msgid ""
-"For the character shown in the top right, press the key with <keycap>Shift</"
-"keycap> and the third level modifier."
-msgstr ""
-"Символ сверху справа вводится с клавишей <keycap>Shift</keycap> и "
-"модификатором 3-го уровня."
-
-#: ../C/gswitchit.xml:175(para)
-msgid ""
-"By default, no key is assigned to act as a third-level modifier. You can "
-"assign a key to act as a third level modifier in the <ulink type=\"help\" "
-"url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout "
-"Options Preferences</ulink>."
-msgstr ""
-"По умолчанию, клавиши модификатора третьего уровня нет. Её можно назначить, "
-"смотрите <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-"
-"layoutoptions\">Параметры раскладки клавиатуры</ulink>."
-
-#: ../C/gswitchit.xml:181(title)
-msgid "Plugins"
-msgstr "Дополнения"
-
-#: ../C/gswitchit.xml:182(para)
-msgid ""
-"To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select "
-"<guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins "
-"are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr ""
-"Для открытия диалога <guilabel>Дополнения индикатора клавиатуры1</guilabel>, "
-"выберите <guimenuitem>Дополнения</guimenuitem> из контекстного меню. Дополнения "
-"отображаются в области <guilabel>Активные дополнения</guilabel>."
-
-#: ../C/gswitchit.xml:187(term)
-msgid "Adding a New Plugin"
-msgstr "Добавление нового модуля"
-
-#: ../C/gswitchit.xml:188(para)
-msgid ""
-"Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> "
-"window, select one of the plugins in the <guilabel>Available plugins</"
-"guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr ""
-"Нажмите кнопку <guibutton>Добавить</guibutton>. В окне <guilabel>Добавление "
-"модуля</guilabel>, выберите модуль из списка доступных и нажмите "
-"<guibutton>OK</guibutton>."
-
-#: ../C/gswitchit.xml:194(term)
-msgid "Removing a Plugin"
-msgstr "Удаление модуля"
-
-#: ../C/gswitchit.xml:195(para)
-msgid ""
-"Select the plugin in the <guilabel>Active plugins</guilabel> area that you "
-"do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr ""
-"Выберите модуль, который больше не нужен из <guilabel>Активных модулей</"
-"guilabel> и нажмите <guibutton>Удалить</guibutton>."
-
-#: ../C/gswitchit.xml:200(term)
-msgid "Moving Items in the Plugin List"
-msgstr "Перемещение элементов в списке модулей"
-
-#: ../C/gswitchit.xml:201(para)
-msgid ""
-"To move items up and down the plugin list in the <guilabel>Active plugins</"
-"guilabel> area, select the plugin you want to move, and click <guibutton>Up</"
-"guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the "
-"keyboard to move the selection point up and down."
-msgstr ""
-"Чтобы переместить элемент вверх или вниз в <guilabel>Активных модулях</"
-"guilabel>, выберите соответствующий модуль и нажмите кнопку "
-"<guibutton>Вверх</guibutton> или <guibutton>Вниз</guibutton>. Также для "
-"перемещения можно использовать клавиши со стрелками на вашей клавиатуре."
-
-#: ../C/gswitchit.xml:208(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "Изменение свойств модуля"
-
-#: ../C/gswitchit.xml:209(para)
-msgid ""
-"To change the properties of the plugins, select the plugin you want and "
-"click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr ""
-"Для изменения свойств модуля, выберите соответствующий и нажмите кнопку "
-"<guibutton>Свойства</guibutton>. Свойства разные для каждого дополнения."
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: ../C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr "Салихов Тимур <email>[email protected]</email>"
diff --git a/gswitchit/help/sv/sv.po b/gswitchit/help/sv/sv.po
deleted file mode 100644
index afb5d318..00000000
--- a/gswitchit/help/sv/sv.po
+++ /dev/null
@@ -1,242 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: applets-gswitchit\n"
-"PO-Revision-Date: 2006-11-16 21:14+0100\n"
-"POT-Creation-Date: 2006-05-31 19:13+0200\n"
-"Last-Translator: Daniel Nylander <[email protected]>\n"
-"Language-Team: Swedish <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "Handbok för Tangentbordsindikator"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:25(para)
-msgid "The Keyboard Indicator shows the active keyboard group and enables switching between different groups."
-msgstr "Tangentbordsindikatorn visar den aktiva tangentbordsgruppen och tillåter växling mellan olika grupper."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:30(year)
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "Dokumentationsprojekt för MATE"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "2004-08"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:2(para)
-msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
-msgstr "Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free Documentation License (GFDL), version 1.1 eller senare, utgivet av Free Software Foundation utan standardavsnitt och omslagstexter. En kopia av GFDL finns att hämta på denna <ulink type=\"help\" url=\"ghelp:fdl\">länk</ulink> eller i filen COPYING-DOCS som medföljer denna handbok."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:12(para)
-msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
-msgstr "Denna handbok utgör en av flera MATE-handböcker som distribueras under villkoren i GFDL. Om du vill distribuera denna handbok separat från övriga handböcker kan du göra detta genom att lägga till en kopia av licensavtalet i handboken enligt instruktionerna i avsnitt 6 i licensavtalet."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:19(para)
-msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any MATE documentation, and the members of the MATE Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
-msgstr "Flera namn på produkter och tjänster är registrerade varumärken. I de fall dessa namn förekommer i MATE-dokumentation - och medlemmarna i MATE-dokumentationsprojektet är medvetna om dessa varumärken - är de skrivna med versaler eller med inledande versal."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:35(para)
-msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr "DOKUMENTET TILLHANDAHÅLLS I \"BEFINTLIGT SKICK\" UTAN NÅGRA SOM HELST GARANTIER, VARE SIG UTTRYCKLIGA ELLER UNDERFÖRSTÅDDA, INKLUSIVE, MEN INTE BEGRÄNSAT TILL, GARANTIER ATT DOKUMENTET ELLER EN MODIFIERAD VERSION AV DOKUMENTET INTE INNEHÅLLER NÅGRA FELAKTIGHETER, ÄR LÄMPLIGT FÖR ETT VISST ÄNDAMÅL ELLER INTE STRIDER MOT LAG. HELA RISKEN VAD GÄLLER KVALITET, EXAKTHET OCH UTFÖRANDE AV DOKUMENTET OCH MODIFIERADE VERSIONER AV DOKUMENTET LIGGER HELT OCH HÅLLET PÅ ANVÄNDAREN. OM ETT DOKUMENT ELLER EN MODIFIERAD VERSION AV ETT DOKUMENT SKULLE VISA SIG INNEHÅLLA FELAKTIGHETER I NÅGOT HÄNSEENDE ÄR DET DU (INTE DEN URSPRUNGLIGA SKRIBENTEN, FÖRFATTAREN ELLER NÅGON ANNAN MEDARBETARE) SOM FÅR STÅ FÖR ALLA EVENTUELLA KOSTNADER FÖR SERVICE, REPARATIONER ELLER KORRIGERINGAR. DENNA GARANTIFRISKRIVNING UTGÖR EN VÄSENTLIG DEL AV DETTA LICENSAVTAL. DETTA INNEBÄR ATT ALL ANVÄNDNING AV ETT DOKUMENT ELLER EN MODIFIERAD VERSION AV ETT DOKUMENT BEVILJAS ENDAST UNDER DENNA ANSVARSFRISKRIVNING;"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:55(para)
-msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
-msgstr "UNDER INGA OMSTÄNDIGHETER ELLER INOM RAMEN FÖR NÅGON LAGSTIFTNING, OAVSETT OM DET GÄLLER KRÄNKNING (INKLUSIVE VÅRDSLÖSHET), KONTRAKT ELLER DYLIKT, SKA FÖRFATTAREN, DEN URSPRUNGLIGA SKRIBENTEN ELLER ANNAN MEDARBETARE ELLER ÅTERFÖRSÄLJARE AV DOKUMENTET ELLER AV EN MODIFIERAD VERSION AV DOKUMENTET ELLER NÅGON LEVERANTÖR TILL NÅGON AV NÄMNDA PARTER STÄLLAS ANSVARIG GENTEMOT NÅGON FÖR NÅGRA DIREKTA, INDIREKTA, SÄRSKILDA ELLER OFÖRUTSEDDA SKADOR ELLER FÖLJDSKADOR AV NÅGOT SLAG, INKLUSIVE, MEN INTE BEGRÄNSAT TILL, SKADOR BETRÄFFANDE FÖRLORAD GOODWILL, HINDER I ARBETET, DATORHAVERI ELLER NÅGRA ANDRA TÄNKBARA SKADOR ELLER FÖRLUSTER SOM KAN UPPKOMMA PÅ GRUND AV ELLER RELATERAT TILL ANVÄNDNINGEN AV DOKUMENTET ELLER MODIFIERADE VERSIONER AV DOKUMENTET, ÄVEN OM PART SKA HA BLIVIT INFORMERAD OM MÖJLIGHETEN TILL SÅDANA SKADOR."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:28(para)
-msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
-msgstr "DOKUMENTET OCH MODIFIERADE VERSIONER AV DOKUMENTET TILLHANDAHÅLLS UNDER VILLKOREN I GNU FREE DOCUMENTATION LICENSE ENDAST UNDER FÖLJANDE FÖRUTSÄTTNINGAR: <placeholder-1/>"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:65(email)
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:72(email)
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:89(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr "Denna handbok beskriver version 2.8 av panelprogrammet Tangentbordsindikator."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:93(title)
-msgid "Feedback"
-msgstr "Återkoppling"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:94(para)
-msgid "To report a bug or make a suggestion regarding the Keyboard Indicator applet or this manual, follow the directions in the <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr "För att rapportera ett fel eller komma med förslag angående panelprogrammet Tangentbordsindikator eller denna handbok, följ anvisningarna på <ulink url=\"ghelp:mate-feedback\" type=\"help\">MATE:s återkopplingssida</ulink>."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:103(primary)
-msgid "Keyboard Indicator"
-msgstr "Tangentbordsindikator"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:107(title)
-msgid "Introduction"
-msgstr "Introduktion"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:109(para)
-msgid "<application>Keyboard Indicator</application> indicates the active keyboard group. The applet shows you which group you are currently using. Aside from the standard applet popup menu functions, the <application>Keyboard Indicator</application> applet popup menu allows you to launch the applet Preferences tool and to switch between language groups."
-msgstr "<application>Tangentbordsindikator</application> indikerar den aktiva tangentbordsgruppen. Panelprogrammet visar dig vilken grupp som du för närvarande använder. Förutom standardfunktioner i panelprogrammets popuppmeny, låter <application>Tangentbordsindikator</application> dig även starta panelprogrammets inställningsverktyg och växla mellan språkgrupper."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:115(para)
-msgid "To add <application>Keyboard Indicator</application> to a panel, right-click on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select <application>Keyboard Indicator</application> in the <application>Add to the panel</application> dialog, then click <guibutton>OK</guibutton>. For more on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject\">Adding an Object to a Panel</ulink>."
-msgstr "För att lägga till <application>Tangentbordsindikator</application> till en panel, högerklicka på panelen, välj sedan <guimenuitem>Lägg till i panel</guimenuitem>. Välj <application>Tangentbordsindikator</application> i dialogrutan <application>Lägg till i panelen</application>, klicka sedan på <guibutton>OK</guibutton>. För mer information om det här, se <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject\">Lägg till ett objekt till en panel</ulink>."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:121(para)
-msgid "To open the <application>Keyboard</application> preference tool, choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup menu. You may need to go to this dialog to be able to configure the keyboard (choose model, layouts, options, etc.). For help with setting Keyboard preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring Keyboard Preferences</ulink>."
-msgstr "För att öppna inställningsverktyget <application>Tangentbord</application>, välj <guimenuitem>Öppna tangentbordsinställningar</guimenuitem> i panelprogrammets popuppmeny. Du kan behöva gå till den här dialogrutan för att kunna konfigurera tangentbordet (välj modell, layouter, alternativ, etc.). För hjälp med att konfigurera tangentbordsinställningar, se <ulink url=\"ghelp:user-guide?prefs-keyboard\">Tangentbordsinställningar</ulink>."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:131(title)
-msgid "Switching Language"
-msgstr "Byt språk"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:133(para)
-msgid "First, you must know that a group is a set of characters, whether it be for a language or non-language-related set of characters, like a dvorak. Each language may have more than one subset, and each subset is called a group. There are many ways you can switch the group that you are using on your keyboard."
-msgstr "Först måste du känna till att en grupp är en teckenuppsättning, antingen om den är för ett språk eller en icke-språkrelaterad teckenuppsättning, såsom en dvorak. Varje språk kan ha fler än en underuppsättning, och varje underuppsättning kallas för en grupp. Det finns många sätt som du kan byta gruppen på som du använder för ditt tangentbord."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:141(term)
-msgid "Mouse Click"
-msgstr "Musklick"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:142(para)
-msgid "You can switch between groups with a single click on the applet's panel icon. The groups switch in a cycle determined by the current configuration."
-msgstr "Du kan växla mellan grupper med ett enda klick på panelprogrammets ikon. Grupperna växlas i en slinga som bestäms av den aktuella konfigurationen."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:147(term)
-msgid "Popup Menu"
-msgstr "Popuppmeny"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:148(para)
-msgid "To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the popup menu. From there, choose the group you want to switch to."
-msgstr "För att välja en specifik grupp, välj <guisubmenu>Grupper</guisubmenu> från popuppmenyn. Därifrån kan du välja gruppen som du vill byta till."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:153(term)
-msgid "Keyboard"
-msgstr "Tangentbord"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:154(para)
-msgid "In the <application>Keyboard</application> preference tool, you can set which key that you would like to use to switch groups on your keyboard. Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup menu, and choose the key you want to use in the <ulink url=\"ghelp:user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr "I inställningsverktyget <application>Tangentbord</application>, kan du ställa in vilken tangent som du vill använda för att byta grupper på ditt tangentbord. Välj <guimenuitem>Öppna tangentbordsinställningar</guimenuitem> i panelprogrammets popuppmeny, och välj tangenten som du vill använda under fliken <ulink url=\"ghelp:user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layoutalternativ</guilabel></ulink>, under <guilabel>Gruppbeteende för Skift/Lock</guilabel>."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:161(para)
-msgid "To add other layouts to the list, open the <application>Keyboard</application> preference tool. Choose other layouts in the <ulink url=\"ghelp:user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr "För att lägga till andra layouter till listan, öppna inställningsverktyget <application>Tangentbord</application>. Välj andra layouter under fliken <ulink url=\"ghelp:user-guide#prefs-keyboard-layouts\"><guilabel>Layouter</guilabel></ulink>."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:165(title)
-msgid "Layout View"
-msgstr "Layoutvy"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:166(para)
-msgid "Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to see a diagram of your current keyboard layout."
-msgstr "Välj <guimenuitem>Layoutvy</guimenuitem> från panelprogrammets popuppmeny för att se ett diagram för din aktuella tangentbordslayout."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:167(para)
-msgid "In the <guilabel>Layout View</guilabel> window, press a key on your keyboard to highlight its representation in the diagram."
-msgstr "I fönstret <guilabel>Layoutvy</guilabel>, tryck på en tangent på ditt tangentbord för att markera att den finns representerad i diagrammet."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:168(para)
-msgid "Each key in the diagram has up to four characters. These can be produced with different keyboard modifiers, as follows:"
-msgstr "Varje tangent i diagrammet har upp till fyra tecken. Dessa kan produceras med olika tangentbordsmodifierare:"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:170(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr "För tecknet som visas i vänstra nederkanten, tryck på själva tangenten."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:171(para)
-msgid "For the character shown in the top left, press the key with <keycap>Shift</keycap>."
-msgstr "För tecknet som visas i vänstra överkanten, tryck på tangenten med <keycap>Skift</keycap>."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:172(para)
-msgid "For the character shown in the bottom right, press the key with the third level modifier."
-msgstr "För tecknet som visas i högra nederkanten, tryck på tangenten med tredje nivåmodifieraren."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:173(para)
-msgid "For the character shown in the top right, press the key with <keycap>Shift</keycap> and the third level modifier."
-msgstr "För tecknet som visas i högra överkanten, tryck på tangenten med <keycap>Skift</keycap> och tredje nivåmodifieraren. "
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:175(para)
-msgid "By default, no key is assigned to act as a third-level modifier. You can assign a key to act as a third level modifier in the <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout Options Preferences</ulink>."
-msgstr "Som standard finns det ingen tangent tilldelad att fungera som en tredje nivåmodifierare. Du kan tilldela en tangent till att fungera som en tredje nivåmodifierare i <ulink type=\"help\" url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Alternativ för tangentbordslayouter</ulink>."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:181(title)
-msgid "Plugins"
-msgstr "Insticksmoduler"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:182(para)
-msgid "To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select <guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr "För att öppna dialogrutan <guilabel>Insticksmoduler för tangentbordsindikator</guilabel>, välj <guimenuitem>Insticksmoduler</guimenuitem> från popuppmenyn. Dina aktuella insticksmoduler visas i <guilabel>Aktiva insticksmoduler</guilabel>."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:187(term)
-msgid "Adding a New Plugin"
-msgstr "Lägg till en ny insticksmodul"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:188(para)
-msgid "Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> window, select one of the plugins in the <guilabel>Available plugins</guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr "Klicka på <guibutton>Lägg till</guibutton>. I fönstret <guilabel>Lägg till insticksmodul</guilabel>, välj en av insticksmodulerna i <guilabel>Tillgängliga insticksmoduler</guilabel> och klicka på knappen <guibutton>OK</guibutton>."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:194(term)
-msgid "Removing a Plugin"
-msgstr "Ta bort en insticksmodul"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:195(para)
-msgid "Select the plugin in the <guilabel>Active plugins</guilabel> area that you do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr "Välj insticksmodulen i <guilabel>Aktiva insticksmoduler</guilabel> som du inte vill ha längre och klicka på <guibutton>Ta bort</guibutton>."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:200(term)
-msgid "Moving Items in the Plugin List"
-msgstr "Flytta objekt i insticksmodullistan"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:201(para)
-msgid "To move items up and down the plugin list in the <guilabel>Active plugins</guilabel> area, select the plugin you want to move, and click <guibutton>Up</guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the keyboard to move the selection point up and down."
-msgstr "För att flytta objekt uppåt och nedåt i insticksmodullistan i <guilabel>Aktiva insticksmoduler</guilabel>, välj insticksmodulen som du vill flytta, och klicka på <guibutton>Uppåt</guibutton> eller <guibutton>Nedåt</guibutton>. Du kan använda pilarna på tangentbordet för att flytta markeringspunkten upp och ned."
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:208(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "Ändra egenskaperna för en insticksmodul"
-
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:209(para)
-msgid "To change the properties of the plugins, select the plugin you want and click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr "För att ändra egenskaperna för insticksmodulerna, välj insticksmodulen som du vill ändra och klicka på <guibutton>Egenskaper</guibutton>. Egenskaperna varierar mellan varje insticksmodul."
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: /tmp/doc-l10n/cvs/applets-gswitchit.HEAD/C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr "Daniel Nylander <[email protected]>, 2006"
-
diff --git a/gswitchit/help/uk/uk.po b/gswitchit/help/uk/uk.po
deleted file mode 100644
index 1796a33c..00000000
--- a/gswitchit/help/uk/uk.po
+++ /dev/null
@@ -1,488 +0,0 @@
-# Ukrainian translation of mate-applets manual.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Maxim Dziumanenko <[email protected]>, 2004-2005
-msgid ""
-msgstr ""
-"Project-Id-Version: mate-applets manual\n"
-"POT-Creation-Date: 2005-12-13 10:57+0800\n"
-"PO-Revision-Date: 2005-08-24 22:55+0300\n"
-"Last-Translator: Maxim V. Dziumanenko <[email protected]>\n"
-"Language-Team: Ukrainian <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "Довідка з аплету \"Індикатор клавіатури\""
-
-#: ../C/gswitchit.xml:25(para)
-msgid ""
-"The Keyboard Indicator shows the active keyboard group and enables switching "
-"between different groups."
-msgstr ""
-
-#: ../C/gswitchit.xml:30(year) ../C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: ../C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: ../C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Сергій Удальцов"
-
-#: ../C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "Проект документування MATE"
-
-#: ../C/gswitchit.xml:2(para)
-msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-"later version published by the Free Software Foundation with no Invariant "
-"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
-"in the file COPYING-DOCS distributed with this manual."
-msgstr ""
-"Дозволяється копіювати, розповсюджувати та/або змінювати цей документ на "
-"умовах ліцензії GNU Free Documentation License (GFDL), версії 1.1 або будь-"
-"якої старшої версії, що опублікована Free Software Foundation без "
-"інваріантних розділів, тексту титульної сторінки, та тексту фінальної "
-"сторінки. Копію GFDL можна знайти <ulink type=\"help\" url=\"ghelp:fdl\">за "
-"адресою</ulink> або у файлі COPYING-DOCS, що постачається з цією довідкою."
-
-#: ../C/gswitchit.xml:12(para)
-msgid ""
-"This manual is part of a collection of MATE manuals distributed under the "
-"GFDL. If you want to distribute this manual separately from the collection, "
-"you can do so by adding a copy of the license to the manual, as described in "
-"section 6 of the license."
-msgstr ""
-"Ця довідка є частиною збірки документації з MATE, що постачається на умовах "
-"ліцензії GFDL. Якщо ви бажаєте розповсюджувати цю довідку окремо від збірки, "
-"можете це зробити додавши до довідки копію ліцензії, як описано у пункті 6 "
-"ліцензії."
-
-#: ../C/gswitchit.xml:19(para)
-msgid ""
-"Many of the names used by companies to distinguish their products and "
-"services are claimed as trademarks. Where those names appear in any MATE "
-"documentation, and the members of the MATE Documentation Project are made "
-"aware of those trademarks, then the names are in capital letters or initial "
-"capital letters."
-msgstr ""
-"Більшість назв, що використовуються компаніями для розповсюдження їх "
-"продуктів та послуг є торговими марками. Якщо такі назви зустрічаються у "
-"документації з MATE та учасникам проекту документування MATE відомо, що "
-"вони є торговими марками, тоді ці назви пишуться великими літерами або "
-"починаються з великої літери."
-
-#: ../C/gswitchit.xml:35(para)
-msgid ""
-"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-"ДОКУМЕНТ НАДАЄТЬСЯ \"ЯК Є\", БЕЗ БУДЬ-ЯКИХ ГАРАНТІЇ, ЯВНИХ ЧИ НЕЯВНИХ, "
-"ВКЛЮЧАЮЧИ, АЛЕ НЕ ОБМЕЖУЮЧИСЬ, ГАРАНТІЙ ЩО ЦЕЙ ДОКУМЕНТ ЧИ ЗМІНЕНА ВЕРСІЯ "
-"ДОКУМЕНТА ВІЛЬНІ ВІД ДЕФЕКТІВ, ПРИДАТНІ ДО ПРОДАЖУ, ВІДПОВІДАЮТЬ ПЕВНІЙ МЕТІ "
-"АБО НЕ ПОРУШУЮТЬ ЧИЇСЬ ПРАВА. ВЕСЬ РИЗИК ЗА ЯКІСТЬ, ТОЧНІСТЬ, ТА ЧИННІСТЬ "
-"ЦЬОГО ДОКУМЕНТУ АБО ЙОГО ЗМІНЕНИХ ВЕРСІЙ ЛЕЖИТЬ НА ВАС. ЯКЩО БУДЬ-ЯКИЙ "
-"ДОКУМЕНТ ЧИ ЗМІНЕНА ВЕРСІЯ БУДУТЬ ВИЗНАНІ ДЕФЕКТНИМИ У БУДЬ-ЯКОМУ "
-"ВІДНОШЕННІ, ВИ (НЕ ПОЧАТКОВИЙ УКЛАДАЧ, АВТОР АБО БУДЬ-ЯКИЙ СПІВАВТОР) БЕРЕТЕ "
-"НА СЕБЕ ВИТРАТИ ЗА БУДЬ-ЯКЕ НЕОБХІДНЕ ОБСЛУГОВУВАННЯ, РЕМОНТ ЧИ ВИПРАВЛЕННЯ. "
-"ЦЯ ВІДМОВА ВІД ГАРАНТІЙ СКЛАДАЄ ВАЖЛИВУ ЧАСТИНУ ЦІЄЇ ЛІЦЕНЗІЇ. НЕ "
-"ДОПУСКАЄТЬСЯ ВИКОРИСТАННЯ ЦЬОГО ДОКУМЕНТУ АБО ЙОГО ЗМІНЕНОЇ ВЕРСІЇ БЕЗ "
-"ПРИЙНЯТТЯ ЦІЄЇ ВІДМОВИ; ТА"
-
-#: ../C/gswitchit.xml:55(para)
-msgid ""
-"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-"POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-"НІ ЗА ЯКИХ ОБСТАВИН ТА ЗА БУДЬ-ЯКОГО ЗАКОНОДАВСТВА, ЧИ ТО ГРОМАДЯНСЬКОЇ "
-"ВІДПОВІДАЛЬНОСТІ (ВКЛЮЧАЮЧИ ХАЛАТНІСТЬ), ДОГОВОРУ, ЧИ ЧОГОСЬ ІНШОГО, АВТОР, "
-"ПОЧАТКОВИЙ УКЛАДАЧ, БУДЬ-ЯКИЙ СПІВАВТОР, АБО ДИСТРИБ'ЮТОР ДОКУМЕНТУ ЧИ "
-"ЗМІНЕНОЇ ВЕРСІЇ ДОКУМЕНТУ, АБО БУДЬ-ЯКИЙ ПОСТАЧАЛЬНИК БУДЬ-ЯКОЇ З ЦИХ "
-"СТОРІН, НЕ НЕСЕ ВІДПОВІДАЛЬНІСТЬ ПЕРЕД БУДЬ-ЯКОЮ ОСОБОЮ ЗА БУДЬ-ЯКІ ПРЯМІ, "
-"НЕПРЯМІ, ОСОБЛИВІ, ВИПАДКОВІ, АБО ІСТОТНІ ЗБИТКИ БУДЬ-ЯКОГО ХАРАКТЕРУ "
-"ВКЛЮЧАЮЧИ, АЛЕ НЕ ОБМЕЖУЮЧИСЬ, ЗБИТКАМИ ВІД ВТРАТИ ПРЕСТИЖУ, ЗУПИНКИ РОБОТИ, "
-"ЗБОЇВ АБО НЕСПРАВНОСТЕЙ КОМП'ЮТЕРА, АБО БУДЬ-ЯКІ ІНШІ ЗБИТКИ АБО ВТРАТИ ЩО "
-"ВИНИКЛИ БЕЗВІДНОСНО АБО ВНАСЛІДОК ВИКОРИСТАННЯ ЦЬОГО ДОКУМЕНТУ ТА ЗМІНЕНИХ "
-"ВЕРСІЙ ЦЬОГО ДОКУМЕНТУ, НАВІТЬ ЯКЩО ЦІ СТОРОНИ, МОЖЛИВО, БУЛИ ПРОІНФОРМОВАНІ "
-"ПРО МОЖЛИВІСТЬ ТАКИХ ЗБИТКІВ."
-
-#: ../C/gswitchit.xml:28(para)
-msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-"<placeholder-1/>"
-msgstr ""
-"ДОКУМЕНТ ТА ЗМІНЕНІ ВЕРСІЇ ЦЬОГО ДОКУМЕНТУ ПОСТАЧАЮТЬСЯ НА УМОВАХ ВІЛЬНОЇ "
-"ЛІЦЕНЗІЇ ДЛЯ ДОКУМЕНТАЦІЇ GNU З ПОДАЛЬШИМ РОЗУМІННЯМ ЩО: <placeholder-1/>"
-
-#: ../C/gswitchit.xml:55(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: ../C/gswitchit.xml:56(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: ../C/gswitchit.xml:58(email)
-
-#: ../C/gswitchit.xml:62(firstname)
-msgid "Sergey"
-msgstr "Сергій"
-
-#: ../C/gswitchit.xml:63(surname)
-msgid "Udaltsov"
-msgstr "Удальцов"
-
-#: ../C/gswitchit.xml:65(email)
-
-#: ../C/gswitchit.xml:82(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr "Ця довідка описує аплет \"Індикатор клавіатури\" версії 2.8."
-
-#: ../C/gswitchit.xml:86(title)
-msgid "Feedback"
-msgstr "Зворотній зв'язок"
-
-#: ../C/gswitchit.xml:87(para)
-msgid ""
-"To report a bug or make a suggestion regarding the Keyboard Indicator applet "
-"or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
-"feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr ""
-"Щоб сповістити про помилку або внести пропозицію відносно аплету \"Індикатор "
-"клавіатури\"або цієї довідки, дотримуйтесь інструкцій на сторінці <ulink url="
-"\"ghelp:mate-feedback\" type=\"help\">Зворотний зв'язок з MATE</ulink>."
-
-#: ../C/gswitchit.xml:96(primary)
-msgid "Keyboard Indicator"
-msgstr "Індикатор клавіатури"
-
-#: ../C/gswitchit.xml:100(title)
-msgid "Introduction"
-msgstr "Вступ"
-
-#: ../C/gswitchit.xml:102(para)
-msgid ""
-"<application>Keyboard Indicator</application> indicates the active keyboard "
-"group. The applet shows you which group you are currently using. Aside from "
-"the standard applet popup menu functions, the <application>Keyboard "
-"Indicator</application> applet popup menu allows you to launch the applet "
-"Preferences tool and to switch between language groups."
-msgstr ""
-"Аплет <application>Індикатор клавіатури</application> відображає активну "
-"групу клавіатури. Аплет відображає групу, яку ви зараз використовуєте. Окрім "
-"стандартних пунктів меню аплету, аплет <application>Індикатор клавіатури</"
-"application> дозволяє відкривати вікно Параметри та перемикати групи мов."
-
-#: ../C/gswitchit.xml:108(para)
-msgid ""
-"To add <application>Keyboard Indicator</application> to a panel, right-click "
-"on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select "
-"<application>Keyboard Indicator</application> in the <application>Add to the "
-"panel</application> dialog, then click <guibutton>OK</guibutton>."
-msgstr ""
-"Щоб додати <application>Індикатор клавіатури</application> до панелі, "
-"натисніть правою кнопкою на панелі, потім виберіть <guimenuitem>Додати до "
-"панелі</guimenuitem>. У діалоговому вікні <application>Додати до панелі</"
-"application> виберіть <application>Індикатор клавіатури</application>, потім "
-"натисніть <guibutton>Гаразд</guibutton>."
-
-#: ../C/gswitchit.xml:114(para)
-msgid ""
-"To open the <guilabel>Keyboard Preferences</guilabel> dialog, choose "
-"<guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup "
-"menu. You may need to go to this dialog to be able to configure the keyboard "
-"(choose model, layouts, options, etc.). To view the help for "
-"<guilabel>Keyboard Preferences</guilabel>, see <ulink url=\"ghelp:user-"
-"guide#goscustperiph-2\">Configuring Keyboard Preferences</ulink>."
-msgstr ""
-"Щоб відкрити діалогове вікно <guilabel>Параметри клавіатури</guilabel>, "
-"виберіть у меню аплету <guimenuitem>Відкрити параметри клавіатури</"
-"guimenuitem>. У цьому вікні можна налаштувати клавіатуру (вибрати модель, "
-"розкладки, параметри, тощо). Щоб переглянути довідку з вікна "
-"<guilabel>Параметри клавіатури</guilabel>, перегляньте <ulink url=\"ghelp:"
-"user-guide#goscustperiph-2\">Налаштовування параметрів клавіатури</ulink>."
-
-#: ../C/gswitchit.xml:124(title)
-msgid "Switching Language"
-msgstr "Перемикання мови"
-
-#: ../C/gswitchit.xml:126(para)
-msgid ""
-"First, you must know that a group is a set of characters, whether it be for "
-"a language or non-language-related set of characters, like a dvorak. Each "
-"language may have more than one subset, and each subset is called a group. "
-"There are many ways you can switch the group that you are using on your "
-"keyboard."
-msgstr ""
-"По-перше, слід знати, що група - це набір символів певної мови, чи символи, "
-"що не відносяться до жодної мови, наприклад дворак. Кожна мова може мати "
-"більш ніж один піднабір символів, та кожен піднабір називається групою. Є "
-"кілька шляхів перемикання групи символів вашої клавіатури."
-
-#: ../C/gswitchit.xml:134(term)
-msgid "Mouse Click"
-msgstr "Клацанням мишею"
-
-#: ../C/gswitchit.xml:135(para)
-msgid ""
-"You can switch between groups with a single click on the applet's panel "
-"icon. The groups switch in a cycle determined by the current configuration."
-msgstr ""
-"Можете перемикати групи одним клацанням на значку аплету на панелі. Групи "
-"перемикаються циклічно, відповідно до поточної конфігурації."
-
-#: ../C/gswitchit.xml:140(term)
-msgid "Popup Menu"
-msgstr "Контекстне меню"
-
-#: ../C/gswitchit.xml:141(para)
-msgid ""
-"To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the "
-"popup menu. From there, choose the group you want to switch to."
-msgstr ""
-"Щоб вибрати певну групу виберіть її з меню <guisubmenu>Групи</guisubmenu>. "
-
-#: ../C/gswitchit.xml:146(term)
-msgid "Keyboard"
-msgstr "Клавіатурою"
-
-#: ../C/gswitchit.xml:147(para)
-msgid ""
-"In <guilabel>Keyboard Preferences</guilabel>, you can set which key that you "
-"would like to use to switch groups on your keyboard. To bring up the "
-"<guilabel>Keyboard Preferences</guilabel> dialog, choose <guimenuitem>Open "
-"Keyboard Preferences</guimenuitem> in the applet popup menu. For more "
-"information about <guilabel>Keyboard Preferences</guilabel>, see <ulink url="
-"\"ghelp:user-guide#goscustperiph-2\">Configuring Keyboard Preferences</"
-"ulink>."
-msgstr ""
-"У <guilabel>Параметри клавіатури</guilabel> можна вибрати комбінацію клавіш "
-"якою ви бажаєте перемикати групи. Щоб відкрити вікно <guilabel>Параметри "
-"клавіатури</guilabel>, виберіть у контекстному вікні <guimenuitem>Відкрити "
-"параметри клавіатури</guimenuitem>. Докладніше про <guilabel>Параметри "
-"клавіатури</guilabel>, дивіться <ulink url=\"ghelp:user-guide#goscustperiph-2"
-"\">Налаштовування параметрів клавіатури</ulink>."
-
-#: ../C/gswitchit.xml:159(title)
-msgid "Customizing Behavior"
-msgstr "Налаштовування поведінки"
-
-#: ../C/gswitchit.xml:160(para)
-msgid ""
-"To customize the behavior of the <application>Keyboard Indicator</"
-"application> applet, select <guimenuitem>Preferences</guimenuitem> in the "
-"popup menu to bring up the <guilabel>Keyboard Indicator Preferences</"
-"guilabel> dialog. All the settings made in the <guilabel>Preferences</"
-"guilabel> tool become active in the applet immediately after the "
-"<guibutton>Close</guibutton> button is pressed."
-msgstr ""
-"Щоб налаштувати аплет <application>Параметри клавіатури</application>, "
-"натисніть правою кнопкою миші на аплеті, потім виберіть "
-"<guimenuitem>Параметри</guimenuitem>. Відкриється діалогове вікно "
-"<guilabel>Параметри клавіатури</guilabel>. Усі зроблені у вікні "
-"<guilabel>Параметри</guilabel> зміни стануть активними негайно після "
-"натискання кнопки <guibutton>Закрити</guibutton>."
-
-#: ../C/gswitchit.xml:167(title)
-msgid "Availability of Options"
-msgstr "Доступні параметри"
-
-#: ../C/gswitchit.xml:168(para)
-msgid ""
-"All settings from the <guilabel>Keyboard Preferences</guilabel> work even "
-"without the applet, but all the settings in the applet <guilabel>Keyboard "
-"Indicator Preferences</guilabel> are only working when the applet is running."
-msgstr ""
-"Усі параметри вікна <guilabel>Параметри клавіатури</guilabel> працюють "
-"навіть без аплету, але усі параметри у аплеті <guilabel>Параметри "
-"клавіатури</guilabel> працюють лише при запущеному аплеті."
-
-#: ../C/gswitchit.xml:175(guibutton)
-msgid "Default group"
-msgstr "Типова група"
-
-#: ../C/gswitchit.xml:176(para)
-msgid ""
-"This drop-down box sets the group that will be used on the creation of a new "
-"application window. You can also choose the entry <guimenuitem>Not Used</"
-"guimenuitem>, which means new windows will use the currently active group."
-msgstr ""
-"Цей розкривний список визначає групу, яка буде використовуватись при "
-"створенні нового вікна. Також можна вибрати запис <guimenuitem>не "
-"використовувати</guimenuitem>, тоді нові вікна будуть використовувати "
-"поточну активну групу."
-
-#: ../C/gswitchit.xml:182(guibutton)
-msgid "Separate group for each window"
-msgstr "Окрема група для кожного вікна"
-
-#: ../C/gswitchit.xml:183(para)
-msgid ""
-"Selecting this option makes the applet keep and process the active group "
-"independently for each application window on the screen. Note that this "
-"option is only available when the applet is on the panel."
-msgstr ""
-"При відміченні цього параметра аплет буде зберігати та активну групу "
-"незалежну для кожного вікна. Зауважте, цей параметр доступний лише якщо "
-"аплет на панелі."
-
-#: ../C/gswitchit.xml:189(guibutton)
-msgid "Save/restore indicators with group"
-msgstr "Зберігати/відновлювати індикатори групи"
-
-#: ../C/gswitchit.xml:191(para)
-msgid ""
-"Selecting this option allows the applet to keep/process an independent set "
-"of keyboard indicators (Caps Lock, Num Lock, Scroll Lock, etc.) for each "
-"application window on the screen. For example, if your CapsLock is active in "
-"the OpenOffice window and not active in the Evolution window, it is "
-"automatically restored when you switch between these windows -- to the \"On"
-"\" state in the OpenOffice window and to the \"Off\" state in the Evolution "
-"window. This setting is only enabled when you have <guibutton>Separate group "
-"for each window</guibutton> checked."
-msgstr ""
-"При відміченні цього параметра, аплет буде зберігати/обробляти незалежні "
-"набори індикаторів клавіатури (Caps Lock, Num Lock, Scroll Lock, тощо.) для "
-"кожного вікна на екрані. Наприклад, якщо CapsLock активний для вікна "
-"OpenOffice, та не активний для вікна Evolution, він автоматично "
-"відновлюється при перемиканні між цими вікнами -- на стан \"Увімкнено у "
-"вікні OpenOffice та стан \"Вимкнено\" для вікна Evolution. Цей параметр діє, "
-"лише якщо відмічено параметр <guibutton>Окрема група для кожного вікна</"
-"guibutton>."
-
-#: ../C/gswitchit.xml:200(para)
-msgid ""
-"The above option can interfere with settings assigning indicators to groups. "
-"For example, in the <guilabel>Layout Options</guilabel> tab, there are "
-"options allowing to use NumLock as indicator of group #2. So even if you "
-"have <guilabel>Save/restore indicators</guilabel> unchecked (and "
-"<guilabel>Separate group for each window</guilabel> checked), the NumLock "
-"will be restored along with the group anyway."
-msgstr ""
-"Наведений вище параметр може входити у протиріччя з параметрами, що "
-"призначені індикаторам групи. Наприклад, у вкладці <guilabel>Розкладка</"
-"guilabel>, є параметри які дозволяють використовувати NumLock як індикатор "
-"групи №2. Тож, навіть якщо ви не відмітили <guilabel>Зберігати/відновлювати "
-"індикатори</guilabel> (та відмітили <guilabel>Окрема група для кожного "
-"вікна</guilabel>), індикатор NumLock все одно буде відновлюватись разом з "
-"групою."
-
-#: ../C/gswitchit.xml:210(guilabel)
-msgid "Exclude from keyboard switching"
-msgstr "Вилучити з циклу перемикання"
-
-#: ../C/gswitchit.xml:211(para)
-msgid ""
-"This option keeps you from switching off of the selected group from the "
-"keyboard. The number of entries corresponds to the number of the groups "
-"enabled, so you can exclude each group separately."
-msgstr ""
-"Цей параметр запобігає перемиканню на цю групу з клавіатури. Кількість "
-"елементів відповідає кількості увімкнених груп, тому ви можете виключати "
-"кожну групу окремо."
-
-#: ../C/gswitchit.xml:220(title)
-msgid "Plugins"
-msgstr "Модулі"
-
-#: ../C/gswitchit.xml:221(para)
-msgid ""
-"To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select "
-"<guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins "
-"are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr ""
-"Щоб відкрити вікно <guilabel>Модулі індикатора клавіатури</guilabel>, "
-"виберіть з контекстного меню аплету <guimenuitem>Модулі</guimenuitem>. "
-"Встановлені модулі показуються у списку <guilabel>Активні модулі</guilabel>."
-
-#: ../C/gswitchit.xml:226(term)
-msgid "Adding a New Plugin"
-msgstr "Додавання нового модуля"
-
-#: ../C/gswitchit.xml:227(para)
-msgid ""
-"Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> "
-"window, select one of the plugins in the <guilabel>Available plugins</"
-"guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr ""
-"Натисніть кнопку <guibutton>Додати</guibutton>. У вікні <guilabel>Додавання "
-"модуля</guilabel> виберіть модуль зі списку <guilabel>Наявні модулі</"
-"guilabel> та натисніть <guibutton>Гаразд</guibutton>."
-
-#: ../C/gswitchit.xml:233(term)
-msgid "Removing a Plugin"
-msgstr "Видалення модуля"
-
-#: ../C/gswitchit.xml:234(para)
-msgid ""
-"Select the plugin in the <guilabel>Active plugins</guilabel> area that you "
-"do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr ""
-"Виділіть зайвий модуль у списку <guilabel>Активні модулі</guilabel> та "
-"натисніть <guibutton>Видалити</guibutton>."
-
-#: ../C/gswitchit.xml:239(term)
-msgid "Moving Items in the Plugin List"
-msgstr "Переміщення елементів списку модулів"
-
-#: ../C/gswitchit.xml:240(para)
-msgid ""
-"To move items up and down the plugin list in the <guilabel>Active plugins</"
-"guilabel> area, select the plugin you want to move, and click <guibutton>Up</"
-"guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the "
-"keyboard to move the selection point up and down."
-msgstr ""
-"Для переміщення елементів у списку <guilabel>Активні модулі</guilabel> вгору "
-"та вниз, виділіть потрібний модуль та натисніть <guibutton>Вгору</guibutton> "
-"чи <guibutton>Вниз</guibutton>. Також для переміщення виділеного елементу "
-"вгору чи вниз можна користуватись клавішами зі стрілками."
-
-#: ../C/gswitchit.xml:247(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "Зміна властивостей модуля"
-
-#: ../C/gswitchit.xml:248(para)
-msgid ""
-"To change the properties of the plugins, select the plugin you want and "
-"click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr ""
-"Щоб змінити параметри модуля виберіть потрібний модуль та натисніть "
-"<guibutton>Параметри</guibutton>. У кожного модуля свій набір параметрів."
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: ../C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr "Максим Дзюманенко <[email protected]>, 2004, 2005"
-
-#~ msgid "User manual for the Keyboard Indicator applet"
-#~ msgstr "Довідка з аплету Індикатор клавіатури."
diff --git a/gswitchit/help/zh_CN/zh_CN.po b/gswitchit/help/zh_CN/zh_CN.po
deleted file mode 100644
index 1655802b..00000000
--- a/gswitchit/help/zh_CN/zh_CN.po
+++ /dev/null
@@ -1,426 +0,0 @@
-# Translation of gswitchit to Simplified Chinese.
-# Copyright (C) 2008-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-applets package.
-#
-# Zhang Miao <[email protected]>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: MATE\n"
-"POT-Creation-Date: 2009-03-22 11:32+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Zhang Miao <[email protected]>\n"
-"Language-Team: i18n-zh <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: C/gswitchit.xml:23(title)
-msgid "Keyboard Indicator Manual"
-msgstr "键盘指示器手册"
-
-#: C/gswitchit.xml:25(para)
-msgid ""
-"The Keyboard Indicator shows the active keyboard group and enables switching "
-"between different groups."
-msgstr "键盘指示器用于显示活动的键盘组以及启用不同键盘组间的切换。"
-
-#: C/gswitchit.xml:30(year) C/gswitchit.xml:34(year)
-msgid "2004"
-msgstr "2004"
-
-#: C/gswitchit.xml:31(holder)
-msgid "Angela Boyle"
-msgstr "Angela Boyle"
-
-#: C/gswitchit.xml:35(holder)
-msgid "Sergey Udaltsov"
-msgstr "Sergey Udaltsov"
-
-#: C/gswitchit.xml:45(publishername)
-msgid "MATE Documentation Project"
-msgstr "MATE 文档项目"
-
-#: C/gswitchit.xml:50(revnumber)
-msgid "2.8"
-msgstr "2.8"
-
-#: C/gswitchit.xml:51(date)
-msgid "2004-08"
-msgstr "2004-08"
-
-#: C/gswitchit.xml:2(para)
-msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-"later version published by the Free Software Foundation with no Invariant "
-"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
-"in the file COPYING-DOCS distributed with this manual."
-msgstr ""
-"对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software "
-"Foundation) 发布的 GNU 自由文档许可证 (GFDL) 版本 1.1 或更高版本,该许可证没"
-"有固定的部分、没有封面和背页文本。您可以在此<ulink type=\"help\" url=\"ghelp:"
-"fdl\">链接</ulink>上或在随本手册一起分发的 COPYING-DOCS 文件中找到 GFDL 的副"
-"本。"
-
-#: C/gswitchit.xml:12(para)
-msgid ""
-"This manual is part of a collection of MATE manuals distributed under the "
-"GFDL. If you want to distribute this manual separately from the collection, "
-"you can do so by adding a copy of the license to the manual, as described in "
-"section 6 of the license."
-msgstr ""
-"本手册是在 GFDL 许可之下分发的 MATE 手册集合的一部分。如果想要单独分发此手"
-"册,可以在手册中添加该许可证的一份副本然后分发,如该许可证的第 6 部分所述。"
-
-#: C/gswitchit.xml:19(para)
-msgid ""
-"Many of the names used by companies to distinguish their products and "
-"services are claimed as trademarks. Where those names appear in any MATE "
-"documentation, and the members of the MATE Documentation Project are made "
-"aware of those trademarks, then the names are in capital letters or initial "
-"capital letters."
-msgstr ""
-"各个公司使用的许多用于区别它们产品和服务的名称都声明为商标。在所有的 MATE 文"
-"档以及 MATE 文档项目的成员中,这些名称都是以全大写字母或首字母大写显示,从而"
-"表明它们是商标。"
-
-#: C/gswitchit.xml:35(para)
-msgid ""
-"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-"文档按“原样”提供,不提供任何明示或暗示的保证,包括但不限于:文档或文档的修改"
-"版本没有适销性方面的缺陷、适合特定目的的适用性,以及没有侵权行为。您将自行承"
-"担本文档以及文档修改版本的质量、准确性以及性能方面的风险。如果任何文档或文档"
-"修改版本存在缺陷,您(而不是最初的编写者、作者或撰写人)将承担所有必需的服务、"
-"维修或更正的费用。此免责声明是本许可证的重要组成部分。如果不接受此免责声明,"
-"那么您就没有权利使用任何文档或文档的修改版本;并且"
-
-#: C/gswitchit.xml:55(para)
-msgid ""
-"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-"POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-"无论在任何情况以及在任何法律理论下,本文档或文档修改版本的作者、最初的编写"
-"者、任何撰写人或任何分发者,或者任意这些方的任何提供者都不对任何人由于使用本"
-"\"文档或文档修改版本引起或带来的任何直接的、间接的、特殊的、偶然的或继发的损"
-"失承担任何民事(包括疏忽)、合同或其它方面的责任,这些损失包括但不限于信誉损"
-"失、工作停止、计算机失败或故障,或任何以及所有其它损失或由此引发的或与之相关"
-"的损失,即使这些方已被告知存在出现此类损失的可能性时也是如此。"
-
-#: C/gswitchit.xml:28(para)
-msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-"<placeholder-1/>"
-msgstr ""
-"本文档以及文档的修改版本都是在遵循 GNU 自由文档许可证的条款下提供,这表示具有"
-"以下含义:<placeholder-1/>"
-
-#: C/gswitchit.xml:62(firstname)
-msgid "Angela"
-msgstr "Angela"
-
-#: C/gswitchit.xml:63(surname)
-msgid "Boyle"
-msgstr "Boyle"
-
-#: C/gswitchit.xml:65(email)
-
-#: C/gswitchit.xml:69(firstname)
-msgid "Sergey"
-msgstr "Sergey"
-
-#: C/gswitchit.xml:70(surname)
-msgid "Udaltsov"
-msgstr "Udaltsov"
-
-#: C/gswitchit.xml:72(email)
-
-#: C/gswitchit.xml:89(releaseinfo)
-msgid "This manual describes version 2.8 of the Keyboard Indicator applet."
-msgstr "本手册描述的是 2.8 版的键盘指示器。"
-
-#: C/gswitchit.xml:93(title)
-msgid "Feedback"
-msgstr "反馈"
-
-#: C/gswitchit.xml:94(para)
-msgid ""
-"To report a bug or make a suggestion regarding the Keyboard Indicator applet "
-"or this manual, follow the directions in the <ulink url=\"ghelp:mate-"
-"feedback\" type=\"help\">MATE Feedback Page</ulink>."
-msgstr ""
-"对键盘指示器小程序或本手册报告错误或提供建议,请参照<ulink url=\"ghelp:mate-"
-"feedback\" type=\"help\">MATE 反馈页面</ulink> 的指导。"
-
-#: C/gswitchit.xml:103(primary)
-msgid "Keyboard Indicator"
-msgstr "键盘指示器"
-
-#: C/gswitchit.xml:107(title)
-msgid "Introduction"
-msgstr "简介"
-
-#: C/gswitchit.xml:109(para)
-msgid ""
-"<application>Keyboard Indicator</application> indicates the active keyboard "
-"group. The applet shows you which group you are currently using. Aside from "
-"the standard applet popup menu functions, the <application>Keyboard "
-"Indicator</application> applet popup menu allows you to launch the applet "
-"Preferences tool and to switch between language groups."
-msgstr ""
-"<application>键盘指示器</application> 显示活动的键盘组。小程序显示您当前正在"
-"使用的组。除了标准的小程序弹出式菜单功能,<application>键盘指示器</"
-"application>小程序弹出式菜单允许您启动小程序设置工具和切换语言组。"
-
-#: C/gswitchit.xml:115(para)
-msgid ""
-"To add <application>Keyboard Indicator</application> to a panel, right-click "
-"on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select "
-"<application>Keyboard Indicator</application> in the <application>Add to the "
-"panel</application> dialog, then click <guibutton>OK</guibutton>. For more "
-"on this, see <ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject"
-"\">Adding an Object to a Panel</ulink>."
-msgstr ""
-"要将<application>键盘指示器</application>添加到面板,在面板上右击,然后选择"
-"<guimenuitem>添加到面板</guimenuitem>。在<application>添加到面板l</"
-"application> 对话框中选择<application>键盘指示器</application>。关于这方面的"
-"更多信息,参见<ulink type=\"help\" url=\"ghelp:user-guide?panels-addobject\">"
-"添加对象到面板</ulink>。"
-
-#: C/gswitchit.xml:121(para)
-msgid ""
-"To open the <application>Keyboard</application> preference tool, choose "
-"<guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet popup "
-"menu. You may need to go to this dialog to be able to configure the keyboard "
-"(choose model, layouts, options, etc.). For help with setting Keyboard "
-"preferences, see <ulink url=\"ghelp:user-guide?prefs-keyboard\">Configuring "
-"Keyboard Preferences</ulink>."
-msgstr ""
-"要打开<application>键盘</application>设置工具,在小程序弹出式菜单中选择"
-"<guimenuitem>打开键盘设置</guimenuitem>。您可能需要到此对话框中才能配置键盘"
-"(选择模式,布局,选项,等)。更多关于设置键盘的帮助,参见<ulink url=\"ghelp:"
-"user-guide?prefs-keyboard\">配置键盘属性</ulink>。"
-
-#: C/gswitchit.xml:131(title)
-msgid "Switching Language"
-msgstr "切换语言"
-
-#: C/gswitchit.xml:133(para)
-msgid ""
-"First, you must know that a group is a set of characters, whether it be for "
-"a language or non-language-related set of characters, like a dvorak. Each "
-"language may have more than one subset, and each subset is called a group. "
-"There are many ways you can switch the group that you are using on your "
-"keyboard."
-msgstr ""
-"首先,您需要知道一个组是一系列字符,无论它是否是语言中的,或是与语言无关的字"
-"符系列,如dvorak键盘。每个语言可能有多于一个的子集,每个自己称为一个组。切换"
-"您在使用的键盘组有许多方式。"
-
-#: C/gswitchit.xml:141(term)
-msgid "Mouse Click"
-msgstr "鼠标点击"
-
-#: C/gswitchit.xml:142(para)
-msgid ""
-"You can switch between groups with a single click on the applet's panel "
-"icon. The groups switch in a cycle determined by the current configuration."
-msgstr ""
-"您可以在小程序面板图标上单击以在组间切换。一个循环中切换的组决定于当前的配"
-"置。"
-
-#: C/gswitchit.xml:147(term)
-msgid "Popup Menu"
-msgstr "弹出式菜单"
-
-#: C/gswitchit.xml:148(para)
-msgid ""
-"To pick a specific group, select <guisubmenu>Groups</guisubmenu> from the "
-"popup menu. From there, choose the group you want to switch to."
-msgstr ""
-"要选取特定的组,在弹出式菜单中选择<guisubmenu>组</guisubmenu>。从那里选取您想"
-"要切换的组。"
-
-#: C/gswitchit.xml:153(term)
-msgid "Keyboard"
-msgstr "键盘"
-
-#: C/gswitchit.xml:154(para)
-msgid ""
-"In the <application>Keyboard</application> preference tool, you can set "
-"which key that you would like to use to switch groups on your keyboard. "
-"Choose <guimenuitem>Open Keyboard Preferences</guimenuitem> in the applet "
-"popup menu, and choose the key you want to use in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layoutoptions\"><guilabel>Layout Options</"
-"guilabel></ulink> tab, under <guilabel>Group Shift/Lock behavior</guilabel>."
-msgstr ""
-"在 <application>键盘</application> 设置工具中,您可以设置您要在键盘上用哪个键"
-"切换组。在本小程序弹出式菜单中选择<guimenuitem>打开键盘设置</guimenuitem>,然"
-"后在<guilabel>组切换/锁定行为</guilabel>下<ulink url=\"ghelp:user-"
-"guide#prefs-keyboard-layoutoptions\"><guilabel>布局选择</guilabel></ulink> 标"
-"签页中选择您要用的键。"
-
-#: C/gswitchit.xml:161(para)
-msgid ""
-"To add other layouts to the list, open the <application>Keyboard</"
-"application> preference tool. Choose other layouts in the <ulink url=\"ghelp:"
-"user-guide#prefs-keyboard-layouts\"><guilabel>Layouts</guilabel> tab</ulink>."
-msgstr ""
-"要将其他的布局添加到列表,打开<application>键盘</application> 设置工具。在"
-"<ulink url=\"ghelp:user-guide#prefs-keyboard-layouts\"><guilabel>布局</"
-"guilabel> 标签页</ulink> 中选择其他的布局。"
-
-#: C/gswitchit.xml:165(title)
-msgid "Layout View"
-msgstr "布局查看"
-
-#: C/gswitchit.xml:166(para)
-msgid ""
-"Choose <guimenuitem>Layout View</guimenuitem> from the applet popup menu to "
-"see a diagram of your current keyboard layout."
-msgstr ""
-"在小程序弹出式菜单中选择<guimenuitem>布局查看</guimenuitem>以查看您当前的键盘"
-"布局图表。"
-
-#: C/gswitchit.xml:167(para)
-msgid ""
-"In the <guilabel>Layout View</guilabel> window, press a key on your keyboard "
-"to highlight its representation in the diagram."
-msgstr "在 <guilabel>布局查看</guilabel>窗口中,按下一键可在图表中高亮显示它。"
-
-#: C/gswitchit.xml:168(para)
-msgid ""
-"Each key in the diagram has up to four characters. These can be produced "
-"with different keyboard modifiers, as follows:"
-msgstr "图表中的每个键可达四个字符。这些包括不同的键盘标志符,如下:"
-
-#: C/gswitchit.xml:170(para)
-msgid "For the character shown in the bottom left, press the key alone."
-msgstr "在左下角显示的字符,按下相应的键即可。"
-
-#: C/gswitchit.xml:171(para)
-msgid ""
-"For the character shown in the top left, press the key with <keycap>Shift</"
-"keycap>."
-msgstr "左上角显示的字符,按下<keycap>Shift</keycap>的同时按下此键。"
-
-#: C/gswitchit.xml:172(para)
-msgid ""
-"For the character shown in the bottom right, press the key with the third "
-"level modifier."
-msgstr "右下角显示的字符,同时按下第三级标志符和该键。"
-
-#: C/gswitchit.xml:173(para)
-msgid ""
-"For the character shown in the top right, press the key with <keycap>Shift</"
-"keycap> and the third level modifier."
-msgstr ""
-"在右上角显示的字符,同时按下<keycap>Shift</keycap>和第三级标志符以及该键。"
-
-#: C/gswitchit.xml:175(para)
-msgid ""
-"By default, no key is assigned to act as a third-level modifier. You can "
-"assign a key to act as a third level modifier in the <ulink type=\"help\" "
-"url=\"ghelp:user-guide?prefs-keyboard-layoutoptions\">Keyboard Layout "
-"Options Preferences</ulink>."
-msgstr ""
-"默认情况下,没有键会被设为第三级标志符。您可以在 <ulink type=\"help\" url="
-"\"ghelp:user-guide?prefs-keyboard-layoutoptions\">键盘布局选项设置</ulink>中"
-"设置第三级标志符。"
-
-#: C/gswitchit.xml:181(title)
-msgid "Plugins"
-msgstr "插件"
-
-#: C/gswitchit.xml:182(para)
-msgid ""
-"To open the <guilabel>Keyboard Indicator Plugins</guilabel> dialog, select "
-"<guimenuitem>Plugins</guimenuitem> from the popup menu. Your current plugins "
-"are shown in the <guilabel>Active plugins</guilabel> area."
-msgstr ""
-"要打开<guilabel>键盘指示器插件</guilabel> 对话框,在弹出式菜单中选择"
-"<guimenuitem>插件</guimenuitem> 。您当前的插件显示在<guilabel>活动的插件</"
-"guilabel> 区。"
-
-#: C/gswitchit.xml:187(term)
-msgid "Adding a New Plugin"
-msgstr "添加新插件"
-
-#: C/gswitchit.xml:188(para)
-msgid ""
-"Click <guibutton>Add</guibutton>. In the <guilabel>Add Plugin</guilabel> "
-"window, select one of the plugins in the <guilabel>Available plugins</"
-"guilabel> area and click the <guibutton>OK</guibutton> button."
-msgstr ""
-"点击<guibutton>添加</guibutton>,在<guilabel>添加插件</guilabel>窗口中,在"
-"<guilabel>可用的插件</guilabel> 中选择一个并点击 <guibutton>确定</guibutton>"
-"按钮。"
-
-#: C/gswitchit.xml:194(term)
-msgid "Removing a Plugin"
-msgstr "移除插件"
-
-#: C/gswitchit.xml:195(para)
-msgid ""
-"Select the plugin in the <guilabel>Active plugins</guilabel> area that you "
-"do not want anymore and click <guibutton>Remove</guibutton>."
-msgstr ""
-"在<guilabel>活动的插件</guilabel> 区域选择您不再需要的插件,然后点击"
-"<guibutton>移除</guibutton>。"
-
-#: C/gswitchit.xml:200(term)
-msgid "Moving Items in the Plugin List"
-msgstr "正在移除插件列表中的项目"
-
-#: C/gswitchit.xml:201(para)
-msgid ""
-"To move items up and down the plugin list in the <guilabel>Active plugins</"
-"guilabel> area, select the plugin you want to move, and click <guibutton>Up</"
-"guibutton> or <guibutton>Down</guibutton>. You can use the arrows on the "
-"keyboard to move the selection point up and down."
-msgstr ""
-"在<guilabel>活动的插件</guilabel>区域中上下移动插件列表,选择您要移动的插件,"
-"然后点击<guibutton>向上</guibutton>或<guibutton>向下</guibutton>。您可以使用"
-"键盘中的方向键上下移动选择点。"
-
-#: C/gswitchit.xml:208(term)
-msgid "Changing the Properties of a Plugin"
-msgstr "改变插件属性"
-
-#: C/gswitchit.xml:209(para)
-msgid ""
-"To change the properties of the plugins, select the plugin you want and "
-"click <guibutton>Properties</guibutton>. The properties vary for each plugin."
-msgstr ""
-"要改变插件的属性,选择该插件,点击<guibutton>属性</guibutton>。每个插件的属性"
-"不同。"
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/gswitchit.xml:0(None)
-msgid "translator-credits"
-msgstr "Zhang Miao <[email protected]>,2009."