Index: kbd-1.15/data/keymaps/i386/fgGIod/trf.map
===================================================================
--- kbd-1.15.orig/data/keymaps/i386/fgGIod/trf.map
+++ kbd-1.15/data/keymaps/i386/fgGIod/trf.map
@@ -5,112 +5,135 @@ strings as usual
 
 keycode   1 = Escape Escape
 	alt       keycode   1 = Meta_Escape
-keycode   2 = one exclam asciitilde
+keycode   2 = one exclam onesuperior
 	alt       keycode   2 = Meta_one
 	alt shift keycode   2 = Meta_exclam
-keycode   3 = two at ampersand
+keycode   3 = two quotedbl twosuperior
 	control   keycode   3 = nul
 	control shift keycode   3 = nul
 	alt       keycode   3 = Meta_two
 	alt shift keycode   3 = Meta_at
-keycode   4 = three quotedbl numbersign
+keycode   4 = three asciicircum numbersign
 	control   keycode   4 = Escape
 	alt       keycode   4 = Meta_three
 	alt shift keycode   4 = Meta_quotedbl
-keycode   5 = four apostrophe dollar
+keycode   5 = four dollar onequarter
 	control   keycode   5 = Control_backslash
 	alt       keycode   5 = Meta_four
 	alt shift keycode   5 = Meta_apostrophe
-keycode   6 = five parenleft less
+keycode   6 = five percent onehalf
 	control   keycode   6 = Control_bracketright
 	alt       keycode   6 = Meta_five
 	alt shift keycode   6 = Meta_parenleft
-keycode   7 = six slash greater
+keycode   7 = six ampersand threequarters
 	control   keycode   7 = Control_asciicircum
 	alt       keycode   7 = Meta_six
 	alt shift keycode   7 = Meta_slash
-keycode   8 = seven parenright braceleft
+keycode   8 = seven apostrophe braceleft
 	control   keycode   8 = Control_underscore
 	alt       keycode   8 = Meta_seven
 	alt shift keycode   8 = Meta_parenright
-keycode   9 = eight underscore braceright
+keycode   9 = eight parenleft bracketleft
 	control   keycode   9 = Delete
 	alt       keycode   9 = Meta_eight
 	alt shift keycode   9 = Meta_underscore
-keycode  10 = nine percent bracketleft
+keycode  10 = nine parenright bracketright
 	alt       keycode  10 = Meta_nine
 	alt shift keycode  10 = Meta_percent
-keycode  11 = zero colon bracketright
+keycode  11 = zero equal braceright
 	alt       keycode  11 = Meta_zero
 	alt shift keycode  11 = Meta_colon
-keycode  12 = x
-keycode  13 = q
+keycode  12 = slash question backslash
+	control   keycode  12 = Control_underscore
+	control shift keycode  12 = Control_underscore
+	alt       keycode  12 = Meta_minus
+keycode  13 = minus underscore division
+	alt       keycode  13 = Meta_equal
 keycode  14 = Delete	Delete
 	alt       keycode  14 = Meta_Delete
 keycode  15 = Tab
-	shift	keycode  15 = Meta_Tab
+	shift     keycode  15 = Meta_Tab
 	alt       keycode  15 = Meta_Tab
 keycode  16 = f
+	altgr     keycode  16 = at
 keycode  17 = g
 keycode  18 = +0360 +0320
 keycode  19 = +0375 +I
-	altgr keycode  19 = +0356
+	altgr     keycode  19 = paragraph
 	altgr shift keycode  19 = +0316
 keycode  20 = o
-	altgr keycode  20 = +0364
+	altgr     keycode  20 = ocircumflex
 	altgr shift keycode  20 = +0324
 keycode  21 = d
+	altgr     keycode  21 = yen
 keycode  22 = r
+	altgr     keycode  22 = registered
 keycode  23 = n
 keycode  24 = h
+	altgr     keycode  24 = degree
 keycode  25 = p
-keycode  26 = semicolon asterisk
+	altgr     keycode  25 = sterling
+keycode  26 = q
 	control   keycode  26 = Escape
-	alt       keycode  26 = Meta_semicolon
-	alt shift keycode  26 = Meta_asterisk
-keycode  27 = asciicircum grave
+	alt       keycode  26 = Meta_bracketleft
+	alt shift keycode  26 = Meta_braceleft
+	altgr     keycode  26 = dead_diaeresis
+keycode  27 = w
 	control   keycode  27 = Control_bracketright
-	alt       keycode  27 = Meta_asciicircum
-	alt shift keycode  27 = Meta_grave
+	alt       keycode  27 = Meta_bracketright
+	alt shift keycode  27 = Meta_braceright
+	altgr     keycode  27 = asciitilde
 keycode  28 = Return
 	alt       keycode  28 = 0x080d
 keycode  29 = Control
 keycode  30 = u
-	altgr keycode  30 = +0373
+	altgr     keycode  30 = ucircumflex
 	altgr shift keycode  30 = +0333
 keycode  31 = +i +0335
+	altgr     keycode  31 = icircumflex
 keycode  32 = e
+	altgr     keycode  32 = currency
 keycode  33 = a
-	altgr keycode  33 = +0342
+	altgr     keycode  33 = acircumflex
 	altgr shift keycode  33 = +0302
 keycode  34 = +0374 +0334
+	altgr     keycode  34 = ucircumflex
 keycode  35 = t
 keycode  36 = k
 keycode  37 = m
+	altgr     keycode  37 = mu
 keycode  38 = l
 keycode  39 = y
+	altgr     keycode  39 = acute
 keycode  40 = +0376 +0336
 	control   keycode  40 = Control_g
-keycode  41 = w
+	altgr     keycode  40 = numbersign
+keycode  41 = plus asterisk notsign
 	control   keycode  41 = nul
 keycode  42 = Shift
-keycode  43 = equal plus
+keycode  43 = x
 	control   keycode  43 = Control_backslash
 	alt       keycode  43 = Meta_equal
 	alt shift keycode  43 = Meta_plus
+	altgr     keycode  43 = grave
 keycode  44 = j
+	altgr     keycode  44 = guillemotleft
 keycode  45 = +0366 +0326
+	altgr     keycode  45 = guillemotright
 keycode  46 = v
 keycode  47 = c
+	altgr     keycode  47 = cent
 keycode  48 = +0347 +0307
 keycode  49 = z
 keycode  50 = s
+	altgr     keycode  50 = section
 keycode  51 = b
-keycode  52 = period question
+	altgr     keycode  51 = multiply
+keycode  52 = period colon division
 	control   keycode  52 = Delete
 	alt       keycode  52 = Meta_period
 	alt shift keycode  52 = Meta_question
-keycode  53 = comma minus slash
+keycode  53 = comma semicolon periodcentered
 	alt       keycode  53 = Meta_comma
 	alt shift keycode  53 = Meta_minus
 keycode  54 = Shift
@@ -121,7 +144,7 @@ keycode  58 = Caps_Lock
 keycode  83 = KP_Comma KP_Period
 	altgr control keycode 83 = Boot
 	control alt   keycode 83 = Boot
-keycode  86 = backslash bar
+keycode  86 = less greater bar
 	alt       keycode  86 = Meta_backslash
 	alt shift keycode  86 = Meta_bar
 keycode  97 = Control
