diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc
index d1c179d2ef3..0d4c719166d 100644
--- a/dlls/joy.cpl/joy.rc
+++ b/dlls/joy.cpl/joy.rc
@@ -54,25 +54,16 @@ STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
 CAPTION "Test Joystick"
 FONT 8, "Ms Shell Dlg"
 {
-    COMBOBOX        IDC_TESTSELECTCOMBO, 5, 5, 200, 60, CBS_DROPDOWNLIST | CBS_HASSTRINGS
+    COMBOBOX        IDC_TESTSELECTCOMBO, 15, 10, 291, 60, CBS_DROPDOWNLIST | CBS_HASSTRINGS
     GROUPBOX        "Buttons", IDC_STATIC, 15, 100, 291, 70
     GROUPBOX        "", IDC_TESTGROUPXY,   15, 30, 60, 60
     GROUPBOX        "", IDC_TESTGROUPRXRY, 92, 30, 60, 60
     GROUPBOX        "", IDC_TESTGROUPZRZ, 169, 30, 60, 60
     GROUPBOX        "", IDC_TESTGROUPPOV, 246, 30, 60, 60
-}
-
-IDD_FORCEFEEDBACK DIALOG 0, 0, 320, 300
-STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
-CAPTION "Test Force Feedback"
-FONT 8, "Ms Shell Dlg"
-{
-    COMBOBOX        IDC_FFSELECTCOMBO, 5, 5, 200, 60, CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT           "Available Effects", IDC_STATIC, 10, 30, 100, 10
-    LISTBOX         IDC_FFEFFECTLIST, 10, 40, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY
+    LTEXT           "Force Feedback Effect", IDC_STATIC, 15, 180, 291, 10
+    LISTBOX         IDC_FFEFFECTLIST, 15, 190, 291, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY
     LTEXT           "Press any button in the controller to activate the chosen effect. The effect direction can be changed with the controller axis.",
-                    IDC_STATIC, 10, 110, 210, 25
-    GROUPBOX        "Direction", IDC_STATIC, 220, 30, 60, 60
+                    IDC_STATIC, 15, 260, 291, 25
 }
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index e48762d18f1..e5377a71aa9 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -59,16 +59,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(joycpl);
 #define TEST_AXIS_MIN       -25
 #define TEST_AXIS_MAX       25
 
-#define FF_AXIS_X           248
-#define FF_AXIS_Y           60
-#define FF_AXIS_SIZE_X      3
-#define FF_AXIS_SIZE_Y      3
-
 #define FF_PLAY_TIME        2*DI_SECONDS
 #define FF_PERIOD_TIME      FF_PLAY_TIME/4
 
-#define NUM_PROPERTY_PAGES 3
-
 struct effect
 {
     struct list entry;
@@ -86,7 +79,6 @@ struct Graphics
     HWND hwnd;
     HWND buttons[TEST_MAX_BUTTONS];
     HWND axes[TEST_MAX_AXES];
-    HWND ff_axis;
 };
 
 struct JoystickData
@@ -613,7 +605,6 @@ static void dump_joy_state(DIJOYSTATE* st)
 static DWORD WINAPI input_thread(void *param)
 {
     int axes_pos[TEST_MAX_AXES][2];
-    DIJOYSTATE state;
     struct JoystickData *data = param;
 
     /* Setup POV as clock positions
@@ -629,63 +620,114 @@ static DWORD WINAPI input_thread(void *param)
     int pov_pos[9][2] = { {0, -ma}, {ma/2, -ma/2}, {ma, 0}, {ma/2, ma/2},
                           {0, ma}, {-ma/2, ma/2}, {-ma, 0}, {-ma/2, -ma/2}, {0, 0} };
 
-    ZeroMemory(&state, sizeof(state));
-
     while (!data->stop)
     {
         IDirectInputDevice8W *device;
+        IDirectInputEffect *effect;
+        DIJOYSTATE state = {0};
         unsigned int i, j;
 
-        memset( &state, 0, sizeof(state) );
-
         if (WaitForSingleObject( device_state_event, TEST_POLL_TIME ) == WAIT_TIMEOUT) continue;
 
         if ((device = get_selected_device()))
         {
             IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state );
             IDirectInputDevice8_Release( device );
-        }
 
-        dump_joy_state(&state);
+            dump_joy_state(&state);
 
-        /* Indicate pressed buttons */
-        for (i = 0; i < TEST_MAX_BUTTONS; i++)
-            SendMessageW(data->graphics.buttons[i], BM_SETSTATE, !!state.rgbButtons[i], 0);
+            /* Indicate pressed buttons */
+            for (i = 0; i < TEST_MAX_BUTTONS; i++)
+                SendMessageW(data->graphics.buttons[i], BM_SETSTATE, !!state.rgbButtons[i], 0);
 
-        /* Indicate axis positions, axes showing are hardcoded for now */
-        axes_pos[0][0] = state.lX;
-        axes_pos[0][1] = state.lY;
-        axes_pos[1][0] = state.lRx;
-        axes_pos[1][1] = state.lRy;
-        axes_pos[2][0] = state.lZ;
-        axes_pos[2][1] = state.lRz;
+            /* Indicate axis positions, axes showing are hardcoded for now */
+            axes_pos[0][0] = state.lX;
+            axes_pos[0][1] = state.lY;
+            axes_pos[1][0] = state.lRx;
+            axes_pos[1][1] = state.lRy;
+            axes_pos[2][0] = state.lZ;
+            axes_pos[2][1] = state.lRz;
 
-        /* Set pov values */
-        for (j = 0; j < ARRAY_SIZE(pov_val); j++)
-        {
-            if (state.rgdwPOV[0] == pov_val[j])
+            /* Set pov values */
+            for (j = 0; j < ARRAY_SIZE(pov_val); j++)
             {
-                axes_pos[3][0] = pov_pos[j][0];
-                axes_pos[3][1] = pov_pos[j][1];
+                if (state.rgdwPOV[0] == pov_val[j])
+                {
+                    axes_pos[3][0] = pov_pos[j][0];
+                    axes_pos[3][1] = pov_pos[j][1];
+                }
+            }
+
+            for (i = 0; i < TEST_MAX_AXES; i++)
+            {
+                RECT r;
+
+                r.left = (TEST_AXIS_X + TEST_NEXT_AXIS_X*i + axes_pos[i][0]);
+                r.top = (TEST_AXIS_Y + axes_pos[i][1]);
+                r.bottom = r.right = 0; /* unused */
+                MapDialogRect(data->graphics.hwnd, &r);
+
+                SetWindowPos(data->graphics.axes[i], 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
             }
         }
 
-        for (i = 0; i < TEST_MAX_AXES; i++)
+        if ((effect = get_selected_effect()))
         {
-            RECT r;
+            DWORD flags = DIEP_AXES | DIEP_DIRECTION | DIEP_NORESTART;
+            LONG direction[3] = {0};
+            DWORD axes[3] = {0};
+            DIEFFECT params =
+            {
+                .dwSize = sizeof(DIEFFECT),
+                .dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS,
+                .rglDirection = direction,
+                .rgdwAxes = axes,
+                .cAxes = 3,
+            };
 
-            r.left = (TEST_AXIS_X + TEST_NEXT_AXIS_X*i + axes_pos[i][0]);
-            r.top = (TEST_AXIS_Y + axes_pos[i][1]);
-            r.bottom = r.right = 0; /* unused */
-            MapDialogRect(data->graphics.hwnd, &r);
+            IDirectInputEffect_GetParameters( effect, &params, flags );
+            params.rgdwAxes[0] = state.lX;
+            params.rgdwAxes[1] = state.lY;
 
-            SetWindowPos(data->graphics.axes[i], 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
+            for (i=0; i < TEST_MAX_BUTTONS; i++)
+            {
+                if (state.rgbButtons[i])
+                {
+                    IDirectInputEffect_SetParameters( effect, &params, flags );
+                    IDirectInputEffect_Start( effect, 1, 0 );
+                    break;
+                }
+            }
+
+            IDirectInputEffect_Release( effect );
         }
     }
 
     return 0;
 }
 
+static void initialize_effects_list( HWND hwnd, IDirectInputDevice8W *device )
+{
+    struct effect *effect;
+
+    clear_effects();
+
+    IDirectInputDevice8_EnumEffects( device, enum_effects, device, 0 );
+
+    SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_RESETCONTENT, 0, 0);
+    SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_ADDSTRING, 0, (LPARAM)L"None");
+
+    LIST_FOR_EACH_ENTRY( effect, &effects, struct effect, entry )
+    {
+        DIEFFECTINFOW info = {.dwSize = sizeof(DIEFFECTINFOW)};
+        GUID guid;
+
+        if (FAILED(IDirectInputEffect_GetEffectGuid( effect->effect, &guid ))) continue;
+        if (FAILED(IDirectInputDevice8_GetEffectInfo( device, &info, &guid ))) continue;
+        SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_ADDSTRING, 0, (LPARAM)(info.tszName + 5));
+    }
+}
+
 static void test_handle_joychange(HWND hwnd, struct JoystickData *data)
 {
     DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)};
@@ -706,9 +748,36 @@ static void test_handle_joychange(HWND hwnd, struct JoystickData *data)
     if (FAILED(IDirectInputDevice8_GetCapabilities( device, &caps ))) return;
 
     set_selected_device( device );
+    initialize_effects_list( hwnd, device );
     for (i = 0; i < TEST_MAX_BUTTONS; i++) ShowWindow( data->graphics.buttons[i], i < caps.dwButtons );
 }
 
+static void ff_handle_effectchange( HWND hwnd )
+{
+    IDirectInputDevice8W *device;
+    struct list *entry;
+    int sel;
+
+    set_selected_effect( NULL );
+
+    sel = SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_GETCURSEL, 0, 0) - 1;
+    if (sel < 0) return;
+
+    entry = list_head( &effects );
+    while (sel-- && entry) entry = list_next( &effects, entry );
+    if (!entry) return;
+
+    set_selected_effect( LIST_ENTRY( entry, struct effect, entry )->effect );
+
+    if ((device = get_selected_device()))
+    {
+        IDirectInputDevice8_Unacquire( device );
+        IDirectInputDevice8_SetCooperativeLevel( device, GetAncestor( hwnd, GA_ROOT ), DISCL_BACKGROUND | DISCL_EXCLUSIVE );
+        IDirectInputDevice8_Acquire( device );
+        IDirectInputDevice8_Release( device );
+    }
+}
+
 /*********************************************************************
  * button_number_to_wchar [internal]
  *  Transforms an integer in the interval [0,99] into a 2 character WCHAR string
@@ -822,7 +891,14 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
             {
                 case MAKEWPARAM(IDC_TESTSELECTCOMBO, CBN_SELCHANGE):
                     test_handle_joychange(hwnd, data);
-                break;
+
+                    SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_SETCURSEL, 0, 0);
+                    ff_handle_effectchange( hwnd );
+                    break;
+
+                case MAKEWPARAM(IDC_FFEFFECTLIST, LBN_SELCHANGE):
+                    ff_handle_effectchange( hwnd );
+                    break;
             }
             return TRUE;
 
@@ -841,6 +917,9 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
                     SendDlgItemMessageW(hwnd, IDC_TESTSELECTCOMBO, CB_SETCURSEL, 0, 0);
                     test_handle_joychange(hwnd, data);
 
+                    SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_SETCURSEL, 0, 0);
+                    ff_handle_effectchange( hwnd );
+
                     thread = CreateThread(NULL, 0, input_thread, (void*) data, 0, &tid);
                 }
                 break;
@@ -858,238 +937,6 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
     return FALSE;
 }
 
-/*********************************************************************
- * Joystick force feedback testing functions
- *
- */
-static void draw_ff_axis(HWND hwnd, struct JoystickData *data)
-{
-    HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE);
-    RECT r;
-
-    r.left = FF_AXIS_X;
-    r.top = FF_AXIS_Y;
-    r.right = r.left + FF_AXIS_SIZE_X;
-    r.bottom = r.top + FF_AXIS_SIZE_Y;
-    MapDialogRect(hwnd, &r);
-
-    /* Draw direction axis */
-    data->graphics.ff_axis = CreateWindowW(L"Button", NULL, WS_CHILD | WS_VISIBLE,
-        r.left, r.top, r.right - r.left, r.bottom - r.top,
-        hwnd, NULL, NULL, hinst);
-}
-
-static void initialize_effects_list( HWND hwnd, IDirectInputDevice8W *device )
-{
-    struct effect *effect;
-
-    clear_effects();
-
-    IDirectInputDevice8_EnumEffects( device, enum_effects, device, 0 );
-
-    SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_RESETCONTENT, 0, 0);
-
-    LIST_FOR_EACH_ENTRY( effect, &effects, struct effect, entry )
-    {
-        DIEFFECTINFOW info = {.dwSize = sizeof(DIEFFECTINFOW)};
-        GUID guid;
-
-        if (FAILED(IDirectInputEffect_GetEffectGuid( effect->effect, &guid ))) continue;
-        if (FAILED(IDirectInputDevice8_GetEffectInfo( device, &info, &guid ))) continue;
-        SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_ADDSTRING, 0, (LPARAM)(info.tszName + 5));
-    }
-}
-
-static void ff_handle_joychange( HWND hwnd )
-{
-    DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)};
-    IDirectInputDevice8W *device;
-    struct list *entry;
-    int i;
-
-    i = SendDlgItemMessageW( hwnd, IDC_FFSELECTCOMBO, CB_GETCURSEL, 0, 0 );
-    if (i < 0) return;
-
-    entry = list_head( &devices );
-    while (i-- && entry) entry = list_next( &devices, entry );
-    if (!entry) return;
-
-    device = LIST_ENTRY( entry, struct device, entry )->device;
-    if (FAILED(IDirectInputDevice8_GetCapabilities( device, &caps ))) return;
-
-    set_selected_device( device );
-    initialize_effects_list( hwnd, device );
-}
-
-static void ff_handle_effectchange( HWND hwnd )
-{
-    IDirectInputDevice8W *device;
-    struct list *entry;
-    int sel;
-
-    set_selected_effect( NULL );
-
-    sel = SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_GETCURSEL, 0, 0);
-    if (sel < 0) return;
-
-    entry = list_head( &effects );
-    while (sel-- && entry) entry = list_next( &effects, entry );
-    if (!entry) return;
-
-    set_selected_effect( LIST_ENTRY( entry, struct effect, entry )->effect );
-
-    if ((device = get_selected_device()))
-    {
-        IDirectInputDevice8_Unacquire( device );
-        IDirectInputDevice8_SetCooperativeLevel( device, GetAncestor( hwnd, GA_ROOT ), DISCL_BACKGROUND | DISCL_EXCLUSIVE );
-        IDirectInputDevice8_Acquire( device );
-        IDirectInputDevice8_Release( device );
-    }
-}
-
-static DWORD WINAPI ff_input_thread(void *param)
-{
-    struct JoystickData *data = param;
-    DIJOYSTATE state;
-
-    ZeroMemory(&state, sizeof(state));
-
-    while (!data->stop)
-    {
-        int i;
-        DWORD flags = DIEP_AXES | DIEP_DIRECTION | DIEP_NORESTART;
-        IDirectInputDevice8W *device;
-        IDirectInputEffect *effect;
-        LONG direction[3] = {0};
-        DWORD axes[3] = {0};
-        DIEFFECT params =
-        {
-            .dwSize = sizeof(DIEFFECT),
-            .dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS,
-            .rglDirection = direction,
-            .rgdwAxes = axes,
-            .cAxes = 3,
-        };
-        RECT r;
-
-        if (WaitForSingleObject( device_state_event, TEST_POLL_TIME ) == WAIT_TIMEOUT) continue;
-
-        if ((device = get_selected_device()))
-        {
-            IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state );
-            IDirectInputDevice8_Release( device );
-        }
-
-        if (!(effect = get_selected_effect())) continue;
-
-        IDirectInputEffect_GetParameters( effect, &params, flags );
-        params.rgdwAxes[0] = state.lX;
-        params.rgdwAxes[1] = state.lY;
-
-        r.left = FF_AXIS_X + state.lX;
-        r.top = FF_AXIS_Y + state.lY;
-        r.right = r.bottom = 0; /* unused */
-        MapDialogRect(data->graphics.hwnd, &r);
-
-        SetWindowPos(data->graphics.ff_axis, 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
-
-        for (i=0; i < TEST_MAX_BUTTONS; i++)
-            if (state.rgbButtons[i])
-            {
-                IDirectInputEffect_SetParameters( effect, &params, flags );
-                IDirectInputEffect_Start( effect, 1, 0 );
-                break;
-            }
-
-        IDirectInputEffect_Release( effect );
-    }
-
-    return 0;
-}
-
-
-/*********************************************************************
- * ff_dlgproc [internal]
- *
- */
-static void refresh_ff_joystick_list(HWND hwnd, struct JoystickData *data)
-{
-    struct device *entry;
-
-    SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_RESETCONTENT, 0, 0);
-
-    LIST_FOR_EACH_ENTRY( entry, &devices, struct device, entry )
-    {
-        DIDEVICEINSTANCEW info = {.dwSize = sizeof(DIDEVICEINSTANCEW)};
-        if (FAILED(IDirectInputDevice8_GetDeviceInfo( entry->device, &info ))) continue;
-        SendDlgItemMessageW( hwnd, IDC_FFSELECTCOMBO, CB_ADDSTRING, 0, (LPARAM)info.tszInstanceName );
-    }
-}
-
-static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
-{
-    static HANDLE thread;
-    static struct JoystickData *data;
-    TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam);
-
-    switch (msg)
-    {
-        case WM_INITDIALOG:
-        {
-            data = (struct JoystickData*) ((PROPSHEETPAGEW*)lparam)->lParam;
-
-            refresh_ff_joystick_list(hwnd, data);
-            draw_ff_axis(hwnd, data);
-
-            return TRUE;
-        }
-
-        case WM_COMMAND:
-            switch(wparam)
-            {
-                case MAKEWPARAM(IDC_FFSELECTCOMBO, CBN_SELCHANGE):
-                    ff_handle_joychange( hwnd );
-
-                    SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_SETCURSEL, 0, 0);
-                    ff_handle_effectchange( hwnd );
-                    break;
-
-                case MAKEWPARAM(IDC_FFEFFECTLIST, LBN_SELCHANGE):
-                    ff_handle_effectchange( hwnd );
-                    break;
-            }
-            return TRUE;
-
-        case WM_NOTIFY:
-            switch(((LPNMHDR)lparam)->code)
-            {
-                case PSN_SETACTIVE:
-                    refresh_ff_joystick_list(hwnd, data);
-
-                    data->stop = FALSE;
-                    /* Set the first joystick as default */
-                    SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_SETCURSEL, 0, 0);
-                    ff_handle_joychange( hwnd );
-
-                    SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_SETCURSEL, 0, 0);
-                    ff_handle_effectchange( hwnd );
-
-                    thread = CreateThread(NULL, 0, ff_input_thread, (void*) data, 0, NULL);
-                break;
-
-                case PSN_RESET: /* intentional fall-through */
-                case PSN_KILLACTIVE:
-                    /* Stop ff thread */
-                    data->stop = TRUE;
-                    MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, 0);
-                    CloseHandle(thread);
-                break;
-            }
-            return TRUE;
-    }
-    return FALSE;
-}
-
 /******************************************************************************
  * propsheet_callback [internal]
  */
@@ -1113,8 +960,8 @@ static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam)
 static void display_cpl_sheets(HWND parent, struct JoystickData *data)
 {
     INITCOMMONCONTROLSEX icex;
-    PROPSHEETPAGEW psp[NUM_PROPERTY_PAGES];
     BOOL activated = FALSE;
+    PROPSHEETPAGEW psp[2];
     PROPSHEETHEADERW psh;
     ULONG_PTR cookie;
     ACTCTXW actctx;
@@ -1155,13 +1002,6 @@ static void display_cpl_sheets(HWND parent, struct JoystickData *data)
     psp[id].lParam = (INT_PTR) data;
     id++;
 
-    psp[id].dwSize = sizeof (PROPSHEETPAGEW);
-    psp[id].hInstance = hcpl;
-    psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_FORCEFEEDBACK);
-    psp[id].pfnDlgProc = ff_dlgproc;
-    psp[id].lParam = (INT_PTR) data;
-    id++;
-
     /* Fill out the PROPSHEETHEADER */
     psh.dwSize = sizeof (PROPSHEETHEADERW);
     psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK;
diff --git a/dlls/joy.cpl/resource.h b/dlls/joy.cpl/resource.h
index 671e9ad8c77..c15f8dfbdeb 100644
--- a/dlls/joy.cpl/resource.h
+++ b/dlls/joy.cpl/resource.h
@@ -36,7 +36,6 @@
 
 #define IDD_LIST            1000
 #define IDD_TEST            1001
-#define IDD_FORCEFEEDBACK   1002
 
 #define IDC_JOYSTICKLIST    2000
 #define IDC_DISABLEDLIST    2001
@@ -51,9 +50,7 @@
 #define IDC_TESTGROUPRXRY   2102
 #define IDC_TESTGROUPZRZ    2103
 #define IDC_TESTGROUPPOV    2104
-
-#define IDC_FFSELECTCOMBO   2200
-#define IDC_FFEFFECTLIST    2201
+#define IDC_FFEFFECTLIST    2105
 
 #define ICO_MAIN            100
 
diff --git a/po/ar.po b/po/ar.po
index 1eb2b2067b5..c129846f594 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -790,7 +790,7 @@ msgstr "مطابقة ال&كلمة"
 msgid "Match &Case"
 msgstr "مطابقة ال&حالة"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "الاتجاه"
 
@@ -3786,15 +3786,13 @@ msgstr "اختبار مقبض اللعب"
 msgid "Buttons"
 msgstr "الأزرار"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "اختبار الهزّاز"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "المؤثرات المتاحة"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ast.po b/po/ast.po
index 1e32387449f..09a778463c6 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -784,7 +784,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Direición"
 
@@ -3679,15 +3679,11 @@ msgstr ""
 msgid "Buttons"
 msgstr "Botones"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Efeutos disponibles"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/bg.po b/po/bg.po
index 9d2225bd214..29534552eb7 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -801,7 +801,7 @@ msgstr "&Само цели думи"
 msgid "Match &Case"
 msgstr "&Чувствителен регистър"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Посока"
 
@@ -3798,16 +3798,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-#, fuzzy
-msgid "Available Effects"
-msgstr "На&пред"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ca.po b/po/ca.po
index 203f48deda3..92eff11fca8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -786,7 +786,7 @@ msgstr "Troba només &paraules completes"
 msgid "Match &Case"
 msgstr "&Distingeix entre majúscules i minúscules"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Direcció"
 
@@ -3774,15 +3774,13 @@ msgstr "Prova de palanca de control"
 msgid "Buttons"
 msgstr "Botons"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Prova de retroacció de força"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Efectes disponibles"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/cs.po b/po/cs.po
index 2bf0ea31203..36c69b7454b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -797,7 +797,7 @@ msgstr "Pouze &celá slova"
 msgid "Match &Case"
 msgstr "&Rozlišovat velikost"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Směr"
 
@@ -3735,15 +3735,13 @@ msgstr "Otestovat pákový ovladač"
 msgid "Buttons"
 msgstr "Tlačítka"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Otestovat silovou zpětnou vazbu"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Dostupné efekty"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/da.po b/po/da.po
index 08f2649bf3c..0282cedefcd 100644
--- a/po/da.po
+++ b/po/da.po
@@ -805,7 +805,7 @@ msgstr "&Kun hele ord"
 msgid "Match &Case"
 msgstr "Forskel på store/små &bogstaver"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Retning"
 
@@ -3821,17 +3821,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-#, fuzzy
-#| msgid "Available formats"
-msgid "Available Effects"
-msgstr "Tilgængelige formater"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/de.po b/po/de.po
index 056e5d17319..406c111396b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -784,7 +784,7 @@ msgstr "Nu&r ganzes Wort suchen"
 msgid "Match &Case"
 msgstr "Groß-/Klein&schreibung"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Suchrichtung"
 
@@ -3762,15 +3762,13 @@ msgstr "Joystick testen"
 msgid "Buttons"
 msgstr "Tasten"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Force Feedback testen"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Verfügbare Effekte"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/el.po b/po/el.po
index 2cfa69e36a2..3012ebb06b8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -778,7 +778,7 @@ msgstr "Ταίριασμα &Ολόκληρης Λέξης Μόνο"
 msgid "Match &Case"
 msgstr "Ταίριασμα &Κεφαλαίων"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
@@ -3710,17 +3710,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-#, fuzzy
-#| msgid "A&vailable buttons:"
-msgid "Available Effects"
-msgstr "Δ&ιαθέσιμα κουμπιά:"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/en.po b/po/en.po
index 5af86c229ff..80d95f8084a 100644
--- a/po/en.po
+++ b/po/en.po
@@ -783,7 +783,7 @@ msgstr "Match &Whole Word Only"
 msgid "Match &Case"
 msgstr "Match &Case"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Direction"
 
@@ -3755,15 +3755,11 @@ msgstr "Test Joystick"
 msgid "Buttons"
 msgstr "Buttons"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
-msgstr "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
+msgstr "Force Feedback Effect"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Available Effects"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/en_US.po b/po/en_US.po
index 8e9574594a7..b234b644aee 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -783,7 +783,7 @@ msgstr "Match &Whole Word Only"
 msgid "Match &Case"
 msgstr "Match &Case"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Direction"
 
@@ -3755,15 +3755,11 @@ msgstr "Test Joystick"
 msgid "Buttons"
 msgstr "Buttons"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
-msgstr "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
+msgstr "Force Feedback Effect"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Available Effects"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/eo.po b/po/eo.po
index ca841a149f2..51b09106ec8 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -787,7 +787,7 @@ msgstr "Nur tutan &vorton"
 msgid "Match &Case"
 msgstr "Atenti &Usklecon"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Direkto"
 
@@ -3705,17 +3705,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-#, fuzzy
-#| msgid "Available formats"
-msgid "Available Effects"
-msgstr "Disponeblaj formatoj"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/es.po b/po/es.po
index c04c5e75b27..32cf1f2f466 100644
--- a/po/es.po
+++ b/po/es.po
@@ -785,7 +785,7 @@ msgstr "Sólo &palabra completa"
 msgid "Match &Case"
 msgstr "&Mayúsculas/minúsculas"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Dirección"
 
@@ -3775,15 +3775,13 @@ msgstr "Probar comando de juegos"
 msgid "Buttons"
 msgstr "Botones"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Probar Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Efectos disponibles"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/fa.po b/po/fa.po
index 340d6a2873b..857af17df4e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -785,7 +785,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 #, fuzzy
 msgid "Direction"
 msgstr "اطلاعات"
@@ -3739,15 +3739,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr ""
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/fi.po b/po/fi.po
index 82c8c3aedce..443c69f4af6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -778,7 +778,7 @@ msgstr "&Koko sana"
 msgid "Match &Case"
 msgstr "Kirjaink&oko"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Suunta"
 
@@ -3749,15 +3749,13 @@ msgstr "Testaa joystickia"
 msgid "Buttons"
 msgstr "Painikkeet"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Testaa voimapalautetta"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Mahdolliset efektit"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/fr.po b/po/fr.po
index d96525c6588..a1b2c433452 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -786,7 +786,7 @@ msgstr "Mots &entiers seulement"
 msgid "Match &Case"
 msgstr "Respecter la &casse"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Direction"
 
@@ -3781,15 +3781,13 @@ msgstr "Tester le joystick"
 msgid "Buttons"
 msgstr "Boutons"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Tester le retour de force"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Effets disponibles"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/he.po b/po/he.po
index 079c934d75e..062d1509b2c 100644
--- a/po/he.po
+++ b/po/he.po
@@ -802,7 +802,7 @@ msgstr "התאמת מילים &שלמות בלבד"
 msgid "Match &Case"
 msgstr "התאמת &רשיות"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "כיוון"
 
@@ -3782,17 +3782,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-#, fuzzy
-#| msgid "Available formats"
-msgid "Available Effects"
-msgstr "התבניות הזמינות"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/hi.po b/po/hi.po
index 94f7305bc31..688f14a210c 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -770,7 +770,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr ""
 
@@ -3671,15 +3671,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr ""
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/hr.po b/po/hr.po
index de9d319fc11..5a20180d70d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -795,7 +795,7 @@ msgstr "Odgovara samo &cijela riječ"
 msgid "Match &Case"
 msgstr "Odgovara &veličina slova"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Smjer"
 
@@ -3791,15 +3791,13 @@ msgstr "Isprobaj joystick"
 msgid "Buttons"
 msgstr "Gumbi"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Isprobaj povratnu vezu sile"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Dostupni efekti"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/hu.po b/po/hu.po
index 3a11546692a..410fdc772cc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -809,7 +809,7 @@ msgstr "Teljes &szavak keresése"
 msgid "Match &Case"
 msgstr "Kis/&nagybetű különbség"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Irány"
 
@@ -3837,17 +3837,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-#, fuzzy
-#| msgid "Available formats"
-msgid "Available Effects"
-msgstr "Elérhető formátumok"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/it.po b/po/it.po
index 557080702a5..c7d9b56db84 100644
--- a/po/it.po
+++ b/po/it.po
@@ -815,7 +815,7 @@ msgstr "Solo parole &intere"
 msgid "Match &Case"
 msgstr "&Maiuscole/Minuscole"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Direzione"
 
@@ -3845,17 +3845,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-#, fuzzy
-#| msgid "Available formats"
-msgid "Available Effects"
-msgstr "Formati disponibili"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ja.po b/po/ja.po
index 19675288dca..3f3ce8fdbb4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -784,7 +784,7 @@ msgstr "単語単位で検索(&W)"
 msgid "Match &Case"
 msgstr "大文字と小文字を区別する(&C)"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "方向"
 
@@ -3749,15 +3749,13 @@ msgstr "ジョイスティックのテスト"
 msgid "Buttons"
 msgstr "ボタン"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "フォース フィードバックのテスト"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "使用可能な効果"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ko.po b/po/ko.po
index 15b750a9941..c46f84011e0 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -781,7 +781,7 @@ msgstr "단어 단위로(&W)"
 msgid "Match &Case"
 msgstr "대/소문자 구분(&C)"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "방향"
 
@@ -3739,15 +3739,13 @@ msgstr "조이스틱 테스트"
 msgid "Buttons"
 msgstr "버튼"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "강제 피드백 테스트"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "사용 가능한 효과"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/lt.po b/po/lt.po
index 141862eeefb..02847a1c27c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -783,7 +783,7 @@ msgstr "Tenkina tik &visas žodis"
 msgid "Match &Case"
 msgstr "Skirti raidžių &dydį"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Kryptis"
 
@@ -3758,15 +3758,13 @@ msgstr "Testuoti vairasvirtę"
 msgid "Buttons"
 msgstr "Mygtukai"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Testuoti „Force Feedback“"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Prieinami efektai"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ml.po b/po/ml.po
index 2dc8a4f62b7..9c5d39246c4 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -772,7 +772,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr ""
 
@@ -3673,15 +3673,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr ""
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 939c9b1d396..3533dc066ae 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -782,7 +782,7 @@ msgstr "Finn &kun hele ord"
 msgid "Match &Case"
 msgstr "Skill &mellom store og små bokstaver"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Retning"
 
@@ -3769,15 +3769,13 @@ msgstr "Test styrespake"
 msgid "Buttons"
 msgstr "Knapper"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Test Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Tilgjengelige effekter"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/nl.po b/po/nl.po
index a42e96be659..df48054f489 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -785,7 +785,7 @@ msgstr "Geheel &woord"
 msgid "Match &Case"
 msgstr "Gelijke &hoofd-/kleine letters"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Oriëntatie"
 
@@ -3769,15 +3769,13 @@ msgstr "Joystick testen"
 msgid "Buttons"
 msgstr "Knoppen"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Force Feedback Testen"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Beschikbare effecten"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/or.po b/po/or.po
index 2138375aff9..bf4927b4eee 100644
--- a/po/or.po
+++ b/po/or.po
@@ -770,7 +770,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr ""
 
@@ -3671,15 +3671,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr ""
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/pa.po b/po/pa.po
index 852ecdcc4b6..f0cf7c8e7f2 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -770,7 +770,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr ""
 
@@ -3671,15 +3671,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr ""
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/pl.po b/po/pl.po
index 9cea7787c3b..3840b87ded3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -788,7 +788,7 @@ msgstr "Uwzględniaj tylko całe &wyrazy"
 msgid "Match &Case"
 msgstr "&Rozróżniaj wielkość liter"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Kierunek"
 
@@ -3774,15 +3774,13 @@ msgstr "Próbowanie Joysticka"
 msgid "Buttons"
 msgstr "Przyciski"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Próbowanie odczuć siły zwrotnej"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Dostępne efekty"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 91bdf5f7632..b540268e520 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -785,7 +785,7 @@ msgstr "Palavra &Inteira"
 msgid "Match &Case"
 msgstr "&Maiúsculas/minúsculas"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Direção"
 
@@ -3770,15 +3770,13 @@ msgstr "Testar Controle"
 msgid "Buttons"
 msgstr "Botões"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Testar Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Efeitos Disponíveis"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 8aad754f71d..a7399d323df 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -809,7 +809,7 @@ msgstr "Palavra &Inteira"
 msgid "Match &Case"
 msgstr "&Maiúsculas/minúsculas"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Direção"
 
@@ -3817,15 +3817,13 @@ msgstr "Testar Joystick"
 msgid "Buttons"
 msgstr "Botões"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Testar Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Efeitos Disponíveis"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/rm.po b/po/rm.po
index 2752faab910..5ca6fb54d72 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -781,7 +781,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr ""
 
@@ -3700,15 +3700,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr ""
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ro.po b/po/ro.po
index aa490b92b81..adf37ce0754 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -784,7 +784,7 @@ msgstr "&Numai cuvinte întregi"
 msgid "Match &Case"
 msgstr "Sensibil la registru"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Direcție"
 
@@ -3772,15 +3772,11 @@ msgstr "Testează joystick-ul"
 msgid "Buttons"
 msgstr "Butoane"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Efecte disponibile"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ru.po b/po/ru.po
index d17ba11f060..f43e0c5ffd3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -793,7 +793,7 @@ msgstr "&Только слово целиком"
 msgid "Match &Case"
 msgstr "C &учетом регистра"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Направление"
 
@@ -3777,15 +3777,13 @@ msgstr "Проверить джойстик"
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Проверить отдачу"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Доступные эффекты"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/si.po b/po/si.po
index 8ada822413e..23825064a32 100644
--- a/po/si.po
+++ b/po/si.po
@@ -791,7 +791,7 @@ msgstr "සම්පූර්ණ වචනය පමණක් ගැලපේ (&
 msgid "Match &Case"
 msgstr ""
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "දිශාව"
 
@@ -3704,15 +3704,11 @@ msgstr ""
 msgid "Buttons"
 msgstr "බොත්තම්"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr ""
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/sk.po b/po/sk.po
index 88284490211..b96a3432967 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -815,7 +815,7 @@ msgstr "Len &celé slová"
 msgid "Match &Case"
 msgstr "&Rozlišovať malé a veľké písmená"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Smer"
 
@@ -3751,17 +3751,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-#, fuzzy
-#| msgid "Available formats"
-msgid "Available Effects"
-msgstr "Dostupné formáty"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/sl.po b/po/sl.po
index 7a380697e62..5556d25f01e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -814,7 +814,7 @@ msgstr "&Samo cele besede"
 msgid "Match &Case"
 msgstr "&Razlikuj velikost črk"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Smer iskanja"
 
@@ -3839,17 +3839,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-#, fuzzy
-#| msgid "Available formats"
-msgid "Available Effects"
-msgstr "Razpoložljive oblike"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index 0816a693c69..cadd0118ff7 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -804,7 +804,7 @@ msgstr "Пронађи само &целу реч"
 msgid "Match &Case"
 msgstr "Подударање &малих и великих слова"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Правац"
 
@@ -3815,16 +3815,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-#, fuzzy
-msgid "Available Effects"
-msgstr "Н&апред"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index 767665408d8..b4c070c6851 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -850,7 +850,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 #, fuzzy
 msgid "Direction"
 msgstr "Opis"
@@ -3900,16 +3900,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-#, fuzzy
-msgid "Available Effects"
-msgstr "N&apred"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/sv.po b/po/sv.po
index 22eba643cfc..9aeade4a423 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -796,7 +796,7 @@ msgstr "&Bara hela ord"
 msgid "Match &Case"
 msgstr "&Skillnad på stora/små bokstäver"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Riktning"
 
@@ -3796,15 +3796,13 @@ msgstr "Testa joysticken"
 msgid "Buttons"
 msgstr "Knappar"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Testa kraftåterkoppling"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Tillgängliga effekter"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ta.po b/po/ta.po
index 39448e627cc..617fb19eb34 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -764,7 +764,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr ""
 
@@ -3637,15 +3637,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr ""
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/te.po b/po/te.po
index 7d599ec4914..57d7837ed4a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -770,7 +770,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr ""
 
@@ -3671,15 +3671,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr ""
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/th.po b/po/th.po
index 98374fe34c7..3baf79ee981 100644
--- a/po/th.po
+++ b/po/th.po
@@ -781,7 +781,7 @@ msgstr "ตรงกันทุกตัวอักษร"
 msgid "Match &Case"
 msgstr "พิจารณาตัวเล็ก-ใหญ่"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "ทาง"
 
@@ -3729,17 +3729,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-#, fuzzy
-#| msgid "A&vailable buttons:"
-msgid "Available Effects"
-msgstr "ทีเลือกได้:"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/tr.po b/po/tr.po
index 0e8c6fe320b..6860d9b00dc 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -790,7 +790,7 @@ msgstr "Yalnızca &Tam Sözcükleri Bul"
 msgid "Match &Case"
 msgstr "BÜYÜK/küçük Harf &Duyarlı"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Yön"
 
@@ -3770,15 +3770,13 @@ msgstr "Oyun Kolunu Test Et"
 msgid "Buttons"
 msgstr "Düğmeler"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Zorunlu Geri Beslemeyi Kontrol Et"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Kullanılabilir Efektler"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/uk.po b/po/uk.po
index 1ff1a189e36..5dd1f46f189 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -781,7 +781,7 @@ msgstr "&Лише слово цілком"
 msgid "Match &Case"
 msgstr "Враховувати &регістр"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Напрям"
 
@@ -3761,15 +3761,13 @@ msgstr "Випробувати Джойстик"
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "Перевірка Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "Доступні Ефекти"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/wa.po b/po/wa.po
index 60b871468dd..0f0d05de6b9 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -782,7 +782,7 @@ msgstr "Mots &etîrs seulmint"
 msgid "Match &Case"
 msgstr "Rispecter les &madjuscules/minuscules"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "Direccion"
 
@@ -3735,15 +3735,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr ""
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/wine.pot b/po/wine.pot
index 022119d864e..41436c38cc6 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -755,7 +755,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr ""
 
@@ -3626,15 +3626,11 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+msgid "Force Feedback Effect"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr ""
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f6656f2189d..933d032287c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -771,7 +771,7 @@ msgstr "全字匹配(&W)"
 msgid "Match &Case"
 msgstr "区分大小写(&C)"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "方向"
 
@@ -3707,15 +3707,13 @@ msgstr "测试操纵杆"
 msgid "Buttons"
 msgstr "按钮"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "测试力反馈"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "可选效果"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ed86d663be4..df8e81d6688 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -771,7 +771,7 @@ msgstr "全字拼寫須符合(&W)"
 msgid "Match &Case"
 msgstr "大小寫視為相異(&C)"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
+#: dlls/comdlg32/comdlg32.rc:325
 msgid "Direction"
 msgstr "方向"
 
@@ -3709,15 +3709,13 @@ msgstr "測試搖桿"
 msgid "Buttons"
 msgstr "按鈕"
 
-#: dlls/joy.cpl/joy.rc:68
-msgid "Test Force Feedback"
+#: dlls/joy.cpl/joy.rc:64
+#, fuzzy
+#| msgid "Test Force Feedback"
+msgid "Force Feedback Effect"
 msgstr "測試應力回饋"
 
-#: dlls/joy.cpl/joy.rc:72
-msgid "Available Effects"
-msgstr "可用效果"
-
-#: dlls/joy.cpl/joy.rc:74
+#: dlls/joy.cpl/joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."