https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a6d4bf0c5b6ddebd1a7f66012d0c3170dc249b2
commit 9a6d4bf0c5b6ddebd1a7f66012d0c3170dc249b2 Author: Eric Kohl <[email protected]> AuthorDate: Mon Apr 2 13:33:41 2018 +0200 Commit: Eric Kohl <[email protected]> CommitDate: Mon Apr 2 13:33:41 2018 +0200 [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 | 12 +++++++----- base/system/winlogon/lang/cs-CZ.rc | 12 +++++++----- base/system/winlogon/lang/de-DE.rc | 12 +++++++----- base/system/winlogon/lang/el-GR.rc | 12 +++++++----- base/system/winlogon/lang/en-US.rc | 12 +++++++----- base/system/winlogon/lang/es-ES.rc | 12 +++++++----- base/system/winlogon/lang/fr-FR.rc | 12 +++++++----- base/system/winlogon/lang/he-IL.rc | 12 +++++++----- base/system/winlogon/lang/hu-HU.rc | 12 +++++++----- base/system/winlogon/lang/id-ID.rc | 12 +++++++----- base/system/winlogon/lang/it-IT.rc | 12 +++++++----- base/system/winlogon/lang/ja-JP.rc | 12 +++++++----- base/system/winlogon/lang/lt-LT.rc | 12 +++++++----- base/system/winlogon/lang/ms-MY.rc | 12 +++++++----- base/system/winlogon/lang/nl-NL.rc | 12 +++++++----- base/system/winlogon/lang/no-NO.rc | 12 +++++++----- base/system/winlogon/lang/pl-PL.rc | 12 +++++++----- base/system/winlogon/lang/pt-BR.rc | 12 +++++++----- base/system/winlogon/lang/ro-RO.rc | 12 +++++++----- base/system/winlogon/lang/ru-RU.rc | 12 +++++++----- base/system/winlogon/lang/sk-SK.rc | 12 +++++++----- base/system/winlogon/lang/sq-AL.rc | 12 +++++++----- base/system/winlogon/lang/sv-SE.rc | 12 +++++++----- base/system/winlogon/lang/tr-TR.rc | 12 +++++++----- base/system/winlogon/lang/uk-UA.rc | 12 +++++++----- base/system/winlogon/lang/zh-CN.rc | 12 +++++++----- base/system/winlogon/lang/zh-TW.rc | 12 +++++++----- base/system/winlogon/resource.h | 23 ++++++++++------------- base/system/winlogon/shutdown.c | 4 ++-- 29 files changed, 201 insertions(+), 150 deletions(-) diff --git a/base/system/winlogon/lang/bg-BG.rc b/base/system/winlogon/lang/bg-BG.rc index 310842acfc..c4909af9af 100644 --- a/base/system/winlogon/lang/bg-BG.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/cs-CZ.rc b/base/system/winlogon/lang/cs-CZ.rc index 503c231227..a5aee95484 100644 --- a/base/system/winlogon/lang/cs-CZ.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/de-DE.rc b/base/system/winlogon/lang/de-DE.rc index cf698c6e40..0c6065a3e8 100644 --- a/base/system/winlogon/lang/de-DE.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/el-GR.rc b/base/system/winlogon/lang/el-GR.rc index d4663ce8c4..f1b6eee22d 100644 --- a/base/system/winlogon/lang/el-GR.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/en-US.rc b/base/system/winlogon/lang/en-US.rc index 2369394828..1fa1c71d8b 100644 --- a/base/system/winlogon/lang/en-US.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/es-ES.rc b/base/system/winlogon/lang/es-ES.rc index 60e4334411..772184ebe3 100644 --- a/base/system/winlogon/lang/es-ES.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc index eab9d4b572..e9cba337c9 100644 --- a/base/system/winlogon/lang/fr-FR.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/he-IL.rc b/base/system/winlogon/lang/he-IL.rc index 0b900ec96c..ebf4b2fb14 100644 --- a/base/system/winlogon/lang/he-IL.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/hu-HU.rc b/base/system/winlogon/lang/hu-HU.rc index 14c127a362..c0c8974e8a 100644 --- a/base/system/winlogon/lang/hu-HU.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/id-ID.rc b/base/system/winlogon/lang/id-ID.rc index c8fec2c143..9cc54d5632 100644 --- a/base/system/winlogon/lang/id-ID.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/it-IT.rc b/base/system/winlogon/lang/it-IT.rc index f16f126013..dc2ab0d8ee 100644 --- a/base/system/winlogon/lang/it-IT.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/ja-JP.rc b/base/system/winlogon/lang/ja-JP.rc index fd586f3d22..30eeb77fb2 100644 --- a/base/system/winlogon/lang/ja-JP.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/lt-LT.rc b/base/system/winlogon/lang/lt-LT.rc index dd4ea23200..6aba0931c6 100644 --- a/base/system/winlogon/lang/lt-LT.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/ms-MY.rc b/base/system/winlogon/lang/ms-MY.rc index b2a1ec4cc1..fa4cca5d5f 100644 --- a/base/system/winlogon/lang/ms-MY.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/nl-NL.rc b/base/system/winlogon/lang/nl-NL.rc index 53967ff4ba..fa28236f5c 100644 --- a/base/system/winlogon/lang/nl-NL.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/no-NO.rc b/base/system/winlogon/lang/no-NO.rc index 799df12b59..0f7ef7e4b3 100644 --- a/base/system/winlogon/lang/no-NO.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/pl-PL.rc b/base/system/winlogon/lang/pl-PL.rc index a4a8f2c65c..2c3f93c311 100644 --- a/base/system/winlogon/lang/pl-PL.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/pt-BR.rc b/base/system/winlogon/lang/pt-BR.rc index 58e107b261..346887795c 100644 --- a/base/system/winlogon/lang/pt-BR.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index edad82edf6..f7684533d0 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/ru-RU.rc b/base/system/winlogon/lang/ru-RU.rc index efa60bec94..479b0dd062 100644 --- a/base/system/winlogon/lang/ru-RU.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/sk-SK.rc b/base/system/winlogon/lang/sk-SK.rc index ced0100fd4..036ef00272 100644 --- a/base/system/winlogon/lang/sk-SK.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/sq-AL.rc b/base/system/winlogon/lang/sq-AL.rc index de8b6046f2..e0c19673f6 100644 --- a/base/system/winlogon/lang/sq-AL.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/sv-SE.rc b/base/system/winlogon/lang/sv-SE.rc index 92aa469aa3..6f1c3e42d6 100644 --- a/base/system/winlogon/lang/sv-SE.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/tr-TR.rc b/base/system/winlogon/lang/tr-TR.rc index 2019d7a9b4..9c82dffd4c 100644 --- a/base/system/winlogon/lang/tr-TR.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/uk-UA.rc b/base/system/winlogon/lang/uk-UA.rc index 3022a35e0b..dc2c39b084 100644 --- a/base/system/winlogon/lang/uk-UA.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/zh-CN.rc b/base/system/winlogon/lang/zh-CN.rc index 16683df9ed..346dc27fc2 100644 --- a/base/system/winlogon/lang/zh-CN.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/lang/zh-TW.rc b/base/system/winlogon/lang/zh-TW.rc index 1b6a15dfee..580707a5c3 100644 --- a/base/system/winlogon/lang/zh-TW.rc +++ b/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 - 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 "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 - LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 + 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.", -1, 38, 7, 135, 40 + LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + 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 diff --git a/base/system/winlogon/resource.h b/base/system/winlogon/resource.h index ac5150876c..41037647d1 100644 --- a/base/system/winlogon/resource.h +++ b/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 */ -#define IDC_SYSSHUTDOWNMSG 501 -#define IDC_SHUTDOWNTIMELEFT 502 -#define IDC_SHUTDOWNCOMMENT 503 -#define IDC_SYSSHUTDOWNICON 504 +/* Dialogs */ +#define IDD_SHUTDOWNCOMPUTER 300 +#define IDC_SHTDOWNICON 301 +#define IDC_SHUTDOWNCOMPUTER 302 +#define IDC_BTNSHTDOWNCOMPUTER 303 +#define IDD_GINALOADFAILED 400 #define IDC_GINALOADFAILED 401 #define IDC_GINALOADFAILEDCONTACT 402 -#define IDC_SHUTDOWNCOMPUTER 302 -#define IDC_BTNSHTDOWNCOMPUTER 305 -#define IDC_SHTDOWNICON 102 +#define IDD_SYSSHUTDOWN 500 +#define IDC_SYSSHUTDOWNICON 501 +#define IDC_SYSSHUTDOWNTIMELEFT 502 +#define IDC_SYSSHUTDOWNMESSAGE 503 /* Strings */ #define IDS_PREPARENETWORKCONNECTIONS 1675 diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c index 8a8a0c9fbd..d09368664a 100644 --- a/base/system/winlogon/shutdown.c +++ b/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); }
