Index: lang/bg-BG.rc
===================================================================
--- lang/bg-BG.rc	(revision 74261)
+++ lang/bg-BG.rc	(working copy)
@@ -188,6 +188,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Пуск"
+    IDS_START_ALT "пуск"
     IDS_PROPERTIES "&Свойства"
     IDS_OPEN_ALL_USERS "&Отваряне на всички потребители"
     IDS_EXPLORE_ALL_USERS "&Разлистване на всички потребители"
Index: lang/cs-CZ.rc
===================================================================
--- lang/cs-CZ.rc	(revision 74261)
+++ lang/cs-CZ.rc	(working copy)
@@ -194,6 +194,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Start"
+    IDS_START_ALT "Start"
     IDS_PROPERTIES "Vl&astnosti"
     IDS_OPEN_ALL_USERS "Ote&vřít složku All Users"
     IDS_EXPLORE_ALL_USERS "Pro&cházet složku All Users"
Index: lang/de-DE.rc
===================================================================
--- lang/de-DE.rc	(revision 74261)
+++ lang/de-DE.rc	(working copy)
@@ -188,6 +188,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Start"
+    IDS_START_ALT "Start"
     IDS_PROPERTIES "E&igenschaften"
     IDS_OPEN_ALL_USERS "Öffnen (&Alle Benutzer)"
     IDS_EXPLORE_ALL_USERS "Explorer (A&lle Benutzer)"
Index: lang/en-US.rc
===================================================================
--- lang/en-US.rc	(revision 74261)
+++ lang/en-US.rc	(working copy)
@@ -188,6 +188,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Start"
+    IDS_START_ALT "start"
     IDS_PROPERTIES "P&roperties"
     IDS_OPEN_ALL_USERS "O&pen All Users"
     IDS_EXPLORE_ALL_USERS "E&xplore All Users"
Index: lang/es-ES.rc
===================================================================
--- lang/es-ES.rc	(revision 74261)
+++ lang/es-ES.rc	(working copy)
@@ -198,6 +198,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Inicio"
+    IDS_START_ALT "Inicio"
     IDS_PROPERTIES "P&ropiedades"
     IDS_OPEN_ALL_USERS "A&brir todos los usuarios"
     IDS_EXPLORE_ALL_USERS "E&xplorar todos los usuarios"
Index: lang/fr-FR.rc
===================================================================
--- lang/fr-FR.rc	(revision 74261)
+++ lang/fr-FR.rc	(working copy)
@@ -188,6 +188,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Démarrer"
+    IDS_START_ALT "démarrer"
     IDS_PROPERTIES "P&ropriétés"
     IDS_OPEN_ALL_USERS "Ouvrir tous les utilisateurs"
     IDS_EXPLORE_ALL_USERS "E&xplorer tous les utilisateurs"
Index: lang/he-IL.rc
===================================================================
--- lang/he-IL.rc	(revision 74261)
+++ lang/he-IL.rc	(working copy)
@@ -188,6 +188,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "התחל"
+    IDS_START_ALT "התחל"
     IDS_PROPERTIES "מאפיינים"
     IDS_OPEN_ALL_USERS "פתח את כל המשתמשים"
     IDS_EXPLORE_ALL_USERS "סייר בכל המשתמשים"
Index: lang/it-IT.rc
===================================================================
--- lang/it-IT.rc	(revision 74261)
+++ lang/it-IT.rc	(working copy)
@@ -188,6 +188,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Avvio"
+    IDS_START_ALT "avvio"
     IDS_PROPERTIES "&Proprietà"
     IDS_OPEN_ALL_USERS "&Apri tutti gli utenti"
     IDS_EXPLORE_ALL_USERS "&Esplora tutti gli utenti"
Index: lang/ja-JP.rc
===================================================================
--- lang/ja-JP.rc	(revision 74261)
+++ lang/ja-JP.rc	(working copy)
@@ -188,6 +188,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "スタート"
+    IDS_START_ALT "スタート"
     IDS_PROPERTIES "プロパティ(&R)"
     IDS_OPEN_ALL_USERS "開く - All Users(&P)"
     IDS_EXPLORE_ALL_USERS "エクスプローラ - All Users(&E)"
Index: lang/ko-KR.rc
===================================================================
--- lang/ko-KR.rc	(revision 74261)
+++ lang/ko-KR.rc	(working copy)
@@ -190,6 +190,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "시작"
+    IDS_START_ALT "시작"
     IDS_PROPERTIES "속성(&R)"
     IDS_OPEN_ALL_USERS "열기 - All Users(&P)"
     IDS_EXPLORE_ALL_USERS "탐색 - All Users(&X)"
Index: lang/lt-LT.rc
===================================================================
--- lang/lt-LT.rc	(revision 74261)
+++ lang/lt-LT.rc	(working copy)
@@ -191,6 +191,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Start"
+    IDS_START_ALT "start"
     IDS_PROPERTIES "&Parametrai"
     IDS_OPEN_ALL_USERS "&Atverti visus vartotojus"
     IDS_EXPLORE_ALL_USERS "&Naršyti visus vartotojus"
Index: lang/ms-MY.rc
===================================================================
--- lang/ms-MY.rc	(revision 74261)
+++ lang/ms-MY.rc	(working copy)
@@ -190,6 +190,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Mula"
+    IDS_START_ALT "Mula"
     IDS_PROPERTIES "Sifat-sifat(&R)"
     IDS_OPEN_ALL_USERS "Buka semua &pengguna"
     IDS_EXPLORE_ALL_USERS "Lanjut semua pengguna(&X)"
Index: lang/nl-NL.rc
===================================================================
--- lang/nl-NL.rc	(revision 74261)
+++ lang/nl-NL.rc	(working copy)
@@ -188,6 +188,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "&Start"
+    IDS_START_ALT "&Start"
     IDS_PROPERTIES "&Eigenschappen"
     IDS_OPEN_ALL_USERS "&Alle Gebruikers weergeven"
     IDS_EXPLORE_ALL_USERS "Alle Gebruikers V&erkennen"
Index: lang/no-NO.rc
===================================================================
--- lang/no-NO.rc	(revision 74261)
+++ lang/no-NO.rc	(working copy)
@@ -189,6 +189,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Start"
+    IDS_START_ALT "Start"
     IDS_PROPERTIES "E&genskaper"
     IDS_OPEN_ALL_USERS "Å&pne alle brukere"
     IDS_EXPLORE_ALL_USERS "U&tforsk alle brukere"
Index: lang/pl-PL.rc
===================================================================
--- lang/pl-PL.rc	(revision 74261)
+++ lang/pl-PL.rc	(working copy)
@@ -197,6 +197,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Start"
+    IDS_START_ALT "Start"
     IDS_PROPERTIES "Właś&ciwości"
     IDS_OPEN_ALL_USERS "&Otwórz - wszyscy użytkownicy"
     IDS_EXPLORE_ALL_USERS "&Eksploruj - wszyscy użytkownicy"
Index: lang/pt-BR.rc
===================================================================
--- lang/pt-BR.rc	(revision 74261)
+++ lang/pt-BR.rc	(working copy)
@@ -190,6 +190,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Iniciar"
+    IDS_START_ALT "Iniciar"
     IDS_PROPERTIES "P&ropriedades"
     IDS_OPEN_ALL_USERS "A&brir Todos os Usuários"
     IDS_EXPLORE_ALL_USERS "E&xplorar Todos os Usuários"
Index: lang/ro-RO.rc
===================================================================
--- lang/ro-RO.rc	(revision 74261)
+++ lang/ro-RO.rc	(working copy)
@@ -190,6 +190,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Pornire"
+    IDS_START_ALT "pornire"
     IDS_PROPERTIES "P&referințe"
     IDS_OPEN_ALL_USERS "&Deschide „Toți utilizatorii”"
     IDS_EXPLORE_ALL_USERS "E&xplorează „Toți utilizatorii”"
Index: lang/ru-RU.rc
===================================================================
--- lang/ru-RU.rc	(revision 74261)
+++ lang/ru-RU.rc	(working copy)
@@ -190,6 +190,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Пуск"
+    IDS_START_ALT "пуск"
     IDS_PROPERTIES "&Свойства"
     IDS_OPEN_ALL_USERS "&Все пользователи"
     IDS_EXPLORE_ALL_USERS "&Обзор Всех пользователей"
Index: lang/sk-SK.rc
===================================================================
--- lang/sk-SK.rc	(revision 74261)
+++ lang/sk-SK.rc	(working copy)
@@ -193,6 +193,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Štart"
+    IDS_START_ALT "Štart"
     IDS_PROPERTIES "Vl&astnosti"
     IDS_OPEN_ALL_USERS "&Otvoriť profil All Users"
     IDS_EXPLORE_ALL_USERS "&Preskúmať profil All Users"
Index: lang/sq-AL.rc
===================================================================
--- lang/sq-AL.rc	(revision 74261)
+++ lang/sq-AL.rc	(working copy)
@@ -192,6 +192,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Fillo"
+    IDS_START_ALT "Fillo"
     IDS_PROPERTIES "Të gjitha"
     IDS_OPEN_ALL_USERS "Hap të gjith përdoruesit"
     IDS_EXPLORE_ALL_USERS "E&ksploro të gjith përdoruesit"
Index: lang/tr-TR.rc
===================================================================
--- lang/tr-TR.rc	(revision 74261)
+++ lang/tr-TR.rc	(working copy)
@@ -190,6 +190,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Başlat"
+    IDS_START_ALT "Başlat"
     IDS_PROPERTIES "&Husûsiyetler"
     IDS_OPEN_ALL_USERS "&Tüm Kullanıcılar'da Aç"
     IDS_EXPLORE_ALL_USERS "T&üm Kullanıcılar'da Araştır"
Index: lang/uk-UA.rc
===================================================================
--- lang/uk-UA.rc	(revision 74261)
+++ lang/uk-UA.rc	(working copy)
@@ -196,6 +196,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "Пуск"
+    IDS_START_ALT "пуск"
     IDS_PROPERTIES "В&ластивості"
     IDS_OPEN_ALL_USERS "&Всі користувачі"
     IDS_EXPLORE_ALL_USERS "&Огляд всіх користувачів"
Index: lang/zh-CN.rc
===================================================================
--- lang/zh-CN.rc	(revision 74261)
+++ lang/zh-CN.rc	(working copy)
@@ -196,6 +196,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "开始"
+    IDS_START_ALT "开始"
     IDS_PROPERTIES "属性(&R)"
     IDS_OPEN_ALL_USERS "打开所有用户(&P)"
     IDS_EXPLORE_ALL_USERS "浏览所有用户(&X)"
Index: lang/zh-TW.rc
===================================================================
--- lang/zh-TW.rc	(revision 74261)
+++ lang/zh-TW.rc	(working copy)
@@ -196,6 +196,7 @@
 STRINGTABLE
 BEGIN
     IDS_START "開始"
+    IDS_START_ALT "開始"
     IDS_PROPERTIES "內容(&R)"
     IDS_OPEN_ALL_USERS "開啟所有使用者(&P)"
     IDS_EXPLORE_ALL_USERS "瀏覽所有使用者(&X)"
Index: resource.h
===================================================================
--- resource.h	(revision 74261)
+++ resource.h	(working copy)
@@ -96,6 +96,7 @@
 
 #define IDS_STARTUP_ERROR                  105
 #define IDS_START                          595
+#define IDS_START_ALT                      578
 #define IDS_OPEN_ALL_USERS                 718
 #define IDS_EXPLORE_ALL_USERS              719
 #define IDS_PROPERTIES                     720
Index: traywnd.cpp
===================================================================
--- traywnd.cpp	(revision 74261)
+++ traywnd.cpp	(working copy)
@@ -141,12 +141,18 @@
     HWND Create(HWND hwndParent)
     {
         WCHAR szStartCaption[32];
-        if (!LoadStringW(hExplorerInstance,
-                         IDS_START,
+        if (!IsThemeActive() || !LoadStringW(hExplorerInstance,
+                         IDS_START_ALT,
                          szStartCaption,
                          _countof(szStartCaption)))
         {
-            wcscpy(szStartCaption, L"Start");
+            if (!LoadStringW(hExplorerInstance,
+                             IDS_START,
+                             szStartCaption,
+                             _countof(szStartCaption)))
+            {
+                wcscpy(szStartCaption, L"Start");
+            }
         }
 
         DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | BS_PUSHBUTTON | BS_LEFT | BS_VCENTER;
@@ -191,6 +197,7 @@
     HWND m_Rebar;
     HWND m_TaskSwitch;
     HWND m_TrayNotify;
+    HWND m_Start;
 
     CTrayNotifyWnd* m_TrayNotifyInstance;
 
@@ -242,6 +249,7 @@
         m_Rebar(NULL),
         m_TaskSwitch(NULL),
         m_TrayNotify(NULL),
+        m_Start(NULL),
         m_Position(0),
         m_Monitor(NULL),
         m_PreviousMonitor(NULL),
@@ -2088,7 +2096,7 @@
         SetWindowTheme(m_hWnd, L"TaskBar", NULL);
 
         /* Create the Start button */
-        m_StartButton.Create(m_hWnd);
+        m_Start = m_StartButton.Create(m_hWnd);
 
         /* Load the saved tray window settings */
         RegLoadSettings();
@@ -2154,7 +2162,16 @@
             CloseThemeData(m_Theme);
 
         m_Theme = OpenThemeData(m_hWnd, L"TaskBar");
-
+        
+        WCHAR szStartCaption[32];
+        if (LoadStringW(hExplorerInstance,
+                         m_Theme ? IDS_START_ALT : IDS_START,
+                         szStartCaption,
+                         _countof(szStartCaption)))
+        {
+            SendMessageW(m_Start, WM_SETTEXT, 0, (LPARAM)szStartCaption);
+        }
+        
         if (m_Theme)
         {
             SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0);