[ros-diffs] [reactos] 01/01: [OSK] On Screen Keyboard overhaul

23 Oct 2021

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1faa1cc6d6aade97b19b…

commit a1faa1cc6d6aade97b19b06cbd903ddf3a4bc6eb
Author:     Baruch Rutman &lt;peterooch(a)gmail.com&gt;
AuthorDate: Wed Aug 11 22:36:30 2021 +0300
Commit:     George Bișoc &lt;george.bisoc(a)reactos.org&gt;
CommitDate: Sat Oct 23 09:45:46 2021 +0200

    [OSK] On Screen Keyboard overhaul
    
    Primary changes:
    Convert from dialog to an ordinary window, placing buttons according to data in
keyboard.c
    Character button text is now according to selected keyboard layout instead of system
language.
    Buttons will update* automatically when there is a layout switch (and when
shift/capslock are pressed).
    (Updating is most reliable when the keyboard is focused)
    Removed keyboard dialog templates from resource files, they live on in keyboard.c
    
    Secondary changes:
    Support for font change, currently saved in registry is facename and height.
    Additional registry load/save functions for strings to facilitate above change.
---
 base/applications/osk/CMakeLists.txt |   3 +-
 base/applications/osk/keyboard.c     | 251 +++++++++++++
 base/applications/osk/lang/ar-DZ.rc  | 259 +------------
 base/applications/osk/lang/cs-CZ.rc  | 259 +------------
 base/applications/osk/lang/de-DE.rc  | 260 +------------
 base/applications/osk/lang/en-GB.rc  | 260 +------------
 base/applications/osk/lang/en-US.rc  | 259 +------------
 base/applications/osk/lang/es-ES.rc  | 260 +------------
 base/applications/osk/lang/et-EE.rc  | 259 +------------
 base/applications/osk/lang/fr-CA.rc  | 260 +------------
 base/applications/osk/lang/fr-FR.rc  | 260 +------------
 base/applications/osk/lang/he-IL.rc  | 259 +------------
 base/applications/osk/lang/id-ID.rc  | 259 +------------
 base/applications/osk/lang/it-IT.rc  | 261 +------------
 base/applications/osk/lang/pl-PL.rc  | 259 +------------
 base/applications/osk/lang/ro-RO.rc  | 259 +------------
 base/applications/osk/lang/ru-RU.rc  | 259 +------------
 base/applications/osk/lang/tr-TR.rc  | 261 +------------
 base/applications/osk/lang/zh-CN.rc  | 259 +------------
 base/applications/osk/lang/zh-TW.rc  | 259 +------------
 base/applications/osk/main.c         | 689 +++++++++++++++++++++++------------
 base/applications/osk/osk_res.h      |  23 +-
 base/applications/osk/precomp.h      |  84 ++++-
 base/applications/osk/settings.c     | 156 ++++++--
 24 files changed, 1253 insertions(+), 4624 deletions(-)

diff --git a/base/applications/osk/CMakeLists.txt b/base/applications/osk/CMakeLists.txt
index 293eba14b50..b3171bfb3ea 100644
--- a/base/applications/osk/CMakeLists.txt
+++ b/base/applications/osk/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 list(APPEND SOURCE
+    keyboard.c
     main.c
     settings.c
     precomp.h)
@@ -8,6 +9,6 @@ file(GLOB osk_rc_deps res/*.*)
 add_rc_deps(osk.rc ${osk_rc_deps})
 add_executable(osk ${SOURCE} osk.rc)
 set_module_type(osk win32gui UNICODE)
-add_importlibs(osk comdlg32 uxtheme winmm shell32 user32 gdi32 advapi32 comctl32 msvcrt
kernel32 ntdll)
+add_importlibs(osk comdlg32 winmm shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32
ntdll)
 add_pch(osk precomp.h SOURCE)
 add_cd_file(TARGET osk DESTINATION reactos/system32 FOR all)
diff --git a/base/applications/osk/keyboard.c b/base/applications/osk/keyboard.c
new file mode 100644
index 00000000000..8c57a5201b1
--- /dev/null
+++ b/base/applications/osk/keyboard.c
@@ -0,0 +1,251 @@
+/*
+ * PROJECT:         ReactOS On-Screen Keyboard
+ * LICENSE:         GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:         Keyboard layout data.
+ * COPYRIGHT:       Baruch Rutman (peterooch at gmail dot com)
+ * 
+ * This is partialy based on the original en-US dialog templates.
+ */
+#include "precomp.h"
+
+KEY EnhancedKeyboardKeys[] = 
+{
+    {L"Esc", SCAN_CODE_110, 4, 4, 28, 28, 0, FALSE},
+    {L"F1", SCAN_CODE_112, 68, 4, 28, 28, 0, FALSE},
+    {L"F2", SCAN_CODE_113, 100, 4, 28, 28, 0, FALSE},
+    {L"F3", SCAN_CODE_114, 132, 4, 28, 28, 0, FALSE},
+    {L"F4", SCAN_CODE_115, 164, 4, 28, 28, 0, FALSE},
+    {L"F5", SCAN_CODE_116, 228, 4, 28, 28, 0, FALSE},
+    {L"F6", SCAN_CODE_117, 260, 4, 28, 28, 0, FALSE},
+    {L"F7", SCAN_CODE_118, 292, 4, 28, 28, 0, FALSE},
+    {L"F8", SCAN_CODE_119, 324, 4, 28, 28, 0, FALSE},
+    {L"F9", SCAN_CODE_120, 388, 4, 28, 28, 0, FALSE},
+    {L"F10", SCAN_CODE_121, 420, 4, 28, 28, 0, FALSE},
+    {L"F11", SCAN_CODE_122, 452, 4, 28, 28, 0, FALSE},
+    {L"F12", SCAN_CODE_123, 484, 4, 28, 28, 0, FALSE},
+    {L"Prn", SCAN_CODE_124, 516, 4, 28, 28, 0, FALSE},
+    {L"Stop", SCAN_CODE_125, 548, 4, 28, 28, 0, FALSE},
+    {L"Attn", SCAN_CODE_126, 580, 4, 28, 28, 0, FALSE},
+    {L"`", SCAN_CODE_1, 4, 35, 28, 28, 0, TRUE},
+    {L"1", SCAN_CODE_2, 36, 35, 28, 28, 0, TRUE},
+    {L"2", SCAN_CODE_3, 68, 35, 28, 28, 0, TRUE},
+    {L"3", SCAN_CODE_4, 100, 35, 28, 28, 0, TRUE},
+    {L"4", SCAN_CODE_5, 132, 35, 28, 28, 0, TRUE},
+    {L"5", SCAN_CODE_6, 164, 35, 28, 28, 0, TRUE},
+    {L"6", SCAN_CODE_7, 196, 35, 28, 28, 0, TRUE},
+    {L"7", SCAN_CODE_8, 228, 35, 28, 28, 0, TRUE},
+    {L"8", SCAN_CODE_9, 260, 35, 28, 28, 0, TRUE},
+    {L"9", SCAN_CODE_10, 292, 35, 28, 28, 0, TRUE},
+    {L"0", SCAN_CODE_11, 324, 35, 28, 28, 0, TRUE},
+    {L"-", SCAN_CODE_12, 356, 35, 28, 28, 0, TRUE},
+    {L"=", SCAN_CODE_13, 388, 35, 28, 28, 0, TRUE},
+    {L"<--", SCAN_CODE_15, 420, 35, 92, 28, BS_ICON, FALSE},
+    {L"Tab", SCAN_CODE_16, 4, 65, 60, 28, BS_ICON, FALSE},
+    {L"q", SCAN_CODE_17, 67, 65, 28, 28, 0, TRUE},
+    {L"w", SCAN_CODE_18, 97, 65, 28, 28, 0, TRUE},
+    {L"e", SCAN_CODE_19, 128, 65, 28, 28, 0, TRUE},
+    {L"r", SCAN_CODE_20, 158, 65, 28, 28, 0, TRUE},
+    {L"t", SCAN_CODE_21, 188, 65, 28, 28, 0, TRUE},
+    {L"y", SCAN_CODE_22, 219, 65, 28, 28, 0, TRUE},
+    {L"u", SCAN_CODE_23, 249, 65, 28, 28, 0, TRUE},
+    {L"i", SCAN_CODE_24, 280, 65, 28, 28, 0, TRUE},
+    {L"o", SCAN_CODE_25, 310, 65, 28, 28, 0, TRUE},
+    {L"p", SCAN_CODE_26, 340, 65, 28, 28, 0, TRUE},
+    {L"[", SCAN_CODE_27, 371, 65, 28, 28, 0, TRUE},
+    {L"]", SCAN_CODE_28, 401, 65, 28, 28, 0, TRUE},
+    {L"lock", SCAN_CODE_30, 4, 96, 78, 28, BS_ICON, FALSE},
+    {L"a", SCAN_CODE_31, 84, 96, 28, 28, 0, TRUE},
+    {L"s", SCAN_CODE_32, 115, 96, 28, 28, 0, TRUE},
+    {L"d", SCAN_CODE_33, 145, 96, 28, 28, 0, TRUE},
+    {L"f", SCAN_CODE_34, 176, 96, 28, 28, 0, TRUE},
+    {L"g", SCAN_CODE_35, 206, 96, 28, 28, 0, TRUE},
+    {L"h", SCAN_CODE_36, 236, 96, 28, 28, 0, TRUE},
+    {L"j", SCAN_CODE_37, 267, 96, 28, 28, 0, TRUE},
+    {L"k", SCAN_CODE_38, 297, 96, 28, 28, 0, TRUE},
+    {L"l", SCAN_CODE_39, 328, 96, 28, 28, 0, TRUE},
+    {L";", SCAN_CODE_40, 358, 96, 28, 28, 0, TRUE},
+    {L"'", SCAN_CODE_41, 388, 96, 28, 28, 0, TRUE},
+    {L"\\", SCAN_CODE_29, 432, 65, 80, 28, 0, TRUE},
+    {L"ret", SCAN_CODE_43, 419, 96, 93, 28, BS_ICON, FALSE},
+    {L"shift", SCAN_CODE_44, 4, 126, 95, 28,
BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE},
+    {L"z", SCAN_CODE_46, 102, 126, 28, 28, 0, TRUE},
+    {L"x", SCAN_CODE_47, 132, 126, 28, 28, 0, TRUE},
+    {L"c", SCAN_CODE_48, 163, 126, 28, 28, 0, TRUE},
+    {L"v", SCAN_CODE_49, 193, 126, 28, 28, 0, TRUE},
+    {L"b", SCAN_CODE_50, 224, 126, 28, 28, 0, TRUE},
+    {L"n", SCAN_CODE_51, 254, 126, 28, 28, 0, TRUE},
+    {L"m", SCAN_CODE_52, 284, 126, 28, 28, 0, TRUE},
+    {L",", SCAN_CODE_53, 315, 126, 28, 28, 0, TRUE},
+    {L".", SCAN_CODE_54, 345, 126, 28, 28, 0, TRUE},
+    {L"/", SCAN_CODE_55, 376, 126, 28, 28, 0, TRUE},
+    {L"shift", SCAN_CODE_57, 406, 126, 106, 28,
BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE},
+    {L"ctrl", SCAN_CODE_58, 4, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX,
FALSE},
+    {L"v", SCAN_CODE_84, 548, 156, 28, 28, BS_ICON, FALSE},
+    {L"ROS", SCAN_CODE_127, 48, 156, 43, 28,
BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE},
+    {L"alt", SCAN_CODE_60, 91, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX,
FALSE},
+    {L"", SCAN_CODE_61, 134, 156, 204, 28, 0, FALSE},
+    {L"alt", SCAN_CODE_62, 340, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX,
FALSE},
+    {L"ROS", SCAN_CODE_128, 384, 156, 43, 28,
BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE},
+    {L"menu", SCAN_CODE_129, 427, 156, 43, 28, BS_ICON, FALSE},
+    {L"ctrl", SCAN_CODE_64, 470, 156, 42, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX,
FALSE},
+    {L"ins", SCAN_CODE_75, 516, 35, 28, 28, 0, FALSE},
+    {L"del", SCAN_CODE_76, 516, 65, 28, 28, 0, FALSE},
+    {L"hm", SCAN_CODE_80, 548, 35, 28, 28, BS_ICON, FALSE},
+    {L"end", SCAN_CODE_81, 548, 65, 28, 28, 0, FALSE},
+    {L"pup", SCAN_CODE_85, 580, 35, 28, 28, BS_ICON, FALSE},
+    {L"pdn", SCAN_CODE_86, 580, 65, 28, 28, BS_ICON, FALSE},
+    {L"<-", SCAN_CODE_79, 516, 156, 28, 28, BS_ICON, FALSE},
+    {L"^", SCAN_CODE_83, 548, 126, 28, 28, BS_ICON, FALSE},
+    {L"->", SCAN_CODE_89, 580, 156, 28, 28, BS_ICON, FALSE},
+    {L"nlk", SCAN_CODE_90, 612, 35, 28, 28, 0, FALSE},
+    {L"7", SCAN_CODE_91, 612, 65, 28, 28, 0, FALSE},
+    {L"4", SCAN_CODE_92, 612, 96, 28, 28, 0, FALSE},
+    {L"1", SCAN_CODE_93, 612, 126, 28, 28, 0, FALSE},
+    {L"/", SCAN_CODE_95, 644, 35, 28, 28, 0, FALSE},
+    {L"8", SCAN_CODE_96, 644, 65, 28, 28, 0, FALSE},
+    {L"5", SCAN_CODE_97, 644, 96, 28, 28, 0, FALSE},
+    {L"2", SCAN_CODE_98, 644, 126, 28, 28, 0, FALSE},
+    {L"0", SCAN_CODE_99, 612, 156, 60, 28, 0, FALSE},
+    {L"*", SCAN_CODE_100, 676, 35, 28, 28, 0, FALSE},
+    {L"9", SCAN_CODE_101, 676, 65, 28, 28, 0, FALSE},
+    {L"6", SCAN_CODE_102, 676, 96, 28, 28, 0, FALSE},
+    {L"3", SCAN_CODE_103, 676, 126, 28, 28, 0, FALSE},
+    {L".", SCAN_CODE_104, 676, 156, 28, 28, 0, FALSE},
+    {L"-", SCAN_CODE_105, 708, 35, 28, 28, 0, FALSE},
+    {L"+", SCAN_CODE_106, 708, 65, 28, 59, 0, FALSE},
+    {L"ent", SCAN_CODE_108, 708, 126, 28, 58, 0, FALSE},
+};
+
+KEY StandardKeyboardKeys[] = 
+{
+    {L"Esc", SCAN_CODE_110, 4, 4, 28, 28, 0, FALSE},
+    {L"F1", SCAN_CODE_112, 68, 4, 28, 28, 0, FALSE},
+    {L"F2", SCAN_CODE_113, 100, 4, 28, 28, 0, FALSE},
+    {L"F3", SCAN_CODE_114, 132, 4, 28, 28, 0, FALSE},
+    {L"F4", SCAN_CODE_115, 164, 4, 28, 28, 0, FALSE},
+    {L"F5", SCAN_CODE_116, 196, 4, 28, 28, 0, FALSE},
+    {L"F6", SCAN_CODE_117, 228, 4, 28, 28, 0, FALSE},
+    {L"F7", SCAN_CODE_118, 292, 4, 28, 28, 0, FALSE},
+    {L"F8", SCAN_CODE_119, 324, 4, 28, 28, 0, FALSE},
+    {L"F9", SCAN_CODE_120, 356, 4, 28, 28, 0, FALSE},
+    {L"F10", SCAN_CODE_121, 388, 4, 28, 28, 0, FALSE},
+    {L"F11", SCAN_CODE_122, 420, 4, 28, 28, 0, FALSE},
+    {L"F12", SCAN_CODE_123, 452, 4, 28, 28, 0, FALSE},
+    {L"Prn", SCAN_CODE_124, 486, 4, 28, 28, 0, FALSE},
+    {L"Stop", SCAN_CODE_125, 518, 4, 28, 28, 0, FALSE},
+    {L"Attn", SCAN_CODE_126, 550, 4, 28, 28, 0, FALSE},
+    {L"`", SCAN_CODE_1, 4, 35, 28, 28, 0, TRUE},
+    {L"1", SCAN_CODE_2, 36, 35, 28, 28, 0, TRUE},
+    {L"2", SCAN_CODE_3, 68, 35, 28, 28, 0, TRUE},
+    {L"3", SCAN_CODE_4, 100, 35, 28, 28, 0, TRUE},
+    {L"4", SCAN_CODE_5, 132, 35, 28, 28, 0, TRUE},
+    {L"5", SCAN_CODE_6, 164, 35, 28, 28, 0, TRUE},
+    {L"6", SCAN_CODE_7, 196, 35, 28, 28, 0, TRUE},
+    {L"7", SCAN_CODE_8, 228, 35, 28, 28, 0, TRUE},
+    {L"8", SCAN_CODE_9, 260, 35, 28, 28, 0, TRUE},
+    {L"9", SCAN_CODE_10, 292, 35, 28, 28, 0, TRUE},
+    {L"0", SCAN_CODE_11, 324, 35, 28, 28, 0, TRUE},
+    {L"-", SCAN_CODE_12, 356, 35, 28, 28, 0, TRUE},
+    {L"=", SCAN_CODE_13, 388, 35, 28, 28, 0, TRUE},
+    {L"<--", SCAN_CODE_15, 420, 35, 63, 28, BS_ICON, FALSE},
+    {L"Tab", SCAN_CODE_16, 4, 65, 60, 28, BS_ICON, FALSE},
+    {L"q", SCAN_CODE_17, 67, 65, 28, 28, 0, TRUE},
+    {L"w", SCAN_CODE_18, 97, 65, 28, 28, 0, TRUE},
+    {L"e", SCAN_CODE_19, 128, 65, 28, 28, 0, TRUE},
+    {L"r", SCAN_CODE_20, 158, 65, 28, 28, 0, TRUE},
+    {L"t", SCAN_CODE_21, 188, 65, 28, 28, 0, TRUE},
+    {L"y", SCAN_CODE_22, 219, 65, 28, 28, 0, TRUE},
+    {L"u", SCAN_CODE_23, 249, 65, 28, 28, 0, TRUE},
+    {L"i", SCAN_CODE_24, 280, 65, 28, 28, 0, TRUE},
+    {L"o", SCAN_CODE_25, 310, 65, 28, 28, 0, TRUE},
+    {L"p", SCAN_CODE_26, 340, 65, 28, 28, 0, TRUE},
+    {L"[", SCAN_CODE_27, 371, 65, 28, 28, 0, TRUE},
+    {L"]", SCAN_CODE_28, 401, 65, 28, 28, 0, TRUE},
+    {L"lock", SCAN_CODE_30, 4, 96, 78, 28, BS_ICON, FALSE},
+    {L"a", SCAN_CODE_31, 84, 96, 28, 28, 0, TRUE},
+    {L"s", SCAN_CODE_32, 115, 96, 28, 28, 0, TRUE},
+    {L"d", SCAN_CODE_33, 145, 96, 28, 28, 0, TRUE},
+    {L"f", SCAN_CODE_34, 176, 96, 28, 28, 0, TRUE},
+    {L"g", SCAN_CODE_35, 206, 96, 28, 28, 0, TRUE},
+    {L"h", SCAN_CODE_36, 236, 96, 28, 28, 0, TRUE},
+    {L"j", SCAN_CODE_37, 267, 96, 28, 28, 0, TRUE},
+    {L"k", SCAN_CODE_38, 297, 96, 28, 28, 0, TRUE},
+    {L"l", SCAN_CODE_39, 328, 96, 28, 28, 0, TRUE},
+    {L";", SCAN_CODE_40, 358, 96, 28, 28, 0, TRUE},
+    {L"'", SCAN_CODE_41, 388, 96, 28, 28, 0, TRUE},
+    {L"\\", SCAN_CODE_29, 432, 65, 51, 28, 0, TRUE},
+    {L"ret", SCAN_CODE_43, 419, 96, 64, 28, BS_ICON, FALSE},
+    {L"shift", SCAN_CODE_44, 4, 126, 96, 28,
BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE},
+    {L"z", SCAN_CODE_46, 102, 126, 28, 28, 0, TRUE},
+    {L"x", SCAN_CODE_47, 132, 126, 28, 28, 0, TRUE},
+    {L"c", SCAN_CODE_48, 163, 126, 28, 28, 0, TRUE},
+    {L"v", SCAN_CODE_49, 193, 126, 28, 28, 0, TRUE},
+    {L"b", SCAN_CODE_50, 224, 126, 28, 28, 0, TRUE},
+    {L"n", SCAN_CODE_51, 254, 126, 28, 28, 0, TRUE},
+    {L"m", SCAN_CODE_52, 284, 126, 28, 28, 0, TRUE},
+    {L",", SCAN_CODE_53, 315, 126, 28, 28, 0, TRUE},
+    {L".", SCAN_CODE_54, 345, 126, 28, 28, 0, TRUE},
+    {L"/", SCAN_CODE_55, 376, 126, 28, 28, 0, TRUE},
+    {L"shift", SCAN_CODE_57, 406, 126, 77, 28,
BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE},
+    {L"ctrl", SCAN_CODE_58, 4, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX,
FALSE},
+    {L"v", SCAN_CODE_84, 518, 156, 28, 28, BS_ICON, FALSE},
+    {L"ROS", SCAN_CODE_127, 48, 156, 43, 28,
BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE},
+    {L"alt", SCAN_CODE_60, 91, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX,
FALSE},
+    {L"", SCAN_CODE_61, 134, 156, 174, 28, 0, FALSE},
+    {L"alt", SCAN_CODE_62, 310, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX,
FALSE},
+    {L"ROS", SCAN_CODE_128, 353, 156, 43, 28,
BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE},
+    {L"menu", SCAN_CODE_129, 396, 156, 43, 28, BS_ICON, FALSE},
+    {L"ctrl", SCAN_CODE_64, 440, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX,
FALSE},
+    {L"ins", SCAN_CODE_75, 486, 35, 28, 28, 0, FALSE},
+    {L"del", SCAN_CODE_76, 486, 65, 28, 28, 0, FALSE},
+    {L"hm", SCAN_CODE_80, 518, 35, 28, 28, BS_ICON, FALSE},
+    {L"end", SCAN_CODE_81, 518, 65, 28, 28, 0, FALSE},
+    {L"pup", SCAN_CODE_85, 550, 35, 28, 28, BS_ICON, FALSE},
+    {L"pdn", SCAN_CODE_86, 550, 65, 28, 28, BS_ICON, FALSE},
+    {L"<-", SCAN_CODE_79, 486, 156, 28, 28, BS_ICON, FALSE},
+    {L"^", SCAN_CODE_83, 518, 126, 28, 28, BS_ICON, FALSE},
+    {L"->", SCAN_CODE_89, 550, 156, 28, 28, BS_ICON, FALSE},
+    {L"nlk", SCAN_CODE_90, 582, 35, 28, 28, 0, FALSE},
+    {L"7", SCAN_CODE_91, 582, 65, 28, 28, 0, FALSE},
+    {L"4", SCAN_CODE_92, 582, 96, 28, 28, 0, FALSE},
+    {L"1", SCAN_CODE_93, 582, 126, 28, 28, 0, FALSE},
+    {L"/", SCAN_CODE_95, 614, 35, 28, 28, 0, FALSE},
+    {L"8", SCAN_CODE_96, 614, 65, 28, 28, 0, FALSE},
+    {L"5", SCAN_CODE_97, 614, 96, 28, 28, 0, FALSE},
+    {L"2", SCAN_CODE_98, 614, 126, 28, 28, 0, FALSE},
+    {L"0", SCAN_CODE_99, 582, 156, 60, 28, 0, FALSE},
+    {L"*", SCAN_CODE_100, 646, 35, 28, 28, 0, FALSE},
+    {L"9", SCAN_CODE_101, 646, 65, 28, 28, 0, FALSE},
+    {L"6", SCAN_CODE_102, 646, 96, 28, 28, 0, FALSE},
+    {L"3", SCAN_CODE_103, 646, 126, 28, 28, 0, FALSE},
+    {L".", SCAN_CODE_104, 646, 156, 28, 28, 0, FALSE},
+    {L"-", SCAN_CODE_105, 678, 35, 28, 28, 0, FALSE},
+    {L"+", SCAN_CODE_106, 678, 65, 28, 59, 0, FALSE},
+    {L"ent", SCAN_CODE_108, 678, 126, 28, 58, 0, FALSE},
+};
+
+KEYBOARD_STRUCT EnhancedKeyboard = 
+{ 
+    EnhancedKeyboardKeys,
+    _countof(EnhancedKeyboardKeys),
+    { 746, 193 },
+    { 620, 6 },
+    { 40, 15 },
+    40,
+    { 628, 25 },
+    { 7, 5 },
+    40
+};
+
+KEYBOARD_STRUCT StandardKeyboard = 
+{ 
+    StandardKeyboardKeys,
+    _countof(StandardKeyboardKeys),
+    { 586, 193 },
+    { 588, 6 },
+    { 40, 15 },
+    40,
+    { 596, 25 },
+    { 7, 5 },
+    40
+};
diff --git a/base/applications/osk/lang/ar-DZ.rc b/base/applications/osk/lang/ar-DZ.rc
index f537b582395..458a7dd2645 100644
--- a/base/applications/osk/lang/ar-DZ.rc
+++ b/base/applications/osk/lang/ar-DZ.rc
@@ -8,244 +8,6 @@
 
 LANGUAGE LANG_ARABIC, SUBLANG_DEFAULT
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
-CAPTION "On screen keyboard"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,23,22
-    PUSHBUTTON      "F1",SCAN_CODE_112,48,3,23,22
-    PUSHBUTTON      "F2",SCAN_CODE_113,75,3,23,22
-    PUSHBUTTON      "F3",SCAN_CODE_114,101,3,23,22
-    PUSHBUTTON      "F4",SCAN_CODE_115,128,3,23,22
-    PUSHBUTTON      "F5",SCAN_CODE_116,173,3,23,22
-    PUSHBUTTON      "F6",SCAN_CODE_117,199,3,23,22
-    PUSHBUTTON      "F7",SCAN_CODE_118,225,3,23,22
-    PUSHBUTTON      "F8",SCAN_CODE_119,251,3,23,22
-    PUSHBUTTON      "F9",SCAN_CODE_120,296,3,23,22
-    PUSHBUTTON      "F10",SCAN_CODE_121,323,3,23,22
-    PUSHBUTTON      "F11",SCAN_CODE_122,350,3,23,22
-    PUSHBUTTON      "F12",SCAN_CODE_123,377,3,23,22
-    PUSHBUTTON      "Prn",SCAN_CODE_124,411,3,23,22
-    PUSHBUTTON      "Stop",SCAN_CODE_125,438,3,23,22
-    PUSHBUTTON      "Attn",SCAN_CODE_126,465,3,23,22
-    PUSHBUTTON      "ذ",SCAN_CODE_1,3,35,23,22
-    PUSHBUTTON      "1",SCAN_CODE_2,30,35,23,22
-    PUSHBUTTON      "2",SCAN_CODE_3,57,35,23,22
-    PUSHBUTTON      "3",SCAN_CODE_4,84,35,23,22
-    PUSHBUTTON      "4",SCAN_CODE_5,111,35,23,22
-    PUSHBUTTON      "5",SCAN_CODE_6,138,35,23,22
-    PUSHBUTTON      "6",SCAN_CODE_7,165,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_8,192,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_9,219,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_10,246,35,23,22
-    PUSHBUTTON      "0",SCAN_CODE_11,273,35,23,22
-    PUSHBUTTON      "-",SCAN_CODE_12,300,35,23,22
-    PUSHBUTTON      "=",SCAN_CODE_13,327,35,23,22
-    PUSHBUTTON      "<--",SCAN_CODE_15,354,35,47,22,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON
-    PUSHBUTTON      "ض",SCAN_CODE_17,42,61,23,22
-    PUSHBUTTON      "ص",SCAN_CODE_18,69,61,23,22
-    PUSHBUTTON      "ث",SCAN_CODE_19,96,61,23,22
-    PUSHBUTTON      "ق",SCAN_CODE_20,123,61,23,22
-    PUSHBUTTON      "ف",SCAN_CODE_21,150,61,23,22
-    PUSHBUTTON      "غ",SCAN_CODE_22,177,61,23,22
-    PUSHBUTTON      "ع",SCAN_CODE_23,204,61,23,22
-    PUSHBUTTON      "ه",SCAN_CODE_24,231,61,23,22
-    PUSHBUTTON      "خ",SCAN_CODE_25,258,61,23,22
-    PUSHBUTTON      "ح",SCAN_CODE_26,285,61,23,22
-    PUSHBUTTON      "ج",SCAN_CODE_27,312,61,23,22
-    PUSHBUTTON      "د",SCAN_CODE_28,339,61,23,22
-    PUSHBUTTON      "\\",SCAN_CODE_29,366,61,35,22
-    PUSHBUTTON      "Verr maj",SCAN_CODE_30,3,87,46,22,BS_ICON
-    PUSHBUTTON      "ش",SCAN_CODE_31,53,87,23,22
-    PUSHBUTTON      "س",SCAN_CODE_32,80,87,23,22
-    PUSHBUTTON      "ي",SCAN_CODE_33,107,87,23,22
-    PUSHBUTTON      "ب",SCAN_CODE_34,134,87,23,22
-    PUSHBUTTON      "ل",SCAN_CODE_35,161,87,23,22
-    PUSHBUTTON      "ا",SCAN_CODE_36,188,87,23,22
-    PUSHBUTTON      "ت",SCAN_CODE_37,215,87,23,22
-    PUSHBUTTON      "ن",SCAN_CODE_38,242,87,23,22
-    PUSHBUTTON      "م",SCAN_CODE_39,269,87,23,22
-    PUSHBUTTON      "ك",SCAN_CODE_40,296,87,23,22
-    PUSHBUTTON      "ط",SCAN_CODE_41,323,87,23,22
-    PUSHBUTTON      "ret",SCAN_CODE_43,350,87,51,22,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ئ",SCAN_CODE_46,64,113,23,22
-    PUSHBUTTON      "ء",SCAN_CODE_47,91,113,23,22
-    PUSHBUTTON      "ؤ",SCAN_CODE_48,118,113,23,22
-    PUSHBUTTON      "ر",SCAN_CODE_49,145,113,23,22
-    PUSHBUTTON      "ﻻ",SCAN_CODE_50,172,113,23,22
-    PUSHBUTTON      "ﻯ",SCAN_CODE_51,199,113,23,22
-    PUSHBUTTON      "ﺓ",SCAN_CODE_52,226,113,23,22
-    PUSHBUTTON      "و",SCAN_CODE_53,253,113,23,22
-    PUSHBUTTON      "ز",SCAN_CODE_54,280,113,23,22
-    PUSHBUTTON      "ظ",SCAN_CODE_55,307,113,23,22
-    PUSHBUTTON     
"shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,116,139,143,22
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,332,139,30,22,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,411,35,23,22
-    PUSHBUTTON      "del",SCAN_CODE_76,411,61,23,22
-    PUSHBUTTON      "home",SCAN_CODE_80,438,35,23,22,BS_ICON
-    PUSHBUTTON      "end",SCAN_CODE_81,438,61,23,22
-    PUSHBUTTON      "pg AR",SCAN_CODE_85,465,35,23,22,BS_ICON
-    PUSHBUTTON      "pg AV",SCAN_CODE_86,465,61,23,22,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,411,139,23,22,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,438,113,23,22,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,438,139,23,22,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,465,139,23,22,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,500,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_91,500,61,23,22
-    PUSHBUTTON      "4",SCAN_CODE_92,500,87,23,22
-    PUSHBUTTON      "1",SCAN_CODE_93,500,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_95,527,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_96,527,61,23,22
-    PUSHBUTTON      "5",SCAN_CODE_97,527,87,23,22
-    PUSHBUTTON      "2",SCAN_CODE_98,527,113,23,22
-    PUSHBUTTON      "0",SCAN_CODE_99,500,139,50,22
-    PUSHBUTTON      "*",SCAN_CODE_100,554,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_101,554,61,23,22
-    PUSHBUTTON      "6",SCAN_CODE_102,554,87,23,22
-    PUSHBUTTON      "3",SCAN_CODE_103,554,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_104,554,139,23,22
-    PUSHBUTTON      "-",SCAN_CODE_105,581,35,23,22
-    PUSHBUTTON      "+",SCAN_CODE_106,581,61,23,48
-    PUSHBUTTON      "ent",SCAN_CODE_108,581,113,23,48
-    CTEXT           "Num",IDC_STATIC,510,4,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3
-    CTEXT           "Caps",IDC_STATIC,540,4,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3
-    CTEXT           "Scroll",IDC_STATIC,572,4,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "On screen keyboard"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "File"
@@ -274,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Font...", IDM_FONT, GRAYED
+        MENUITEM "&Font...", IDM_FONT
     END
 
     POPUP "Help"
@@ -299,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "On-Screen Keyboard"
-    STRING_AUTHORS "Copyright Denis Robert"
+    IDS_OSK "On-Screen Keyboard"
+    IDS_AUTHORS "Copyright Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/cs-CZ.rc b/base/applications/osk/lang/cs-CZ.rc
index a873fce0264..b6b45b3eb44 100644
--- a/base/applications/osk/lang/cs-CZ.rc
+++ b/base/applications/osk/lang/cs-CZ.rc
@@ -8,244 +8,6 @@
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
-CAPTION "Klávesnice na obrazovce"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,23,22
-    PUSHBUTTON      "F1",SCAN_CODE_112,48,3,23,22
-    PUSHBUTTON      "F2",SCAN_CODE_113,75,3,23,22
-    PUSHBUTTON      "F3",SCAN_CODE_114,101,3,23,22
-    PUSHBUTTON      "F4",SCAN_CODE_115,128,3,23,22
-    PUSHBUTTON      "F5",SCAN_CODE_116,173,3,23,22
-    PUSHBUTTON      "F6",SCAN_CODE_117,199,3,23,22
-    PUSHBUTTON      "F7",SCAN_CODE_118,225,3,23,22
-    PUSHBUTTON      "F8",SCAN_CODE_119,251,3,23,22
-    PUSHBUTTON      "F9",SCAN_CODE_120,296,3,23,22
-    PUSHBUTTON      "F10",SCAN_CODE_121,323,3,23,22
-    PUSHBUTTON      "F11",SCAN_CODE_122,350,3,23,22
-    PUSHBUTTON      "F12",SCAN_CODE_123,377,3,23,22
-    PUSHBUTTON      "Prn",SCAN_CODE_124,411,3,23,22
-    PUSHBUTTON      "Stop",SCAN_CODE_125,438,3,23,22
-    PUSHBUTTON      "Attn",SCAN_CODE_126,465,3,23,22
-    PUSHBUTTON      "`",SCAN_CODE_1,3,35,23,22
-    PUSHBUTTON      "1",SCAN_CODE_2,30,35,23,22
-    PUSHBUTTON      "2",SCAN_CODE_3,57,35,23,22
-    PUSHBUTTON      "3",SCAN_CODE_4,84,35,23,22
-    PUSHBUTTON      "4",SCAN_CODE_5,111,35,23,22
-    PUSHBUTTON      "5",SCAN_CODE_6,138,35,23,22
-    PUSHBUTTON      "6",SCAN_CODE_7,165,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_8,192,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_9,219,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_10,246,35,23,22
-    PUSHBUTTON      "0",SCAN_CODE_11,273,35,23,22
-    PUSHBUTTON      "-",SCAN_CODE_12,300,35,23,22
-    PUSHBUTTON      "=",SCAN_CODE_13,327,35,23,22
-    PUSHBUTTON      "<--",SCAN_CODE_15,354,35,47,22,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_17,42,61,23,22
-    PUSHBUTTON      "W",SCAN_CODE_18,69,61,23,22
-    PUSHBUTTON      "E",SCAN_CODE_19,96,61,23,22
-    PUSHBUTTON      "R",SCAN_CODE_20,123,61,23,22
-    PUSHBUTTON      "T",SCAN_CODE_21,150,61,23,22
-    PUSHBUTTON      "Y",SCAN_CODE_22,177,61,23,22
-    PUSHBUTTON      "U",SCAN_CODE_23,204,61,23,22
-    PUSHBUTTON      "I",SCAN_CODE_24,231,61,23,22
-    PUSHBUTTON      "O",SCAN_CODE_25,258,61,23,22
-    PUSHBUTTON      "P",SCAN_CODE_26,285,61,23,22
-    PUSHBUTTON      "[",SCAN_CODE_27,312,61,23,22
-    PUSHBUTTON      "]",SCAN_CODE_28,339,61,23,22
-    PUSHBUTTON      "\\",SCAN_CODE_29,366,61,35,22
-    PUSHBUTTON      "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_31,53,87,23,22
-    PUSHBUTTON      "S",SCAN_CODE_32,80,87,23,22
-    PUSHBUTTON      "D",SCAN_CODE_33,107,87,23,22
-    PUSHBUTTON      "F",SCAN_CODE_34,134,87,23,22
-    PUSHBUTTON      "G",SCAN_CODE_35,161,87,23,22
-    PUSHBUTTON      "H",SCAN_CODE_36,188,87,23,22
-    PUSHBUTTON      "J",SCAN_CODE_37,215,87,23,22
-    PUSHBUTTON      "K",SCAN_CODE_38,242,87,23,22
-    PUSHBUTTON      "L",SCAN_CODE_39,269,87,23,22
-    PUSHBUTTON      ";",SCAN_CODE_40,296,87,23,22
-    PUSHBUTTON      "'",SCAN_CODE_41,323,87,23,22
-    PUSHBUTTON      "ret",SCAN_CODE_43,350,87,51,22,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "Z",SCAN_CODE_46,64,113,23,22
-    PUSHBUTTON      "X",SCAN_CODE_47,91,113,23,22
-    PUSHBUTTON      "C",SCAN_CODE_48,118,113,23,22
-    PUSHBUTTON      "V",SCAN_CODE_49,145,113,23,22
-    PUSHBUTTON      "B",SCAN_CODE_50,172,113,23,22
-    PUSHBUTTON      "N",SCAN_CODE_51,199,113,23,22
-    PUSHBUTTON      "M",SCAN_CODE_52,226,113,23,22
-    PUSHBUTTON      ",",SCAN_CODE_53,253,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_54,280,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_55,307,113,23,22
-    PUSHBUTTON     
"shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,116,139,143,22
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,332,139,30,22,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,411,35,23,22
-    PUSHBUTTON      "del",SCAN_CODE_76,411,61,23,22
-    PUSHBUTTON      "home",SCAN_CODE_80,438,35,23,22,BS_ICON
-    PUSHBUTTON      "end",SCAN_CODE_81,438,61,23,22
-    PUSHBUTTON      "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON
-    PUSHBUTTON      "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,411,139,23,22,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,438,113,23,22,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,438,139,23,22,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,465,139,23,22,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,500,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_91,500,61,23,22
-    PUSHBUTTON      "4",SCAN_CODE_92,500,87,23,22
-    PUSHBUTTON      "1",SCAN_CODE_93,500,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_95,527,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_96,527,61,23,22
-    PUSHBUTTON      "5",SCAN_CODE_97,527,87,23,22
-    PUSHBUTTON      "2",SCAN_CODE_98,527,113,23,22
-    PUSHBUTTON      "0",SCAN_CODE_99,500,139,50,22
-    PUSHBUTTON      "*",SCAN_CODE_100,554,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_101,554,61,23,22
-    PUSHBUTTON      "6",SCAN_CODE_102,554,87,23,22
-    PUSHBUTTON      "3",SCAN_CODE_103,554,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_104,554,139,23,22
-    PUSHBUTTON      "-",SCAN_CODE_105,581,35,23,22
-    PUSHBUTTON      "+",SCAN_CODE_106,581,61,23,48
-    PUSHBUTTON      "ent",SCAN_CODE_108,581,113,23,48
-    CTEXT           "Num",IDC_STATIC,510,4,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3
-    CTEXT           "Caps",IDC_STATIC,540,4,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3
-    CTEXT           "Scroll",IDC_STATIC,572,4,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "On screen keyboard"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "File"
@@ -274,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Font...", IDM_FONT, GRAYED
+        MENUITEM "&Font...", IDM_FONT
     END
 
     POPUP "Help"
@@ -299,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "On-Screen Keyboard"
-    STRING_AUTHORS "Copyright Denis Robert"
+    IDS_OSK "On-Screen Keyboard"
+    IDS_AUTHORS "Copyright Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/de-DE.rc b/base/applications/osk/lang/de-DE.rc
index 83c7b760e09..357de8326bc 100644
--- a/base/applications/osk/lang/de-DE.rc
+++ b/base/applications/osk/lang/de-DE.rc
@@ -8,245 +8,6 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
-CAPTION "Bildschirmtastatur"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,23,22
-    PUSHBUTTON      "F1",SCAN_CODE_112,48,3,23,22
-    PUSHBUTTON      "F2",SCAN_CODE_113,75,3,23,22
-    PUSHBUTTON      "F3",SCAN_CODE_114,101,3,23,22
-    PUSHBUTTON      "F4",SCAN_CODE_115,128,3,23,22
-    PUSHBUTTON      "F5",SCAN_CODE_116,173,3,23,22
-    PUSHBUTTON      "F6",SCAN_CODE_117,199,3,23,22
-    PUSHBUTTON      "F7",SCAN_CODE_118,225,3,23,22
-    PUSHBUTTON      "F8",SCAN_CODE_119,251,3,23,22
-    PUSHBUTTON      "F9",SCAN_CODE_120,296,3,23,22
-    PUSHBUTTON      "F10",SCAN_CODE_121,323,3,23,22
-    PUSHBUTTON      "F11",SCAN_CODE_122,350,3,23,22
-    PUSHBUTTON      "F12",SCAN_CODE_123,377,3,23,22
-    PUSHBUTTON      "Druck",SCAN_CODE_124,411,3,23,22
-    PUSHBUTTON      "Rollen",SCAN_CODE_125,438,3,23,22
-    PUSHBUTTON      "Pause",SCAN_CODE_126,465,3,23,22
-    PUSHBUTTON      "^",SCAN_CODE_1,3,35,23,22
-    PUSHBUTTON      "1",SCAN_CODE_2,30,35,23,22
-    PUSHBUTTON      "2",SCAN_CODE_3,57,35,23,22
-    PUSHBUTTON      "3",SCAN_CODE_4,84,35,23,22
-    PUSHBUTTON      "4",SCAN_CODE_5,111,35,23,22
-    PUSHBUTTON      "5",SCAN_CODE_6,138,35,23,22
-    PUSHBUTTON      "6",SCAN_CODE_7,165,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_8,192,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_9,219,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_10,246,35,23,22
-    PUSHBUTTON      "0",SCAN_CODE_11,273,35,23,22
-    PUSHBUTTON      "ß",SCAN_CODE_12,300,35,23,22
-    PUSHBUTTON      "´",SCAN_CODE_13,327,35,23,22
-    PUSHBUTTON      "<--",SCAN_CODE_15,354,35,47,22,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_17,42,61,23,22
-    PUSHBUTTON      "W",SCAN_CODE_18,69,61,23,22
-    PUSHBUTTON      "E",SCAN_CODE_19,96,61,23,22
-    PUSHBUTTON      "R",SCAN_CODE_20,123,61,23,22
-    PUSHBUTTON      "T",SCAN_CODE_21,150,61,23,22
-    PUSHBUTTON      "Z",SCAN_CODE_22,177,61,23,22
-    PUSHBUTTON      "U",SCAN_CODE_23,204,61,23,22
-    PUSHBUTTON      "I",SCAN_CODE_24,231,61,23,22
-    PUSHBUTTON      "O",SCAN_CODE_25,258,61,23,22
-    PUSHBUTTON      "P",SCAN_CODE_26,285,61,23,22
-    PUSHBUTTON      "Ü",SCAN_CODE_27,312,61,23,22
-    PUSHBUTTON      "+",SCAN_CODE_28,339,61,23,22
-    PUSHBUTTON      "Feststell",SCAN_CODE_30,3,87,46,22,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_31,53,87,23,22
-    PUSHBUTTON      "S",SCAN_CODE_32,80,87,23,22
-    PUSHBUTTON      "D",SCAN_CODE_33,107,87,23,22
-    PUSHBUTTON      "F",SCAN_CODE_34,134,87,23,22
-    PUSHBUTTON      "G",SCAN_CODE_35,161,87,23,22
-    PUSHBUTTON      "H",SCAN_CODE_36,188,87,23,22
-    PUSHBUTTON      "J",SCAN_CODE_37,215,87,23,22
-    PUSHBUTTON      "K",SCAN_CODE_38,242,87,23,22
-    PUSHBUTTON      "L",SCAN_CODE_39,269,87,23,22
-    PUSHBUTTON      "Ö",SCAN_CODE_40,296,87,23,22
-    PUSHBUTTON      "Ä",SCAN_CODE_41,323,87,23,22
-    PUSHBUTTON      "#",SCAN_CODE_42,350,87,23,22
-    PUSHBUTTON      "Enter",SCAN_CODE_43,377,61,23,48,BS_ICON
-    PUSHBUTTON     
"Umsch",SCAN_CODE_44,3,113,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "<",SCAN_CODE_45,37,113,23,22
-    PUSHBUTTON      "Y",SCAN_CODE_46,64,113,23,22
-    PUSHBUTTON      "X",SCAN_CODE_47,91,113,23,22
-    PUSHBUTTON      "C",SCAN_CODE_48,118,113,23,22
-    PUSHBUTTON      "V",SCAN_CODE_49,145,113,23,22
-    PUSHBUTTON      "B",SCAN_CODE_50,172,113,23,22
-    PUSHBUTTON      "N",SCAN_CODE_51,199,113,23,22
-    PUSHBUTTON      "M",SCAN_CODE_52,226,113,23,22
-    PUSHBUTTON      ",",SCAN_CODE_53,253,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_54,280,113,23,22
-    PUSHBUTTON      "-",SCAN_CODE_55,307,113,23,22
-    PUSHBUTTON     
"Umsch",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"Strg",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"Alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,116,139,143,22
-    PUSHBUTTON      "Alt
Gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "Menü",SCAN_CODE_129,332,139,30,22,BS_ICON
-    PUSHBUTTON     
"Strg",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "Einfg",SCAN_CODE_75,411,35,23,22
-    PUSHBUTTON      "Entf",SCAN_CODE_76,411,61,23,22
-    PUSHBUTTON      "Pos1",SCAN_CODE_80,438,35,23,22,BS_ICON
-    PUSHBUTTON      "Ende",SCAN_CODE_81,438,61,23,22
-    PUSHBUTTON      "Bild auf",SCAN_CODE_85,465,35,23,22,BS_ICON
-    PUSHBUTTON      "Bild ab",SCAN_CODE_86,465,61,23,22,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,411,139,23,22,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,438,113,23,22,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,438,139,23,22,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,465,139,23,22,BS_ICON
-    PUSHBUTTON      "Num",SCAN_CODE_90,500,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_91,500,61,23,22
-    PUSHBUTTON      "4",SCAN_CODE_92,500,87,23,22
-    PUSHBUTTON      "1",SCAN_CODE_93,500,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_95,527,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_96,527,61,23,22
-    PUSHBUTTON      "5",SCAN_CODE_97,527,87,23,22
-    PUSHBUTTON      "2",SCAN_CODE_98,527,113,23,22
-    PUSHBUTTON      "0",SCAN_CODE_99,500,139,50,22
-    PUSHBUTTON      "*",SCAN_CODE_100,554,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_101,554,61,23,22
-    PUSHBUTTON      "6",SCAN_CODE_102,554,87,23,22
-    PUSHBUTTON      "3",SCAN_CODE_103,554,113,23,22
-    PUSHBUTTON      ",",SCAN_CODE_104,554,139,23,22
-    PUSHBUTTON      "-",SCAN_CODE_105,581,35,23,22
-    PUSHBUTTON      "+",SCAN_CODE_106,581,61,23,48
-    PUSHBUTTON      "Enter",SCAN_CODE_108,581,113,23,48
-    CTEXT           "Num",IDC_STATIC,510,4,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3
-    CTEXT           "Caps",IDC_STATIC,540,4,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3
-    CTEXT           "Rollen",IDC_STATIC,572,4,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "Bildschirmtastatur"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Druck",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Pause",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "^",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "ß",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "´",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "z",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "ü",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "+",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "feststell",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      "ö",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "ä",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "#",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "enter",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"umsch",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "y",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "-",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"umsch",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "strg",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menü",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"strg",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "einfg",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "entf",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "pos1",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "ende",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "bild auf",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "bild ab",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "enter",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Rollen",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "Datei"
@@ -275,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Eingabemodus...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Schriftart...", IDM_FONT, GRAYED
+        MENUITEM "&Schriftart...", IDM_FONT
     END
 
     POPUP "Hilfe"
@@ -300,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "Bildschirmtastatur"
-    STRING_AUTHORS "Copyright Denis Robert"
+    IDS_OSK "Bildschirmtastatur"
+    IDS_AUTHORS "Copyright Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/en-GB.rc b/base/applications/osk/lang/en-GB.rc
index dc0fc5b81c4..7f9fd716a9b 100644
--- a/base/applications/osk/lang/en-GB.rc
+++ b/base/applications/osk/lang/en-GB.rc
@@ -8,245 +8,6 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
-CAPTION "On screen keyboard"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Ech",SCAN_CODE_110,3,3,23,22
-    PUSHBUTTON      "F1",SCAN_CODE_112,48,3,23,22
-    PUSHBUTTON      "F2",SCAN_CODE_113,75,3,23,22
-    PUSHBUTTON      "F3",SCAN_CODE_114,101,3,23,22
-    PUSHBUTTON      "F4",SCAN_CODE_115,128,3,23,22
-    PUSHBUTTON      "F5",SCAN_CODE_116,173,3,23,22
-    PUSHBUTTON      "F6",SCAN_CODE_117,199,3,23,22
-    PUSHBUTTON      "F7",SCAN_CODE_118,225,3,23,22
-    PUSHBUTTON      "F8",SCAN_CODE_119,251,3,23,22
-    PUSHBUTTON      "F9",SCAN_CODE_120,296,3,23,22
-    PUSHBUTTON      "F10",SCAN_CODE_121,323,3,23,22
-    PUSHBUTTON      "F11",SCAN_CODE_122,350,3,23,22
-    PUSHBUTTON      "F12",SCAN_CODE_123,377,3,23,22
-    PUSHBUTTON      "Prn",SCAN_CODE_124,411,3,23,22
-    PUSHBUTTON      "Stop",SCAN_CODE_125,438,3,23,22
-    PUSHBUTTON      "Attn",SCAN_CODE_126,465,3,23,22
-    PUSHBUTTON      "|",SCAN_CODE_1,3,35,23,22
-    PUSHBUTTON      "1",SCAN_CODE_2,30,35,23,22
-    PUSHBUTTON      "2",SCAN_CODE_3,57,35,23,22
-    PUSHBUTTON      "3",SCAN_CODE_4,84,35,23,22
-    PUSHBUTTON      "4",SCAN_CODE_5,111,35,23,22
-    PUSHBUTTON      "5",SCAN_CODE_6,138,35,23,22
-    PUSHBUTTON      "6",SCAN_CODE_7,165,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_8,192,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_9,219,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_10,246,35,23,22
-    PUSHBUTTON      "0",SCAN_CODE_11,273,35,23,22
-    PUSHBUTTON      "-",SCAN_CODE_12,300,35,23,22
-    PUSHBUTTON      "=",SCAN_CODE_13,327,35,23,22
-    PUSHBUTTON      "<--",SCAN_CODE_15,354,35,47,22,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_17,42,61,23,22
-    PUSHBUTTON      "W",SCAN_CODE_18,69,61,23,22
-    PUSHBUTTON      "E",SCAN_CODE_19,96,61,23,22
-    PUSHBUTTON      "R",SCAN_CODE_20,123,61,23,22
-    PUSHBUTTON      "T",SCAN_CODE_21,150,61,23,22
-    PUSHBUTTON      "Y",SCAN_CODE_22,177,61,23,22
-    PUSHBUTTON      "U",SCAN_CODE_23,204,61,23,22
-    PUSHBUTTON      "I",SCAN_CODE_24,231,61,23,22
-    PUSHBUTTON      "O",SCAN_CODE_25,258,61,23,22
-    PUSHBUTTON      "P",SCAN_CODE_26,285,61,23,22
-    PUSHBUTTON      "[",SCAN_CODE_27,312,61,23,22
-    PUSHBUTTON      "]",SCAN_CODE_28,339,61,23,22
-    PUSHBUTTON      "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_31,53,87,23,22
-    PUSHBUTTON      "S",SCAN_CODE_32,80,87,23,22
-    PUSHBUTTON      "D",SCAN_CODE_33,107,87,23,22
-    PUSHBUTTON      "F",SCAN_CODE_34,134,87,23,22
-    PUSHBUTTON      "G",SCAN_CODE_35,161,87,23,22
-    PUSHBUTTON      "H",SCAN_CODE_36,188,87,23,22
-    PUSHBUTTON      "J",SCAN_CODE_37,215,87,23,22
-    PUSHBUTTON      "K",SCAN_CODE_38,242,87,23,22
-    PUSHBUTTON      "L",SCAN_CODE_39,269,87,23,22
-    PUSHBUTTON      ";",SCAN_CODE_40,296,87,23,22
-    PUSHBUTTON      "'",SCAN_CODE_41,323,87,23,22
-    PUSHBUTTON      "#",SCAN_CODE_42,350,87,23,22
-    PUSHBUTTON      "ret",SCAN_CODE_43,377,61,23,48,BS_ICON
-    PUSHBUTTON     
"Shift",SCAN_CODE_44,3,113,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "\\",SCAN_CODE_45,37,113,23,22
-    PUSHBUTTON      "Z",SCAN_CODE_46,64,113,23,22
-    PUSHBUTTON      "X",SCAN_CODE_47,91,113,23,22
-    PUSHBUTTON      "C",SCAN_CODE_48,118,113,23,22
-    PUSHBUTTON      "V",SCAN_CODE_49,145,113,23,22
-    PUSHBUTTON      "B",SCAN_CODE_50,172,113,23,22
-    PUSHBUTTON      "N",SCAN_CODE_51,199,113,23,22
-    PUSHBUTTON      "M",SCAN_CODE_52,226,113,23,22
-    PUSHBUTTON      ",",SCAN_CODE_53,253,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_54,280,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_55,307,113,23,22
-    PUSHBUTTON     
"Shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,116,139,143,22
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,332,139,30,22,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,411,35,23,22
-    PUSHBUTTON      "can",SCAN_CODE_76,411,61,23,22
-    PUSHBUTTON      "home",SCAN_CODE_80,438,35,23,22,BS_ICON
-    PUSHBUTTON      "End",SCAN_CODE_81,438,61,23,22
-    PUSHBUTTON      "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON
-    PUSHBUTTON      "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,411,139,23,22,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,438,113,23,22,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,438,139,23,22,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,465,139,23,22,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,500,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_91,500,61,23,22
-    PUSHBUTTON      "4",SCAN_CODE_92,500,87,23,22
-    PUSHBUTTON      "1",SCAN_CODE_93,500,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_95,527,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_96,527,61,23,22
-    PUSHBUTTON      "5",SCAN_CODE_97,527,87,23,22
-    PUSHBUTTON      "2",SCAN_CODE_98,527,113,23,22
-    PUSHBUTTON      "0",SCAN_CODE_99,500,139,50,22
-    PUSHBUTTON      "*",SCAN_CODE_100,554,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_101,554,61,23,22
-    PUSHBUTTON      "6",SCAN_CODE_102,554,87,23,22
-    PUSHBUTTON      "3",SCAN_CODE_103,554,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_104,554,139,23,22
-    PUSHBUTTON      "-",SCAN_CODE_105,581,35,23,22
-    PUSHBUTTON      "+",SCAN_CODE_106,581,61,23,48
-    PUSHBUTTON      "ent",SCAN_CODE_108,581,113,23,48
-    CTEXT           "Num",IDC_STATIC,510,4,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3
-    CTEXT           "Caps",IDC_STATIC,540,4,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3
-    CTEXT           "Scroll",IDC_STATIC,572,4,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "On screen keyboard"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "File"
@@ -275,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Font...", IDM_FONT, GRAYED
+        MENUITEM "&Font...", IDM_FONT
     END
 
     POPUP "Help"
@@ -300,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "On-Screen Keyboard"
-    STRING_AUTHORS "Copyright Denis Robert"
+    IDS_OSK "On-Screen Keyboard"
+    IDS_AUTHORS "Copyright Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc
index 412ead788fb..2a6f9c54331 100644
--- a/base/applications/osk/lang/en-US.rc
+++ b/base/applications/osk/lang/en-US.rc
@@ -8,244 +8,6 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
-CAPTION "On screen keyboard"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,143,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,163,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,243,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,263,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,283,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,303,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,323,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,343,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,363,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,55,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,48,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,56,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,343,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,125,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,267,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,323,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,323,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,343,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,343,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,363,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,363,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,323,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,343,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,363,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,383,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,383,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,383,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,383,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,403,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,403,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,403,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,403,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,383,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,423,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,423,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,423,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,423,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,423,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,443,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,443,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,443,78,15,35
-    CTEXT           "Num",IDC_STATIC,383,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3
-    CTEXT           "Caps",IDC_STATIC,408,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,433,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "On screen keyboard"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "File"
@@ -274,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Font...", IDM_FONT, GRAYED
+        MENUITEM "&Font...", IDM_FONT
     END
 
     POPUP "Help"
@@ -299,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "On-Screen Keyboard"
-    STRING_AUTHORS "Copyright Denis Robert"
+    IDS_OSK "On-Screen Keyboard"
+    IDS_AUTHORS "Copyright Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/es-ES.rc b/base/applications/osk/lang/es-ES.rc
index a88f5754384..27e2072880c 100644
--- a/base/applications/osk/lang/es-ES.rc
+++ b/base/applications/osk/lang/es-ES.rc
@@ -10,245 +10,6 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
-CAPTION "Teclado en Pantalla"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "esc",SCAN_CODE_110,3,3,23,22
-    PUSHBUTTON      "F1",SCAN_CODE_112,48,3,23,22
-    PUSHBUTTON      "F2",SCAN_CODE_113,75,3,23,22
-    PUSHBUTTON      "F3",SCAN_CODE_114,101,3,23,22
-    PUSHBUTTON      "F4",SCAN_CODE_115,128,3,23,22
-    PUSHBUTTON      "F5",SCAN_CODE_116,173,3,23,22
-    PUSHBUTTON      "F6",SCAN_CODE_117,199,3,23,22
-    PUSHBUTTON      "F7",SCAN_CODE_118,225,3,23,22
-    PUSHBUTTON      "F8",SCAN_CODE_119,251,3,23,22
-    PUSHBUTTON      "F9",SCAN_CODE_120,296,3,23,22
-    PUSHBUTTON      "F10",SCAN_CODE_121,323,3,23,22
-    PUSHBUTTON      "F11",SCAN_CODE_122,350,3,23,22
-    PUSHBUTTON      "F12",SCAN_CODE_123,377,3,23,22
-    PUSHBUTTON      "imp",SCAN_CODE_124,411,3,23,22
-    PUSHBUTTON      "lck",SCAN_CODE_125,438,3,23,22
-    PUSHBUTTON      "pau",SCAN_CODE_126,465,3,23,22
-    PUSHBUTTON      "°",SCAN_CODE_1,3,35,23,22
-    PUSHBUTTON      "1",SCAN_CODE_2,30,35,23,22
-    PUSHBUTTON      "2",SCAN_CODE_3,57,35,23,22
-    PUSHBUTTON      "3",SCAN_CODE_4,84,35,23,22
-    PUSHBUTTON      "4",SCAN_CODE_5,111,35,23,22
-    PUSHBUTTON      "5",SCAN_CODE_6,138,35,23,22
-    PUSHBUTTON      "6",SCAN_CODE_7,165,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_8,192,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_9,219,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_10,246,35,23,22
-    PUSHBUTTON      "0",SCAN_CODE_11,273,35,23,22
-    PUSHBUTTON      "'",SCAN_CODE_12,300,35,23,22
-    PUSHBUTTON      "¡",SCAN_CODE_13,327,35,23,22
-    PUSHBUTTON      "<--",SCAN_CODE_15,354,35,47,22,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_17,42,61,23,22
-    PUSHBUTTON      "W",SCAN_CODE_18,69,61,23,22
-    PUSHBUTTON      "E",SCAN_CODE_19,96,61,23,22
-    PUSHBUTTON      "R",SCAN_CODE_20,123,61,23,22
-    PUSHBUTTON      "T",SCAN_CODE_21,150,61,23,22
-    PUSHBUTTON      "Y",SCAN_CODE_22,177,61,23,22
-    PUSHBUTTON      "U",SCAN_CODE_23,204,61,23,22
-    PUSHBUTTON      "I",SCAN_CODE_24,231,61,23,22
-    PUSHBUTTON      "O",SCAN_CODE_25,258,61,23,22
-    PUSHBUTTON      "P",SCAN_CODE_26,285,61,23,22
-    PUSHBUTTON      "`",SCAN_CODE_27,312,61,23,22
-    PUSHBUTTON      "+",SCAN_CODE_28,339,61,23,22
-    PUSHBUTTON      "Verr maj",SCAN_CODE_30,3,87,46,22,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_31,53,87,23,22
-    PUSHBUTTON      "S",SCAN_CODE_32,80,87,23,22
-    PUSHBUTTON      "D",SCAN_CODE_33,107,87,23,22
-    PUSHBUTTON      "F",SCAN_CODE_34,134,87,23,22
-    PUSHBUTTON      "G",SCAN_CODE_35,161,87,23,22
-    PUSHBUTTON      "H",SCAN_CODE_36,188,87,23,22
-    PUSHBUTTON      "J",SCAN_CODE_37,215,87,23,22
-    PUSHBUTTON      "K",SCAN_CODE_38,242,87,23,22
-    PUSHBUTTON      "L",SCAN_CODE_39,269,87,23,22
-    PUSHBUTTON      "Ñ",SCAN_CODE_40,296,87,23,22
-    PUSHBUTTON      ",",SCAN_CODE_41,323,87,23,22
-    PUSHBUTTON      "ç",SCAN_CODE_42,350,87,23,22
-    PUSHBUTTON      "ret",SCAN_CODE_43,377,61,23,48,BS_ICON
-    PUSHBUTTON     
"maj",SCAN_CODE_44,3,113,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "<",SCAN_CODE_45,37,113,23,22
-    PUSHBUTTON      "Z",SCAN_CODE_46,64,113,23,22
-    PUSHBUTTON      "X",SCAN_CODE_47,91,113,23,22
-    PUSHBUTTON      "C",SCAN_CODE_48,118,113,23,22
-    PUSHBUTTON      "V",SCAN_CODE_49,145,113,23,22
-    PUSHBUTTON      "B",SCAN_CODE_50,172,113,23,22
-    PUSHBUTTON      "N",SCAN_CODE_51,199,113,23,22
-    PUSHBUTTON      "M",SCAN_CODE_52,226,113,23,22
-    PUSHBUTTON      ",",SCAN_CODE_53,253,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_54,280,113,23,22
-    PUSHBUTTON      "-",SCAN_CODE_55,307,113,23,22
-    PUSHBUTTON     
"maj",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,116,139,143,22
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menú",SCAN_CODE_129,332,139,30,22,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,411,35,23,22
-    PUSHBUTTON      "sup",SCAN_CODE_76,411,61,23,22
-    PUSHBUTTON      "ini",SCAN_CODE_80,438,35,23,22,BS_ICON
-    PUSHBUTTON      "fin",SCAN_CODE_81,438,61,23,22
-    PUSHBUTTON      "Re pág",SCAN_CODE_85,465,35,23,22,BS_ICON
-    PUSHBUTTON      "Av pág",SCAN_CODE_86,465,61,23,22,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,411,139,23,22,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,438,113,23,22,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,438,139,23,22,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,465,139,23,22,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,500,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_91,500,61,23,22
-    PUSHBUTTON      "4",SCAN_CODE_92,500,87,23,22
-    PUSHBUTTON      "1",SCAN_CODE_93,500,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_95,527,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_96,527,61,23,22
-    PUSHBUTTON      "5",SCAN_CODE_97,527,87,23,22
-    PUSHBUTTON      "2",SCAN_CODE_98,527,113,23,22
-    PUSHBUTTON      "0",SCAN_CODE_99,500,139,50,22
-    PUSHBUTTON      "*",SCAN_CODE_100,554,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_101,554,61,23,22
-    PUSHBUTTON      "6",SCAN_CODE_102,554,87,23,22
-    PUSHBUTTON      "3",SCAN_CODE_103,554,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_104,554,139,23,22
-    PUSHBUTTON      "-",SCAN_CODE_105,581,35,23,22
-    PUSHBUTTON      "+",SCAN_CODE_106,581,61,23,48
-    PUSHBUTTON      "ent",SCAN_CODE_108,581,113,23,48
-    CTEXT           "Num.",IDC_STATIC,510,4,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3
-    CTEXT           "May.",IDC_STATIC,540,4,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3
-    CTEXT           "Desp.",IDC_STATIC,572,4,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "Teclado en Pantalla"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "bloq",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "supr",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "ini",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "fin",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "ReP",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "AvP",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "bln",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "int",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Mayús",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Bl. Desp",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "Archivo"
@@ -277,7 +38,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Modo de Escritura...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Fuente...", IDM_FONT, GRAYED
+        MENUITEM "&Fuente...", IDM_FONT
     END
 
     POPUP "Ayuda"
@@ -302,8 +63,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "Teclado en Pantalla"
-    STRING_AUTHORS "Copyright Denis Robert"
+    IDS_OSK "Teclado en Pantalla"
+    IDS_AUTHORS "Copyright Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc
index d2dddd6599a..1d1e85110a2 100644
--- a/base/applications/osk/lang/et-EE.rc
+++ b/base/applications/osk/lang/et-EE.rc
@@ -8,244 +8,6 @@
 
 LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
-CAPTION "Ekraaniklaviatuur"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,143,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,163,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,243,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,263,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,283,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,303,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,323,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,343,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,363,3,15,15
-    PUSHBUTTON      "ˇ",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "´",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,55,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "ü",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "õ",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      "ö",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "ä",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_29,270,41,48,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,56,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "-",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,343,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,125,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,267,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,323,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,323,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,343,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,343,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,363,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,363,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,323,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,343,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,363,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,383,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,383,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,383,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,383,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,403,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,403,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,403,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,403,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,383,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,423,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,423,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,423,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,423,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,423,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,443,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,443,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,443,78,15,35
-    CTEXT           "Num",IDC_STATIC,383,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3
-    CTEXT           "Caps",IDC_STATIC,408,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,433,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "On screen keyboard"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "File"
@@ -274,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Font...", IDM_FONT, GRAYED
+        MENUITEM "&Font...", IDM_FONT
     END
 
     POPUP "Help"
@@ -299,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "On-Screen Keyboard"
-    STRING_AUTHORS "Copyright Denis Robert"
+    IDS_OSK "On-Screen Keyboard"
+    IDS_AUTHORS "Copyright Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/fr-CA.rc b/base/applications/osk/lang/fr-CA.rc
index 4a2fd0e9a67..74801b5c33e 100644
--- a/base/applications/osk/lang/fr-CA.rc
+++ b/base/applications/osk/lang/fr-CA.rc
@@ -8,245 +8,6 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
-CAPTION "Clavier visuel"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "ech",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,143,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,163,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,243,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,263,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,283,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,303,3,15,15
-    PUSHBUTTON      "imp",SCAN_CODE_124,323,3,15,15
-    PUSHBUTTON      "arr",SCAN_CODE_125,343,3,15,15
-    PUSHBUTTON      "att",SCAN_CODE_126,363,3,15,15
-    PUSHBUTTON      "#",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,55,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,48,15,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_17,55,41,15,15
-    PUSHBUTTON      "W",SCAN_CODE_18,74,41,15,15
-    PUSHBUTTON      "E",SCAN_CODE_19,93,41,15,15
-    PUSHBUTTON      "R",SCAN_CODE_20,112,41,15,15
-    PUSHBUTTON      "T",SCAN_CODE_21,131,41,15,15
-    PUSHBUTTON      "Y",SCAN_CODE_22,150,41,15,15
-    PUSHBUTTON      "U",SCAN_CODE_23,169,41,15,15
-    PUSHBUTTON      "I",SCAN_CODE_24,188,41,15,15
-    PUSHBUTTON      "O",SCAN_CODE_25,207,41,15,15
-    PUSHBUTTON      "P",SCAN_CODE_26,227,41,15,15
-    PUSHBUTTON      "^",SCAN_CODE_27,248,41,15,15
-    PUSHBUTTON      "¨",SCAN_CODE_28,270,41,15,15
-    PUSHBUTTON      "Verr maj",SCAN_CODE_30,3,60,48,15,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_31,55,60,15,15
-    PUSHBUTTON      "S",SCAN_CODE_32,74,60,15,15
-    PUSHBUTTON      "D",SCAN_CODE_33,93,60,15,15
-    PUSHBUTTON      "F",SCAN_CODE_34,112,60,15,15
-    PUSHBUTTON      "G",SCAN_CODE_35,131,60,15,15
-    PUSHBUTTON      "H",SCAN_CODE_36,150,60,15,15
-    PUSHBUTTON      "J",SCAN_CODE_37,169,60,15,15
-    PUSHBUTTON      "K",SCAN_CODE_38,188,60,15,15
-    PUSHBUTTON      "L",SCAN_CODE_39,207,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,227,60,15,15
-    PUSHBUTTON      "`",SCAN_CODE_41,248,60,15,15
-    PUSHBUTTON      "<",SCAN_CODE_42,270,60,15,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,291,41,27,34,BS_ICON
-    PUSHBUTTON     
"maj",SCAN_CODE_44,3,79,37,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "«",SCAN_CODE_45,43,79,15,15
-    PUSHBUTTON      "Z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "X",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "C",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "V",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "B",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "N",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "M",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"maj",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,125,15
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,267,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,323,22,15,15
-    PUSHBUTTON      "sup",SCAN_CODE_76,323,41,15,15
-    PUSHBUTTON      "home",SCAN_CODE_80,343,22,15,15,BS_ICON
-    PUSHBUTTON      "fin",SCAN_CODE_81,343,41,15,15
-    PUSHBUTTON      "pg AR",SCAN_CODE_85,363,22,15,15,BS_ICON
-    PUSHBUTTON      "pg AV",SCAN_CODE_86,363,41,15,15,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,323,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,343,79,15,15,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,343,98,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,363,98,15,15,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,383,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,383,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,383,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,383,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,403,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,403,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,403,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,403,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,383,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,423,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,423,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,423,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,423,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,423,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,443,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,443,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,443,78,15,35
-    CTEXT           "Num",IDC_STATIC,383,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3
-    CTEXT           "Caps",IDC_STATIC,408,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,433,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "On screen keyboard"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "File"
@@ -275,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Font...", IDM_FONT, GRAYED
+        MENUITEM "&Font...", IDM_FONT
     END
 
     POPUP "Help"
@@ -300,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "On-Screen Keyboard"
-    STRING_AUTHORS "Copyright Denis Robert"
+    IDS_OSK "On-Screen Keyboard"
+    IDS_AUTHORS "Copyright Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/fr-FR.rc b/base/applications/osk/lang/fr-FR.rc
index 987757e0daa..fecb5285be3 100644
--- a/base/applications/osk/lang/fr-FR.rc
+++ b/base/applications/osk/lang/fr-FR.rc
@@ -8,245 +8,6 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
-CAPTION "Clavier visuel"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "ech",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,143,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,163,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,243,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,263,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,283,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,303,3,15,15
-    PUSHBUTTON      "imp",SCAN_CODE_124,323,3,15,15
-    PUSHBUTTON      "arr",SCAN_CODE_125,343,3,15,15
-    PUSHBUTTON      "att",SCAN_CODE_126,363,3,15,15
-    PUSHBUTTON      "²",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "&&",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "é",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      """",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "'",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "(",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "è",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "_",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "ç",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "à",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      ")",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,55,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,48,15,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_17,55,41,15,15
-    PUSHBUTTON      "Z",SCAN_CODE_18,74,41,15,15
-    PUSHBUTTON      "E",SCAN_CODE_19,93,41,15,15
-    PUSHBUTTON      "R",SCAN_CODE_20,112,41,15,15
-    PUSHBUTTON      "T",SCAN_CODE_21,131,41,15,15
-    PUSHBUTTON      "Y",SCAN_CODE_22,150,41,15,15
-    PUSHBUTTON      "U",SCAN_CODE_23,169,41,15,15
-    PUSHBUTTON      "I",SCAN_CODE_24,188,41,15,15
-    PUSHBUTTON      "O",SCAN_CODE_25,207,41,15,15
-    PUSHBUTTON      "P",SCAN_CODE_26,227,41,15,15
-    PUSHBUTTON      "^",SCAN_CODE_27,248,41,15,15
-    PUSHBUTTON      "$",SCAN_CODE_28,270,41,15,15
-    PUSHBUTTON      "Verr maj",SCAN_CODE_30,3,60,48,15,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_31,55,60,15,15
-    PUSHBUTTON      "S",SCAN_CODE_32,74,60,15,15
-    PUSHBUTTON      "D",SCAN_CODE_33,93,60,15,15
-    PUSHBUTTON      "F",SCAN_CODE_34,112,60,15,15
-    PUSHBUTTON      "G",SCAN_CODE_35,131,60,15,15
-    PUSHBUTTON      "H",SCAN_CODE_36,150,60,15,15
-    PUSHBUTTON      "J",SCAN_CODE_37,169,60,15,15
-    PUSHBUTTON      "K",SCAN_CODE_38,188,60,15,15
-    PUSHBUTTON      "L",SCAN_CODE_39,207,60,15,15
-    PUSHBUTTON      "M",SCAN_CODE_40,227,60,15,15
-    PUSHBUTTON      "ù",SCAN_CODE_41,248,60,15,15
-    PUSHBUTTON      "*",SCAN_CODE_42,270,60,15,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,291,41,27,34,BS_ICON
-    PUSHBUTTON     
"maj",SCAN_CODE_44,3,79,37,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "<",SCAN_CODE_45,43,79,15,15
-    PUSHBUTTON      "W",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "X",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "C",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "V",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "B",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "N",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ";",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ":",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "!",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"maj",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,125,15
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,267,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,323,22,15,15
-    PUSHBUTTON      "sup",SCAN_CODE_76,323,41,15,15
-    PUSHBUTTON      "home",SCAN_CODE_80,343,22,15,15,BS_ICON
-    PUSHBUTTON      "fin",SCAN_CODE_81,343,41,15,15
-    PUSHBUTTON      "pg AR",SCAN_CODE_85,363,22,15,15,BS_ICON
-    PUSHBUTTON      "pg AV",SCAN_CODE_86,363,41,15,15,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,323,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,343,79,15,15,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,343,98,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,363,98,15,15,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,383,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,383,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,383,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,383,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,403,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,403,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,403,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,403,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,383,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,423,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,423,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,423,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,423,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,423,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,443,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,443,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,443,78,15,35
-    CTEXT           "Num",IDC_STATIC,383,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3
-    CTEXT           "Caps",IDC_STATIC,408,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,433,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "On screen keyboard"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "File"
@@ -275,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Font...", IDM_FONT, GRAYED
+        MENUITEM "&Font...", IDM_FONT
     END
 
     POPUP "Help"
@@ -300,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "On-Screen Keyboard"
-    STRING_AUTHORS "Copyright Denis Robert"
+    IDS_OSK "On-Screen Keyboard"
+    IDS_AUTHORS "Copyright Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/he-IL.rc b/base/applications/osk/lang/he-IL.rc
index 0fe7d60e9a9..f831262f503 100644
--- a/base/applications/osk/lang/he-IL.rc
+++ b/base/applications/osk/lang/he-IL.rc
@@ -8,244 +8,6 @@
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
-CAPTION "לוח מקשים על התצוגה"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,23,22
-    PUSHBUTTON      "F1",SCAN_CODE_112,48,3,23,22
-    PUSHBUTTON      "F2",SCAN_CODE_113,75,3,23,22
-    PUSHBUTTON      "F3",SCAN_CODE_114,101,3,23,22
-    PUSHBUTTON      "F4",SCAN_CODE_115,128,3,23,22
-    PUSHBUTTON      "F5",SCAN_CODE_116,173,3,23,22
-    PUSHBUTTON      "F6",SCAN_CODE_117,199,3,23,22
-    PUSHBUTTON      "F7",SCAN_CODE_118,225,3,23,22
-    PUSHBUTTON      "F8",SCAN_CODE_119,251,3,23,22
-    PUSHBUTTON      "F9",SCAN_CODE_120,296,3,23,22
-    PUSHBUTTON      "F10",SCAN_CODE_121,323,3,23,22
-    PUSHBUTTON      "F11",SCAN_CODE_122,350,3,23,22
-    PUSHBUTTON      "F12",SCAN_CODE_123,377,3,23,22
-    PUSHBUTTON      "Prn",SCAN_CODE_124,411,3,23,22
-    PUSHBUTTON      "Stop",SCAN_CODE_125,438,3,23,22
-    PUSHBUTTON      "Attn",SCAN_CODE_126,465,3,23,22
-    PUSHBUTTON      "`",SCAN_CODE_1,3,35,23,22
-    PUSHBUTTON      "1",SCAN_CODE_2,30,35,23,22
-    PUSHBUTTON      "2",SCAN_CODE_3,57,35,23,22
-    PUSHBUTTON      "3",SCAN_CODE_4,84,35,23,22
-    PUSHBUTTON      "4",SCAN_CODE_5,111,35,23,22
-    PUSHBUTTON      "5",SCAN_CODE_6,138,35,23,22
-    PUSHBUTTON      "6",SCAN_CODE_7,165,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_8,192,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_9,219,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_10,246,35,23,22
-    PUSHBUTTON      "0",SCAN_CODE_11,273,35,23,22
-    PUSHBUTTON      "-",SCAN_CODE_12,300,35,23,22
-    PUSHBUTTON      "=",SCAN_CODE_13,327,35,23,22
-    PUSHBUTTON      "<--",SCAN_CODE_15,354,35,47,22,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON
-    PUSHBUTTON      "/",SCAN_CODE_17,42,61,23,22
-    PUSHBUTTON      "'",SCAN_CODE_18,69,61,23,22
-    PUSHBUTTON      "ק",SCAN_CODE_19,96,61,23,22
-    PUSHBUTTON      "ר",SCAN_CODE_20,123,61,23,22
-    PUSHBUTTON      "א",SCAN_CODE_21,150,61,23,22
-    PUSHBUTTON      "ט",SCAN_CODE_22,177,61,23,22
-    PUSHBUTTON      "ו",SCAN_CODE_23,204,61,23,22
-    PUSHBUTTON      "ן",SCAN_CODE_24,231,61,23,22
-    PUSHBUTTON      "ם",SCAN_CODE_25,258,61,23,22
-    PUSHBUTTON      "פ",SCAN_CODE_26,285,61,23,22
-    PUSHBUTTON      "[",SCAN_CODE_27,312,61,23,22
-    PUSHBUTTON      "]",SCAN_CODE_28,339,61,23,22
-    PUSHBUTTON      "\\",SCAN_CODE_29,366,61,35,22
-    PUSHBUTTON      "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON
-    PUSHBUTTON      "ש",SCAN_CODE_31,53,87,23,22
-    PUSHBUTTON      "ד",SCAN_CODE_32,80,87,23,22
-    PUSHBUTTON      "ג",SCAN_CODE_33,107,87,23,22
-    PUSHBUTTON      "כ",SCAN_CODE_34,134,87,23,22
-    PUSHBUTTON      "ע",SCAN_CODE_35,161,87,23,22
-    PUSHBUTTON      "י",SCAN_CODE_36,188,87,23,22
-    PUSHBUTTON      "ח",SCAN_CODE_37,215,87,23,22
-    PUSHBUTTON      "ל",SCAN_CODE_38,242,87,23,22
-    PUSHBUTTON      "ך",SCAN_CODE_39,269,87,23,22
-    PUSHBUTTON      "ף",SCAN_CODE_40,296,87,23,22
-    PUSHBUTTON      ",",SCAN_CODE_41,323,87,23,22
-    PUSHBUTTON      "ret",SCAN_CODE_43,350,87,51,22,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ז",SCAN_CODE_46,64,113,23,22
-    PUSHBUTTON      "ס",SCAN_CODE_47,91,113,23,22
-    PUSHBUTTON      "ב",SCAN_CODE_48,118,113,23,22
-    PUSHBUTTON      "ה",SCAN_CODE_49,145,113,23,22
-    PUSHBUTTON      "נ",SCAN_CODE_50,172,113,23,22
-    PUSHBUTTON      "מ",SCAN_CODE_51,199,113,23,22
-    PUSHBUTTON      "צ",SCAN_CODE_52,226,113,23,22
-    PUSHBUTTON      "ת",SCAN_CODE_53,253,113,23,22
-    PUSHBUTTON      "ץ",SCAN_CODE_54,280,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_55,307,113,23,22
-    PUSHBUTTON     
"shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,116,139,143,22
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,332,139,30,22,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,411,35,23,22
-    PUSHBUTTON      "del",SCAN_CODE_76,411,61,23,22
-    PUSHBUTTON      "home",SCAN_CODE_80,438,35,23,22,BS_ICON
-    PUSHBUTTON      "end",SCAN_CODE_81,438,61,23,22
-    PUSHBUTTON      "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON
-    PUSHBUTTON      "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,411,139,23,22,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,438,113,23,22,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,438,139,23,22,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,465,139,23,22,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,500,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_91,500,61,23,22
-    PUSHBUTTON      "4",SCAN_CODE_92,500,87,23,22
-    PUSHBUTTON      "1",SCAN_CODE_93,500,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_95,527,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_96,527,61,23,22
-    PUSHBUTTON      "5",SCAN_CODE_97,527,87,23,22
-    PUSHBUTTON      "2",SCAN_CODE_98,527,113,23,22
-    PUSHBUTTON      "0",SCAN_CODE_99,500,139,50,22
-    PUSHBUTTON      "*",SCAN_CODE_100,554,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_101,554,61,23,22
-    PUSHBUTTON      "6",SCAN_CODE_102,554,87,23,22
-    PUSHBUTTON      "3",SCAN_CODE_103,554,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_104,554,139,23,22
-    PUSHBUTTON      "-",SCAN_CODE_105,581,35,23,22
-    PUSHBUTTON      "+",SCAN_CODE_106,581,61,23,48
-    PUSHBUTTON      "ent",SCAN_CODE_108,581,113,23,48
-    CTEXT           "Num",IDC_STATIC,510,4,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3
-    CTEXT           "Caps",IDC_STATIC,540,4,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3
-    CTEXT           "Scroll",IDC_STATIC,572,4,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "On screen keyboard"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "File"
@@ -274,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Font...", IDM_FONT, GRAYED
+        MENUITEM "&Font...", IDM_FONT
     END
 
     POPUP "Help"
@@ -299,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "On-Screen Keyboard"
-    STRING_AUTHORS "Copyright Denis Robert"
+    IDS_OSK "On-Screen Keyboard"
+    IDS_AUTHORS "Copyright Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/id-ID.rc b/base/applications/osk/lang/id-ID.rc
index 4de8d491cfa..ae174e1705e 100644
--- a/base/applications/osk/lang/id-ID.rc
+++ b/base/applications/osk/lang/id-ID.rc
@@ -8,244 +8,6 @@
 
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
-CAPTION "Papan ketik layar"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,143,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,163,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,243,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,263,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,283,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,303,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,323,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,343,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,363,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,55,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,48,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,56,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,343,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,125,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,267,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,323,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,323,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,343,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,343,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,363,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,363,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,323,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,343,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,363,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,383,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,383,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,383,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,383,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,403,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,403,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,403,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,403,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,383,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,423,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,423,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,423,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,423,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,423,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,443,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,443,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,443,78,15,35
-    CTEXT           "Num",IDC_STATIC,383,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3
-    CTEXT           "Caps",IDC_STATIC,408,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,433,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "Papan ketik layar"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "Be&rkas"
@@ -274,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Mode &Mengetik...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Fon...", IDM_FONT, GRAYED
+        MENUITEM "&Fon...", IDM_FONT
     END
 
     POPUP "&Bantuan"
@@ -299,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "Papan Ketik Layar"
-    STRING_AUTHORS "Hak Cipta Denis Robert"
+    IDS_OSK "Papan Ketik Layar"
+    IDS_AUTHORS "Hak Cipta Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc
index fa45a353b11..1f449cab0f4 100644
--- a/base/applications/osk/lang/it-IT.rc
+++ b/base/applications/osk/lang/it-IT.rc
@@ -8,246 +8,6 @@
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
-CAPTION "Tastiera a schermo"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,143,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,163,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,243,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,263,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,283,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,303,3,15,15
-    PUSHBUTTON      "Imp",SCAN_CODE_124,323,3,15,15
-    PUSHBUTTON      "Arr",SCAN_CODE_125,343,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,363,3,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0 ",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "'",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "|",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,55,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "W",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "E",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "R",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "T",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "Y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "U",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "I",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "O",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "P",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "è",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "+",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "Verr maj",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "S",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "D",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "F",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "G",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "H",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "J",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "K",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "L",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      "ò",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "à",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "ù",SCAN_CODE_42,243,60,15,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,56,15,BS_ICON
-    PUSHBUTTON     
"Shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "Z",SCAN_CODE_45,64,79,15,15
-    PUSHBUTTON      "<",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "X",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "C",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "V",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "B",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "N",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "M",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "-",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"Shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,125,15
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,267,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,323,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,323,41,15,15
-    PUSHBUTTON      "home",SCAN_CODE_80,343,22,15,15,BS_ICON
-    PUSHBUTTON      "fin",SCAN_CODE_81,343,41,15,15
-    PUSHBUTTON      "pg up",SCAN_CODE_85,363,22,15,15,BS_ICON
-    PUSHBUTTON      "pg down",SCAN_CODE_86,363,41,15,15,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,323,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,343,79,15,15,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,343,98,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,363,98,15,15,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,383,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,383,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,383,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,383,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,403,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,403,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,403,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,403,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,383,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,423,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,423,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,423,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,423,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,423,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,443,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,443,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,443,78,15,35
-    CTEXT           "Num",IDC_STATIC,383,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3
-    CTEXT           "Caps",IDC_STATIC,408,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,433,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "Tastiera a schermo"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,143,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,163,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,243,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,263,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,283,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,303,3,15,15
-    PUSHBUTTON      "Imp",SCAN_CODE_124,323,3,15,15
-    PUSHBUTTON      "Arr",SCAN_CODE_125,343,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,363,3,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0 ",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "'",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "|",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,55,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "W",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "E",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "R",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "T",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "Y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "U",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "I",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "O",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "P",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "è",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "+",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "Verr maj",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "S",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "D",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "F",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "G",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "H",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "J",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "K",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "L",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      "ò",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "à",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "ù",SCAN_CODE_42,243,60,15,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,56,15,BS_ICON
-    PUSHBUTTON     
"Shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "Z",SCAN_CODE_45,64,79,15,15
-    PUSHBUTTON      "<",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "X",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "C",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "V",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "B",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "N",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "M",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "-",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"Shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,125,15
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,267,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,323,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,323,41,15,15
-    PUSHBUTTON      "home",SCAN_CODE_80,343,22,15,15,BS_ICON
-    PUSHBUTTON      "fin",SCAN_CODE_81,343,41,15,15
-    PUSHBUTTON      "pg up",SCAN_CODE_85,363,22,15,15,BS_ICON
-    PUSHBUTTON      "pg down",SCAN_CODE_86,363,41,15,15,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,323,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,343,79,15,15,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,343,98,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,363,98,15,15,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,383,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,383,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,383,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,383,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,403,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,403,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,403,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,403,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,383,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,423,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,423,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,423,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,423,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,423,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,443,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,443,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,443,78,15,35
-    CTEXT           "Num",IDC_STATIC,383,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3
-    CTEXT           "Caps",IDC_STATIC,408,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,433,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "File"
@@ -276,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Modalità di scrittura...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Tipo di carattere...", IDM_FONT, GRAYED
+        MENUITEM "&Tipo di carattere...", IDM_FONT
     END
 
     POPUP "Aiuto"
@@ -301,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "Tastiera a schermo"
-    STRING_AUTHORS "Diritti d'autore Denis Robert"
+    IDS_OSK "Tastiera a schermo"
+    IDS_AUTHORS "Diritti d'autore Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/pl-PL.rc b/base/applications/osk/lang/pl-PL.rc
index c128976e309..fb584a41db1 100644
--- a/base/applications/osk/lang/pl-PL.rc
+++ b/base/applications/osk/lang/pl-PL.rc
@@ -8,244 +8,6 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
-CAPTION "Klawiatura Ekranowa"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,23,22
-    PUSHBUTTON      "F1",SCAN_CODE_112,48,3,23,22
-    PUSHBUTTON      "F2",SCAN_CODE_113,75,3,23,22
-    PUSHBUTTON      "F3",SCAN_CODE_114,101,3,23,22
-    PUSHBUTTON      "F4",SCAN_CODE_115,128,3,23,22
-    PUSHBUTTON      "F5",SCAN_CODE_116,173,3,23,22
-    PUSHBUTTON      "F6",SCAN_CODE_117,199,3,23,22
-    PUSHBUTTON      "F7",SCAN_CODE_118,225,3,23,22
-    PUSHBUTTON      "F8",SCAN_CODE_119,251,3,23,22
-    PUSHBUTTON      "F9",SCAN_CODE_120,296,3,23,22
-    PUSHBUTTON      "F10",SCAN_CODE_121,323,3,23,22
-    PUSHBUTTON      "F11",SCAN_CODE_122,350,3,23,22
-    PUSHBUTTON      "F12",SCAN_CODE_123,377,3,23,22
-    PUSHBUTTON      "Prn",SCAN_CODE_124,411,3,23,22
-    PUSHBUTTON      "Stop",SCAN_CODE_125,438,3,23,22
-    PUSHBUTTON      "Attn",SCAN_CODE_126,465,3,23,22
-    PUSHBUTTON      "`",SCAN_CODE_1,3,35,23,22
-    PUSHBUTTON      "1",SCAN_CODE_2,30,35,23,22
-    PUSHBUTTON      "2",SCAN_CODE_3,57,35,23,22
-    PUSHBUTTON      "3",SCAN_CODE_4,84,35,23,22
-    PUSHBUTTON      "4",SCAN_CODE_5,111,35,23,22
-    PUSHBUTTON      "5",SCAN_CODE_6,138,35,23,22
-    PUSHBUTTON      "6",SCAN_CODE_7,165,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_8,192,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_9,219,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_10,246,35,23,22
-    PUSHBUTTON      "0",SCAN_CODE_11,273,35,23,22
-    PUSHBUTTON      "-",SCAN_CODE_12,300,35,23,22
-    PUSHBUTTON      "=",SCAN_CODE_13,327,35,23,22
-    PUSHBUTTON      "<--",SCAN_CODE_15,354,35,47,22,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_17,42,61,23,22
-    PUSHBUTTON      "W",SCAN_CODE_18,69,61,23,22
-    PUSHBUTTON      "E",SCAN_CODE_19,96,61,23,22
-    PUSHBUTTON      "R",SCAN_CODE_20,123,61,23,22
-    PUSHBUTTON      "T",SCAN_CODE_21,150,61,23,22
-    PUSHBUTTON      "Y",SCAN_CODE_22,177,61,23,22
-    PUSHBUTTON      "U",SCAN_CODE_23,204,61,23,22
-    PUSHBUTTON      "I",SCAN_CODE_24,231,61,23,22
-    PUSHBUTTON      "O",SCAN_CODE_25,258,61,23,22
-    PUSHBUTTON      "P",SCAN_CODE_26,285,61,23,22
-    PUSHBUTTON      "[",SCAN_CODE_27,312,61,23,22
-    PUSHBUTTON      "]",SCAN_CODE_28,339,61,23,22
-    PUSHBUTTON      "\\",SCAN_CODE_29,366,61,35,22
-    PUSHBUTTON      "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_31,53,87,23,22
-    PUSHBUTTON      "S",SCAN_CODE_32,80,87,23,22
-    PUSHBUTTON      "D",SCAN_CODE_33,107,87,23,22
-    PUSHBUTTON      "F",SCAN_CODE_34,134,87,23,22
-    PUSHBUTTON      "G",SCAN_CODE_35,161,87,23,22
-    PUSHBUTTON      "H",SCAN_CODE_36,188,87,23,22
-    PUSHBUTTON      "J",SCAN_CODE_37,215,87,23,22
-    PUSHBUTTON      "K",SCAN_CODE_38,242,87,23,22
-    PUSHBUTTON      "L",SCAN_CODE_39,269,87,23,22
-    PUSHBUTTON      ";",SCAN_CODE_40,296,87,23,22
-    PUSHBUTTON      "'",SCAN_CODE_41,323,87,23,22
-    PUSHBUTTON      "ret",SCAN_CODE_43,350,87,51,22,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "Z",SCAN_CODE_46,64,113,23,22
-    PUSHBUTTON      "X",SCAN_CODE_47,91,113,23,22
-    PUSHBUTTON      "C",SCAN_CODE_48,118,113,23,22
-    PUSHBUTTON      "V",SCAN_CODE_49,145,113,23,22
-    PUSHBUTTON      "B",SCAN_CODE_50,172,113,23,22
-    PUSHBUTTON      "N",SCAN_CODE_51,199,113,23,22
-    PUSHBUTTON      "M",SCAN_CODE_52,226,113,23,22
-    PUSHBUTTON      ",",SCAN_CODE_53,253,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_54,280,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_55,307,113,23,22
-    PUSHBUTTON     
"shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,116,139,143,22
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,332,139,30,22,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,411,35,23,22
-    PUSHBUTTON      "del",SCAN_CODE_76,411,61,23,22
-    PUSHBUTTON      "home",SCAN_CODE_80,438,35,23,22,BS_ICON
-    PUSHBUTTON      "end",SCAN_CODE_81,438,61,23,22
-    PUSHBUTTON      "pg AR",SCAN_CODE_85,465,35,23,22,BS_ICON
-    PUSHBUTTON      "pg AV",SCAN_CODE_86,465,61,23,22,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,411,139,23,22,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,438,113,23,22,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,438,139,23,22,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,465,139,23,22,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,500,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_91,500,61,23,22
-    PUSHBUTTON      "4",SCAN_CODE_92,500,87,23,22
-    PUSHBUTTON      "1",SCAN_CODE_93,500,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_95,527,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_96,527,61,23,22
-    PUSHBUTTON      "5",SCAN_CODE_97,527,87,23,22
-    PUSHBUTTON      "2",SCAN_CODE_98,527,113,23,22
-    PUSHBUTTON      "0",SCAN_CODE_99,500,139,50,22
-    PUSHBUTTON      "*",SCAN_CODE_100,554,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_101,554,61,23,22
-    PUSHBUTTON      "6",SCAN_CODE_102,554,87,23,22
-    PUSHBUTTON      "3",SCAN_CODE_103,554,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_104,554,139,23,22
-    PUSHBUTTON      "-",SCAN_CODE_105,581,35,23,22
-    PUSHBUTTON      "+",SCAN_CODE_106,581,61,23,48
-    PUSHBUTTON      "ent",SCAN_CODE_108,581,113,23,48
-    CTEXT           "Num",IDC_STATIC,510,4,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3
-    CTEXT           "Caps",IDC_STATIC,540,4,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3
-    CTEXT           "Scroll",IDC_STATIC,572,4,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "Klawiatura ekranowa"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "Pl&ik"
@@ -274,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Tryb wpisywania...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Czcionka...", IDM_FONT, GRAYED
+        MENUITEM "&Czcionka...", IDM_FONT
     END
 
     POPUP "Pomo&c"
@@ -299,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "Klawiatura ekranowa"
-    STRING_AUTHORS "Copyright Denis Robert"
+    IDS_OSK "Klawiatura ekranowa"
+    IDS_AUTHORS "Copyright Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc
index 9e0bba88685..e7faada2b3f 100644
--- a/base/applications/osk/lang/ro-RO.rc
+++ b/base/applications/osk/lang/ro-RO.rc
@@ -9,244 +9,6 @@
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
-CAPTION "Tastatură virtuală"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,143,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,163,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,243,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,263,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,283,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,303,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,323,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,343,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,363,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,55,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "W",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "E",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "R",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "T",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "Y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "U",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "I",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "O",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "P",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,48,15
-    PUSHBUTTON      "Fix cap",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "S",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "D",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "F",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "G",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "H",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "J",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "K",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "L",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,56,15,BS_ICON
-    PUSHBUTTON     
"schimb",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "Z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "X",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "C",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "V",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "B",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "N",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "M",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"schimb",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,125,15
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "meniu",SCAN_CODE_129,267,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,323,22,15,15
-    PUSHBUTTON      "ștg",SCAN_CODE_76,323,41,15,15
-    PUSHBUTTON      "init",SCAN_CODE_80,343,22,15,15
-    PUSHBUTTON      "fin",SCAN_CODE_81,343,41,15,15
-    PUSHBUTTON      "pg sus",SCAN_CODE_85,363,22,15,15,BS_ICON
-    PUSHBUTTON      "pg jos",SCAN_CODE_86,363,41,15,15,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,323,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,343,79,15,15,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,343,98,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,363,98,15,15,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,383,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,383,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,383,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,383,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,403,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,403,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,403,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,403,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,383,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,423,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,423,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,423,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,423,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,423,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,443,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,443,41,15,35
-    PUSHBUTTON      "intr",SCAN_CODE_108,443,78,15,35
-    CTEXT           "Num",IDC_STATIC,383,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3
-    CTEXT           "Cap",IDC_STATIC,408,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3
-    CTEXT           "Derul",IDC_STATIC,433,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "Tastatură virtuală"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,143,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,163,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,243,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,263,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,283,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,303,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,323,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,343,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,363,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,55,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "W",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "E",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "R",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "T",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "Y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "U",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "I",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "O",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "P",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,48,15
-    PUSHBUTTON      "Fix cap",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "S",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "D",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "F",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "G",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "H",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "J",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "K",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "L",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,56,15,BS_ICON
-    PUSHBUTTON     
"schimb",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "Z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "X",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "C",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "V",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "B",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "N",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "M",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"schimb",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,125,15
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "meniu",SCAN_CODE_129,267,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,323,22,15,15
-    PUSHBUTTON      "ștg",SCAN_CODE_76,323,41,15,15
-    PUSHBUTTON      "init",SCAN_CODE_80,343,22,15,15
-    PUSHBUTTON      "fin",SCAN_CODE_81,343,41,15,15
-    PUSHBUTTON      "pg sus",SCAN_CODE_85,363,22,15,15,BS_ICON
-    PUSHBUTTON      "pg jos",SCAN_CODE_86,363,41,15,15,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,323,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,343,79,15,15,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,343,98,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,363,98,15,15,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,383,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,383,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,383,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,383,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,403,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,403,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,403,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,403,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,383,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,423,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,423,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,423,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,423,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,423,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,443,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,443,41,15,35
-    PUSHBUTTON      "intr",SCAN_CODE_108,443,78,15,35
-    CTEXT           "Num",IDC_STATIC,383,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3
-    CTEXT           "Cap",IDC_STATIC,408,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3
-    CTEXT           "Derul",IDC_STATIC,433,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "Fișier"
@@ -275,7 +37,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Mod tastare...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Font...", IDM_FONT, GRAYED
+        MENUITEM "&Font...", IDM_FONT
     END
 
     POPUP "Ajutor"
@@ -300,8 +62,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "Tastatură virtuală"
-    STRING_AUTHORS "Drepturi de autor Denis Robert"
+    IDS_OSK "Tastatură virtuală"
+    IDS_AUTHORS "Drepturi de autor Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc
index e4f6a4fa125..49331bf89d7 100644
--- a/base/applications/osk/lang/ru-RU.rc
+++ b/base/applications/osk/lang/ru-RU.rc
@@ -8,244 +8,6 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
-CAPTION "Экранная клавиатура"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,143,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,163,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,243,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,263,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,283,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,303,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,323,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,343,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,363,3,15,15
-    PUSHBUTTON      "ё",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,55,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "й",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "ц",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "у",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "к",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "е",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "н",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "г",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "ш",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "щ",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "з",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "х",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "ъ",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "ф",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "ы",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "в",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "а",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "п",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "р",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "о",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "л",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "д",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      "ж",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "э",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_42,270,41,48,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,56,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "я",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "ч",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "с",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "м",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "и",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "т",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "ь",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      "б",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      "ю",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,343,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,125,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,267,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,323,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,323,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,343,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,343,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,363,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,363,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,323,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,343,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,363,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,383,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,383,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,383,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,383,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,403,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,403,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,403,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,403,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,383,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,423,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,423,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,423,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,423,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,423,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,443,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,443,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,443,78,15,35
-    CTEXT           "Num",IDC_STATIC,383,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3
-    CTEXT           "Caps",IDC_STATIC,408,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,433,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "On screen keyboard"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "File"
@@ -274,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Font...", IDM_FONT, GRAYED
+        MENUITEM "&Font...", IDM_FONT
     END
 
     POPUP "Help"
@@ -299,8 +61,23 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_OSK "On-Screen Keyboard"
-    STRING_AUTHORS "Copyright Denis Robert"
+    IDS_OSK "On-Screen Keyboard"
+    IDS_AUTHORS "Copyright Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/tr-TR.rc b/base/applications/osk/lang/tr-TR.rc
index 3e0a2095f3d..ca27a1913b6 100644
--- a/base/applications/osk/lang/tr-TR.rc
+++ b/base/applications/osk/lang/tr-TR.rc
@@ -8,244 +8,6 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
-CAPTION "Ekran Klavyesi"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,23,22
-    PUSHBUTTON      "F1",SCAN_CODE_112,48,3,23,22
-    PUSHBUTTON      "F2",SCAN_CODE_113,75,3,23,22
-    PUSHBUTTON      "F3",SCAN_CODE_114,101,3,23,22
-    PUSHBUTTON      "F4",SCAN_CODE_115,128,3,23,22
-    PUSHBUTTON      "F5",SCAN_CODE_116,173,3,23,22
-    PUSHBUTTON      "F6",SCAN_CODE_117,199,3,23,22
-    PUSHBUTTON      "F7",SCAN_CODE_118,225,3,23,22
-    PUSHBUTTON      "F8",SCAN_CODE_119,251,3,23,22
-    PUSHBUTTON      "F9",SCAN_CODE_120,296,3,23,22
-    PUSHBUTTON      "F10",SCAN_CODE_121,323,3,23,22
-    PUSHBUTTON      "F11",SCAN_CODE_122,350,3,23,22
-    PUSHBUTTON      "F12",SCAN_CODE_123,377,3,23,22
-    PUSHBUTTON      "Prn",SCAN_CODE_124,411,3,23,22
-    PUSHBUTTON      "Stop",SCAN_CODE_125,438,3,23,22
-    PUSHBUTTON      "Attn",SCAN_CODE_126,465,3,23,22
-    PUSHBUTTON      """",SCAN_CODE_1,3,35,23,22
-    PUSHBUTTON      "1",SCAN_CODE_2,30,35,23,22
-    PUSHBUTTON      "2",SCAN_CODE_3,57,35,23,22
-    PUSHBUTTON      "3",SCAN_CODE_4,84,35,23,22
-    PUSHBUTTON      "4",SCAN_CODE_5,111,35,23,22
-    PUSHBUTTON      "5",SCAN_CODE_6,138,35,23,22
-    PUSHBUTTON      "6",SCAN_CODE_7,165,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_8,192,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_9,219,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_10,246,35,23,22
-    PUSHBUTTON      "0",SCAN_CODE_11,273,35,23,22
-    PUSHBUTTON      "*",SCAN_CODE_12,300,35,23,22
-    PUSHBUTTON      "-",SCAN_CODE_13,327,35,23,22
-    PUSHBUTTON      "<--",SCAN_CODE_15,354,35,47,22,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_17,42,61,23,22
-    PUSHBUTTON      "W",SCAN_CODE_18,69,61,23,22
-    PUSHBUTTON      "E",SCAN_CODE_19,96,61,23,22
-    PUSHBUTTON      "R",SCAN_CODE_20,123,61,23,22
-    PUSHBUTTON      "T",SCAN_CODE_21,150,61,23,22
-    PUSHBUTTON      "Y",SCAN_CODE_22,177,61,23,22
-    PUSHBUTTON      "U",SCAN_CODE_23,204,61,23,22
-    PUSHBUTTON      "I",SCAN_CODE_24,231,61,23,22
-    PUSHBUTTON      "O",SCAN_CODE_25,258,61,23,22
-    PUSHBUTTON      "P",SCAN_CODE_26,285,61,23,22
-    PUSHBUTTON      "Ğ",SCAN_CODE_27,312,61,23,22
-    PUSHBUTTON      "Ü",SCAN_CODE_28,339,61,23,22
-    PUSHBUTTON      ",",SCAN_CODE_29,366,61,35,22
-    PUSHBUTTON      "Lock",SCAN_CODE_30,3,87,46,22,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_31,53,87,23,22
-    PUSHBUTTON      "S",SCAN_CODE_32,80,87,23,22
-    PUSHBUTTON      "D",SCAN_CODE_33,107,87,23,22
-    PUSHBUTTON      "F",SCAN_CODE_34,134,87,23,22
-    PUSHBUTTON      "G",SCAN_CODE_35,161,87,23,22
-    PUSHBUTTON      "H",SCAN_CODE_36,188,87,23,22
-    PUSHBUTTON      "J",SCAN_CODE_37,215,87,23,22
-    PUSHBUTTON      "K",SCAN_CODE_38,242,87,23,22
-    PUSHBUTTON      "L",SCAN_CODE_39,269,87,23,22
-    PUSHBUTTON      "Ş",SCAN_CODE_40,296,87,23,22
-    PUSHBUTTON      "İ",SCAN_CODE_41,323,87,23,22
-    PUSHBUTTON      "Ret",SCAN_CODE_43,350,87,51,22,BS_ICON
-    PUSHBUTTON     
"Shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "Z",SCAN_CODE_46,64,113,23,22
-    PUSHBUTTON      "X",SCAN_CODE_47,91,113,23,22
-    PUSHBUTTON      "C",SCAN_CODE_48,118,113,23,22
-    PUSHBUTTON      "V",SCAN_CODE_49,145,113,23,22
-    PUSHBUTTON      "B",SCAN_CODE_50,172,113,23,22
-    PUSHBUTTON      "N",SCAN_CODE_51,199,113,23,22
-    PUSHBUTTON      "M",SCAN_CODE_52,226,113,23,22
-    PUSHBUTTON      "Ö",SCAN_CODE_53,253,113,23,22
-    PUSHBUTTON      "Ç",SCAN_CODE_54,280,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_55,307,113,23,22
-    PUSHBUTTON     
"Shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"Ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"Alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,116,139,143,22
-    PUSHBUTTON     
"Alt",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "Menü",SCAN_CODE_129,332,139,30,22,BS_ICON
-    PUSHBUTTON     
"Ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "Ins",SCAN_CODE_75,411,35,23,22
-    PUSHBUTTON      "Del",SCAN_CODE_76,411,61,23,22
-    PUSHBUTTON      "Home",SCAN_CODE_80,438,35,23,22,BS_ICON
-    PUSHBUTTON      "End",SCAN_CODE_81,438,61,23,22
-    PUSHBUTTON      "PgUp",SCAN_CODE_85,465,35,23,22,BS_ICON
-    PUSHBUTTON      "PgDn",SCAN_CODE_86,465,61,23,22,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,411,139,23,22,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,438,113,23,22,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,438,139,23,22,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,465,139,23,22,BS_ICON
-    PUSHBUTTON      "Nlk",SCAN_CODE_90,500,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_91,500,61,23,22
-    PUSHBUTTON      "4",SCAN_CODE_92,500,87,23,22
-    PUSHBUTTON      "1",SCAN_CODE_93,500,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_95,527,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_96,527,61,23,22
-    PUSHBUTTON      "5",SCAN_CODE_97,527,87,23,22
-    PUSHBUTTON      "2",SCAN_CODE_98,527,113,23,22
-    PUSHBUTTON      "0",SCAN_CODE_99,500,139,50,22
-    PUSHBUTTON      "*",SCAN_CODE_100,554,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_101,554,61,23,22
-    PUSHBUTTON      "6",SCAN_CODE_102,554,87,23,22
-    PUSHBUTTON      "3",SCAN_CODE_103,554,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_104,554,139,23,22
-    PUSHBUTTON      "-",SCAN_CODE_105,581,35,23,22
-    PUSHBUTTON      "+",SCAN_CODE_106,581,61,23,48
-    PUSHBUTTON      "Enter",SCAN_CODE_108,581,113,23,48
-    CTEXT           "Num",IDC_STATIC,510,4,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3
-    CTEXT           "Caps",IDC_STATIC,540,4,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3
-    CTEXT           "Scroll",IDC_STATIC,572,4,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
-END
-
-MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
-CAPTION "Ekran Klavyesi"
-FONT 8, "MS Shell Dlg"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
-    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
-    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
-    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
-    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
-    PUSHBUTTON      "F5",SCAN_CODE_116,123,3,15,15
-    PUSHBUTTON      "F6",SCAN_CODE_117,143,3,15,15
-    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
-    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
-    PUSHBUTTON      "F9",SCAN_CODE_120,223,3,15,15
-    PUSHBUTTON      "F10",SCAN_CODE_121,243,3,15,15
-    PUSHBUTTON      "F11",SCAN_CODE_122,263,3,15,15
-    PUSHBUTTON      "F12",SCAN_CODE_123,283,3,15,15
-    PUSHBUTTON      "Prn",SCAN_CODE_124,304,3,15,15
-    PUSHBUTTON      "Stop",SCAN_CODE_125,324,3,15,15
-    PUSHBUTTON      "Attn",SCAN_CODE_126,344,3,15,15
-    PUSHBUTTON      "`",SCAN_CODE_1,3,22,15,15
-    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
-    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
-    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
-    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
-    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
-    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
-    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
-    PUSHBUTTON      "-",SCAN_CODE_12,223,22,15,15
-    PUSHBUTTON      "=",SCAN_CODE_13,243,22,15,15
-    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
-    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
-    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
-    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
-    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
-    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
-    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
-    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
-    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
-    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
-    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
-    PUSHBUTTON      "[",SCAN_CODE_27,232,41,15,15
-    PUSHBUTTON      "]",SCAN_CODE_28,251,41,15,15
-    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
-    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
-    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
-    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
-    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
-    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
-    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
-    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
-    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
-    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
-    PUSHBUTTON      ";",SCAN_CODE_40,224,60,15,15
-    PUSHBUTTON      "'",SCAN_CODE_41,243,60,15,15
-    PUSHBUTTON      "\\",SCAN_CODE_29,270,41,30,15
-    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
-    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
-    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
-    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
-    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
-    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
-    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
-    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_55,235,79,15,15
-    PUSHBUTTON     
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "v",SCAN_CODE_84,324,98,15,15,BS_ICON
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,84,98,106,15 //space
-    PUSHBUTTON     
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,304,22,15,15
-    PUSHBUTTON      "del",SCAN_CODE_76,304,41,15,15
-    PUSHBUTTON      "hm",SCAN_CODE_80,324,22,15,15
-    PUSHBUTTON      "end",SCAN_CODE_81,324,41,15,15
-    PUSHBUTTON      "pup",SCAN_CODE_85,344,22,15,15
-    PUSHBUTTON      "pdn",SCAN_CODE_86,344,41,15,15
-    PUSHBUTTON      "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,324,79,15,15,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,344,98,15,15,BS_ICON
-    PUSHBUTTON      "nlk",SCAN_CODE_90,364,22,15,15
-    PUSHBUTTON      "7",SCAN_CODE_91,364,41,15,15
-    PUSHBUTTON      "4",SCAN_CODE_92,364,60,15,15
-    PUSHBUTTON      "1",SCAN_CODE_93,364,79,15,15
-    PUSHBUTTON      "/",SCAN_CODE_95,384,22,15,15
-    PUSHBUTTON      "8",SCAN_CODE_96,384,41,15,15
-    PUSHBUTTON      "5",SCAN_CODE_97,384,60,15,15
-    PUSHBUTTON      "2",SCAN_CODE_98,384,79,15,15
-    PUSHBUTTON      "0",SCAN_CODE_99,364,98,34,15
-    PUSHBUTTON      "*",SCAN_CODE_100,404,22,15,15
-    PUSHBUTTON      "9",SCAN_CODE_101,404,41,15,15
-    PUSHBUTTON      "6",SCAN_CODE_102,404,60,15,15
-    PUSHBUTTON      "3",SCAN_CODE_103,404,79,15,15
-    PUSHBUTTON      ".",SCAN_CODE_104,404,98,15,15
-    PUSHBUTTON      "-",SCAN_CODE_105,424,22,15,15
-    PUSHBUTTON      "+",SCAN_CODE_106,424,41,15,35
-    PUSHBUTTON      "ent",SCAN_CODE_108,424,78,15,35
-    CTEXT           "Num",IDC_STATIC,364,3,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
-    CTEXT           "Caps",IDC_STATIC,389,3,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
-    CTEXT           "Scroll",IDC_STATIC,414,3,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
-END
-
 IDR_OSK_MENU MENU DISCARDABLE
 BEGIN
     POPUP "Dosya"
@@ -274,7 +36,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Yazma modu...", IDM_TYPE_MODE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Font...", IDM_FONT, GRAYED
+        MENUITEM "&Font...", IDM_FONT
     END
 
     POPUP "Yardım"
@@ -298,9 +60,24 @@ BEGIN
 END
 
 STRINGTABLE
-BEGIN
-    STRING_OSK "Ekran Klavyesi"
-    STRING_AUTHORS "Telif Hakkı: Denis Robert"
+BEGIN 
+    IDS_OSK "Ekran Klavyesi"
+    IDS_AUTHORS "Telif Hakkı: Denis Robert"
+    IDS_NUMLOCK "Num"
+    IDS_CAPSLOCK "Caps"
+    IDS_SCROLLLOCK "Scroll"
+    /* Make sure the text fits onto the buttons */
+    IDS_ESCAPE "Esc"
+    IDS_PRN "Prn"
+    IDS_STOP "Stop"
+    IDS_ATTN "Attn"
+    IDS_INSERT "ins"
+    IDS_NUMLOCKKEY "nlk"
+    IDS_DELETE "del"
+    IDS_END "end"
+    IDS_CTRL "ctrl"
+    IDS_LEFTALT "alt"
+    IDS_RIGHTALT "alt"
 END
 
 /* EOF */
diff --git a/base/applications/osk/lang/zh-CN.rc b/base/applications/osk/lang/zh-CN.rc
index 9bd7e0769cf..77b3b2a262f 100644
--- a/base/applications/osk/lang/zh-CN.rc
+++ b/base/applications/osk/lang/zh-CN.rc
@@ -12,244 +12,6 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
-CAPTION "屏幕键盘"
-FONT 9, "宋体"
-MENU IDR_OSK_MENU
-STYLE WS_SYSMENU | WS_MINIMIZEBOX
-EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
-BEGIN
-    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,23,22
-    PUSHBUTTON      "F1",SCAN_CODE_112,48,3,23,22
-    PUSHBUTTON      "F2",SCAN_CODE_113,75,3,23,22
-    PUSHBUTTON      "F3",SCAN_CODE_114,101,3,23,22
-    PUSHBUTTON      "F4",SCAN_CODE_115,128,3,23,22
-    PUSHBUTTON      "F5",SCAN_CODE_116,173,3,23,22
-    PUSHBUTTON      "F6",SCAN_CODE_117,199,3,23,22
-    PUSHBUTTON      "F7",SCAN_CODE_118,225,3,23,22
-    PUSHBUTTON      "F8",SCAN_CODE_119,251,3,23,22
-    PUSHBUTTON      "F9",SCAN_CODE_120,296,3,23,22
-    PUSHBUTTON      "F10",SCAN_CODE_121,323,3,23,22
-    PUSHBUTTON      "F11",SCAN_CODE_122,350,3,23,22
-    PUSHBUTTON      "F12",SCAN_CODE_123,377,3,23,22
-    PUSHBUTTON      "Prn",SCAN_CODE_124,411,3,23,22
-    PUSHBUTTON      "Stop",SCAN_CODE_125,438,3,23,22
-    PUSHBUTTON      "Attn",SCAN_CODE_126,465,3,23,22
-    PUSHBUTTON      "`",SCAN_CODE_1,3,35,23,22
-    PUSHBUTTON      "1",SCAN_CODE_2,30,35,23,22
-    PUSHBUTTON      "2",SCAN_CODE_3,57,35,23,22
-    PUSHBUTTON      "3",SCAN_CODE_4,84,35,23,22
-    PUSHBUTTON      "4",SCAN_CODE_5,111,35,23,22
-    PUSHBUTTON      "5",SCAN_CODE_6,138,35,23,22
-    PUSHBUTTON      "6",SCAN_CODE_7,165,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_8,192,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_9,219,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_10,246,35,23,22
-    PUSHBUTTON      "0",SCAN_CODE_11,273,35,23,22
-    PUSHBUTTON      "-",SCAN_CODE_12,300,35,23,22
-    PUSHBUTTON      "=",SCAN_CODE_13,327,35,23,22
-    PUSHBUTTON      "<--",SCAN_CODE_15,354,35,47,22,BS_ICON
-    PUSHBUTTON      "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON
-    PUSHBUTTON      "Q",SCAN_CODE_17,42,61,23,22
-    PUSHBUTTON      "W",SCAN_CODE_18,69,61,23,22
-    PUSHBUTTON      "E",SCAN_CODE_19,96,61,23,22
-    PUSHBUTTON      "R",SCAN_CODE_20,123,61,23,22
-    PUSHBUTTON      "T",SCAN_CODE_21,150,61,23,22
-    PUSHBUTTON      "Y",SCAN_CODE_22,177,61,23,22
-    PUSHBUTTON      "U",SCAN_CODE_23,204,61,23,22
-    PUSHBUTTON      "I",SCAN_CODE_24,231,61,23,22
-    PUSHBUTTON      "O",SCAN_CODE_25,258,61,23,22
-    PUSHBUTTON      "P",SCAN_CODE_26,285,61,23,22
-    PUSHBUTTON      "[",SCAN_CODE_27,312,61,23,22
-    PUSHBUTTON      "]",SCAN_CODE_28,339,61,23,22
-    PUSHBUTTON      "\\",SCAN_CODE_29,366,61,35,22
-    PUSHBUTTON      "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON
-    PUSHBUTTON      "A",SCAN_CODE_31,53,87,23,22
-    PUSHBUTTON      "S",SCAN_CODE_32,80,87,23,22
-    PUSHBUTTON      "D",SCAN_CODE_33,107,87,23,22
-    PUSHBUTTON      "F",SCAN_CODE_34,134,87,23,22
-    PUSHBUTTON      "G",SCAN_CODE_35,161,87,23,22
-    PUSHBUTTON      "H",SCAN_CODE_36,188,87,23,22
-    PUSHBUTTON      "J",SCAN_CODE_37,215,87,23,22
-    PUSHBUTTON      "K",SCAN_CODE_38,242,87,23,22
-    PUSHBUTTON      "L",SCAN_CODE_39,269,87,23,22
-    PUSHBUTTON      ";",SCAN_CODE_40,296,87,23,22
-    PUSHBUTTON      "'",SCAN_CODE_41,323,87,23,22
-    PUSHBUTTON      "ret",SCAN_CODE_43,350,87,51,22,BS_ICON
-    PUSHBUTTON     
"shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "Z",SCAN_CODE_46,64,113,23,22
-    PUSHBUTTON      "X",SCAN_CODE_47,91,113,23,22
-    PUSHBUTTON      "C",SCAN_CODE_48,118,113,23,22
-    PUSHBUTTON      "V",SCAN_CODE_49,145,113,23,22
-    PUSHBUTTON      "B",SCAN_CODE_50,172,113,23,22
-    PUSHBUTTON      "N",SCAN_CODE_51,199,113,23,22
-    PUSHBUTTON      "M",SCAN_CODE_52,226,113,23,22
-    PUSHBUTTON      ",",SCAN_CODE_53,253,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_54,280,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_55,307,113,23,22
-    PUSHBUTTON     
"shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "",SCAN_CODE_61,116,139,143,22
-    PUSHBUTTON      "alt
gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON     
"ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "menu",SCAN_CODE_129,332,139,30,22,BS_ICON
-    PUSHBUTTON     
"ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX
-    PUSHBUTTON      "ins",SCAN_CODE_75,411,35,23,22
-    PUSHBUTTON      "del",SCAN_CODE_76,411,61,23,22
-    PUSHBUTTON      "home",SCAN_CODE_80,438,35,23,22,BS_ICON
-    PUSHBUTTON      "end",SCAN_CODE_81,438,61,23,22
-    PUSHBUTTON      "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON
-    PUSHBUTTON      "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON
-    PUSHBUTTON      "<-",SCAN_CODE_79,411,139,23,22,BS_ICON
-    PUSHBUTTON      "^",SCAN_CODE_83,438,113,23,22,BS_ICON
-    PUSHBUTTON      "v",SCAN_CODE_84,438,139,23,22,BS_ICON
-    PUSHBUTTON      "->",SCAN_CODE_89,465,139,23,22,BS_ICON
-    PUSHBUTTON      "num",SCAN_CODE_90,500,35,23,22
-    PUSHBUTTON      "7",SCAN_CODE_91,500,61,23,22
-    PUSHBUTTON      "4",SCAN_CODE_92,500,87,23,22
-    PUSHBUTTON      "1",SCAN_CODE_93,500,113,23,22
-    PUSHBUTTON      "/",SCAN_CODE_95,527,35,23,22
-    PUSHBUTTON      "8",SCAN_CODE_96,527,61,23,22
-    PUSHBUTTON      "5",SCAN_CODE_97,527,87,23,22
-    PUSHBUTTON      "2",SCAN_CODE_98,527,113,23,22
-    PUSHBUTTON      "0",SCAN_CODE_99,500,139,50,22
-    PUSHBUTTON      "*",SCAN_CODE_100,554,35,23,22
-    PUSHBUTTON      "9",SCAN_CODE_101,554,61,23,22
-    PUSHBUTTON      "6",SCAN_CODE_102,554,87,23,22
-    PUSHBUTTON      "3",SCAN_CODE_103,554,113,23,22
-    PUSHBUTTON      ".",SCAN_CODE_104,554,139,23,22
-    PUSHBUTTON      "-",SCAN_CODE_105,581,35,23,22
-    PUSHBUTTON      "+",SCAN_CODE_106,581,61,23,48
-    PUSHBUTTON      "ent",SCAN_CODE_108,581,113,23,48
-    CTEXT           "Num",IDC_STATIC,510,4,21,8
-    CONTROL        
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3
-    CTEXT           "Caps",IDC_STATIC,540,4,21,8
-    CONTROL        
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3
-    CTEXT           "Scroll",IDC_STATIC,572,4,21,8
-    CONTROL        
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
-END
... 1854 lines suppressed ...


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

[ros-diffs] [reactos] 01/01: [OSK] On Screen Keyboard overhaul