[WINLOGON] System shutdown dialog clean-up

- Replace the winlogon icon by the warning icon.
- Add more space for the main text.
- Move the shutdown time into a separate line to ensure it is always fully visible.
- Add more space for the shutdown message and keep the message empty by default.
- Clean up the resource IDs.

base/system/winlogon/lang/bg-BG.rc

@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "Пре&запуск", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/cs-CZ.rc

@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/de-DE.rc

@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "Neusta&rt", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/el-GR.rc

@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/en-US.rc

@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/es-ES.rc

@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Reiniciar", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/fr-FR.rc

@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Redémarrer", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/he-IL.rc

@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "הפעל מחדש", 1, 59, 32, 49, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/hu-HU.rc

@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Újraindítás", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/id-ID.rc

@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Mulai Lagi", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/it-IT.rc

@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Riavvio", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/ja-JP.rc

@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "再起動(&R)", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/lt-LT.rc

@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Perkrauti", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/ms-MY.rc

@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "Mula semula(&R)", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/nl-NL.rc

@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/no-NO.rc

@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE 

base/system/winlogon/lang/pl-PL.rc

@@ -27,15 +27,17 @@ BEGIN
     DEFPUSHBUTTON "&Uruchom ponownie", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/pt-BR.rc

@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Reiniciar", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/ro-RO.rc

@@ -29,15 +29,17 @@ BEGIN
     DEFPUSHBUTTON "&Repornire", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/ru-RU.rc

@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Перезагрузка", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/sk-SK.rc

@@ -25,15 +25,17 @@ BEGIN
     DEFPUSHBUTTON "&Reštartovať", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/sq-AL.rc

@@ -24,15 +24,17 @@ BEGIN
     DEFPUSHBUTTON "&Rifillo", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/sv-SE.rc

@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Starta om", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/tr-TR.rc

@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "&Yeniden Başlat", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/uk-UA.rc

@@ -20,15 +20,17 @@ BEGIN
     DEFPUSHBUTTON "&Перезавантаження", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/zh-CN.rc

@@ -23,15 +23,17 @@ BEGIN
     DEFPUSHBUTTON "重新启动(&R)", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/lang/zh-TW.rc

@@ -22,15 +22,17 @@ BEGIN
     DEFPUSHBUTTON "重新啟動(&R)", 1, 80, 91, 68, 14
 END
 
-IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100
+IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP
 CAPTION "System Shutdown"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
+    ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20
-    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31
+    LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40
-    LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14
+    LTEXT "The system shuts down in:", -1, 38, 50, 90, 8
-    LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55
+    LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8
+    LTEXT "Message:", -1, 38, 65, 135, 8
+    LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58
 END
 
 STRINGTABLE

base/system/winlogon/resource.h

@@ -1,25 +1,22 @@
 #pragma once
 
-/* Dialogs */
-#define IDD_SYSSHUTDOWN      500
-#define IDD_GINALOADFAILED   400
-#define IDD_SHUTDOWNCOMPUTER 300
-
 /* Icons */
 #define IDI_WINLOGON 4
 
-/* Controls */
+/* Dialogs */
-#define IDC_SYSSHUTDOWNMSG   501
+#define IDD_SHUTDOWNCOMPUTER      300
-#define IDC_SHUTDOWNTIMELEFT 502
+#define IDC_SHTDOWNICON           301
-#define IDC_SHUTDOWNCOMMENT  503
+#define IDC_SHUTDOWNCOMPUTER      302
-#define IDC_SYSSHUTDOWNICON  504
+#define IDC_BTNSHTDOWNCOMPUTER    303
 
+#define IDD_GINALOADFAILED        400
 #define IDC_GINALOADFAILED        401
 #define IDC_GINALOADFAILEDCONTACT 402
 
-#define IDC_SHUTDOWNCOMPUTER   302
+#define IDD_SYSSHUTDOWN           500
-#define IDC_BTNSHTDOWNCOMPUTER 305
+#define IDC_SYSSHUTDOWNICON       501
-#define IDC_SHTDOWNICON        102
+#define IDC_SYSSHUTDOWNTIMELEFT   502
+#define IDC_SYSSHUTDOWNMESSAGE    503
 
 /* Strings */
 #define IDS_PREPARENETWORKCONNECTIONS    1675

base/system/winlogon/shutdown.c

@@ -56,7 +56,7 @@ OnTimer(
     iSeconds -= iMinutes * 60;
 
     swprintf(szBuffer, L"%02d:%02d:%02d", iHours, iMinutes, iSeconds);
-    SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNTIMELEFT, szBuffer);
+    SetDlgItemTextW(hwndDlg, IDC_SYSSHUTDOWNTIMELEFT, szBuffer);
 
     if (pShutdownParams->dwTimeout == 0)
     {
@@ -94,7 +94,7 @@ ShutdownDialogProc(
             if (pShutdownParams->pszMessage)
             {
                 SetDlgItemTextW(hwndDlg,
-                                IDC_SHUTDOWNCOMMENT,
+                                IDC_SYSSHUTDOWNMESSAGE,
                                 pShutdownParams->pszMessage);
             }