diff --git a/dlls/joy.cpl/joy.h b/dlls/joy.cpl/joy.h
index ffba9cd1220..64df21963b9 100644
--- a/dlls/joy.cpl/joy.h
+++ b/dlls/joy.cpl/joy.h
@@ -42,6 +42,7 @@ struct Joystick {
     int num_axes;
     BOOL forcefeedback;
     BOOL is_xinput;
+    BOOL has_override;
     int num_effects;
     int cur_effect;
     int chosen_effect;
@@ -87,6 +88,8 @@ struct JoystickData {
 #define IDC_XINPUTLIST      2002
 #define IDC_BUTTONDISABLE   2010
 #define IDC_BUTTONENABLE    2011
+#define IDC_BUTTONRESET     2012
+#define IDC_BUTTONOVERRIDE  2013
 
 #define IDC_TESTSELECTCOMBO 2100
 #define IDC_TESTGROUPXY     2101
diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc
index d425ea76440..77f121c5b1c 100644
--- a/dlls/joy.cpl/joy.rc
+++ b/dlls/joy.cpl/joy.rc
@@ -37,7 +37,9 @@ CAPTION "Joysticks"
 FONT 8, "Ms Shell Dlg"
 {
     PUSHBUTTON      "&Disable", IDC_BUTTONDISABLE, 200, 20, 60, 15
+    PUSHBUTTON      "&Reset", IDC_BUTTONRESET, 200, 40, 60, 15
     PUSHBUTTON      "&Enable", IDC_BUTTONENABLE, 200, 190, 60, 15
+    PUSHBUTTON      "&Override", IDC_BUTTONOVERRIDE, 200, 100, 60, 15
     LTEXT           "Connected", IDC_STATIC, 10, 10, 100, 10
     LISTBOX         IDC_JOYSTICKLIST, 10, 20, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY
     LTEXT           "Connected (xinput device)", IDC_STATIC, 10, 90, 100, 10
diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index 91280f2c2c5..57c188a5df1 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -272,6 +272,21 @@ static void refresh_joystick_list(HWND hwnd, struct JoystickData *data)
     if (appkey) RegCloseKey(appkey);
 }
 
+static void override_joystick(WCHAR *joy_name, BOOL override)
+{
+    HKEY hkey, appkey;
+
+    get_app_key(&hkey, &appkey);
+
+    if (override)
+        set_config_key(hkey, appkey, joy_name, L"override", wcslen(L"override"));
+    else
+        set_config_key(hkey, appkey, joy_name, NULL, 0);
+
+    if (hkey) RegCloseKey(hkey);
+    if (appkey) RegCloseKey(appkey);
+}
+
 /*********************************************************************
  * list_dlgproc [internal]
  *
@@ -293,6 +308,8 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
 
             EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE);
             EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), FALSE);
+            EnableWindow(GetDlgItem(hwnd, IDC_BUTTONRESET), FALSE);
+            EnableWindow(GetDlgItem(hwnd, IDC_BUTTONOVERRIDE), FALSE);
 
             /* Store the hwnd to be used with MapDialogRect for unit conversions */
             data->graphics.hwnd = hwnd;
@@ -332,11 +349,35 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
                 }
                 break;
 
+                case IDC_BUTTONRESET:
+                {
+                    if ((sel = SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETCURSEL, 0, 0)) >= 0)
+                    {
+                        SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETTEXT, sel, (LPARAM)instance_name);
+                        override_joystick(instance_name, FALSE);
+                        refresh_joystick_list(hwnd, data);
+                    }
+                }
+                break;
+
+                case IDC_BUTTONOVERRIDE:
+                {
+                    if ((sel = SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_GETCURSEL, 0, 0)) >= 0)
+                    {
+                        SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_GETTEXT, sel, (LPARAM)instance_name);
+                        override_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);
+                    EnableWindow(GetDlgItem(hwnd, IDC_BUTTONOVERRIDE), FALSE);
+                    EnableWindow(GetDlgItem(hwnd, IDC_BUTTONRESET), TRUE);
                 break;
 
                 case IDC_XINPUTLIST:
@@ -344,6 +385,8 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
                     SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_SETCURSEL, -1, 0);
                     EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE);
                     EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), TRUE);
+                    EnableWindow(GetDlgItem(hwnd, IDC_BUTTONOVERRIDE), TRUE);
+                    EnableWindow(GetDlgItem(hwnd, IDC_BUTTONRESET), FALSE);
                 break;
 
                 case IDC_DISABLEDLIST:
@@ -351,6 +394,8 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
                     SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_SETCURSEL, -1, 0);
                     EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), TRUE);
                     EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), FALSE);
+                    EnableWindow(GetDlgItem(hwnd, IDC_BUTTONOVERRIDE), FALSE);
+                    EnableWindow(GetDlgItem(hwnd, IDC_BUTTONRESET), FALSE);
                 break;
             }
 
diff --git a/po/ar.po b/po/ar.po
index d17ca7a37c5..8d36dc53f5c 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "الاتجاه"
 
@@ -3731,24 +3731,36 @@ msgid "&Disable"
 msgstr "مع&طل"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "إعادة الضبط"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "م&فعل"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "تحرير السيطرة"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "م&تصل"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "جهاز الإدخال الصوتي:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "معطل"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3756,23 +3768,23 @@ msgstr ""
 "بعد تعطيل أو تفعيل جهاز ، مقبض اللعب المتصل لنيتم تحديثه هنا حتى إعادة تشغيل "
 "التطبيق."
 
-#: dlls/joy.cpl/joy.rc:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "اختبار مقبض اللعب"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "الأزرار"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "اختبار الهزّاز"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "المؤثرات المتاحة"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 8174900b57c..e148c1b0ead 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Direición"
 
@@ -3624,22 +3624,35 @@ msgid "&Disable"
 msgstr "&Inhabilitar"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgctxt "recycle bin"
+#| msgid "&Restore"
+msgid "&Reset"
+msgstr "&Restaurar"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Habilitar"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Overwrite %1?"
+msgid "&Override"
+msgstr "¿Sobrescribir %1?"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 msgid "Connected (xinput device)"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3647,23 +3660,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Botones"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Efeutos disponibles"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 a07742e1f7c..3c0a4eff4f1 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Посока"
 
@@ -3745,48 +3745,60 @@ msgstr "&Забрани"
 
 #: dlls/joy.cpl/joy.rc:41
 #, fuzzy
+#| msgid "R&eset"
+msgid "&Reset"
+msgstr "&Възстанови"
+
+#: dlls/joy.cpl/joy.rc:42
+#, fuzzy
 msgid "&Enable"
 msgstr "&Таблица"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Редактиране на замяна"
+
+#: dlls/joy.cpl/joy.rc:44
 #, fuzzy
 msgid "Connected"
 msgstr "Файлът не е намерен"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 msgid "Connected (xinput device)"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 #, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Забрани"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 #, fuzzy
 msgid "Available Effects"
 msgstr "На&пред"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 ba44dd2c31b..8f26efe667e 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Direcció"
 
@@ -3731,24 +3731,36 @@ msgid "&Disable"
 msgstr "&Inhabilita"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Reinicia"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Habilita"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Edita reemplaçament"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Connectat"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Dispositiu d'entrada de veu:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Inhabilitat"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3756,23 +3768,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Prova de palanca de control"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Botons"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Prova de retroacció de força"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Efectes disponibles"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 ea05f1c0104..4e5821972ab 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Směr"
 
@@ -3680,24 +3680,36 @@ msgid "&Disable"
 msgstr "&Zakázat"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Restart"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "P&ovolit"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Úprava nastavení knihovny"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Připojeno"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Zařízení hlasového vstupu:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3705,23 +3717,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Otestovat pákový ovladač"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Tlačítka"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Otestovat silovou zpětnou vazbu"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Dostupné efekty"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 ae7cc023005..05d17192465 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Retning"
 
@@ -3763,53 +3763,65 @@ msgstr "&Deaktiver"
 
 #: dlls/joy.cpl/joy.rc:41
 #, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Nulstil"
+
+#: dlls/joy.cpl/joy.rc:42
+#, fuzzy
 #| msgid "&enable"
 msgid "&Enable"
 msgstr "&Aktiver"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Rediger overstyring"
+
+#: dlls/joy.cpl/joy.rc:44
 #, fuzzy
 #| msgid "Disconnected"
 msgid "Connected"
 msgstr "Forbindelse mistet"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Stemme input enhed:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 #, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Deaktiver"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Tilgængelige formater"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 102a038ed20..b224f66d1a5 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Suchrichtung"
 
@@ -3715,24 +3715,36 @@ msgid "&Disable"
 msgstr "&Deaktivieren"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Reset"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Aktivieren"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Überschreibung bearbeiten"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Verbunden"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Spracheingabegerät:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3740,23 +3752,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Joystick testen"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Tasten"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Force Feedback testen"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Verfügbare Effekte"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 ef219f136ed..171551d5bfe 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
@@ -3660,47 +3660,57 @@ msgid "&Disable"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "R&eset"
+msgid "&Reset"
+msgstr "Ε&παναφορά"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+msgid "&Override"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:44
 #, fuzzy
 msgid "Connected"
 msgstr "Το αρχείο δε βρέθηκε"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 msgid "Connected (xinput device)"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 #, fuzzy
 #| msgid "A&vailable buttons:"
 msgid "Available Effects"
 msgstr "Δ&ιαθέσιμα κουμπιά:"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 3f79e4c55d7..e04821761b3 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Direction"
 
@@ -3708,22 +3708,30 @@ msgid "&Disable"
 msgstr "&Disable"
 
 #: dlls/joy.cpl/joy.rc:41
+msgid "&Reset"
+msgstr "&Reset"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Enable"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+msgid "&Override"
+msgstr "&Override"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Connected"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 msgid "Connected (xinput device)"
 msgstr "Connected (xinput device)"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Disabled"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3731,23 +3739,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Test Joystick"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Buttons"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Test Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Available Effects"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 00bd90833b4..2ad3a6f2b2e 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Direction"
 
@@ -3708,22 +3708,30 @@ msgid "&Disable"
 msgstr "&Disable"
 
 #: dlls/joy.cpl/joy.rc:41
+msgid "&Reset"
+msgstr "&Reset"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Enable"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+msgid "&Override"
+msgstr "&Override"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Connected"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 msgid "Connected (xinput device)"
 msgstr "Connected (xinput device)"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Disabled"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3731,23 +3739,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Test Joystick"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Buttons"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Test Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Available Effects"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 d893f3b649d..0349317f51c 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Direkto"
 
@@ -3649,51 +3649,63 @@ msgstr "&Malaktivigi"
 
 #: dlls/joy.cpl/joy.rc:41
 #, fuzzy
+#| msgid "R&eset"
+msgid "&Reset"
+msgstr "R&estarigi"
+
+#: dlls/joy.cpl/joy.rc:42
+#, fuzzy
 #| msgid "&enable"
 msgid "&Enable"
 msgstr "&aktivigi"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "DLL overrides"
+msgid "&Override"
+msgstr "DLL superregoj"
+
+#: dlls/joy.cpl/joy.rc:44
 #, fuzzy
 #| msgid "Disconnected"
 msgid "Connected"
 msgstr "Malkonektita"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 msgid "Connected (xinput device)"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 #, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Malaktivigi"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Disponeblaj formatoj"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 e190820968b..d728962f745 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Dirección"
 
@@ -3726,46 +3726,58 @@ msgid "&Disable"
 msgstr "&Deshabilitar"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Resetear"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Habilitar"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Modificar sustitución"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Conectado"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Dispositivo de entrada de voz:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Deshabilitar"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Probar comando de juegos"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Botones"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Probar Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Efectos disponibles"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 b7cf6280746..99cc67990e2 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 #, fuzzy
 msgid "Direction"
 msgstr "اطلاعات"
@@ -3691,44 +3691,53 @@ msgid "&Disable"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:41
-msgid "&Enable"
+msgid "&Reset"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:42
+msgid "&Enable"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+msgid "&Override"
+msgstr "&ویرایش"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 msgid "Connected (xinput device)"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 698416be227..6349aa70e7b 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Suunta"
 
@@ -3702,24 +3702,36 @@ msgid "&Disable"
 msgstr "&Poista käytöstä"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Nollaa"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Ota käyttöön"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Muokkaa ohitusta"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Äänen sisääntulolaite:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Ei käytössä"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3727,23 +3739,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Testaa joystickia"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Painikkeet"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Testaa voimapalautetta"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Mahdolliset efektit"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 d4ffa996345..62b89e90747 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Direction"
 
@@ -3763,24 +3763,36 @@ msgid "&Disable"
 msgstr "&Désactiver"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Réinitialiser"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Activer"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Éditer le remplacement"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Connecté"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Périphérique d'entrée voix :"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3789,23 +3801,23 @@ msgstr ""
 "joysticks connectés ne sera pas mise à jour à moins de redémarrer cette "
 "applet."
 
-#: dlls/joy.cpl/joy.rc:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Tester le joystick"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Boutons"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Tester le retour de force"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Effets disponibles"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 03dc6bfc302..711c2acc6e2 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "כיוון"
 
@@ -3730,50 +3730,61 @@ msgstr "Table"
 
 #: dlls/joy.cpl/joy.rc:41
 #, fuzzy
+#| msgid "R&eset"
+msgid "&Reset"
+msgstr "&איפוס"
+
+#: dlls/joy.cpl/joy.rc:42
+#, fuzzy
 #| msgid "&enable"
 msgid "&Enable"
 msgstr "ה&פעלה"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+msgid "&Override"
+msgstr "תצוגת ע&ריכה"
+
+#: dlls/joy.cpl/joy.rc:44
 #, fuzzy
 #| msgid "Disconnected"
 msgid "Connected"
 msgstr "Disconnected"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 msgid "Connected (xinput device)"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 #, fuzzy
 msgid "Disabled"
 msgstr "Table"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "התבניות הזמינות"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 34ca3aebdca..21b29b4cd66 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr ""
 
@@ -3625,44 +3625,52 @@ msgid "&Disable"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:41
-msgid "&Enable"
+msgid "&Reset"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:42
-msgid "Connected"
+msgid "&Enable"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:43
+msgid "&Override"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Connected (xinput device)"
+msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:48
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 80131e5a5c3..9178063fe02 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Smjer"
 
@@ -3736,24 +3736,36 @@ msgid "&Disable"
 msgstr "&Isključi"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Poništi"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Uključi"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Izmjeni podešavanje"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Povezan"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Ulazni uređdaj za glas:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Isključen"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3761,23 +3773,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Isprobaj joystick"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Gumbi"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Isprobaj povratnu vezu sile"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Dostupni efekti"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 db25a0cb884..384918c1151 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Irány"
 
@@ -3779,53 +3779,65 @@ msgstr "Tiltá&s"
 
 #: dlls/joy.cpl/joy.rc:41
 #, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Újraindítás"
+
+#: dlls/joy.cpl/joy.rc:42
+#, fuzzy
 #| msgid "&enable"
 msgid "&Enable"
 msgstr "&engedélyez"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Felülbírálás szerkesztése"
+
+#: dlls/joy.cpl/joy.rc:44
 #, fuzzy
 #| msgid "Disconnected"
 msgid "Connected"
 msgstr "Lecsatlakozott"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Hang bemeneti eszköz:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 #, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "Tiltá&s"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Elérhető formátumok"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 1be21088354..faa12f1ee21 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Direzione"
 
@@ -3787,53 +3787,65 @@ msgstr "&Disabilita"
 
 #: dlls/joy.cpl/joy.rc:41
 #, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Resetta"
+
+#: dlls/joy.cpl/joy.rc:42
+#, fuzzy
 #| msgid "&enable"
 msgid "&Enable"
 msgstr "&abilita"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Modifica sostituzione"
+
+#: dlls/joy.cpl/joy.rc:44
 #, fuzzy
 #| msgid "Disconnected"
 msgid "Connected"
 msgstr "Disconnesso"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Unità input voce:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 #, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Disabilita"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Formati disponibili"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 6d478b99fe0..dcf03cce9db 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "方向"
 
@@ -3700,24 +3700,36 @@ msgid "&Disable"
 msgstr "無効化(&D)"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "リセット"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "有効化(&E)"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "オーバーライドの編集"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "接続済み"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "音声入力デバイス:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "無効"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3725,23 +3737,23 @@ msgstr ""
 "このアプレットを再起動するまでは、デバイスを無効化または有効化したあとでも、"
 "ここにある接続済みジョイスティックの一覧は更新されません。"
 
-#: dlls/joy.cpl/joy.rc:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "ジョイスティックのテスト"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "ボタン"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "フォース フィードバックのテスト"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "使用可能な効果"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 42bb7c51650..7984db497eb 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "방향"
 
@@ -3696,24 +3696,36 @@ msgid "&Disable"
 msgstr "사용하지 않음(&D)"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "재설정"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "가능(&E)"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "재정의 편집"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "연결됨"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "음성 입력 장치:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "불가능"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3721,23 +3733,23 @@ msgstr ""
 "장치를 비활성화하거나 활성화한 후, 이 애플릿을 다시 시작할 때까지 연결된 조이"
 "스틱을 업데이트하지 않습니다."
 
-#: dlls/joy.cpl/joy.rc:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "조이스틱 테스트"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "버튼"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "강제 피드백 테스트"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "사용 가능한 효과"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 1b6af783e88..55b3076df12 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Kryptis"
 
@@ -3711,24 +3711,36 @@ msgid "&Disable"
 msgstr "&Išjungti"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Atkurti"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "Įj&ungti"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Redaguoti nustelbimą"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Prijungta"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Balso įvedimo įtaisas:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Išjungta"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3736,23 +3748,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Testuoti vairasvirtę"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Mygtukai"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Testuoti „Force Feedback“"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Prieinami efektai"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 d9a77f865fe..7cd2caf565c 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr ""
 
@@ -3627,44 +3627,52 @@ msgid "&Disable"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:41
-msgid "&Enable"
+msgid "&Reset"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:42
-msgid "Connected"
+msgid "&Enable"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:43
+msgid "&Override"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Connected (xinput device)"
+msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:48
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 b643512fe06..45fdeae9485 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Retning"
 
@@ -3714,24 +3714,36 @@ msgid "&Disable"
 msgstr "&Deaktiver"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Tilbakestill"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "Sl&å på"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Rediger overstyring"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Inn-enhet for tale:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Slått av"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3739,23 +3751,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Test styrespake"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Knapper"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Test Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Tilgjengelige effekter"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 7d6ed7bfae1..e4616d5aacf 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Zoekrichting"
 
@@ -3722,24 +3722,36 @@ msgid "&Disable"
 msgstr "&Uitzetten"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Terugzetten"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "Activ&eren"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "DLL Bewerken"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Verbonden"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Steminvoer apparaat:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Deactiveren"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3747,23 +3759,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Joystick testen"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Knoppen"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Force Feedback Testen"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Beschikbare effecten"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 dd6c2d4a084..c1f7557f749 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr ""
 
@@ -3625,44 +3625,52 @@ msgid "&Disable"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:41
-msgid "&Enable"
+msgid "&Reset"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:42
-msgid "Connected"
+msgid "&Enable"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:43
+msgid "&Override"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Connected (xinput device)"
+msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:48
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 a22184d408d..be648013649 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr ""
 
@@ -3625,44 +3625,52 @@ msgid "&Disable"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:41
-msgid "&Enable"
+msgid "&Reset"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:42
-msgid "Connected"
+msgid "&Enable"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:43
+msgid "&Override"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Connected (xinput device)"
+msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:48
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 15c4f087fac..ae12eb00cfd 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Kierunek"
 
@@ -3725,24 +3725,36 @@ msgid "&Disable"
 msgstr "Wyłą&cz"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Wyzeruj"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Włącz"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Zmiana zasady"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Włączone"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Urządzenie wejściowe głosu:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3750,23 +3762,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Próba Joysticka"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Przyciski"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Próba odczucia siły zwrotnej"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Dostępne efekty"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 a3ab89ea64b..e4313235304 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Direção"
 
@@ -3721,24 +3721,36 @@ msgid "&Disable"
 msgstr "&Desativar"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Reiniciar"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Habilitar"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Editar Substituição"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Conectado"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Entrada de voz:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Desativado"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3746,23 +3758,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Testar Controle"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Botões"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Testar Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Efeitos Disponíveis"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 a7e6da4aef6..ef67a58202f 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Direção"
 
@@ -3762,24 +3762,36 @@ msgid "&Disable"
 msgstr "&Desactivar"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Reinicializar"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Activar"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Editar Substituição"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Conectado"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Dispositivo de entrada de voz:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3787,23 +3799,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Testar Joystick"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Botões"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Testar Force Feedback"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Efeitos Disponíveis"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 b96be927387..9d3122d8287 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr ""
 
@@ -3654,44 +3654,53 @@ msgid "&Disable"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:41
-msgid "&Enable"
+msgid "&Reset"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:42
+msgid "&Enable"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+msgid "&Override"
+msgstr "&Lavurar"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 msgid "Connected (xinput device)"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 5fd470ae90a..d5450336ffe 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Direcție"
 
@@ -3719,46 +3719,58 @@ msgid "&Disable"
 msgstr "&Dezactivează"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Resetează"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "Activ&ează"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Editează suprascrierea"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Conectat"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Dispozitiv de intrare voce:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "&Dezactivat"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Testează joystick-ul"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Butoane"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Efecte disponibile"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 155919b1963..96bb6033e8c 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Направление"
 
@@ -3724,24 +3724,36 @@ msgid "&Disable"
 msgstr "&Отключить"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Сброс"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Включить"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Изменить замещение"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Подключено"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Уст-во речевого ввода:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Выключено"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3749,23 +3761,23 @@ msgstr ""
 "Список подключенных джойстиков не обновляется автоматически при подключении/"
 "отключении устройств, требуется перезапуск этой программы."
 
-#: dlls/joy.cpl/joy.rc:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Проверить джойстик"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Проверить отдачу"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Доступные эффекты"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 909f43ab537..5a26c3a738d 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "දිශාව"
 
@@ -3651,46 +3651,58 @@ msgid "&Disable"
 msgstr "ඕෆ් කරන්න (&D)"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "නැවත සකසන්න"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "සබල කරන්න (&E)"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Override එක වෙනස් කරන්න"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "සබඳිලා"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "හඬ ආදාන ආම්පන්නය:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "ඕෆ් කරලා"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "බොත්තම්"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 bdfb33137d8..7f6dbdbc4c3 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Smer"
 
@@ -3689,52 +3689,64 @@ msgstr "&Zakázať"
 
 #: dlls/joy.cpl/joy.rc:41
 #, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Vynulovať"
+
+#: dlls/joy.cpl/joy.rc:42
+#, fuzzy
 #| msgid "&Disable"
 msgid "&Enable"
 msgstr "&Zakázať"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Upraviť prepísanie"
+
+#: dlls/joy.cpl/joy.rc:44
 #, fuzzy
 msgid "Connected"
 msgstr "Súbor nenájdený"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Hlasové vstupné zariadenie:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 #, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Zakázať"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Dostupné formáty"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 bf366af0bfd..66c00b30625 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Smer iskanja"
 
@@ -3781,53 +3781,65 @@ msgstr "&Onemogoči"
 
 #: dlls/joy.cpl/joy.rc:41
 #, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Ponastavi"
+
+#: dlls/joy.cpl/joy.rc:42
+#, fuzzy
 #| msgid "&enable"
 msgid "&Enable"
 msgstr "&omogoči"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Uredi prepis"
+
+#: dlls/joy.cpl/joy.rc:44
 #, fuzzy
 #| msgid "Disconnected"
 msgid "Connected"
 msgstr "Povezava je bila prekinjena"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Naprava zvočnega vhoda:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 #, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Onemogoči"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Razpoložljive oblike"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 37330fbc505..4bd715cbbf7 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Правац"
 
@@ -3764,47 +3764,58 @@ msgstr "табела"
 
 #: dlls/joy.cpl/joy.rc:41
 #, fuzzy
+#| msgid "R&eset"
+msgid "&Reset"
+msgstr "&Поништи"
+
+#: dlls/joy.cpl/joy.rc:42
+#, fuzzy
 msgid "&Enable"
 msgstr "&Табела"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+msgid "&Override"
+msgstr "&Уређивање"
+
+#: dlls/joy.cpl/joy.rc:44
 #, fuzzy
 msgid "Connected"
 msgstr "Датотека није пронађена"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 msgid "Connected (xinput device)"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 #, fuzzy
 msgid "Disabled"
 msgstr "табела"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 #, fuzzy
 msgid "Available Effects"
 msgstr "Н&апред"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 c3464634ffa..b6422ca8851 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 #, fuzzy
 msgid "Direction"
 msgstr "Opis"
@@ -3843,48 +3843,60 @@ msgstr "&Isključi"
 
 #: dlls/joy.cpl/joy.rc:41
 #, fuzzy
+#| msgid "R&eset"
+msgid "&Reset"
+msgstr "&Poništi"
+
+#: dlls/joy.cpl/joy.rc:42
+#, fuzzy
 msgid "&Enable"
 msgstr "&Tabela"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Izmeni podešavanje"
+
+#: dlls/joy.cpl/joy.rc:44
 #, fuzzy
 msgid "Connected"
 msgstr "Datoteka nije pronađena"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 msgid "Connected (xinput device)"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 #, fuzzy
 #| msgid "&Disable"
 msgid "Disabled"
 msgstr "&Isključi"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 #, fuzzy
 msgid "Available Effects"
 msgstr "N&apred"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 9d7e309e03f..58010d9085e 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Riktning"
 
@@ -3741,24 +3741,36 @@ msgid "&Disable"
 msgstr "&Inaktivera"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Återställa"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Aktivera"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Redigera åsidosättning"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Ansluten"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Ingångsenhet för röster:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3766,23 +3778,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Testa joysticken"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Knappar"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Testa kraftåterkoppling"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Tillgängliga effekter"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 f57d57bec84..55022444279 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr ""
 
@@ -3590,44 +3590,54 @@ msgid "&Disable"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "R&eset"
+msgid "&Reset"
+msgstr "மீட்டமை (&E)"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:42
-msgid "Connected"
+#: dlls/joy.cpl/joy.rc:43
+msgid "&Override"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Connected (xinput device)"
+msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:48
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 e87b65abe63..c7b7921de25 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr ""
 
@@ -3625,44 +3625,52 @@ msgid "&Disable"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:41
-msgid "&Enable"
+msgid "&Reset"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:42
-msgid "Connected"
+msgid "&Enable"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:43
+msgid "&Override"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Connected (xinput device)"
+msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:48
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 562c0aa029d..d4fa4ce9a6c 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "ทาง"
 
@@ -3679,47 +3679,57 @@ msgid "&Disable"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "R&eset"
+msgid "&Reset"
+msgstr "แก้ออก"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+msgid "&Override"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:44
 #, fuzzy
 msgid "Connected"
 msgstr "ไม่พบแฟ้ม"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 msgid "Connected (xinput device)"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 #, fuzzy
 #| msgid "A&vailable buttons:"
 msgid "Available Effects"
 msgstr "ทีเลือกได้:"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 92b41b085df..1739cfa2011 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Yön"
 
@@ -3715,24 +3715,36 @@ msgid "&Disable"
 msgstr "&Devre Dışı Bırak"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Sıfırla"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Etkinleştir"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Öncelik Düzenle"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Bağlı"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Ses girdi aygıtı:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Devre dışı"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3740,23 +3752,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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Oyun Kolunu Test Et"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Düğmeler"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "Zorunlu Geri Beslemeyi Kontrol Et"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Kullanılabilir Efektler"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 aec48471d10..b6e06baa342 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Напрям"
 
@@ -3718,24 +3718,36 @@ msgid "&Disable"
 msgstr "Вим&кнути"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "Скинути"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "&Увімкнути"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "Змінити заміщення"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "Під'єднано"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "Пристрій вводу голосу:"
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "Вимкнений"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3743,23 +3755,23 @@ msgstr ""
 "Після увімкнення чи вимкнення пристрою, під’єднаний джойстик не буде "
 "оновлений, поки Ви не перезавантажите цей аплет."
 
-#: dlls/joy.cpl/joy.rc:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "Випробувати Джойстик"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "Доступні Ефекти"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 1090711f4ca..a1baccae590 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "Direccion"
 
@@ -3687,44 +3687,53 @@ msgid "&Disable"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+msgid "&Reset"
+msgstr "&Rifé"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:42
-msgid "Connected"
+#: dlls/joy.cpl/joy.rc:43
+msgid "&Override"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Connected (xinput device)"
+msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:48
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 1a6bbaa611b..59320092dc7 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr ""
 
@@ -3581,44 +3581,52 @@ msgid "&Disable"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:41
-msgid "&Enable"
+msgid "&Reset"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:42
-msgid "Connected"
+msgid "&Enable"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:43
+msgid "&Override"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:44
-msgid "Connected (xinput device)"
+msgid "Connected"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:46
-msgid "Disabled"
+msgid "Connected (xinput device)"
 msgstr ""
 
 #: dlls/joy.cpl/joy.rc:48
+msgid "Disabled"
+msgstr ""
+
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr ""
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 d5a324b6f6b..e048d35f458 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "方向"
 
@@ -3663,24 +3663,36 @@ msgid "&Disable"
 msgstr "停用(&D)"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "重设"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "启用(&E)"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "编辑顶替"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "已连接"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "语音输入设备："
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "停用"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 msgid ""
 "After disabling or enabling a device, the connected joysticks won't be "
 "updated here until you restart this applet."
@@ -3688,23 +3700,23 @@ msgstr ""
 "在禁用或启用设备之后，已连接的操纵杆的信息将不会在这里更新，直到您重启该小工"
 "具为止。"
 
-#: dlls/joy.cpl/joy.rc:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "测试操纵杆"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "按钮"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "测试力反馈"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "可选效果"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 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 fa92a08f76c..a8312e8bcec 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:74
+#: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76
 msgid "Direction"
 msgstr "方向"
 
@@ -3703,46 +3703,58 @@ msgid "&Disable"
 msgstr "停用(&D)"
 
 #: dlls/joy.cpl/joy.rc:41
+#, fuzzy
+#| msgid "Reset"
+msgid "&Reset"
+msgstr "重置"
+
+#: dlls/joy.cpl/joy.rc:42
 msgid "&Enable"
 msgstr "啟用(&E)"
 
-#: dlls/joy.cpl/joy.rc:42
+#: dlls/joy.cpl/joy.rc:43
+#, fuzzy
+#| msgid "Edit Override"
+msgid "&Override"
+msgstr "編輯覆載設定"
+
+#: dlls/joy.cpl/joy.rc:44
 msgid "Connected"
 msgstr "已連線"
 
-#: dlls/joy.cpl/joy.rc:44
+#: dlls/joy.cpl/joy.rc:46
 #, fuzzy
 #| msgid "Voice input device:"
 msgid "Connected (xinput device)"
 msgstr "語音輸入裝置："
 
-#: dlls/joy.cpl/joy.rc:46
+#: dlls/joy.cpl/joy.rc:48
 msgid "Disabled"
 msgstr "已停用"
 
-#: dlls/joy.cpl/joy.rc:48
+#: dlls/joy.cpl/joy.rc:50
 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:53
+#: dlls/joy.cpl/joy.rc:55
 msgid "Test Joystick"
 msgstr "測試搖桿"
 
-#: dlls/joy.cpl/joy.rc:57
+#: dlls/joy.cpl/joy.rc:59
 msgid "Buttons"
 msgstr "按鈕"
 
-#: dlls/joy.cpl/joy.rc:66
+#: dlls/joy.cpl/joy.rc:68
 msgid "Test Force Feedback"
 msgstr "測試應力回饋"
 
-#: dlls/joy.cpl/joy.rc:70
+#: dlls/joy.cpl/joy.rc:72
 msgid "Available Effects"
 msgstr "可用效果"
 
-#: dlls/joy.cpl/joy.rc:72
+#: dlls/joy.cpl/joy.rc:74
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."