https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38f21f93e995dbe798aa9…
commit 38f21f93e995dbe798aa90a7f1eceabfdd37d59b
Author:     Joachim Henze <joachim.henze(a)reactos.org>
AuthorDate: Fri Oct 11 03:35:28 2024 +0200
Commit:     GitHub <noreply(a)github.com>
CommitDate: Fri Oct 11 03:35:28 2024 +0200
    [DESK] *.rc: Tweak AUTOCHECKBOXES (#7403)
    Tweaks all AUTOCHECKBOXes in desk.cpl
    no functional change intended, it seems to work well when testing it locally
    Makes the rcs shorter
    it also makes the binaries a few bytes smaller:
    GCC8.4.0dbg RosBEWin2.2.2 DESK.CPL shrinks 650.240 bytes -> 647.168 bytes
    it prettifies also the display in reshacker
---
 dll/cpl/desk/lang/bg-BG.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/cs-CZ.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/de-DE.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/el-GR.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/en-GB.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/en-US.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/es-ES.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/et-EE.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/fr-FR.rc | 37 ++++++++++++-------------------------
 dll/cpl/desk/lang/he-IL.rc | 38 +++++++++++++-------------------------
 dll/cpl/desk/lang/hu-HU.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/id-ID.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/it-IT.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/ja-JP.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/nl-NL.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/no-NO.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/pl-PL.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/pt-BR.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/pt-PT.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/ro-RO.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/ru-RU.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/sk-SK.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/sq-AL.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/sv-SE.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/tr-TR.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/uk-UA.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/zh-CN.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/zh-HK.rc | 36 ++++++++++++------------------------
 dll/cpl/desk/lang/zh-TW.rc | 36 ++++++++++++------------------------
 29 files changed, 349 insertions(+), 698 deletions(-)
diff --git a/dll/cpl/desk/lang/bg-BG.rc b/dll/cpl/desk/lang/bg-BG.rc
index 40928b8e035..e296e24bf24 100644
--- a/dll/cpl/desk/lang/bg-BG.rc
+++ b/dll/cpl/desk/lang/bg-BG.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 72, 123, 12, 13
     LTEXT "минути", IDC_MINTEXT, 86, 125, 26, 9
-    CONTROL "Искане на парола при изход", IDC_SCREENS_USEPASSCHK,
"button",//FIXME: add accel. I used "Искане &на парола при изход"
for the backport
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 120, 109, 19
+    AUTOCHECKBOX "Искане на парола при изход", IDC_SCREENS_USEPASSCHK, 116,
120, 109, 19//FIXME: add accel. I used "Искане &на парола при изход" for the
backport
     GROUPBOX "Енергоспестяващи възможности на монитора", IDC_SCREENS_DUMMY2, 8,
150, 230, 41
     LTEXT "За настройка захранването на монитора, натиснете „Захранване...“.",
IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "Захранване...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61,
15//FIXME: add accel. I used "&Захранване..." for the backport
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Ефекти"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Из&ползване на следните преходни ефекти за изборниците и
подсказките:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "Из&ползване на следните преходни ефекти за изборниците и
подсказките:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "&Използване на следния похват за изглаждане ръбовете на екранните
шрифтове:", IDC_EFFAPPEARANCE_SMOOTHING,//FIXME: text truncation. I used
"&Изгладете ръбовете на екранните шрифтове чрез" for the backport
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "&Използване на следния похват за изглаждане ръбовете на
екранните шрифтове:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19//FIXME: text
truncation. I used "&Изгладете ръбовете на екранните шрифтове чрез" for the
backport
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Използван&е на големи значета", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Изобразяване на &сенки под изборницте",
IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Показване на съдържанието на &прозорците по време на влачене",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "С&криване на подчертаването за клавиатурното насочване, до
натискане на Alt",//FIXME: text truncation. I used "С&криване на
осветяването за клавиатурата, докато не бъде натиснат Alt" for the backport
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Използван&е на големи значета",
IDC_EFFAPPEARANCE_LARGEICONS, 10, 80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Изобразяване на &сенки под изборницте",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "Показване на съдържанието на &прозорците по време на
влачене", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "С&криване на подчертаването за клавиатурното насочване, до
натискане на Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19//FIXME: text
truncation. I used "С&криване на осветяването за клавиатурата, докато не бъде
натиснат Alt" for the backport
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Отказ", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "Добре", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/cs-CZ.rc b/dll/cpl/desk/lang/cs-CZ.rc
index 7d5f4c4ebd7..15f10c8103e 100644
--- a/dll/cpl/desk/lang/cs-CZ.rc
+++ b/dll/cpl/desk/lang/cs-CZ.rc
@@ -49,8 +49,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "minut", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "Chránit &heslem", IDC_SCREENS_USEPASSCHK, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Chránit &heslem", IDC_SCREENS_USEPASSCHK, 108, 120, 117,
19
     GROUPBOX "Napájení monitoru", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Pro nastavení napájení Vašeho monitoru, klikněte na Napájení",
IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "Na&pájení...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -113,24 +112,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Efekty"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Použít následující &efekt přechodu pro nabídky a popisky:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "Použít následující &efekt přechodu pro nabídky a
popisky:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Použít následující metodu vyhlazování &hran obrazovkových
písem:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "Použít následující metodu vyhlazování &hran obrazovkových
písem:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Použít velké &ikony", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Zobrazovat &stíny pod nabídkami",
IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Zobrazovat &obsah okna během přesouvání",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Nezobrazovat podtržení písmen u klávesových zkratek, dokud
nestisknu klávesu Alt",//FIXME: text truncation. I used "S&kryl podtržená
písmena pro klávesnici, dokud nestisknu Alt" for the backport
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Použít velké &ikony", IDC_EFFAPPEARANCE_LARGEICONS, 10,
80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Zobrazovat &stíny pod nabídkami",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "Zobrazovat &obsah okna během přesouvání",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Nezobrazovat podtržení písmen u klávesových zkratek, dokud
nestisknu klávesu Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19//FIXME: text
truncation. I used "S&kryl podtržená písmena pro klávesnici, dokud nestisknu
Alt" for the backport
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Storno", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -163,14 +155,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/de-DE.rc b/dll/cpl/desk/lang/de-DE.rc
index 56b424f6d0a..54d9676e168 100644
--- a/dll/cpl/desk/lang/de-DE.rc
+++ b/dll/cpl/desk/lang/de-DE.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "Minuten", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "&Passwort nach Reaktivierung", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "&Passwort nach Reaktivierung", IDC_SCREENS_USEPASSCHK,
108, 120, 117, 19
     GROUPBOX "Energiesparfunktionen des Monitors", IDC_SCREENS_DUMMY2, 8, 150,
230, 41
     LTEXT "Um die Energieoptionen des Monitors zu editieren, wählen Sie
Energieoptionen.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "E&nergieoptionen...", IDC_SCREENS_POWER_BUTTON, 157, 165,
69, 15
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Effekte"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Verwende folgenden Übergangseffekt für Menüs und Tooltips:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Verwende folgenden Übergangseffekt für Menüs und
Tooltips:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "V&erwende folgende Kantenglättungsmethode für
Bildschirmschriften:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "V&erwende folgende Kantenglättungsmethode für
Bildschirmschriften:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Ve&rwende große Icons", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Zeige Menüsch&atten", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Zeige &Fensterinhalt beim Verschieben",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "Ver&stecke Unterstrich der Tastaturnavigation bis zum Druck der
Alt-Taste",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Ver&wende flache Menüs", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Ve&rwende große Icons", IDC_EFFAPPEARANCE_LARGEICONS, 10,
80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Zeige Menüsch&atten", IDC_EFFAPPEARANCE_SETDROPSHADOW,
10, 95, 267, 19
+    AUTOCHECKBOX "Zeige &Fensterinhalt beim Verschieben",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "Ver&stecke Unterstrich der Tastaturnavigation bis zum Druck
der Alt-Taste", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Ver&wende flache Menüs", IDC_EFFAPPEARANCE_FLATMENUS, 10,
140, 267, 19
     PUSHBUTTON "Abbrechen", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktopsymbole", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "&Eigene Dateien", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "&Netzwerkumgebung", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "A&rbeitsplatz", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "&Eigene Dateien", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "&Netzwerkumgebung", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "A&rbeitsplatz", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/el-GR.rc b/dll/cpl/desk/lang/el-GR.rc
index 425e23e712c..1b056ad08c9 100644
--- a/dll/cpl/desk/lang/el-GR.rc
+++ b/dll/cpl/desk/lang/el-GR.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "λεπτά", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "Κατά τη συνέχιση, προστασία με κωδικό πρόσβασης",
IDC_SCREENS_USEPASSCHK, "button",//FIXME: add accel and shrink the text. It is
too long to fit the control. I used "&Κωδικός πρόσβασης όταν συνεχίζετε" for
the backport with the position and width 98, 120, 127, 19
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Κατά τη συνέχιση, προστασία με κωδικό πρόσβασης",
IDC_SCREENS_USEPASSCHK, 108, 120, 117, 19//FIXME: add accel and shrink the text. It is too
long to fit the control. I used "&Κωδικός πρόσβασης όταν συνεχίζετε" for the
backport with the position and width 98, 120, 127, 19
     GROUPBOX "Ενέργεια οθόνης", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Για ρύθμιση των χαρακτηριστικών εξοικονόμησης ενέργειας, κάντε κλικ στο
κουμπί 'Ενέργεια'.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "Ενέργεια...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61,
15//FIXME: add accel. I used "&Ενέργεια..." for the backport
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Effects"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Use the following transition effect for menus and tooltips:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Use the following transition effect for menus and
tooltips:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "U&se the following method to smooth edges of screen fonts:",
IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "U&se the following method to smooth edges of screen
fonts:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Show &window contents while dragging",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Hide underlined letters for keyboard navigation until I press the
Alt key",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80,
267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Show sh&adows under menus",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "Show &window contents while dragging",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Hide underlined letters for keyboard navigation until I press
the Alt key", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc
index 96277b091b6..e96327aac94 100644
--- a/dll/cpl/desk/lang/en-GB.rc
+++ b/dll/cpl/desk/lang/en-GB.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "Ask for &password on resume", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Ask for &password on resume", IDC_SCREENS_USEPASSCHK,
108, 120, 117, 19
     GROUPBOX "Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 8, 150,
230, 41
     LTEXT "To adjust the power settings for your monitor, click on Power
Settings.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Effects"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Use the following transition effect for menus and tooltips:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Use the following transition effect for menus and
tooltips:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "U&se the following method to smooth edges of screen fonts:",
IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "U&se the following method to smooth edges of screen
fonts:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Show &window contents while dragging",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Hide underlined letters for keyboard navigation until I press the
Alt key",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80,
267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Show sh&adows under menus",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "Show &window contents while dragging",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Hide underlined letters for keyboard navigation until I press
the Alt key", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/en-US.rc b/dll/cpl/desk/lang/en-US.rc
index 7060056eaa0..bcaceaab124 100644
--- a/dll/cpl/desk/lang/en-US.rc
+++ b/dll/cpl/desk/lang/en-US.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "Ask for &password on resume", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Ask for &password on resume", IDC_SCREENS_USEPASSCHK,
108, 120, 117, 19
     GROUPBOX "Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 8, 150,
230, 41
     LTEXT "To adjust the power settings for your monitor, click on Power
Settings.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Effects"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Use the following transition effect for menus and tooltips:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Use the following transition effect for menus and
tooltips:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "U&se the following method to smooth edges of screen fonts:",
IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "U&se the following method to smooth edges of screen
fonts:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Show &window contents while dragging",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Hide underlined letters for keyboard navigation until I press the
Alt key",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80,
267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Show sh&adows under menus",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "Show &window contents while dragging",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Hide underlined letters for keyboard navigation until I press
the Alt key", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/es-ES.rc b/dll/cpl/desk/lang/es-ES.rc
index 3fde92259b7..21855b67a58 100644
--- a/dll/cpl/desk/lang/es-ES.rc
+++ b/dll/cpl/desk/lang/es-ES.rc
@@ -54,8 +54,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 58, 123, 12, 13
     LTEXT "minutos", IDC_MINTEXT, 74, 125, 26, 9
-    CONTROL "Pr&oteger sesión con contraseña", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Pr&oteger sesión con contraseña", IDC_SCREENS_USEPASSCHK,
108, 120, 117, 19
     GROUPBOX "Energía del monitor", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Para ajustar la configuración de energía del monitor y ahorrar energía,
haga clic en Energía.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "E&nergía...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -118,24 +117,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Efectos"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Animar transiciones de menús y sugerencias emergentes:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Animar transiciones de menús y sugerencias emergentes:",
IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "U&sar el siguiente método para suavizar los bordes de las fuentes
de pantalla:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "U&sar el siguiente método para suavizar los bordes de las
fuentes de pantalla:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Usar i&conos grandes", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Mostrar som&bras bajo los menús",
IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "&Mostrar el contenido de la ventana mientras se arrastra",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Ocultar el subrayado de acceso rápido hasta presionar la tecla
Alt",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Usar menús &planos", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Usar i&conos grandes", IDC_EFFAPPEARANCE_LARGEICONS, 10,
80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Mostrar som&bras bajo los menús",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "&Mostrar el contenido de la ventana mientras se
arrastra", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Ocultar el subrayado de acceso rápido hasta presionar la
tecla Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Usar menús &planos", IDC_EFFAPPEARANCE_FLATMENUS, 10,
140, 267, 19
     PUSHBUTTON "Cancelar", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "Aceptar", IDOK, 172, 165, 50, 14
 END
@@ -168,14 +160,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/et-EE.rc b/dll/cpl/desk/lang/et-EE.rc
index 57f635a5fb4..13754f02dc1 100644
--- a/dll/cpl/desk/lang/et-EE.rc
+++ b/dll/cpl/desk/lang/et-EE.rc
@@ -51,8 +51,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "minutit", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "Ärkamisel küsi parooli", IDC_SCREENS_USEPASSCHK,
"button",//FIXME: add accel, I used "Ä&rkamisel küsi parooli" for
the backport
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Ärkamisel küsi parooli", IDC_SCREENS_USEPASSCHK, 108, 120,
117, 19//FIXME: add accel, I used "Ä&rkamisel küsi parooli" for the backport
     GROUPBOX "Kuvari toide", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Kuvari toitesätete reguleerimiseks ja energia säästmiseks klõpsake nuppu
Toide.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "&Toide...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -115,24 +114,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Efektid"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Kasuta menüüde ja kohtspikrite puhul järgmist siirdeefekti:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Kasuta menüüde ja kohtspikrite puhul järgmist
siirdeefekti:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "K&asuta ekraanifontide serva tasandamiseks järgmist
meetodit:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "K&asuta ekraanifontide serva tasandamiseks järgmist
meetodit:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Ka&suta suuri ikoone", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Kuva menüüde all &varjustus", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Kuva lohistamise ajal akna &sisu",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Peida kiirkla&hvide jaoks allakriipsutatud tähed muuteklahvi
(Alt) vajutamiseni",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Kasuta k&itsaid aknaid", IDC_EFFAPPEARANCE_FLATMENUS,//FIXME:
double-check that translation. The current translation means "Use small windows"
while it should be "Use flat menus". I used "&Lamedad menüüd" for
the backport
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Ka&suta suuri ikoone", IDC_EFFAPPEARANCE_LARGEICONS, 10,
80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Kuva menüüde all &varjustus",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "Kuva lohistamise ajal akna &sisu",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Peida kiirkla&hvide jaoks allakriipsutatud tähed
muuteklahvi (Alt) vajutamiseni", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Kasuta k&itsaid aknaid", IDC_EFFAPPEARANCE_FLATMENUS, 10,
140, 267, 19//FIXME: double-check that translation. The current translation means
"Use small windows" while it should be "Use flat menus". I used
"&Lamedad menüüd" for the backport
     PUSHBUTTON "Loobu", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -165,14 +157,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/fr-FR.rc b/dll/cpl/desk/lang/fr-FR.rc
index 8671dab1e2a..fe822da4d2a 100644
--- a/dll/cpl/desk/lang/fr-FR.rc
+++ b/dll/cpl/desk/lang/fr-FR.rc
@@ -46,8 +46,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "minutes", IDC_MINTEXT, 65, 125, 26, 9
-    CONTROL "À la reprise, demander un mot de &passe",
IDC_SCREENS_USEPASSCHK, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 93, 120, 140, 19
+    AUTOCHECKBOX "À la reprise, demander un mot de &passe",
IDC_SCREENS_USEPASSCHK, 93, 120, 140, 19
     GROUPBOX "Gestion de l'alimentation du moniteur", IDC_SCREENS_DUMMY2,
8, 150, 230, 41
     LTEXT "Pour modifier les paramètres de l'alimentation du moniteur, cliquez
sur Gestion de l'alimentation.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "&Gestion de l'alimentation...",
IDC_SCREENS_POWER_BUTTON, 133, 172, 100, 15
@@ -110,25 +109,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Effets"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Utiliser l'effet de &transition suivant pour les menus et les
info-bulles :",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "Utiliser l'effet de &transition suivant pour les menus et
les info-bulles :", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Utili&ser la méthode suivante pour lisser les bords des polices
d'écran :", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "Utili&ser la méthode suivante pour lisser les bords des
polices d'écran :", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "&Utiliser de grandes icônes", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "&Afficher une ombre sous les menus",
IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "A&fficher le contenu des fenêtres pendant leur déplacement",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "Mas&quer les lettres soulignées de navigation au clavier
jusqu'à l'appui sur la touche Alt",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 290, 19
-    //FIXME: This is the too long string, and so I used the shortened "&Cacher
les lettres soulignées jusqu'à ce que j'appuie sur la touche Alt" for the
backport to allow keeping the dialogs en-US original size
-    CONTROL "Utiliser les menus &plats", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "&Utiliser de grandes icônes",
IDC_EFFAPPEARANCE_LARGEICONS, 10, 80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "&Afficher une ombre sous les menus",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "A&fficher le contenu des fenêtres pendant leur
déplacement", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "Mas&quer les lettres soulignées de navigation au clavier
jusqu'à l'appui sur la touche Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125,
290, 19//FIXME: This is the too long string, and so I used the shortened "&Cacher
les lettres soulignées jusqu'à ce que j'appuie sur la touche Alt" for the
backport to allow keeping the dialogs en-US original size
+    AUTOCHECKBOX "Utiliser les menus &plats", IDC_EFFAPPEARANCE_FLATMENUS,
10, 140, 267, 19
     PUSHBUTTON "Annuler", IDCANCEL, 226, 165, 50, 14//FIXME: someone resized
the dialog from width 285 to 300 during 0.4.15-dev'ing, that is why those buttons are
misplaced now. It would be better to shrink the dlg again, and shorten some texts instead.
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14//FIXME: someone resized the
dialog from width 285 to 300 during 0.4.15-dev'ing, that is why those buttons are
misplaced now. It would be better to shrink the dlg again, and shorten some texts instead.
 END
@@ -161,14 +152,10 @@ CAPTION "Général"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Icônes du Bureau", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "&Mes documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "Mon &réseau", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "P&oste de travail", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Navigateur Internet", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "&Mes documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "Mon &réseau", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "P&oste de travail", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Navigateur Internet", IDC_ICONS_INTERNET, 116, 28, 100,
12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/he-IL.rc b/dll/cpl/desk/lang/he-IL.rc
index 871fd1c64f7..bbea7c114b0 100644
--- a/dll/cpl/desk/lang/he-IL.rc
+++ b/dll/cpl/desk/lang/he-IL.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "דקות", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "שאל לסיסמה בעת חידוש", IDC_SCREENS_USEPASSCHK, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "שאל לסיסמה בעת חידוש", IDC_SCREENS_USEPASSCHK, 108, 120, 117,
19
     GROUPBOX "Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 8, 150,
230, 41
     LTEXT "To adjust the power settings for your monitor, click on Power
Settings.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "אפקטים"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Use the following transition effect for menus and tooltips:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Use the following transition effect for menus and
tooltips:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "U&se the following method to smooth edges of screen fonts:",
IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "U&se the following method to smooth edges of screen
fonts:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "השתמש בסמלים גדולים", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Show &window contents while dragging",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Hide underlined letters for keyboard navigation until I press the
Alt key",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "השתמש בסמלים גדולים", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80,
267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Show sh&adows under menus",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "Show &window contents while dragging",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Hide underlined letters for keyboard navigation until I press
the Alt key", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "ביטול", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "אישור", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
@@ -179,7 +167,7 @@ CAPTION "כללי"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "תצוגה", -1, 7, 6, 237, 56, WS_GROUP
-    LTEXT "גודל גופן:", -1, 14, 20, 222, 9//FIXME: 2k3sp2 does now call this
"&DPI setting:" . Feel free to translate that.
+    LTEXT "גודל גופן:", -1, 14, 20, 222, 9//FIXME: 2k3sp2 does now call this
"&DPI setting:". Feel free to translate that.
     COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
     LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
     GROUPBOX "תאימות", -1, 7, 67, 237, 97
diff --git a/dll/cpl/desk/lang/hu-HU.rc b/dll/cpl/desk/lang/hu-HU.rc
index c071ad3b4d2..4f5b116c373 100644
--- a/dll/cpl/desk/lang/hu-HU.rc
+++ b/dll/cpl/desk/lang/hu-HU.rc
@@ -46,8 +46,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 60, 123, 12, 13
     LTEXT "percet", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "&Jelszóvédelem a visszatéréshez", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "&Jelszóvédelem a visszatéréshez", IDC_SCREENS_USEPASSCHK,
108, 120, 117, 19
     GROUPBOX "A monitor energiatakarékossági tulajdonságai",
IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "A monitor energiaellátási tulajdonságainak megváltoztatásához kattintson
az energiaellátás gombra.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "Ener&giaellátás...", IDC_SCREENS_POWER_BUTTON, 167, 165,
61, 15
@@ -110,24 +109,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Effektusok"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Az alábbi áttűnés &effektet használja menükhöz és
eszköztippekhez:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "Az alábbi áttűnés &effektet használja menükhöz és
eszköztippekhez:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Az alábbi módszert használja a képernyőn megjelenő &betűtípusok
simítására:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "Az alábbi módszert használja a képernyőn megjelenő
&betűtípusok simítására:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Nagy &ikonok használata", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Árnyékok megjelenítése a &menük alatt",
IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "&Ablakok tartalmának mutatása mozgatás közben",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "Alá&húzott betűk elrejtése a billentyűzet navigációhoz az ALT
megnyomásáig",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "&Lapos menük használata", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Nagy &ikonok használata", IDC_EFFAPPEARANCE_LARGEICONS,
10, 80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Árnyékok megjelenítése a &menük alatt",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "&Ablakok tartalmának mutatása mozgatás közben",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "Alá&húzott betűk elrejtése a billentyűzet navigációhoz az ALT
megnyomásáig", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "&Lapos menük használata", IDC_EFFAPPEARANCE_FLATMENUS,
10, 140, 267, 19
     PUSHBUTTON "Mégse", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -160,14 +152,10 @@ CAPTION "Általános"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Asztali ikonok", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "&Dokumentumok", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "&Hálózati helyek", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&Számítógép", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet böngésző", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "&Dokumentumok", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "&Hálózati helyek", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&Számítógép", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet böngésző", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/id-ID.rc b/dll/cpl/desk/lang/id-ID.rc
index 9850609a802..9852d28971c 100644
--- a/dll/cpl/desk/lang/id-ID.rc
+++ b/dll/cpl/desk/lang/id-ID.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 60, 123, 12, 13
     LTEXT "menit", IDC_MINTEXT, 74, 125, 26, 9
-    CONTROL "Pintai &kata sandi saat melanjutkan", IDC_SCREENS_USEPASSCHK,
"button",//FIXME: text truncation. I used "Minta &kata sandi saat
melanjutkan" with width 124 to fix that for the backport
-            BS_AUTOCHECKBOX | WS_TABSTOP, 106, 120, 119, 19
+    AUTOCHECKBOX "Pintai &kata sandi saat melanjutkan",
IDC_SCREENS_USEPASSCHK, 106, 120, 119, 19//FIXME: text truncation. I used "Minta
&kata sandi saat melanjutkan" with width 124 to fix that for the backport
     GROUPBOX "Fitur penyimpan Daya monitor", IDC_SCREENS_DUMMY2, 8, 150, 230,
41
     LTEXT "Untuk mengatur setelan daya monitor, klik Daya.", IDC_STATIC, 16,
161, 146, 27
     PUSHBUTTON "&Daya...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Efek"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "G&unakan efek transisi berikut untuk menu dan alat bantuan:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "G&unakan efek transisi berikut untuk menu dan alat
bantuan:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Gu&nakan cara berikut untuk menghaluskan tepi fon pada
layar:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "Gu&nakan cara berikut untuk menghaluskan tepi fon pada
layar:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "&Gunakan ikon besar", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Tampilkan &bayangan di bawah menu",
IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "&Tampilkan konten jendela ketika digeser",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Sembunyikan huruf yang digarisbawahi untuk navigasi papan ketik
sampai tombol Alt tertekan",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 23
-    CONTROL "Gunakan menu &datar", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 144, 267, 19
+    AUTOCHECKBOX "&Gunakan ikon besar", IDC_EFFAPPEARANCE_LARGEICONS, 10,
80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Tampilkan &bayangan di bawah menu",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "&Tampilkan konten jendela ketika digeser",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Sembunyikan huruf yang digarisbawahi untuk navigasi papan
ketik sampai tombol Alt tertekan", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 23
+    AUTOCHECKBOX "Gunakan menu &datar", IDC_EFFAPPEARANCE_FLATMENUS, 10,
144, 267, 19
     PUSHBUTTON "Batal", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/it-IT.rc b/dll/cpl/desk/lang/it-IT.rc
index 05ebb698ec2..077e51d5d5d 100644
--- a/dll/cpl/desk/lang/it-IT.rc
+++ b/dll/cpl/desk/lang/it-IT.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 58, 123, 12, 13
     LTEXT "minuti", IDC_MINTEXT, 72, 125, 26, 9
-    CONTROL "Chiedere la &password al ripristino", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Chiedere la &password al ripristino",
IDC_SCREENS_USEPASSCHK, 108, 120, 117, 19
     GROUPBOX "Funzioni di risparmio energetico del monitor",
IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Per regolare le impostazioni premere Alimentazione.", IDC_STATIC,
16, 161, 146, 27
     PUSHBUTTON "Alim&entazione...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61,
15
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Effetti"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Usare il seguente effetto per le transizioni in menu e
tooltip:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Usare il seguente effetto per le transizioni in menu e
tooltip:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "U&sare il seguente metodo per arrotondare i bordi dei font per lo
schermo:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "U&sare il seguente metodo per arrotondare i bordi dei font per
lo schermo:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Usare le icone grandi", IDC_EFFAPPEARANCE_LARGEICONS,
"button",//FIXME: add accel. I used "Us&are le icone grandi" for
the backport
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "&Ombreggiatura sotto i menu", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Mostrare il contenuto delle finestr mentre le si trascina",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,//FIXME: add accel. I used "&Mostrare il
contenuto delle finestr mentre le si trascina" for the backport
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Nascondere la sottolineatura delle lettere di navigazione finche
non è premuto il tasto Alt",//FIXME: text cutoff. I used "&Nascondi le
lettere sottolineate finché non viene premuto il tasto Alt" for the backport
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Usare le icone grandi", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80,
267, 19, WS_TABSTOP | WS_DISABLED//FIXME: add accel. I used "Us&are le icone
grandi" for the backport
+    AUTOCHECKBOX "&Ombreggiatura sotto i menu",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "Mostrare il contenuto delle finestr mentre le si trascina",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19//FIXME: add accel. I used
"&Mostrare il contenuto delle finestr mentre le si trascina" for the
backport
+    AUTOCHECKBOX "&Nascondere la sottolineatura delle lettere di navigazione
finche non è premuto il tasto Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267,
19//FIXME: text cutoff. I used "&Nascondi le lettere sottolineate finché non
viene premuto il tasto Alt" for the backport
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Annulla", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/ja-JP.rc b/dll/cpl/desk/lang/ja-JP.rc
index 10fd61152e5..db60062d25a 100644
--- a/dll/cpl/desk/lang/ja-JP.rc
+++ b/dll/cpl/desk/lang/ja-JP.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "分間", IDC_MINTEXT, 80, 125, 20, 9
-    CONTROL "復帰時にパスワードを確認する(&P)", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 109, 120, 125, 19
+    AUTOCHECKBOX "復帰時にパスワードを確認する(&P)", IDC_SCREENS_USEPASSCHK, 109, 120,
125, 19
     GROUPBOX "モニタの省電力機能", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "モニタの電源設定を変更するには、[電源] を クリックしてください。", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "電源(&O)...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "効果"
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "次のアニメーション効果をメニューとツール チップに使用する(&U):",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "次のアニメーション効果をメニューとツール チップに使用する(&U):",
IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "次の方法でスクリーン フォントの縁を滑らかにする(&S):", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "次の方法でスクリーン フォントの縁を滑らかにする(&S):",
IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "大きいアイコンを使用する(&E)", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "メニューの下に影を表示する(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "ドラッグ中にウィンドウの内容を表示する(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "Alt キーを押すまでキーボード ナビゲーションの下線を隠しておく(&H)",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "フラットなメニューを使う(&F)", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "大きいアイコンを使用する(&E)", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80,
267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "メニューの下に影を表示する(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW, 10,
95, 267, 19
+    AUTOCHECKBOX "ドラッグ中にウィンドウの内容を表示する(&W)",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "Alt キーを押すまでキーボード ナビゲーションの下線を隠しておく(&H)",
IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "フラットなメニューを使う(&F)", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "キャンセル", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "全般設定"
 FONT 9, "MS UI Gothic"
 BEGIN
     GROUPBOX "デスクトップのアイコン", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "マイ ドキュメント(&D)", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "マイ ネットワーク(&N)", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "マイ コンピュータ(&M)", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "インターネット ブラウザ(&I)", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "マイ ドキュメント(&D)", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "マイ ネットワーク(&N)", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "マイ コンピュータ(&M)", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "インターネット ブラウザ(&I)", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/nl-NL.rc b/dll/cpl/desk/lang/nl-NL.rc
index 22339d74228..bd1c9407f63 100644
--- a/dll/cpl/desk/lang/nl-NL.rc
+++ b/dll/cpl/desk/lang/nl-NL.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 58, 123, 12, 13
     LTEXT "minuten", IDC_MINTEXT, 72, 125, 26, 9
-    CONTROL "Ask for &password on resume", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Ask for &password on resume", IDC_SCREENS_USEPASSCHK,
108, 120, 117, 19
     GROUPBOX "Energie van het beeldscherm", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Om de energie instellingen van uw monitor in te stellen, klik op
Energie.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "&Energie...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Effecten"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "De volgende overgangseffecten voor men&u's en knopinfo
gebruiken:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "De volgende overgangseffecten voor men&u's en knopinfo
gebruiken:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Randen van letter&s vloeiend op het scherm weergeven, en wel als
volgt:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "Randen van letter&s vloeiend op het scherm weergeven, en wel
als volgt:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "&Grote pictogrammen gebruiken", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Sch&aduw onder menu's weergeven",
IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "De in&houd van het venster tijdens het slepen weergeven",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "Onderstreepte letters voor toetsenbordnavigatie &verbergen tot ALT
wordt ingedrukt",//FIXME: text cutoff. I used "&Verberg onderstreepte
letters voor navigatie totdat ALT wordt ingedrukt" for the backport
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "&Grote pictogrammen gebruiken",
IDC_EFFAPPEARANCE_LARGEICONS, 10, 80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Sch&aduw onder menu's weergeven",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "De in&houd van het venster tijdens het slepen weergeven",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "Onderstreepte letters voor toetsenbordnavigatie &verbergen tot
ALT wordt ingedrukt", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19//FIXME: text
cutoff. I used "&Verberg onderstreepte letters voor navigatie totdat ALT wordt
ingedrukt" for the backport
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Annuleren", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/no-NO.rc b/dll/cpl/desk/lang/no-NO.rc
index 4cef7a894c7..6529683406b 100644
--- a/dll/cpl/desk/lang/no-NO.rc
+++ b/dll/cpl/desk/lang/no-NO.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "minutter", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "Krev &passord ved gjenopptakelse", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Krev &passord ved gjenopptakelse",
IDC_SCREENS_USEPASSCHK, 108, 120, 117, 19
     GROUPBOX "Strømsparing funksjon", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "For å tilpasse strøminnstillingene for din skjerm, klikk på strøm
innstillingene.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "S&trøm...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Effekter"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Bruk følgende overgang effekter for menyer og verktøytips:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Bruk følgende overgang effekter for menyer og
verktøytips:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "B&ruk følgende metode for kantutjevning av skjerm skifter:",
IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "B&ruk følgende metode for kantutjevning av skjerm
skifter:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Br&uk store ikoner", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Vis sk&ygger under menyer", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Vis &vindu innholdet ved flytting",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Skjul visning av understrekning for tastatur hurtigtast til jeg
trykker på Alt tasten",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Br&uk store ikoner", IDC_EFFAPPEARANCE_LARGEICONS, 10,
80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Vis sk&ygger under menyer",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "Vis &vindu innholdet ved flytting",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Skjul visning av understrekning for tastatur hurtigtast til
jeg trykker på Alt tasten", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Avbryt", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc
index d1585bd9729..ce7b2e9f39d 100644
--- a/dll/cpl/desk/lang/pl-PL.rc
+++ b/dll/cpl/desk/lang/pl-PL.rc
@@ -55,8 +55,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 58, 123, 12, 13
     LTEXT "minut", IDC_MINTEXT, 72, 125, 26, 9
-    CONTROL "Po wznowieniu chroń &hasłem", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Po wznowieniu chroń &hasłem", IDC_SCREENS_USEPASSCHK,
108, 120, 117, 19
     GROUPBOX "Zasilanie monitora", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Kliknij przycisk Zasilanie, aby dopasować ustawienia zasilania dla
monitora i oszczędzanie energii.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "Z&asilanie...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -119,24 +118,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Efekty"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Użyj następującego efektu przejścia dla menu i etykiet
narzędzi:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Użyj następującego efektu przejścia dla menu i etykiet
narzędzi:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Użyj n&astępującej metody wygładzania krawędzi czcionek
ekranowych:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "Użyj n&astępującej metody wygładzania krawędzi czcionek
ekranowych:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Użyj &dużych ikon", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "&Pokaż cienie pod menu", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Pokaż &zawartość okna podczas przeciągania",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "Ukryj podkreślenie liter do nawigacji &klawiaturą, dopóki nie
nacisnę klawisza Alt",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Użyj płaskich &menu", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Użyj &dużych ikon", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80,
267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "&Pokaż cienie pod menu", IDC_EFFAPPEARANCE_SETDROPSHADOW,
10, 95, 267, 19
+    AUTOCHECKBOX "Pokaż &zawartość okna podczas przeciągania",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "Ukryj podkreślenie liter do nawigacji &klawiaturą, dopóki nie
nacisnę klawisza Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Użyj płaskich &menu", IDC_EFFAPPEARANCE_FLATMENUS, 10,
140, 267, 19
     PUSHBUTTON "Anuluj", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -169,14 +161,10 @@ CAPTION "Ogólne"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Ikony pulpitu", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "Moje &dokumenty", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "Moje &miejsca sieciowe", IDC_ICONS_MYNET,
"button",//FIXME: accel collision &M
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "Mój &komputer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Przeglądarka internetowa", IDC_ICONS_INTERNET,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "Moje &dokumenty", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "Moje &miejsca sieciowe", IDC_ICONS_MYNET, 116, 14, 100,
12//FIXME: accel collision &M
+    AUTOCHECKBOX "Mój &komputer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Przeglądarka internetowa", IDC_ICONS_INTERNET, 116, 28,
100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-BR.rc
index 4cc950f6784..49c739e417e 100644
--- a/dll/cpl/desk/lang/pt-BR.rc
+++ b/dll/cpl/desk/lang/pt-BR.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "minutos", IDC_MINTEXT, 80, 125, 26, 9
-    CONTROL "Ao continuar, &proteger com senha", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 122, 19
+    AUTOCHECKBOX "Ao continuar, &proteger com senha",
IDC_SCREENS_USEPASSCHK, 108, 120, 122, 19
     GROUPBOX "Energia do monitor", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Para ajustar a energia do monitor e poupar energia, clique em
'Energia'.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "&Energia...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Efeitos"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Usar este efeito de transição para menus e dicas de
ferramenta:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Usar este efeito de transição para menus e dicas de
ferramenta:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "U&sar este método para suavizar as bordas das fontes de
tela:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "U&sar este método para suavizar as bordas das fontes de
tela:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Usar íco&nes grandes", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Mostr&ar sombras sob menus", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "&Mostrar conteúdo da janela ao arrastar",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Ocultar sublinhados para navegação do teclado até eu pressionar a
tecla Alt",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Usar íco&nes grandes", IDC_EFFAPPEARANCE_LARGEICONS, 10,
80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Mostr&ar sombras sob menus",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "&Mostrar conteúdo da janela ao arrastar",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Ocultar sublinhados para navegação do teclado até eu
pressionar a tecla Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Cancelar", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/pt-PT.rc b/dll/cpl/desk/lang/pt-PT.rc
index 53e7e99ceb0..7e452f54c23 100644
--- a/dll/cpl/desk/lang/pt-PT.rc
+++ b/dll/cpl/desk/lang/pt-PT.rc
@@ -51,8 +51,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "min", IDC_MINTEXT, 79, 125, 13, 9
-    CONTROL "Ao &reiniciar, proteger por palavra-passe",
IDC_SCREENS_USEPASSCHK, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 93, 120, 139, 19
+    AUTOCHECKBOX "Ao &reiniciar, proteger por palavra-passe",
IDC_SCREENS_USEPASSCHK, 93, 120, 139, 19
     GROUPBOX "Energia do monitor", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Para ajustar as definições de energia do monitor e poupar energia, clique
em 'Energia'.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "&Energia...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -115,24 +114,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Efeitos"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Utilizar o seguinte efeito de transição para menus e descrições de
ferramentas:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Utilizar o seguinte efeito de transição para menus e
descrições de ferramentas:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Utili&zar o seguinte método para suavizar as arestas dos tipos de
letra do ecrã:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "Utili&zar o seguinte método para suavizar as arestas dos tipos
de letra do ecrã:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Utilizar íco&nes grandes", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Mostr&ar sombras sob os menus",
IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "&Mostrar o conteúdo das janelas ao arrastar",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Ocultar letras sublinhadas para navegação por teclado até que a
tecla Alt seja premida",//FIXME: text cutoff. I used "&Ocultar letras
sublinhadas para navegação pelo teclado até que Alt seja premida" AND A WIDTH OF 270
for the backport
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Utilizar menus &planos", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Utilizar íco&nes grandes", IDC_EFFAPPEARANCE_LARGEICONS,
10, 80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Mostr&ar sombras sob os menus",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "&Mostrar o conteúdo das janelas ao arrastar",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Ocultar letras sublinhadas para navegação por teclado até que
a tecla Alt seja premida", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19//FIXME:
text cutoff. I used "&Ocultar letras sublinhadas para navegação pelo teclado até
que Alt seja premida" AND A WIDTH OF 270 for the backport
+    AUTOCHECKBOX "Utilizar menus &planos", IDC_EFFAPPEARANCE_FLATMENUS, 10,
140, 267, 19
     PUSHBUTTON "Cancelar", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -165,14 +157,10 @@ CAPTION "Geral"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Ícones da área de trabalho", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "Os Meus &Documentos", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "Os Meus Locais na &Rede", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "O Meu &Computador", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Navegador de Internet", IDC_ICONS_INTERNET,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "Os Meus &Documentos", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "Os Meus Locais na &Rede", IDC_ICONS_MYNET, 116, 14, 100,
12
+    AUTOCHECKBOX "O Meu &Computador", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Navegador de Internet", IDC_ICONS_INTERNET, 116, 28,
100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc
index 2dcffbb2f15..71b08e30270 100644
--- a/dll/cpl/desk/lang/ro-RO.rc
+++ b/dll/cpl/desk/lang/ro-RO.rc
@@ -53,8 +53,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 88, 123, 12, 13
     LTEXT "minute", IDC_MINTEXT, 102, 125, 23, 9
-    CONTROL "Solicită pa&rolă la revenire", IDC_SCREENS_USEPASSCHK,
"button",//FIXME: accelerator collision &R
-            BS_AUTOCHECKBOX | WS_TABSTOP, 129, 120, 96, 19
+    AUTOCHECKBOX "Solicită pa&rolă la revenire", IDC_SCREENS_USEPASSCHK,
129, 120, 96, 19//FIXME: accelerator collision &R
     GROUPBOX "Mecanisme de gestiune a consumului", IDC_SCREENS_DUMMY2, 8, 150,
230, 41
     LTEXT "Pentru a ajusta setările de alimentare ale monitorului dvs., apăsaţi pe
Setări de alimentare.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "Ali&mentare…", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -117,24 +116,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Efecte vizuale"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Aplică &efect de tranziţie pentru meniuri şi ponturi:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "Aplică &efect de tranziţie pentru meniuri şi ponturi:",
IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "&Rotunjeşte marginile de text folosind metoda:",
IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "&Rotunjeşte marginile de text folosind metoda:",
IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "&Pictograme mari", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Afişează &umbre sub meniuri", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Afişează ferestrele şi în timpul &mişcării lor",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Amână sublinierea literelor navigării din tastatură până la
apăsarea tastei «Alt»",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "F&oloseşte meniuri plate", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "&Pictograme mari", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80,
267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Afişează &umbre sub meniuri",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "Afişează ferestrele şi în timpul &mişcării lor",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Amână sublinierea literelor navigării din tastatură până la
apăsarea tastei «Alt»", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "F&oloseşte meniuri plate", IDC_EFFAPPEARANCE_FLATMENUS,
10, 140, 267, 19
     PUSHBUTTON "Anulare", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -167,14 +159,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Pictograme de desktop", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "&Documente", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "Locurile din &reţeaua mea", IDC_ICONS_MYNET,
"button",//FIXME: accelerator collision &R
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&Computerul meu", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Navigatorul de Internet", IDC_ICONS_INTERNET,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "&Documente", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "Locurile din &reţeaua mea", IDC_ICONS_MYNET, 116, 14,
100, 12//FIXME: accelerator collision &R
+    AUTOCHECKBOX "&Computerul meu", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Navigatorul de Internet", IDC_ICONS_INTERNET, 116, 28,
100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 251, 54
diff --git a/dll/cpl/desk/lang/ru-RU.rc b/dll/cpl/desk/lang/ru-RU.rc
index 6c734131ef0..537dc346363 100644
--- a/dll/cpl/desk/lang/ru-RU.rc
+++ b/dll/cpl/desk/lang/ru-RU.rc
@@ -44,8 +44,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 70, 123, 12, 13
     LTEXT "мин.", IDC_MINTEXT, 84, 125, 18, 9
-    CONTROL "На&чинать с экрана приветствия", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 106, 120, 121, 19
+    AUTOCHECKBOX "На&чинать с экрана приветствия", IDC_SCREENS_USEPASSCHK,
106, 120, 121, 19
     GROUPBOX "Энергосбережение", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Для изменения параметров питания монитора нажмите кнопку
""Питание"".", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "П&итание...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -108,24 +107,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Эффекты"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Применять следующий переходный эффект для меню и подсказок:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Применять следующий переходный эффект для меню и
подсказок:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Пр&именять следующий метод сглаживания для экранных шрифтов:",
IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "Пр&именять следующий метод сглаживания для экранных
шрифтов:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Применять &крупные значки", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Отображать &тени, отбрасываемые меню",
IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "&Отображать содержимое окна при перетаскивании",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "Скр&ывать указатели вызова с клавиатуры до нажатия
<Alt>",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Использовать п&лоские меню", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Применять &крупные значки", IDC_EFFAPPEARANCE_LARGEICONS,
10, 80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Отображать &тени, отбрасываемые меню",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "&Отображать содержимое окна при перетаскивании",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "Скр&ывать указатели вызова с клавиатуры до нажатия
<Alt>", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Использовать п&лоские меню", IDC_EFFAPPEARANCE_FLATMENUS,
10, 140, 267, 19
     PUSHBUTTON "Отмена", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -158,14 +150,10 @@ CAPTION "Общие"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Значки рабочего стола", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "Мои &документы", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "&Сетевое окружение", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "Мой &компьютер", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Интернет браузер", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "Мои &документы", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "&Сетевое окружение", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "Мой &компьютер", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Интернет браузер", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/sk-SK.rc b/dll/cpl/desk/lang/sk-SK.rc
index 92c70db5abe..47df14dedbb 100644
--- a/dll/cpl/desk/lang/sk-SK.rc
+++ b/dll/cpl/desk/lang/sk-SK.rc
@@ -46,8 +46,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 58, 123, 12, 13
     LTEXT "minút", IDC_MINTEXT, 72, 125, 26, 9
-    CONTROL "Pri obnovení chrániť &heslom", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Pri obnovení chrániť &heslom", IDC_SCREENS_USEPASSCHK,
108, 120, 117, 19
     GROUPBOX "Napájanie monitora", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Ak chcete upraviť nastavenie napájania monitora a ušetriť energiu,
kliknite na tlačidlo Napájanie.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "N&apájanie...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -110,24 +109,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Efekty"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Používať nasledovný efekt prechodu pre ponuky a názvy
tlačidiel:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Používať nasledovný efekt prechodu pre ponuky a názvy
tlačidiel:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Po&užívať nasledovnú metódu vyhladenia okrajov zobrazeného
písma:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "Po&užívať nasledovnú metódu vyhladenia okrajov zobrazeného
písma:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Používať &veľké ikony", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "&Zobrazovať tiene pod ponukami",
IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Zobrazovať &obsah okna počas presúvania",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Skrývať podčiarknuté písmená (klávesové skratky) až do stlačenia
klávesu Alt",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Používať &veľké ikony", IDC_EFFAPPEARANCE_LARGEICONS, 10,
80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "&Zobrazovať tiene pod ponukami",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "Zobrazovať &obsah okna počas presúvania",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Skrývať podčiarknuté písmená (klávesové skratky) až do
stlačenia klávesu Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Zrušiť", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -160,14 +152,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/sq-AL.rc b/dll/cpl/desk/lang/sq-AL.rc
index 903ef08a758..a543b246278 100644
--- a/dll/cpl/desk/lang/sq-AL.rc
+++ b/dll/cpl/desk/lang/sq-AL.rc
@@ -47,8 +47,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "minuta", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "Pyet për fjalëkalim kur të rinisë", IDC_SCREENS_USEPASSCHK,
"button",//FIXME: add accel. I used "Pyet pë&r fjalëkalim kur të
rinisë" for the backport
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Pyet për fjalëkalim kur të rinisë", IDC_SCREENS_USEPASSCHK,
108, 120, 117, 19//FIXME: add accel. I used "Pyet pë&r fjalëkalim kur të
rinisë" for the backport
     GROUPBOX "Karakteristika Ruajtja e Energjisë të monitoruar",
IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Për të rregulluar parametrat Energjise të monitoruar tuaj, klikoni mbi
cilësime energjisë.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "&Energji...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -111,24 +110,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Efekte"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Përdorni efektin e mëposhtme tranzicionit për menutë dhe
ndihmesa:",//FIXME: accelerator collision &P
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Përdorni efektin e mëposhtme tranzicionit për menutë dhe
ndihmesa:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19//FIXME: accelerator collision
&P
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Përdor metodën e mëposhtme për të zbutë skajet e fonts ekran:",
IDC_EFFAPPEARANCE_SMOOTHING,//FIXME: add accel. I used "Pë&rdor metodën e
mëposhtme për të zbutë skajet e fonts ekran" for the backport. Remember: &P is in
use already.
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "Përdor metodën e mëposhtme për të zbutë skajet e fonts
ekran:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19//FIXME: add accel. I used
"Pë&rdor metodën e mëposhtme për të zbutë skajet e fonts ekran" for the
backport. Remember: &P is in use already.
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Përdor ikona të mëdha", IDC_EFFAPPEARANCE_LARGEICONS,
"button",//FIXME: add accel. I used "Për&dor ikona të mëdha" for
the backport. Keep in mind that &P is in use
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Shfaq hije poshte menus", IDC_EFFAPPEARANCE_SETDROPSHADOW,//FIXME:
add accel. I used "&Shfaq hije poshte menus" for the backport
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Shfaq &përmbajtjen dritare ndërsa zvarritet",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,//FIXME: accelerator collision &P. I used
"S&hfaq përmbajtjen dritare ndërsa zvarritet" for the backport
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "Fsheh gërma të nënvizuara për kërkimin e tastierës deri sa të shtypni
butonin Alt",//FIXME: add accel. I used "Fsh&eh gërma të nënvizuara për
kërkimin e tastierës deri sa të shtypni Alt" as shortener for the backport. Keep in
mind that &f is currently used by the &flat menus. And keep in mind that the text
is currently too long and therefore cut off.
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Përdor ikona të mëdha", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80,
267, 19, WS_TABSTOP | WS_DISABLED//FIXME: add accel. I used "Për&dor ikona të
mëdha" for the backport. Keep in mind that &P is in use
+    AUTOCHECKBOX "Shfaq hije poshte menus", IDC_EFFAPPEARANCE_SETDROPSHADOW,
10, 95, 267, 19//FIXME: add accel. I used "&Shfaq hije poshte menus" for the
backport
+    AUTOCHECKBOX "Shfaq &përmbajtjen dritare ndërsa zvarritet",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19//FIXME: accelerator collision &P.
I used "S&hfaq përmbajtjen dritare ndërsa zvarritet" for the backport
+    AUTOCHECKBOX "Fsheh gërma të nënvizuara për kërkimin e tastierës deri sa të
shtypni butonin Alt", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19//FIXME: add
accel. I used "Fsh&eh gërma të nënvizuara për kërkimin e tastierës deri sa të
shtypni Alt" as shortener for the backport. Keep in mind that &f is currently
used by the &flat menus. And keep in mind that the text is currently too long and
therefore cut off.
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Anulo", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -161,14 +153,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/sv-SE.rc b/dll/cpl/desk/lang/sv-SE.rc
index 7c20975668c..3aace5bef5d 100644
--- a/dll/cpl/desk/lang/sv-SE.rc
+++ b/dll/cpl/desk/lang/sv-SE.rc
@@ -46,8 +46,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "Ask for &password on resume", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "Ask for &password on resume", IDC_SCREENS_USEPASSCHK,
108, 120, 117, 19
     GROUPBOX "Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 8, 150,
230, 41
     LTEXT "To adjust the power settings for your monitor, click on Power
Settings.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -110,24 +109,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Effects"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Use the following transition effect for menus and tooltips:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Use the following transition effect for menus and
tooltips:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "U&se the following method to smooth edges of screen fonts:",
IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "U&se the following method to smooth edges of screen
fonts:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Show &window contents while dragging",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Hide underlined letters for keyboard navigation until I press the
Alt key",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80,
267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Show sh&adows under menus",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "Show &window contents while dragging",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Hide underlined letters for keyboard navigation until I press
the Alt key", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -160,14 +152,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/tr-TR.rc b/dll/cpl/desk/lang/tr-TR.rc
index a8007f77693..f8c81d9b726 100644
--- a/dll/cpl/desk/lang/tr-TR.rc
+++ b/dll/cpl/desk/lang/tr-TR.rc
@@ -46,8 +46,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 62, 123, 12, 13
     LTEXT "dakika", IDC_MINTEXT, 76, 125, 26, 9
-    CONTROL "&Çıkışta Parola Sor", IDC_SCREENS_USEPASSCHK,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "&Çıkışta Parola Sor", IDC_SCREENS_USEPASSCHK, 108, 120,
117, 19
     GROUPBOX "Monitörün Güç Tasarrufu Özellikleri", IDC_SCREENS_DUMMY2, 8, 150,
230, 41
     LTEXT "Monitörünüzün güç ayarlarını düzenlemek için ""Güç
Ayarları""na tıklayınız.", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "G&üç...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -110,24 +109,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Etkiler"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Araç ipuçları ve menüler için aşağıdaki geçiş etkisini
kullan:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Araç ipuçları ve menüler için aşağıdaki geçiş etkisini
kullan:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "&Ekran yazı tiplerinin kenarlarını yumuşatmak için aşağıdaki
yöntemi kullan:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "&Ekran yazı tiplerinin kenarlarını yumuşatmak için aşağıdaki
yöntemi kullan:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "&Büyük simgeler kullan", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "&Menüler altında gölge göster",
IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "&Sürüklerken pencere içeriğini göster",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "A< düğmesine basana kadar klavyeyle gezinme için altı çizili
harfleri gizle",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "&Düz menüler kullan", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "&Büyük simgeler kullan", IDC_EFFAPPEARANCE_LARGEICONS,
10, 80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "&Menüler altında gölge göster",
IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95, 267, 19
+    AUTOCHECKBOX "&Sürüklerken pencere içeriğini göster",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "A< düğmesine basana kadar klavyeyle gezinme için altı çizili
harfleri gizle", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "&Düz menüler kullan", IDC_EFFAPPEARANCE_FLATMENUS, 10,
140, 267, 19
     PUSHBUTTON "İptal", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "Tamam", IDOK, 172, 165, 50, 14
 END
@@ -160,14 +152,10 @@ CAPTION "Genel"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Masaüstü simgeleri", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "&Belgelerim", IDC_ICONS_MYDOCS, "button",//FIXME:
accelerator collision &B
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "&Ağ Konumlarım", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&Bu bilgisayar", IDC_ICONS_MYCOMP, "button",//FIXME:
accelerator collision &B
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&İnternet tarayıcısı", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "&Belgelerim", IDC_ICONS_MYDOCS, 14, 14, 100, 12//FIXME:
accelerator collision &B
+    AUTOCHECKBOX "&Ağ Konumlarım", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&Bu bilgisayar", IDC_ICONS_MYCOMP, 14, 28, 100,
12//FIXME: accelerator collision &B
+    AUTOCHECKBOX "&İnternet tarayıcısı", IDC_ICONS_INTERNET, 116, 28, 100,
12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/uk-UA.rc b/dll/cpl/desk/lang/uk-UA.rc
index 307063659f9..f7336e4e016 100644
--- a/dll/cpl/desk/lang/uk-UA.rc
+++ b/dll/cpl/desk/lang/uk-UA.rc
@@ -51,8 +51,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 68, 123, 12, 13
     LTEXT "хв", IDC_MINTEXT, 82, 125, 16, 9
-    CONTROL "За&хист паролем", IDC_SCREENS_USEPASSCHK,"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "За&хист паролем", IDC_SCREENS_USEPASSCHK, 108, 120, 117,
19
     GROUPBOX "Енергозбереження", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "Щоб змінити параметри живлення монітора, натисніть кнопку
""Живлення"".", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "&Живлення...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -115,24 +114,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Ефекти"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "&Застосовувати наступний перехідний ефект для меню та
підказок:",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "&Застосовувати наступний перехідний ефект для меню та
підказок:", IDC_EFFAPPEARANCE_ANIMATION, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "З&астосовувати наступний метод згладжування для екранних
шрифтів:", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "З&астосовувати наступний метод згладжування для екранних
шрифтів:", IDC_EFFAPPEARANCE_SMOOTHING, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "Застосовувати &великі значки", IDC_EFFAPPEARANCE_LARGEICONS,
"button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "Відображати тіні від меню",
IDC_EFFAPPEARANCE_SETDROPSHADOW,//FIXME: add accel. I used "Ві&дображати тіні від
меню" for the backport
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "Показати &вміст вікна під час перетягування",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "&Приховувати покажчики виклику з клавіатури до натиснення
<Alt>",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "Застосовувати &великі значки",
IDC_EFFAPPEARANCE_LARGEICONS, 10, 80, 267, 19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "Відображати тіні від меню", IDC_EFFAPPEARANCE_SETDROPSHADOW,
10, 95, 267, 19//FIXME: add accel. I used "Ві&дображати тіні від меню" for
the backport
+    AUTOCHECKBOX "Показати &вміст вікна під час перетягування",
IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10, 110, 267, 19
+    AUTOCHECKBOX "&Приховувати покажчики виклику з клавіатури до натиснення
<Alt>", IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140,
267, 19
     PUSHBUTTON "Скасувати", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
 END
@@ -165,14 +157,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc
index af930cea8e9..933aa9f0616 100644
--- a/dll/cpl/desk/lang/zh-CN.rc
+++ b/dll/cpl/desk/lang/zh-CN.rc
@@ -54,8 +54,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "分钟", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "密码保护(&P)", IDC_SCREENS_USEPASSCHK, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "密码保护(&P)", IDC_SCREENS_USEPASSCHK, 108, 120, 117, 19
     GROUPBOX "监视器的节能特征", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "要修改监视器的电源设置,请单击“电源”。", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "电源(&O)...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -118,24 +117,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "效果"
 FONT 9, "宋体"
 BEGIN
-    CONTROL "对菜单和工具提示使用以下过渡效果(&U):",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "对菜单和工具提示使用以下过渡效果(&U):", IDC_EFFAPPEARANCE_ANIMATION, 10,
5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "使用以下方法平滑屏幕字体的边缘(&S):", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "使用以下方法平滑屏幕字体的边缘(&S):", IDC_EFFAPPEARANCE_SMOOTHING, 10,
42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "使用大图标(&E)", IDC_EFFAPPEARANCE_LARGEICONS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "在菜单下显示阴影(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "拖动时显示窗口的内容(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "直到我按 Alt 键之前,请隐藏有下划线的字母供键盘使用(&H)",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "使用平面菜单(&F)", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "使用大图标(&E)", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80, 267,
19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "在菜单下显示阴影(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95,
267, 19
+    AUTOCHECKBOX "拖动时显示窗口的内容(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10,
110, 267, 19
+    AUTOCHECKBOX "直到我按 Alt 键之前,请隐藏有下划线的字母供键盘使用(&H)",
IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "使用平面菜单(&F)", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140, 267,
19
     PUSHBUTTON "取消", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "确定", IDOK, 172, 165, 50, 14
 END
@@ -168,14 +160,10 @@ CAPTION "常规"
 FONT 9, "宋体"
 BEGIN
     GROUPBOX "桌面图标", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "我的文档(&D)", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "网上邻居(&N)", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "我的电脑(&M)", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "Internet浏览器(&I)", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "我的文档(&D)", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "网上邻居(&N)", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "我的电脑(&M)", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "Internet浏览器(&I)", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/zh-HK.rc b/dll/cpl/desk/lang/zh-HK.rc
index 60e35106161..07d4101d455 100644
--- a/dll/cpl/desk/lang/zh-HK.rc
+++ b/dll/cpl/desk/lang/zh-HK.rc
@@ -52,8 +52,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "分鐘", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "以密碼保護(&P)", IDC_SCREENS_USEPASSCHK, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "以密碼保護(&P)", IDC_SCREENS_USEPASSCHK, 108, 120, 117, 19
     GROUPBOX "顯示器電源", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "要修改顯示器的電源設定,請按[電源]。", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "電源(&O)...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -116,24 +115,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "效果"
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "為選單和工具提示使用以下過渡效果(&U):",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "為選單和工具提示使用以下過渡效果(&U):", IDC_EFFAPPEARANCE_ANIMATION, 10,
5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "使用下列方式使螢幕字型的邊緣平滑(&S):", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "使用下列方式使螢幕字型的邊緣平滑(&S):", IDC_EFFAPPEARANCE_SMOOTHING, 10,
42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "使用大圖示(&E)", IDC_EFFAPPEARANCE_LARGEICONS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "在選單下顯示陰影(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "拖動時顯示視窗內容(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "直到我按 ALT 鍵之前,請隱藏有下劃線的字母供鍵盤使用(&H)",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "使用扁平化選單(&F)", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "使用大圖示(&E)", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80, 267,
19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "在選單下顯示陰影(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95,
267, 19
+    AUTOCHECKBOX "拖動時顯示視窗內容(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10,
110, 267, 19
+    AUTOCHECKBOX "直到我按 ALT 鍵之前,請隱藏有下劃線的字母供鍵盤使用(&H)",
IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "使用扁平化選單(&F)", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140, 267,
19
     PUSHBUTTON "取消", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "確定", IDOK, 172, 165, 50, 14
 END
@@ -166,14 +158,10 @@ CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56
diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc
index 58b435dee37..f3b8a67fbc2 100644
--- a/dll/cpl/desk/lang/zh-TW.rc
+++ b/dll/cpl/desk/lang/zh-TW.rc
@@ -53,8 +53,7 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT |
UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13
     LTEXT "分鐘", IDC_MINTEXT, 70, 125, 26, 9
-    CONTROL "以密碼保護(&P)", IDC_SCREENS_USEPASSCHK, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19
+    AUTOCHECKBOX "以密碼保護(&P)", IDC_SCREENS_USEPASSCHK, 108, 120, 117, 19
     GROUPBOX "顯示器電源", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "要修改顯示器的電源設定,請按[電源]。", IDC_STATIC, 16, 161, 146, 27
     PUSHBUTTON "電源(&O)...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
@@ -117,24 +116,17 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "效果"
 FONT 9, "新細明體"
 BEGIN
-    CONTROL "為選單和工具提示使用以下過渡效果(&U):",
-            IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 5, 267, 19
+    AUTOCHECKBOX "為選單和工具提示使用以下過渡效果(&U):", IDC_EFFAPPEARANCE_ANIMATION, 10,
5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "使用下列方式使螢幕字型的邊緣平滑(&S):", IDC_EFFAPPEARANCE_SMOOTHING,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
+    AUTOCHECKBOX "使用下列方式使螢幕字型的邊緣平滑(&S):", IDC_EFFAPPEARANCE_SMOOTHING, 10,
42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL "使用大圖示(&E)", IDC_EFFAPPEARANCE_LARGEICONS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19
-    CONTROL "在選單下顯示陰影(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
-    CONTROL "拖動時顯示視窗內容(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "直到我按 ALT 鍵之前,請隱藏有下劃線的字母供鍵盤使用(&H)",
-            IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX |
WS_TABSTOP, 10, 125, 267, 19
-    CONTROL "使用扁平化選單(&F)", IDC_EFFAPPEARANCE_FLATMENUS,
-            "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
+    AUTOCHECKBOX "使用大圖示(&E)", IDC_EFFAPPEARANCE_LARGEICONS, 10, 80, 267,
19, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX "在選單下顯示陰影(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW, 10, 95,
267, 19
+    AUTOCHECKBOX "拖動時顯示視窗內容(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, 10,
110, 267, 19
+    AUTOCHECKBOX "直到我按 ALT 鍵之前,請隱藏有下劃線的字母供鍵盤使用(&H)",
IDC_EFFAPPEARANCE_KEYBOARDCUES, 10, 125, 267, 19
+    AUTOCHECKBOX "使用扁平化選單(&F)", IDC_EFFAPPEARANCE_FLATMENUS, 10, 140, 267,
19
     PUSHBUTTON "取消", IDCANCEL, 226, 165, 50, 14
     DEFPUSHBUTTON "確定", IDOK, 172, 165, 50, 14
 END
@@ -167,14 +159,10 @@ CAPTION "General"
 FONT 9, "新細明體"
 BEGIN
     GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40
-    CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12
-    CONTROL "My &Network Places", IDC_ICONS_MYNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12
-    CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12
-    CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button",
-            BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12
+    AUTOCHECKBOX "My &Documents", IDC_ICONS_MYDOCS, 14, 14, 100, 12
+    AUTOCHECKBOX "My &Network Places", IDC_ICONS_MYNET, 116, 14, 100, 12
+    AUTOCHECKBOX "&My Computer", IDC_ICONS_MYCOMP, 14, 28, 100, 12
+    AUTOCHECKBOX "&Internet Browser", IDC_ICONS_INTERNET, 116, 28, 100, 12
     CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32",
             LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER |
WS_TABSTOP | WS_HSCROLL,
             6, 60, 212, 56