https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1ac33a9bd730a78acb1fc59d8b42db2a713f864

commit d1ac33a9bd730a78acb1fc59d8b42db2a713f864
Author:     Katayama Hirofumi MZ <katayama.hirofumi...@gmail.com>
AuthorDate: Tue Feb 27 20:41:43 2024 +0900
Commit:     GitHub <nore...@github.com>
CommitDate: Tue Feb 27 20:41:43 2024 +0900

    [EXPLORER][SHELL32] Strengthen Start Menu Customize Part 1 (#6544)
    
    Strengthen customization of Start menu.
    JIRA issue: CORE-16956
    - Modify IDD_CLASSICSTART_CUSTOMIZE dialog.
    - Add some resource strings to shell32.dll.
    - Add some helper functions.
    - Disable Clear button if necessary.
    - Add "Display Favorites" and "Display Log Off"
      items into IDC_CLASSICSTART_SETTINGS treeview
      control.
    - Implement two items' action.
    - Recreate the start menu if WM_SETTINGCHANGE
      message received.
---
 base/shell/explorer/explorer.rc      |   1 +
 base/shell/explorer/lang/bg-BG.rc    |   2 +-
 base/shell/explorer/lang/cs-CZ.rc    |   2 +-
 base/shell/explorer/lang/de-DE.rc    |   2 +-
 base/shell/explorer/lang/en-US.rc    |   2 +-
 base/shell/explorer/lang/es-ES.rc    |   2 +-
 base/shell/explorer/lang/et-EE.rc    |   2 +-
 base/shell/explorer/lang/eu-ES.rc    |   2 +-
 base/shell/explorer/lang/fi-FI.rc    |   2 +-
 base/shell/explorer/lang/fr-FR.rc    |   2 +-
 base/shell/explorer/lang/he-IL.rc    |   2 +-
 base/shell/explorer/lang/hi-IN.rc    |   2 +-
 base/shell/explorer/lang/hu-HU.rc    |   2 +-
 base/shell/explorer/lang/id-ID.rc    |   2 +-
 base/shell/explorer/lang/it-IT.rc    |   2 +-
 base/shell/explorer/lang/ja-JP.rc    |   2 +-
 base/shell/explorer/lang/ko-KR.rc    |   2 +-
 base/shell/explorer/lang/lt-LT.rc    |   2 +-
 base/shell/explorer/lang/ms-MY.rc    |   2 +-
 base/shell/explorer/lang/nl-NL.rc    |   2 +-
 base/shell/explorer/lang/no-NO.rc    |   2 +-
 base/shell/explorer/lang/pl-PL.rc    |   2 +-
 base/shell/explorer/lang/pt-BR.rc    |   2 +-
 base/shell/explorer/lang/pt-PT.rc    |   2 +-
 base/shell/explorer/lang/ro-RO.rc    |   2 +-
 base/shell/explorer/lang/ru-RU.rc    |   2 +-
 base/shell/explorer/lang/sk-SK.rc    |   2 +-
 base/shell/explorer/lang/sq-AL.rc    |   2 +-
 base/shell/explorer/lang/tr-TR.rc    |   2 +-
 base/shell/explorer/lang/uk-UA.rc    |   2 +-
 base/shell/explorer/lang/zh-CN.rc    |   2 +-
 base/shell/explorer/lang/zh-HK.rc    |   2 +-
 base/shell/explorer/lang/zh-TW.rc    |   2 +-
 base/shell/explorer/precomp.h        |   8 +--
 base/shell/explorer/resource.h       |   6 ++
 base/shell/explorer/startmnucust.cpp | 132 ++++++++++++++++++++++++++++++-----
 base/shell/explorer/startmnusite.cpp |   8 +--
 base/shell/explorer/traywnd.cpp      |   9 +++
 base/shell/explorer/util.cpp         |  57 +++++----------
 dll/win32/shell32/lang/bg-BG.rc      |   4 ++
 dll/win32/shell32/lang/ca-ES.rc      |   4 ++
 dll/win32/shell32/lang/cs-CZ.rc      |   4 ++
 dll/win32/shell32/lang/da-DK.rc      |   4 ++
 dll/win32/shell32/lang/de-DE.rc      |   4 ++
 dll/win32/shell32/lang/el-GR.rc      |   4 ++
 dll/win32/shell32/lang/en-GB.rc      |   4 ++
 dll/win32/shell32/lang/en-US.rc      |   4 ++
 dll/win32/shell32/lang/es-ES.rc      |   4 ++
 dll/win32/shell32/lang/et-EE.rc      |   4 ++
 dll/win32/shell32/lang/eu-ES.rc      |   4 ++
 dll/win32/shell32/lang/fi-FI.rc      |   4 ++
 dll/win32/shell32/lang/fr-FR.rc      |   4 ++
 dll/win32/shell32/lang/he-IL.rc      |   4 ++
 dll/win32/shell32/lang/hi-IN.rc      |   4 ++
 dll/win32/shell32/lang/hu-HU.rc      |   4 ++
 dll/win32/shell32/lang/id-ID.rc      |   4 ++
 dll/win32/shell32/lang/it-IT.rc      |   4 ++
 dll/win32/shell32/lang/ja-JP.rc      |   4 ++
 dll/win32/shell32/lang/ko-KR.rc      |   4 ++
 dll/win32/shell32/lang/nl-NL.rc      |   4 ++
 dll/win32/shell32/lang/no-NO.rc      |   4 ++
 dll/win32/shell32/lang/pl-PL.rc      |   4 ++
 dll/win32/shell32/lang/pt-BR.rc      |   4 ++
 dll/win32/shell32/lang/pt-PT.rc      |   4 ++
 dll/win32/shell32/lang/ro-RO.rc      |   4 ++
 dll/win32/shell32/lang/ru-RU.rc      |   4 ++
 dll/win32/shell32/lang/sk-SK.rc      |   4 ++
 dll/win32/shell32/lang/sl-SI.rc      |   4 ++
 dll/win32/shell32/lang/sq-AL.rc      |   4 ++
 dll/win32/shell32/lang/sv-SE.rc      |   4 ++
 dll/win32/shell32/lang/tr-TR.rc      |   4 ++
 dll/win32/shell32/lang/uk-UA.rc      |   4 ++
 dll/win32/shell32/lang/zh-CN.rc      |   4 ++
 dll/win32/shell32/lang/zh-HK.rc      |   4 ++
 dll/win32/shell32/lang/zh-TW.rc      |   4 ++
 dll/win32/shell32/shresdef.h         |   6 ++
 76 files changed, 338 insertions(+), 97 deletions(-)

diff --git a/base/shell/explorer/explorer.rc b/base/shell/explorer/explorer.rc
index 8a3400a0fa2..c27464aebbc 100644
--- a/base/shell/explorer/explorer.rc
+++ b/base/shell/explorer/explorer.rc
@@ -1,5 +1,6 @@
 #include <windef.h>
 #include <winuser.h>
+#include <commctrl.h>
 
 #include "resource.h"
 
diff --git a/base/shell/explorer/lang/bg-BG.rc 
b/base/shell/explorer/lang/bg-BG.rc
index d05994ddb8c..65585857c28 100644
--- a/base/shell/explorer/lang/bg-BG.rc
+++ b/base/shell/explorer/lang/bg-BG.rc
@@ -144,7 +144,7 @@ BEGIN
     LTEXT            "За да премахнете записи на наскоро използвани документи, 
програми и интернет сайтове, щракнете върху Изчисти.", IDC_STATIC, 49, 85, 108, 
33
     PUSHBUTTON       "&Изчисти", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Разширени настройки на Старт менюто:", IDC_STATIC, 8, 
129, 150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "Добре", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Изход", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/cs-CZ.rc 
b/base/shell/explorer/lang/cs-CZ.rc
index f2703454ba8..8c8438e967f 100644
--- a/base/shell/explorer/lang/cs-CZ.rc
+++ b/base/shell/explorer/lang/cs-CZ.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "Kliknutím na Vyčistit odstraníte záznamy o naposledy 
použitých programech a zobrazených dokumentech a webových stránkách.", 
IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Vyčistit", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Pokročilé &možnosti nabídky Start:", IDC_STATIC, 8, 129, 
150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Storno", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/de-DE.rc 
b/base/shell/explorer/lang/de-DE.rc
index 6c582df58c2..719833d6f19 100644
--- a/base/shell/explorer/lang/de-DE.rc
+++ b/base/shell/explorer/lang/de-DE.rc
@@ -147,7 +147,7 @@ BEGIN
     LTEXT            "Löschen Sie kürzlich verwendete Dokumente, Programme und 
Webseiten.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Löschen", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Erweiterte Startmenü&optionen:", IDC_STATIC, 8, 129, 
150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Abbrechen", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/en-US.rc 
b/base/shell/explorer/lang/en-US.rc
index dcb82674148..537d46dc5df 100644
--- a/base/shell/explorer/lang/en-US.rc
+++ b/base/shell/explorer/lang/en-US.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "To remove records of recently accessed documents, 
programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 
8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Cancel", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/es-ES.rc 
b/base/shell/explorer/lang/es-ES.rc
index ce1cb64085c..60a86cb2d29 100644
--- a/base/shell/explorer/lang/es-ES.rc
+++ b/base/shell/explorer/lang/es-ES.rc
@@ -147,7 +147,7 @@ BEGIN
     LTEXT            "Para eliminar registros de documentos, programas y 
sitios web abiertos recientemente, haga click en Borrar.", IDC_STATIC, 49, 85, 
108, 33
     PUSHBUTTON       "&Borrar", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "&Opciones avanzadas del Menú Inicio:", IDC_STATIC, 8, 
129, 150, 8
-    CONTROL          "A&justes del Menú Inicio", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "A&justes del Menú Inicio", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "Aceptar", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Cancelar", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/et-EE.rc 
b/base/shell/explorer/lang/et-EE.rc
index 55547a78c38..edac53dee40 100644
--- a/base/shell/explorer/lang/et-EE.rc
+++ b/base/shell/explorer/lang/et-EE.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "Viimati avatud dokumentide, programmide ja veebisaitide 
kirjete eemaldamiseks klõpsake nuppu Tühjenda.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Tühjenda", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Menüü Start täpsemad suvandid:", IDC_STATIC, 8, 129, 
150, 8
-    CONTROL          "StartMenu&Options", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenu&Options", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Loobu", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/eu-ES.rc 
b/base/shell/explorer/lang/eu-ES.rc
index 12dc7a089fc..1edc42304f1 100644
--- a/base/shell/explorer/lang/eu-ES.rc
+++ b/base/shell/explorer/lang/eu-ES.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "Azkenaldian erabilitako dokumentu, programa eta web 
orrien erregistroak kentzeko, egin klik 'Garbitu'n.", IDC_STATIC, 49, 85, 108, 
33
     PUSHBUTTON       "&Garbitu", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "&Hasi' menuko aukera aurreratuak:", IDC_STATIC, 8, 129, 
150, 8
-    CONTROL          "Hasi-menuko &aukerak", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "Hasi-menuko &aukerak", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "Ados", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Utzi", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/fi-FI.rc 
b/base/shell/explorer/lang/fi-FI.rc
index f608afac06b..007d5a9139e 100644
--- a/base/shell/explorer/lang/fi-FI.rc
+++ b/base/shell/explorer/lang/fi-FI.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "Poistaaksesi tiedot viimeksi käytetyistä tiedostoista, 
ohjelmista, nettisivuista, klikkaa Tyhjennä.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Tyhjennä", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "K&äynnistä valikko lisäasetukset:", IDC_STATIC, 8, 129, 
150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Peruuta", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/fr-FR.rc 
b/base/shell/explorer/lang/fr-FR.rc
index 473c1aa8dfa..bc8250201c3 100644
--- a/base/shell/explorer/lang/fr-FR.rc
+++ b/base/shell/explorer/lang/fr-FR.rc
@@ -144,7 +144,7 @@ BEGIN
     LTEXT            "Pour vider la liste des documents, programmes et sites 
web récemment accédés, cliquez sur Nettoyer.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Nettoyer", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "&Options avancées du Menu démarrer :", IDC_STATIC, 8, 
129, 150, 8
-    CONTROL          "&Paramètres du Menu Démarrer", 
IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 
218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "&Paramètres du Menu Démarrer", 
IDC_CLASSICSTART_SETTINGS, "SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 
218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Annuler", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/he-IL.rc 
b/base/shell/explorer/lang/he-IL.rc
index b704b545af8..7dcdaff4449 100644
--- a/base/shell/explorer/lang/he-IL.rc
+++ b/base/shell/explorer/lang/he-IL.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "To remove records of recently accessed documents, 
programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 
8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Cancel", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/hi-IN.rc 
b/base/shell/explorer/lang/hi-IN.rc
index 0c2cfa6784b..31f36698e65 100644
--- a/base/shell/explorer/lang/hi-IN.rc
+++ b/base/shell/explorer/lang/hi-IN.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "हाल ही में एक्सेस किए गए डॉक्यमिन्ट, प्रोग्राम्स और 
वेबसाइटों के रिकॉर्ड को हटाने के लिए, साफ़ करें पर क्लिक करें।", IDC_STATIC, 
49, 85, 108, 33
     PUSHBUTTON       "&साफ़ करें ", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "उन्नत स्टार्ट मेनू विकल्प:", IDC_STATIC, 8, 129, 150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "ओके", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "रद्द करें", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/hu-HU.rc 
b/base/shell/explorer/lang/hu-HU.rc
index 0c4829ee569..4e167f3160b 100644
--- a/base/shell/explorer/lang/hu-HU.rc
+++ b/base/shell/explorer/lang/hu-HU.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "A nemrég megnyitott dokumentumok, programok és 
weboldalak listájának törléséhez kattintson a törlés gombra.", IDC_STATIC, 49, 
85, 108, 33
     PUSHBUTTON       "&Törlés", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Ha&ladó Start menü opciók:", IDC_STATIC, 8, 129, 150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Mégse", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/id-ID.rc 
b/base/shell/explorer/lang/id-ID.rc
index 7e0c29a7cd2..b63978cba29 100644
--- a/base/shell/explorer/lang/id-ID.rc
+++ b/base/shell/explorer/lang/id-ID.rc
@@ -144,7 +144,7 @@ BEGIN
     LTEXT            "Untuk menghapus jejak dokumen, program, dan situs web 
yang telah diakses, klik Bersihkan.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Bersihkan", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "&Opsi menu mulai tingkat lanjut:", IDC_STATIC, 8, 129, 
150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Batal", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/it-IT.rc 
b/base/shell/explorer/lang/it-IT.rc
index 571f4c5f6f2..4f584bc7613 100644
--- a/base/shell/explorer/lang/it-IT.rc
+++ b/base/shell/explorer/lang/it-IT.rc
@@ -144,7 +144,7 @@ BEGIN
     LTEXT            "To remove records of recently accessed documents, 
programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 
8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Cancel", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/ja-JP.rc 
b/base/shell/explorer/lang/ja-JP.rc
index 50db3892c37..33f92fd6784 100644
--- a/base/shell/explorer/lang/ja-JP.rc
+++ b/base/shell/explorer/lang/ja-JP.rc
@@ -145,7 +145,7 @@ BEGIN
     LTEXT            "最近アクセスした文書、プログラム、Webサイトの記録を消すには、[クリア] をクリックして下さい。", 
IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "クリア(&C)", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "上級者向けスタートメニューのオプション(&T):", IDC_STATIC, 8, 129, 150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "キャンセル", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/ko-KR.rc 
b/base/shell/explorer/lang/ko-KR.rc
index 93c3527f512..e8603060ba8 100644
--- a/base/shell/explorer/lang/ko-KR.rc
+++ b/base/shell/explorer/lang/ko-KR.rc
@@ -144,7 +144,7 @@ BEGIN
     LTEXT            "To remove records of recently accessed documents, 
programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "지우기(&C)", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "시작 메뉴 고급 옵션(&T):", IDC_STATIC, 8, 129, 150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "확인", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "취소", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/lt-LT.rc 
b/base/shell/explorer/lang/lt-LT.rc
index bdd783cc19e..5627b7f0267 100644
--- a/base/shell/explorer/lang/lt-LT.rc
+++ b/base/shell/explorer/lang/lt-LT.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "To remove records of recently accessed documents, 
programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 
8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Cancel", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/ms-MY.rc 
b/base/shell/explorer/lang/ms-MY.rc
index b5c046d694f..31ea4cb6d1b 100644
--- a/base/shell/explorer/lang/ms-MY.rc
+++ b/base/shell/explorer/lang/ms-MY.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "To remove records of recently accessed documents, 
programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 
8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Cancel", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/nl-NL.rc 
b/base/shell/explorer/lang/nl-NL.rc
index 11fa4d02da7..702d2ab2bf8 100644
--- a/base/shell/explorer/lang/nl-NL.rc
+++ b/base/shell/explorer/lang/nl-NL.rc
@@ -144,7 +144,7 @@ BEGIN
     LTEXT            "To remove records of recently accessed documents, 
programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 
8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Cancel", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/no-NO.rc 
b/base/shell/explorer/lang/no-NO.rc
index 3b37e8be177..351d7942af0 100644
--- a/base/shell/explorer/lang/no-NO.rc
+++ b/base/shell/explorer/lang/no-NO.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "To remove records of recently accessed documents, 
programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 
8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Cancel", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/pl-PL.rc 
b/base/shell/explorer/lang/pl-PL.rc
index 5fb0ea79d9a..6f4b1115b99 100644
--- a/base/shell/explorer/lang/pl-PL.rc
+++ b/base/shell/explorer/lang/pl-PL.rc
@@ -146,7 +146,7 @@ BEGIN
     LTEXT            "Kliknij przycisk Wyczyść, aby usunąć informacje o 
ostatnio otwieranych dokumentach, programach i witrynach sieci Web.", 
IDC_STATIC, 49, 61, 100, 33
     PUSHBUTTON       "&Wyczyść", IDC_CLASSICSTART_CLEAR, 150, 94, 70, 14
     LTEXT            "Zaawansowane opcje menu Start:", IDC_STATIC, 8, 129, 
150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Anuluj", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/pt-BR.rc 
b/base/shell/explorer/lang/pt-BR.rc
index efdb495cada..c2df38de08b 100644
--- a/base/shell/explorer/lang/pt-BR.rc
+++ b/base/shell/explorer/lang/pt-BR.rc
@@ -144,7 +144,7 @@ BEGIN
     LTEXT            "To remove records of recently accessed documents, 
programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 
8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Cancel", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/pt-PT.rc 
b/base/shell/explorer/lang/pt-PT.rc
index 35d813c7a9d..39c9868b253 100644
--- a/base/shell/explorer/lang/pt-PT.rc
+++ b/base/shell/explorer/lang/pt-PT.rc
@@ -145,7 +145,7 @@ BEGIN
     LTEXT            "Para remover os registos dos documentos, programas e Web 
sites acedidos recentemente, clique em Limpar.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Limpar", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Opções avançadas do menu &Iniciar:", IDC_STATIC, 8, 129, 
150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Cancelar", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/ro-RO.rc 
b/base/shell/explorer/lang/ro-RO.rc
index 9c52fb68ca5..5369f1f0a02 100644
--- a/base/shell/explorer/lang/ro-RO.rc
+++ b/base/shell/explorer/lang/ro-RO.rc
@@ -144,7 +144,7 @@ BEGIN
     LTEXT            "Pentru a elimina înregistrări ale documentelor, 
programelor, și siturilor Web recent accesate, apăsați Curăță.", IDC_STATIC, 
49, 85, 108, 33
     PUSHBUTTON       "&Curăță", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Opțiuni avansate ale meniului Pornire:", IDC_STATIC, 8, 
129, 150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "Con&firmă", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "A&nulează", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/ru-RU.rc 
b/base/shell/explorer/lang/ru-RU.rc
index 1dd2a57fe91..d86f3477ef5 100644
--- a/base/shell/explorer/lang/ru-RU.rc
+++ b/base/shell/explorer/lang/ru-RU.rc
@@ -147,7 +147,7 @@ BEGIN
     LTEXT            "Для удаления записей о недавних документах, программах и 
сайтах нажмите ""Очистить"".", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "О&чистить", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "До&полнительные параметры меню ""Пуск"":", IDC_STATIC, 
8, 129, 150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Отмена", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/sk-SK.rc 
b/base/shell/explorer/lang/sk-SK.rc
index a87dd997c0d..7f42ea11589 100644
--- a/base/shell/explorer/lang/sk-SK.rc
+++ b/base/shell/explorer/lang/sk-SK.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "To remove records of recently accessed documents, 
programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 
8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Cancel", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/sq-AL.rc 
b/base/shell/explorer/lang/sq-AL.rc
index f29e0d76988..97634842e87 100644
--- a/base/shell/explorer/lang/sq-AL.rc
+++ b/base/shell/explorer/lang/sq-AL.rc
@@ -143,7 +143,7 @@ BEGIN
     LTEXT            "To remove records of recently accessed documents, 
programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 
8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Cancel", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/tr-TR.rc 
b/base/shell/explorer/lang/tr-TR.rc
index 606b1971bb1..b0fac0464cb 100644
--- a/base/shell/explorer/lang/tr-TR.rc
+++ b/base/shell/explorer/lang/tr-TR.rc
@@ -144,7 +144,7 @@ BEGIN
     LTEXT            "Son erişilen belgelerin, programların ve Genel Ağ 
sitelerinin kayıtlarını silmek için Sil'e tıklayınız.", IDC_STATIC, 49, 85, 
108, 33
     PUSHBUTTON       "S&il", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Ge&lişmiş Başlat Menüsü Ayarları:", IDC_STATIC, 8, 129, 
150, 8
-    CONTROL          "&Başlat Menüsü Ayarları", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "&Başlat Menüsü Ayarları", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "Tamam", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "İptal", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/uk-UA.rc 
b/base/shell/explorer/lang/uk-UA.rc
index a5b1b7c02b6..413fa063db6 100644
--- a/base/shell/explorer/lang/uk-UA.rc
+++ b/base/shell/explorer/lang/uk-UA.rc
@@ -147,7 +147,7 @@ BEGIN
     LTEXT            "Щоб видалити історію недавніх документів, програм і 
веб-сайтів, натисніть кнопку Очистити.", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "&Очистити", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "Додаткові налаштування го&ловного меню", IDC_STATIC, 8, 
129, 150, 8
-    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "OK", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "Скасувати", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/zh-CN.rc 
b/base/shell/explorer/lang/zh-CN.rc
index d987482e8b6..5b60db65738 100644
--- a/base/shell/explorer/lang/zh-CN.rc
+++ b/base/shell/explorer/lang/zh-CN.rc
@@ -145,7 +145,7 @@ BEGIN
     LTEXT            "要删除最近访问过的文档、程序和网站记录,单击清除。", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "清除(&C)", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "开始菜单中的高级的选项:(&T)", IDC_STATIC, 8, 129, 150, 8
-    CONTROL          "开始菜单设置(&T)", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", 
WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "开始菜单设置(&T)", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", 
TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "确定", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "取消", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/zh-HK.rc 
b/base/shell/explorer/lang/zh-HK.rc
index 9f0b03056b6..faec29523d8 100644
--- a/base/shell/explorer/lang/zh-HK.rc
+++ b/base/shell/explorer/lang/zh-HK.rc
@@ -144,7 +144,7 @@ BEGIN
     LTEXT            "要刪除最近訪問過的檔案、程式和網站記錄,請按[清除]。", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "清除(&C)", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "開始功能表中的進階選項(&T):", IDC_STATIC, 8, 129, 150, 8
-    CONTROL          "開始功能表設定(&T)", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "開始功能表設定(&T)", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "確定", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "取消", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/lang/zh-TW.rc 
b/base/shell/explorer/lang/zh-TW.rc
index 930a50cb349..5e100da0257 100644
--- a/base/shell/explorer/lang/zh-TW.rc
+++ b/base/shell/explorer/lang/zh-TW.rc
@@ -145,7 +145,7 @@ BEGIN
     LTEXT            "要刪除最近訪問過的檔案、程式和網站記錄,請按[清除]。", IDC_STATIC, 49, 85, 108, 33
     PUSHBUTTON       "清除(&C)", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14
     LTEXT            "開始功能表中的進階選項(&T):", IDC_STATIC, 8, 129, 150, 8
-    CONTROL          "開始功能表設定(&T)", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE
+    CONTROL          "開始功能表設定(&T)", IDC_CLASSICSTART_SETTINGS, 
"SysTreeView32", TVS_HASBUTTONS | WS_BORDER, 8, 139, 218, 72, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON    "確定", IDOK, 122, 220, 50, 14
     PUSHBUTTON       "取消", IDCANCEL, 176, 220, 50, 14
 END
diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h
index 8a2dfd08811..ad94ada234a 100644
--- a/base/shell/explorer/precomp.h
+++ b/base/shell/explorer/precomp.h
@@ -106,10 +106,10 @@ FormatMenuString(IN HMENU hMenu,
                  IN UINT uFlags,
                  ...);
 
-BOOL
-GetExplorerRegValueSet(IN HKEY hKey,
-                       IN LPCWSTR lpSubKey,
-                       IN LPCWSTR lpValue);
+BOOL GetRegValue(IN LPCWSTR pszSubKey, IN LPCWSTR pszValueName, IN BOOL 
bDefaultValue);
+BOOL SetRegDword(IN LPCWSTR pszSubKey, IN LPCWSTR pszValueName, IN DWORD 
dwValue);
+BOOL GetAdvancedBool(IN LPCWSTR pszValueName, IN BOOL bDefaultValue);
+BOOL SetAdvancedDword(IN LPCWSTR pszValueName, IN DWORD dwValue);
 
 /*
  *  rshell.c
diff --git a/base/shell/explorer/resource.h b/base/shell/explorer/resource.h
index 8ea838f1bdc..1d79e677842 100644
--- a/base/shell/explorer/resource.h
+++ b/base/shell/explorer/resource.h
@@ -106,6 +106,12 @@
 #define IDS_TRAYWND_UNDO_CASCADE           812
 #define IDS_TRAYWND_UNDO_TILE              813
 
+/* These values must be synchronized with shell32 */
+#define IDS_ADVANCED_DISPLAY_FAVORITES              30466
+#define IDS_ADVANCED_DISPLAY_LOG_OFF                30467
+#define IDS_ADVANCED_DISPLAY_RUN                    30474
+#define IDS_ADVANCED_DISPLAY_ADMINTOOLS             30476
+
 
/*******************************************************************************\
 |*                              Control Resources                              
*|
 
\*******************************************************************************/
diff --git a/base/shell/explorer/startmnucust.cpp 
b/base/shell/explorer/startmnucust.cpp
index 0aa436f20cf..b4465de9722 100644
--- a/base/shell/explorer/startmnucust.cpp
+++ b/base/shell/explorer/startmnucust.cpp
@@ -21,6 +21,8 @@
 
 #include "precomp.h"
 
+#define I_CHECKED   2
+
 // TODO: Windows Explorer appears to be calling NewLinkHere / ConfigStartMenu 
directly for both items.
 VOID OnAddStartMenuItems(HWND hDlg)
 {
@@ -49,25 +51,120 @@ VOID OnAdvancedStartMenuItems()
     }
 }
 
-VOID OnClearRecentItems()
+static BOOL RecentHasShortcut(HWND hwnd)
 {
-   WCHAR szPath[MAX_PATH], szFile[MAX_PATH];
-   WIN32_FIND_DATAW info;
-   HANDLE hPath;
+    WCHAR szPath[MAX_PATH];
+    if (FAILED(SHGetFolderPathW(hwnd, CSIDL_RECENT | CSIDL_FLAG_CREATE, NULL, 
0, szPath)))
+        return FALSE;
+
+    // Find shortcut files in Recent
+    WIN32_FIND_DATAW find;
+    PathAppendW(szPath, L"*.lnk");
+    HANDLE hFind = FindFirstFileW(szPath, &find);
+    if (hFind == INVALID_HANDLE_VALUE)
+        return FALSE;
+
+    FindClose(hFind);
+    return TRUE;
+}
+
+static VOID OnClearRecentItems(HWND hwnd)
+{
+    SHAddToRecentDocs(SHARD_PIDL, NULL);
+    EnableWindow(GetDlgItem(hwnd, IDC_CLASSICSTART_CLEAR), 
RecentHasShortcut(hwnd));
+}
+
+struct CUSTOMIZE_ENTRY;
+typedef DWORD (CALLBACK *FN_CUSTOMIZE_READ)(const CUSTOMIZE_ENTRY *entry);
+typedef BOOL (CALLBACK *FN_CUSTOMIZE_WRITE)(const CUSTOMIZE_ENTRY *entry, 
DWORD dwValue);
+
+struct CUSTOMIZE_ENTRY
+{
+    LPARAM id;
+    LPCWSTR name;
+    FN_CUSTOMIZE_READ fnRead;
+    FN_CUSTOMIZE_WRITE fnWrite;
+};
+
+static DWORD CALLBACK CustomizeRead0(const CUSTOMIZE_ENTRY *entry)
+{
+    return GetAdvancedBool(entry->name, FALSE);
+}
+
+static BOOL CALLBACK CustomizeWrite0(const CUSTOMIZE_ENTRY *entry, DWORD 
dwValue)
+{
+    return SetAdvancedDword(entry->name, dwValue);
+}
+
+static const CUSTOMIZE_ENTRY s_CustomizeEntries[] =
+{
+    // FIXME: Make "StartMenuAdminTools" effective
+    //{ IDS_ADVANCED_DISPLAY_ADMINTOOLS, L"StartMenuAdminTools", 
CustomizeRead1, CustomizeWrite1 }, // FIXME
+
+    { IDS_ADVANCED_DISPLAY_FAVORITES,  L"StartMenuFavorites",  CustomizeRead0, 
CustomizeWrite0 },
+    { IDS_ADVANCED_DISPLAY_LOG_OFF,    L"StartMenuLogoff",     CustomizeRead0, 
CustomizeWrite0 },
 
-    if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_RECENT, NULL, 0, szPath)))
+    // FIXME: SHRestricted is buggy!
+    //{ IDS_ADVANCED_DISPLAY_RUN,        L"NoRun",               
CustomizeRead2, CustomizeWrite2 },
+};
+
+static VOID AddCustomizeItem(HWND hTreeView, const CUSTOMIZE_ENTRY *entry)
+{
+    TV_INSERTSTRUCT Insert = { TVI_ROOT, TVI_LAST };
+    Insert.item.mask = TVIF_TEXT | TVIF_STATE | TVIF_PARAM;
+
+    WCHAR szText[MAX_PATH];
+    LoadStringW(GetModuleHandleW(L"shell32.dll"), entry->id, szText, 
_countof(szText));
+    Insert.item.pszText = szText;
+    Insert.item.lParam = entry->id;
+    Insert.item.stateMask = TVIS_STATEIMAGEMASK;
+    if (entry->fnRead(entry))
+        Insert.item.state = INDEXTOSTATEIMAGEMASK(I_CHECKED);
+    TreeView_InsertItem(hTreeView, &Insert);
+}
+
+static void CustomizeClassic_OnInitDialog(HWND hwnd)
+{
+    EnableWindow(GetDlgItem(hwnd, IDC_CLASSICSTART_CLEAR), 
RecentHasShortcut(hwnd));
+
+    HWND hTreeView = GetDlgItem(hwnd, IDC_CLASSICSTART_SETTINGS);
+
+    DWORD_PTR style = GetWindowLongPtrW(hTreeView, GWL_STYLE);
+    SetWindowLongPtrW(hTreeView, GWL_STYLE, style | TVS_CHECKBOXES);
+
+    for (auto& entry : s_CustomizeEntries)
+    {
+        AddCustomizeItem(hTreeView, &entry);
+    }
+}
+
+static BOOL CustomizeClassic_OnOK(HWND hwnd)
+{
+    HWND hTreeView = GetDlgItem(hwnd, IDC_CLASSICSTART_SETTINGS);
+
+    for (HTREEITEM hItem = TreeView_GetFirstVisible(hTreeView);
+         hItem != NULL;
+         hItem = TreeView_GetNextVisible(hTreeView, hItem))
     {
-        StringCchPrintfW(szFile, _countof(szFile), L"%s\\*.*", szPath);
-        hPath = FindFirstFileW(szFile, &info);
-        do
+        TV_ITEM item = { TVIF_PARAM | TVIF_STATE };
+        item.hItem = hItem;
+        item.stateMask = TVIS_STATEIMAGEMASK;
+        TreeView_GetItem(hTreeView, &item);
+
+        BOOL bChecked = (item.state & INDEXTOSTATEIMAGEMASK(I_CHECKED));
+        for (auto& entry : s_CustomizeEntries)
         {
-            StringCchPrintfW(szFile, _countof(szFile), L"%s\\%s", szPath, 
info.cFileName);
-            DeleteFileW(szFile);
+            if (item.lParam == entry.id)
+            {
+                entry.fnWrite(&entry, bChecked);
+                break;
+            }
         }
-        while (FindNextFileW(hPath, &info));
-        FindClose(hPath);
-        /* FIXME: Disable the button*/
     }
+
+    SendMessageTimeoutW(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
(LPARAM)L"TraySettings",
+                        SMTO_ABORTIFHUNG, 200, NULL);
+    return TRUE;
 }
 
 INT_PTR CALLBACK CustomizeClassicProc(HWND hwnd, UINT Message, WPARAM wParam, 
LPARAM lParam)
@@ -75,7 +172,7 @@ INT_PTR CALLBACK CustomizeClassicProc(HWND hwnd, UINT 
Message, WPARAM wParam, LP
     switch (Message)
     {
         case WM_INITDIALOG:
-            /* FIXME: Properly initialize the dialog (check whether 'clear' 
button must be disabled, for example) */
+            CustomizeClassic_OnInitDialog(hwnd);
             return TRUE;
         case WM_COMMAND:
             switch (LOWORD(wParam))
@@ -90,10 +187,13 @@ INT_PTR CALLBACK CustomizeClassicProc(HWND hwnd, UINT 
Message, WPARAM wParam, LP
                     OnAdvancedStartMenuItems();
                     break;
                 case IDC_CLASSICSTART_CLEAR:
-                    OnClearRecentItems();
+                    OnClearRecentItems(hwnd);
                     break;
                 case IDOK:
-                    EndDialog(hwnd, IDOK);
+                    if (CustomizeClassic_OnOK(hwnd))
+                    {
+                        EndDialog(hwnd, IDOK);
+                    }
                     break;
                 case IDCANCEL:
                     EndDialog(hwnd, IDCANCEL);
diff --git a/base/shell/explorer/startmnusite.cpp 
b/base/shell/explorer/startmnusite.cpp
index 6189c59cb8a..5f52b43de36 100644
--- a/base/shell/explorer/startmnusite.cpp
+++ b/base/shell/explorer/startmnusite.cpp
@@ -133,14 +133,10 @@ public:
         dwLogoff = SHRestricted(REST_STARTMENULOGOFF);
         bWantLogoff = (dwLogoff == 2 ||
                        SHRestricted(REST_FORCESTARTMENULOGOFF) ||
-                       GetExplorerRegValueSet(HKEY_CURRENT_USER,
-                                              L"Advanced",
-                                              L"StartMenuLogoff"));
+                       GetAdvancedBool(L"StartMenuLogoff", FALSE));
 
         /* Favorites */
-        if (!GetExplorerRegValueSet(HKEY_CURRENT_USER,
-                                    L"Advanced",
-                                    L"StartMenuFavorites"))
+        if (!GetAdvancedBool(L"StartMenuFavorites", FALSE))
         {
             DeleteMenu(hMenu,
                        IDM_FAVORITES,
diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp
index 5aacfa43c0c..bfb9abb345c 100644
--- a/base/shell/explorer/traywnd.cpp
+++ b/base/shell/explorer/traywnd.cpp
@@ -2658,6 +2658,15 @@ ChangePos:
             CheckTrayWndPosition();
         }
 
+        if (m_StartMenuPopup && lstrcmpiW((LPCWSTR)lParam, L"TraySettings") == 
0)
+        {
+            /* Re-create the start menu */
+            HideStartMenu();
+            m_StartMenuBand.Release();
+            HBITMAP hbmBanner = LoadBitmapW(hExplorerInstance, 
MAKEINTRESOURCEW(IDB_STARTMENU));
+            m_StartMenuPopup = CreateStartMenu(this, &m_StartMenuBand, 
hbmBanner, FALSE);
+        }
+
         return 0;
     }
 
diff --git a/base/shell/explorer/util.cpp b/base/shell/explorer/util.cpp
index 01b234baefe..f6824cc3de7 100644
--- a/base/shell/explorer/util.cpp
+++ b/base/shell/explorer/util.cpp
@@ -140,48 +140,27 @@ FormatMenuString(IN HMENU hMenu,
     return FALSE;
 }
 
-BOOL
-GetExplorerRegValueSet(IN HKEY hKey,
-                       IN LPCWSTR lpSubKey,
-                       IN LPCWSTR lpValue)
+BOOL GetRegBool(IN LPCWSTR pszSubKey, IN LPCWSTR pszValueName, IN BOOL 
bDefaultValue)
 {
-    WCHAR szBuffer[MAX_PATH];
-    HKEY hkSubKey;
-    DWORD dwType, dwSize;
-    BOOL Ret = FALSE;
-
-    StringCbCopyW(szBuffer, sizeof(szBuffer),
-                  L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer");
-    if (FAILED_UNEXPECTEDLY(StringCbCatW(szBuffer, sizeof(szBuffer), L"\\")))
-        return FALSE;
-    if (FAILED_UNEXPECTEDLY(StringCbCatW(szBuffer, sizeof(szBuffer), 
lpSubKey)))
-        return FALSE;
+    return SHRegGetBoolUSValueW(pszSubKey, pszValueName, FALSE, bDefaultValue);
+}
 
-    dwSize = sizeof(szBuffer);
-    if (RegOpenKeyExW(hKey,
-                      szBuffer,
-                      0,
-                      KEY_QUERY_VALUE,
-                      &hkSubKey) == ERROR_SUCCESS)
-    {
-        ZeroMemory(szBuffer, sizeof(szBuffer));
-
-        if (RegQueryValueExW(hkSubKey,
-                             lpValue,
-                             0,
-                             &dwType,
-                             (LPBYTE)szBuffer,
-                             &dwSize) == ERROR_SUCCESS)
-        {
-            if ((dwType == REG_DWORD) && (dwSize == sizeof(DWORD)))
-                Ret = *((PDWORD)szBuffer) != 0;
-            else if (dwSize > 0)
-                Ret = *((PWCHAR)szBuffer) != 0;
-        }
+BOOL SetRegDword(IN LPCWSTR pszSubKey, IN LPCWSTR pszValueName, IN DWORD 
dwValue)
+{
+    return (SHRegSetUSValueW(pszSubKey, pszValueName, REG_DWORD, &dwValue,
+                             sizeof(dwValue), SHREGSET_FORCE_HKCU) == 
ERROR_SUCCESS);
+}
 
-        RegCloseKey(hkSubKey);
-    }
-    return Ret;
+#define REGKEY_ADVANCED 
L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced"
+
+BOOL GetAdvancedBool(IN LPCWSTR pszValueName, IN BOOL bDefaultValue)
+{
+    return GetRegBool(REGKEY_ADVANCED, pszValueName, bDefaultValue);
+}
+
+BOOL SetAdvancedDword(IN LPCWSTR pszValueName, IN DWORD dwValue)
+{
+    return SetRegDword(REGKEY_ADVANCED, pszValueName, dwValue);
 }
 
 BOOL
diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc
index 660f2556e88..fd8917c194f 100644
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index 6f9a9de6417..f63e63e804f 100644
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc
index a5b78258f72..cd1e690b6bf 100644
--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@@ -1020,6 +1020,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc
index 82875b138a4..017aec2cff3 100644
--- a/dll/win32/shell32/lang/da-DK.rc
+++ b/dll/win32/shell32/lang/da-DK.rc
@@ -1019,6 +1019,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc
index baa34616d46..b4db49177b2 100644
--- a/dll/win32/shell32/lang/de-DE.rc
+++ b/dll/win32/shell32/lang/de-DE.rc
@@ -1013,6 +1013,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Systemsteuerung unter 
Arbeitsplatz einblenden"
     IDS_ADVANCED_SHOW_COMP_COLOR "Verschlüsselte oder komprimierte 
NTFS-Dateien farbig anzeigen"
     IDS_ADVANCED_SHOW_INFO_TIP "Popupinformationen für Ordner- und 
Desktop-Elemente anzeigen"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Er&weitert"
     IDS_NEWEXT_ADVANCED_RIGHT "&Erweitert >>"
diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc
index 82ce40b3d94..ce38f44b65e 100644
--- a/dll/win32/shell32/lang/el-GR.rc
+++ b/dll/win32/shell32/lang/el-GR.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc
index 51fe4202a87..3cbf42580f8 100644
--- a/dll/win32/shell32/lang/en-GB.rc
+++ b/dll/win32/shell32/lang/en-GB.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
colour"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc
index 4f675cb94cd..af8f821962b 100644
--- a/dll/win32/shell32/lang/en-US.rc
+++ b/dll/win32/shell32/lang/en-US.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc
index d22987a8bec..0e02d16aac5 100644
--- a/dll/win32/shell32/lang/es-ES.rc
+++ b/dll/win32/shell32/lang/es-ES.rc
@@ -1021,6 +1021,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Mostrar Panel de Control en Mi 
PC"
     IDS_ADVANCED_SHOW_COMP_COLOR "Mostrar en color archivos NTFS comprimidos o 
encriptados"
     IDS_ADVANCED_SHOW_INFO_TIP "Mostrar descripción de íconos y carpetas en el 
escritorio"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< A&vanzado"
     IDS_NEWEXT_ADVANCED_RIGHT "A&vanzado >>"
diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc
index 87be7228dd0..7451f1f42a5 100644
--- a/dll/win32/shell32/lang/et-EE.rc
+++ b/dll/win32/shell32/lang/et-EE.rc
@@ -1019,6 +1019,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Näita juhtpaneeli kaustas Minu 
aruvti"
     IDS_ADVANCED_SHOW_COMP_COLOR "Näita krüptitud või tihendatud NTFS-faile 
värvilisena"
     IDS_ADVANCED_SHOW_INFO_TIP "Näita kausta- ja töölauaüksuste 
hüpikkirjeldusi"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< T&äpsemalt"
     IDS_NEWEXT_ADVANCED_RIGHT "Tä&psemalt >>"
diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc
index 9de9fd60cb5..7c4e8545880 100644
--- a/dll/win32/shell32/lang/eu-ES.rc
+++ b/dll/win32/shell32/lang/eu-ES.rc
@@ -1017,6 +1017,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Erakutsi kontrol-panela nire 
ordenagailuan"
     IDS_ADVANCED_SHOW_COMP_COLOR "Erakutsi koloretan konprimitutako edo 
enkriptatutako NTFS fitxategiak"
     IDS_ADVANCED_SHOW_INFO_TIP "Erakutsi ikonoen eta karpeten deskribapena 
mahaigainean"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< &Aurreratua"
     IDS_NEWEXT_ADVANCED_RIGHT "&Aurreratua >>"
diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc
index eea6b5504c1..506771e1f2f 100644
--- a/dll/win32/shell32/lang/fi-FI.rc
+++ b/dll/win32/shell32/lang/fi-FI.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc
index 0a4e63adbb4..0dd366692ad 100644
--- a/dll/win32/shell32/lang/fr-FR.rc
+++ b/dll/win32/shell32/lang/fr-FR.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Afficher le Panneau de 
configuration dans le Poste de travail"
     IDS_ADVANCED_SHOW_COMP_COLOR "Afficher les dossiers et les fichiers NTFS 
chiffrés ou compressés en couleur"
     IDS_ADVANCED_SHOW_INFO_TIP "Afficher les info-bulles pour les fichiers et 
les dossiers"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Avancé"
     IDS_NEWEXT_ADVANCED_RIGHT "Avancé >>"
diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc
index 67b4b61d713..271218e5386 100644
--- a/dll/win32/shell32/lang/he-IL.rc
+++ b/dll/win32/shell32/lang/he-IL.rc
@@ -1019,6 +1019,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< &מתקדם"
     IDS_NEWEXT_ADVANCED_RIGHT "&מתקדם >>"
diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc
index 4b30c22e23f..31f246172a4 100644
--- a/dll/win32/shell32/lang/hi-IN.rc
+++ b/dll/win32/shell32/lang/hi-IN.rc
@@ -1014,6 +1014,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "मेरा कंप्यूटर में नियंत्रण कक्ष 
दिखाएं"
     IDS_ADVANCED_SHOW_COMP_COLOR "एनक्रिप्टेड या कम्प्रेस्ट NTFS फ़ाइलों को 
रंग में दिखाएं"
     IDS_ADVANCED_SHOW_INFO_TIP "फ़ोल्डर और डेस्कटॉप आइटम के लिए पॉप-अप विवरण 
दिखाएं"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< &उन्नत"
     IDS_NEWEXT_ADVANCED_RIGHT "&उन्नत >>"
diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc
index f89e3d3c3ea..fdac1f499ca 100644
--- a/dll/win32/shell32/lang/hu-HU.rc
+++ b/dll/win32/shell32/lang/hu-HU.rc
@@ -1011,6 +1011,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Vezérlőpult megjelenítése a 
Sajátgépben"
     IDS_ADVANCED_SHOW_COMP_COLOR "Titkosított vagy tömörített NTFS fájlok 
színezése"
     IDS_ADVANCED_SHOW_INFO_TIP "Felugró leírások megjelenítése a mappákhoz és 
az asztalon lévő elemekhez"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< &Haladó"
     IDS_NEWEXT_ADVANCED_RIGHT "&Haladó >>"
diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc
index 598842909af..01f067658a0 100644
--- a/dll/win32/shell32/lang/id-ID.rc
+++ b/dll/win32/shell32/lang/id-ID.rc
@@ -1009,6 +1009,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Tampilkan Panel Kontrol pada 
Komputer Saya"
     IDS_ADVANCED_SHOW_COMP_COLOR "Tampilkan file NTFS terenkripsi atau 
dikompresi dalam warna"
     IDS_ADVANCED_SHOW_INFO_TIP "Tampilkan deskrisi popup untuk butir folder 
dan desktop"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Tin&gkat lanjut"
     IDS_NEWEXT_ADVANCED_RIGHT "Tin&gkat lanjut >>"
diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc
index e2562e2f970..6c899156918 100644
--- a/dll/win32/shell32/lang/it-IT.rc
+++ b/dll/win32/shell32/lang/it-IT.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc
index 359cbef6f0d..d58dcde0183 100644
--- a/dll/win32/shell32/lang/ja-JP.rc
+++ b/dll/win32/shell32/lang/ja-JP.rc
@@ -1009,6 +1009,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "マイ コンピュータでコントロール パネルを表示する"
     IDS_ADVANCED_SHOW_COMP_COLOR "暗号化または圧縮されたNTFSファイルを色付きで表示する"
     IDS_ADVANCED_SHOW_INFO_TIP "フォルダとデスクトップの項目にポップアップ式の説明を表示する"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< 高度な設定(&V)"
     IDS_NEWEXT_ADVANCED_RIGHT "高度な設定(&V) >>"
diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc
index bf5f519f14a..f6bf96c3944 100644
--- a/dll/win32/shell32/lang/ko-KR.rc
+++ b/dll/win32/shell32/lang/ko-KR.rc
@@ -1019,6 +1019,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc
index 51ba9458b2a..9198a63f23e 100644
--- a/dll/win32/shell32/lang/nl-NL.rc
+++ b/dll/win32/shell32/lang/nl-NL.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc
index 08e6a8dd2a2..b47d0f937f1 100644
--- a/dll/win32/shell32/lang/no-NO.rc
+++ b/dll/win32/shell32/lang/no-NO.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc
index 0b584a4f8d3..193aad6ee1e 100644
--- a/dll/win32/shell32/lang/pl-PL.rc
+++ b/dll/win32/shell32/lang/pl-PL.rc
@@ -1021,6 +1021,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Pokaż Panel sterowania w oknie 
Mój komputer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Pokaż zaszyfrowane lub skompresowane pliki 
NTFS w kolorze"
     IDS_ADVANCED_SHOW_INFO_TIP "Pokaż podręczny opis elementów folderów i 
pulpitu"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< &Zaawansowane"
     IDS_NEWEXT_ADVANCED_RIGHT "&Zaawansowane >>"
diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc
index 7fb4ef1161a..3c43e989993 100644
--- a/dll/win32/shell32/lang/pt-BR.rc
+++ b/dll/win32/shell32/lang/pt-BR.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc
index 0c835e9f397..f3c10f5daf0 100644
--- a/dll/win32/shell32/lang/pt-PT.rc
+++ b/dll/win32/shell32/lang/pt-PT.rc
@@ -1011,6 +1011,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Mostrar painel de controle no 
meu computador"
     IDS_ADVANCED_SHOW_COMP_COLOR "Mostrar ficheiros NTFS criptografados ou 
compactados a cores"
     IDS_ADVANCED_SHOW_INFO_TIP "Mostrar descrição pop-up para itens de pastas 
e área de trabalho"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< A&vançado"
     IDS_NEWEXT_ADVANCED_RIGHT "Avança&do >>"
diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc
index 43a33ff9ffb..621ec05e753 100644
--- a/dll/win32/shell32/lang/ro-RO.rc
+++ b/dll/win32/shell32/lang/ro-RO.rc
@@ -1020,6 +1020,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Afișează Panoul de control în 
Calculatorul meu"
     IDS_ADVANCED_SHOW_COMP_COLOR "Afișează în culori fișierele NTFS criptate 
sau comprimate"
     IDS_ADVANCED_SHOW_INFO_TIP "Permite descriere prin indicii pentru foldere 
și elemente de desktop"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< A&vansate"
     IDS_NEWEXT_ADVANCED_RIGHT "A&vansate >>"
diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc
index e449f8ddaa3..d59277362f0 100644
--- a/dll/win32/shell32/lang/ru-RU.rc
+++ b/dll/win32/shell32/lang/ru-RU.rc
@@ -1021,6 +1021,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Показать ""Панель управления"" 
в ""Мой компьютер"""
     IDS_ADVANCED_SHOW_COMP_COLOR "Отображать сжатые или зашифрованные файлы 
NTFS другим цветом"
     IDS_ADVANCED_SHOW_INFO_TIP "Отображать описание для папок и элементов 
рабочего стола"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< До&полнительно"
     IDS_NEWEXT_ADVANCED_RIGHT "До&полнительно >>"
diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc
index 015b5539a0c..d712f2302d8 100644
--- a/dll/win32/shell32/lang/sk-SK.rc
+++ b/dll/win32/shell32/lang/sk-SK.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc
index dd7676fa74e..731cd06ea72 100644
--- a/dll/win32/shell32/lang/sl-SI.rc
+++ b/dll/win32/shell32/lang/sl-SI.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc
index c25ed095302..3d40941ac93 100644
--- a/dll/win32/shell32/lang/sq-AL.rc
+++ b/dll/win32/shell32/lang/sq-AL.rc
@@ -1019,6 +1019,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc
index 0d93b973da6..42f5014e8f3 100644
--- a/dll/win32/shell32/lang/sv-SE.rc
+++ b/dll/win32/shell32/lang/sv-SE.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My 
Computer"
     IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in 
color"
     IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop 
items"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"
     IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>"
diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc
index 618e4aa21fb..6948821098a 100644
--- a/dll/win32/shell32/lang/tr-TR.rc
+++ b/dll/win32/shell32/lang/tr-TR.rc
@@ -1021,6 +1021,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Bilgisayarım'da Denetim 
Masası'nı göster"
     IDS_ADVANCED_SHOW_COMP_COLOR "Şifrelenmiş veya sıkıştırılmış NTFS 
dosyalarını renkli göster"
     IDS_ADVANCED_SHOW_INFO_TIP "Dizin ve masaüstü ögeleri için açılan tanım 
göster"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< G&elişmiş"
     IDS_NEWEXT_ADVANCED_RIGHT "Ge&lişmiş >>"
diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc
index 9ec0332e405..14be2ba092c 100644
--- a/dll/win32/shell32/lang/uk-UA.rc
+++ b/dll/win32/shell32/lang/uk-UA.rc
@@ -1012,6 +1012,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Показувати панель керування в 
моєму комп'ютері"
     IDS_ADVANCED_SHOW_COMP_COLOR "Показувати зашифровані або зжаті файли NTFS 
іншим кольором"
     IDS_ADVANCED_SHOW_INFO_TIP "Показувати спливаючий опис для елементів папки 
та робочого столу"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< &Додатково"
     IDS_NEWEXT_ADVANCED_RIGHT "&Додатково >>"
diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc
index cf3f11d898b..b27be47fad7 100644
--- a/dll/win32/shell32/lang/zh-CN.rc
+++ b/dll/win32/shell32/lang/zh-CN.rc
@@ -1022,6 +1022,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "在我的电脑中显示控制面板"
     IDS_ADVANCED_SHOW_COMP_COLOR "以彩色显示已被加密或压缩的 NTFS 文件"
     IDS_ADVANCED_SHOW_INFO_TIP "显示文件夹和桌面项目的弹出描述"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< 高级(&V)"
     IDS_NEWEXT_ADVANCED_RIGHT "高级(&V) >>"
diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc
index b18d6ffb86c..ac4dec30dec 100644
--- a/dll/win32/shell32/lang/zh-HK.rc
+++ b/dll/win32/shell32/lang/zh-HK.rc
@@ -1020,6 +1020,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "在我的電腦顯示控制台"
     IDS_ADVANCED_SHOW_COMP_COLOR "使用色彩來顯示加密或壓縮的 NTFS 檔案"
     IDS_ADVANCED_SHOW_INFO_TIP "顯示資料夾和桌面項目的快顯描述"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< 進階(&V)"
     IDS_NEWEXT_ADVANCED_RIGHT "進階(&V) >>"
diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc
index f4752e1b728..c3054d7c4b4 100644
--- a/dll/win32/shell32/lang/zh-TW.rc
+++ b/dll/win32/shell32/lang/zh-TW.rc
@@ -1021,6 +1021,10 @@ BEGIN
     IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "在我的電腦顯示控制台"
     IDS_ADVANCED_SHOW_COMP_COLOR "使用色彩來顯示加密或壓縮的 NTFS 檔案"
     IDS_ADVANCED_SHOW_INFO_TIP "顯示資料夾和桌面項目的快顯描述"
+    IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites"
+    IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off"
+    IDS_ADVANCED_DISPLAY_RUN "Display Run"
+    IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools"
 
     IDS_NEWEXT_ADVANCED_LEFT "<< 進階(&V)"
     IDS_NEWEXT_ADVANCED_RIGHT "進階(&V) >>"
diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h
index edaa5ab9e57..7ed1a413624 100644
--- a/dll/win32/shell32/shresdef.h
+++ b/dll/win32/shell32/shresdef.h
@@ -306,6 +306,12 @@
 #define IDS_ADVANCED_SHOW_COMP_COLOR                30512
 #define IDS_ADVANCED_SHOW_INFO_TIP                  30502
 
+/* These values must be synchronized with explorer */
+#define IDS_ADVANCED_DISPLAY_FAVORITES              30466
+#define IDS_ADVANCED_DISPLAY_LOG_OFF                30467
+#define IDS_ADVANCED_DISPLAY_RUN                    30474
+#define IDS_ADVANCED_DISPLAY_ADMINTOOLS             30476
+
 #define IDS_NEWEXT_ADVANCED_LEFT                    30515
 #define IDS_NEWEXT_ADVANCED_RIGHT                   30516
 #define IDS_NEWEXT_NEW                              30518

Reply via email to