diff --git a/dlls/joy.cpl/joy.h b/dlls/joy.cpl/joy.h
index e860b1b3093..c54d30f86f8 100644
--- a/dlls/joy.cpl/joy.h
+++ b/dlls/joy.cpl/joy.h
@@ -37,6 +37,7 @@ struct Joystick {
 };
 
 #define TEST_MAX_BUTTONS    32
+#define TEST_MAX_AXES       3
 
 struct JoystickData {
     IDirectInput8W *di;
@@ -45,6 +46,7 @@ struct JoystickData {
     int cur_joystick;
     int chosen_joystick;
     HWND buttons[TEST_MAX_BUTTONS];
+    HWND axes[TEST_MAX_AXES];
     BOOL stop;
 };
 
@@ -68,6 +70,7 @@ struct JoystickData {
 #define IDC_TESTSELECTCOMBO 2004
 
 #define IDC_JOYSTICKBUTTON  3000
+#define IDC_JOYSTICKAXES    4000
 
 /* constants */
 #define TEST_POLL_TIME      100
@@ -80,4 +83,12 @@ struct JoystickData {
 #define TEST_BUTTON_SIZE_X  30
 #define TEST_BUTTON_SIZE_Y  25
 
+#define TEST_AXIS_X         65
+#define TEST_AXIS_Y         98
+#define TEST_NEXT_AXIS_X    115
+#define TEST_AXIS_SIZE_X    5
+#define TEST_AXIS_SIZE_Y    5
+#define TEST_AXIS_MIN       -40
+#define TEST_AXIS_MAX       40
+
 #endif
diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc
index ba341f98f1a..a52273b34f8 100644
--- a/dlls/joy.cpl/joy.rc
+++ b/dlls/joy.cpl/joy.rc
@@ -48,6 +48,9 @@ FONT 8, "Ms Shell Dlg"
 {
     COMBOBOX        IDC_TESTSELECTCOMBO, 5, 5, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
     GROUPBOX        "Buttons", IDC_STATIC, 0, 110, 250, 90
+    GROUPBOX        "X,Y", IDC_STATIC, 15, 30, 60, 60
+    GROUPBOX        "Rx,Ry", IDC_STATIC, 92, 30, 60, 60
+    GROUPBOX        "Z, Rz", IDC_STATIC, 169, 30, 60, 60
 }
 
 IDD_FORCEFEEDBACK DIALOG 0, 0, 250, 200
diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index 22b9e910ece..1c8b6ac36b5 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -194,6 +194,7 @@ static void poll_input(const struct Joystick *joy, DIJOYSTATE *state)
 
 static DWORD WINAPI input_thread(void *param)
 {
+    int axes_pos[TEST_MAX_AXES][2];
     DIJOYSTATE state;
     struct JoystickData *data = param;
 
@@ -209,6 +210,20 @@ static DWORD WINAPI input_thread(void *param)
             if (state.rgbButtons[i])
                 SendMessageW(data->buttons[i], BM_SETSTATE, TRUE, 0);
 
+        /* Indicate axis positions, axes showing are hardcoded for now */
+        axes_pos[0][0] = state.lX;
+        axes_pos[0][1] = state.lY;
+        axes_pos[1][0] = state.lRx;
+        axes_pos[1][1] = state.lRy;
+        axes_pos[2][0] = state.lZ;
+        axes_pos[2][1] = state.lRz;
+
+        for (i = 0; i < TEST_MAX_AXES; i++)
+            SetWindowPos(data->axes[i], 0,
+                        TEST_AXIS_X + TEST_NEXT_AXIS_X*i + axes_pos[i][0],
+                        TEST_AXIS_Y + axes_pos[i][1],
+                        0, 0, SWP_NOZORDER | SWP_NOSIZE);
+
         Sleep(TEST_POLL_TIME);
 
         /* Reset button state */
@@ -271,6 +286,37 @@ static void draw_joystick_buttons(HWND hwnd, struct JoystickData* data)
     }
 }
 
+static void draw_joystick_axes(HWND hwnd, struct JoystickData* data)
+{
+    int i;
+    struct Joystick *joy;
+    DIPROPRANGE propRange;
+    HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE);
+    static WCHAR button_class[] = {'B','u','t','t','o','n','\0'};
+
+    /* Set axis range to ease the GUI visualization */
+    for (i = 0; i < data->num_joysticks; i++)
+    {
+        joy = &data->joysticks[i];
+        propRange.diph.dwSize = sizeof(DIPROPRANGE);
+        propRange.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+        propRange.diph.dwHow = DIPH_DEVICE;
+        propRange.diph.dwObj = 0;
+        propRange.lMin = TEST_AXIS_MIN;
+        propRange.lMax = TEST_AXIS_MAX;
+
+        IDirectInputDevice_SetProperty(joy->device, DIPROP_RANGE, &propRange.diph);
+    }
+
+    for (i = 0; i < TEST_MAX_AXES; i++)
+    {
+        data->axes[i] = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE,
+            TEST_AXIS_X + TEST_NEXT_AXIS_X*i, TEST_AXIS_Y,
+            TEST_AXIS_SIZE_X, TEST_AXIS_SIZE_Y,
+            hwnd, (HMENU) IDC_JOYSTICKAXES + i, NULL, hinst);
+    }
+}
+
 /*********************************************************************
  * test_dlgproc [internal]
  *
@@ -297,6 +343,7 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
             }
 
             draw_joystick_buttons(hwnd, data);
+            draw_joystick_axes(hwnd, data);
 
             return TRUE;
         }
diff --git a/po/ar.po b/po/ar.po
index 73e77b492d3..b1977fb7ce0 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3424,7 +3424,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 0f96320f154..f2563f556d8 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3450,7 +3450,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 6cca950f75b..7cd060c17aa 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3494,7 +3494,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 5307be46f9e..730920b96cd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3498,7 +3498,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 4dc23a53806..35775726c13 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3470,7 +3470,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index b273559be72..5db264886f7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3457,7 +3457,19 @@ msgstr "Joystick testen"
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr "Force Feedback testen"
 
diff --git a/po/el.po b/po/el.po
index 192a410d650..08f52225a9d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3384,7 +3384,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/en.po b/po/en.po
index 86931880073..47edef1cd9e 100644
--- a/po/en.po
+++ b/po/en.po
@@ -3448,7 +3448,19 @@ msgstr "Test Joystick"
 msgid "Buttons"
 msgstr "Buttons"
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr "X,Y"
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr "Rx,Ry"
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr "Z, Rz"
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr "Test Force Feedback"
 
diff --git a/po/en_US.po b/po/en_US.po
index d4cb00733bf..7a3244b0400 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -3450,7 +3450,19 @@ msgstr "Test Joystick"
 msgid "Buttons"
 msgstr "Buttons"
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr "X,Y"
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr "Rx,Ry"
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr "Z, Rz"
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr "Test Force Feedback"
 
diff --git a/po/eo.po b/po/eo.po
index 880d0a570d6..250a31c3314 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -3360,7 +3360,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 6fe9e6526fd..0087d13dc35 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3484,7 +3484,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index 3404c602cc0..d9158e2f360 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -3424,7 +3424,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 75b834f54a4..fcbe173f8e1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3445,7 +3445,19 @@ msgstr "Testaa joystickia"
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr "Testaa voimapalautetta"
 
diff --git a/po/fr.po b/po/fr.po
index d1e566e4801..15a7bd2d871 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3480,7 +3480,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/he.po b/po/he.po
index 8a3caf6eb01..8180a5b7152 100644
--- a/po/he.po
+++ b/po/he.po
@@ -3447,7 +3447,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index dc4206c6c4a..c7de40d0812 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3362,7 +3362,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index ffeca309e5b..9f7678fcaf2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3486,7 +3486,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 99e83bc5a9e..933684b2191 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3494,7 +3494,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 06be68112f9..cc5659b2bac 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3442,7 +3442,19 @@ msgstr "ジョイスティックのテスト"
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr "フォース フィードバックのテスト"
 
diff --git a/po/ko.po b/po/ko.po
index 15d88ba6579..33da0082657 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3446,7 +3446,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index 1ff8d4dfdfd..81d2f099650 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3464,7 +3464,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/ml.po b/po/ml.po
index f39c38c9bd4..5d60efb4b33 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -3362,7 +3362,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 0fb19da8815..6da5fa8f632 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -3619,7 +3619,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 8cb1fffc1b4..37c9eb339ec 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3511,7 +3511,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/or.po b/po/or.po
index 6b7808d7d1f..6f52d352707 100644
--- a/po/or.po
+++ b/po/or.po
@@ -3362,7 +3362,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index be4f2476572..a6107668c7f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -3362,7 +3362,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 14be62ff880..4783d7ec2c0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3488,7 +3488,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 20b95caaee2..f7327bd9071 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3492,7 +3492,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 35e90eed5d3..f273ed2a259 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -3491,7 +3491,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/rm.po b/po/rm.po
index 5925846aabb..65ca42b431f 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -3390,7 +3390,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index 0b86e5ed112..8600cd6bac4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3451,7 +3451,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 6284d3b95ac..ae548ad9e77 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3463,7 +3463,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index 5f1cc6e19f5..aafefce6b17 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3393,7 +3393,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index 2baf94e0746..1e2e38b9cf6 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3483,7 +3483,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index e016e7d27c1..07cb1aed9dc 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -3481,7 +3481,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index 1261d7e93d5..3aa79e40f70 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -3559,7 +3559,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index d983bf50a7d..836e1cfba64 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3440,7 +3440,19 @@ msgstr "Testa joysticken"
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr "Testa kraftåterkoppling"
 
diff --git a/po/te.po b/po/te.po
index ee4f619e75a..c00ebab2f52 100644
--- a/po/te.po
+++ b/po/te.po
@@ -3362,7 +3362,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 52d3791877c..78df85fbea4 100644
--- a/po/th.po
+++ b/po/th.po
@@ -3401,7 +3401,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 8a639c11b96..fa310422f44 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3355,7 +3355,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 49b2c93ba99..fb88ff5987f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3477,7 +3477,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/wa.po b/po/wa.po
index 0cf0f6700e4..a68be835859 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -3409,7 +3409,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/wine.pot b/po/wine.pot
index b39453d3afe..2ee0f8954fd 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -3324,7 +3324,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9e5b7a9d5a8..dc57d41bf42 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3370,7 +3370,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ffd58f1890d..a170ae3bc66 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3374,7 +3374,19 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-#: joy.rc:55
+#: joy.rc:51
+msgid "X,Y"
+msgstr ""
+
+#: joy.rc:52
+msgid "Rx,Ry"
+msgstr ""
+
+#: joy.rc:53
+msgid "Z, Rz"
+msgstr ""
+
+#: joy.rc:58
 msgid "Test Force Feedback"
 msgstr ""