diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc
index f407aa69b7e..c4a551d7295 100644
--- a/dlls/joy.cpl/joy.rc
+++ b/dlls/joy.cpl/joy.rc
@@ -39,6 +39,7 @@ FONT 8, "Ms Shell Dlg"
     LISTBOX         IDC_JOYSTICKLIST, 10, 20, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY
     LTEXT           "Disabled", IDC_STATIC, 10, 95, 100, 10
     LISTBOX         IDC_DISABLEDLIST, 10, 105, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY
+    LTEXT           "After disabling or enabling a device, the connected joysticks won't be updated here until you restart this applet.", IDC_STATIC, 10, 175, 200, 25
 }
 
 IDD_TEST DIALOG 0, 0, 320, 220
@@ -46,7 +47,7 @@ STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
 CAPTION "Test Joystick"
 FONT 8, "Ms Shell Dlg"
 {
-    COMBOBOX        IDC_TESTSELECTCOMBO, 5, 5, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
+    COMBOBOX        IDC_TESTSELECTCOMBO, 5, 5, 200, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
     GROUPBOX        "Buttons", IDC_STATIC, 0, 110, 250, 110
     GROUPBOX        "", IDC_TESTGROUPXY, 15, 30, 60, 60
     GROUPBOX        "", IDC_TESTGROUPRXRY, 92, 30, 60, 60
@@ -59,7 +60,7 @@ STYLE WS_CAPTION | WS_CHILD | WS_DISABLED
 CAPTION "Test Force Feedback"
 FONT 8, "Ms Shell Dlg"
 {
-    COMBOBOX        IDC_FFSELECTCOMBO, 5, 5, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
+    COMBOBOX        IDC_FFSELECTCOMBO, 5, 5, 200, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
     LTEXT           "Available Effects", IDC_STATIC, 10, 30, 100, 10
     LISTBOX         IDC_FFEFFECTLIST, 10, 40, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY
     LTEXT           "Press any button in the controller to activate the chosen effect. The effect direction can be changed with the controller axis.",
diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index 06314666558..e72f93de2db 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -32,6 +32,7 @@
 #include "ole2.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 #include "joy.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(joycpl);
@@ -146,26 +147,134 @@ static void destroy_joysticks(struct JoystickData *data)
     HeapFree(GetProcessHeap(), 0, data->joysticks);
 }
 
+static void initialize_joysticks_list(HWND hwnd, struct JoystickData *data)
+{
+    int i;
+
+    SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_RESETCONTENT, 0, 0);
+
+    /* Add enumerated joysticks */
+    for (i = 0; i < data->num_joysticks; i++)
+    {
+        struct Joystick *joy = &data->joysticks[i];
+        SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName);
+    }
+}
+
+/******************************************************************************
+ * get_app_key [internal]
+ * Get the default DirectInput key and the selected app config key.
+ */
+static BOOL get_app_key(HKEY *defkey, HKEY *appkey)
+{
+    static const WCHAR reg_key[] = { 'S','o','f','t','w','a','r','e','\\',
+                                     'W','i','n','e','\\',
+                                     'D','i','r','e','c','t','I','n','p','u','t','\\',
+                                     'J','o','y','s','t','i','c','k','s','\0' };
+    *appkey = 0;
+
+    /* Registry key can be found in HKCU\Software\Wine\DirectInput */
+    if (RegCreateKeyExW(HKEY_CURRENT_USER, reg_key, 0, NULL, 0, KEY_SET_VALUE | KEY_READ, NULL, defkey, NULL))
+        *defkey = 0;
+
+    return *defkey || *appkey;
+}
+
+/******************************************************************************
+ * set_config_key [internal]
+ * Writes a string value to a registry key, deletes the key if value == NULL
+ */
+static DWORD set_config_key(HKEY defkey, HKEY appkey, const WCHAR *name, const WCHAR *value, DWORD size)
+{
+    if (value == NULL)
+    {
+        if (appkey && !RegDeleteValueW(appkey, name))
+            return 0;
+
+        if (defkey && !RegDeleteValueW(defkey, name))
+            return 0;
+    }
+    else
+    {
+        if (appkey && !RegSetValueExW(appkey, name, 0, REG_SZ, (const BYTE*) value, (size + 1)*sizeof(WCHAR)))
+            return 0;
+
+        if (defkey && !RegSetValueExW(defkey, name, 0, REG_SZ, (const BYTE*) value, (size + 1)*sizeof(WCHAR)))
+            return 0;
+    }
+
+    return ERROR_FILE_NOT_FOUND;
+}
+
+/******************************************************************************
+ * enable_joystick [internal]
+ * Writes to the DirectInput registry key that enables/disables a joystick
+ * from being enumerated.
+ */
+static void enable_joystick(WCHAR *joy_name, BOOL enable)
+{
+    static const WCHAR disabled_str[] = {'d','i','s','a','b','l','e','d','\0'};
+    HKEY hkey, appkey;
+
+    get_app_key(&hkey, &appkey);
+
+    if (!enable)
+        set_config_key(hkey, appkey, joy_name, disabled_str, lstrlenW(disabled_str));
+    else
+        set_config_key(hkey, appkey, joy_name, NULL, 0);
+
+    if (hkey) RegCloseKey(hkey);
+    if (appkey) RegCloseKey(appkey);
+}
+
+static void initialize_disabled_joysticks_list(HWND hwnd)
+{
+    static const WCHAR disabled_str[] = {'d','i','s','a','b','l','e','d','\0'};
+    HKEY hkey, appkey;
+    DWORD values = 0;
+    HRESULT hr;
+    int i;
+
+    SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0);
+
+    /* Search for disabled joysticks */
+    get_app_key(&hkey, &appkey);
+    RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, &values, NULL, NULL, NULL, NULL);
+
+    for (i=0; i < values; i++)
+    {
+        DWORD name_len = MAX_PATH, data_len = MAX_PATH;
+        WCHAR buf_name[MAX_PATH + 9], buf_data[MAX_PATH];
+
+        hr = RegEnumValueW(hkey, i, buf_name, &name_len, NULL, NULL, (BYTE*) buf_data, &data_len);
+
+        if (SUCCEEDED(hr) && !lstrcmpW(disabled_str, buf_data))
+            SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_ADDSTRING, 0, (LPARAM) buf_name);
+    }
+
+    if (hkey) RegCloseKey(hkey);
+    if (appkey) RegCloseKey(appkey);
+}
+
 /*********************************************************************
  * list_dlgproc [internal]
  *
  */
 static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 {
+    static struct JoystickData *data;
     TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam);
     switch (msg)
     {
         case WM_INITDIALOG:
         {
-            int i;
-            struct JoystickData *data = (struct JoystickData*) ((PROPSHEETPAGEW*)lparam)->lParam;
+            data = (struct JoystickData*) ((PROPSHEETPAGEW*)lparam)->lParam;
 
-            /* Set dialog information */
-            for (i = 0; i < data->num_joysticks; i++)
-            {
-                struct Joystick *joy = &data->joysticks[i];
-                SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName);
-            }
+            initialize_joysticks_list(hwnd, data);
+            initialize_disabled_joysticks_list(hwnd);
+
+            EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE);
+            EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), FALSE);
 
             /* Store the hwnd to be used with MapDialogRect for unit conversions */
             data->graphics.hwnd = hwnd;
@@ -178,12 +287,39 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
             switch (LOWORD(wparam))
             {
                 case IDC_BUTTONDISABLE:
-                    FIXME("Disable selected joystick from being enumerated\n");
-                    break;
+                {
+                    int sel = SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETCURSEL, 0, 0);
+
+                    if (sel >= 0)
+                    {
+                        enable_joystick(data->joysticks[sel].instance.tszInstanceName, FALSE);
+                        initialize_disabled_joysticks_list(hwnd);
+                    }
+                }
+                break;
 
                 case IDC_BUTTONENABLE:
-                    FIXME("Re-Enable selected joystick\n");
-                    break;
+                {
+                    int sel = SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETCURSEL, 0, 0);
+
+                    if (sel >= 0)
+                    {
+                        WCHAR text[MAX_PATH];
+                        SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETTEXT, sel, (LPARAM) text);
+                        enable_joystick(text, TRUE);
+                        initialize_disabled_joysticks_list(hwnd);
+                    }
+                }
+
+                case IDC_JOYSTICKLIST:
+                    EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE);
+                    EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), TRUE);
+                break;
+
+                case IDC_DISABLEDLIST:
+                    EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), TRUE);
+                    EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), FALSE);
+                break;
             }
 
             return TRUE;
diff --git a/po/ar.po b/po/ar.po
index b1b7262f144..63827048922 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -635,7 +635,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 #, fuzzy
 msgid "Direction"
 msgstr "معلومات"
@@ -3416,23 +3416,29 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr ""
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/bg.po b/po/bg.po
index ba147759c94..df635df6bdc 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -642,7 +642,7 @@ msgstr "&Само цели думи"
 msgid "Match &Case"
 msgstr "&Чувствителен регистър"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Посока"
 
@@ -3442,24 +3442,30 @@ msgstr "Файлът не е намерен"
 msgid "Disabled"
 msgstr "&Забрани"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 msgid "Available Effects"
 msgstr "На&пред"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ca.po b/po/ca.po
index b3410aa60ab..aabd748abca 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -652,7 +652,7 @@ msgstr "Troba només paraules &completes"
 msgid "Match &Case"
 msgstr "&Distingir majúscules de minúscules"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Direcció"
 
@@ -3491,25 +3491,31 @@ msgstr "Desconnectat"
 msgid "Disabled"
 msgstr "&Deshabilitada"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Formats disponibles"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/cs.po b/po/cs.po
index db2672f470f..11458d16862 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -660,7 +660,7 @@ msgstr "Pouze &celá slova"
 msgid "Match &Case"
 msgstr "&Rozlišovat velikost"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Směr"
 
@@ -3490,25 +3490,31 @@ msgstr "Odpojen"
 msgid "Disabled"
 msgstr "&Zakázat"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Dostupné formáty"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/da.po b/po/da.po
index ba2a40e8240..0050480bd8a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -643,7 +643,7 @@ msgstr "&Kun hele ord"
 msgid "Match &Case"
 msgstr "Forskel på store/små &bogstaver"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Retning"
 
@@ -3462,25 +3462,31 @@ msgstr "Forbindelse mistet"
 msgid "Disabled"
 msgstr "&Deaktiver"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Tilgængelige formater"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/de.po b/po/de.po
index 75629078873..cf995cd35a6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -635,7 +635,7 @@ msgstr "Nu&r ganzes Wort suchen"
 msgid "Match &Case"
 msgstr "Groß-/Klein&schreibung"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Suchrichtung"
 
@@ -3449,23 +3449,29 @@ msgstr "Verbunden"
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr "Joystick testen"
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr "Tasten"
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr "Force Feedback testen"
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr "Verfügbare Effekte"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/el.po b/po/el.po
index 7b330f81f34..c70002f6198 100644
--- a/po/el.po
+++ b/po/el.po
@@ -620,7 +620,7 @@ msgstr "Ταίριασμα &Ολόκληρης Λέξης Μόνο"
 msgid "Match &Case"
 msgstr "Ταίριασμα &Κεφαλαίων"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
@@ -3376,25 +3376,31 @@ msgstr "Το αρχείο δε βρέθηκε"
 msgid "Disabled"
 msgstr ""
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "A&vailable buttons:"
 msgid "Available Effects"
 msgstr "Δ&ιαθέσιμα κουμπιά:"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/en.po b/po/en.po
index b49a005993d..acc7002b364 100644
--- a/po/en.po
+++ b/po/en.po
@@ -634,7 +634,7 @@ msgstr "Match &Whole Word Only"
 msgid "Match &Case"
 msgstr "Match &Case"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Direction"
 
@@ -3440,23 +3440,31 @@ msgstr "Connected"
 msgid "Disabled"
 msgstr "Disabled"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr "Test Joystick"
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr "Buttons"
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr "Test Force Feedback"
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr "Available Effects"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/en_US.po b/po/en_US.po
index eb1b823da40..71ef63b7e32 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -634,7 +634,7 @@ msgstr "Match &Whole Word Only"
 msgid "Match &Case"
 msgstr "Match &Case"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Direction"
 
@@ -3442,23 +3442,31 @@ msgstr "Connected"
 msgid "Disabled"
 msgstr "Disabled"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr "Test Joystick"
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr "Buttons"
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr "Test Force Feedback"
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr "Available Effects"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/eo.po b/po/eo.po
index cf5fec3318b..cef30b73a4f 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -625,7 +625,7 @@ msgstr "Nur tutan &vorton"
 msgid "Match &Case"
 msgstr "Atenti &Usklecon"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Direkto"
 
@@ -3357,25 +3357,31 @@ msgstr "Malkonektita"
 msgid "Disabled"
 msgstr "&Malaktivigi"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Disponeblaj formatoj"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/es.po b/po/es.po
index 9d04f5e4ed7..3525d8c979c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -646,7 +646,7 @@ msgstr "Sólo &palabra completa"
 msgid "Match &Case"
 msgstr "&Mayúsculas/minúsculas"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Dirección"
 
@@ -3476,25 +3476,31 @@ msgstr "Desconectado"
 msgid "Disabled"
 msgstr "&Deshabilitar"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Formatos disponibles"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/fa.po b/po/fa.po
index 5313bc9db77..b6fe9d59a2b 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -635,7 +635,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 #, fuzzy
 msgid "Direction"
 msgstr "اطلاعات"
@@ -3416,23 +3416,29 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr ""
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/fi.po b/po/fi.po
index c67c9fdcafc..dfc9e7d96df 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -630,7 +630,7 @@ msgstr "&Koko sana"
 msgid "Match &Case"
 msgstr "Kirjaink&oko"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Suunta"
 
@@ -3437,23 +3437,29 @@ msgstr "Yhdistetty"
 msgid "Disabled"
 msgstr "Ei käytössä"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr "Testaa joystickia"
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr "Painikkeet"
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr "Testaa voimapalautetta"
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr "Mahdolliset efektit"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/fr.po b/po/fr.po
index 934139eb4fe..3b1f8820b90 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -638,7 +638,7 @@ msgstr "Mots &entiers seulement"
 msgid "Match &Case"
 msgstr "Respecter la &casse"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Direction"
 
@@ -3466,23 +3466,29 @@ msgstr "Connecté"
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr "Tester le joystick"
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr "Boutons"
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr "Tester le retour de force"
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr "Effets disponibles"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/he.po b/po/he.po
index 0e9e5e48f41..74dd3c2b8c2 100644
--- a/po/he.po
+++ b/po/he.po
@@ -641,7 +641,7 @@ msgstr "התאמת מילים &שלמות בלבד"
 msgid "Match &Case"
 msgstr "התאמת &רשיות"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "כיוון"
 
@@ -3444,25 +3444,31 @@ msgstr "Disconnected"
 msgid "Disabled"
 msgstr "Table"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "התבניות הזמינות"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/hi.po b/po/hi.po
index d9b7ff0748a..a3cb43af025 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr ""
 
@@ -3354,23 +3354,29 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr ""
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/hu.po b/po/hu.po
index e10d18009f7..206c6189675 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -647,7 +647,7 @@ msgstr "Teljes &szavak keresése"
 msgid "Match &Case"
 msgstr "Kis/&nagybetű különbség"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Irány"
 
@@ -3478,25 +3478,31 @@ msgstr "Lecsatlakozott"
 msgid "Disabled"
 msgstr "Tiltá&s"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Elérhető formátumok"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/it.po b/po/it.po
index 4765f507364..dcb908f7f8e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -653,7 +653,7 @@ msgstr "Solo parole &intere"
 msgid "Match &Case"
 msgstr "&Maiuscole/Minuscole"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Direzione"
 
@@ -3491,25 +3491,31 @@ msgstr "Disconnesso"
 msgid "Disabled"
 msgstr "&Disabilita"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Formati disponibili"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ja.po b/po/ja.po
index 65605692502..2e42e51398a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -635,7 +635,7 @@ msgstr "単語単位で検索(&W)"
 msgid "Match &Case"
 msgstr "大文字と小文字を区別する(&C)"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "検索する方向"
 
@@ -3434,25 +3434,31 @@ msgstr "接続済み"
 msgid "Disabled"
 msgstr "無効"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr "ジョイスティックのテスト"
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr "フォース フィードバックのテスト"
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "利用できる形式"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ko.po b/po/ko.po
index 5e0a5b0cb30..510ac6be73e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -634,7 +634,7 @@ msgstr "단어 단위로(&W)"
 msgid "Match &Case"
 msgstr "대/소문자 구분(&C)"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "방향"
 
@@ -3432,23 +3432,29 @@ msgstr "연결됨"
 msgid "Disabled"
 msgstr "불가능"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr "조이스틱 시험"
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr "버튼"
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr "강제 피드백 시험"
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr "가능한 효과들"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/lt.po b/po/lt.po
index 67d51311eba..ac8298f5b17 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -634,7 +634,7 @@ msgstr "Tenkina tik &visas žodis"
 msgid "Match &Case"
 msgstr "Skirti raidžių &dydį"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Kryptis"
 
@@ -3450,23 +3450,29 @@ msgstr "Prijungta"
 msgid "Disabled"
 msgstr "Išjungta"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr "Testuoti vairasvirtę"
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr "Mygtukai"
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr "Testuoti „Force Feedback“"
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr "Prieinami efektai"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ml.po b/po/ml.po
index 1b28afa1cc9..aeb29547ae0 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr ""
 
@@ -3354,23 +3354,29 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr ""
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 2de4aba5c37..6cc43821187 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -635,7 +635,7 @@ msgstr "Finn &kun hele ord"
 msgid "Match &Case"
 msgstr "Skill &mellom store og små bokstaver"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Retning"
 
@@ -3588,25 +3588,31 @@ msgstr "Røret er tilkoblet\n"
 msgid "Disabled"
 msgstr "&Deaktiver"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Tilgjengelige formater"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/nl.po b/po/nl.po
index 619d543d780..a383fc4934e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -651,7 +651,7 @@ msgstr "Heel &woord"
 msgid "Match &Case"
 msgstr "Gelijke &hoofd-/kleine letters"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Zoekrichting"
 
@@ -3505,25 +3505,31 @@ msgstr "Verbinding verbroken"
 msgid "Disabled"
 msgstr "&Uitzetten"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Beschikbare formaten"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/or.po b/po/or.po
index a5ac1724b13..ee77c2448f9 100644
--- a/po/or.po
+++ b/po/or.po
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr ""
 
@@ -3354,23 +3354,29 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr ""
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/pa.po b/po/pa.po
index 6d41fa91c48..9207e12a740 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr ""
 
@@ -3354,23 +3354,29 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr ""
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/pl.po b/po/pl.po
index 49abc784ae1..3a878d53d9b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -640,7 +640,7 @@ msgstr "Uwzględniaj tylko całe &wyrazy"
 msgid "Match &Case"
 msgstr "&Uwzględniaj wielkość liter"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Kierunek"
 
@@ -3462,25 +3462,31 @@ msgstr "Podłączony"
 msgid "Disabled"
 msgstr "Wyłączony"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr "Testuj Joystick"
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr "Przyciski"
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr "Testuj odczucie siły zwrotnej"
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Dostępne formaty"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d3806e530e1..be891e1ca1a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -636,7 +636,7 @@ msgstr "Palavra &Inteira"
 msgid "Match &Case"
 msgstr "&Maiúsculas/minúsculas"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Direção"
 
@@ -3455,23 +3455,29 @@ msgstr "Conectado"
 msgid "Disabled"
 msgstr "Desativado"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr "Efeitos Disponíveis"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/pt_PT.po b/po/pt_PT.po
index e7a3cb89913..c6aa444fdfc 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -652,7 +652,7 @@ msgstr "Palavra &Inteira"
 msgid "Match &Case"
 msgstr "&Maiúsculas/minúsculas"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Direção"
 
@@ -3488,25 +3488,31 @@ msgstr "Desligado"
 msgid "Disabled"
 msgstr "&Desactivar"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Formatos Disponíveis"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/rm.po b/po/rm.po
index 8ae75b8ae8c..6fb8e3aa208 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -632,7 +632,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr ""
 
@@ -3382,23 +3382,29 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr ""
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ro.po b/po/ro.po
index 91cb84c9300..3e7fa853db0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -626,7 +626,7 @@ msgstr "&Numai cuvinte întregi"
 msgid "Match &Case"
 msgstr "Sensibil la registru"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Direcție"
 
@@ -3448,25 +3448,31 @@ msgstr "Deconectat"
 msgid "Disabled"
 msgstr "&Dezactivează"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Formate disponibile"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/ru.po b/po/ru.po
index db006e7a493..e8c85022173 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -635,7 +635,7 @@ msgstr "&Только слово целиком"
 msgid "Match &Case"
 msgstr "C &учетом регистра"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Направление"
 
@@ -3455,25 +3455,31 @@ msgstr "Отключено"
 msgid "Disabled"
 msgstr "&Блокировать загрузку"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Доступные форматы"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/sk.po b/po/sk.po
index ddc1c427f07..8c7eabc3637 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -653,7 +653,7 @@ msgstr "Len &celé slová"
 msgid "Match &Case"
 msgstr "&Rozlišovať malé a veľké písmená"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Smer"
 
@@ -3390,25 +3390,31 @@ msgstr "Súbor nenájdený"
 msgid "Disabled"
 msgstr "&Zakázať"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Dostupné formáty"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/sl.po b/po/sl.po
index e3e8256dc44..3db63dafc3b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -652,7 +652,7 @@ msgstr "&Samo cele besede"
 msgid "Match &Case"
 msgstr "&Razlikuj velikost črk"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Smer iskanja"
 
@@ -3480,25 +3480,31 @@ msgstr "Povezava je bila prekinjena"
 msgid "Disabled"
 msgstr "&Onemogoči"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Razpoložljive oblike"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index 4f021fd3d20..d7dbda5b6c8 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -642,7 +642,7 @@ msgstr "Пронађи само &целу реч"
 msgid "Match &Case"
 msgstr "Подударање &малих и великих слова"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Правац"
 
@@ -3473,24 +3473,30 @@ msgstr "Датотека није пронађена"
 msgid "Disabled"
 msgstr "табела"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 msgid "Available Effects"
 msgstr "Н&апред"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index cb8081d18b3..ddf513e6b5e 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -688,7 +688,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 #, fuzzy
 msgid "Direction"
 msgstr "Opis"
@@ -3551,24 +3551,30 @@ msgstr "Datoteka nije pronađena"
 msgid "Disabled"
 msgstr "&Isključi"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 msgid "Available Effects"
 msgstr "N&apred"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/sv.po b/po/sv.po
index 4156569089f..31dff6aa358 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -633,7 +633,7 @@ msgstr "&Bara hela ord"
 msgid "Match &Case"
 msgstr "&Skillnad på stora/små bokstäver"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Riktning"
 
@@ -3432,25 +3432,31 @@ msgstr "Ansluten"
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr "Testa joysticken"
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr "Knappar"
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr "Testa kraftåterkoppling"
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Tillgängliga format"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/te.po b/po/te.po
index f4263beea6b..9058d5ca23c 100644
--- a/po/te.po
+++ b/po/te.po
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr ""
 
@@ -3354,23 +3354,29 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr ""
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/th.po b/po/th.po
index f29d7dc7739..fd4348571a6 100644
--- a/po/th.po
+++ b/po/th.po
@@ -620,7 +620,7 @@ msgstr "ตรงกันทุกตัวอักษร"
 msgid "Match &Case"
 msgstr "พิจารณาตัวเล็ก-ใหญ่"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "ทาง"
 
@@ -3393,25 +3393,31 @@ msgstr "ไม่พบแฟ้ม"
 msgid "Disabled"
 msgstr ""
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "A&vailable buttons:"
 msgid "Available Effects"
 msgstr "ทีเลือกได้:"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/tr.po b/po/tr.po
index cb3316279ea..18510e4b054 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -617,7 +617,7 @@ msgstr "Yalnızca &Tam Sözcükleri Bul"
 msgid "Match &Case"
 msgstr "BÜYÜK/küçük Harf &Duyarlı"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Yön"
 
@@ -3347,25 +3347,31 @@ msgstr "%s Bağlan"
 msgid "Disabled"
 msgstr "&Etkisizleştir"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Mevcut biçimler"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/uk.po b/po/uk.po
index a57f095bae6..f0af4d2a13a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -643,7 +643,7 @@ msgstr "&Лише слово цілком"
 msgid "Match &Case"
 msgstr "Враховувати &реґістр"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Напрям"
 
@@ -3469,25 +3469,31 @@ msgstr "Від'єднано"
 msgid "Disabled"
 msgstr "Вим&кнути"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "Доступні формати"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/wa.po b/po/wa.po
index 188e8f92165..0193d705284 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -628,7 +628,7 @@ msgstr "Mots &etîrs seulmint"
 msgid "Match &Case"
 msgstr "Rispecter les &madjuscules/minuscules"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "Direccion"
 
@@ -3401,23 +3401,29 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr ""
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/wine.pot b/po/wine.pot
index 09220cd3bc4..c3abc05aef9 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Match &Case"
 msgstr ""
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr ""
 
@@ -3316,23 +3316,29 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr ""
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1862feec24b..4b9113513aa 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -634,7 +634,7 @@ msgstr "全字匹配(&W)"
 msgid "Match &Case"
 msgstr "区分大小写(&C)"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "方向"
 
@@ -3367,25 +3367,31 @@ msgstr "连接断开"
 msgid "Disabled"
 msgstr "停用(&D)"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr ""
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr ""
 
-#: joy.rc:63
+#: joy.rc:64
 #, fuzzy
 #| msgid "Available formats"
 msgid "Available Effects"
 msgstr "可选格式"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7a1283ab96a..21246e3d764 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -623,7 +623,7 @@ msgstr "全字拼寫須符合(&W)"
 msgid "Match &Case"
 msgstr "大小寫視為相異(&C)"
 
-#: comdlg32.rc:317 joy.rc:67
+#: comdlg32.rc:317 joy.rc:68
 msgid "Direction"
 msgstr "方向"
 
@@ -3396,23 +3396,29 @@ msgstr "已連線"
 msgid "Disabled"
 msgstr "已停用"
 
-#: joy.rc:46
+#: joy.rc:42
+msgid ""
+"After disabling or enabling a device, the connected joysticks won't be "
+"updated here until you restart this applet."
+msgstr ""
+
+#: joy.rc:47
 msgid "Test Joystick"
 msgstr "測試搖桿"
 
-#: joy.rc:50
+#: joy.rc:51
 msgid "Buttons"
 msgstr "按鈕"
 
-#: joy.rc:59
+#: joy.rc:60
 msgid "Test Force Feedback"
 msgstr "測試應力回饋"
 
-#: joy.rc:63
+#: joy.rc:64
 msgid "Available Effects"
 msgstr "可用效果"
 
-#: joy.rc:65
+#: joy.rc:66
 msgid ""
 "Press any button in the controller to activate the chosen effect. The effect "
 "direction can be changed with the controller axis."