Merge branch 'master' into dvorak

1 files changed, 9 insertions, 22 deletions

diff --git a/keylayout/Generic.kl b/keylayout/Generic.kl
index ce10504..ae84c92 100644
--- a/keylayout/Generic.kl
+++ b/keylayout/Generic.kl
@@ -105,7 +105,7 @@ key 82    NUMPAD_0
 key 83    NUMPAD_DOT
 # key 84 (undefined)
 # key 85 "KEY_ZENKAKUHANKAKU"
-# key 86 "KEY_102ND"
+key 86    BACKSLASH
 key 87    F11
 key 88    F12
 # key 89 "KEY_RO"
@@ -159,10 +159,10 @@ key 128   MEDIA_STOP
 # key 137 "KEY_CUT"
 # key 138 "KEY_HELP"
 key 139   MENU              WAKE_DROPPED
-# key 140 "KEY_CALC"
+key 140   CALCULATOR
 # key 141 "KEY_SETUP"
-# key 142 "KEY_SLEEP"
-# key 143 "KEY_WAKEUP"
+key 142   POWER             WAKE
+key 143   POWER             WAKE
 # key 144 "KEY_FILE"
 # key 145 "KEY_SENDFILE"
 # key 146 "KEY_DELETEFILE"
@@ -171,7 +171,7 @@ key 139   MENU              WAKE_DROPPED
 # key 149 "KEY_PROG2"
 key 150   EXPLORER
 # key 151 "KEY_MSDOS"
-# key 152 "KEY_COFFEE"
+key 152   POWER             WAKE
 # key 153 "KEY_DIRECTION"
 # key 154 "KEY_CYCLEWINDOWS"
 key 155   ENVELOPE
@@ -190,7 +190,7 @@ key 167   MEDIA_RECORD
 key 168   MEDIA_REWIND
 key 169   CALL
 # key 170 "KEY_ISO"
-# key 171 "KEY_CONFIG"
+key 171   MUSIC
 key 172   HOME
 # key 173 "KEY_REFRESH"
 # key 174 "KEY_EXIT"
@@ -232,7 +232,7 @@ key 208   MEDIA_FAST_FORWARD
 # key 210 "KEY_PRINT"
 # key 211 "KEY_HP"
 key 212   CAMERA
-# key 213 "KEY_SOUND"
+key 213   MUSIC
 # key 214 "KEY_QUESTION"
 key 215   ENVELOPE
 # key 216 "KEY_CHAT"
@@ -246,20 +246,6 @@ key 217   SEARCH
 # key 224 "KEY_BRIGHTNESSDOWN"
 # key 225 "KEY_BRIGHTNESSUP"
 key 226   HEADSETHOOK
-key 227   STAR
-key 228   POUND
-key 229   SOFT_LEFT
-key 230   SOFT_RIGHT
-key 231   CALL
-key 232   DPAD_CENTER
-key 233   HEADSETHOOK
-# key 234 "KEY_0_5" or "KEY_SAVE"
-# key 235 "KEY_2_5" or "KEY_DOCUMENTS"
-# key 236 "KEY_SWITCHVIDEOMODE" or "KEY_BATTERY"
-# key 237 "KEY_KBDILLUMTOGGLE"
-# key 238 "KEY_KBDILLUMDOWN"
-# key 239 "KEY_KBDILLUMUP"
-# key 240 "KEY_UNKNOWN"
 
 key 256   BUTTON_1
 key 257   BUTTON_2
@@ -358,7 +344,7 @@ key 377   TV
 # key 394 "KEY_DIRECTORY"
 # key 395 "KEY_LIST"
 # key 396 "KEY_MEMO"
-# key 397 "KEY_CALENDAR"
+key 397   CALENDAR
 # key 398 "KEY_RED"
 # key 399 "KEY_GREEN"
 # key 400 "KEY_YELLOW"
@@ -378,6 +364,7 @@ key 403   CHANNEL_DOWN
 # key 414 "KEY_TEEN"
 # key 415 "KEY_TWEN"
 
+key 429   CONTACTS
 
 # key 448 "KEY_DEL_EOL"
 # key 449 "KEY_DEL_EOS"