diff --git a/dll/cpl/joy/joy.c b/dll/cpl/joy/joy.c
index 97c49ed547e..41b6d45349b 100644
--- a/dll/cpl/joy/joy.c
+++ b/dll/cpl/joy/joy.c
@@ -204,7 +204,7 @@ MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
     switch (uMsg)
     {
         case WM_INITDIALOG:
-            AddColumns(GetDlgItem(hwndDlg,IDC_CONTROLLER_LIST));
+            AddColumns(GetDlgItem(hwndDlg, IDC_CONTROLLER_LIST));
             s_hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM));
             s_hIconSm = (HICON)LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM),
                                           IMAGE_ICON,
@@ -232,6 +232,7 @@ MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                     break;
 
                 case IDOK:
+                case IDCANCEL:
                     DestroyIcon(s_hIcon);
                     DestroyIcon(s_hIconSm);
                     EndDialog(hwndDlg,LOWORD(wParam));
@@ -299,10 +300,8 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
             break;
 
         case CPL_DBLCLK:
-            {
-                MainDlg = hwndCPl;
-                Applets[i].AppletProc();
-            }
+            MainDlg = hwndCPl;
+            Applets[i].AppletProc();
             break;
     }
 
diff --git a/dll/cpl/joy/lang/bg-BG.rc b/dll/cpl/joy/lang/bg-BG.rc
index 5ceabd05425..745e69b9e79 100644
--- a/dll/cpl/joy/lang/bg-BG.rc
+++ b/dll/cpl/joy/lang/bg-BG.rc
@@ -7,7 +7,7 @@ CAPTION "Игрови управления"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20
-    LTEXT "Това са настройките за игровите управления на компютъра ви.", -1, 33, 7, 214, 20, NOT WS_GROUP
+    LTEXT "Това са настройките за джойстиците на компютъра ви.", -1, 33, 7, 214, 20, NOT WS_GROUP
     GROUPBOX "Сложени игрови управления", -1, 7, 34, 238, 117
     CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80
     PUSHBUTTON "&Добавяне...", IDC_ADD_BUTTON, 35, 129, 65, 14
diff --git a/dll/cpl/joy/lang/fr-FR.rc b/dll/cpl/joy/lang/fr-FR.rc
index dd3cdbfdde1..0d90d4b318a 100644
--- a/dll/cpl/joy/lang/fr-FR.rc
+++ b/dll/cpl/joy/lang/fr-FR.rc
@@ -28,10 +28,10 @@ BEGIN
     LTEXT "Sélectionnez un contrôleur de jeu dans la liste suivante, puis cliquez sur OK.  Si votre contrôleur de jeu n'apparaît pas dans la liste, cliquez sur Personnaliser.", -1, 35, 7, 210, 33
     LTEXT "Contrôleurs de jeu :", -1, 8, 45, 126, 8
     LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP
-    AUTOCHECKBOX "Activ&er les palonniers et les pédales", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP
+    AUTOCHECKBOX "Activ&er les palonniers et les pédales", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 250, 10, WS_GROUP
     LTEXT "Port de jeu:", -1, 7, 134, 38, 8, NOT WS_VISIBLE
     COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL
-    PUSHBUTTON "Personnaliser...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14
+    PUSHBUTTON "Personnaliser...", IDC_CUSTOM_BUTTON, 200, 147, 58, 14
     CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1
     DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14
     PUSHBUTTON "Annuler", IDCANCEL, 208, 179, 50, 14
@@ -54,7 +54,7 @@ BEGIN
     AUTORADIOBUTTON "Axe Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE
     GROUPBOX "&Boutons", -1, 137, 67, 116, 44
     COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE
-    AUTOCHECKBOX "Inclue un contrôle de &point de vue", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10
+    AUTOCHECKBOX "Inclut un contrôle de &point de vue", IDC_INC_POINT_CHECKBOX, 7, 123, 120, 10
     LTEXT "N&om du contrôleur :", -1, 7, 139, 200, 9
     EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
     DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14
@@ -70,7 +70,7 @@ BEGIN
     ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20
     DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14
     PUSHBUTTON "Annuler", IDCANCEL, 163, 65, 50, 14
-    LTEXT "Sélectionnez le périphérique que vous désirez utiliser avec d'anciens programmes.", -1, 7, 7, 208, 10
+    LTEXT "Sélectionnez le périphérique que vous désirez utiliser avec d'anciens programmes.", -1, 7, 7, 208, 16
     LTEXT "&Périphérique préféré:", -1, 34, 24, 70, 10
     COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
 END
diff --git a/dll/cpl/joy/lang/he-IL.rc b/dll/cpl/joy/lang/he-IL.rc
index b647bf742c1..68086c1b10c 100644
--- a/dll/cpl/joy/lang/he-IL.rc
+++ b/dll/cpl/joy/lang/he-IL.rc
@@ -70,7 +70,7 @@ BEGIN
     ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20
     DEFPUSHBUTTON "אישור", IDOK, 106, 65, 50, 14
     PUSHBUTTON "ביטול", IDCANCEL, 163, 65, 50, 14
-    LTEXT "Select the device you want to use with older programs.", -1, 7, 7, 208, 10
+    LTEXT "בחר את ההתקן בו ברצונך להשתמש עם תכניות ישנות.", -1, 7, 7, 208, 10
     LTEXT "התקן מועדף:", -1, 34, 24, 70, 10
     COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
 END
@@ -78,7 +78,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_CPLSYSTEMNAME "בקרי משחק"
-    IDS_CPLSYSTEMDESCRIPTION "Add, remove, and configure game controller hardware such as joysticks and gamepads."
+    IDS_CPLSYSTEMDESCRIPTION "הוסף, הסר, והגדר חומרת בקרי משחק כמו ג׳ויסטיקים ומשטחי משחק."
     IDS_CONTROLLER "בקר"
     IDS_STATUS "מצב"
 END
diff --git a/dll/cpl/joy/lang/pl-PL.rc b/dll/cpl/joy/lang/pl-PL.rc
index 496e7a45a35..65a0d059506 100644
--- a/dll/cpl/joy/lang/pl-PL.rc
+++ b/dll/cpl/joy/lang/pl-PL.rc
@@ -62,7 +62,7 @@ BEGIN
     AUTORADIOBUTTON "Oś Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE
     GROUPBOX "&Przyciski", -1, 137, 67, 116, 44
     COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE
-    AUTOCHECKBOX "&Zawiera kontrolę obszaru widoku", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10
+    AUTOCHECKBOX "&Zawiera kontrolę obszaru widoku", IDC_INC_POINT_CHECKBOX, 7, 123, 117, 10
     LTEXT "&Nazwa kontrolera:", -1, 7, 139, 200, 9
     EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
     DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14
diff --git a/dll/cpl/joy/lang/ro-RO.rc b/dll/cpl/joy/lang/ro-RO.rc
index fbcd4e65d76..52cc0f3c93c 100644
--- a/dll/cpl/joy/lang/ro-RO.rc
+++ b/dll/cpl/joy/lang/ro-RO.rc
@@ -1,4 +1,4 @@
-/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */
+// COPYRIGHT: Ștefan Fulea <stefan.fulea@mail.com>
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
diff --git a/dll/cpl/joy/lang/tr-TR.rc b/dll/cpl/joy/lang/tr-TR.rc
index 09944f942df..5c6cdd16dbc 100644
--- a/dll/cpl/joy/lang/tr-TR.rc
+++ b/dll/cpl/joy/lang/tr-TR.rc
@@ -1,20 +1,20 @@
-/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
+// COPYRIGHT: 2013-2020 Erdem Ersoy
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
 EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Oyun Denetleyicileri"
+CAPTION "Oyun Kontrolcüleri"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20
-    LTEXT "Bu ayarlar, bilgisayarınızda yüklü oyun denetleyicilerini yapılandırmanıza yardım eder.", -1, 33, 7, 214, 20, NOT WS_GROUP
-    GROUPBOX "&Yüklü Oyun Denetleyicileri", -1, 7, 34, 238, 117
+    LTEXT "Bu ayarlar, bilgisayarınızda yüklü oyun kontrolcülerini yapılandırmanıza yardım eder.", -1, 33, 7, 214, 20, NOT WS_GROUP
+    GROUPBOX "&Yüklü Oyun Kontrolcüleri", -1, 7, 34, 238, 117
     CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80
     PUSHBUTTON "&Ekle...", IDC_ADD_BUTTON, 35, 129, 65, 14
     PUSHBUTTON "&Sil", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED
-    PUSHBUTTON "&Husûsiyetler", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED
+    PUSHBUTTON "Ö&zellikler", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED
     PUSHBUTTON "&Gelişmiş...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14
     PUSHBUTTON "S&orun Çözme...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14
     PUSHBUTTON "Tamam", IDOK, 195, 185, 50, 14
@@ -27,13 +27,13 @@ CAPTION "Oyun Denetleyicisi Ekle"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20
-    LTEXT "Aşağıdaki dizelgeden bir oyun denetleyicisi seçiniz, ardından ""Tamam""a tıklayınız. Eğer oyun denetleyiciniz dizelgede gözükmüyorsa ""Husûsî...""ye tıklayınız.", -1, 35, 7, 210, 33
-    LTEXT "&Oyun Denetleyicileri:", -1, 8, 45, 126, 8
+    LTEXT "Aşağıdaki listeden bir oyun denetleyicisi seçiniz, ardından ""Tamam""a tıklayınız. Eğer oyun denetleyiciniz listede gözükmüyorsa ""Özel...""e tıklayınız.", -1, 35, 7, 210, 33
+    LTEXT "&Oyun Kontrolcüleri:", -1, 8, 45, 126, 8
     LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP
     AUTOCHECKBOX "&Dümenleri ve Ayaklıkları Etkinleştir", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP
     LTEXT "O&yun Girişi:", -1, 7, 134, 38, 8, NOT WS_VISIBLE
     COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL
-    PUSHBUTTON "&Husûsî...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14
+    PUSHBUTTON "Ö&zel...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14
     CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1
     DEFPUSHBUTTON "Tamam", IDOK, 155, 179, 50, 14
     PUSHBUTTON "İptal", IDCANCEL, 208, 179, 50, 14
@@ -42,21 +42,21 @@ END
 IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION
 EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "Husûsî Oyun Denetleyicisi"
+CAPTION "Özel Oyun Denetleyicisi"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Değişik Husûsiyetler", -1, 7, 7, 245, 52
+    GROUPBOX "Değişik Özellikler", -1, 7, 7, 245, 52
     AUTORADIOBUTTON "&Oyun Çubuğu", IDC_JOYSTICK_RADIO, 17, 23, 55, 10
-    AUTORADIOBUTTON "&Uçuş Dümeni veyâ Uçuş Çubuğu", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10
-    AUTORADIOBUTTON "O&yun Kolu", IDC_GAME_PAD_RADIO, 17, 40, 65, 10
-    AUTORADIOBUTTON "Y&arış Arabası Denetleyicisi", IDC_RACE_CAR_RADIO, 147, 40, 93, 10
+    AUTORADIOBUTTON "&Uçuş Dümeni veya Uçuş Çubuğu", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10
+    AUTORADIOBUTTON "Oyun &Kolu", IDC_GAME_PAD_RADIO, 17, 40, 65, 10
+    AUTORADIOBUTTON "&Yarış Arabası Denetleyicisi", IDC_RACE_CAR_RADIO, 147, 40, 93, 10
     GROUPBOX "Eksenler", -1, 7, 67, 116, 44, WS_GROUP
     COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
     AUTORADIOBUTTON "&Dümen/Ayaklıklar", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE
     AUTORADIOBUTTON "&Z Ekseni", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE
     GROUPBOX "Düğmeler", -1, 137, 67, 116, 44
     COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE
-    AUTOCHECKBOX "D&enetlemeyi Görüntüleyen Bir Nokta İçerir", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10
+    AUTOCHECKBOX "D&enetlemeyi görüntüleyen bir nokta içerir", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10
     LTEXT "De&netleyici Adı:", -1, 7, 139, 200, 9
     EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
     DEFPUSHBUTTON "Tamam", IDOK, 137, 150, 50, 14
@@ -79,7 +79,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_CPLSYSTEMNAME "Oyun Denetleyicileri"
+    IDS_CPLSYSTEMNAME "Oyun Kontrolcüleri"
     IDS_CPLSYSTEMDESCRIPTION "Oyun çubukları ve oyun kolları gibi oyun denetleyicisi donanımlarını ekler, çıkarır ve yapılandırır."
     IDS_CONTROLLER "Denetleyici"
     IDS_STATUS "Durum"
diff --git a/dll/cpl/joy/lang/zh-CN.rc b/dll/cpl/joy/lang/zh-CN.rc
index 56b0266f9c1..63142b71da9 100644
--- a/dll/cpl/joy/lang/zh-CN.rc
+++ b/dll/cpl/joy/lang/zh-CN.rc
@@ -32,7 +32,7 @@ FONT 9, "宋体"
 BEGIN
     ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20
     LTEXT "请在下面列表中选择游戏控制器并单击“确定”。如果您的游戏控制器不在列表中，单击“自定义”。", -1, 35, 7, 210, 33
-    LTEXT "游戏控制器(&G)::", -1, 8, 45, 126, 8
+    LTEXT "游戏控制器(&G):", -1, 8, 45, 126, 8
     LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP
     AUTOCHECKBOX "启用方向舵和脚踏板(&E)", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP
     LTEXT "游戏端口(&G):", -1, 7, 134, 38, 8, NOT WS_VISIBLE
diff --git a/dll/cpl/joy/lang/zh-TW.rc b/dll/cpl/joy/lang/zh-TW.rc
index cbe77f94a13..c4248ec0245 100644
--- a/dll/cpl/joy/lang/zh-TW.rc
+++ b/dll/cpl/joy/lang/zh-TW.rc
@@ -1,4 +1,4 @@
-/* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2@hotmail.com) */
+// COPYRIGHT: 2016 Henry Tang Ih <henrytang2@hotmail.com>
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
@@ -27,13 +27,13 @@ CAPTION "添加遊戲控制器"
 FONT 9, "新細明體"
 BEGIN
     ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20
-    LTEXT "請在下面列表中選擇遊戲控制器並單擊“確定”。如果您的遊戲控制器不在列表中，單擊“自定義”。", -1, 35, 7, 210, 33
-    LTEXT "遊戲控制器(&G)::", -1, 8, 45, 126, 8
+    LTEXT "請在下面列表中選擇遊戲控制器並按［確定］。如果您的遊戲控制器不在列表中，請按［自訂］。", -1, 35, 7, 210, 33
+    LTEXT "遊戲控制器(&G):", -1, 8, 45, 126, 8
     LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP
     AUTOCHECKBOX "啟用方向舵和腳踏板(&E)", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP
     LTEXT "遊戲埠(&G):", -1, 7, 134, 38, 8, NOT WS_VISIBLE
     COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL
-    PUSHBUTTON "自定義(&C)...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14
+    PUSHBUTTON "自訂(&C)...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14
     CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1
     DEFPUSHBUTTON "確定", IDOK, 155, 179, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 208, 179, 50, 14
@@ -42,7 +42,7 @@ END
 IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION
 EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "自定義遊戲控制器"
+CAPTION "自訂遊戲控制器"
 FONT 9, "新細明體"
 BEGIN
     GROUPBOX "特殊特性", -1, 7, 7, 245, 52