From 21c0efe8cd6102c4ff5023772a71f5ac798941af Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 3 Sep 2007 14:44:08 +0000
Subject: [PATCH] - Convert RADIOBUTTONs to AUTORADIOBUTTONs. - Replace
 Trackbars by Comboboxes in the filter keys dialogs. - Fix some typos and
 minor translation issues in the german dialogs. - Add missing functionality
 for the repeat key dialog.

@dreimer: Did I fix all bugs?


svn path=/trunk/; revision=28815
---
 reactos/dll/cpl/access/keyboard.c    | 143 +++++++++++++++++++++------
 reactos/dll/cpl/access/lang/cs-CZ.rc |  43 +++-----
 reactos/dll/cpl/access/lang/de-DE.rc |  59 +++++------
 reactos/dll/cpl/access/lang/en-US.rc |  43 +++-----
 reactos/dll/cpl/access/lang/es-ES.rc |  43 +++-----
 reactos/dll/cpl/access/lang/fr-FR.rc |  43 +++-----
 reactos/dll/cpl/access/lang/hu-HU.rc |  43 +++-----
 reactos/dll/cpl/access/lang/id-ID.rc |  43 +++-----
 reactos/dll/cpl/access/lang/it-IT.rc |  43 +++-----
 reactos/dll/cpl/access/lang/ja-JP.rc |  43 +++-----
 reactos/dll/cpl/access/lang/nl-NL.rc |  43 +++-----
 reactos/dll/cpl/access/lang/pl-PL.rc |  43 +++-----
 reactos/dll/cpl/access/lang/ru-RU.rc |  43 +++-----
 reactos/dll/cpl/access/resource.h    |  20 ++--
 14 files changed, 298 insertions(+), 397 deletions(-)

diff --git a/reactos/dll/cpl/access/keyboard.c b/reactos/dll/cpl/access/keyboard.c
index 42677862a7e..97b9e5312c8 100644
--- a/reactos/dll/cpl/access/keyboard.c
+++ b/reactos/dll/cpl/access/keyboard.c
@@ -32,6 +32,15 @@ typedef struct _GLOBAL_DATA
 #define BOUNCETICKS 5
 static INT nBounceArray[BOUNCETICKS] = {500, 700, 1000, 1500, 2000};
 
+#define DELAYTICKS 5
+static INT nDelayArray[DELAYTICKS] = {300, 700, 1000, 1500, 2000};
+
+#define REPEATTICKS 6
+static INT nRepeatArray[REPEATTICKS] = {300, 500, 700, 1000, 1500, 2000};
+
+#define WAITTICKS 10
+static INT nWaitArray[WAITTICKS] = {0, 300, 500, 700, 1000, 1500, 2000, 5000, 10000, 20000};
+
 
 /* Property page dialog callback */
 INT_PTR CALLBACK
@@ -118,7 +127,7 @@ StickyKeysDlgProc(HWND hwndDlg,
 
 
 static VOID
-SetDlgItemTime(HWND hwnd, INT nId, INT nTimeMs)
+AddComboBoxTime(HWND hwnd, INT nId, INT nTimeMs)
 {
     TCHAR szBuffer[32];
     TCHAR szSeconds[20];
@@ -130,7 +139,7 @@ SetDlgItemTime(HWND hwnd, INT nId, INT nTimeMs)
               nTimeMs / 1000, (nTimeMs % 1000) / 100,
               szSeconds);
 
-    SetDlgItemText(hwnd, nId, szBuffer);
+    SendDlgItemMessage(hwnd, nId, CB_ADDSTRING, 0, (LPARAM)szBuffer);
 }
 
 
@@ -141,7 +150,7 @@ BounceKeysDlgProc(HWND hwndDlg,
                   LPARAM lParam)
 {
     PGLOBAL_DATA pGlobalData;
-    INT i;
+    INT i, n;
 
     pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
 
@@ -151,47 +160,35 @@ BounceKeysDlgProc(HWND hwndDlg,
             pGlobalData = (PGLOBAL_DATA)lParam;
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData);
 
-            /* Set the range */
-            SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_TRACK, TBM_SETRANGE,
-                               TRUE, MAKELONG(0, BOUNCETICKS - 1));
-
-            /* Determine the current thumb position */
+            /* Determine the current bounce time */
             if (pGlobalData->filterKeys.iBounceMSec == 0)
                 pGlobalData->filterKeys.iBounceMSec = nBounceArray[0];
 
-            for (i = 0; i < BOUNCETICKS; i++)
+            for (n = 0; n < BOUNCETICKS; n++)
             {
-                 if (pGlobalData->filterKeys.iBounceMSec < nBounceArray[i])
+                 if (pGlobalData->filterKeys.iBounceMSec < nBounceArray[n])
                      break;
             }
-            i--;
+            n--;
 
-            /* Set the thumb position */
-            SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_TRACK, TBM_SETPOS, TRUE, i);
-
-            /* Set the bounce delay */
-            SetDlgItemTime(hwndDlg, IDC_BOUNCE_TIME_EDIT, nBounceArray[i]);
-            break;
-
-        case WM_HSCROLL:
-            switch (GetWindowLong((HWND) lParam, GWL_ID))
+            for (i = 0; i < BOUNCETICKS; i++)
             {
-                case IDC_BOUNCE_TIME_TRACK:
-                    i = SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_TRACK, TBM_GETPOS, 0, 0);
-                    if (i >= 0 && i < BOUNCETICKS)
-                    {
-                        /* Update the bounce delay */
-                        pGlobalData->filterKeys.iBounceMSec = nBounceArray[i];
-                        SetDlgItemTime(hwndDlg, IDC_BOUNCE_TIME_EDIT, nBounceArray[i]);
-                    }
-                    break;
+                 AddComboBoxTime(hwndDlg, IDC_BOUNCE_TIME_COMBO, nBounceArray[i]);
             }
+
+            SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_COMBO, CB_SETCURSEL, n, 0);
             break;
 
         case WM_COMMAND:
             switch (LOWORD(wParam))
             {
                 case IDOK:
+                    i = SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_COMBO, CB_GETCURSEL, 0, 0);
+                    if (i != CB_ERR)
+                    {
+                        pGlobalData->filterKeys.iBounceMSec = nBounceArray[i];
+                    }
+
                     EndDialog(hwndDlg, TRUE);
                     break;
 
@@ -216,6 +213,7 @@ RepeatKeysDlgProc(HWND hwndDlg,
                   LPARAM lParam)
 {
     PGLOBAL_DATA pGlobalData;
+    INT i, n;
 
     pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
 
@@ -224,12 +222,99 @@ RepeatKeysDlgProc(HWND hwndDlg,
         case WM_INITDIALOG:
             pGlobalData = (PGLOBAL_DATA)lParam;
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData);
+
+            CheckRadioButton(hwndDlg,
+                             IDC_REPEAT_NOREPEAT_RADIO,
+                             IDC_REPEAT_REPEAT_RADIO,
+                             (pGlobalData->filterKeys.iDelayMSec == 0) ? IDC_REPEAT_NOREPEAT_RADIO : IDC_REPEAT_REPEAT_RADIO);
+
+            /* Initialize the delay combobox */
+            for (n = 0; n < DELAYTICKS; n++)
+            {
+                 if (pGlobalData->filterKeys.iDelayMSec < nDelayArray[n])
+                     break;
+            }
+            n--;
+
+            for (i = 0; i < DELAYTICKS; i++)
+            {
+                 AddComboBoxTime(hwndDlg, IDC_REPEAT_DELAY_COMBO, nDelayArray[i]);
+            }
+
+            SendDlgItemMessage(hwndDlg, IDC_REPEAT_DELAY_COMBO, CB_SETCURSEL, n, 0);
+
+            /* Initialize the repeat combobox */
+            for (n = 0; n < REPEATTICKS; n++)
+            {
+                 if (pGlobalData->filterKeys.iRepeatMSec < nRepeatArray[n])
+                     break;
+            }
+            n--;
+
+            for (i = 0; i < REPEATTICKS; i++)
+            {
+                 AddComboBoxTime(hwndDlg, IDC_REPEAT_REPEAT_COMBO, nRepeatArray[i]);
+            }
+
+            SendDlgItemMessage(hwndDlg, IDC_REPEAT_REPEAT_COMBO, CB_SETCURSEL, n, 0);
+
+            /* Disable the delay and repeat comboboxes if needed */
+            if (pGlobalData->filterKeys.iDelayMSec == 0)
+            {
+                EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_DELAY_COMBO), FALSE);
+                EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_REPEAT_COMBO), FALSE);
+            }
+
+            /* Initialize the wait combobox */
+            for (n = 0; n < WAITTICKS; n++)
+            {
+                 if (pGlobalData->filterKeys.iWaitMSec < nWaitArray[n])
+                     break;
+            }
+            n--;
+
+            for (i = 0; i < WAITTICKS; i++)
+            {
+                 AddComboBoxTime(hwndDlg, IDC_REPEAT_WAIT_COMBO, nWaitArray[i]);
+            }
+
+            SendDlgItemMessage(hwndDlg, IDC_REPEAT_WAIT_COMBO, CB_SETCURSEL, n, 0);
             break;
 
         case WM_COMMAND:
             switch (LOWORD(wParam))
             {
+                case IDC_REPEAT_NOREPEAT_RADIO:
+                    pGlobalData->filterKeys.iDelayMSec = 0;
+                    pGlobalData->filterKeys.iRepeatMSec = 0;
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_DELAY_COMBO), FALSE);
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_REPEAT_COMBO), FALSE);
+                    break;
+
+                case IDC_REPEAT_REPEAT_RADIO:
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_DELAY_COMBO), TRUE);
+                    EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_REPEAT_COMBO), TRUE);
+                    break;
+
                 case IDOK:
+                    i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_DELAY_COMBO, CB_GETCURSEL, 0, 0);
+                    if (i != CB_ERR)
+                    {
+                        pGlobalData->filterKeys.iDelayMSec = nDelayArray[i];
+                    }
+
+                    i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_REPEAT_COMBO, CB_GETCURSEL, 0, 0);
+                    if (i != CB_ERR)
+                    {
+                        pGlobalData->filterKeys.iRepeatMSec = nRepeatArray[i];
+                    }
+
+                    i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_WAIT_COMBO, CB_GETCURSEL, 0, 0);
+                    if (i != CB_ERR)
+                    {
+                        pGlobalData->filterKeys.iWaitMSec = nWaitArray[i];
+                    }
+
                     EndDialog(hwndDlg, TRUE);
                     break;
 
diff --git a/reactos/dll/cpl/access/lang/cs-CZ.rc b/reactos/dll/cpl/access/lang/cs-CZ.rc
index 1d004278417..cab0c89b5eb 100644
--- a/reactos/dll/cpl/access/lang/cs-CZ.rc
+++ b/reactos/dll/cpl/access/lang/cs-CZ.rc
@@ -225,14 +225,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1)
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
@@ -247,36 +244,24 @@ BEGIN
   GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12)
   LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
 
-  RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
-  RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
+  AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
+  AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
 
   LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4
   LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
diff --git a/reactos/dll/cpl/access/lang/de-DE.rc b/reactos/dll/cpl/access/lang/de-DE.rc
index 13c6d3389a3..ec0be65f44c 100644
--- a/reactos/dll/cpl/access/lang/de-DE.rc
+++ b/reactos/dll/cpl/access/lang/de-DE.rc
@@ -134,7 +134,7 @@ CAPTION "Anschlagverz
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Tastenkombination",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Die Tastenkombination für die Anschlagverzögerung ist:  \n<Right Shift> für acht Sekunden gedrückt halten.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
+  LTEXT "Die Tastenkombination für die Anschlagverzögerung ist:\n<Right Shift> für acht Sekunden gedrückt halten.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
   AUTOCHECKBOX "T&astenkombination verwenden",IDC_FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14
 
   GROUPBOX "Filter Optionen",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5
@@ -159,8 +159,8 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Toggle Keys Einstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Schnelltaste",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Die Schnelltaste für ToggleKeys ist: \n<Num Lock> für fünf Sekunden gedrückt halten.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
+  GROUPBOX "Tastenkombination",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
+  LTEXT "Die Tastenkombination für ToggleKeys ist:\n<Num Lock> für fünf Sekunden gedrückt halten.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
   AUTOCHECKBOX "Wähle &Schnelltaste",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
@@ -173,12 +173,12 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hoher Konstrast Einstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  GROUPBOX "Schnelltaste",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Die Schnelltaste für hohen Kontrast ist:  \nDrücke <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
+  GROUPBOX "Tastenkombination",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
+  LTEXT "Die Tastenkombination für hohen Kontrast ist:\nDrücke <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
   AUTOCHECKBOX "&Wähle Schnelltaste",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14
 
   GROUPBOX "Hoher Kontrast Farbschema",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1)
-  LTEXT "Derzetiges Farbschema:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  LTEXT "Derzeitiges Farbschema:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
   COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
            CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
@@ -193,7 +193,7 @@ CAPTION "Tastaturmaus Einstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Tastenkombiation",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Die Tastenkombination für die Tastaturmaus ist:  \nDrücke <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
+  LTEXT "Die Tastenkombination für die Tastaturmaus ist:\nDrücke <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3)
   AUTOCHECKBOX "&Tastenkombination verwenden",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14
 
   GROUPBOX "Cursorgeschwindigkeit",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9)
@@ -228,14 +228,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "&Tastenanschläge igorieren, die schneller wiederholt werden als:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1)
-  LTEXT "Kurz",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Lang",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "T&estbereich:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "T&estbereich:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
@@ -248,38 +245,26 @@ CAPTION "Erweiterte Anschlagverz
 FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12)
-  LTEXT "Tastatureinstellungen in der Systmsteuereung übergehen:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  LTEXT "Tastatureinstellungen in der Systmsteuerung übergehen:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
 
-  RADIOBUTTON "&Keine Wiederholung",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
-  RADIOBUTTON "&Wiederholungsraten verlangsamen",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
+  AUTORADIOBUTTON "&Keine Wiederholung",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
+  AUTORADIOBUTTON "&Wiederholungsraten verlangsamen",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
 
   LTEXT "&Verzögerung:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 Sekunden",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Kurz",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Lang",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   LTEXT "Wiede&rholrate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 Sekunden",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Kurz",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Lang",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Tasten&haltedauer",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4
   LTEXT "&Tasten müssen wie folgt gedrückt bleiben:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "0.5 Sekunden",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Kurz",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Lang",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "T&estbereich:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "T&estbereich:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
diff --git a/reactos/dll/cpl/access/lang/en-US.rc b/reactos/dll/cpl/access/lang/en-US.rc
index 09d0d54348e..8a02a60d8af 100644
--- a/reactos/dll/cpl/access/lang/en-US.rc
+++ b/reactos/dll/cpl/access/lang/en-US.rc
@@ -225,14 +225,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1)
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
@@ -247,36 +244,24 @@ BEGIN
   GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12)
   LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
 
-  RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
-  RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
+  AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
+  AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
 
   LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4
   LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
diff --git a/reactos/dll/cpl/access/lang/es-ES.rc b/reactos/dll/cpl/access/lang/es-ES.rc
index dd058c47adf..634c4280c47 100644
--- a/reactos/dll/cpl/access/lang/es-ES.rc
+++ b/reactos/dll/cpl/access/lang/es-ES.rc
@@ -228,14 +228,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1)
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
@@ -250,36 +247,24 @@ BEGIN
   GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12)
   LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
 
-  RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
-  RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
+  AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
+  AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
 
   LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4
   LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
diff --git a/reactos/dll/cpl/access/lang/fr-FR.rc b/reactos/dll/cpl/access/lang/fr-FR.rc
index d49be45c855..20ae21a3345 100644
--- a/reactos/dll/cpl/access/lang/fr-FR.rc
+++ b/reactos/dll/cpl/access/lang/fr-FR.rc
@@ -227,14 +227,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1)
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
@@ -249,36 +246,24 @@ BEGIN
   GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12)
   LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
 
-  RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
-  RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
+  AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
+  AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
 
   LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4
   LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
diff --git a/reactos/dll/cpl/access/lang/hu-HU.rc b/reactos/dll/cpl/access/lang/hu-HU.rc
index 4bcc53d8ae4..8e81128d278 100644
--- a/reactos/dll/cpl/access/lang/hu-HU.rc
+++ b/reactos/dll/cpl/access/lang/hu-HU.rc
@@ -226,14 +226,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1)
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
@@ -248,36 +245,24 @@ BEGIN
   GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12)
   LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
 
-  RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
-  RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
+  AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
+  AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
 
   LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4
   LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
diff --git a/reactos/dll/cpl/access/lang/id-ID.rc b/reactos/dll/cpl/access/lang/id-ID.rc
index c605cfe2dd9..df8b585d7b5 100644
--- a/reactos/dll/cpl/access/lang/id-ID.rc
+++ b/reactos/dll/cpl/access/lang/id-ID.rc
@@ -227,14 +227,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1)
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
@@ -249,36 +246,24 @@ BEGIN
   GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12)
   LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
 
-  RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
-  RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
+  AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
+  AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
 
   LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4
   LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
diff --git a/reactos/dll/cpl/access/lang/it-IT.rc b/reactos/dll/cpl/access/lang/it-IT.rc
index f4776958d69..09b7c1c1a80 100644
--- a/reactos/dll/cpl/access/lang/it-IT.rc
+++ b/reactos/dll/cpl/access/lang/it-IT.rc
@@ -225,14 +225,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1)
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
@@ -247,36 +244,24 @@ BEGIN
   GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12)
   LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
 
-  RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
-  RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
+  AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
+  AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
 
   LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4
   LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
diff --git a/reactos/dll/cpl/access/lang/ja-JP.rc b/reactos/dll/cpl/access/lang/ja-JP.rc
index eacd2bde474..242119cffae 100644
--- a/reactos/dll/cpl/access/lang/ja-JP.rc
+++ b/reactos/dll/cpl/access/lang/ja-JP.rc
@@ -225,14 +225,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1)
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
@@ -247,36 +244,24 @@ BEGIN
   GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12)
   LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
 
-  RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
-  RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
+  AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
+  AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
 
   LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4
   LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
diff --git a/reactos/dll/cpl/access/lang/nl-NL.rc b/reactos/dll/cpl/access/lang/nl-NL.rc
index d784d6bf69d..889bf2853ff 100644
--- a/reactos/dll/cpl/access/lang/nl-NL.rc
+++ b/reactos/dll/cpl/access/lang/nl-NL.rc
@@ -227,14 +227,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1)
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
@@ -249,36 +246,24 @@ BEGIN
   GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12)
   LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
 
-  RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
-  RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
+  AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
+  AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
 
   LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4
   LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
diff --git a/reactos/dll/cpl/access/lang/pl-PL.rc b/reactos/dll/cpl/access/lang/pl-PL.rc
index cabe39fe8c8..b415f6b9d5d 100644
--- a/reactos/dll/cpl/access/lang/pl-PL.rc
+++ b/reactos/dll/cpl/access/lang/pl-PL.rc
@@ -228,14 +228,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1)
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
@@ -250,36 +247,24 @@ BEGIN
   GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12)
   LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
 
-  RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
-  RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
+  AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
+  AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
 
   LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4
   LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
diff --git a/reactos/dll/cpl/access/lang/ru-RU.rc b/reactos/dll/cpl/access/lang/ru-RU.rc
index 2c8738cec68..5cad063f7e0 100644
--- a/reactos/dll/cpl/access/lang/ru-RU.rc
+++ b/reactos/dll/cpl/access/lang/ru-RU.rc
@@ -225,14 +225,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
   LTEXT "&Ignore keystrokes repeated faster than:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
+  COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "",IDC_BOUNCE_TIME_EDIT,PROPSHEETPADDING(2),LABELLINE(3)+4,PROPSHEETPADDING(9),LABELLINE(1)
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_BOUNCE_TIME_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(3)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(3)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
@@ -247,36 +244,24 @@ BEGIN
   GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12)
   LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2)
 
-  RADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
-  RADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
+  AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP
+  AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1)
 
   LTEXT "Repeat &delay:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_DELAY_EDIT,PROPSHEETPADDING(4),LABELLINE(7)+6,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_DELAY_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(7)+3,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(7)+6,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   LTEXT "Repeat &rate:",-1,PROPSHEETPADDING(4),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1)
-
-  LTEXT "0.5 seconds",IDC_REPEAT_REPEAT_EDIT,PROPSHEETPADDING(4),LABELLINE(10)+8,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_REPEAT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(10)+6,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(10)+8,PROPSHEETPADDING(3),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
   GROUPBOX "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4
   LTEXT "&Keys must be held down for:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1)
+  COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8),
+           CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
 
-  LTEXT "0.5 seconds",IDC_REPEAT_WAIT_EDIT,PROPSHEETPADDING(2),LABELLINE(16)+4,PROPSHEETPADDING(9),LABELLINE(1)
-
-  LTEXT "Short",-1,PROPSHEETPADDING(13),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-  CONTROL "",IDC_REPEAT_WAIT_TRACK,"msctls_trackbar32",TBS_AUTOTICKS|WS_TABSTOP,PROPSHEETPADDING(17),LABELLINE(16)+1,PROPSHEETWIDTH-PROPSHEETPADDING(23),LABELLINE(2)
-  LTEXT "Long",-1,PROPSHEETWIDTH-PROPSHEETPADDING(6),LABELLINE(16)+4,PROPSHEETPADDING(3),LABELLINE(1)
-
-  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(6),LABELLINE(1)
-  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(8),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(9),14,ES_AUTOHSCROLL
+  LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1)
+  EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL
 
   DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14
   PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14
diff --git a/reactos/dll/cpl/access/resource.h b/reactos/dll/cpl/access/resource.h
index d679dd40619..4db65b2e81c 100644
--- a/reactos/dll/cpl/access/resource.h
+++ b/reactos/dll/cpl/access/resource.h
@@ -82,19 +82,15 @@
 #define IDC_FILTER_SOUND_CHECK		236
 #define IDC_FILTER_STATUS_CHECK		237
 
-#define IDC_BOUNCE_TIME_EDIT		238
-#define IDC_BOUNCE_TIME_TRACK		239
-#define IDC_BOUNCE_TEST_EDIT		240
+#define IDC_BOUNCE_TIME_COMBO		238
+#define IDC_BOUNCE_TEST_EDIT		239
 
-#define IDC_REPEAT_NOREPEAT_RADIO	241
-#define IDC_REPEAT_REPEAT_RADIO		242
-#define IDC_REPEAT_DELAY_EDIT		243
-#define IDC_REPEAT_DELAY_TRACK		244
-#define IDC_REPEAT_REPEAT_EDIT		245
-#define IDC_REPEAT_REPEAT_TRACK		246
-#define IDC_REPEAT_WAIT_EDIT		247
-#define IDC_REPEAT_WAIT_TRACK		248
-#define IDC_REPEAT_TEST_EDIT		249
+#define IDC_REPEAT_NOREPEAT_RADIO	240
+#define IDC_REPEAT_REPEAT_RADIO		241
+#define IDC_REPEAT_DELAY_COMBO		242
+#define IDC_REPEAT_REPEAT_COMBO		243
+#define IDC_REPEAT_WAIT_COMBO		244
+#define IDC_REPEAT_TEST_EDIT		245
 
 #define IDC_TOGGLE_ACTIVATE_CHECK	250