Sync with trunk r58033.

svn path=/branches/ros-csrss/; revision=58034
2025-02-20 15:35:04 +00:00 · 2012-12-28 23:37:33 +00:00 · 2012-12-28 23:37:33 +00:00 · f44e914e80
commit f44e914e80
parent 5a7730db99 d697105863
804 changed files with 56186 additions and 25131 deletions
--- a/base/applications/atactl/atactl.cpp
+++ b/base/applications/atactl/atactl.cpp
@ -118,6 +118,7 @@ void print_help() {
           "...\n"
           "------\n"
           "",
+           DEFAULT_REMOVAL_LOCK_TIMEOUT,
           DEFAULT_REMOVAL_LOCK_TIMEOUT
           );
    exit(0);
--- a/base/applications/cacls/CMakeLists.txt
+++ b/base/applications/cacls/CMakeLists.txt
@ -1,10 +1,6 @@

-set_rc_compiler()
-
 list(APPEND SOURCE cacls.c cacls.rc)
-
 add_executable(cacls ${SOURCE})
-
 set_module_type(cacls win32cui UNICODE)
 add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32)
 add_cd_file(TARGET cacls DESTINATION reactos/system32 FOR all)
--- a/base/applications/calc/CMakeLists.txt
+++ b/base/applications/calc/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)

 add_executable(calc 
@ -15,7 +13,7 @@ add_executable(calc
 set_module_type(calc win32gui UNICODE)
 add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32)
 if(MSVC)
-add_importlibs(calc ntdll)
+    add_importlibs(calc ntdll)
 endif()
 add_pch(calc calc.h)
 add_cd_file(TARGET calc DESTINATION reactos/system32 FOR all)
--- a/base/applications/calc/lang/ja-JP.rc
+++ b/base/applications/calc/lang/ja-JP.rc
@ -341,29 +341,29 @@ END

 IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE
 BEGIN
-    POPUP "編集"
+    POPUP "編集(&E)"
    BEGIN
-        MENUITEM "コピー\tCtrl+C",              IDM_EDIT_COPY
-        MENUITEM "貼 り付けtCtrl+V",           IDM_EDIT_PASTE
+        MENUITEM "コピー(&C)\tCtrl+C",              IDM_EDIT_COPY
+        MENUITEM "貼り付け(&P)\tCtrl+V",           IDM_EDIT_PASTE
    END
-    POPUP "表 示"
+    POPUP "表示(&V)"
    BEGIN
-        MENUITEM "標準",                        IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "関数電卓",                    IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "変換",                        IDM_VIEW_CONVERSION
+        MENUITEM "標準(&T)",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "関数電卓(&S)",                IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "変換(&C)",                    IDM_VIEW_CONVERSION
        MENUITEM SEPARATOR
-        MENUITEM "16進\tF5",                    IDM_VIEW_HEX, CHECKED
-        MENUITEM "10進\tF6",                    IDM_VIEW_DEC, CHECKED
-        MENUITEM "8進\tF7",                     IDM_VIEW_OCT, CHECKED
-        MENUITEM "2進\tF8",                     IDM_VIEW_BIN, CHECKED
+        MENUITEM "1&6進\tF5",                   IDM_VIEW_HEX, CHECKED
+        MENUITEM "&10進\tF6",                   IDM_VIEW_DEC, CHECKED
+        MENUITEM "&8進\tF7",                    IDM_VIEW_OCT, CHECKED
+        MENUITEM "&2進\tF8",                    IDM_VIEW_BIN, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "Degrees\tF2",                 IDM_VIEW_DEG, CHECKED
-        MENUITEM "Radians\tF3",                 IDM_VIEW_RAD, CHECKED
-        MENUITEM "Gradians\tF4",                IDM_VIEW_GRAD, CHECKED
+        MENUITEM "&Degrees\tF2",                IDM_VIEW_DEG, CHECKED
+        MENUITEM "&Radians\tF3",                IDM_VIEW_RAD, CHECKED
+        MENUITEM "&Gradians\tF4",               IDM_VIEW_GRAD, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "桁を区切る",                  IDM_VIEW_GROUP, CHECKED
+        MENUITEM "桁を区切る(&I)",              IDM_VIEW_GROUP, CHECKED
    END
-    POPUP "ヘルプ"
+    POPUP "ヘルプ(&H)"
    BEGIN
        MENUITEM "ヘルプ トピック",             IDM_HELP_HELP
        MENUITEM SEPARATOR
@ -373,30 +373,30 @@ END

 IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE
 BEGIN
-    POPUP "編集"
+    POPUP "編集(&E)"
    BEGIN
-        MENUITEM "コピー\tCtrl+C",              IDM_EDIT_COPY
-        MENUITEM "貼 り付け\tCtrl+V",           IDM_EDIT_PASTE
+        MENUITEM "コピー(&C)\tCtrl+C",          IDM_EDIT_COPY
+        MENUITEM "貼り付け(&P)\tCtrl+V",        IDM_EDIT_PASTE
    END
-    POPUP "表 示"
+    POPUP "表示(&V)"
    BEGIN
-        MENUITEM "標準",                        IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "関数電卓",                    IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "変換",                        IDM_VIEW_CONVERSION
+        MENUITEM "標準(&T)",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "関数電卓(&S)",                IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "変換(&C)",                    IDM_VIEW_CONVERSION
        MENUITEM SEPARATOR
-        MENUITEM "16進\tF5",                    IDM_VIEW_HEX, CHECKED
-        MENUITEM "10進\tF6",                    IDM_VIEW_DEC, CHECKED
-        MENUITEM "8進\tF7",                     IDM_VIEW_OCT, CHECKED
-        MENUITEM "2進\tF8",                     IDM_VIEW_BIN, CHECKED
+        MENUITEM "1&6進\tF5",                   IDM_VIEW_HEX, CHECKED
+        MENUITEM "&10進\tF6",                   IDM_VIEW_DEC, CHECKED
+        MENUITEM "&8進\tF7",                    IDM_VIEW_OCT, CHECKED
+        MENUITEM "&2進\tF8",                    IDM_VIEW_BIN, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "Qword\tF12",                  IDM_VIEW_QWORD, CHECKED
-        MENUITEM "Dword\tF2",                   IDM_VIEW_DWORD, CHECKED
-        MENUITEM "Word\tF3",                    IDM_VIEW_WORD, CHECKED
-        MENUITEM "Byte\tF4",                    IDM_VIEW_BYTE, CHECKED
+        MENUITEM "&Qword\tF12",                 IDM_VIEW_QWORD, CHECKED
+        MENUITEM "&Dword\tF2",                  IDM_VIEW_DWORD, CHECKED
+        MENUITEM "&Word\tF3",                   IDM_VIEW_WORD, CHECKED
+        MENUITEM "&Byte\tF4",                   IDM_VIEW_BYTE, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "桁を区切る",                  IDM_VIEW_GROUP, CHECKED
+        MENUITEM "桁を区切る(&I)",              IDM_VIEW_GROUP, CHECKED
    END
-    POPUP "ヘルプ"
+    POPUP "ヘルプ(&H)"
    BEGIN
        MENUITEM "ヘルプ トピック",             IDM_HELP_HELP
        MENUITEM SEPARATOR
@ -406,20 +406,20 @@ END

 IDR_MENU_STANDARD MENU DISCARDABLE
 BEGIN
-    POPUP "編集"
+    POPUP "編集(&E)"
    BEGIN
-        MENUITEM "コピー\tCtrl+C",              IDM_EDIT_COPY
-        MENUITEM "貼 り付け\tCtrl+V",           IDM_EDIT_PASTE
+        MENUITEM "コピー(&C)\tCtrl+C",          IDM_EDIT_COPY
+        MENUITEM "貼り付け(&P)\tCtrl+V",        IDM_EDIT_PASTE
    END
-    POPUP "表 示"
+    POPUP "表示"
    BEGIN
-        MENUITEM "標準",                        IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "関数電卓",                    IDM_VIEW_SCIENTIFIC, CHECKED
-        MENUITEM "変換",                        IDM_VIEW_CONVERSION
+        MENUITEM "標準(&T)",                    IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "関数電卓(&S)",                IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "変換(&C)",                    IDM_VIEW_CONVERSION
        MENUITEM SEPARATOR
-        MENUITEM "桁を区切る",                  IDM_VIEW_GROUP, CHECKED
+        MENUITEM "桁を区切る(&I)",              IDM_VIEW_GROUP, CHECKED
    END
-    POPUP "ヘルプ"
+    POPUP "ヘルプ(&H)"
    BEGIN
        MENUITEM "ヘルプ トピック",             IDM_HELP_HELP
        MENUITEM SEPARATOR
@ -431,7 +431,7 @@ END

 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_STRING_LICENSE      "ReactOS 電卓はGNU GPLライセンスの元で提供されるフリーソ フトウェアです。\r\n\r\nこちらでGNU GPLライセンスのコピーを得ることができます:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nこちらでGNU GPLライセンスの翻訳を得ることができます:\r\nhttp://www.gnu.org/licenses/translations.html"
+    IDS_STRING_LICENSE      "ReactOS 電卓はGNU GPLライセンスの元で提供されるフリーソフトウェアです。\r\n\r\nこちらでGNU GPLライセンスのコピーを得ることができます:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nこちらでGNU GPLライセンスの翻訳を得ることができます:\r\nhttp://www.gnu.org/licenses/translations.html"
    IDS_MATH_ERROR          "エラー"
    IDS_QUICKHELP           "クイックヘルプ"
 END
--- a/base/applications/charmap/CMakeLists.txt
+++ b/base/applications/charmap/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 list(APPEND SOURCE
    about.c
    charmap.c
@ -10,11 +8,7 @@ list(APPEND SOURCE
    charmap.rc)

 add_executable(charmap ${SOURCE})
-
 set_module_type(charmap win32gui UNICODE)
-
 add_importlibs(charmap advapi32 user32 gdi32 comctl32 msvcrt kernel32)
-
 add_pch(charmap precomp.h)
-
 add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all)
--- a/base/applications/cmdutils/doskey/CMakeLists.txt
+++ b/base/applications/cmdutils/doskey/CMakeLists.txt
@ -1,8 +1,5 @@

-set_rc_compiler()
-
 add_executable(doskey doskey.c doskey.rc)
-
 set_module_type(doskey win32cui UNICODE)
 add_importlibs(doskey user32 msvcrt kernel32)
 add_cd_file(TARGET doskey DESTINATION reactos/system32 FOR all)
--- a/base/applications/cmdutils/find/CMakeLists.txt
+++ b/base/applications/cmdutils/find/CMakeLists.txt
@ -1,8 +1,5 @@

-set_rc_compiler()
-
 add_executable(find find.c find.rc)
-
 set_module_type(find win32cui)
 add_importlibs(find user32 msvcrt kernel32)
 add_cd_file(TARGET find DESTINATION reactos/system32 FOR all)
--- a/base/applications/cmdutils/more/CMakeLists.txt
+++ b/base/applications/cmdutils/more/CMakeLists.txt
@ -1,8 +1,5 @@

-set_rc_compiler()
-
 add_executable(more more.c more.rc)
-
 set_module_type(more win32cui)
 add_importlibs(more user32 msvcrt kernel32)
 add_cd_file(TARGET more DESTINATION reactos/system32 FOR all)
--- a/base/applications/cmdutils/more/more.c
+++ b/base/applications/cmdutils/more/more.c
@ -164,6 +164,7 @@ int main (int argc, char **argv)
    if (!LoadString(hApp, IDS_CONTINUE, szCont, sizeof(szCont) / sizeof(TCHAR)))
    {
        /* Shouldn't happen, so exit */
+        free(buff);
        return 1;
    }
    szContLength = _tcslen(szCont);
--- a/base/applications/cmdutils/reg/CMakeLists.txt
+++ b/base/applications/cmdutils/reg/CMakeLists.txt
@ -1,11 +1,8 @@

-set_rc_compiler()
-
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)

-add_executable(reg reg.c rsrc.rc)
-
+add_executable(reg reg.c reg.rc)
 set_module_type(reg win32cui UNICODE)
 add_importlibs(reg advapi32 user32 msvcrt kernel32)
 add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all)
--- a/base/applications/cmdutils/reg/lang/bg-BG.rc
+++ b/base/applications/cmdutils/reg/lang/bg-BG.rc
--- a/base/applications/cmdutils/reg/lang/da-DK.rc
+++ b/base/applications/cmdutils/reg/lang/da-DK.rc
--- a/base/applications/cmdutils/reg/lang/de-DE.rc
+++ b/base/applications/cmdutils/reg/lang/de-DE.rc
--- a/base/applications/cmdutils/reg/lang/en-US.rc
+++ b/base/applications/cmdutils/reg/lang/en-US.rc
--- a/base/applications/cmdutils/reg/lang/es-ES.rc
+++ b/base/applications/cmdutils/reg/lang/es-ES.rc
--- a/base/applications/cmdutils/reg/lang/fr-FR.rc
+++ b/base/applications/cmdutils/reg/lang/fr-FR.rc
--- a/base/applications/cmdutils/reg/lang/it-IT.rc
+++ b/base/applications/cmdutils/reg/lang/it-IT.rc
--- a/base/applications/cmdutils/reg/lang/ja-JP.rc
+++ b/base/applications/cmdutils/reg/lang/ja-JP.rc
--- a/base/applications/cmdutils/reg/lang/ko-KR.rc
+++ b/base/applications/cmdutils/reg/lang/ko-KR.rc
@ -26,13 +26,13 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

 STRINGTABLE
 {
-    STRING_USAGE, "명령어 형식:\n\nREG [ ADD | DELETE | QUERY ]\nREG 명령어 /?\n"
-    STRING_ADD_USAGE, "REG ADD 값 [/v 값 | /ve] [/t 형식] [/s 분리기호] [/d 데이타] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE 키 이름 [/v 값 | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY 키 이름 [/v 값| /ve] [/s]\n"
-    STRING_SUCCESS, "작업이 성공적으로 끝났습니다\n"
-    STRING_INVALID_KEY, "에러: 올바르지 않은 키 이름\n"
-    STRING_INVALID_CMDLINE, "에러:올바르지 않은 명령라인 매개변수\n"
-    STRING_NO_REMOTE, "에러: 원격 머신에  키를 더하는 것은 가능하지 않습니다\n"
-    STRING_CANNOT_FIND, "에러: 이 시스템에서 지정된 레지스트리 키나 값을 찾을수 없습니다\n"
+    STRING_USAGE, "명령어 형식:\n\nREG [ ADD | DELETE | QUERY ]\nREG 명령어 /?\n"
+    STRING_ADD_USAGE, "REG ADD 값 [/v 값 | /ve] [/t 형식] [/s 분리기호] [/d 데이타] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE 키 이름 [/v 값 | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY 키 이름 [/v 값| /ve] [/s]\n"
+    STRING_SUCCESS, "작업이 성공적으로 끝났습니다\n"
+    STRING_INVALID_KEY, "에러: 올바르지 않은 키 이름\n"
+    STRING_INVALID_CMDLINE, "에러:올바르지 않은 명령라인 매개변수\n"
+    STRING_NO_REMOTE, "에러: 원격 머신에  키를 더하는 것은 가능하지 않습니다\n"
+    STRING_CANNOT_FIND, "에러: 이 시스템에서 지정된 레지스트리 키나 값을 찾을수 없습니다\n"
 }
--- a/base/applications/cmdutils/reg/lang/lt-LT.rc
+++ b/base/applications/cmdutils/reg/lang/lt-LT.rc
--- a/base/applications/cmdutils/reg/lang/nl-NL.rc
+++ b/base/applications/cmdutils/reg/lang/nl-NL.rc
--- a/base/applications/cmdutils/reg/lang/no-NO.rc
+++ b/base/applications/cmdutils/reg/lang/no-NO.rc
--- a/base/applications/cmdutils/reg/lang/pl-PL.rc
+++ b/base/applications/cmdutils/reg/lang/pl-PL.rc
@ -4,7 +4,7 @@
 *
 * Copyright 2008 Andrew Riedi
 * Copyright 2008 Mikolaj Zalewski
- * Copyright 2010 Łukasz Wojniłowicz
+ * Copyright 2010 Łukasz Wojniłowicz
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@ -27,13 +27,13 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

 STRINGTABLE
 {
-    STRING_USAGE, "Składnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n"
-    STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartości | /ve] [/t typ] [/s separator] [/d dane] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartości | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartości | /ve] [/s]\n"
-    STRING_SUCCESS, "Operacja zakończona pomyślnie\n"
-    STRING_INVALID_KEY, "Błąd: Niewłaściwa nazwa klucza\n"
-    STRING_INVALID_CMDLINE, "Błąd: Niewłaściwe parametry wiersza poleceń\n"
-    STRING_NO_REMOTE, "Błąd: Nie można dodać kluczy do zdalnej maszyny\n"
-    STRING_CANNOT_FIND, "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n"
+    STRING_USAGE, "Składnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n"
+    STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartości | /ve] [/t typ] [/s separator] [/d dane] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartości | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartości | /ve] [/s]\n"
+    STRING_SUCCESS, "Operacja zakończona pomyślnie\n"
+    STRING_INVALID_KEY, "Błąd: Niewłaściwa nazwa klucza\n"
+    STRING_INVALID_CMDLINE, "Błąd: Niewłaściwe parametry wiersza poleceń\n"
+    STRING_NO_REMOTE, "Błąd: Nie można dodać kluczy do zdalnej maszyny\n"
+    STRING_CANNOT_FIND, "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n"
 }
--- a/base/applications/cmdutils/reg/lang/pt-PT.rc
+++ b/base/applications/cmdutils/reg/lang/pt-PT.rc
--- a/base/applications/cmdutils/reg/lang/ro-RO.rc
+++ b/base/applications/cmdutils/reg/lang/ro-RO.rc
--- a/base/applications/cmdutils/reg/lang/ru-RU.rc
+++ b/base/applications/cmdutils/reg/lang/ru-RU.rc
--- a/base/applications/cmdutils/reg/lang/sl-SI.rc
+++ b/base/applications/cmdutils/reg/lang/sl-SI.rc
--- a/base/applications/cmdutils/reg/lang/sv-SE.rc
+++ b/base/applications/cmdutils/reg/lang/sv-SE.rc
--- a/base/applications/cmdutils/reg/lang/uk-UA.rc
+++ b/base/applications/cmdutils/reg/lang/uk-UA.rc
--- a/base/applications/cmdutils/reg/reg.rc
+++ b/base/applications/cmdutils/reg/reg.rc
@ -0,0 +1,13 @@
+#include <windows.h>
+#include <commctrl.h>
+#include "reg.h"
+
+/* Define language neutral resources */
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Registry Console Tool"
+#define REACTOS_STR_INTERNAL_NAME       "reg"
+#define REACTOS_STR_ORIGINAL_FILENAME   "reg.exe"
+#include <reactos/version.rc>
+
+#include "rsrc.rc"
--- a/base/applications/cmdutils/reg/rsrc.rc
+++ b/base/applications/cmdutils/reg/rsrc.rc
@ -1,59 +1,63 @@
-#ifdef LANGUAGE_EN_US
-    #include "En.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "Ko.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "Nl.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "Pl.rc"
-#endif
+#include <windows.h>
+#include "reg.h"

-/* UTF-8 */
+/* Include localised resources */
+// UTF-8
+#pragma code_page(65001)
 #ifdef LANGUAGE_BG_BG
-    #include "Bg.rc"
+    #include "lang/bg-BG.rc"
 #endif
 #ifdef LANGUAGE_DA_DK
-    #include "Da.rc"
+    #include "lang/da-DK.rc"
 #endif
 #ifdef LANGUAGE_DE_DE
-    #include "De.rc"
+    #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
 #endif
 #ifdef LANGUAGE_ES_ES
-    #include "Es.rc"
+    #include "lang/es-ES.rc"
 #endif
 #ifdef LANGUAGE_FR_FR
-    #include "Fr.rc"
+    #include "lang/fr-FR.rc"
 #endif
 #ifdef LANGUAGE_IT_IT
-    #include "It.rc"
+    #include "lang/it-IT.rc"
 #endif
 #ifdef LANGUAGE_JA_JP
-    #include "Ja.rc"
+    #include "lang/ja-JP.rc"
+#endif
+#ifdef LANGUAGE_KO_KR
+    #include "lang/ko-KR.rc"
 #endif
 #ifdef LANGUAGE_LT_LT
-    #include "Lt.rc"
+    #include "lang/lt-LT.rc"
+#endif
+#ifdef LANGUAGE_NL_NL
+    #include "lang/nl-NL.rc"
 #endif
 #ifdef LANGUAGE_NO_NO
-    #include "No.rc"
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+    #include "lang/pl-PL.rc"
 #endif
 #ifdef LANGUAGE_PT_PT
-    #include "Pt.rc"
+    #include "lang/pt-PT.rc"
 #endif
 #ifdef LANGUAGE_RO_RO
-    #include "Ro.rc"
+    #include "lang/ro-RO.rc"
 #endif
 #ifdef LANGUAGE_RU_RU
-    #include "Ru.rc"
+    #include "lang/ru-RU.rc"
 #endif
 #ifdef LANGUAGE_SL_SI
-    #include "Si.rc"
+    #include "lang/sl-SI.rc"
 #endif
 #ifdef LANGUAGE_SV_SE
-    #include "Sv.rc"
+    #include "lang/sv-SE.rc"
 #endif
 #ifdef LANGUAGE_UK_UA
-    #include "Uk.rc"
+    #include "lang/uk-UA.rc"
 #endif
--- a/base/applications/cmdutils/xcopy/CMakeLists.txt
+++ b/base/applications/cmdutils/xcopy/CMakeLists.txt
@ -1,8 +1,5 @@

-set_rc_compiler()
-
 add_executable(xcopy xcopy.c rsrc.rc)
-
 target_link_libraries(xcopy wine)
 set_module_type(xcopy win32cui UNICODE)
 add_importlibs(xcopy shell32 user32 msvcrt kernel32 ntdll)
--- a/base/applications/control/CMakeLists.txt
+++ b/base/applications/control/CMakeLists.txt
@ -1,8 +1,5 @@

-set_rc_compiler()
-
 add_executable(control control.c control.rc)
-
 set_module_type(control win32gui UNICODE)
 add_importlibs(control advapi32 shell32 msvcrt kernel32)
 add_cd_file(TARGET control DESTINATION reactos/system32 FOR all)
--- a/base/applications/dxdiag/CMakeLists.txt
+++ b/base/applications/dxdiag/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 list(APPEND SOURCE
    system.c
    display.c
@ -18,13 +16,8 @@ list(APPEND SOURCE
    d3dtest9.c)

 add_executable(dxdiag ${SOURCE})
-
 set_module_type(dxdiag win32gui UNICODE)
-
 target_link_libraries(dxdiag dxguid)
-
 add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32 ntdll)
-
 add_pch(dxdiag precomp.h)
-
 add_cd_file(TARGET dxdiag DESTINATION reactos/system32 FOR all)
--- a/base/applications/findstr/CMakeLists.txt
+++ b/base/applications/findstr/CMakeLists.txt
@ -1,8 +1,5 @@

-set_rc_compiler()
-
 add_executable(findstr findstr.c findstr.rc)
-
 set_module_type(findstr win32cui)
 add_importlibs(findstr user32 msvcrt kernel32)
 add_cd_file(TARGET findstr DESTINATION reactos/system32 FOR all)
--- a/base/applications/fontview/CMakeLists.txt
+++ b/base/applications/fontview/CMakeLists.txt
@ -1,5 +1,4 @@

-set_rc_compiler()
 add_executable(fontview
    display.c
    fontview.c
@ -7,5 +6,4 @@ add_executable(fontview

 set_module_type(fontview win32gui)
 add_importlibs(fontview comdlg32 gdi32 shell32 user32 msvcrt kernel32)
-
 add_cd_file(TARGET fontview DESTINATION reactos/system32 FOR all)
--- a/base/applications/fontview/ttf.ico
+++ b/base/applications/fontview/ttf.ico
--- a/base/applications/games/solitaire/CMakeLists.txt
+++ b/base/applications/games/solitaire/CMakeLists.txt
@ -1,6 +1,5 @@

 set_cpp()
-set_rc_compiler()

 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib)

--- a/base/applications/games/spider/CMakeLists.txt
+++ b/base/applications/games/spider/CMakeLists.txt
@ -3,8 +3,6 @@ set_cpp()

 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib ${CMAKE_CURRENT_SOURCE_DIR})

-set_rc_compiler()
-
 add_executable(spider
    spider.cpp
    spigame.cpp
--- a/base/applications/games/winmine/CMakeLists.txt
+++ b/base/applications/games/winmine/CMakeLists.txt
@ -1,8 +1,6 @@

 include_directories(${CMAKE_CURRENT_SOURCE_DIR})

-set_rc_compiler()
-
 add_executable(winmine
    main.c
    dialog.c
@ -11,5 +9,4 @@ add_executable(winmine
 set_module_type(winmine win32gui)
 target_link_libraries(winmine wine)
 add_importlibs(winmine user32 gdi32 advapi32 shell32 msvcrt kernel32 ntdll)
-
 add_cd_file(TARGET winmine DESTINATION reactos/system32 FOR all)
--- a/base/applications/hh/CMakeLists.txt
+++ b/base/applications/hh/CMakeLists.txt
@ -1,5 +1,4 @@

-set_rc_compiler()
 add_executable(hh main.c hh.rc)
 set_module_type(hh win32gui)
 add_importlibs(hh gdi32 user32 msvcrt kernel32)
--- a/base/applications/iexplore/CMakeLists.txt
+++ b/base/applications/iexplore/CMakeLists.txt
@ -1,5 +1,4 @@

-set_rc_compiler()
 add_executable(iexplore main.c iexplore.rc)
 set_module_type(iexplore win32gui)
 add_importlibs(iexplore shdocvw msvcrt kernel32)
--- a/base/applications/kbswitch/CMakeLists.txt
+++ b/base/applications/kbswitch/CMakeLists.txt
@ -1,10 +1,6 @@

-set_rc_compiler()
-
 add_executable(kbswitch kbswitch.c kbswitch.rc)
-
 set_module_type(kbswitch win32gui UNICODE)
 add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32)
-
 add_cd_file(TARGET kbswitch DESTINATION reactos/system32 FOR all)
 add_subdirectory(kbsdll)
--- a/base/applications/logoff/CMakeLists.txt
+++ b/base/applications/logoff/CMakeLists.txt
@ -1,13 +1,10 @@

-set_rc_compiler()
-
 list(APPEND SOURCE
    misc.c
    logoff.c
    logoff.rc)

 add_executable(logoff ${SOURCE})
-
 set_module_type(logoff win32cui)
 add_importlibs(logoff advapi32 user32 msvcrt kernel32)
 add_pch(logoff precomp.h)
--- a/base/applications/magnify/CMakeLists.txt
+++ b/base/applications/magnify/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 add_executable(magnify
    magnifier.c
    settings.c
--- a/base/applications/magnify/lang/fr-FR.rc
+++ b/base/applications/magnify/lang/fr-FR.rc
@ -54,7 +54,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
    DEFPUSHBUTTON   "OK",IDOK,193,76,50,14
    ICON            IDI_ICON,IDC_STATIC,7,17,20,20
-    LTEXT           "La loupe a été réalisée pour fournir quelques fonctionnalités aux utilisateurs souffrants de déficiences visuelles. La majorité de ces utilisateurs aura besoin d'un utilitaire d'agrandissement avec plus de fonctionnalités pour une utilisation quotidienne.",IDC_STATIC,36,7,207,33
+    LTEXT           "La loupe a été réalisée pour fournir quelques fonctionnalités aux utilisateurs souffrant de déficiences visuelles. La majorité de ces utilisateurs aura besoin d'un utilitaire d'agrandissement avec plus de fonctionnalités pour une utilisation quotidienne.",IDC_STATIC,36,7,207,33
    CONTROL         "Ne plus montrer ce message",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
 END

--- a/base/applications/magnify/lang/ja-JP.rc
+++ b/base/applications/magnify/lang/ja-JP.rc
@ -38,13 +38,13 @@ BEGIN
    LTEXT           "拡大率:",IDC_STATIC,6,8,68,8
    COMBOBOX        IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
    GROUPBOX        "拡大の対象",IDC_STATIC,7,25,139,59
-    GROUPBOX        "表 示",IDC_STATIC,7,87,139,57
-    CONTROL         "マウス カーソ ルの動きを追う",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10
+    GROUPBOX        "表示",IDC_STATIC,7,87,139,57
+    CONTROL         "マウス カーソルの動きを追う",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10
    CONTROL         "キーボードのフォーカスを追う",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10
    CONTROL         "編集中のテキストを追う",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10
    CONTROL         "色を反転する",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10
    CONTROL         "最小化して開始する",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10
-    CONTROL         "拡大鏡を表 示する",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10
+    CONTROL         "拡大鏡を表示する",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10
 END

 IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97
@ -54,8 +54,8 @@ FONT 9, "MS UI Gothic", 400, 0, 0x1
 BEGIN
    DEFPUSHBUTTON   "OK",IDOK,193,76,50,14
    ICON            IDI_ICON,IDC_STATIC,7,17,20,20
-    LTEXT           "拡大鏡は軽い視覚障害がある方に最低限の機能 を提供するように設計されています。ほとんどの視覚障害者の方の場合、日常利用するにはより高機能 な拡大ユーティリティが必要となります。",IDC_STATIC,36,7,207,33
-    CONTROL         "今後、このメッセージを表 示しない",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
+    LTEXT           "拡大鏡は軽い視覚障害がある方に最低限の機能を提供するように設計されています。ほとんどの視覚障害者の方の場合、日常利用するにはより高機能な拡大ユーティリティが必要となります。",IDC_STATIC,36,7,207,33
+    CONTROL         "今後、このメッセージを表示しない",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
 END

 STRINGTABLE
--- a/base/applications/magnify/magnifier.c
+++ b/base/applications/magnify/magnifier.c
@ -7,6 +7,7 @@
 *
 */

+/* TODO: AppBar */
 #include "magnifier.h"

 const TCHAR szWindowClass[] = TEXT("MAGNIFIER");
@ -118,18 +119,21 @@ ATOM MyRegisterClass(HINSTANCE hInstance)
 */
 BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 {
+   RECT rcWorkArea;
   hInst = hInstance; // Store instance handle in our global variable

-    // Create the Window
+   SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0);
+
+   /* Create the Window */
   hMainWnd = CreateWindowEx(
-        WS_EX_TOPMOST,
+        WS_EX_TOPMOST | WS_EX_PALETTEWINDOW,
        szWindowClass,
        szTitle,
        WS_OVERLAPPEDWINDOW,
        CW_USEDEFAULT,
        CW_USEDEFAULT,
-        CW_USEDEFAULT,
-        CW_USEDEFAULT,
+        (rcWorkArea.right - rcWorkArea.left) * 2 / 3,
+        200,
        NULL,
        NULL,
        hInstance,
--- a/base/applications/mmc/CMakeLists.txt
+++ b/base/applications/mmc/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 list(APPEND SOURCE
    console.c
    misc.c
@ -8,7 +6,6 @@ list(APPEND SOURCE
    mmc.rc)

 add_executable(mmcclient ${SOURCE})
-
 set_module_type(mmcclient win32gui UNICODE)
 add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32)
 add_pch(mmcclient precomp.h)
--- a/base/applications/mplay32/CMakeLists.txt
+++ b/base/applications/mplay32/CMakeLists.txt
@ -1,8 +1,5 @@

-set_rc_compiler()
-
 add_executable(mplay32 mplay32.c mplay32.rc)
-
 set_module_type(mplay32 win32gui UNICODE)
 add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt kernel32)
 add_cd_file(TARGET mplay32 DESTINATION reactos/system32 FOR all)
--- a/base/applications/msconfig/CMakeLists.txt
+++ b/base/applications/msconfig/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 list(APPEND SOURCE
    toolspage.c
    srvpage.c
@ -12,7 +10,6 @@ list(APPEND SOURCE
    msconfig.rc)

 add_executable(msconfig ${SOURCE})
-
 set_module_type(msconfig win32gui UNICODE)
 add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32)
 add_pch(msconfig precomp.h)
--- a/base/applications/mscutils/devmgmt/CMakeLists.txt
+++ b/base/applications/mscutils/devmgmt/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 list(APPEND SOURCE
    about.c
    devmgmt.c
@ -10,7 +8,6 @@ list(APPEND SOURCE
    devmgmt.rc)

 add_executable(devmgmt ${SOURCE})
-
 set_module_type(devmgmt win32gui UNICODE)
 add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32)
 add_pch(devmgmt precomp.h)
--- a/base/applications/mscutils/eventvwr/CMakeLists.txt
+++ b/base/applications/mscutils/eventvwr/CMakeLists.txt
@ -1,13 +1,8 @@

-set_rc_compiler()
-
 add_executable(eventvwr eventvwr.c eventvwr.rc)
-
 set_module_type(eventvwr win32gui UNICODE)
 add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt kernel32)
-
 if(MSVC)
    add_importlibs(eventvwr ntdll)
 endif()
-
 add_cd_file(TARGET eventvwr DESTINATION reactos/system32 FOR all)
--- a/base/applications/mscutils/servman/CMakeLists.txt
+++ b/base/applications/mscutils/servman/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 list(APPEND SOURCE
    about.c
    control.c
@ -24,11 +22,7 @@ list(APPEND SOURCE
    servman.rc)

 add_executable(servman ${SOURCE})
-
 set_module_type(servman win32gui UNICODE)
-
 add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32)
-
 add_pch(servman precomp.h)
-
 add_cd_file(TARGET servman DESTINATION reactos/system32 FOR all)
--- a/base/applications/mspaint/CMakeLists.txt
+++ b/base/applications/mspaint/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 add_executable(mspaint
    dialogs.c
    dib.c
--- a/base/applications/mstsc/CMakeLists.txt
+++ b/base/applications/mstsc/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 list(APPEND SOURCE
    bitmap.c
    bsops.c
@ -24,11 +22,7 @@ list(APPEND SOURCE
    rdc.rc)

 add_executable(mstsc ${SOURCE})
-
 set_module_type(mstsc win32gui UNICODE)
-
 add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32)
-
 add_pch(mstsc precomp.h)
-
 add_cd_file(TARGET mstsc DESTINATION reactos/system32 FOR all)
--- a/base/applications/network/ipconfig/CMakeLists.txt
+++ b/base/applications/network/ipconfig/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 add_executable(ipconfig ipconfig.c ipconfig.rc)
 set_module_type(ipconfig win32cui)
 add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt kernel32)
--- a/base/applications/network/ping/CMakeLists.txt
+++ b/base/applications/network/ping/CMakeLists.txt
@ -1,15 +1,9 @@

 add_definitions(-D__USE_W32_SOCKETS)
-
-set_rc_compiler()
-
 add_executable(ping ping.c ping.rc)
-
 set_module_type(ping win32cui UNICODE)
 add_importlibs(ping ws2_32 msvcrt kernel32)
-
 if(MSVC)
    add_importlibs(ping ntdll)
 endif()
-
 add_cd_file(TARGET ping DESTINATION reactos/system32 FOR all)
--- a/base/applications/notepad/CMakeLists.txt
+++ b/base/applications/notepad/CMakeLists.txt
@ -6,10 +6,7 @@ list(APPEND SOURCE
    text.c
    rsrc.rc)

-set_rc_compiler()
-
 add_executable(notepad ${SOURCE})
-
 set_module_type(notepad win32gui UNICODE)
 add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32)
 add_pch(notepad notepad.h)
--- a/base/applications/notepad/dialog.c
+++ b/base/applications/notepad/dialog.c
@ -92,7 +92,7 @@ static LPWSTR ConvertToUNICODE(LPSTR pszText, DWORD *pdwSize)
 }
 #endif

-VOID ShowLastError(void)
+VOID ShowLastError(VOID)
 {
    DWORD error = GetLastError();
    if (error != NO_ERROR)
@ -117,22 +117,22 @@ VOID ShowLastError(void)
 */
 static void UpdateWindowCaption(void)
 {
-  TCHAR szCaption[MAX_STRING_LEN] = _T("");
+  TCHAR szCaption[MAX_STRING_LEN];
  TCHAR szNotepad[MAX_STRING_LEN];

  LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad));

-  if (Globals.szFileTitle[0] != '\0')
+  if (Globals.szFileTitle[0] != 0)
  {
-      StringCchCat(szCaption, MAX_STRING_LEN, Globals.szFileTitle);
+      StringCchCopy(szCaption, SIZEOF(szCaption), Globals.szFileTitle);
  }
  else
  {
      LoadString(Globals.hInstance, STRING_UNTITLED, szCaption, SIZEOF(szCaption));
  }
  
-  StringCchCat(szCaption, MAX_STRING_LEN, _T(" - "));
-  StringCchCat(szCaption, MAX_STRING_LEN, szNotepad);
+  StringCchCat(szCaption, SIZEOF(szCaption), _T(" - "));
+  StringCchCat(szCaption, SIZEOF(szCaption), szNotepad);
  SetWindowText(Globals.hMainWnd, szCaption);
 }

@ -187,7 +187,6 @@ BOOL FileExists(LPCTSTR szFilename)
   return (hFile != INVALID_HANDLE_VALUE);
 }

-
 BOOL HasFileExtension(LPCTSTR szFilename)
 {
    LPCTSTR s;
@ -198,9 +197,9 @@ BOOL HasFileExtension(LPCTSTR szFilename)
    return _tcsrchr(szFilename, _T('.')) != NULL;
 }

-
-static VOID DoSaveFile(VOID)
+static BOOL DoSaveFile(VOID)
 {
+    BOOL bRet = TRUE;
    HANDLE hFile;
    LPTSTR pTemp;
    DWORD size;
@ -210,7 +209,7 @@ static VOID DoSaveFile(VOID)
    if(hFile == INVALID_HANDLE_VALUE)
    {
        ShowLastError();
-        return;
+        return FALSE;
    }

    size = GetWindowTextLength(Globals.hEdit) + 1;
@ -219,30 +218,38 @@ static VOID DoSaveFile(VOID)
    {
        CloseHandle(hFile);
        ShowLastError();
-        return;
+        return FALSE;
    }
    size = GetWindowText(Globals.hEdit, pTemp, size);

 #ifndef UNICODE
    pTemp = (LPTSTR)ConvertToUNICODE(pTemp, &size);
-    if (!pTemp) {
+    if (!pTemp)
+    {
        /* original "pTemp" already freed */
        CloseHandle(hFile);
        ShowLastError();
-        return;
+        return FALSE;
    }
 #endif

    if (size)
    {
        if (!WriteText(hFile, (LPWSTR)pTemp, size, Globals.iEncoding, Globals.iEoln))
+        {
            ShowLastError();
+            bRet = FALSE;
+        }
        else
+        {
            SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0);
+            bRet = TRUE;
+        }
    }

    CloseHandle(hFile);
    HeapFree(GetProcessHeap(), 0, pTemp);
+    return bRet;
 }

 /**
@ -250,7 +257,7 @@ static VOID DoSaveFile(VOID)
 *   TRUE  - User agreed to close (both save/don't save)
 *   FALSE - User cancelled close by selecting "Cancel"
 */
-BOOL DoCloseFile(void)
+BOOL DoCloseFile(VOID)
 {
    int nResult;

@ -258,27 +265,31 @@ BOOL DoCloseFile(void)
    {
        /* prompt user to save changes */
        nResult = AlertFileNotSaved(Globals.szFileName);
-        switch (nResult) {
-            case IDYES:     DIALOG_FileSave();
-                            break;
+        switch (nResult)
+        {
+            case IDYES:
+                if(!DIALOG_FileSave())
+                    return FALSE;
+                break;

-            case IDNO:      break;
+            case IDNO:
+                break;

-            case IDCANCEL:  return(FALSE);
-                            break;
+            case IDCANCEL:
+                return FALSE;

-            default:        return(FALSE);
-                            break;
-        } /* switch */
-    } /* if */
+            default:
+                return FALSE;
+        }
+    }

    SetFileName(empty_str);
-
    UpdateWindowCaption();
-    return(TRUE);
+
+    return TRUE;
 }

-void DoOpenFile(LPCTSTR szFileName)
+VOID DoOpenFile(LPCTSTR szFileName)
 {
    static const TCHAR dotlog[] = _T(".LOG");
    HANDLE hFile;
@ -384,12 +395,12 @@ VOID DIALOG_FileOpen(VOID)
 }


-VOID DIALOG_FileSave(VOID)
+BOOL DIALOG_FileSave(VOID)
 {
-    if (Globals.szFileName[0] == '\0')
-        DIALOG_FileSaveAs();
+    if (Globals.szFileName[0] == 0)
+        return DIALOG_FileSaveAs();
    else
-        DoSaveFile();
+        return DoSaveFile();
 }

 static UINT_PTR CALLBACK DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
@ -448,7 +459,7 @@ static UINT_PTR CALLBACK DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wPar
    return 0;
 }

-VOID DIALOG_FileSaveAs(VOID)
+BOOL DIALOG_FileSaveAs(VOID)
 {
    OPENFILENAME saveas;
    TCHAR szDir[MAX_PATH];
@ -475,10 +486,26 @@ VOID DIALOG_FileSaveAs(VOID)
    saveas.lpTemplateName    = MAKEINTRESOURCE(DIALOG_ENCODING);
    saveas.lpfnHook          = DIALOG_FileSaveAs_Hook;

-    if (GetSaveFileName(&saveas)) {
+    if (GetSaveFileName(&saveas))
+    {
+        // HACK: Because in ROS, Save-As boxes don't check the validity
+        // of file names and thus, here, szPath can be invalid !! We only
+        // see its validity when we call DoSaveFile()...
        SetFileName(szPath);
-        UpdateWindowCaption();
-        DoSaveFile();
+        if (DoSaveFile())
+        {
+            UpdateWindowCaption();
+            return TRUE;
+        }
+        else
+        {
+            SetFileName(_T(""));
+            return FALSE;
+        }
+    }
+    else
+    {
+        return FALSE;
    }
 }

--- a/base/applications/notepad/dialog.h
+++ b/base/applications/notepad/dialog.h
@ -20,8 +20,8 @@

 VOID DIALOG_FileNew(VOID);
 VOID DIALOG_FileOpen(VOID);
-VOID DIALOG_FileSave(VOID);
-VOID DIALOG_FileSaveAs(VOID);
+BOOL DIALOG_FileSave(VOID);
+BOOL DIALOG_FileSaveAs(VOID);
 VOID DIALOG_FilePrint(VOID);
 VOID DIALOG_FilePageSetup(VOID);
 VOID DIALOG_FilePrinterSetup(VOID);
@ -58,10 +58,10 @@ VOID DIALOG_TimeDate(VOID);
 INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);

 /* utility functions */
-VOID ShowLastError(void);
+VOID ShowLastError(VOID);
 BOOL FileExists(LPCTSTR szFilename);
 BOOL HasFileExtension(LPCTSTR szFilename);
-BOOL DoCloseFile(void);
-void DoOpenFile(LPCTSTR szFileName);
+BOOL DoCloseFile(VOID);
+VOID DoOpenFile(LPCTSTR szFileName);
 VOID DoCreateStatusBar(VOID);
 VOID DoCreateEditWindow(VOID);
--- a/base/applications/rapps/CMakeLists.txt
+++ b/base/applications/rapps/CMakeLists.txt
@ -1,5 +1,4 @@

-
 list(APPEND SOURCE
    aboutdlg.c
    available.c
@ -22,13 +21,10 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${REACTOS_BINARY_DIR}/include/reactos)

-set_rc_compiler()
-
 add_executable(rapps ${SOURCE})
 add_pch(rapps rapps.h)
 set_module_type(rapps win32gui UNICODE)
 target_link_libraries(rapps uuid)
-
 add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll)
 add_dependencies(rapps rappsmsg)
 add_message_headers(ANSI rappsmsg.mc)
--- a/base/applications/rapps/loaddlg.c
+++ b/base/applications/rapps/loaddlg.c
@ -260,7 +260,7 @@ ThreadFunc(LPVOID Context)
    ShowWindow(Dlg, SW_HIDE);

    /* run it */
-    memset(&si, 0, sizeof(si));
+    ZeroMemory(&si, sizeof(si));
    si.cb = sizeof(si);
    r = CreateProcessW(path, NULL, NULL, NULL, 0, 0, NULL, NULL, &si, &pi);
    if (0 == r) goto end;
--- a/base/applications/rapps/misc.c
+++ b/base/applications/rapps/misc.c
@ -168,6 +168,7 @@ StartProcess(LPWSTR lpPath, BOOL Wait)

    ZeroMemory(&si, sizeof(si));
    si.cb = sizeof(si);
+    si.dwFlags = STARTF_USESHOWWINDOW;
    si.wShowWindow = SW_SHOW;

    if (!CreateProcessW(NULL, lpPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
--- a/base/applications/regedit/CMakeLists.txt
+++ b/base/applications/regedit/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 include_directories(BEFORE .)

 list(APPEND SOURCE
@ -21,15 +19,9 @@ list(APPEND SOURCE
    regedit.rc)

 add_executable(regedit ${SOURCE})
-
 set_module_type(regedit win32gui UNICODE)
-
 target_link_libraries(regedit uuid)
-
 add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt kernel32)
-
 add_pch(regedit regedit.h)
-
-#add_subdirectory(clb)
-
 add_cd_file(TARGET regedit DESTINATION reactos FOR all)
+#add_subdirectory(clb)
--- a/base/applications/regedit/childwnd.c
+++ b/base/applications/regedit/childwnd.c
@ -35,14 +35,14 @@ extern LPCWSTR get_root_key_name(HKEY hRootKey)
    if (hRootKey == HKEY_CURRENT_CONFIG) return L"HKEY_CURRENT_CONFIG";
    if (hRootKey == HKEY_DYN_DATA) return L"HKEY_DYN_DATA";

-    return L"UKNOWN HKEY, PLEASE REPORT";
+    return L"UNKNOWN HKEY, PLEASE REPORT";
 }

 extern void ResizeWnd(int cx, int cy)
 {
    HDWP hdwp = BeginDeferWindowPos(3);
    RECT rt, rs, rb;
-    const int tHeight = 18;
+    const int tHeight = 22;
    SetRect(&rt, 0, 0, cx, cy);
    cy = 0;
    if (hStatusBar != NULL)
@ -52,8 +52,8 @@ extern void ResizeWnd(int cx, int cy)
    }
    GetWindowRect(g_pChildWnd->hAddressBtnWnd, &rb);
    cx = g_pChildWnd->nSplitPos + SPLIT_WIDTH/2;
-    DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - tHeight-2, tHeight, SWP_NOZORDER|SWP_NOACTIVATE);
-    DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, 0, rt.right - tHeight, rt.top, tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE);
+    DeferWindowPos(hdwp, g_pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left - 2*tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE);
+    DeferWindowPos(hdwp, g_pChildWnd->hAddressBtnWnd, 0, rt.right - 2*tHeight, rt.top, 2*tHeight, tHeight, SWP_NOZORDER|SWP_NOACTIVATE);
    DeferWindowPos(hdwp, g_pChildWnd->hTreeWnd, 0, rt.left, rt.top + tHeight+2, g_pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
    DeferWindowPos(hdwp, g_pChildWnd->hListWnd, 0, rt.left+cx, rt.top + tHeight+2, rt.right-cx, rt.bottom-rt.top-cy, SWP_NOZORDER|SWP_NOACTIVATE);
    EndDeferWindowPos(hdwp);
@ -303,6 +303,53 @@ LRESULT CALLBACK AddressBarProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar
    return CallWindowProc(oldwndproc, hwnd, uMsg, wParam, lParam);
 }

+static VOID
+UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath)
+{
+    LPCWSTR keyPath, rootName;
+    LPWSTR fullPath;
+
+    if (pszPath == NULL)
+        keyPath = GetItemPath(g_pChildWnd->hTreeWnd, hItem, &hRootKey);
+    else
+        keyPath = pszPath;
+
+    if (keyPath)
+    {
+        RefreshListView(g_pChildWnd->hListWnd, hRootKey, keyPath);
+        rootName = get_root_key_name(hRootKey);
+        fullPath = HeapAlloc(GetProcessHeap(), 0, (wcslen(rootName) + 1 + wcslen(keyPath) + 1) * sizeof(WCHAR));
+        if (fullPath)
+        {
+            /* set (correct) the address bar text */
+            if (keyPath[0] != L'\0')
+                swprintf(fullPath, L"%s\\%s", rootName, keyPath);
+            else
+                fullPath = wcscpy(fullPath, rootName);
+            SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath);
+            SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath);
+            HeapFree(GetProcessHeap(), 0, fullPath);
+            /* disable hive manipulation items temporarily (enable only if necessary) */
+            EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_GRAYED);
+            EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_GRAYED);
+            /* compare the strings to see if we should enable/disable the "Load Hive" menus accordingly */
+            if (!(wcsicmp(rootName, L"HKEY_LOCAL_MACHINE") &&
+                  wcsicmp(rootName, L"HKEY_USERS")))
+            {
+                /*
+                 * enable the unload menu item if at the root, otherwise
+                 * enable the load menu item if there is no slash in
+                 * keyPath (ie. immediate child selected)
+                 */
+                if(keyPath[0] == L'\0')
+                    EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_ENABLED);
+                else if(!wcschr(keyPath, L'\\'))
+                    EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_ENABLED);
+            }
+        }
+    }
+}
+
 /*******************************************************************************
 *
 *  FUNCTION: ChildWndProc(HWND, unsigned, WORD, LONG)
@ -338,7 +385,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
        g_pChildWnd->hAddressBarWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP,
                                                      CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
                                                      hWnd, (HMENU)0, hInst, 0);
-        g_pChildWnd->hAddressBtnWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Button", L"»", WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_DEFPUSHBUTTON,
+        g_pChildWnd->hAddressBtnWnd = CreateWindowExW(0, L"Button", L"»", WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP | BS_TEXT | BS_CENTER | BS_VCENTER | BS_FLAT | BS_DEFPUSHBUTTON,
                                                      CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
                                                      hWnd, (HMENU)0, hInst, 0);
        g_pChildWnd->hTreeWnd = CreateTreeView(hWnd, g_pChildWnd->szPath, (HMENU) TREE_WINDOW);
@ -494,45 +541,8 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
            case TVN_ITEMEXPANDING:
                return !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam);
            case TVN_SELCHANGED:
-            {
-                LPCWSTR keyPath, rootName;
-                LPWSTR fullPath;
-                HKEY hRootKey;
-
-                keyPath = GetItemPath(g_pChildWnd->hTreeWnd, ((NMTREEVIEW*)lParam)->itemNew.hItem, &hRootKey);
-                if (keyPath)
-                {
-                    RefreshListView(g_pChildWnd->hListWnd, hRootKey, keyPath);
-                    rootName = get_root_key_name(hRootKey);
-                    fullPath = HeapAlloc(GetProcessHeap(), 0, (wcslen(rootName) + 1 + wcslen(keyPath) + 1) * sizeof(WCHAR));
-                    if (fullPath)
-                    {
-                        /* set (correct) the address bar text */
-                        if(keyPath[0] != L'\0')
-                            swprintf(fullPath, L"%s\\%s", rootName, keyPath);
-                        else
-                            fullPath = wcscpy(fullPath, rootName);
-                        SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath);
-                        SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath);
-                        HeapFree(GetProcessHeap(), 0, fullPath);
-                        /* disable hive manipulation items temporarily (enable only if necessary) */
-                        EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_GRAYED);
-                        EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_GRAYED);
-                        /* compare the strings to see if we should enable/disable the "Load Hive" menus accordingly */
-                        if (!(wcsicmp(rootName, L"HKEY_LOCAL_MACHINE") &&
-                                wcsicmp(rootName, L"HKEY_USERS")))
-                        {
-                            // enable the unload menu item if at the root
-                            // otherwise enable the load menu item if there is no slash in keyPath (ie. immediate child selected)
-                            if(keyPath[0] == L'\0')
-                                EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_ENABLED);
-                            else if(!wcschr(keyPath, L'\\'))
-                                EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_ENABLED);
-                        }
-                    }
-                }
-            }
-            break;
+                UpdateAddress(((NMTREEVIEW*)lParam)->itemNew.hItem, NULL, NULL);
+                break;
            case NM_SETFOCUS:
                g_pChildWnd->nFocusPanel = 0;
                break;
@ -571,6 +581,8 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
                    {
                        if (RenameKey(hRootKey, keyPath, ptvdi->item.pszText) != ERROR_SUCCESS)
                            lResult = FALSE;
+                        else
+                            UpdateAddress(ptvdi->item.hItem, hRootKey, szBuffer);
                    }
                    return lResult;
                }
--- a/base/applications/regedit/clb/CMakeLists.txt
+++ b/base/applications/regedit/clb/CMakeLists.txt
@ -1,8 +1,6 @@

 spec2def(clb.dll clb.spec)

-set_rc_compiler()
-
 add_library(clb SHARED
    clb.c
    clb.rc
--- a/base/applications/regedit/framewnd.c
+++ b/base/applications/regedit/framewnd.c
@ -288,20 +288,21 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME* pofn)
    return TRUE;
 }

+#define LOADHIVE_KEYNAMELENGTH 128
+
 static INT_PTR CALLBACK LoadHive_KeyNameInHookProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
    static LPWSTR sKey = NULL;
-    static INT sLength = 0;
    switch(uMsg)
    {
    case WM_INITDIALOG:
        sKey = (LPWSTR)lParam;
-        sLength = 128; /* FIXME: Ugly hack! */
+        break;
    case WM_COMMAND:
        switch(LOWORD(wParam))
        {
        case IDOK:
-            if(GetDlgItemTextW(hWndDlg, IDC_EDIT_KEY, sKey, sLength))
+            if(GetDlgItemTextW(hWndDlg, IDC_EDIT_KEY, sKey, LOADHIVE_KEYNAMELENGTH))
                return EndDialog(hWndDlg, -1);
            else
                return EndDialog(hWndDlg, 0);
@ -348,7 +349,7 @@ static BOOL LoadHive(HWND hWnd)
    OPENFILENAME ofn;
    WCHAR Caption[128];
    LPCWSTR pszKeyPath;
-    WCHAR xPath[128];
+    WCHAR xPath[LOADHIVE_KEYNAMELENGTH];
    HKEY hRootKey;
    WCHAR Filter[1024];
    FILTERPAIR filter;
@ -369,7 +370,8 @@ static BOOL LoadHive(HWND hWnd)
    /* now load the hive */
    if (GetOpenFileName(&ofn))
    {
-        if(DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_LOADHIVE), hWnd, &LoadHive_KeyNameInHookProc, (LPARAM)xPath))
+        if (DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_LOADHIVE), hWnd,
+                            &LoadHive_KeyNameInHookProc, (LPARAM)xPath))
        {
            LONG regLoadResult;

--- a/base/applications/regedit/listview.c
+++ b/base/applications/regedit/listview.c
@ -37,12 +37,17 @@ typedef struct tagLINE_INFO
    size_t val_len;
 } LINE_INFO, *PLINE_INFO;

+typedef struct tagSORT_INFO
+{
+    INT  iSortingColumn;
+    BOOL bSortAscending;
+} SORT_INFO, *PSORT_INFO;
+
 /*******************************************************************************
 * Global and Local Variables:
 */

-static DWORD g_columnToSort = ~0UL;
-static BOOL  g_invertSort = FALSE;
+static INT g_iSortedColumn = 0;

 #define MAX_LIST_COLUMNS (IDS_LIST_COLUMN_LAST - IDS_LIST_COLUMN_FIRST + 1)
 static const int default_column_widths[MAX_LIST_COLUMNS] = { 200, 175, 400 };
@ -127,9 +132,10 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, void* ValB
    linfo = (PLINE_INFO)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINE_INFO) + dwCount);
    linfo->dwValType = dwValType;
    linfo->val_len = dwCount;
-    if(dwCount > 0)
+    if (dwCount > 0)
    {
        memcpy(&linfo[1], ValBuf, dwCount);
+        linfo->val = &linfo[1];
    }
    linfo->name = _wcsdup(Name);

@ -280,7 +286,9 @@ static BOOL InitListViewImageLists(HWND hwndLV)
    /* Create the image list.  */
    if ((himl = ImageList_Create(CX_ICON, CY_ICON,
                                 ILC_MASK, 0, NUM_ICONS)) == NULL)
+    {
        return FALSE;
+    }

    hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_BIN));
    Image_Bin = ImageList_AddIcon(himl, hico);
@ -288,7 +296,6 @@ static BOOL InitListViewImageLists(HWND hwndLV)
    hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_STRING));
    Image_String = ImageList_AddIcon(himl, hico);

-
    /* Fail if not all of the images were added.  */
    if (ImageList_GetImageCount(himl) < NUM_ICONS)
    {
@ -373,27 +380,171 @@ static void OnGetDispInfo(NMLVDISPINFO* plvdi)

 static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
 {
-    LINE_INFO*l, *r;
-    UNREFERENCED_PARAMETER(lParamSort);
+    PSORT_INFO pSortInfo = (PSORT_INFO)lParamSort;
+    LINE_INFO *l, *r;
+    DWORD dw1, dw2;
+    DWORDLONG qw1, qw2;

    l = (LINE_INFO*)lParam1;
    r = (LINE_INFO*)lParam2;

-    if (g_columnToSort == ~0UL)
-        g_columnToSort = 0;
-
-    if (g_columnToSort == 1 && l->dwValType != r->dwValType)
-        return g_invertSort ? (int)r->dwValType - (int)l->dwValType : (int)l->dwValType - (int)r->dwValType;
-    if (g_columnToSort == 2)
+    if (pSortInfo->iSortingColumn == 1 && l->dwValType != r->dwValType)
    {
-        /* FIXME: Sort on value */
+        /* Sort by type */
+        if (pSortInfo->bSortAscending)
+            return ((int)l->dwValType - (int)r->dwValType);
+        else
+            return ((int)r->dwValType - (int)l->dwValType);
    }
-    return g_invertSort ? wcsicmp(r->name, l->name) : wcsicmp(l->name, r->name);
+    if (pSortInfo->iSortingColumn == 2)
+    {
+        /* Sort by value */
+        if (l->dwValType != r->dwValType)
+        {
+            if (pSortInfo->bSortAscending)
+                return ((int)l->dwValType - (int)r->dwValType);
+            else
+                return ((int)r->dwValType - (int)l->dwValType);
+        }
+
+        if (l->val == NULL && r->val == NULL)
+            return 0;
+
+        if (pSortInfo->bSortAscending)
+        {
+            if (l->val == NULL)
+                return -1;
+            if (r->val == NULL)
+                return 1;
+        }
+        else
+        {
+            if (l->val == NULL)
+                return 1;
+            if (r->val == NULL)
+                return -1;
+        }
+
+        switch(l->dwValType)
+        {
+            case REG_DWORD:
+            {
+                dw1 = *(DWORD*)l->val;
+                dw2 = *(DWORD*)r->val;
+                if (pSortInfo->bSortAscending)
+                    // return (dw1 > dw2 ? 1 : -1);
+                    return ((int)dw1 - (int)dw2);
+                else
+                    // return (dw1 > dw2 ? -1 : 1);
+                    return ((int)dw2 - (int)dw1);
+            }
+
+            case REG_QWORD:
+            {
+                qw1 = *(DWORDLONG*)l->val;
+                qw2 = *(DWORDLONG*)r->val;
+                if (pSortInfo->bSortAscending)
+                    // return (qw1 > qw2 ? 1 : -1);
+                    return ((int)qw1 - (int)qw2);
+                else
+                    // return (qw1 > qw2 ? -1 : 1);
+                    return ((int)qw2 - (int)qw1);
+            }
+
+            default:
+            {
+                INT nCompare = 0;
+
+                if (pSortInfo->bSortAscending)
+                {
+                    nCompare = memcmp(l->val, r->val, min(l->val_len, r->val_len));
+                    if (nCompare == 0)
+                        nCompare = l->val_len - r->val_len;
+                }
+                else
+                {
+                    nCompare = memcmp(r->val, l->val, min(r->val_len, l->val_len));
+                    if (nCompare == 0)
+                        nCompare = r->val_len - l->val_len;
+                }
+
+                return nCompare;
+            }
+        }
+    }
+
+    /* Sort by name */
+    return (pSortInfo->bSortAscending ? StrCmpLogicalW(l->name, r->name) : StrCmpLogicalW(r->name, l->name));
+}
+
+static BOOL ListView_Sort(HWND hListView, int iSortingColumn, int iSortedColumn)
+{
+    if ( (GetWindowLongPtr(hListView, GWL_STYLE) & ~LVS_NOSORTHEADER) &&
+         (iSortingColumn >= 0) )
+    {
+        BOOL bSortAscending;
+        SORT_INFO SortInfo;
+
+        HWND hHeader = ListView_GetHeader(hListView);
+        HDITEM hColumn = {0};
+
+        /* If we are sorting according to another column, uninitialize the old one */
+        if ( (iSortedColumn >= 0) && (iSortingColumn != iSortedColumn) )
+        {
+            hColumn.mask = HDI_FORMAT;
+            Header_GetItem(hHeader, iSortedColumn, &hColumn);
+            hColumn.fmt &= ~(HDF_SORTUP | HDF_SORTDOWN);
+            Header_SetItem(hHeader, iSortedColumn, &hColumn);
+        }
+
+        /* Get the sorting state of the new column */
+        hColumn.mask = HDI_FORMAT;
+        Header_GetItem(hHeader, iSortingColumn, &hColumn);
+
+        /*
+         * Check whether we are sorting the list because the user clicked
+         * on a column, or because we are refreshing the list:
+         *
+         * iSortedColumn >= 0 - User clicked on a column; holds the
+         *                      old sorting column index.
+         * iSortedColumn  < 0 - List being refreshed.
+         */
+        if (iSortedColumn >= 0)
+        {
+            /* Invert the sorting direction */
+            bSortAscending = ((hColumn.fmt & HDF_SORTUP) == 0);
+        }
+        else
+        {
+            /*
+             * If the sorting state of the column is uninitialized,
+             * initialize it by default to ascending sorting.
+             */
+            if ((hColumn.fmt & (HDF_SORTUP | HDF_SORTDOWN)) == 0)
+                hColumn.fmt |= HDF_SORTUP;
+
+            /* Keep the same sorting direction */
+            bSortAscending = ((hColumn.fmt & HDF_SORTUP) != 0);
+        }
+
+        /* Set the new column sorting state */
+        hColumn.fmt &= ~(bSortAscending ? HDF_SORTDOWN : HDF_SORTUP  );
+        hColumn.fmt |=  (bSortAscending ? HDF_SORTUP   : HDF_SORTDOWN);
+        Header_SetItem(hHeader, iSortingColumn, &hColumn);
+
+        /* Sort the list */
+        SortInfo.iSortingColumn = iSortingColumn;
+        SortInfo.bSortAscending = bSortAscending;
+        return ListView_SortItems(hListView, CompareFunc, (LPARAM)&SortInfo);
+    }
+    else
+        return TRUE;
 }

 BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
 {
    NMLVDISPINFO* Info;
+    int iSortingColumn;
    UNREFERENCED_PARAMETER(wParam);
    *Result = TRUE;
    switch (((LPNMHDR)lParam)->code)
@ -402,15 +553,9 @@ BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
        OnGetDispInfo((NMLVDISPINFO*)lParam);
        return TRUE;
    case LVN_COLUMNCLICK:
-        if (g_columnToSort == (DWORD)((LPNMLISTVIEW)lParam)->iSubItem)
-            g_invertSort = !g_invertSort;
-        else
-        {
-            g_columnToSort = ((LPNMLISTVIEW)lParam)->iSubItem;
-            g_invertSort = FALSE;
-        }
-
-        (void)ListView_SortItems(hWnd, CompareFunc, (WPARAM)hWnd);
+        iSortingColumn = ((LPNMLISTVIEW)lParam)->iSubItem;
+        (void)ListView_Sort(hWnd, iSortingColumn, g_iSortedColumn);
+        g_iSortedColumn = iSortingColumn;
        return TRUE;
    case NM_DBLCLK:
    case NM_RETURN:
@ -483,21 +628,20 @@ BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
    return FALSE;
 }

-
 HWND CreateListView(HWND hwndParent, HMENU id)
 {
    RECT rcClient;
    HWND hwndLV;

-    /* Get the dimensions of the parent window's client area, and create the list view control.  */
+    /* Get the dimensions of the parent window's client area, and create the list view control. */
    GetClientRect(hwndParent, &rcClient);
    hwndLV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEW, L"List View",
-                             WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS,
+                             WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS | LVS_SHOWSELALWAYS,
                             0, 0, rcClient.right, rcClient.bottom,
                             hwndParent, id, hInst, NULL);
    if (!hwndLV) return NULL;

-    /* Initialize the image list, and add items to the control.  */
+    /* Initialize the image list, and add items to the control. */
    if (!CreateListColumns(hwndLV)) goto fail;
    if (!InitListViewImageLists(hwndLV)) goto fail;

@ -542,7 +686,6 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCWSTR keyPath)
    SendMessageW(hwndLV, WM_SETREDRAW, FALSE, 0);
    DestroyListView(hwndLV);

-    g_columnToSort = ~0UL;
    (void)ListView_DeleteAllItems(hwndLV);

    if(!hKey) return FALSE;
@ -584,11 +727,12 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCWSTR keyPath)
        HeapFree(GetProcessHeap(), 0, ValBuf);
        HeapFree(GetProcessHeap(), 0, ValName);
    }
+    RegCloseKey(hNewKey);
+
    if(!AddedDefault)
    {
        AddEntryToList(hwndLV, L"", REG_SZ, NULL, 0, 0, FALSE);
    }
-    ListView_SortItems(hwndLV, CompareFunc, (WPARAM)hwndLV);
    c = ListView_GetItemCount(hwndLV);
    for(i = 0; i < c; i++)
    {
@ -597,7 +741,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCWSTR keyPath)
    ListView_SetItemState(hwndLV, iListViewSelect,
                          LVIS_FOCUSED | LVIS_SELECTED,
                          LVIS_FOCUSED | LVIS_SELECTED);
-    RegCloseKey(hNewKey);
+    (void)ListView_Sort(hwndLV, g_iSortedColumn, -1);
    SendMessageW(hwndLV, WM_SETREDRAW, TRUE, 0);

    return TRUE;
--- a/base/applications/regedit/treeview.c
+++ b/base/applications/regedit/treeview.c
@ -639,7 +639,7 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, HMENU id)
    /* Get the dimensions of the parent window's client area, and create the tree view control.  */
    GetClientRect(hwndParent, &rcClient);
    hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEW, NULL,
-                            WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS,
+                            WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS,
                            0, 0, rcClient.right, rcClient.bottom,
                            hwndParent, id, hInst, NULL);
    /* Initialize the image list, and add items to the control.  */
--- a/base/applications/regedt32/CMakeLists.txt
+++ b/base/applications/regedt32/CMakeLists.txt
@ -1,8 +1,5 @@

-set_rc_compiler()
-
 add_executable(regedt32 regedt32.c resource.rc)
-
 set_module_type(regedt32 win32gui UNICODE)
 add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32)
 add_cd_file(TARGET regedt32 DESTINATION reactos/system32 FOR all)
--- a/base/applications/screensavers/3dtext/CMakeLists.txt
+++ b/base/applications/screensavers/3dtext/CMakeLists.txt
@ -1,6 +1,4 @@

-set_rc_compiler()
-
 add_executable(3dtext
    3dtext.c
    settings.c
@ -11,5 +9,4 @@ add_pch(3dtext 3dtext.h)
 set_target_properties(3dtext PROPERTIES SUFFIX ".scr")
 target_link_libraries(3dtext scrnsave)
 add_importlibs(3dtext user32 gdi32 opengl32 glu32 advapi32 msvcrt kernel32)
-
 add_cd_file(TARGET 3dtext DESTINATION reactos/system32 FOR all)
--- a/base/applications/screensavers/logon/CMakeLists.txt
+++ b/base/applications/screensavers/logon/CMakeLists.txt
@ -1,11 +1,7 @@

-set_rc_compiler()
-
 add_executable(logon logon.c logon.rc)
-
 set_module_type(logon win32gui UNICODE)
 set_target_properties(logon PROPERTIES SUFFIX ".scr")
-
 target_link_libraries(logon scrnsave)
 add_importlibs(logon user32 gdi32 msvcrt kernel32)
 add_cd_file(TARGET logon DESTINATION reactos/system32 FOR all)
--- a/base/applications/setup16/CMakeLists.txt
+++ b/base/applications/setup16/CMakeLists.txt
@ -1,10 +1,5 @@

-set_rc_compiler()
-
-add_executable(setup16
-    main.c)
-
+add_executable(setup16 main.c)
 set_module_type(setup16 win32gui UNICODE)
 add_importlibs(setup16 user32 gdi32 advapi32 msvcrt kernel32 shell32 setupapi)
-
 add_cd_file(TARGET setup16 DESTINATION reactos/system32 FOR all)
--- a/base/applications/shutdown/CMakeLists.txt
+++ b/base/applications/shutdown/CMakeLists.txt
@ -1,14 +1,12 @@

-set_rc_compiler()
-
 list(APPEND SOURCE
+    gui.c
    misc.c
    shutdown.c
    shutdown.rc)

 add_executable(shutdown ${SOURCE})
-
-set_module_type(shutdown win32cui)
-add_importlibs(shutdown advapi32 user32 msvcrt kernel32)
+set_module_type(shutdown win32cui UNICODE)
+add_importlibs(shutdown advapi32 user32 msvcrt powrprof kernel32)
 add_pch(shutdown precomp.h)
 add_cd_file(TARGET shutdown DESTINATION reactos/system32 FOR all)
--- a/base/applications/shutdown/gui.c
+++ b/base/applications/shutdown/gui.c
@ -0,0 +1,70 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS shutdown/logoff utility
+ * FILE:            base/applications/shutdown/gui.c
+ * PURPOSE:         Shows a GUI used for managing multiple remote shutdown/restarts
+ * PROGRAMMERS:     Lee Schroeder
+ */
+
+#include "precomp.h"
+
+BOOL CALLBACK ShutdownGuiProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+    switch(msg)
+    {
+        case WM_INITDIALOG:
+            break;
+
+        case WM_COMMAND:
+            switch(LOWORD(wparam))
+            {
+                case IDC_OK:
+                    EndDialog(hwnd, IDC_OK);
+                    break;
+                case IDC_CANCEL:
+                    EndDialog(hwnd, IDC_CANCEL);
+                    break;
+            }
+            break;
+
+        case WM_CLOSE:
+            EndDialog(hwnd, 0);
+            break;
+
+        default:
+            return FALSE;
+    }
+    
+    return TRUE;
+}
+
+/*
+ * NOTE: Until the ability to shutdown computers remotely, the GUI feature
+ * can't be fully implemented.
+ */
+BOOL ShutdownGuiMain(struct CommandLineOptions opts)
+{
+    INT_PTR result = DialogBoxW(GetModuleHandle(NULL),
+                                MAKEINTRESOURCEW(IDD_GUI),
+                                NULL,
+                                ShutdownGuiProc);
+
+    switch (result)
+    {
+        case IDC_OK:
+            MessageBoxW(NULL, L"This function is unimplemented.", L"Unimplemented", MB_OK);
+            break;
+
+        case IDC_CANCEL:
+            /* Exits the program */
+            break;
+
+        default:
+            MessageBoxW(NULL, L"Dialog Error!", L"Message", MB_OK);
+            return FALSE;
+    }
+
+    return TRUE;
+}
+
+/* EOF */
--- a/base/applications/shutdown/lang/bg-BG.rc
+++ b/base/applications/shutdown/lang/bg-BG.rc
@ -1,14 +1,103 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Употреба: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Без ключове или -?\tПоказва това съобщение\n\
-  -l\t\t\tИзход\n\
-  -s\t\t\tИзключване на компютъра\n\
-  -r\t\t\tИзключване и презапускане на компютъра\n\
-  -f\t\t\tНасилване на работещите приложения да се затворят без предупреждение\n\
-    \t\t\tАко не сте задали други ключове, тази възможност\n\
-    \t\t\tще доведе до изход от потребителя"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/de-DE.rc
+++ b/base/applications/shutdown/lang/de-DE.rc
@ -1,19 +1,103 @@
-/*
- *  German language file by Colin Finck <2007-07-18>
- */
-
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Syntax: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Keine Argumente\tDiese Meldung anzeigen\n\
-  -?\t\t\tDiese Meldung anzeigen\n\
-  -l\t\t\tBenutzer abmelden\n\
-  -s\t\t\tComputer herunterfahren\n\
-  -r\t\t\tComputer herunterfahren und neu starten\n\
-  -f\t\t\tLaufende Anwendungen ohne Warnung schließen\n\
-    \t\t\tWenn Sie keine weiteren Parameter angegeben haben,\n\
-    \t\t\tmeldet Sie diese Option auch ab"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/el-GR.rc
+++ b/base/applications/shutdown/lang/el-GR.rc
@ -1,14 +1,103 @@
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Χρήση: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Κανένα όρισμα ή -?\tΕμφάνιση αυτού του μηνύματος\n\
-  -l\t\t\tΑποσύνδεση\n\
-  -s\t\t\tΤερματισμός του υπολογιστή\n\
-  -r\t\t\tΤερματισμός και επανεκκίνηση του υπολογιστή\n\
-  -f\t\t\tΕξαναγκάζει τις τρέχουσες εφαρμογές να κλείσουν χωρίς προειδοποίηση\n\
-    \t\t\tΑν δε δηλώσατε κάποια άλλη παράμετρο, αυτή η επιλογή\n\
-    \t\t\tθα κάνει την αποσύνδεση"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/en-US.rc
+++ b/base/applications/shutdown/lang/en-US.rc
@ -1,14 +1,103 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Usage: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  No arguments or -?\tDisplay this message\n\
-  -l\t\t\tLog off\n\
-  -s\t\t\tShutdown the computer\n\
-  -r\t\t\tShutdown and restart the computer\n\
-  -f\t\t\tForces running applications to close without warnings\n\
-    \t\t\tIf you did not specify any other parameter, this option\n\
-    \t\t\twill also log off"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/es-ES.rc
+++ b/base/applications/shutdown/lang/es-ES.rc
@ -1,14 +1,103 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Utilización: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Ningún argumento o -?\tMuestra este mensaje\n\
-  -l\t\t\tDesconectarse\n\
-  -s\t\t\tApagar el equipo\n\
-  -r\t\t\tApagar y reiniciar el equipo\n\
-  -f\t\t\tObliga las aplicaciones en curso de ejecución a apagarse sin advertencias\n\
-    \t\t\tSi no especifica algún otro parámetro, esta opción\n\
-    \t\t\tprovocará también una desconexión"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/fr-FR.rc
+++ b/base/applications/shutdown/lang/fr-FR.rc
@ -1,14 +1,107 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Arrêt à distance"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "A&nnuler",IDC_CANCEL,178,232,50,14
+    CTEXT           "Or&dinateurs :", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "Ajout&er...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Supprimer",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "Pa&rcourir...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "&Quelle tâche voulez-vous que ces ordinateurs exécutent ?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "A&vertir les utilisateurs de l'action",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "A&fficher l'avertissement pendant",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "seconde(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Moniteur d'événements d'arrêt",IDC_STATIC,5,114,224,114
+    CTEXT           "Raison :",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planifié",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "&Commentaire :",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Utilisation : shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+              [/m \\\\ordinateur][/t xxx][/d [p|u:]xx:yy [/c ""commentaire""]]\n\
+\n\
+    Sans argument ou /?    Afficher l'aide.\n\
+    /i      Afficher l'interface utilisateur graphique (GUI). Cette option doit\n\
+            être la première.\n\
+    /l      Fermer la session sur l'ordinateur local uniquement. Ne peut pas\n\
+            être utilisée avec les options /m ou /d.\n\
+    /s      Arrêter l'ordinateur.\n\
+    /r      Redémarrer l'ordinateur.\n\
+    /g      Redémarrer l'ordinateur et redémarrer toutes les applications\n\
+            enregistrées.\n\
+    /a      Annuler un arrêt du système. Ne peut être utilisée que pendant\n\
+            la période de délai.\n\
+    /p      Arrêter l'ordinateur local sans délai d'expiration ou\n\
+            avertissement. Peut être utilisée avec les options /d ou /f.\n\
+    /h      Mettre l'ordinateur local en veille prolongée. Utilisable avec\n\
+            l'option /f.\n\
+    /e      Documenter la raison de l'arrêt inattendu d'un ordinateur.\n\
+    /m \\\\ordinateur  Spécifier l'ordinateur cible (adresse UNC/IP).\n\
+    /t xxx  Définir la période de délai avant l'arrêt au bout de xxx secondes.\n\
+            La plage valide est comprise entre 0 et 315360000 (10 ans),\n\
+            30 étant la valeur par défaut.\n\
+    /c ""commentaire""  Commentaire sur la raison de l'arrêt ou du redémarrage.\n\
+            512 caractères maximum autorisés.\n\
+    /f      Force la fermeture des applications en cours d'exécution sans\n\
+            prévenir les utilisateurs. Si vous ne spécifiez aucun autre\n\
+            paramètre, cette option provoquera aussi une déconnexion.\n\
+    /d [p|u:]xx:yy  Fournit la raison de l'arrêt ou du redémarrage.\n\
+            p indique que l'arrêt ou le redémarrage est planifié.\n\
+            u indique que la raison est définie par l'utilisateur.\n\
+            Si ni p ni u ne sont spécifiés, l'arrêt ou le redémarrage ne sont\n\
+            planifiés.\n\
+            xx est le code de raison majeur (entier positif inférieur à 256).\n\
+            yy est le code de raison mineur (entier positif inférieur à 65536).\n"

-IDS_USAGE, "Utilisation: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Aucun argument ou -?\tAffiche ce message\n\
-  -l\t\t\tSe déconnecter\n\
-  -s\t\t\tÉteindre l'ordinateur\n\
-  -r\t\t\tÉteindre et redémarrer l'ordinateur\n\
-  -f\t\t\tForce les applications en cours de fonctionnement à se fermer sans avertissements\n\
-    \t\t\tSi vous ne spécifiez aucun autre paramètre, cette option\n\
-    \t\t\tprovoquera aussi une déconnexion"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERREUR : Impossible d'arrêter et de redémarrer en même temps.\n"
+    IDS_ERROR_TIMEOUT,                  "ERREUR : La valeur de délai %u est en-dehors des limites autorisées (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERREUR : Impossible d'annuler l'arrêt du système.\n"
+    IDS_ERROR_LOGOFF,                   "ERREUR : Impossible de se déconnecter du système.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERREUR : Impossible d'arrêter le système.\n"
+    IDS_ERROR_RESTART,                  "ERREUR : Impossible de redémarrer le système.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERREUR : La longueur du commentaire excède le nombre maximal de caractères imposé par le système.\n"
+    IDS_ERROR_HIBERNATE,                "ERREUR : Impossible de mettre le système en veille prolongée.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERREUR : La mise en veille prolongée ne peut être commandée à distance.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERREUR : La mise en veille prolongée n'est pas activée.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Arrêt à distance"
+    IDS_ERROR_DIALOG_INIT,              "Impossible d'afficher l'interface graphique utilisateur."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Arrêter le système"
+    IDS_ACTION_RESTART,                 "Redémarrer le système"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annoter l'arrêt non planifié"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Autre"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Matériel : Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Matériel : Installation"
+    IDS_REASON_OS_RECOVER,              "Système d'exploitation : Récupération"
+    IDS_REASON_OS_RECONFIGURE,          "Système d'exploitation : Reconfiguration"
+    IDS_REASON_APP_MAINTENANCE,         "Application : Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application : Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application : Aucune réponse"
+    IDS_REASON_APP_UNSTABLE,            "Application : Instable"
+    IDS_REASON_SECURITY,                "Problème de sécurité"
+    IDS_REASON_NETWORK,                 "Perte de connectivité réseau"
 END
--- a/base/applications/shutdown/lang/it-IT.rc
+++ b/base/applications/shutdown/lang/it-IT.rc
@ -1,14 +1,103 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Uso: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Senza parametri o con -?\tvisualizza questo messaggio\n\
-  -l\t\t\tChiude la sessione\n\
-  -s\t\t\tSpegnimento del computer\n\
-  -r\t\t\tRiavvio del computer\n\
-  -f\t\t\tArresta le applicazioni senza nessun avviso\n\
-    \t\t\tSe non viene specificato nessun altro parametro verrà\n\
-    \t\t\tchiusa la sessione"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/ja-JP.rc
+++ b/base/applications/shutdown/lang/ja-JP.rc
@ -1,14 +1,103 @@
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "使用法: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  引数なしもしくは -?\tこのメッセージを表 示します\n\
-  -l\t\t\tログオフ\n\
-  -s\t\t\tコンピュータをシャットダウンします\n\
-  -r\t\t\tコンピュータをシャットダウンして再起動します\n\
-  -f\t\t\t実行中のアプリケーションを警告なしに閉じます\n\
-    \t\t\t他のパラメータを指定しない場合、ログオフn\n\
-    \t\t\tします"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/ko-KR.rc
+++ b/base/applications/shutdown/lang/ko-KR.rc
@ -1,17 +1,103 @@
-/*
- * Korean translation by manatails007(www.manatails007.org)
- */
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "사용법: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  지시문 없음 -?\t이 메세지 표시\n\
-  -l\t\t\t로그 오프\n\
-  -s\t\t\t컴퓨터 끄기\n\
-  -r\t\t\t컴퓨터 재시작\n\
-  -f\t\t\t프로세스 강제종료\n\
-    \t\t\t아무 파라미터도 입력하지 않으시면,\n\
-    \t\t\t로그오프 될 것입니다"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/lt-LT.rc
+++ b/base/applications/shutdown/lang/lt-LT.rc
@ -1,16 +1,103 @@
-/* Translation by Vytis "CMan" Girdžijauskas (cman@cman.us) */
-
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Naudojimas: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Be parametrų arba -?\tParodyti šį pranešimą\n\
-  -l\t\t\tAtsijungti\n\
-  -s\t\t\tIšjungti kompiuterį\n\
-  -r\t\t\tPerkrauti kompiuterį\n\
-  -f\t\t\tPriverstinai užverti visas paleistas programas\n\
-    \t\t\tJeigu nenurodyti jokie kiti parametrai, taip pat\n\
-    \t\t\tbus įvykdytas atsijungimas"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/nl-NL.rc
+++ b/base/applications/shutdown/lang/nl-NL.rc
@ -1,14 +1,103 @@
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Usage: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  No arguments or -?\tDisplay this message\n\
-  -l\t\t\tLog off\n\
-  -s\t\t\tDe computer afsluiten\n\
-  -r\t\t\tOpnieuw opstarten\n\
-  -f\t\t\tProgrammas zonder waarschuwing afsluiten\n\
-    \t\t\tAls u geen andere optie hebt geselecteerd, dan zal deze functie\n\
-    \t\t\tu ook doen afmelden"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/no-NO.rc
+++ b/base/applications/shutdown/lang/no-NO.rc
@ -1,14 +1,103 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Bruk: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Ingen parametere eller -?\tVis denne meldingen\n\
-  -l\t\t\tLogg av\n\
-  -s\t\t\tSkru av maskinen\n\
-  -r\t\t\tSkru av og start maskinen på nytt\n\
-  -f\t\t\tTvinger alle programmer til å avsluttes, og dersom\n\
-    \t\t\tdet ikke er spesifisert andre parametere vil\n\
-    \t\t\tbrukeren også logges ut."
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/pl-PL.rc
+++ b/base/applications/shutdown/lang/pl-PL.rc
@ -1,22 +1,103 @@
-/*
- *         translated by Caemyr - Olaf Siejka (Dec,2007)
- *         Use ReactOS forum PM or IRC to contact me
- *         http://www.reactos.org
- *         IRC: irc.freenode.net #reactos-pl;
- *         UTF-8 conversion by Caemyr (May, 2011) 
- */
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Składnia: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Bez parametrów albo z -?\tWyświetla niniejszą pomoc\n\
-  -l\t\t\tWylogowanie\n\
-  -s\t\t\tWyłączenie komputera\n\
-  -r\t\t\tRestart komputera\n\
-  -f\t\t\tZamknięcie wszystkich działających aplikacji, bez ostrzeżenia\n\
-    \t\t\tBez podania innego parametru, ta opcja domyślnie wyloguje \n\
-    \t\t\tobecnego użytkownika"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/pt-BR.rc
+++ b/base/applications/shutdown/lang/pt-BR.rc
@ -1,16 +1,103 @@
-/* Translation and UTF-8 Conversion by mkbu95 <mkbu95@gmail.com> (August, 2011) */
-
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Uso: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Sem argumentos ou -?\tExibem esta mensagem\n\
-  -l\t\t\tFazer logoff\n\
-  -s\t\t\tDesligar o computador\n\
-  -r\t\t\tDesligar e reiniciar o computador\n\
-  -f\t\t\tForçar o fechamento dos aplicativos em execução sem avisar os usuários\n\
-    \t\t\tSe você não especificar outro parâmetro, esta opção\n\
-    \t\t\ttambém fará logoff"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/ro-RO.rc
+++ b/base/applications/shutdown/lang/ro-RO.rc
@ -1,24 +1,103 @@
-/* 
- * FILE:             base/applications/shutdown/lang/ro-RO.rc
- *                   ReactOS Project (http://www.reactos.org)
- * TRANSLATOR:       Fulea Ștefan (PM on ReactOS Forum at fulea.stefan)
- * CHANGE LOG:       2011-08-24  initial translation
- *                   2011-10-30  diacritics change
- */
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Utilizare: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  fără arg.\n\
-  sau -?\tAfișează acest manual\n\
-  -l\t\tÎnchide sesiunea curentă\n\
-  -s\t\tÎnchide calculatorul\n\
-  -r\t\tRepornește calculatorul\n\
-  -f\t\tForțează închiderea aplicațiilor fără mesaje de avertisment.\n\
-    \t\tDacă nu ați specificat nici un alt parametru, această\n\
-    \t\topțiune are în mod implicit stabilită închiderea\n\
-	\tsesiunii curente."
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/ru-RU.rc
+++ b/base/applications/shutdown/lang/ru-RU.rc
@ -1,17 +1,103 @@
-// Russian language resource file (Dmitry Chapyshev, 2007-07-19)
-
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Использование: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Без аргументов или -?\tОтображение этого сообщения\n\
-  -l\t\t\tЗавершение сеанса\n\
-  -s\t\t\tВыключение этого компьютера\n\
-  -r\t\t\tПерезагрузка этого компьютера\n\
-  -f\t\t\tИгнорирование запущенных программ и завершение их без\n\
-    \t\t\tпредупреждения\n\
-    \t\t\tЕсли вы не указали другие параметры, то эта опция\n\
-    \t\t\tприведет к завершению сеанса."
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/sk-SK.rc
+++ b/base/applications/shutdown/lang/sk-SK.rc
@ -1,23 +1,103 @@
-/*
- * PROJECT:     ReactOS Shutdown Utility
- * FILE:        base/applications/shutdown/lang/sk-SK.rc
- * PURPOSE:     Slovak Language File for shutdown
- * TRANSLATOR:  Kario (kario@szm.sk)
- * DATE OF TR:  25-07-2007
- */
-
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Použitie: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Žiadne argumenty\tZobrazí sa táto správa\n\
-  -?\t\t\tZobrazí túto správu\n\
-  -l\t\t\tOdhlási používateľa\n\
-  -s\t\t\tVypne počítač\n\
-  -r\t\t\tReštartuje počítač\n\
-  -f\t\t\tDonúti spustené programy aby sa vypli bez upozornení.\n\
-    \t\t\tAk nebol zadaný žiadny iný parameter, tak aj odhlási\n\
-    \t\t\tpoužívateľa."
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/sv-SE.rc
+++ b/base/applications/shutdown/lang/sv-SE.rc
@ -1,21 +1,103 @@
-/*
- * PROJECT:         ReactOS RAPPS
- * FILE:            base/applications/shutdown/lang/sv-SE.rc
- * PURPOSE:         Swedish resource file
- * Translation:     Jaix Bly
- */
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "SYNTAX: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Ingen parameter eller -? Visar detta meddelandet.\n\
-  -l\t\tLogga ut\n\
-  -s\t\tStäng av datorn.\n\
-  -r\t\tStäng av och starta datorn.\n\
-  -f\t\tGör att program som körs avslutas utan att användare meddelas.\n\
-    \t\tOm du inte angav någon annan parameter till detta kommandot\n\
-    \t\tkommer användaren dessutom att loggas ut."
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/uk-UA.rc
+++ b/base/applications/shutdown/lang/uk-UA.rc
@ -8,15 +8,104 @@

 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "Використання: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Без аргументів або -?\tВідображення цього повідомлення\n\
-  -l\t\t\tЗавершення сеансу\n\
-  -s\t\t\tВимкнення цього комп'ютера\n\
-  -r\t\t\tПерезавантаження цього комп'ютера\n\
-  -f\t\t\tПримусове закриття запущених додатків без попереджень\n\
-    \t\t\tЯкщо ви не вказали інший параметр, то ця опція також\n\
-    \t\t\tзавершить сеанс"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/zh-CN.rc
+++ b/base/applications/shutdown/lang/zh-CN.rc
@ -1,18 +1,103 @@
-/*
- * Translated by Song Fuchang (0xfc) <sfc_0@yahoo.com.cn>
- */
-
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "用法: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  没有参数或 -?\t显示这个消息\n\
-  -l\t\t\t注销\n\
-  -s\t\t\t关闭计算机\n\
-  -r\t\t\t重新启动计算机\n\
-  -f\t\t\t毫无警告地强行关闭正在运行的程序\n\
-    \t\t\t如果您没有指定其他任何参数，这个选项\n\
-    \t\t\t也会引起注销"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/lang/zh-TW.rc
+++ b/base/applications/shutdown/lang/zh-TW.rc
@ -1,18 +1,103 @@
-/*
- * Translated by Elton Chung aka MfldElton <elton328@gmail.com>
- */
-
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

+/* Dialog */
+IDD_GUI DIALOGEX DISCARDABLE 0, 0, 240, 255
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remote Shutdown"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDC_OK,125,232,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,178,232,50,14
+    CTEXT           "Co&mputers:", IDC_STATIC,9,9,35,36
+    LISTBOX         IDC_COMPUTER_LIST,8,19,162,55
+    PUSHBUTTON      "&Add...",IDC_ADD_SYSTEM,179,19,50,14
+    PUSHBUTTON      "&Remove",IDC_REMOVE_SYSTEM,179,36,50,14,WS_DISABLED
+    PUSHBUTTON      "&Browse...",IDC_BROWSE_SYSTEM,179,53,50,14
+    CTEXT           "Which action do you want these computers to execute?", IDC_ACTION,14,81,20,14
+    COMBOBOX        IDC_ACTION_TYPE,37,79,129,14,WS_TABSTOP | CBS_DROPDOWN
+    CHECKBOX        "Warn users",IDC_WARN_USERS,178,79,50,14,BS_AUTOCHECKBOX | WS_TABSTOP
+    CTEXT           "Display warning for",IDC_SHOW_WARN_ONE,11,99,65,14
+    EDITTEXT        IDC_SHOW_WARN,78,97,41,14
+    CTEXT           "second(s)",IDC_SHOW_WARN_TWO,124,99,32,10
+    GROUPBOX        "Shutdown Event Tracker",IDC_STATIC,5,114,224,114
+    CTEXT           "Reason:",IDC_STATIC,16,130,27,8
+    CHECKBOX        "Planned",IDC_PLANNED,175,130,40,12,BS_AUTOCHECKBOX | WS_TABSTOP
+    COMBOBOX        IDC_REASON_CODE,17,142,198,13,WS_TABSTOP | CBS_DROPDOWN
+    CTEXT           "Comm&ent:",IDC_COMMENT_CAPTION,17,159,30,8
+    EDITTEXT        IDC_COMMENT_TEXT,17,171,198,50,WS_VSCROLL
+END
+
+/* Information and error messages */
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_USAGE,  "ReactOS Shutdown Utility\n\
+\n\
+Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\
+       [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\
+\n\
+    No arguments or /?    Display this help.\n\
+    /i      Show the graphical user interface (GUI). This option must be the\n\
+            first one.\n\
+    /l      Log off on the local system only. Cannot be used with /m or /d.\n\
+    /s      Shutdown the computer.\n\
+    /r      Restart the computer.\n\
+    /g      Restart the computer and restart all the registered applications.\n\
+    /a      Cancel a delayed shutdown. Can only be used during the delay\n\
+            period.\n\
+    /p      Shutdown the local computer without any timeout or warning. Can be\n\
+            used with /d or /f.\n\
+    /h      Hibernate the local computer. Usable with /f.\n\
+    /e      Document the reason for the unexpected computer shutdown.\n\
+    /m \\\\computer  Specify the target computer (UNC/IP address).\n\
+    /t xxx  Set the timeout period to xxx seconds before shutting down.\n\
+            The valid range starts from 0 to 315360000 (10 years),\n\
+            30 being the default value.\n\
+    /c ""comment""  Comment on the reason for shutdown or restart.\n\
+            512 characters maximum allowed.\n\
+    /f      Force running applications to close without warning users. If you\n\
+            do not specify any other parameter, this option will also log off.\n\
+    /d [p|u:]xx:yy  Give the reason code for the shutdown or the restart.\n\
+            p indicates that the shutdown or the restart is planned.\n\
+            u indicates that the reason is defined by the user.\n\
+            If neither p nor u are specified, the shutdown or the restart are\n\
+            not planned.\n\
+            xx is the major reason code (positive integer smaller than 256).\n\
+            yy is the minor reason code (positive integer smaller than 65536).\n"

-IDS_USAGE, "用法: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  沒有參數或 -?\t顯示這個訊息\n\
-  -l\t\t\t登出\n\
-  -s\t\t\t將電腦關機\n\
-  -r\t\t\t重新啟動電腦\n\
-  -f\t\t\t無警告地強制關閉正在執行的程式\n\
-    \t\t\t如果您沒有指定其他任何參數，這個選項\n\
-    \t\t\t也會引致登出"
+    IDS_ERROR_SHUTDOWN_REBOOT,          "ERROR: Unable to shutdown and restart at the same time.\n"
+    IDS_ERROR_TIMEOUT,                  "ERROR: Timeout value of %u is out of bounds (0-315360000).\n"
+    IDS_ERROR_ABORT,                    "ERROR: Unable to abort the shutdown of the system.\n"
+    IDS_ERROR_LOGOFF,                   "ERROR: Unable to logoff the system.\n"
+    IDS_ERROR_SHUTDOWN,                 "ERROR: Unable to shutdown the system.\n"
+    IDS_ERROR_RESTART,                  "ERROR: Unable to restart the system.\n"
+    IDS_ERROR_MAX_COMMENT_LENGTH,       "ERROR: Comment length exceeds maximum character limit set by the system.\n"
+    IDS_ERROR_HIBERNATE,                "ERROR: Unable to send system into hibernation mode.\n"
+    IDS_ERROR_HIBERNATE_LOCAL,          "ERROR: Hibernation mode cannot be started remotely.\n"
+    IDS_ERROR_HIBERNATE_ENABLED,        "ERROR: Hibernation mode is not enabled.\n"
+    IDS_ERROR_DIALOG_CAPTION,           "Remote Shutdown"
+    IDS_ERROR_DIALOG_INIT,              "Unable to display the graphical user interface."
+END
+
+/* Remote shutdown action strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_ACTION_SHUTDOWN,                "Shutdown the system"
+    IDS_ACTION_RESTART,                 "Restart the system"
+    IDS_ACTION_UNEXPECTED_SHUTDOWN,     "Annotate the unexpected shutdown"
+END
+
+/* Remote shutdown reason strings */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_REASON_OTHER,                   "Other"
+    IDS_REASON_HARDWARE_MAINTENANCE,    "Hardware: Maintenance"
+    IDS_REASON_HARDWARE_INSTALL,        "Hardware: Installation"
+    IDS_REASON_OS_RECOVER,              "Operating System: Recovery"
+    IDS_REASON_OS_RECONFIGURE,          "Operating System: Reconfigure"
+    IDS_REASON_APP_MAINTENANCE,         "Application: Maintenance"
+    IDS_REASON_APP_INSTALL,             "Application: Installation"
+    IDS_REASON_APP_UNRESPONSIVE,        "Application: Unresponsive"
+    IDS_REASON_APP_UNSTABLE,            "Application: Unstable"
+    IDS_REASON_SECURITY,                "Security Issue"
+    IDS_REASON_NETWORK,                 "Loss of network connectivity"
 END
--- a/base/applications/shutdown/misc.c
+++ b/base/applications/shutdown/misc.c
@ -1,63 +1,188 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS shutdown/logoff utility
+ * FILE:            base/applications/shutdown/misc.c
+ * PURPOSE:         Misc. functions used for the shutdown utility
+ * PROGRAMMERS:     Lee Schroeder
+ */
+
 #include "precomp.h"

-static INT
-LengthOfStrResource(IN HINSTANCE hInst,
-                    IN UINT uID)
+const DWORD defaultReason = SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER;
+
+REASON shutdownReason[] =
 {
-    HRSRC hrSrc;
-    HGLOBAL hRes;
-    LPWSTR lpName, lpStr;
+    {L"U" , 0,  0, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER},                                             /* Other (Unplanned) */
+    {L"E" , 0,  0, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER},                                             /* Other (Unplanned) */
+    {L"EP", 0,  0, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED},                 /* Other (Planned) */
+    {L"U" , 0,  5, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_HUNG},                                              /* Other Failure: System Unresponsive */
+    {L"E" , 1,  1, SHTDN_REASON_MAJOR_HARDWARE | SHTDN_REASON_MINOR_MAINTENANCE},                                    /* Hardware: Maintenance (Unplanned) */
+    {L"EP", 1,  1, SHTDN_REASON_MAJOR_HARDWARE | SHTDN_REASON_MINOR_MAINTENANCE | SHTDN_REASON_FLAG_PLANNED},        /* Hardware: Maintenance (Planned) */
+    {L"E" , 1,  2, SHTDN_REASON_MAJOR_HARDWARE | SHTDN_REASON_MINOR_INSTALLATION},                                   /* Hardware: Installation (Unplanned) */
+    {L"EP", 1,  2, SHTDN_REASON_MAJOR_HARDWARE | SHTDN_REASON_MINOR_INSTALLATION | SHTDN_REASON_FLAG_PLANNED},       /* Hardware: Installation (Planned) */
+    {L"P" , 2,  3, SHTDN_REASON_MAJOR_OPERATINGSYSTEM | SHTDN_REASON_MINOR_UPGRADE | SHTDN_REASON_FLAG_PLANNED},     /* Operating System: Upgrade (Planned) */
+    {L"E" , 2,  4, SHTDN_REASON_MAJOR_OPERATINGSYSTEM | SHTDN_REASON_MINOR_RECONFIG},                                /* Operating System: Reconfiguration (Unplanned) */
+    {L"EP", 2,  4, SHTDN_REASON_MAJOR_OPERATINGSYSTEM | SHTDN_REASON_MINOR_RECONFIG | SHTDN_REASON_FLAG_PLANNED},    /* Operating System: Reconfiguration (Planned) */
+    {L"P" , 2, 16, SHTDN_REASON_MAJOR_OPERATINGSYSTEM | SHTDN_REASON_MINOR_RECONFIG | SHTDN_REASON_FLAG_PLANNED},    /* Operating System: Service pack (Planned) */
+    {L"U" , 2, 17, SHTDN_REASON_MAJOR_OPERATINGSYSTEM | SHTDN_REASON_MINOR_HOTFIX},                                  /* Operating System: Hotfix (Unplanned) */
+    {L"P" , 2, 17, SHTDN_REASON_MAJOR_OPERATINGSYSTEM | SHTDN_REASON_MINOR_HOTFIX | SHTDN_REASON_FLAG_PLANNED},      /* Operating System: Hotfix (Planned) */
+    {L"U" , 2, 18, SHTDN_REASON_MAJOR_OPERATINGSYSTEM | SHTDN_REASON_MINOR_SECURITYFIX},                             /* Operating System: Security fix (Unplanned) */
+    {L"P" , 2, 18, SHTDN_REASON_MAJOR_OPERATINGSYSTEM | SHTDN_REASON_MINOR_SECURITYFIX | SHTDN_REASON_FLAG_PLANNED}, /* Operating System: Security fix (Planned) */
+    {L"E" , 4,  1, SHTDN_REASON_MAJOR_APPLICATION | SHTDN_REASON_MINOR_MAINTENANCE},                                 /* Application: Maintenance (Unplanned) */
+    {L"EP", 4,  1, SHTDN_REASON_MAJOR_APPLICATION | SHTDN_REASON_MINOR_MAINTENANCE | SHTDN_REASON_FLAG_PLANNED},     /* Application: Maintenance (Planned) */
+    {L"EP", 4,  2, SHTDN_REASON_MAJOR_APPLICATION | SHTDN_REASON_MINOR_INSTALLATION | SHTDN_REASON_FLAG_PLANNED},    /* Application: Installation (Planned) */
+    {L"E" , 4,  5, SHTDN_REASON_MAJOR_APPLICATION | SHTDN_REASON_MINOR_HUNG},                                        /* Application: Unresponsive */
+    {L"E" , 4,  6, SHTDN_REASON_MAJOR_APPLICATION | SHTDN_REASON_MINOR_UNSTABLE},                                    /* Application: Unstable */
+    {L"U" , 5, 15, SHTDN_REASON_MAJOR_SYSTEM | SHTDN_REASON_MINOR_BLUESCREEN},                                       /* System Failure: Stop Error */
+    {L"E" , 5, 19, SHTDN_REASON_MAJOR_SYSTEM | SHTDN_REASON_MINOR_SECURITY},                                         /* Security Issue */
+    {L"U" , 5, 19, SHTDN_REASON_MAJOR_SYSTEM | SHTDN_REASON_MINOR_SECURITY},                                         /* Security Issue */
+    {L"EP", 5, 19, SHTDN_REASON_MAJOR_SYSTEM | SHTDN_REASON_MINOR_SECURITY | SHTDN_REASON_FLAG_PLANNED},             /* Security Issue (Planned) */
+    {L"E" , 5, 20, SHTDN_REASON_MAJOR_SYSTEM | SHTDN_REASON_MINOR_NETWORK_CONNECTIVITY},                             /* Loss of Network Connectivity (Unplanned) */
+    {L"U" , 6, 11, SHTDN_REASON_MAJOR_POWER | SHTDN_REASON_MINOR_CORDUNPLUGGED},                                     /* Power Failure: Cord Unplugged */
+    {L"U" , 6, 12, SHTDN_REASON_MAJOR_POWER | SHTDN_REASON_MINOR_ENVIRONMENT},                                       /* Power Failure: Environment */
+    {L"P" , 7,  0, SHTDN_REASON_MAJOR_POWER | SHTDN_REASON_MINOR_ENVIRONMENT}                                        /* Legacy API shutdown (Planned) */
+};

-    if (hInst == NULL)
+/*
+ * This command helps to work around the fact that the shutdown utility has
+ * different upper limits for the comment flag since each version of Windows
+ * seems to have different upper limits.
+ */
+BOOL CheckCommentLength(LPCWSTR comment)
+{
+    DWORD finalLength = 0;
+    size_t strLength = 0;
+    DWORD osVersion = 0;
+    DWORD osMajorVersion = 0;
+    DWORD osMinorVersion = 0;
+
+    /* An empty string is always valid. */
+    if (!comment || *comment == 0)
+        return TRUE;
+
+    /* Grab the version of the current Operating System. */
+    osVersion = GetVersion();
+
+    osMajorVersion = (DWORD)(LOBYTE(LOWORD(osVersion)));
+    osMinorVersion = (DWORD)(HIBYTE(LOWORD(osVersion)));
+
+    /*
+     * Check to make sure that the proper length is being used
+     * based upon the version of Windows currently being used.
+     */
+    if (osMajorVersion == 5) /* Windows XP/2003 */
    {
-        return -1;
-    }
-
-    /* There are always blocks of 16 strings */
-    lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1);
-
-    /* Find the string table block */
-    if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) &&
-        (hRes = LoadResource(hInst, hrSrc)) &&
-        (lpStr = (WCHAR*) LockResource(hRes)))
-    {
-        UINT x;
-
-        /* Find the string we're looking for */
-        uID &= 0xF; /* position in the block, same as % 16 */
-        for (x = 0; x < uID; x++)
+        if ((osMinorVersion == 1) || (osMinorVersion == 2))
        {
-            lpStr += (*lpStr) + 1;
+            finalLength = 127;
        }
-
-        /* Found the string */
-        return (int)(*lpStr);
    }
-    return -1;
+    else if (osMajorVersion == 6) /* Windows Vista/7/2008 */
+    {
+        if ((osMinorVersion == 0) || (osMinorVersion == 1))
+        {
+            finalLength = 512;
+        }
+    }
+
+    /* Grab the length of the comment string. */
+    strLength = wcslen(comment);
+
+    /*
+     * Compare the size of the string to make sure
+     * it fits with the current version of Windows,
+     * and return TRUE or FALSE accordingly.
+     */
+    return (strLength <= finalLength);
 }

-INT
-AllocAndLoadString(OUT LPTSTR *lpTarget,
-                   IN HINSTANCE hInst,
-                   IN UINT uID)
+/*
+ * This function parses the reason code to a usable format that will specify
+ * why the user wants to shut the computer down. Although this is used for
+ * both client and server environments, use of a reason code is more important
+ * in a server environment since servers are supposed to be on all the time
+ * for easier access.
+ */
+DWORD ParseReasonCode(LPCWSTR code)
 {
-    INT ln;
+    PREASON reasonptr;
+    int majorCode = 0;
+    int minorCode = 0;
+    LPWSTR tmpPrefix = NULL;
+    size_t codeSize;

-    ln = LengthOfStrResource(hInst,
-                             uID);
-    if (ln++ > 0)
+    /* If no reason code is specified, use "Other (Unplanned)" as the default option */
+    if(code == NULL)
    {
-        (*lpTarget) = (LPTSTR)LocalAlloc(LMEM_FIXED,
-                                         ln * sizeof(TCHAR));
-        if ((*lpTarget) != NULL)
+        return defaultReason;
+    }
+    else
+    {
+        /* Store the size of the code so we can use it later */
+        codeSize = (size_t)wcslen(code);
+
+        /* A colon cannot be the first or last character in the reason code */
+        if ((code[0] == L':') || (code[codeSize] == L':'))
        {
-            INT Ret;
-            if (!(Ret = LoadString(hInst, uID, *lpTarget, ln)))
+            return defaultReason;
+        }
+
+        /* The minimum length that a reason code can be is 5-7 characters in length */
+        if ((codeSize < 5) || (codeSize > 7))
+        {
+            return defaultReason;
+        }
+
+        /* TODO: Add code for reason parsing here. */
+
+        /* Make sure that the major and minor codes are within size limits */
+        if ((majorCode > 7 ) || (majorCode < 0) ||
+            (minorCode > 20) || (minorCode < 0))
+        {
+            return defaultReason;
+        }
+
+        /* Figure out what flags to return */
+        for (reasonptr = shutdownReason ; reasonptr->prefix ; reasonptr++)
+        {
+            if ((majorCode == reasonptr->major) &&
+                (minorCode == reasonptr->minor) &&
+                (_wcsicmp(tmpPrefix, reasonptr->prefix) != 0))
            {
-                LocalFree((HLOCAL)(*lpTarget));
+                return reasonptr->flag;
            }
-            return Ret;
        }
    }
-    return 0;
+
+    return defaultReason;
 }
+
+/* Writes the last error as both text and error code to the console */
+VOID DisplayError(DWORD dwError)
+{
+    LPWSTR lpMsgBuf = NULL;
+    DWORD  errLength; /* Error message length */
+    LPSTR resMsg;     /* For error message in OEM symbols */
+
+    /* Grabs the length of the error message */
+    errLength = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+                               NULL,
+                               dwError,
+                               LANG_USER_DEFAULT,
+                               (LPWSTR)&lpMsgBuf,
+                               0,
+                               NULL) + 1;
+
+    /* Gets the error message ready for output */
+    resMsg = (LPSTR)LocalAlloc(LPTR, errLength * sizeof(WCHAR));
+    CharToOemBuffW(lpMsgBuf, resMsg, errLength);
+
+    /* Prints out the error message to the user */
+    fprintf(stderr, resMsg);
+    fwprintf(stderr, L"Error code: %d\n", dwError);
+
+    LocalFree(lpMsgBuf);
+    LocalFree(resMsg);
+}
+
+/* EOF */
--- a/base/applications/shutdown/precomp.h
+++ b/base/applications/shutdown/precomp.h
@ -1,16 +1,59 @@
 #ifndef __SHUTDOWN_PRECOMP_H
 #define __SHUTDOWN_PRECOMP_H

+/* INCLUDES ******************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include <windows.h>
 #include <tchar.h>
-#include <reason.h> //shutdown codes
+#include <powrprof.h>
+// #include <reason.h> // Shutdown codes
 #include "resource.h"

-// misc.c
-INT AllocAndLoadString(OUT LPTSTR *lpTarget,
-                       IN HINSTANCE hInst,
-                       IN UINT uID);
+/* DEFINES *******************************************************************/
+#define MAX_MESSAGE_SIZE    512
+#define MAX_MAJOR_CODE      256
+#define MAX_MINOR_CODE      65536
+#define MAX_TIMEOUT         315360000
+#define MAX_BUFFER_SIZE     5024
+
+/* Reason Code List */
+typedef struct _REASON
+{
+    LPWSTR prefix;
+    int major;
+    int minor;
+    DWORD flag;
+} REASON, *PREASON;
+
+/* Used to determine how to shutdown the system. */
+struct CommandLineOptions
+{
+    BOOL abort;
+    BOOL force;
+    BOOL logoff;
+    BOOL restart;
+    BOOL shutdown;
+    BOOL document_reason;
+    BOOL hibernate;
+    DWORD shutdown_delay;
+    LPWSTR remote_system;
+    LPWSTR message;
+    DWORD reason;
+    BOOL show_gui;
+};
+
+extern const DWORD defaultReason;
+
+/* PROTOTYPES *****************************************************************/
+
+/* misc.c */
+BOOL CheckCommentLength(LPCWSTR);
+DWORD ParseReasonCode(LPCWSTR);
+VOID DisplayError(DWORD dwError);
+
+/* gui.c */
+BOOL ShutdownGuiMain(struct CommandLineOptions opts);

 #endif
--- a/base/applications/shutdown/resource.h
+++ b/base/applications/shutdown/resource.h
@ -1 +1,56 @@
-#define IDS_USAGE    1000
+#pragma once
+
+/* Strings */
+#define IDC_STATIC                     -1
+#define IDS_USAGE                       1
+#define IDS_ERROR_SHUTDOWN_REBOOT       2
+#define IDS_ERROR_TIMEOUT               3
+#define IDS_ERROR_ABORT                 4
+#define IDS_ERROR_LOGOFF                5
+#define IDS_ERROR_RESTART               6
+#define IDS_ERROR_SHUTDOWN              7
+#define IDS_ERROR_MAX_COMMENT_LENGTH    8
+#define IDS_ERROR_HIBERNATE             9
+#define IDS_ERROR_HIBERNATE_LOCAL       10
+#define IDS_ERROR_HIBERNATE_ENABLED     11
+#define IDS_ERROR_DIALOG_CAPTION        12
+#define IDS_ERROR_DIALOG_INIT           13
+
+/* Action strings */
+#define IDS_ACTION_SHUTDOWN             14
+#define IDS_ACTION_RESTART              15
+#define IDS_ACTION_UNEXPECTED_SHUTDOWN  16
+
+/* Reason strings */
+#define IDS_REASON_OTHER                    17
+#define IDS_REASON_HARDWARE_MAINTENANCE     18
+#define IDS_REASON_HARDWARE_INSTALL         19
+#define IDS_REASON_OS_RECOVER               20
+#define IDS_REASON_OS_RECONFIGURE           21
+#define IDS_REASON_APP_MAINTENANCE          22
+#define IDS_REASON_APP_INSTALL              23
+#define IDS_REASON_APP_UNRESPONSIVE         24
+#define IDS_REASON_APP_UNSTABLE             25
+#define IDS_REASON_SECURITY                 26
+#define IDS_REASON_NETWORK                  27
+
+/* Controls */
+#define IDC_OK                  100
+#define IDC_CANCEL              101
+#define IDC_COMPUTER_LIST       102
+#define IDC_ADD_SYSTEM          103
+#define IDC_REMOVE_SYSTEM       104
+#define IDC_BROWSE_SYSTEM       105
+#define IDC_ACTION              106
+#define IDC_ACTION_TYPE         107
+#define IDC_WARN_USERS          108
+#define IDC_SHOW_WARN_ONE       109
+#define IDC_SHOW_WARN_TWO       110
+#define IDC_SHOW_WARN           111
+#define IDC_PLANNED             112
+#define IDC_REASON_CODE         113
+#define IDC_COMMENT_CAPTION     114
+#define IDC_COMMENT_TEXT        115
+
+/* Dialogs */
+#define IDD_GUI                 200
--- a/Show more
+++ b/Show more