--- a/textinput/ptienginev2/keymaps/EMU/ELangEstonian.txt	Tue Aug 31 15:31:50 2010 +0300
+++ b/textinput/ptienginev2/keymaps/EMU/ELangEstonian.txt	Wed Sep 01 12:23:33 2010 +0100
@@ -45,101 +45,73 @@
 #
 [KEYBOARD BLOCK QWERTY STANDARD]
 
-key lower (1 2) 0x31
-key upper (1 2) 0x21
-key lower (1 3) 0x32
-key upper (1 3) 0x22
-key lower (1 4) 0x33
-key upper (1 4) 0x20ac
-key lower (1 5) 0x34
-key upper (1 5) 0x2a
-key lower (1 6) 0x35
-key upper (1 6) 0x2f
-key lower (1 7) 0x36
-key upper (1 7) 0x28
-key lower (1 8) 0x37
-key upper (1 8) 0x29
-key lower (1 9) 0x38
-key upper (1 9) 0x3d
-key lower (1 10) 0x39
-key upper (1 10) 0x3f
-key lower (1 11) 0x30
-key upper (1 11) 0xdf
-key lower (3 2) 0x61,0x101,0x105,0xe5,0xe6
-key upper (3 2) 0x41,0x100,0x104,0xc5,0xc6
-key lower (4 6) 0x62
-key upper (4 6) 0x42
-key lower (4 4) 0x63,0x10d
-key upper (4 4) 0x43,0x10c
-key lower (3 4) 0x64
-key upper (3 4) 0x44
-key lower (2 4) 0x65,0xe9,0x113,0x117,0x119
-key upper (2 4) 0x45,0xc9,0x112,0x116,0x118
-key lower (3 5) 0x66
-key upper (3 5) 0x46
-key lower (3 6) 0x67,0x123
-key upper (3 6) 0x47,0x122
-key lower (3 7) 0x68
-key upper (3 7) 0x48
-key lower (2 9) 0x69,0x12b,0x12f
-key upper (2 9) 0x49,0x12a,0x12e
-key lower (3 8) 0x6a
-key upper (3 8) 0x4a
-key lower (3 9) 0x6b,0x137
-key upper (3 9) 0x4b,0x136
-key lower (3 10) 0x6c,0x13c
-key upper (3 10) 0x4c,0x13b
-key lower (4 8) 0x6d
-key upper (4 8) 0x4d
-key lower (4 7) 0x6e,0x146
-key upper (4 7) 0x4e,0x145
-key lower (2 10) 0x6f,0xf5,0xf8
-key upper (2 10) 0x4f,0xd5,0xd8
-key lower (2 11) 0x70
-key upper (2 11) 0x50
-key lower (2 2) 0x71
-key upper (2 2) 0x51
-key lower (2 5) 0x72,0x157
-key upper (2 5) 0x52,0x156
-key lower (3 3) 0x73,0x161,0xdf
-key upper (3 3) 0x53,0x160
-key lower (2 6) 0x74
-key upper (2 6) 0x54
-key lower (2 8) 0x75,0x16b,0x173
-key upper (2 8) 0x55,0x16a,0x172
-key lower (4 5) 0x76
-key upper (4 5) 0x56
-key lower (2 3) 0x77
-key upper (2 3) 0x57
-key lower (4 3) 0x78
-key upper (4 3) 0x58
-key lower (2 7) 0x7a,0x17e
-key upper (2 7) 0x5a,0x17d
-key lower (4 2) 0x79
-key upper (4 2) 0x59
-key lower (2 1) 0x40
-key upper (2 1) 0xf001,0x7e
-key lower (2 12) 0xfc
-key upper (2 12) 0xdc
-key lower (4 9) 0x2c
-key upper (4 9) 0x3b
-key lower (3 11) 0xf6
-key upper (3 11) 0xd6
-key lower (4 10) 0x2e
-key upper (4 10) 0x3a
-key lower (3 1) 0x2b
-key upper (3 1) 0x23
-key lower (4 11) 0x2d
-key upper (4 11) 0x27
-key lower (3 12) 0xe4
-key upper (3 12) 0xc4
+key lower (1 1) 0x0071
+key upper (1 1) 0x0051
+key lower (1 2) 0x0077
+key upper (1 2) 0x0057
+key lower (1 3) 0x0065
+key upper (1 3) 0x0045
+key lower (1 4) 0x0072
+key upper (1 4) 0x0052
+key lower (1 5) 0x0074
+key upper (1 5) 0x0054
+key lower (1 6) 0x0079
+key upper (1 6) 0x0059
+key lower (1 7) 0x0075
+key upper (1 7) 0x0055
+key lower (1 8) 0x0069
+key upper (1 8) 0x0049
+key lower (1 9) 0x006F
+key upper (1 9) 0x004F
+key lower (1 10) 0x0070
+key upper (1 10) 0x0050
+key lower (1 11) 0x00FC
+key upper (1 11) 0x00DC
+key lower (2 1) 0x0061
+key upper (2 1) 0x0041
+key lower (2 2) 0x0073
+key upper (2 2) 0x0053
+key lower (2 3) 0x0064
+key upper (2 3) 0x0044
+key lower (2 4) 0x0066
+key upper (2 4) 0x0046
+key lower (2 5) 0x0067
+key upper (2 5) 0x0047
+key lower (2 6) 0x0068
+key upper (2 6) 0x0048
+key lower (2 7) 0x006A
+key upper (2 7) 0x004A
+key lower (2 8) 0x006B
+key upper (2 8) 0x004B
+key lower (2 9) 0x006C
+key upper (2 9) 0x004C
+key lower (2 10) 0x00F6
+key upper (2 10) 0x00D6
+key lower (2 11) 0x00E4
+key upper (2 11) 0x00C4
+key lower (3 1) 0x007A
+key upper (3 1) 0x005A
+key lower (3 2) 0x0078
+key upper (3 2) 0x0058
+key lower (3 3) 0x0063
+key upper (3 3) 0x0043
+key lower (3 4) 0x0076
+key upper (3 4) 0x0056
+key lower (3 5) 0x0062
+key upper (3 5) 0x0042
+key lower (3 6) 0x006E
+key upper (3 6) 0x004E
+key lower (3 7) 0x006D
+key upper (3 7) 0x004D
+key lower (3 8) 0x002C
+key upper (3 8) 0x0027
+key lower (3 9) 0x002E
+key upper (3 9) 0x002D
+key lower (3 10) 0x003F
+key upper (3 10) 0x0021
+key lower (3 11) 0x00F5
+key upper (3 11) 0x00D5
 
-#
-# Dead key data data
-# 0xf000 means "no dead key character for that index".
-#
-dead_key_data lower (2 10) 0x00f5,0xf000,0xf000,0xf000,0xf000
-dead_key_data upper (2 10) 0x00d5,0xf000,0xf000,0xf000,0xf000
 
 #
 # Three row mini qwerty keymap data.