Index: base/shell/explorer-new/lang/bg-BG.rc
===================================================================
--- base/shell/explorer-new/lang/bg-BG.rc	(revision 58140)
+++ base/shell/explorer-new/lang/bg-BG.rc	(working copy)
@@ -77,6 +77,12 @@
     AUTOCHECKBOX    "Задачната лента стои &върху останалите прозорци", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Скупчване на сходните бутони в задачната лента", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Показване на &бърз пуск", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Уведомителка", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "&Часовник", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "Можете да поддържате уведомителката подредена, като скривате значетата, върху които не сте цъкали скоро.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "С&криване на бездейните значета", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "На&гласяване...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -95,25 +101,6 @@
     AUTOCHECKBOX    "Съхраняване и показване на списък от отваряни скоро &приложения",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Уведомителка"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Значета", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "Можете да поддържате уведомителката подредена, като скривате значетата, върху които не сте цъкали скоро.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "С&криване на бездейните значета", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "На&гласяване...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "Системи значета", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Изберете кои значета да се показват винаги.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Часовник", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Сила", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Мрежа", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "За&хранване", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Инструментални ленти"
@@ -131,6 +118,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "&Показване на преглед на прозорците (изображенийца)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "&Сила", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "&Мрежа", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "За&хранване", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/cs-CZ.rc
===================================================================
--- base/shell/explorer-new/lang/cs-CZ.rc	(revision 58140)
+++ base/shell/explorer-new/lang/cs-CZ.rc	(working copy)
@@ -81,6 +81,12 @@
     AUTOCHECKBOX    "&Zobrazit hlavní panel nad ostatními okny", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Seskupovat podobná tlačítka hlavního panelu", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Zobrazit &panel Snadné spuštění", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Oznamovací oblast", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "&Hodiny", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "Přehledost oznamovací oblasti lze zachovat pomocí skrytí nepoužívaných ikon.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "Sk&rýt neaktivní ikony", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Upravit...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -99,25 +105,6 @@
     AUTOCHECKBOX    "Uložit a zobrazit seznam naposledy spuštěných &programů",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Oznamovací oblast"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Ikony", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "Přehledost oznamovací oblasti lze zachovat pomocí skrytí nepoužívaných ikon.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "Sk&rýt neaktivní ikony", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Upravit...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "Systémové ikony", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Vyberte systémové ikony, které se mají vždy zobrazit.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Hodiny", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "H&lasitost", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "S&íť", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Napájení", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Panely nástrojů"
@@ -135,6 +122,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "Zobrazit &náhledy oken", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "H&lasitost", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "S&íť", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "&Napájení", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/de-DE.rc
===================================================================
--- base/shell/explorer-new/lang/de-DE.rc	(revision 58140)
+++ base/shell/explorer-new/lang/de-DE.rc	(working copy)
@@ -75,6 +75,12 @@
     AUTOCHECKBOX    "&Taskleiste immer im Vordergrund halten", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "Ähnliche Buttons &gruppieren", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Schnellstartleiste &anzeigen", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Benachrichtigungsfeld", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "&Uhr", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "Das Benachrichtigungsfeld kann übersichtlich gestaltet werden, indem selten verwendete Symbole ausgeblendet werden.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Inaktive Symbole ausblenden", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "An&passen...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -93,25 +99,6 @@
     AUTOCHECKBOX    "Eine Liste zuletzt gestarteter &Programme führen",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Benachrichtigungsfeld"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Symbole", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "Das Benachrichtigungsfeld kann übersichtlich gestaltet werden, indem selten verwendete Symbole ausgeblendet werden.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Inaktive Symbole ausblenden", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "An&passen...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "Systemsymbole", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Wählen Sie die Systemsymbole aus, die immer angezeigt werden sollen.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Uhr", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "Lautstär&ke", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Netzwerk", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Akku", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Symbolleisten"
@@ -129,6 +116,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "Fenstervor&schau anzeigen", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "Lautstär&ke", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "&Netzwerk", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "&Akku", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/en-US.rc
===================================================================
--- base/shell/explorer-new/lang/en-US.rc	(revision 58140)
+++ base/shell/explorer-new/lang/en-US.rc	(working copy)
@@ -75,6 +75,12 @@
     AUTOCHECKBOX    "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Notification area", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "Show the cloc&k", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Customize...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -93,25 +99,6 @@
     AUTOCHECKBOX    "Store and display a list of recently opened &programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Notification Area"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Icons", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Customize...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "System icons", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Select which system icons to always show.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "Cloc&k", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Volume", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Network", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Power", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Toolbars"
@@ -129,6 +116,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "Show &volume", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "Show &network", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "Show &power", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/es-ES.rc
===================================================================
--- base/shell/explorer-new/lang/es-ES.rc	(revision 58140)
+++ base/shell/explorer-new/lang/es-ES.rc	(working copy)
@@ -84,6 +84,12 @@
     AUTOCHECKBOX    "Mantener la barra de tareas &siempre visible", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Agrupar botones similares  de la barra de tareas", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Mostrar Inicio rápi&do", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Area de notificación", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "Re&loj", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "Puede mantener libre el área de notifación ocultando iconos que no ha usado recientemente.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "Ocular &iconos inactivos", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -102,25 +108,6 @@
     AUTOCHECKBOX    "Guardar y mostrar una lista de los p&rogramas abiertos recientemente",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Area de notificación"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Icono s", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "Puede mantener libre el área de notifación ocultando iconos que no ha usado recientemente.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "Ocular &iconos inactivos", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "Iconos de sistema ", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Seleccione los iconos de sistema que va a mostrar de forma permanente.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "Re&loj", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Volumen", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Red", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Alimentación", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Barras de tareas"
@@ -138,6 +125,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "M&ostrar vista previa de las ventanas (miniaturas)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "&Volumen", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "&Red", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "&Alimentación", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/fr-FR.rc
===================================================================
--- base/shell/explorer-new/lang/fr-FR.rc	(revision 58140)
+++ base/shell/explorer-new/lang/fr-FR.rc	(working copy)
@@ -84,6 +84,12 @@
     AUTOCHECKBOX    "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Notification area", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "Show the cloc&k", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Customize...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -102,25 +108,6 @@
     AUTOCHECKBOX    "Store and display a list of recently opened &programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Notification Area"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Icons", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Customize...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "System icons", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Select which system icons to always show.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "Cloc&k", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Volume", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Network", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Power", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Toolbars"
@@ -138,6 +125,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "Show &volume", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "Show &network", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "Show &power", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/it-IT.rc
===================================================================
--- base/shell/explorer-new/lang/it-IT.rc	(revision 58140)
+++ base/shell/explorer-new/lang/it-IT.rc	(working copy)
@@ -75,6 +75,12 @@
     AUTOCHECKBOX    "Mantenere la Barra delle applicazioni in &primo piano", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Raggruppare pulsanti simili", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Mostrare Avvio &veloce", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Area di notifica", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "Orolog&io", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "Puoi tenere libera l'area di notifica nascondendo icone non usate recentemente.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Nascondere icone inattive", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Personalizzare...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -93,25 +99,6 @@
     AUTOCHECKBOX    "Memorizza e mostra un elenco di &programmi aperti di recente",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Area di notifica"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Icone", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "Puoi tenere libera l'area di notifica nascondendo icone non usate recentemente.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Nascondere icone inattive", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Personalizzare...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "Icone di sistema", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Scegli che icone di sistema mostrare sempre.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "Orolog&io", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Volume", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Rete", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Alimentazione", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Barre degli strumenti"
@@ -129,6 +116,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "&Mostrare anteprima delle finestre (miniature)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "Show &volume", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "&Rete", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "&Alimentazione", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/ja-JP.rc
===================================================================
--- base/shell/explorer-new/lang/ja-JP.rc	(revision 58140)
+++ base/shell/explorer-new/lang/ja-JP.rc	(working copy)
@@ -75,6 +75,12 @@
     AUTOCHECKBOX    "タスクバーを他のウインドウ上に保つ(&T)", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "類似するタスクバーボタンをグループ化する(&G)", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "クイック起動の表示(&Q)", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "通知領域", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "時計(&K)", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "最近クリックしていないアイコンを隠して通知領域をすっきりさせることができます。", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "アクティブでないアイコンを隠す(&H)", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "カスタマイズ(&C)...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -93,25 +99,6 @@
     AUTOCHECKBOX    "最近開いたプログラムのリストを記憶して表示する(&P)",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "通知領域"
-FONT 9, "MS UI Gothic", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "アイコン", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "最近クリックしていないアイコンを隠して通知領域をすっきりさせることができます。", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "アクティブでないアイコンを隠す(&H)", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "カスタマイズ(&C)...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "システム アイコン", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "常に表示させるシステムアイコンを選択してください。", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "時計(&K)", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "音量(&V)", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "ネットワーク(&N)", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "電源(&P)", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ツールバー"
@@ -129,6 +116,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "ウインドウのプレビューを表示する(サムネイル)(&S)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "音量(&V)", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "ネットワーク(&N)", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "電源(&P)", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/ko-KR.rc
===================================================================
--- base/shell/explorer-new/lang/ko-KR.rc	(revision 58140)
+++ base/shell/explorer-new/lang/ko-KR.rc	(working copy)
@@ -89,6 +89,12 @@
     AUTOCHECKBOX    "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Notification area", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "Show the cloc&k", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Customize...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -107,25 +113,6 @@
     AUTOCHECKBOX    "Store and display a list of recently opened &programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Notification Area"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Icons", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Customize...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "System icons", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Select which system icons to always show.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "Cloc&k", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Volume", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Network", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Power", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Toolbars"
@@ -143,6 +130,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "Show &volume", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "Show &network", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "Show &power", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/lt-LT.rc
===================================================================
--- base/shell/explorer-new/lang/lt-LT.rc	(revision 58140)
+++ base/shell/explorer-new/lang/lt-LT.rc	(working copy)
@@ -79,6 +79,12 @@
     AUTOCHECKBOX    "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Notification area", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "Show the cloc&k", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Customize...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -97,25 +103,6 @@
     AUTOCHECKBOX    "Store and display a list of recently opened &programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Notification Area"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Icons", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Customize...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "System icons", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Select which system icons to always show.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "Cloc&k", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Volume", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Network", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Power", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Toolbars"
@@ -133,6 +120,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Rodyti s&ekundes", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "Show &volume", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "Show &network", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "Show &power", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 STRINGTABLE DISCARDABLE
Index: base/shell/explorer-new/lang/nl-NL.rc
===================================================================
--- base/shell/explorer-new/lang/nl-NL.rc	(revision 58140)
+++ base/shell/explorer-new/lang/nl-NL.rc	(working copy)
@@ -75,6 +75,12 @@
     AUTOCHECKBOX    "Taakbalk altijd o&p voorgrond weergeven", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Gelijksoortige knoppen gegroepeerd weergeven", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Werkbalk &Snel starten weergeven", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Systeemvak", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "&Klok", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "U kunt het systeemvak opruimen door pictogrammen te verbergen waarop u recentelijk niet hebt geklikt.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Inactieve pictogrammen verbergen", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Aanpassen...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -93,25 +99,6 @@
     AUTOCHECKBOX    "Een lijst met onlangs geopende &programma's opslaan en weergeven",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Systeemvak"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Pictogrammen", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "U kunt het systeemvak opruimen door pictogrammen te verbergen waarop u recentelijk niet hebt geklikt.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Inactieve pictogrammen verbergen", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Aanpassen...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "Systeempictogrammen", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Selecteer welke systeempictogrammen altijd worden weergegeven.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Klok", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Volume", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Netwerk", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Energie", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Werkbalken"
@@ -129,6 +116,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "Venstervoorbeelden (miniatuurweergaven) &weergeven", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "Show &volume", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "&Netwerk", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "&Energie", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 STRINGTABLE DISCARDABLE
Index: base/shell/explorer-new/lang/no-NO.rc
===================================================================
--- base/shell/explorer-new/lang/no-NO.rc	(revision 58140)
+++ base/shell/explorer-new/lang/no-NO.rc	(working copy)
@@ -84,6 +84,12 @@
     AUTOCHECKBOX    "Behold &oppgavelinjen på toppen over andre vinduer", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Grupper og lignende knapper på oppgavelinjen", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Vis &hurtigstart", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Systemstatusfelt", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "&Klokke", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "Du kan beholde systemfeltet ryddig ved å skjule ikoner som du ikke har brukt så ofte.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Skjul inaktive ikoner", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Tilpass...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -102,25 +108,6 @@
     AUTOCHECKBOX    "Lagre og vis en liste av sist åpnet &programmer",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Systemstatusfelt"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Ikoner", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "Du kan beholde systemfeltet ryddig ved å skjule ikoner som du ikke har brukt så ofte.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Skjul inaktive ikoner", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Tilpass...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "Systemikoner", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Velg hvilken systemikoner som skal vises.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Klokke", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Volum", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Nettverk", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Strøm", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Verktøylinje"
@@ -138,6 +125,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "&Vis vinduforhåndvisning (miniaturbilde)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "&Volum", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "&Nettverk", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "&Strøm", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/pl-PL.rc
===================================================================
--- base/shell/explorer-new/lang/pl-PL.rc	(revision 58140)
+++ base/shell/explorer-new/lang/pl-PL.rc	(working copy)
@@ -84,6 +84,12 @@
     AUTOCHECKBOX    "Zawsze &na wierzchu", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Grupuj programy w pasku zadań", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Pokaż pasek &Szybkiego uruchamiania", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Obszar powiadomień", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "&Zegar", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "Możesz uporządkować obszar powiadomień poprzez ukrycie rzadko używanych ikon.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Ukryj nieaktywne ikony", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Dostosuj...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -102,25 +108,6 @@
     AUTOCHECKBOX    "Zachowaj i wyświetl listę niedawno otwartych &programów",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Obszar powiadomień"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Ikony", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "Możesz uporządkować obszar powiadomień poprzez ukrycie rzadko używanych ikon.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Ukryj nieaktywne ikony", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Dostosuj...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "Ikony systemowe", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Wybierz zawsze widoczne ikony systemowe.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Zegar", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Głośność", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Sieć", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "Z&arządzanie energią", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Paski narzędzi"
@@ -138,6 +125,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "&Pokaż podgląd okien (miniaturki)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "&Głośność", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "&Sieć", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "Z&arządzanie energią", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/pt-BR.rc
===================================================================
--- base/shell/explorer-new/lang/pt-BR.rc	(revision 58140)
+++ base/shell/explorer-new/lang/pt-BR.rc	(working copy)
@@ -77,6 +77,12 @@
     AUTOCHECKBOX    "&Manter barra de tarefas sobre outros janelas", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Agrupar botões similares da barra de tarefas", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "&Exibir Inicialização Rápida", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Área de Notificação", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "Reló&gio", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "Você pode manter a área de notificação organizada escondendo os ícones que você não tenha clicado recentemente.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Esconder ícones inativos", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -95,25 +101,6 @@
     AUTOCHECKBOX    "Armazenar e e&xibir programas abertos recentemente no menu Iniciar",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Área de Notificação"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Ícones", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "Você pode manter a área de notificação organizada escondendo os ícones que você não tenha clicado recentemente.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Esconder ícones inativos", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "Ícones do sistema", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Selecione os ícones do sistema que serão exibidos automaticamente.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "Reló&gio", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Volume", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Rede", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Energia", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Barras de Ferramentas"
@@ -131,6 +118,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "E&xibir miniaturas (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "Show &volume", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "&Rede", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "&Energia", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/ro-RO.rc
===================================================================
--- base/shell/explorer-new/lang/ro-RO.rc	(revision 58140)
+++ base/shell/explorer-new/lang/ro-RO.rc	(working copy)
@@ -76,6 +76,12 @@
     AUTOCHECKBOX    "Menține bara de ac&tivități deasupra celorlalte ferestre", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Grupează butoanele similare din bara de activități", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Arată bara &Lansărilor rapide", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Zona de notoficare", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "&Ceas", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "Puteți menține ordonată zona de notificare prin ascunderea pictogramelor neaccesate recent.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Ascunde pictogramele neaccesate", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Particularizare...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -94,25 +100,6 @@
     AUTOCHECKBOX    "Păstrează și afișează o listă a &programelor deschise recent",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Zona de notoficare"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Pictograme", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "Puteți menține ordonată zona de notificare prin ascunderea pictogramelor neaccesate recent.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Ascunde pictogramele neaccesate", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Particularizare…", IDC_TASKBARPROP_ICONCUST, 168,70,70,14, WS_DISABLED
-    GROUPBOX        "Pictograme de sistem", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Specificați care dintre pictogramele de sistem le doriți expuse.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Ceas", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Volum", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Rețea", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "A&limentare", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Bare de instrumente"
@@ -130,6 +117,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "&Prezintă miniaturi ale ferestrelor", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "&Volum", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "&Rețea", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "A&limentare", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/ru-RU.rc
===================================================================
--- base/shell/explorer-new/lang/ru-RU.rc	(revision 58140)
+++ base/shell/explorer-new/lang/ru-RU.rc	(working copy)
@@ -77,6 +77,12 @@
     AUTOCHECKBOX    "&Поверх других окон", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Группировать схожие кнопки", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Отображать панель &быстрого запуска", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Область уведомлений", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "&Часы", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "Можно избежать загромождения области уведомлений, скрывая значки, которые давно не использовались.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Скрывать неиспользуемые значки", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Настроить...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -95,25 +101,6 @@
     AUTOCHECKBOX    "Хранить и отображать список недавно открывавшихся &программ",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,17, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Область уведомлений"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Значки", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "Можно избежать загромождения области уведомлений, скрывая значки, которые давно не использовались.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Скрывать неиспользуемые значки", IDC_TASKBARPROP_HIDEICONS, 13,70,140,10, WS_DISABLED
-    PUSHBUTTON      "&Настроить...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "Системные значки", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Выберите постоянно отображаемые системные значки.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Часы", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Громкость", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Сеть", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Питание", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Панели инструментов"
@@ -131,6 +118,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "Отобра&жать образцы окон (эскизы)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "&Громкость", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "&Сеть", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "&Питание", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/sk-SK.rc
===================================================================
--- base/shell/explorer-new/lang/sk-SK.rc	(revision 58140)
+++ base/shell/explorer-new/lang/sk-SK.rc	(working copy)
@@ -80,6 +80,12 @@
     AUTOCHECKBOX    "Zo&brazovať panel úloh nad ostatnými oknami", IDC_TASKBARPROP_ONTOP, 13,71,200,10 //Ponechať panel úloh nad ostatnými oknami
     AUTOCHECKBOX    "&Zoskupovať podobné tlačidlá na paneli s nástrojmi", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Zobraziť panel &Rýchle spustenie", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Oblasť oznámení", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "Ho&diny", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Skryť neaktívne ikony", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "P&rispôsobiť...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -98,25 +104,6 @@
     AUTOCHECKBOX    "Store and display a list of recently opened &programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Oblasť oznámení"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Ikony", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Skryť neaktívne ikony", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "P&rispôsobiť...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "Systémové ikony", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Vyberte, ktoré systémové ikony sa majú vždy zobrazovať.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "Ho&diny", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Hlasitosť", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "Si&eť", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "N&apájanie", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Panel s nástrojmi"
@@ -134,6 +121,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "Z&obraziť náhľady okien (miniatúry)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "&Hlasitosť", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "Si&eť", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "N&apájanie", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/uk-UA.rc
===================================================================
--- base/shell/explorer-new/lang/uk-UA.rc	(revision 58140)
+++ base/shell/explorer-new/lang/uk-UA.rc	(working copy)
@@ -83,6 +83,12 @@
     AUTOCHECKBOX    "&Поверх інших вікон", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "&Групувати схожі кнопки", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "Відображати панель &швидкого запуску", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "Область сповіщень", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "&Годинник", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "Можна уникнути захаращення області повідомлень, приховуючи значки, які давно не використовувалися.", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "&Приховувати невживані значки", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "&Налаштувати...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -101,25 +107,6 @@
     AUTOCHECKBOX    "Зберігати та відображати список недавно відкритих &програм",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Область сповіщень"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "Значки", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "Можна уникнути захаращення області повідомлень, приховуючи значки, які давно не використовувалися.", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Приховувати невживані значки", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "&Налаштувати...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "Системні значки", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "Оберіть системні значки для постійного відображення.", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "&Годинник", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Гучність", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Мережа", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "&Живлення", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Панелі інструментів"
@@ -137,6 +124,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "&Відображати зразки вікон (ескізи)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "&Гучність", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "&Мережа", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "&Живлення", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/lang/zh-CN.rc
===================================================================
--- base/shell/explorer-new/lang/zh-CN.rc	(revision 58140)
+++ base/shell/explorer-new/lang/zh-CN.rc	(working copy)
@@ -83,6 +83,12 @@
     AUTOCHECKBOX    "保持任务栏在其他窗口之上(&T)", IDC_TASKBARPROP_ONTOP, 13,71,200,10
     AUTOCHECKBOX    "分组相似按钮(&G)", IDC_TASKBARPROP_GROUP, 13,84,200,10
     AUTOCHECKBOX    "显示快速启动(&Q)", IDC_TASKBARPROP_SHOWQL, 13,97,200,10
+    GROUPBOX        "通知区域", IDC_STATIC, 6,114,240,100
+    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,13,124,223,28
+    AUTOCHECKBOX    "时间(&K)", IDC_TASKBARPROP_CLOCK, 13,153,200,10, WS_TABSTOP
+    LTEXT           "您可以通过隐藏不常用的图标来保持通知区域的整洁。", IDC_STATIC, 13,169,223,16
+    AUTOCHECKBOX    "隐藏不活动的图标(&H)", IDC_TASKBARPROP_HIDEICONS, 13,191,125,10, WS_TABSTOP
+    PUSHBUTTON      "自定义(&C)...", IDC_TASKBARPROP_ICONCUST, 188,191,50,14, WS_TABSTOP
 END
 
 IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218
@@ -101,25 +107,6 @@
     AUTOCHECKBOX    "存储并显示过去曾打开的程序列表(&P)",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
 END
 
-IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "通知区域"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    CONTROL         "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED
-    GROUPBOX        "图标", IDC_STATIC, 6,33,240,58, WS_DISABLED
-    LTEXT           "您可以通过隐藏不常用的图标来保持通知区域的整洁。", IDC_STATIC, 13,48,223,16, WS_DISABLED
-    AUTOCHECKBOX    "隐藏不活动的图标(&H)", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED
-    PUSHBUTTON      "自定义(&C)...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED
-    GROUPBOX        "系统图标", IDC_STATIC, 6,97,240,84, WS_DISABLED
-    LTEXT           "选择总是显示的系统图标。", IDC_STATIC, 13,112,223,16, WS_DISABLED
-    AUTOCHECKBOX    "时间(&K)", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED
-    AUTOCHECKBOX    "音量(&V)", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED
-    AUTOCHECKBOX    "网络(&N)", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED
-    AUTOCHECKBOX    "电源(&P)", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED
-
-END
-
 IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "工具栏"
@@ -137,6 +124,9 @@
     GROUPBOX        "Advanced options", IDC_STATIC, 6,6,240,121
     AUTOCHECKBOX    "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10
     AUTOCHECKBOX    "显示窗口预览(&S)", IDC_TASKBARPROP_WNDPREV, 13,31,200,10
+    AUTOCHECKBOX    "音量(&V)", IDC_TASKBARPROP_VOLUME, 13,44,200,10
+    AUTOCHECKBOX    "网络(&N)", IDC_TASKBARPROP_NETWORK, 13,57,200,10
+    AUTOCHECKBOX    "电源(&P)", IDC_TASKBARPROP_POWER, 13,70,200,10
 END
 
 
Index: base/shell/explorer-new/resource.h
===================================================================
--- base/shell/explorer-new/resource.h	(revision 58140)
+++ base/shell/explorer-new/resource.h	(working copy)
@@ -69,7 +69,10 @@
 #define IDC_TASKBARPROP_ONTOP 2004
 #define IDC_TASKBARPROP_GROUP 2005
 #define IDC_TASKBARPROP_SHOWQL 2006
-#define IDC_TASKBARPROP_WNDPREV 2007
+#define IDC_TASKBARPROP_HIDEICONS 2007
+#define IDC_TASKBARPROP_NOTIFICATIONBITMAP 2008
+#define IDC_TASKBARPROP_CLOCK 2009
+#define IDC_TASKBARPROP_ICONCUST 2010
 
 #define IDB_TASKBARPROP_AUTOHIDE 2050
 #define IDB_TASKBARPROP_LOCK_GROUP_NOQL 2051
@@ -80,7 +83,6 @@
 #define IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL 2056
 #define IDB_TASKBARPROP_NOLOCK_NOGROUP_QL 2057
 #define IDB_TASKBARPROP_NOLOCK_GROUP_QL 2058
-#define IDC_TASKBARPROP_SECONDS 2059
 
 /* Taskbar properties, startmenu*/
 #define IDD_TASKBARPROP_STARTMENU 2100
@@ -91,16 +93,13 @@
 #define IDC_TASKBARPROP_RECENTFILES 2105
 #define IDC_TASKBARPROP_RECENTFOLDERS 2106
 
-/* Taskbar properties, notification */
-#define IDD_TASKBARPROP_NOTIFICATION 2200
-#define IDC_TASKBARPROP_NOTIFICATIONBITMAP 2201
-#define IDC_TASKBARPROP_HIDEICONS 2202
-#define IDC_TASKBARPROP_ICONCUST 2203
-#define IDC_TASKBARPROP_CLOCK 2204
-#define IDC_TASKBARPROP_VOLUME 2205
-#define IDC_TASKBARPROP_NETWORK 2206
-#define IDC_TASKBARPROP_POWER 2207
-#define IDD_TASKBARPROP_ADVANCED 2208
+/* Taskbar properties, advanced */
+#define IDD_TASKBARPROP_ADVANCED 2201
+#define IDC_TASKBARPROP_SECONDS 2202
+#define IDC_TASKBARPROP_WNDPREV 2203
+#define IDC_TASKBARPROP_VOLUME 2204
+#define IDC_TASKBARPROP_NETWORK 2205
+#define IDC_TASKBARPROP_POWER 2206
 
 /* Taskbar properties, toolbars */
 #define IDD_TASKBARPROP_TOOLBARS 2300
Index: base/shell/explorer-new/trayprop.c
===================================================================
--- base/shell/explorer-new/trayprop.c	(revision 58140)
+++ base/shell/explorer-new/trayprop.c	(working copy)
@@ -276,41 +276,6 @@
 
 
 static INT_PTR CALLBACK
-NotificationPageProc(HWND hwndDlg,
-                     UINT uMsg,
-                     WPARAM wParam,
-                     LPARAM lParam)
-{
-    switch (uMsg)
-    {
-        case WM_INITDIALOG:
-            break;
-
-        case WM_DESTROY:
-            break;
-
-        case WM_NOTIFY:
-        {
-            LPNMHDR pnmh = (LPNMHDR)lParam;
-
-            switch (pnmh->code)
-            {
-                case PSN_SETACTIVE:
-                    break;
-
-                case PSN_APPLY:
-                    break;
-            }
-
-            break;
-        }
-    }
-
-    return FALSE;
-}
-
-
-static INT_PTR CALLBACK
 ToolbarsPageProc(HWND hwndDlg,
                  UINT uMsg,
                  WPARAM wParam,
@@ -366,7 +331,7 @@
 {
     PPROPSHEET_INFO pPropInfo;
     PROPSHEETHEADER psh;
-    PROPSHEETPAGE psp[5];
+    PROPSHEETPAGE psp[4];
     TCHAR szCaption[256];
 
     pPropInfo = HeapAlloc(hProcessHeap,
@@ -402,9 +367,8 @@
 
     InitPropSheetPage(&psp[0], IDD_TASKBARPROP_TASKBAR, TaskbarPageProc, (LPARAM)pPropInfo);
     InitPropSheetPage(&psp[1], IDD_TASKBARPROP_STARTMENU, StartMenuPageProc, (LPARAM)pPropInfo);
-    InitPropSheetPage(&psp[2], IDD_TASKBARPROP_NOTIFICATION, NotificationPageProc, (LPARAM)pPropInfo);
-    InitPropSheetPage(&psp[3], IDD_TASKBARPROP_TOOLBARS, ToolbarsPageProc, (LPARAM)pPropInfo);
-    InitPropSheetPage(&psp[4], IDD_TASKBARPROP_ADVANCED, AdvancedSettingsPageProc, (LPARAM)pPropInfo);
+    InitPropSheetPage(&psp[2], IDD_TASKBARPROP_TOOLBARS, ToolbarsPageProc, (LPARAM)pPropInfo);
+    InitPropSheetPage(&psp[3], IDD_TASKBARPROP_ADVANCED, AdvancedSettingsPageProc, (LPARAM)pPropInfo);
 
     PropertySheet(&psh);