diff --git a/dlls/joy.cpl/joy.h b/dlls/joy.cpl/joy.h
index ec7af4f7879..ffba9cd1220 100644
--- a/dlls/joy.cpl/joy.h
+++ b/dlls/joy.cpl/joy.h
@@ -41,6 +41,7 @@ struct Joystick {
     int num_buttons;
     int num_axes;
     BOOL forcefeedback;
+    BOOL is_xinput;
     int num_effects;
     int cur_effect;
     int chosen_effect;
@@ -82,17 +83,19 @@ struct JoystickData {
 #define IDD_FORCEFEEDBACK   1002
 
 #define IDC_JOYSTICKLIST    2000
-#define IDC_BUTTONDISABLE   2001
-#define IDC_BUTTONENABLE    2002
-#define IDC_DISABLEDLIST    2003
-#define IDC_TESTSELECTCOMBO 2004
-#define IDC_TESTGROUPXY     2005
-#define IDC_TESTGROUPRXRY   2006
-#define IDC_TESTGROUPZRZ    2007
-#define IDC_TESTGROUPPOV    2008
+#define IDC_DISABLEDLIST    2001
+#define IDC_XINPUTLIST      2002
+#define IDC_BUTTONDISABLE   2010
+#define IDC_BUTTONENABLE    2011
 
-#define IDC_FFSELECTCOMBO   2009
-#define IDC_FFEFFECTLIST    2010
+#define IDC_TESTSELECTCOMBO 2100
+#define IDC_TESTGROUPXY     2101
+#define IDC_TESTGROUPRXRY   2102
+#define IDC_TESTGROUPZRZ    2103
+#define IDC_TESTGROUPPOV    2104
+
+#define IDC_FFSELECTCOMBO   2200
+#define IDC_FFEFFECTLIST    2201
 
 #define ICO_MAIN            100
 
diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc
index a4a780276bb..d425ea76440 100644
--- a/dlls/joy.cpl/joy.rc
+++ b/dlls/joy.cpl/joy.rc
@@ -31,21 +31,23 @@ BEGIN
     IDS_CPL_INFO        "Test and configure game controllers."
 END
 
-IDD_LIST DIALOG 0, 0, 320, 220
+IDD_LIST DIALOG 0, 0, 320, 300
 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
 CAPTION "Joysticks"
 FONT 8, "Ms Shell Dlg"
 {
     PUSHBUTTON      "&Disable", IDC_BUTTONDISABLE, 200, 20, 60, 15
-    PUSHBUTTON      "&Enable", IDC_BUTTONENABLE, 200, 105, 60, 15
+    PUSHBUTTON      "&Enable", IDC_BUTTONENABLE, 200, 190, 60, 15
     LTEXT           "Connected", IDC_STATIC, 10, 10, 100, 10
     LISTBOX         IDC_JOYSTICKLIST, 10, 20, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY
-    LTEXT           "Disabled", IDC_STATIC, 10, 95, 100, 10
-    LISTBOX         IDC_DISABLEDLIST, 10, 105, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY
-    LTEXT           "After disabling or enabling a device, the connected joysticks won't be updated here until you restart this applet.", IDC_STATIC, 10, 175, 200, 25
+    LTEXT           "Connected (xinput device)", IDC_STATIC, 10, 90, 100, 10
+    LISTBOX         IDC_XINPUTLIST, 10, 100, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY
+    LTEXT           "Disabled", IDC_STATIC, 10, 180, 100, 10
+    LISTBOX         IDC_DISABLEDLIST, 10, 190, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY
+    LTEXT           "After disabling or enabling a device, the connected joysticks won't be updated here until you restart this applet.", IDC_STATIC, 10, 270, 200, 25
 }
 
-IDD_TEST DIALOG 0, 0, 320, 220
+IDD_TEST DIALOG 0, 0, 320, 300
 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
 CAPTION "Test Joystick"
 FONT 8, "Ms Shell Dlg"
@@ -58,7 +60,7 @@ FONT 8, "Ms Shell Dlg"
     GROUPBOX        "", IDC_TESTGROUPPOV, 246, 30, 60, 60
 }
 
-IDD_FORCEFEEDBACK DIALOG 0, 0, 320, 220
+IDD_FORCEFEEDBACK DIALOG 0, 0, 320, 300
 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
 CAPTION "Test Force Feedback"
 FONT 8, "Ms Shell Dlg"
diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index dbe84963c5d..91280f2c2c5 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -63,6 +63,15 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
 static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef);
 static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *context)
 {
+    DIPROPGUIDANDPATH prop_guid_path =
+    {
+        .diph =
+        {
+            .dwSize = sizeof(DIPROPGUIDANDPATH),
+            .dwHeaderSize = sizeof(DIPROPHEADER),
+            .dwHow = DIPH_DEVICE,
+        },
+    };
     struct JoystickData *data = context;
     struct Joystick *joystick;
     DIPROPRANGE proprange;
@@ -90,6 +99,9 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont
     joystick->forcefeedback = caps.dwFlags & DIDC_FORCEFEEDBACK;
     joystick->num_effects = 0;
 
+    IDirectInputDevice8_GetProperty(joystick->device, DIPROP_GUIDANDPATH, &prop_guid_path.diph);
+    joystick->is_xinput = wcsstr(prop_guid_path.wszPath, L"&IG_") != NULL;
+
     if (joystick->forcefeedback) data->num_ff++;
 
     /* Set axis range to ease the GUI visualization */
@@ -233,9 +245,13 @@ static void refresh_joystick_list(HWND hwnd, struct JoystickData *data)
 
     SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_RESETCONTENT, 0, 0);
     SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0);
+    SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_RESETCONTENT, 0, 0);
 
     for (joy = data->joysticks, joy_end = joy + data->num_joysticks; joy != joy_end; ++joy)
-        SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName);
+    {
+        if (joy->is_xinput) SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName);
+        else SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName);
+    }
 
     /* Search for disabled joysticks */
     get_app_key(&hkey, &appkey);
@@ -262,7 +278,10 @@ static void refresh_joystick_list(HWND hwnd, struct JoystickData *data)
  */
 static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 {
+    WCHAR instance_name[MAX_PATH] = {0};
     static struct JoystickData *data;
+    int sel;
+
     TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam);
     switch (msg)
     {
@@ -287,11 +306,14 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
             {
                 case IDC_BUTTONDISABLE:
                 {
-                    int sel = SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETCURSEL, 0, 0);
+                    if ((sel = SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETCURSEL, 0, 0)) >= 0)
+                        SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETTEXT, sel, (LPARAM)instance_name);
+                    if ((sel = SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_GETCURSEL, 0, 0)) >= 0)
+                        SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_GETTEXT, sel, (LPARAM)instance_name);
 
-                    if (sel >= 0)
+                    if (instance_name[0])
                     {
-                        enable_joystick(data->joysticks[sel].instance.tszInstanceName, FALSE);
+                        enable_joystick(instance_name, FALSE);
                         refresh_joystick_list(hwnd, data);
                     }
                 }
@@ -299,24 +321,34 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
 
                 case IDC_BUTTONENABLE:
                 {
-                    int sel = SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETCURSEL, 0, 0);
+                    if ((sel = SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETCURSEL, 0, 0)) >= 0)
+                        SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETTEXT, sel, (LPARAM)instance_name);
 
-                    if (sel >= 0)
+                    if (instance_name[0])
                     {
-                        WCHAR text[MAX_PATH];
-                        SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETTEXT, sel, (LPARAM) text);
-                        enable_joystick(text, TRUE);
+                        enable_joystick(instance_name, TRUE);
                         refresh_joystick_list(hwnd, data);
                     }
                 }
                 break;
 
                 case IDC_JOYSTICKLIST:
+                    SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_SETCURSEL, -1, 0);
+                    SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_SETCURSEL, -1, 0);
+                    EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE);
+                    EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), TRUE);
+                break;
+
+                case IDC_XINPUTLIST:
+                    SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_SETCURSEL, -1, 0);
+                    SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_SETCURSEL, -1, 0);
                     EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE);
                     EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), TRUE);
                 break;
 
                 case IDC_DISABLEDLIST:
+                    SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_SETCURSEL, -1, 0);
+                    SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_SETCURSEL, -1, 0);
                     EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), TRUE);
                     EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), FALSE);
                 break;
diff --git a/po/ar.po b/po/ar.po
index e4ffb52c5e6..d17ca7a37c5 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "الاتجاه"
 
@@ -3739,10 +3739,16 @@ msgid "Connected"
 msgstr "م&تصل"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "جهاز الإدخال الصوتي:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "معطل"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3750,23 +3756,23 @@ msgstr ""
 "بعد تعطيل أو تفعيل جهاز ، مقبض اللعب المتصل لنيتم تحديثه هنا حتى إعادة تشغيل "
 "التطبيق."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "اختبار مقبض اللعب"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "الأزرار"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "اختبار الهزّاز"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "المؤثرات المتاحة"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 63c27d78f75..8174900b57c 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Direición"
 
@@ -3632,10 +3632,14 @@ msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3643,23 +3647,23 @@ msgstr ""
 "Tres in/habilitar un preséu, los joysticks coneutaos nun van anovase equí "
 "hasta que reanicies esti applet."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Botones"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Efeutos disponibles"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 752765b7187..a07742e1f7c 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Посока"
 
@@ -3754,35 +3754,39 @@ msgid "Connected"
 msgstr "Файлът не е намерен"
 
 #: dlls/joy.cpl/joy.rc:44
+msgid "Connected (xinput device)"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Забрани"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 #, fuzzy
 msgid "Available Effects"
 msgstr "На&пред"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 da7e54e7fef..ba44dd2c31b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -792,7 +792,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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Direcció"
 
@@ -3739,10 +3739,16 @@ msgid "Connected"
 msgstr "Connectat"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Dispositiu d'entrada de veu:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Inhabilitat"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3750,23 +3756,23 @@ msgstr ""
 "Després d'inhabilitar o habilitar un dispositiu, no s'actualitzaran aquí les "
 "palanques de control connectades fins que reinicieu aquesta miniaplicació."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Prova de palanca de control"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Botons"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Prova de retroacció de força"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Efectes disponibles"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 88b40a43b72..ea05f1c0104 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Směr"
 
@@ -3688,10 +3688,16 @@ msgid "Connected"
 msgstr "Připojeno"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Zařízení hlasového vstupu:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3699,23 +3705,23 @@ msgstr ""
 "Po povolení či zakázání zařízení bude stav připojeného pákového ovladače "
 "aktualizován až po restartu tohoto appletu."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Otestovat pákový ovladač"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Tlačítka"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Otestovat silovou zpětnou vazbu"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Dostupné efekty"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 840c6fd09c8..ae7cc023005 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Retning"
 
@@ -3775,35 +3775,41 @@ msgstr "Forbindelse mistet"
 
 #: dlls/joy.cpl/joy.rc:44
 #, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Stemme input enhed:"
+
+#: dlls/joy.cpl/joy.rc:46
+#, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Deaktiver"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Tilgængelige formater"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 d2e798afc7f..102a038ed20 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Suchrichtung"
 
@@ -3723,10 +3723,16 @@ msgid "Connected"
 msgstr "Verbunden"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Spracheingabegerät:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3734,23 +3740,23 @@ msgstr ""
 "Nach dem De-/Aktivieren eines Gerätes wird die Liste der verbundenen "
 "Controller bis zum Neustart dieses Applets nicht mehr aktualisiert."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Joystick testen"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Tasten"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Force Feedback testen"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Verfügbare Effekte"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 09564586796..ef219f136ed 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
@@ -3669,34 +3669,38 @@ msgid "Connected"
 msgstr "Το αρχείο δε βρέθηκε"
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 #, fuzzy
 #| msgid "A&vailable buttons:"
 msgid "Available Effects"
 msgstr "Δ&ιαθέσιμα κουμπιά:"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 14f9949dfe9..3f79e4c55d7 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Direction"
 
@@ -3716,10 +3716,14 @@ msgid "Connected"
 msgstr "Connected"
 
 #: dlls/joy.cpl/joy.rc:44
+msgid "Connected (xinput device)"
+msgstr "Connected (xinput device)"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Disabled"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3727,23 +3731,23 @@ msgstr ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Test Joystick"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Buttons"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Test Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Available Effects"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 7640ece8629..00bd90833b4 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Direction"
 
@@ -3716,10 +3716,14 @@ msgid "Connected"
 msgstr "Connected"
 
 #: dlls/joy.cpl/joy.rc:44
+msgid "Connected (xinput device)"
+msgstr "Connected (xinput device)"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Disabled"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3727,23 +3731,23 @@ msgstr ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Test Joystick"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Buttons"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Test Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Available Effects"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 3d65594bc3e..d893f3b649d 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Direkto"
 
@@ -3660,36 +3660,40 @@ msgid "Connected"
 msgstr "Malkonektita"
 
 #: dlls/joy.cpl/joy.rc:44
+msgid "Connected (xinput device)"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Malaktivigi"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Disponeblaj formatoj"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 c8fdb623b7f..e190820968b 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Dirección"
 
@@ -3734,32 +3734,38 @@ msgid "Connected"
 msgstr "Conectado"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Dispositivo de entrada de voz:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Deshabilitar"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Probar comando de juegos"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Botones"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Probar Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Efectos disponibles"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 97993996c8c..b7cf6280746 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 #, fuzzy
 msgid "Direction"
 msgstr "اطلاعات"
@@ -3699,32 +3699,36 @@ msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 64d8c16cfa7..698416be227 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Suunta"
 
@@ -3710,10 +3710,16 @@ msgid "Connected"
 msgstr "Yhdistetty"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Äänen sisääntulolaite:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Ei käytössä"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3721,23 +3727,23 @@ msgstr ""
 "Kun laite poistetaan käytöstä tai otetaan käyttöön, liitetyt ohjaimet eivät "
 "päivity tähän, ellei tätä sovelmaa käynnistetä uudelleen."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Testaa joystickia"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Painikkeet"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Testaa voimapalautetta"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Mahdolliset efektit"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 781724aaa16..d4ffa996345 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -800,7 +800,7 @@ msgstr "Mots &entiers seulement"
 msgid "Match &Case"
 msgstr "Respecter la &casse"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Direction"
 
@@ -3771,10 +3771,16 @@ msgid "Connected"
 msgstr "Connecté"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Périphérique d'entrée voix :"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3783,23 +3789,23 @@ msgstr ""
 "joysticks connectés ne sera pas mise à jour à moins de redémarrer cette "
 "applet."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Tester le joystick"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Boutons"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Tester le retour de force"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Effets disponibles"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 1fc4e94a7f3..03dc6bfc302 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "כיוון"
 
@@ -3741,35 +3741,39 @@ msgid "Connected"
 msgstr "Disconnected"
 
 #: dlls/joy.cpl/joy.rc:44
+msgid "Connected (xinput device)"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 msgid "Disabled"
 msgstr "Table"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "התבניות הזמינות"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 9b8a86db776..34ca3aebdca 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr ""
 
@@ -3633,32 +3633,36 @@ msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 e003dd92e92..80131e5a5c3 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Smjer"
 
@@ -3744,10 +3744,16 @@ msgid "Connected"
 msgstr "Povezan"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Ulazni uređdaj za glas:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Isključen"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3755,23 +3761,23 @@ msgstr ""
 "Nakon isključivanja ili uključivanja uređaja, povezani joystici neće biti "
 "osvježeni ovdje dok ponovno ne pokrenete ovaj applet."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Isprobaj joystick"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Gumbi"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Isprobaj povratnu vezu sile"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Dostupni efekti"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 259c386e876..db25a0cb884 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Irány"
 
@@ -3791,35 +3791,41 @@ msgstr "Lecsatlakozott"
 
 #: dlls/joy.cpl/joy.rc:44
 #, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Hang bemeneti eszköz:"
+
+#: dlls/joy.cpl/joy.rc:46
+#, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "Tiltá&s"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Elérhető formátumok"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 8f75ea6bbe5..1be21088354 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Direzione"
 
@@ -3799,35 +3799,41 @@ msgstr "Disconnesso"
 
 #: dlls/joy.cpl/joy.rc:44
 #, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Unità input voce:"
+
+#: dlls/joy.cpl/joy.rc:46
+#, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Disabilita"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Formati disponibili"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 eddf392230b..6d478b99fe0 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "方向"
 
@@ -3708,10 +3708,16 @@ msgid "Connected"
 msgstr "接続済み"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "音声入力デバイス:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "無効"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3719,23 +3725,23 @@ msgstr ""
 "このアプレットを再起動するまでは、デバイスを無効化または有効化したあとでも、"
 "ここにある接続済みジョイスティックの一覧は更新されません。"
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "ジョイスティックのテスト"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "ボタン"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "フォース フィードバックのテスト"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "使用可能な効果"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 1061ff4e1da..42bb7c51650 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -787,7 +787,7 @@ msgstr "단어 단위로(&W)"
 msgid "Match &Case"
 msgstr "대/소문자 구분(&C)"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "방향"
 
@@ -3704,10 +3704,16 @@ msgid "Connected"
 msgstr "연결됨"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "음성 입력 장치:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "불가능"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3715,23 +3721,23 @@ msgstr ""
 "장치를 비활성화하거나 활성화한 후, 이 애플릿을 다시 시작할 때까지 연결된 조이"
 "스틱을 업데이트하지 않습니다."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "조이스틱 테스트"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "버튼"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "강제 피드백 테스트"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "사용 가능한 효과"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 e7468af6f80..1b6af783e88 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Kryptis"
 
@@ -3719,10 +3719,16 @@ msgid "Connected"
 msgstr "Prijungta"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Balso įvedimo įtaisas:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Išjungta"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3730,23 +3736,23 @@ msgstr ""
 "Po įtaiso išjungimo ar įjungimo, prijungtos vairasvirtės nebus automatiškai "
 "čia atnaujintos, kol nepaleisite šios programėlės iš naujo."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Testuoti vairasvirtę"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Mygtukai"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Testuoti „Force Feedback“"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Prieinami efektai"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 8465470d89e..d9a77f865fe 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr ""
 
@@ -3635,32 +3635,36 @@ msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 c11eede51ed..b643512fe06 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Retning"
 
@@ -3722,10 +3722,16 @@ msgid "Connected"
 msgstr "Tilkoblet"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Inn-enhet for tale:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Slått av"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3733,23 +3739,23 @@ msgstr ""
 "Etter at en enhet er slått på eller av vil ikke styrespaken bli oppdatert "
 "her før programmet startes på nytt."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Test styrespake"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Knapper"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Test Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Tilgjengelige effekter"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 e6b3ea6aab7..7d6ed7bfae1 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Zoekrichting"
 
@@ -3730,10 +3730,16 @@ msgid "Connected"
 msgstr "Verbonden"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Steminvoer apparaat:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Deactiveren"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3741,23 +3747,23 @@ msgstr ""
 "Na het uit- of inschakelen van een apparaat zullen de aangesloten joysticks "
 "niet vernieuwd worden totdat u deze applet herstart."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Joystick testen"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Knoppen"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Force Feedback Testen"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Beschikbare effecten"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 6535c2f6b5c..dd6c2d4a084 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr ""
 
@@ -3633,32 +3633,36 @@ msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 9d821390ce0..a22184d408d 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr ""
 
@@ -3633,32 +3633,36 @@ msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 e90ea1fd552..15c4f087fac 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Kierunek"
 
@@ -3733,10 +3733,16 @@ msgid "Connected"
 msgstr "Włączone"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Urządzenie wejściowe głosu:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3744,23 +3750,23 @@ msgstr ""
 "Po wyłączeniu lub włączeniu urządzenia, podłączone joysticki nie będą tutaj "
 "uaktualnione do momentu ponownego uruchomienia tego apletu."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Próba Joysticka"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Przyciski"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Próba odczucia siły zwrotnej"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Dostępne efekty"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 b5d61e7b615..a3ab89ea64b 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Direção"
 
@@ -3729,10 +3729,16 @@ msgid "Connected"
 msgstr "Conectado"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Entrada de voz:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Desativado"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3740,23 +3746,23 @@ msgstr ""
 "Depois de habilitar/desabilitar um dispositivo, os controles conectados não "
 "serão atualizados até que o applet seja reaberto."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Testar Controle"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Botões"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Testar Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Efeitos Disponíveis"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 42d91bec617..a7e6da4aef6 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Direção"
 
@@ -3770,10 +3770,16 @@ msgid "Connected"
 msgstr "Conectado"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Dispositivo de entrada de voz:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3781,23 +3787,23 @@ msgstr ""
 "Depois de activar ou desactivar um dispositivo, os joysticks ligados não "
 "serão actualisados aqui até reiniciar esta mini-aplicação."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Testar Joystick"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Botões"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Testar Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Efeitos Disponíveis"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 c966fac6061..b96be927387 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr ""
 
@@ -3662,32 +3662,36 @@ msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 8376b4a19b1..5fd470ae90a 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Direcție"
 
@@ -3727,32 +3727,38 @@ msgid "Connected"
 msgstr "Conectat"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Dispozitiv de intrare voce:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "&Dezactivat"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Testează joystick-ul"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Butoane"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Efecte disponibile"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 ebb60280085..155919b1963 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Направление"
 
@@ -3732,10 +3732,16 @@ msgid "Connected"
 msgstr "Подключено"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Уст-во речевого ввода:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Выключено"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3743,23 +3749,23 @@ msgstr ""
 "Список подключенных джойстиков не обновляется автоматически при подключении/"
 "отключении устройств, требуется перезапуск этой программы."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Проверить джойстик"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Проверить отдачу"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Доступные эффекты"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 c795106afee..909f43ab537 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "දිශාව"
 
@@ -3659,32 +3659,38 @@ msgid "Connected"
 msgstr "සබඳිලා"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "හඬ ආදාන ආම්පන්නය:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "ඕෆ් කරලා"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "බොත්තම්"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 e59aa2e4dce..bdfb33137d8 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Smer"
 
@@ -3700,35 +3700,41 @@ msgstr "Súbor nenájdený"
 
 #: dlls/joy.cpl/joy.rc:44
 #, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Hlasové vstupné zariadenie:"
+
+#: dlls/joy.cpl/joy.rc:46
+#, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Zakázať"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Dostupné formáty"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 9a8f5785e9d..bf366af0bfd 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Smer iskanja"
 
@@ -3793,35 +3793,41 @@ msgstr "Povezava je bila prekinjena"
 
 #: dlls/joy.cpl/joy.rc:44
 #, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Naprava zvočnega vhoda:"
+
+#: dlls/joy.cpl/joy.rc:46
+#, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Onemogoči"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Razpoložljive oblike"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 e82fd9fd4ee..37330fbc505 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Правац"
 
@@ -3773,34 +3773,38 @@ msgid "Connected"
 msgstr "Датотека није пронађена"
 
 #: dlls/joy.cpl/joy.rc:44
+msgid "Connected (xinput device)"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 msgid "Disabled"
 msgstr "табела"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 #, fuzzy
 msgid "Available Effects"
 msgstr "Н&апред"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 88880671785..c3464634ffa 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 #, fuzzy
 msgid "Direction"
 msgstr "Opis"
@@ -3852,35 +3852,39 @@ msgid "Connected"
 msgstr "Datoteka nije pronađena"
 
 #: dlls/joy.cpl/joy.rc:44
+msgid "Connected (xinput device)"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Isključi"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 #, fuzzy
 msgid "Available Effects"
 msgstr "N&apred"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 fb9336ef1d1..9d7e309e03f 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Riktning"
 
@@ -3749,10 +3749,16 @@ msgid "Connected"
 msgstr "Ansluten"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Ingångsenhet för röster:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3760,23 +3766,23 @@ msgstr ""
 "Efter att ha inaktiverat eller aktiverat en enhet kommer de anslutna "
 "styrspakarna inte att uppdateras här innan du startar om detta miniprogram."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Testa joysticken"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Knappar"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Testa kraftåterkoppling"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Tillgängliga effekter"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 9313878dac6..f57d57bec84 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr ""
 
@@ -3598,32 +3598,36 @@ msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 403471d9f0d..e87b65abe63 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr ""
 
@@ -3633,32 +3633,36 @@ msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 acc6fd8dd6a..562c0aa029d 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "ทาง"
 
@@ -3688,34 +3688,38 @@ msgid "Connected"
 msgstr "ไม่พบแฟ้ม"
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 #, fuzzy
 #| msgid "A&vailable buttons:"
 msgid "Available Effects"
 msgstr "ทีเลือกได้:"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 987b447de35..92b41b085df 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Yön"
 
@@ -3723,10 +3723,16 @@ msgid "Connected"
 msgstr "Bağlı"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Ses girdi aygıtı:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Devre dışı"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3734,23 +3740,23 @@ msgstr ""
 "Bir aygıtı etkinleştirdiğinizde veya kapattığınızda, siz bu ayarlara yeniden "
 "girene kadar bağlı oyun kolları burada güncellenmeyecektir."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Oyun Kolunu Test Et"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Düğmeler"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "Zorunlu Geri Beslemeyi Kontrol Et"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Kullanılabilir Efektler"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 bbb51679e96..aec48471d10 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -787,7 +787,7 @@ msgstr "&Лише слово цілком"
 msgid "Match &Case"
 msgstr "Враховувати &регістр"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Напрям"
 
@@ -3726,10 +3726,16 @@ msgid "Connected"
 msgstr "Під'єднано"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "Пристрій вводу голосу:"
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "Вимкнений"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3737,23 +3743,23 @@ msgstr ""
 "Після увімкнення чи вимкнення пристрою, під’єднаний джойстик не буде "
 "оновлений, поки Ви не перезавантажите цей аплет."
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "Випробувати Джойстик"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "Доступні Ефекти"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 eb13f240562..1090711f4ca 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "Direccion"
 
@@ -3695,32 +3695,36 @@ msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 4a320495036..1a6bbaa611b 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:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr ""
 
@@ -3589,32 +3589,36 @@ msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 598222285e7..d5a324b6f6b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -776,7 +776,7 @@ msgstr "全字匹配(&W)"
 msgid "Match &Case"
 msgstr "区分大小写(&C)"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "方向"
 
@@ -3671,10 +3671,16 @@ msgid "Connected"
 msgstr "已连接"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "语音输入设备："
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "停用"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3682,23 +3688,23 @@ msgstr ""
 "在禁用或启用设备之后，已连接的操纵杆的信息将不会在这里更新，直到您重启该小工"
 "具为止。"
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "测试操纵杆"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "按钮"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "测试力反馈"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "可选效果"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 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 a5e6ecd1437..fa92a08f76c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -785,7 +785,7 @@ msgstr "全字拼寫須符合(&W)"
 msgid "Match &Case"
 msgstr "大小寫視為相異(&C)"
 
-#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:72
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:74
 msgid "Direction"
 msgstr "方向"
 
@@ -3711,32 +3711,38 @@ msgid "Connected"
 msgstr "已連線"
 
 #: dlls/joy.cpl/joy.rc:44
+#, fuzzy
+#| msgid "Voice input device:"
+msgid "Connected (xinput device)"
+msgstr "語音輸入裝置："
+
+#: dlls/joy.cpl/joy.rc:46
 msgid "Disabled"
 msgstr "已停用"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
 msgstr "停用或啟用裝置之後，已連線的搖桿將無法更新，直到您重新啟動這個小程式。"
 
-#: dlls/joy.cpl/joy.rc:51
+#: dlls/joy.cpl/joy.rc:53
 msgid "Test Joystick"
 msgstr "測試搖桿"
 
-#: dlls/joy.cpl/joy.rc:55
+#: dlls/joy.cpl/joy.rc:57
 msgid "Buttons"
 msgstr "按鈕"
 
-#: dlls/joy.cpl/joy.rc:64
+#: dlls/joy.cpl/joy.rc:66
 msgid "Test Force Feedback"
 msgstr "測試應力回饋"
 
-#: dlls/joy.cpl/joy.rc:68
+#: dlls/joy.cpl/joy.rc:70
 msgid "Available Effects"
 msgstr "可用效果"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."