Index: dll/win32/shell32/dialogs/dialogs.cpp =================================================================== --- dll/win32/shell32/dialogs/dialogs.cpp (revision 71635) +++ dll/win32/shell32/dialogs/dialogs.cpp (working copy) @@ -758,7 +758,41 @@ return 0; } +/************************************************************************* + * LogOffDialogProc + * + * NOTES: Used to make the Log Off dialog work + * + */ +INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) +{ + switch(Message) + { + case WM_INITDIALOG: + { + return TRUE; + } + case WM_CLOSE: + EndDialog(hwnd, IDCANCEL); + break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + ExitWindowsEx(EWX_LOGOFF, 0); + break; + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + } + break; + default: + return FALSE; + } + return TRUE; +} + /************************************************************************* * LogoffWindowsDialog [SHELL32.54] */ @@ -765,9 +799,7 @@ EXTERN_C int WINAPI LogoffWindowsDialog(HWND hWndOwner) { - if (ConfirmDialog(hWndOwner, IDS_LOGOFF_PROMPT, IDS_LOGOFF_TITLE)) - ExitWindowsEx(EWX_LOGOFF, 0); - + DialogBox(shell32_hInstance, MAKEINTRESOURCE(IDD_LOG_OFF), hWndOwner, LogOffDialogProc); return 0; } Index: dll/win32/shell32/lang/bg-BG.rc =================================================================== --- dll/win32/shell32/lang/bg-BG.rc (revision 71635) +++ dll/win32/shell32/lang/bg-BG.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Излизане от РеактОС" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 LTEXT "Сигурни ли сте, че искате да излезете?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Излизане", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Отказ", IDCANCEL, 122, 40, 60, 14 + DEFPUSHBUTTON "&Излизане", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Отказ", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/ca-ES.rc =================================================================== --- dll/win32/shell32/lang/ca-ES.rc (revision 71635) +++ dll/win32/shell32/lang/ca-ES.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/cs-CZ.rc =================================================================== --- dll/win32/shell32/lang/cs-CZ.rc (revision 71635) +++ dll/win32/shell32/lang/cs-CZ.rc (working copy) @@ -481,15 +481,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Odhlásit se ze systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Opravdu se chcete odhlásit?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Odhlásit", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Storno", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Opravdu se chcete odhlásit?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "&Odhlásit", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/da-DK.rc =================================================================== --- dll/win32/shell32/lang/da-DK.rc (revision 71635) +++ dll/win32/shell32/lang/da-DK.rc (working copy) @@ -481,15 +481,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/de-DE.rc =================================================================== --- dll/win32/shell32/lang/de-DE.rc (revision 71635) +++ dll/win32/shell32/lang/de-DE.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Abmelden" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Abmelden", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 + LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "&Abmelden", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/el-GR.rc =================================================================== --- dll/win32/shell32/lang/el-GR.rc (revision 71635) +++ dll/win32/shell32/lang/el-GR.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/en-GB.rc =================================================================== --- dll/win32/shell32/lang/en-GB.rc (revision 71635) +++ dll/win32/shell32/lang/en-GB.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/en-US.rc =================================================================== --- dll/win32/shell32/lang/en-US.rc (revision 71635) +++ dll/win32/shell32/lang/en-US.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/es-ES.rc =================================================================== --- dll/win32/shell32/lang/es-ES.rc (revision 71635) +++ dll/win32/shell32/lang/es-ES.rc (working copy) @@ -477,15 +477,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Cerrar sesión de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "¿Esta seguro de que quiere cerrar la sesión?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Cerrar sesión", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 + LTEXT "¿Esta seguro de que quiere cerrar la sesión?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "&Cerrar sesión", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/fi-FI.rc =================================================================== --- dll/win32/shell32/lang/fi-FI.rc (revision 71635) +++ dll/win32/shell32/lang/fi-FI.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/fr-FR.rc =================================================================== --- dll/win32/shell32/lang/fr-FR.rc (revision 71635) +++ dll/win32/shell32/lang/fr-FR.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Fermer ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Êtes-vous sûr de vouloir fermer ReactOS ?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "Fermer", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Annuler", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 + LTEXT "Êtes-vous sûr de vouloir fermer ReactOS ?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "Fermer", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/he-IL.rc =================================================================== --- dll/win32/shell32/lang/he-IL.rc (revision 71635) +++ dll/win32/shell32/lang/he-IL.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/hu-HU.rc =================================================================== --- dll/win32/shell32/lang/hu-HU.rc (revision 71635) +++ dll/win32/shell32/lang/hu-HU.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/it-IT.rc =================================================================== --- dll/win32/shell32/lang/it-IT.rc (revision 71635) +++ dll/win32/shell32/lang/it-IT.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Chiudi sessione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Siete sicuro di voler chiudere la sessione?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Chiudi sessione", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Annulla", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 + LTEXT "Siete sicuro di voler chiudere la sessione?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "&Chiudi sessione", IDOK, 35, 39, 55, 14 + PUSHBUTTON "Annulla", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/ja-JP.rc =================================================================== --- dll/win32/shell32/lang/ja-JP.rc (revision 71635) +++ dll/win32/shell32/lang/ja-JP.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOSのログオフ" FONT 9, "MS UI Gothic" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 LTEXT "ログオフしてもよろしいですか?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "ログオフ(&L)", IDOK, 57, 40, 60, 14 - PUSHBUTTON "キャンセル", IDCANCEL, 122, 40, 60, 14 + DEFPUSHBUTTON "ログオフ(&L)", IDOK, 41, 39, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/ko-KR.rc =================================================================== --- dll/win32/shell32/lang/ko-KR.rc (revision 71635) +++ dll/win32/shell32/lang/ko-KR.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" -FONT 9, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/nl-NL.rc =================================================================== --- dll/win32/shell32/lang/nl-NL.rc (revision 71635) +++ dll/win32/shell32/lang/nl-NL.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/no-NO.rc =================================================================== --- dll/win32/shell32/lang/no-NO.rc (revision 71635) +++ dll/win32/shell32/lang/no-NO.rc (working copy) @@ -475,12 +475,12 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Logg av ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 LTEXT "Er du sikker på at du vil logge av?", -1, 43, 11, 140, 22 DEFPUSHBUTTON "&Logg av", IDOK, 57, 40, 60, 14 PUSHBUTTON "Avbryt", IDCANCEL, 122, 40, 60, 14 Index: dll/win32/shell32/lang/pl-PL.rc =================================================================== --- dll/win32/shell32/lang/pl-PL.rc (revision 71635) +++ dll/win32/shell32/lang/pl-PL.rc (working copy) @@ -479,15 +479,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Wyloguj się z ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Czy na pewno chcesz się wylogować?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Wyloguj", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Czy na pewno chcesz się wylogować?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "&Wyloguj", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/pt-BR.rc =================================================================== --- dll/win32/shell32/lang/pt-BR.rc (revision 71635) +++ dll/win32/shell32/lang/pt-BR.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Você tem certeza que desejar realizar log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Você tem certeza que desejar realizar log off?", -1, 35, 15, 148, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/pt-PT.rc =================================================================== --- dll/win32/shell32/lang/pt-PT.rc (revision 71635) +++ dll/win32/shell32/lang/pt-PT.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Terminar sessão ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Tem a certeza que quer terminar a sessão?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Terminar a sessão", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Tem a certeza que quer terminar a sessão?", -1, 30, 15, 131, 8 + DEFPUSHBUTTON "&Terminar a sessão", IDOK, 30, 38, 64, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/ro-RO.rc =================================================================== --- dll/win32/shell32/lang/ro-RO.rc (revision 71635) +++ dll/win32/shell32/lang/ro-RO.rc (working copy) @@ -477,15 +477,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Deautentificare" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Sigur doriți să vă deautentificați?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Deautentifică", IDOK, 57, 40, 60, 14 - PUSHBUTTON "A&nulează", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Sigur doriți să vă deautentificați?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "D&a", IDOK, 41, 39, 50, 14 + PUSHBUTTON "N&u", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/ru-RU.rc =================================================================== --- dll/win32/shell32/lang/ru-RU.rc (revision 71635) +++ dll/win32/shell32/lang/ru-RU.rc (working copy) @@ -477,15 +477,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Выход из ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Вы действительно хотите выйти из системы?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "В&ыход", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Отмена", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Вы уверены, что хотите выйти?", -1, 35, 16, 146, 8 + PUSHBUTTON "Да", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Нет", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/sk-SK.rc =================================================================== --- dll/win32/shell32/lang/sk-SK.rc (revision 71635) +++ dll/win32/shell32/lang/sk-SK.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Odhlásiť ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Ste si istý, že sa chcete odhlásiť?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "O&dhlásiť", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Zrušiť", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Ste si istý, že sa chcete odhlásiť?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "O&dhlásiť", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Zrušiť", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/sl-SI.rc =================================================================== --- dll/win32/shell32/lang/sl-SI.rc (revision 71635) +++ dll/win32/shell32/lang/sl-SI.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/sq-AL.rc =================================================================== --- dll/win32/shell32/lang/sq-AL.rc (revision 71635) +++ dll/win32/shell32/lang/sq-AL.rc (working copy) @@ -479,15 +479,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Dil nga ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Jeni te sigurte qe doni të dilni?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Dil", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Anulo", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Jeni te sigurte qe doni të dilni?", -1, 35, 16, 146, 8 + DEFPUSHBUTTON "&Dil", IDOK, 41, 39, 50, 14 + PUSHBUTTON "Anulo", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/sv-SE.rc =================================================================== --- dll/win32/shell32/lang/sv-SE.rc (revision 71635) +++ dll/win32/shell32/lang/sv-SE.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/tr-TR.rc =================================================================== --- dll/win32/shell32/lang/tr-TR.rc (revision 71635) +++ dll/win32/shell32/lang/tr-TR.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOS Oturumunu Kapat" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Oturumu kapatmayı gerçekten istiyor musunuz?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "Oturumu &Kapat", IDOK, 57, 40, 60, 14 - PUSHBUTTON "İptal", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 7, 7, 20, 20 + LTEXT "Oturumu kapatmayı gerçekten istiyor musunuz?", -1, 33, 16, 151, 8 + DEFPUSHBUTTON "Oturumu &Kapat", IDOK, 30, 39, 60, 14 + PUSHBUTTON "İptal", IDCANCEL, 95, 39, 60, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/uk-UA.rc =================================================================== --- dll/win32/shell32/lang/uk-UA.rc (revision 71635) +++ dll/win32/shell32/lang/uk-UA.rc (working copy) @@ -475,15 +475,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Вихід із ReactOS" FONT 8, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Ви дійсно бажаєте вийти із системи?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "В&ихід", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Скасувати", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Ви дійсно бажаєте вийти із системи?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "В&ихід", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Скасувати", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/zh-CN.rc =================================================================== --- dll/win32/shell32/lang/zh-CN.rc (revision 71635) +++ dll/win32/shell32/lang/zh-CN.rc (working copy) @@ -484,15 +484,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "注销 ReactOS" FONT 9, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "确信你想要注销吗?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "注销(&L)", IDOK, 57, 40, 60, 14 - PUSHBUTTON "取消", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "你确定你想要注销?", -1, 35, 16, 146, 8 + PUSHBUTTON "是", IDOK, 41, 39, 50, 14 + PUSHBUTTON "否", IDCANCEL, 95, 39, 50, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 Index: dll/win32/shell32/lang/zh-TW.rc =================================================================== --- dll/win32/shell32/lang/zh-TW.rc (revision 71635) +++ dll/win32/shell32/lang/zh-TW.rc (working copy) @@ -483,15 +483,15 @@ ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END -IDD_LOG_OFF DIALOGEX 0, 0, 190, 60 +IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" FONT 9, "MS Shell Dlg" BEGIN - ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 + LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "Log Off", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60