* Fix svn merge-info confusion regarding this file.

svn path=/branches/GSoC_2017/rapps/; revision=75825

reactos/CMakeLists.txt

@@ -16,6 +16,11 @@ if(POLICY CMP0051)
     cmake_policy(SET CMP0051 NEW)
 endif()
 
+if(POLICY CMP0058)
+    # Ninja requires custom command byproducts to be explicit
+    cmake_policy(SET CMP0058 OLD)
+endif()
+
 project(REACTOS)
 
 # Versioning
@@ -35,7 +40,6 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE)
 set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE)
 set(CMAKE_COLOR_MAKEFILE OFF)
 #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
-set(CMAKE_SKIP_INSTALL_RULES ON)
 
 if(NOT DEFINED NEW_STYLE_BUILD)
     set(NEW_STYLE_BUILD TRUE)
@@ -53,15 +57,15 @@ string(TOLOWER ${ARCH} ARCH)
 
 # Compile options
 if(ARCH STREQUAL "i386")
-    include(cmake/config.cmake)
+    include(sdk/cmake/config.cmake)
 elseif(ARCH STREQUAL "amd64")
-    include(cmake/config-amd64.cmake)
+    include(sdk/cmake/config-amd64.cmake)
 elseif(ARCH STREQUAL "arm")
-    include(cmake/config-arm.cmake)
+    include(sdk/cmake/config-arm.cmake)
 endif()
 
 # Compiler flags handling
-include(cmake/compilerflags.cmake)
+include(sdk/cmake/compilerflags.cmake)
 
 add_definitions(-D__REACTOS__)
 
@@ -76,7 +80,7 @@ if(NOT MSVC_IDE)
 endif()
 
 # Bison and Flex support
-# include(cmake/bison-flex.cmake)
+# include(sdk/cmake/bison-flex.cmake)
 
 if(NOT CMAKE_CROSSCOMPILING)
 
@@ -94,8 +98,6 @@ if(NOT CMAKE_CROSSCOMPILING)
             add_definitions(/D_ALLOW_KEYWORD_MACROS)
         endif()
         add_definitions(/Dinline=__inline)
-    else()
-        add_compile_flags("-fshort-wchar -Wno-multichar")
     endif()
 
     include_directories(sdk/include/host)
@@ -108,16 +110,16 @@ if(NOT CMAKE_CROSSCOMPILING)
 
     if(NOT NEW_STYLE_BUILD)
         if(NOT MSVC)
-            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc rsym mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+            export(TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc rsym mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
         else()
-            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+            export(TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
         endif()
     endif()
 
 else()
 
     if(NEW_STYLE_BUILD)
-        include(cmake/host-tools.cmake)
+        include(sdk/cmake/host-tools.cmake)
     endif()
 
     # Print build type
@@ -207,24 +209,24 @@ else()
     enable_language(RC)
 
     # Localization definitions
-    include(cmake/localization.cmake)
+    include(sdk/cmake/localization.cmake)
     set(I18N_DEFS "")
     # This will set I18N_DEFS for later use
     set_i18n_language(${I18N_LANG})
 
     # Compiler specific definitions and macros
     if(MSVC)
-        include(cmake/msvc.cmake)
+        include(sdk/cmake/msvc.cmake)
     else()
-        include(cmake/gcc.cmake)
+        include(sdk/cmake/gcc.cmake)
     endif()
 
     # Generic macros
-    include(cmake/CMakeMacros.cmake)
+    include(sdk/cmake/CMakeMacros.cmake)
 
     # IDL macros for widl/midl
     # We're using widl now for both MSVC and GCC builds
-    include(cmake/widl-support.cmake)
+    include(sdk/cmake/widl-support.cmake)
 
     include_directories(
         sdk/include
@@ -235,6 +237,7 @@ else()
         ${REACTOS_BINARY_DIR}/sdk/include/dxsdk
         ${REACTOS_BINARY_DIR}/sdk/include/ddk
         ${REACTOS_BINARY_DIR}/sdk/include/reactos
+        ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc
         sdk/include/crt
         sdk/include/ddk
         sdk/include/ndk
@@ -255,11 +258,11 @@ else()
     add_subdirectory(sdk/include/asm)
 
     if(NO_ROSSYM)
-        include(cmake/baseaddress_dwarf.cmake)
+        include(sdk/cmake/baseaddress_dwarf.cmake)
     elseif(MSVC)
-        include(cmake/baseaddress_msvc.cmake)
+        include(sdk/cmake/baseaddress_msvc.cmake)
     else()
-        include(cmake/baseaddress.cmake)
+        include(sdk/cmake/baseaddress.cmake)
     endif()
 
     # For MSVC builds, this puts all debug symbols file in the same directory.

reactos/PreLoad.cmake

@@ -4,7 +4,7 @@ STRING(REPLACE "/PreLoad.cmake" "" REACTOS_HOME_DIR ${CMAKE_CURRENT_LIST_FILE})
 
 #message("/PreLoad.cmake ... ${REACTOS_HOME_DIR}")
 
-SET(CMAKE_MODULE_PATH "${REACTOS_HOME_DIR}/cmake" CACHE INTERNAL "")
+SET(CMAKE_MODULE_PATH "${REACTOS_HOME_DIR}/sdk/cmake" CACHE INTERNAL "")
 
 #message("CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")
 

reactos/README

@@ -14,7 +14,7 @@ The ReactOS project, although currently focused on Windows Server 2003
 compatibility, is always keeping an eye toward compatibility with
 Windows Vista and future Windows NT releases.
 
-More information is available at: http://www.reactos.org
+More information is available at: https://www.reactos.org
 
 2. Building ReactOS
 -------------------

reactos/base/applications/CMakeLists.txt

@@ -9,6 +9,7 @@ add_subdirectory(control)
 add_subdirectory(dxdiag)
 add_subdirectory(extrac32)
 add_subdirectory(findstr)
+add_subdirectory(fltmc)
 add_subdirectory(fontview)
 add_subdirectory(games)
 add_subdirectory(hh)
@@ -27,7 +28,6 @@ add_subdirectory(network)
 add_subdirectory(notepad)
 add_subdirectory(osk)
 add_subdirectory(rapps)
-add_subdirectory(rapps_new)
 add_subdirectory(regedit)
 add_subdirectory(regedt32)
 add_subdirectory(sc)

reactos/base/applications/atactl/atactl.cpp

@@ -91,14 +91,14 @@ void print_help() {
            "    will switch device at Scsi2, bus 1, taget_id 1 to UDMA0 mode\n"
            "  atactl -h -d 30 c1:b0:d0:l0 \n"
            "    will hide Master (d0:l0) device on secondary (c1:b0) IDE channel\n"
-           "    and lock i/o on this channel for 30 seconds to ensure safity\n"
+           "    and lock i/o on this channel for 30 seconds to ensure safety\n"
            "    of removal process"
            "------\n"
            "Device address format:\n"
            "\n"
            "s<controller id> number of controller in system. Is assigned during hardware\n"
            "                   detection. Usually s0/s1 are ATA Pri/Sec.\n"
-           "                   Note, due do NT internal desing ATA controllers are represented\n"
+           "                   Note, due do NT internal design ATA controllers are represented\n"
            "                   as SCSI controllers.\n"
            "b<bus id>        For ATA controllers it is channel number.\n"
            "                   Note, usually onboard controller is represented as 2 legacy\n"
@@ -1283,7 +1283,7 @@ ata_scan(
         to.WaitForPhysicalLink = lock;
         to.Flags = unhide ? UNIATA_ADD_FLAGS_UNHIDE : 0;
 
-        printf("Scaning bus for new devices.\n");
+        printf("Scanning bus for new devices.\n");
         if(lock) {
             printf("You have %d seconds to connect device.\n", lock);
         }

reactos/base/applications/cacls/CMakeLists.txt

@@ -1,6 +1,8 @@
 
-list(APPEND SOURCE cacls.c cacls.rc)
-add_executable(cacls ${SOURCE})
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
+add_executable(cacls cacls.c cacls.rc)
 set_module_type(cacls win32cui UNICODE)
+target_link_libraries(cacls conutils ${PSEH_LIB})
 add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32)
 add_cd_file(TARGET cacls DESTINATION reactos/system32 FOR all)

reactos/base/applications/cacls/cacls.c

@@ -33,155 +33,17 @@ static GENERIC_MAPPING FileGenericMapping =
 };
 
 
-static
-INT
-LengthOfStrResource(IN HINSTANCE hInst,
-                    IN UINT uID)
+static VOID
+PrintError(DWORD dwError)
 {
-    HRSRC hrSrc;
-    HGLOBAL hRes;
-    LPWSTR lpName, lpStr;
+    if (dwError == ERROR_SUCCESS)
+        return;
 
-    if (hInst == NULL)
-    {
-        hInst = GetModuleHandle(NULL);
-    }
-
-    /* There are always blocks of 16 strings */
-    lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1);
-
-    /* Find the string table block */
-    hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING);
-    if (hrSrc)
-    {
-        hRes = LoadResource(hInst, hrSrc);
-        if (hRes)
-        {
-            lpStr = LockResource(hRes);
-            if (lpStr)
-            {
-                UINT x;
-
-                /* Find the string we're looking for */
-                uID &= 0xF; /* position in the block, same as % 16 */
-                for (x = 0; x < uID; x++)
-                {
-                    lpStr += (*lpStr) + 1;
-                }
-
-                /* Found the string */
-                return (int)(*lpStr);
-            }
-        }
-    }
-    return -1;
+    ConMsgPuts(StdErr, FORMAT_MESSAGE_FROM_SYSTEM,
+               NULL, dwError, LANG_USER_DEFAULT);
 }
 
-
-static
-INT
-AllocAndLoadString(OUT LPTSTR *lpTarget,
-                   IN HINSTANCE hInst,
-                   IN UINT uID)
-{
-    INT ln;
-
-    ln = LengthOfStrResource(hInst,
-                             uID);
-    if (ln++ > 0)
-    {
-        (*lpTarget) = (LPTSTR)HeapAlloc(GetProcessHeap(),
-                                        0,
-                                        ln * sizeof(TCHAR));
-        if ((*lpTarget) != NULL)
-        {
-            INT Ret;
-            Ret = LoadString(hInst,
-                             uID,
-                             *lpTarget,
-                             ln);
-            if (!Ret)
-            {
-                HeapFree(GetProcessHeap(),
-                         0,
-                         *lpTarget);
-            }
-            return Ret;
-        }
-    }
-    return 0;
-}
-
-
-static
-VOID
-PrintHelp(VOID)
-{
-    LPTSTR szHelp;
-
-    if (AllocAndLoadString(&szHelp,
-                           NULL,
-                           IDS_HELP) != 0)
-    {
-        _tprintf(_T("%s"),
-                 szHelp);
-
-        HeapFree(GetProcessHeap(),
-                 0,
-                 szHelp);
-    }
-}
-
-
-static
-VOID
-PrintErrorMessage(IN DWORD dwError)
-{
-    LPTSTR szError;
-
-    if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                          FORMAT_MESSAGE_IGNORE_INSERTS |
-                          FORMAT_MESSAGE_FROM_SYSTEM,
-                      NULL,
-                      dwError,
-                      MAKELANGID(LANG_NEUTRAL,
-                                 SUBLANG_DEFAULT),
-                      (LPTSTR)&szError,
-                      0,
-                      NULL) != 0)
-    {
-        _tprintf(_T("%s"),
-                 szError);
-        LocalFree((HLOCAL)szError);
-    }
-}
-
-
-static
-DWORD
-LoadAndPrintString(IN HINSTANCE hInst,
-                   IN UINT uID)
-{
-    TCHAR szTemp[255];
-    DWORD Len;
-
-    Len = (DWORD)LoadString(hInst,
-                            uID,
-                            szTemp,
-                            sizeof(szTemp) / sizeof(szTemp[0]));
-
-    if (Len != 0)
-    {
-        _tprintf(_T("%s"),
-                 szTemp);
-    }
-
-    return Len;
-}
-
-
-static
-BOOL
+static BOOL
 PrintFileDacl(IN LPTSTR FilePath,
               IN LPTSTR FileName)
 {
@@ -199,10 +61,8 @@ PrintFileDacl(IN LPTSTR FilePath,
         return FALSE;
     }
 
-    _tcscpy(FullFileName,
-            FilePath);
-    _tcscat(FullFileName,
-            FileName);
+    _tcscpy(FullFileName, FilePath);
+    _tcscat(FullFileName, FileName);
 
     /* find out how much memory we need */
     if (!GetFileSecurity(FullFileName,
@@ -318,8 +178,7 @@ BuildSidString:
                         }
 
                         /* print the file name or space */
-                        _tprintf(_T("%s "),
-                                 FullFileName);
+                        ConPrintf(StdOut, L"%s ", FullFileName);
 
                         /* attempt to map the SID to a user name */
                         if (AceIndex == 0)
@@ -335,35 +194,29 @@ BuildSidString:
                         /* print the domain and/or user if possible, or the SID string */
                         if (Name != NULL && Domain[0] != _T('\0'))
                         {
-                            _tprintf(_T("%s\\%s:"),
-                                     Domain,
-                                     Name);
+                            ConPrintf(StdOut, L"%s\\%s:", Domain, Name);
                             IndentAccess = (DWORD)_tcslen(Domain) + _tcslen(Name);
                         }
                         else
                         {
                             LPTSTR DisplayString = (Name != NULL ? Name : SidString);
 
-                            _tprintf(_T("%s:"),
-                                     DisplayString);
+                            ConPrintf(StdOut, L"%s:", DisplayString);
                             IndentAccess = (DWORD)_tcslen(DisplayString);
                         }
 
                         /* print the ACE Flags */
                         if (Ace->Header.AceFlags & CONTAINER_INHERIT_ACE)
                         {
-                            IndentAccess += LoadAndPrintString(NULL,
-                                                               IDS_ABBR_CI);
+                            IndentAccess += ConResPuts(StdOut, IDS_ABBR_CI);
                         }
                         if (Ace->Header.AceFlags & OBJECT_INHERIT_ACE)
                         {
-                            IndentAccess += LoadAndPrintString(NULL,
-                                                               IDS_ABBR_OI);
+                            IndentAccess += ConResPuts(StdOut, IDS_ABBR_OI);
                         }
                         if (Ace->Header.AceFlags & INHERIT_ONLY_ACE)
                         {
-                            IndentAccess += LoadAndPrintString(NULL,
-                                                               IDS_ABBR_IO);
+                            IndentAccess += ConResPuts(StdOut, IDS_ABBR_IO);
                         }
 
                         IndentAccess += 2;
@@ -375,13 +228,11 @@ BuildSidString:
                         {
                             if (AccessMask == FILE_ALL_ACCESS)
                             {
-                                LoadAndPrintString(NULL,
-                                                   IDS_ABBR_NONE);
+                                ConResPuts(StdOut, IDS_ABBR_NONE);
                             }
                             else
                             {
-                                LoadAndPrintString(NULL,
-                                                   IDS_DENY);
+                                ConResPuts(StdOut, IDS_DENY);
                                 goto PrintSpecialAccess;
                             }
                         }
@@ -389,24 +240,20 @@ BuildSidString:
                         {
                             if (AccessMask == FILE_ALL_ACCESS)
                             {
-                                LoadAndPrintString(NULL,
-                                                   IDS_ABBR_FULL);
+                                ConResPuts(StdOut, IDS_ABBR_FULL);
                             }
                             else if (!(Ace->Mask & (GENERIC_READ | GENERIC_EXECUTE)) &&
                                      AccessMask == (FILE_GENERIC_READ | FILE_EXECUTE))
                             {
-                                LoadAndPrintString(NULL,
-                                                   IDS_ABBR_READ);
+                                ConResPuts(StdOut, IDS_ABBR_READ);
                             }
                             else if (AccessMask == (FILE_GENERIC_READ | FILE_GENERIC_WRITE | FILE_EXECUTE | DELETE))
                             {
-                                LoadAndPrintString(NULL,
-                                                   IDS_ABBR_CHANGE);
+                                ConResPuts(StdOut, IDS_ABBR_CHANGE);
                             }
                             else if (AccessMask == FILE_GENERIC_WRITE)
                             {
-                                LoadAndPrintString(NULL,
-                                                   IDS_ABBR_WRITE);
+                                ConResPuts(StdOut, IDS_ABBR_WRITE);
                             }
                             else
                             {
@@ -446,38 +293,32 @@ BuildSidString:
                                     {STANDARD_RIGHTS_ALL, IDS_STANDARD_RIGHTS_ALL},
                                 };
 
-                                LoadAndPrintString(NULL,
-                                                   IDS_ALLOW);
+                                ConResPuts(StdOut, IDS_ALLOW);
 
 PrintSpecialAccess:
-                                LoadAndPrintString(NULL,
-                                                   IDS_SPECIAL_ACCESS);
+                                ConResPuts(StdOut, IDS_SPECIAL_ACCESS);
 
                                 /* print the special access rights */
-                                x = sizeof(AccessRights) / sizeof(AccessRights[0]);
+                                x = ARRAYSIZE(AccessRights);
                                 while (x-- != 0)
                                 {
                                     if ((Ace->Mask & AccessRights[x].Access) == AccessRights[x].Access)
                                     {
-                                        _tprintf(_T("\n%s "),
-                                                 FullFileName);
-                                        for (x2 = 0;
-                                             x2 < IndentAccess;
-                                             x2++)
+                                        ConPrintf(StdOut, L"\n%s ", FullFileName);
+                                        for (x2 = 0; x2 < IndentAccess; x2++)
                                         {
-                                            _tprintf(_T(" "));
+                                            ConPuts(StdOut, L" ");
                                         }
 
-                                        LoadAndPrintString(NULL,
-                                                           AccessRights[x].uID);
+                                        ConResPuts(StdOut, AccessRights[x].uID);
                                     }
                                 }
 
-                                _tprintf(_T("\n"));
+                                ConPuts(StdOut, L"\n");
                             }
                         }
 
-                        _tprintf(_T("\n"));
+                        ConPuts(StdOut, L"\n");
 
                         /* free up all resources */
                         if (Name != NULL)
@@ -541,7 +382,7 @@ GetPathOfFile(LPTSTR FilePath, LPCTSTR pszFiles)
         *pch = 0;
         if (!GetFullPathName(FilePath, MAX_PATH, FullPath, NULL))
         {
-            PrintErrorMessage(GetLastError());
+            PrintError(GetLastError());
             return FALSE;
         }
         lstrcpyn(FilePath, FullPath, MAX_PATH);
@@ -549,7 +390,7 @@ GetPathOfFile(LPTSTR FilePath, LPCTSTR pszFiles)
         attrs = GetFileAttributes(FilePath);
         if (attrs == 0xFFFFFFFF || !(attrs & FILE_ATTRIBUTE_DIRECTORY))
         {
-            PrintErrorMessage(ERROR_DIRECTORY);
+            PrintError(ERROR_DIRECTORY);
             return FALSE;
         }
     }
@@ -591,7 +432,7 @@ PrintDaclsOfFiles(LPCTSTR pszFiles)
             LastError = GetLastError();
             if (LastError == ERROR_ACCESS_DENIED)
             {
-                PrintErrorMessage(LastError);
+                PrintError(LastError);
                 if (!OptionC)
                 {
                     FindClose(hFind);
@@ -599,17 +440,21 @@ PrintDaclsOfFiles(LPCTSTR pszFiles)
                 }
             }
             else
+            {
                 break;
+            }
         }
         else
-            _tprintf(_T("\n"));
+        {
+            ConPuts(StdOut, L"\n");
+        }
     } while(FindNextFile(hFind, &FindData));
     LastError = GetLastError();
     FindClose(hFind);
 
     if (LastError != ERROR_NO_MORE_FILES)
     {
-        PrintErrorMessage(LastError);
+        PrintError(LastError);
         return FALSE;
     }
 
@@ -771,7 +616,7 @@ ChangeACLsOfFiles(LPCTSTR pszFiles)
             LastError = GetLastError();
             if (LastError == ERROR_ACCESS_DENIED)
             {
-                PrintErrorMessage(LastError);
+                PrintError(LastError);
                 if (!OptionC)
                 {
                     FindClose(hFind);
@@ -788,7 +633,7 @@ ChangeACLsOfFiles(LPCTSTR pszFiles)
 
     if (LastError != ERROR_NO_MORE_FILES)
     {
-        PrintErrorMessage(LastError);
+        PrintError(LastError);
         return FALSE;
     }
 
@@ -826,7 +671,7 @@ ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
             LastError = GetLastError();
             if (LastError == ERROR_ACCESS_DENIED)
             {
-                PrintErrorMessage(LastError);
+                PrintError(LastError);
                 if (!OptionC)
                 {
                     FindClose(hFind);
@@ -843,7 +688,7 @@ ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
 
     if (LastError != ERROR_NO_MORE_FILES)
     {
-        PrintErrorMessage(LastError);
+        PrintError(LastError);
         return FALSE;
     }
 
@@ -872,7 +717,7 @@ ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
                 LastError = GetLastError();
                 if (LastError == ERROR_ACCESS_DENIED)
                 {
-                    PrintErrorMessage(LastError);
+                    PrintError(LastError);
                     if (!OptionC)
                     {
                         FindClose(hFind);
@@ -889,26 +734,29 @@ ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
 
     if (LastError != ERROR_NO_MORE_FILES)
     {
-        PrintErrorMessage(LastError);
+        PrintError(LastError);
         return FALSE;
     }
     return TRUE;
 }
 
-int
-__cdecl
-_tmain(int argc, const TCHAR *argv[])
+int _tmain(int argc, const TCHAR *argv[])
 {
     INT i;
     LPTSTR pch;
     BOOL InvalidParameter = FALSE;
 
+    /* Initialize the Console Standard Streams */
+    ConInitStdStreams();
+
     if (argc <= 1)
     {
-        PrintHelp();
+        ConResPuts(StdOut, IDS_HELP);
         return 0;
     }
 
+    // FIXME: Convert to proper parsing, with support for /?
+
     /*
      * parse command line options
      */
@@ -991,8 +839,8 @@ _tmain(int argc, const TCHAR *argv[])
 
     if (InvalidParameter)
     {
-        PrintErrorMessage(ERROR_INVALID_PARAMETER);
-        PrintHelp();
+        PrintError(ERROR_INVALID_PARAMETER);
+        ConResPuts(StdOut, IDS_HELP);
         return 1;
     }
 

reactos/base/applications/cacls/lang/el-GR.rc

@@ -23,7 +23,8 @@ CACLS όνομα_αρχείου [/T] [/E] [/C] [/G χρήστης:άδειες [
                               C  Αλλαγή (εγγραφή)\n\
                               F  Πλήρης έλεγχος\n\
    /D user       Αποτροπή χρήστη από προσπέλαση.\n\
-Τα Wildcards μπορούν να χρησιμοποιηθούν για να προσδιορίσουν παραπαπάνω από ένα αρχεία στην εντολή.\n\
+Τα Wildcards μπορούν να χρησιμοποιηθούν για να προσδιορίσουν παραπαπάνω από\n\
+ένα αρχεία στην εντολή.\n\
 Μπορείτε να προσδιορίσετε παρπαάνω από έναν χρήστη στην εντολή.\n\n\
 Abbreviations:\n\
    CI - Container Inherit.\n\

reactos/base/applications/cacls/lang/es-ES.rc

@@ -18,7 +18,8 @@ CACLS archivo  [/T] [/E] [/C] [/G user:perm [...]] [/R usuario [...]]\n\
                                  W  Escribir\n\
                                  C  Cambiar (escribir)\n\
                                  F  Control total\n\
-   /R usuario    Revoca los derechos de acceso al usuario especificado (unicamente válido con /E).\n\
+   /R usuario    Revoca los derechos de acceso al usuario especificado\n\
+                 (unicamente válido con /E).\n\
    /P user:perm  Reemplaza los derechos de acceso del usuario especificado.\n\
                  Perm puede ser: N  Ninguno\n\
                                  R  Leer\n\

reactos/base/applications/cacls/lang/fr-FR.rc

@@ -15,7 +15,8 @@ CACLS nomfichier [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
                                     W  Écriture\n\
                                     C  Modification (Écriture)\n\
                                     F  Contrôle total\n\
-   /R user       Supprime les droits d'accès de l'utilisateur spécifié (valide uniquement avec /E).\n\
+   /R user       Supprime les droits d'accès de l'utilisateur spécifié\n\
+                 (valide uniquement avec /E).\n\
    /P user:perm  Remplace les droits d'accès de l'utilisateur spécifié.\n\
                  Perm peut valoir : N  Aucun \n\
                                     R  Lecture\n\
@@ -23,7 +24,8 @@ CACLS nomfichier [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
                                     C  Modification (Écriture)\n\
                                     F  Contrôle total\n\
    /D user       Interdit l'accès à l'utilisateur spécifié.\n\
-Il est possible d'utiliser des caractères joker pour sélectionner plus d'un fichier avec une commande.\n\
+Il est possible d'utiliser des caractères joker pour sélectionner plus d'un\n\
+fichier avec une commande.\n\
 Il est possible de spécifier plus d'un utilisateur dans une commande.\n\n\
 Abréviations:\n\
    CI - Héritage du conteneur.\n\

reactos/base/applications/cacls/lang/nl-NL.rc

@@ -2,7 +2,9 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_HELP "ACL's (Access Control Lists, toegangslijsten) van bestanden weergeven\nof bewerken\n\nCACLS bestandsnaam [/T] [/E] [/C] [/G gebr:toeg] [/R gebruiker [...]]\n\
+    IDS_HELP "ACL's (Access Control Lists, toegangslijsten) van bestanden weergeven\n\
+of bewerken\n\n\
+CACLS bestandsnaam [/T] [/E] [/C] [/G gebr:toeg] [/R gebruiker [...]]\n\
                    [/P gebr:toeg [...]] [/D gebruiker [...]]\n\
    bestandsnaam    ACL's weergeven.\n\
    /T              ACL's wijzigen van opgegeven bestanden in\n\

reactos/base/applications/cacls/lang/pl-PL.rc

@@ -24,7 +24,8 @@ CACLS nazwa pliku [/T] [/E] [/C] [/G użytkownik:dostęp [...]] [/R użytkownik
                               W  Zapis\n\
                               C  Zmiana (zapis)\n\
                               F  Pełny dostęp\n\
-   /R użytkownik         Odwołuje prawa dostępu określonemu użytkownikowi  (działa tylko z opcją /E).\n\
+   /R użytkownik         Odwołuje prawa dostępu określonemu użytkownikowi\n\
+                         (działa tylko z opcją /E).\n\
    /P użytkownik:dostęp  Edytuje prawa dostępu określonego użytkownika.\n\
                          Poziom dostępu:\n\
                               N  Brak\n\
@@ -33,7 +34,8 @@ CACLS nazwa pliku [/T] [/E] [/C] [/G użytkownik:dostęp [...]] [/R użytkownik
                               C  Zmiana (zapis)\n\
                               F  Pełny dostęp\n\
    /D użytkownik        Odbiera prawa dostępu określonemu użytkownikowi.\n\
-W jednym poleceniu można edytować prawa dostępu do wielu plików, używając symboli wieloznacznych.\n\
+W jednym poleceniu można edytować prawa dostępu do wielu plików, używając\n\
+symboli wieloznacznych.\n\
 W jednym poleceniu można edytować prawa dostępu wielu użytkowników.\n\n\
 Skróty:\n\
    CI - Dziedziczenie kontenera.\n\

reactos/base/applications/cacls/lang/ro-RO.rc

@@ -1,11 +1,4 @@
-/* 
- * FILE:       base/applications/cacls/lang/ro-RO.rc
- *             ReactOS Project (http://www.reactos.org)
- * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum at fulea.stefan)
- * CHANGE LOG: 2011-08-20  initial translation
- *             2011-10-17  diacritics change
- */
-
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
@@ -18,7 +11,7 @@ CACLS nume_fișier [/T] [/E] [/C] [/G utilizator:acces [...]]\n\
    /T                   Modifică ACL pentru fișierele specificate în\n\
                         directorul curent și toate subdirectoarele sale.\n\
    /E                   Editează ACL curentă evitând astfel înlocuirea ei.\n\
-   /C                   Continuă și la erori de acces interzis.\n\
+   /C                   Continuă și la erori de acces respins.\n\
    /G utilizator:acces  Acordă drepturile de acces specificate pentru utilizator.\n\
                         acces poate fi de: R  Citire\n\
                                            W  Scriere\n\
@@ -33,8 +26,8 @@ CACLS nume_fișier [/T] [/E] [/C] [/G utilizator:acces [...]]\n\
                                         C  De modificare (scriere)\n\
                                         F  Deplin\n\
    /D utilizator        Interzice accesul pentru utilizatorul specificat.\n\
-Se pot specifica mai multe fișiere utilizând metacaractere.\n\
-Pot fi specificați mai mulți utilizatori în aceiași comandă.\n\n\
+Utilizând metacaractere pot fi specificate mai multe fișiere.\n\
+În aceiași comandă pot fi specificați mai mulți utilizatori.\n\n\
 Abrevieri:\n\
    CI - Moștenire container.\n\
         ACE moștenită de directoare.\n\

reactos/base/applications/cacls/precomp.h

@@ -2,11 +2,14 @@
 #define _CACLS_PRECOMP_H
 
 #include <stdarg.h>
+#include <tchar.h>
+
 #include <windef.h>
 #include <winbase.h>
-#include <winuser.h>
+#include <winuser.h> // For CharPrev
 #include <sddl.h>
-#include <tchar.h>
+
+#include <conutils.h>
 
 #include "resource.h"
 

reactos/base/applications/calc/CMakeLists.txt

@@ -2,7 +2,6 @@
 add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
 
 list(APPEND SOURCE
-    about.c
     convert.c
     function.c
     rpn.c
@@ -14,11 +13,9 @@ file(GLOB calc_rc_deps res/*.*)
 add_rc_deps(resource.rc ${calc_rc_deps})
 add_executable(calc ${SOURCE} resource.rc)
 set_module_type(calc win32gui UNICODE)
-add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32)
+add_importlibs(calc advapi32 comctl32 user32 shell32 gdi32 msvcrt kernel32)
 
-if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    target_link_libraries(calc mingwex)
-elseif(MSVC)
+if(MSVC)
     add_importlibs(calc ntdll)
 endif()
 

reactos/base/applications/calc/about.c

@@ -1,33 +0,0 @@
-#include "calc.h"
-
-#define MAX_LICENSE_SIZE 1000 // it's enought!
-
-INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
-{
-    TCHAR *license;
-
-    switch (msg) {
-    case WM_INITDIALOG:
-        license = (TCHAR *)alloca(MAX_LICENSE_SIZE*sizeof(TCHAR));
-        if (LoadString(calc.hInstance, IDS_STRING_LICENSE, license, MAX_LICENSE_SIZE))
-            SendDlgItemMessage(hWnd, IDC_EDIT_LICENSE, WM_SETTEXT, 0, (LPARAM)license);
-        /* Update software version */
-        SendDlgItemMessage(hWnd, IDC_TEXT_VERSION, WM_GETTEXT, (WPARAM)MAX_LICENSE_SIZE, (LPARAM)license);
-        _tcscat(license, CALC_VERSION);
-        SendDlgItemMessage(hWnd, IDC_TEXT_VERSION, WM_SETTEXT, 0, (LPARAM)license);
-        return TRUE;
-    case WM_COMMAND:
-        switch (LOWORD(wp)) {
-        case IDOK:
-            EndDialog(hWnd, 0);
-            return TRUE;
-        }
-        break;
-
-    case WM_CLOSE:
-        EndDialog(hWnd, 0);
-        return 0;
-    }
-    return FALSE;
-}
-

reactos/base/applications/calc/calc.h

@@ -41,8 +41,6 @@
 #define IDC_STATIC  ((DWORD)-1)
 #endif
 
-#define CALC_VERSION        TEXT("1.11")
-
 #define MAX_CALC_SIZE       256
 
 /*#define USE_KEYBOARD_HOOK*/

reactos/base/applications/calc/convert.c

@@ -144,15 +144,17 @@ static const conv_t conv_CURRENCY[] = {
     DECLARE_CONV_UNIT(CURRENCY, AUSTRIAN_SCHILLING, "$/13,7603", "$*13,7603")
     DECLARE_CONV_UNIT(CURRENCY, BELGIAN_FRANC,      "$/40,3399", "$*40,3399")
     DECLARE_CONV_UNIT(CURRENCY, CYPRIOT_POUND,      "$/0,585274","$*0,585274")
-    DECLARE_CONV_UNIT(CURRENCY, CZECH_KORUNA,       "$/27,9766", "$*27,9766")
-    DECLARE_CONV_UNIT(CURRENCY, DEUTSCHE_MARK,      "$/1,9558",  "$*1,9558")
+    DECLARE_CONV_UNIT(CURRENCY, DEUTSCHE_MARK,      "$/1,95583", "$*1,95583")
     DECLARE_CONV_UNIT(CURRENCY, DUTCH_GUILDER,      "$/2,20371", "$*2,20371")
+    DECLARE_CONV_UNIT(CURRENCY, ESTONIAN_KROON,     "$/15,6466", "$*15,6466")
     DECLARE_CONV_UNIT(CURRENCY, EURO,               "$",         "$")
-    DECLARE_CONV_UNIT(CURRENCY, FINNISH_MARKKA,     "$/5,9457",  "$*5,9457")
-    DECLARE_CONV_UNIT(CURRENCY, FRENCH_FRANC,       "$/6,5596",  "$*6,5596")
-    DECLARE_CONV_UNIT(CURRENCY, GREEK_DRACHMA,      "$/340,75",  "$*340,75")
-    DECLARE_CONV_UNIT(CURRENCY, IRISH_POUND,        "$/0,7876",  "$*0,7876")
+    DECLARE_CONV_UNIT(CURRENCY, FINNISH_MARKKA,     "$/5,94573", "$*5,94573")
+    DECLARE_CONV_UNIT(CURRENCY, FRENCH_FRANC,       "$/6,55957", "$*6,55957")
+    DECLARE_CONV_UNIT(CURRENCY, GREEK_DRACHMA,      "$/340,751", "$*340,751")
+    DECLARE_CONV_UNIT(CURRENCY, IRISH_POUND,        "$/0,787564","$*0,787564")
     DECLARE_CONV_UNIT(CURRENCY, ITALIAN_LIRA,       "$/1936.27", "$*1936.27")
+    DECLARE_CONV_UNIT(CURRENCY, LATVIAN_LATS,       "$/0,7028",  "$*0,7028")
+    DECLARE_CONV_UNIT(CURRENCY, LITHUANIAN_LITAS,   "$/3,45280", "$*3,45280")
     DECLARE_CONV_UNIT(CURRENCY, LUXEMBOURG_FRANC,   "$/40,3399", "$*40,3399")
     DECLARE_CONV_UNIT(CURRENCY, MALTESE_LIRA,       "$/0.42930", "$*0.42930")
     DECLARE_CONV_UNIT(CURRENCY, PORTOGUESE_ESCUDO,  "$/200,482", "$*200,482")

reactos/base/applications/calc/help.txt

@@ -331,7 +331,7 @@ It deletes the current calculation and all sub expressions.
 Shortcut from keyboard: ESC
 
 F-E
-It enables or it disables the fixed scietific notation.
+It enables or it disables the fixed scientific notation.
 Shortcut from keyboard: V
 
 0 1 2 3 4 5 6 7 8 9

reactos/base/applications/calc/lang/bg-BG.rc

@@ -296,22 +296,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "За ReactOS Calc"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "Добре", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Изчислителят на РеактОС", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Версия:", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Написано от Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Статистическа кутия"
@@ -419,11 +403,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Грешка"
     IDS_QUICKHELP "Бърза помощ"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Изчислителят на РеактОС"
+    IDS_AUTHOR "Написано от Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -507,12 +497,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Чешка крона"
     IDS_CURRENCY_DEUTSCHE_MARK "Германска марка"
     IDS_CURRENCY_DUTCH_GUILDER "Холандски гулден"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Евро"
     IDS_CURRENCY_FINNISH_MARKKA "Финска марка"
     IDS_CURRENCY_FRENCH_FRANC "Френски франк"
     IDS_CURRENCY_GREEK_DRACHMA "Гръцка драхма"
     IDS_CURRENCY_IRISH_POUND "Ирландска лира"
     IDS_CURRENCY_ITALIAN_LIRA "Италианска лира"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Люксембургски франк"
     IDS_CURRENCY_MALTESE_LIRA "Малтийска лира"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Португалско ескудо"

reactos/base/applications/calc/lang/cs-CZ.rc

@@ -295,22 +295,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "O ReactOS Kalkulačce"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Kalkulačka", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Verze ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Autor: Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistické výpočty"
@@ -418,11 +402,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS kalkulačka je svobodný software vydaný pod licencí GNU GPL.\r\n\r\nZde najdete znění GNU GPL licence:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nZde také najdete překlad GNU GPL licence:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Chyba"
     IDS_QUICKHELP "Rychlá nápověda"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Kalkulačka"
+    IDS_AUTHOR "Autor: Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -506,12 +496,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Česká koruna"
     IDS_CURRENCY_DEUTSCHE_MARK "Německá marka"
     IDS_CURRENCY_DUTCH_GUILDER "Nizozemský gulden"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Finská marka"
     IDS_CURRENCY_FRENCH_FRANC "Francouzský frank"
     IDS_CURRENCY_GREEK_DRACHMA "Řecká drachma"
     IDS_CURRENCY_IRISH_POUND "Irská libra"
     IDS_CURRENCY_ITALIAN_LIRA "Italská lira"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Lucemburský frank"
     IDS_CURRENCY_MALTESE_LIRA "Maltská lira"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalské escudo"

reactos/base/applications/calc/lang/de-DE.rc

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Über ReactOS Rechner"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Rechner", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Geschrieben von Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistikbox"
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Rechner ist freie Software, herausgegeben unter der GNU GPL Lizenz.\r\n\r\nSie können hier eine Kopie der GNU GPL Lizenz erhalten:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nSie können hier auch eine Übersetzung der GNU GPL Lizenz erhalten:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Fehler"
     IDS_QUICKHELP "Schnellhilfe"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Rechner"
+    IDS_AUTHOR "Geschrieben von Carlo Bramini"
+END
+
 /* Konversionstypen */
 STRINGTABLE
 BEGIN
@@ -501,12 +491,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Tschechische Krone"
     IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark"
     IDS_CURRENCY_DUTCH_GUILDER "Niederländische Guilder"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Finnische Mark"
     IDS_CURRENCY_FRENCH_FRANC "Französchische Franc"
     IDS_CURRENCY_GREEK_DRACHMA "Griechische Drachme"
     IDS_CURRENCY_IRISH_POUND "Irische Pfund"
     IDS_CURRENCY_ITALIAN_LIRA "Italienische Lire"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgische Franc"
     IDS_CURRENCY_MALTESE_LIRA "Maltesische Lire"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugiesische Escudo"

reactos/base/applications/calc/lang/el-GR.rc

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Σχετικά..."
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Αριθμομηχανή", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Έκδοση ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Από τον Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistics box"
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Σφάλμα"
     IDS_QUICKHELP "Quick help"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Αριθμομηχανή"
+    IDS_AUTHOR "Από τον Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -501,12 +491,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Czech koruna"
     IDS_CURRENCY_DEUTSCHE_MARK "Γερμανικό μάρκο"
     IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Ευρώ"
     IDS_CURRENCY_FINNISH_MARKKA "Finnish markka"
     IDS_CURRENCY_FRENCH_FRANC "Γαλλικό φράγκο"
     IDS_CURRENCY_GREEK_DRACHMA "Δραχμή"
     IDS_CURRENCY_IRISH_POUND "Irish pound"
     IDS_CURRENCY_ITALIAN_LIRA "Ιταλική λίρα"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
     IDS_CURRENCY_MALTESE_LIRA "Μαλτέζικη λίρα"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Πορτογαλικό εσκούδο"

reactos/base/applications/calc/lang/en-US.rc

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "About ReactOS Calc"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Calculator", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Written by Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistics box"
@@ -347,7 +331,7 @@ BEGIN
     END
     POPUP "&Help"
     BEGIN
-        MENUITEM "&Help topics", IDM_HELP_HELP
+        MENUITEM "&Help Topics", IDM_HELP_HELP
         MENUITEM SEPARATOR
         MENUITEM "&About ReactOS Calc", IDM_HELP_ABOUT
     END
@@ -380,7 +364,7 @@ BEGIN
     END
     POPUP "&Help"
     BEGIN
-        MENUITEM "&Help topics", IDM_HELP_HELP
+        MENUITEM "&Help Topics", IDM_HELP_HELP
         MENUITEM SEPARATOR
         MENUITEM "&About ReactOS Calc", IDM_HELP_ABOUT
     END
@@ -403,7 +387,7 @@ BEGIN
     END
     POPUP "&Help"
     BEGIN
-        MENUITEM "&Help topics", IDM_HELP_HELP
+        MENUITEM "&Help Topics", IDM_HELP_HELP
         MENUITEM SEPARATOR
         MENUITEM "&About ReactOS Calc", IDM_HELP_ABOUT
     END
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Error"
     IDS_QUICKHELP "Quick help"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Calculator"
+    IDS_AUTHOR "Written by Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -501,12 +491,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Czech koruna"
     IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark"
     IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Finnish markka"
     IDS_CURRENCY_FRENCH_FRANC "French franc"
     IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma"
     IDS_CURRENCY_IRISH_POUND "Irish pound"
     IDS_CURRENCY_ITALIAN_LIRA "Italian lira"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
     IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portuguese escudo"

reactos/base/applications/calc/lang/es-ES.rc

@@ -296,22 +296,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Acerca de la Calculadora de ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "Aceptar", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Calculadora de ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Versión ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Creada por Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Cuadro de estadísticas"
@@ -419,18 +403,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "La Calculadora de ReactOS es software libre realizado bajo licencia GNU GPL.\r\n\
-	\r\n\
-	Puedes obtener una copia de la licencia GNU GPL aquí:\r\n\
-	http://www.gnu.org/licenses/gpl.html\r\n\
-	\r\n\
-	También puedes obtener una traducción de la licencia GNU GPL aquí:\r\n\
-	http://www.gnu.org/licenses/translations.html"
-	
     IDS_MATH_ERROR "Error"
     IDS_QUICKHELP "Ayuda rápida"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Calculadora de ReactOS"
+    IDS_AUTHOR "Creada por Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -514,12 +497,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Corona checa"
     IDS_CURRENCY_DEUTSCHE_MARK "Marco alemán"
     IDS_CURRENCY_DUTCH_GUILDER "Florín neerlandés"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Marco finlandés"
     IDS_CURRENCY_FRENCH_FRANC "Franco frances"
     IDS_CURRENCY_GREEK_DRACHMA "Drachma griego"
     IDS_CURRENCY_IRISH_POUND "Libra irlandesa"
     IDS_CURRENCY_ITALIAN_LIRA "Lira italiana"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburgués"
     IDS_CURRENCY_MALTESE_LIRA "Lira maltesa"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portugués"

reactos/base/applications/calc/lang/fr-FR.rc

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "À propos de la Calculatrice ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Calculatrice ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "par Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistiques"
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Calculatrice ReactOS est un logiciel libre distribué sous licence GNU GPL.\r\n\r\nVous pouvez obtenir une copie de la licence GNU GPL ici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nVous pouvez aussi obtenir une traduction de la licence GNU GPL ici:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Erreur"
     IDS_QUICKHELP "Aide rapide"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Calculatrice ReactOS"
+    IDS_AUTHOR "par Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -501,12 +491,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Couronne tchèque"
     IDS_CURRENCY_DEUTSCHE_MARK "Mark allemand"
     IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Marks finlandais"
     IDS_CURRENCY_FRENCH_FRANC "Franc français"
     IDS_CURRENCY_GREEK_DRACHMA "Drachmes grecques"
     IDS_CURRENCY_IRISH_POUND "Livre irlandaise"
     IDS_CURRENCY_ITALIAN_LIRA "Lire italienne"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Franc luxembourgeois"
     IDS_CURRENCY_MALTESE_LIRA "Lire maltaise"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portugaise"

reactos/base/applications/calc/lang/he-IL.rc

@@ -292,22 +292,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "אודות המחשבון ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "אישור", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "מחשבון ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "גירסה ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "נכתבה על ידי Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "תיבת סטטיסטיקה"
@@ -415,11 +399,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "שגיאה"
     IDS_QUICKHELP "עזרה מהירה"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "מחשבון ReactOS"
+    IDS_AUTHOR "נכתבה על ידי Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -503,12 +493,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "קורונה צ'כי"
     IDS_CURRENCY_DEUTSCHE_MARK "מארק גרמני"
     IDS_CURRENCY_DUTCH_GUILDER "גילדר הולנדי"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "אירו"
     IDS_CURRENCY_FINNISH_MARKKA "מארקה פינית"
     IDS_CURRENCY_FRENCH_FRANC "פרנק צרפתי"
     IDS_CURRENCY_GREEK_DRACHMA "דרכמה יוונית"
     IDS_CURRENCY_IRISH_POUND "לירה אירית"
     IDS_CURRENCY_ITALIAN_LIRA "לירה איטלקית"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "פרנק לוקסמבורגי"
     IDS_CURRENCY_MALTESE_LIRA "לירה מלטזי"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "אסקודו פורטגלי"

reactos/base/applications/calc/lang/hu-HU.rc

@@ -298,22 +298,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "A ReactOS Számológépről"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Számológép", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Verzió ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Írta Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statisztika"
@@ -421,11 +405,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "A ReactOS Számológép a GNU GPL licenc alatt kiadott szabad szoftver.\r\n\r\nA GNU GPL licenc egy másolatát innen szerezheted be:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nValamint a GNU GPL licenc fordítását innen szerezheted be:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Hiba"
     IDS_QUICKHELP "Gyors súgó"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Számológép"
+    IDS_AUTHOR "Írta Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -509,12 +499,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Cseh korona"
     IDS_CURRENCY_DEUTSCHE_MARK "Német márka"
     IDS_CURRENCY_DUTCH_GUILDER "Holland gulden"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euró"
     IDS_CURRENCY_FINNISH_MARKKA "Finn márka"
     IDS_CURRENCY_FRENCH_FRANC "Francia frank"
     IDS_CURRENCY_GREEK_DRACHMA "Görög drachma"
     IDS_CURRENCY_IRISH_POUND "Ír font"
     IDS_CURRENCY_ITALIAN_LIRA "Olasz líra"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgi frank"
     IDS_CURRENCY_MALTESE_LIRA "Máltai líra"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugál escudo"

reactos/base/applications/calc/lang/it-IT.rc

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Informazioni su ReactOS Calc"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Calcolatrice ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Versione ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Scritto da Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Finestra di statistica"
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc e` software libero rilasciato sotto licenza GNU GPL.\r\n\r\nE` possibile ottenere una copia del testo della licenza GNU GPL all'indirizzo:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nE` possibile ottenere una traduzione del testo della licenza GNU GPL all'indirizzo:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Errore"
     IDS_QUICKHELP "Guida rapida"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Calcolatrice ReactOS"
+    IDS_AUTHOR "Scritto da Carlo Bramini"
+END
+
 /* Categorie per le conversioni */
 STRINGTABLE
 BEGIN
@@ -501,12 +491,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Corona ceca"
     IDS_CURRENCY_DEUTSCHE_MARK "Marco tedesco"
     IDS_CURRENCY_DUTCH_GUILDER "Fiorino olandese"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Markka finlandese"
     IDS_CURRENCY_FRENCH_FRANC "Franco francese"
     IDS_CURRENCY_GREEK_DRACHMA "Dracma greca"
     IDS_CURRENCY_IRISH_POUND "Sterlina irlandese"
     IDS_CURRENCY_ITALIAN_LIRA "Lira italiana"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Franco Lussemburghese"
     IDS_CURRENCY_MALTESE_LIRA "Lira maltese"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portoghese"

reactos/base/applications/calc/lang/ja-JP.rc

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 電卓について"
-FONT 9, "MS UI Gothic"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS 電卓", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Written by Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistics box"
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 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_MATH_ERROR "エラー"
     IDS_QUICKHELP "クイックヘルプ"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS 電卓"
+    IDS_AUTHOR "Written by Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -501,12 +491,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "チェコ コルナ"
     IDS_CURRENCY_DEUTSCHE_MARK "ドイツ マルク"
     IDS_CURRENCY_DUTCH_GUILDER "オランダ ギルダー"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "ユーロ"
     IDS_CURRENCY_FINNISH_MARKKA "フィンランド マルッカ"
     IDS_CURRENCY_FRENCH_FRANC "フランス フラン"
     IDS_CURRENCY_GREEK_DRACHMA "ギリシャ ドラクマ"
     IDS_CURRENCY_IRISH_POUND "アイルランド ポンド"
     IDS_CURRENCY_ITALIAN_LIRA "イタリア リラ"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "ルクセンブルク フラン"
     IDS_CURRENCY_MALTESE_LIRA "マルタ リラ"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "ポルトガル エスクード"

reactos/base/applications/calc/lang/ko-KR.rc

@@ -292,22 +292,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 계산기 정보"
-FONT 9, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS 계산기", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "버젼 ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Carlo Bramini에 의해 쓰여짐", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistics box"
@@ -415,11 +399,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "에러"
     IDS_QUICKHELP "빠른 도움말"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS 계산기"
+    IDS_AUTHOR "Carlo Bramini에 의해 쓰여짐"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -503,12 +493,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Czech koruna"
     IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark"
     IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Finnish markka"
     IDS_CURRENCY_FRENCH_FRANC "French franc"
     IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma"
     IDS_CURRENCY_IRISH_POUND "Irish pound"
     IDS_CURRENCY_ITALIAN_LIRA "Italian lira"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
     IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"

reactos/base/applications/calc/lang/nl-NL.rc

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Over ReactOS Rekenmachine"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Rekenmachine", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Versie", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Geschreven door: Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistiek-venster"
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "De ReactOS Rekenmachine is free software gepubliceerd onder de GNU GPL licentie.\r\n\r\nU kan een kopie van GNU GPL licentie hier bezichtigen:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nU kan ook een vertaling van de GNU GPL licentie hier bezichtigen:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Fout"
     IDS_QUICKHELP "Snelle hulp"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Rekenmachine"
+    IDS_AUTHOR "Geschreven door: Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -501,12 +491,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Tsjechische kroon"
     IDS_CURRENCY_DEUTSCHE_MARK "Duitse Mark"
     IDS_CURRENCY_DUTCH_GUILDER "Nederlandse gulden"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Finse markka"
     IDS_CURRENCY_FRENCH_FRANC "Franse franc"
     IDS_CURRENCY_GREEK_DRACHMA "Griekse Drachma"
     IDS_CURRENCY_IRISH_POUND "Ierse pound"
     IDS_CURRENCY_ITALIAN_LIRA "Italiaanse lira"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgse franc"
     IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugese escudo"

reactos/base/applications/calc/lang/no-NO.rc

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Om ReactOS Kalkulator"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Kalkulator", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Versjon ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Laget av Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "statistikk boks"
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Kalkulator er gratis programvare utgitt under GNU GPL lisensen.\r\n\r\nDu kan få en kopi av GNU GPL lisensen her:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDu kan også få en oversettelse av GNU GPL lisensen her:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Feil"
     IDS_QUICKHELP "Rask hjelp"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Kalkulator"
+    IDS_AUTHOR "Laget av Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -501,12 +491,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Tsjekkisk koruna"
     IDS_CURRENCY_DEUTSCHE_MARK "Tusk Mark"
     IDS_CURRENCY_DUTCH_GUILDER "Nederlansk guilder"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Finisk markka"
     IDS_CURRENCY_FRENCH_FRANC "Fransk franc"
     IDS_CURRENCY_GREEK_DRACHMA "Gresk Drachma"
     IDS_CURRENCY_IRISH_POUND "Irisk pound"
     IDS_CURRENCY_ITALIAN_LIRA "Italiask lira"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
     IDS_CURRENCY_MALTESE_LIRA "Maltesisk lira"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portogisisk escudo"

reactos/base/applications/calc/lang/pl-PL.rc

@@ -299,22 +299,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "O Kalkulatorze ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Kalkulator ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Wersja ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Autorstwa: Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statystyka"
@@ -422,11 +406,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Kalkulator ReactOS jest darmowym programem, publikowanym zgodnie z licencją GNU GPL.\r\n\r\nMożesz otrzymać kopię licencji GNU GPL tutaj:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nTłumaczenie licencji GNU GPL znajdziesz tutaj:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Błąd"
     IDS_QUICKHELP "Szybka pomoc"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Kalkulator ReactOS"
+    IDS_AUTHOR "Autorstwa: Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -510,12 +500,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Czeska korona"
     IDS_CURRENCY_DEUTSCHE_MARK "Niemiecka marka"
     IDS_CURRENCY_DUTCH_GUILDER "Holenderki gulden"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Fińska marka"
     IDS_CURRENCY_FRENCH_FRANC "Francuski frank"
     IDS_CURRENCY_GREEK_DRACHMA "Grecka drachma"
     IDS_CURRENCY_IRISH_POUND "Irlandzki funt"
     IDS_CURRENCY_ITALIAN_LIRA "Włoskie liry"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luksemburski frank"
     IDS_CURRENCY_MALTESE_LIRA "Maltańskie liry"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalskie escudo"

reactos/base/applications/calc/lang/pt-BR.rc

@@ -292,22 +292,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Sobre Calc ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Calcuadora ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Versão ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Escrita por Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Caixa de estatísticas"
@@ -415,11 +399,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Calculadora ReactOS é um software livre lançado sobre a licença GNU GPL.\r\nVocê pode adquirir uma cópia da licença GNU GPL no endereço abaixo:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nVocê também pode adquirir uma tradução da licença GNU GPL no endereço abaixo:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Erro"
     IDS_QUICKHELP "Ajuda rápida"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Calcuadora ReactOS"
+    IDS_AUTHOR "Escrita por Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -503,12 +493,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Coroa checa"
     IDS_CURRENCY_DEUTSCHE_MARK "Marco alemão"
     IDS_CURRENCY_DUTCH_GUILDER "Florim neerlandês"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Marco finlandês"
     IDS_CURRENCY_FRENCH_FRANC "Franco francês"
     IDS_CURRENCY_GREEK_DRACHMA "Dracma"
     IDS_CURRENCY_IRISH_POUND "Libra irlandesa"
     IDS_CURRENCY_ITALIAN_LIRA "Lira italiana"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburguês"
     IDS_CURRENCY_MALTESE_LIRA "Lira maltesa"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo português"

reactos/base/applications/calc/lang/ro-RO.rc

@@ -295,22 +295,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Despre Minicalculator"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "Î&nchide", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Minicalculator ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Versiune ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Scris de Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistici"
@@ -418,11 +402,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Această aplicație este publică; fiind permisă modificarea și/sau (re)distribuția sa în termenii Licenței Publice Generale GNU publicată de Free Software Foundation; sau versiunea 2 a Licenței, sau (la alegere) a oricărei versiuni ulterioare.\r\n\r\nAceastă aplicație este distribuită doar în speranța de a fi utilă, FĂRĂ însă NICI O GARANȚIE; nici măcar cu garanția implicită a VANDABILITĂȚII sau a UTILITĂȚII ÎNTR-UN SCOP ANUME. Pentru mai multe detalii consultați Licența Publică Generală GNU.\r\n\r\nPuteți vedea această licență aici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDe asemenea puteți consulta traduceri neoficiale ale acestei licențe aici:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Eroare"
     IDS_QUICKHELP "Manual"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Minicalculator ReactOS"
+    IDS_AUTHOR "Scris de Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -506,12 +496,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Coroană cehă"
     IDS_CURRENCY_DEUTSCHE_MARK "Marcă nemțească"
     IDS_CURRENCY_DUTCH_GUILDER "Guilder olandez"
+    IDS_CURRENCY_ESTONIAN_KROON "Coroană estoniană"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Marcă finlandeză"
     IDS_CURRENCY_FRENCH_FRANC "Franc framcez"
     IDS_CURRENCY_GREEK_DRACHMA "Drahmă grecească"
     IDS_CURRENCY_IRISH_POUND "Liră irlandeză"
     IDS_CURRENCY_ITALIAN_LIRA "Liră italiană"
+    IDS_CURRENCY_LATVIAN_LATS "Lats leton"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Litas lituanian"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Franc luxemburghez"
     IDS_CURRENCY_MALTESE_LIRA "Litră malteză"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portughez"

reactos/base/applications/calc/lang/ru-RU.rc

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "О программе"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Калькулятор ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Версия ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Автор: Карло Брамини", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Статистика"
@@ -323,89 +307,89 @@ END
 
 IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
-    POPUP "Правка"
+    POPUP "&Правка"
     BEGIN
-        MENUITEM "Копировать\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Вставить\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "&Копировать\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Вст&авить\tCTRL-V", IDM_EDIT_PASTE
     END
-    POPUP "Вид"
+    POPUP "В&ид"
     BEGIN
-        MENUITEM "Обычный", IDM_VIEW_STANDARD
-        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Преобразование", IDM_VIEW_CONVERSION
+        MENUITEM "&Обычный", IDM_VIEW_STANDARD
+        MENUITEM "&Инженерный", IDM_VIEW_SCIENTIFIC
+        MENUITEM "П&еревод величин", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Шестнадцатеричный\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "Десятичный\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "Восьмеричный\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "Двоичный\tF8", IDM_VIEW_BIN, CHECKED
+        MENUITEM "&Шестнадцатеричный\tF5", IDM_VIEW_HEX, CHECKED
+        MENUITEM "&Десятичный\tF6", IDM_VIEW_DEC, CHECKED
+        MENUITEM "&Восьмеричный\tF7", IDM_VIEW_OCT, CHECKED
+        MENUITEM "Двои&чный\tF8", IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Градусы\tF2", IDM_VIEW_DEG, CHECKED
-        MENUITEM "Радианы\tF3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "Грады\tF4", IDM_VIEW_GRAD, CHECKED
+        MENUITEM "&Градусы\tF2", IDM_VIEW_DEG, CHECKED
+        MENUITEM "Радиа&ны\tF3", IDM_VIEW_RAD, CHECKED
+        MENUITEM "Гр&ады\tF4", IDM_VIEW_GRAD, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Количество цифр в группе", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Группировать &цифры", IDM_VIEW_GROUP, CHECKED
     END
-    POPUP "Справка"
+    POPUP "&Справка"
     BEGIN
-        MENUITEM "Вызов справки", IDM_HELP_HELP
+        MENUITEM "&Вызов справки", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "О программе", IDM_HELP_ABOUT
+        MENUITEM "&О программе", IDM_HELP_ABOUT
     END
 END
 
 IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
-    POPUP "Правка"
+    POPUP "&Правка"
     BEGIN
-        MENUITEM "Копировать\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Вставить\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "&Копировать\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Вст&авить\tCTRL-V", IDM_EDIT_PASTE
     END
-    POPUP "Вид"
+    POPUP "В&ид"
     BEGIN
-        MENUITEM "Обычный", IDM_VIEW_STANDARD
-        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Преобразование", IDM_VIEW_CONVERSION
+        MENUITEM "&Обычный", IDM_VIEW_STANDARD
+        MENUITEM "&Инженерный", IDM_VIEW_SCIENTIFIC
+        MENUITEM "П&еревод величин", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Шестнадцатеричный\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "Десятичный\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "Восьмеричный\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "Двоичный\tF8", IDM_VIEW_BIN, CHECKED
+        MENUITEM "&Шестнадцатеричный\tF5", IDM_VIEW_HEX, CHECKED
+        MENUITEM "&Десятичный\tF6", IDM_VIEW_DEC, CHECKED
+        MENUITEM "&Восьмеричный\tF7", IDM_VIEW_OCT, CHECKED
+        MENUITEM "Двои&чный\tF8", IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "8 байт\tF12", IDM_VIEW_QWORD, CHECKED
-        MENUITEM "4 байт\tF2", IDM_VIEW_DWORD, CHECKED
-        MENUITEM "2 байт\tF3", IDM_VIEW_WORD, CHECKED
-        MENUITEM "1 байт\tF4", IDM_VIEW_BYTE, CHECKED
+        MENUITEM "&8 байт\tF12", IDM_VIEW_QWORD, CHECKED
+        MENUITEM "&4 байт\tF2", IDM_VIEW_DWORD, CHECKED
+        MENUITEM "&2 байт\tF3", IDM_VIEW_WORD, CHECKED
+        MENUITEM "&1 байт\tF4", IDM_VIEW_BYTE, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Количество цифр в группе", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Группировать &цифры", IDM_VIEW_GROUP, CHECKED
     END
-    POPUP "Справка"
+    POPUP "&Справка"
     BEGIN
-        MENUITEM "Вызов справки", IDM_HELP_HELP
+        MENUITEM "&Вызов справки", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "О программе", IDM_HELP_ABOUT
+        MENUITEM "&О программе", IDM_HELP_ABOUT
     END
 END
 
 IDR_MENU_STANDARD MENU
 BEGIN
-    POPUP "Правка"
+    POPUP "&Правка"
     BEGIN
-        MENUITEM "Копировать\tCTRL-C", IDM_EDIT_COPY
-        MENUITEM "Вставить\tCTRL-V", IDM_EDIT_PASTE
+        MENUITEM "&Копировать\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Вст&авить\tCTRL-V", IDM_EDIT_PASTE
     END
-    POPUP "Вид"
+    POPUP "В&ид"
     BEGIN
-        MENUITEM "Обычный", IDM_VIEW_STANDARD
-        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Преобразование", IDM_VIEW_CONVERSION
+        MENUITEM "&Обычный", IDM_VIEW_STANDARD
+        MENUITEM "&Инженерный", IDM_VIEW_SCIENTIFIC
+        MENUITEM "П&еревод величин", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Количество цифр в группе", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Группировать &цифры", IDM_VIEW_GROUP, CHECKED
     END
-    POPUP "Справка"
+    POPUP "&Справка"
     BEGIN
-        MENUITEM "Вызов справки", IDM_HELP_HELP
+        MENUITEM "&Вызов справки", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "О программе", IDM_HELP_ABOUT
+        MENUITEM "&О программе", IDM_HELP_ABOUT
     END
 END
 
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 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Ознакомиться c переводом лицензии GNU GPL можно здесь:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Ошибка"
     IDS_QUICKHELP "Быстрая справка"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Калькулятор ReactOS"
+    IDS_AUTHOR "Автор: Карло Брамини"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -501,12 +491,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Чешская крона"
     IDS_CURRENCY_DEUTSCHE_MARK "Немецкая марка"
     IDS_CURRENCY_DUTCH_GUILDER "Голландский гульден"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Евро"
     IDS_CURRENCY_FINNISH_MARKKA "Финская марка"
     IDS_CURRENCY_FRENCH_FRANC "Французский франк"
     IDS_CURRENCY_GREEK_DRACHMA "Греческая драхма"
     IDS_CURRENCY_IRISH_POUND "Ирландский фунт"
     IDS_CURRENCY_ITALIAN_LIRA "Итальянская лира"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Люксембургский франк"
     IDS_CURRENCY_MALTESE_LIRA "Мальтийская лира"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Португальское эскудо"

reactos/base/applications/calc/lang/sk-SK.rc

@@ -297,22 +297,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Čo je kalkulačka systému ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Kalkulačka systému ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Verzia ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Napísal Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Štatistika"
@@ -420,11 +404,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Kalkulačka systému ReactOS je voľný softvér vydaný pod licenciou GNU GPL.\r\n\r\nKópiu licencie GNU GPL môžete získať tu:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nRovnako môžete získať preklad licencie GNU GPL tu:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Chyba"
     IDS_QUICKHELP "Rýchla pomoc"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Kalkulačka systému ReactOS"
+    IDS_AUTHOR "Napísal Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -508,12 +498,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Česká koruna"
     IDS_CURRENCY_DEUTSCHE_MARK "Nemecká marka"
     IDS_CURRENCY_DUTCH_GUILDER "Holandský gulden"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Fínska marka"
     IDS_CURRENCY_FRENCH_FRANC "Francúzsky frank"
     IDS_CURRENCY_GREEK_DRACHMA "Grécka drachma"
     IDS_CURRENCY_IRISH_POUND "Írska libra"
     IDS_CURRENCY_ITALIAN_LIRA "Talianská líra"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburský frank"
     IDS_CURRENCY_MALTESE_LIRA "Maltská líra"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalské escudo"

reactos/base/applications/calc/lang/sq-AL.rc

@@ -294,22 +294,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Informacione mbi Makine Llogaritje ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Makine Llogaritje", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Versioni ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "krijuar nga Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Kutia e Statistikave"
@@ -417,11 +401,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Makina Llogaritese ReactOS eshte program falas i lanquar nen liçensen GNU GPL.\r\n\r\nJu mund te merrni nje kopje te liçenses se GNU CPL ketu:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nJu gjithashtu mund te merrni e liçenses se GNU GPL ketu:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Error"
     IDS_QUICKHELP "Ndihmë e shpejtë"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Makine Llogaritje"
+    IDS_AUTHOR "krijuar nga Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -505,12 +495,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Koruna Czech"
     IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark"
     IDS_CURRENCY_DUTCH_GUILDER "Deutsche Mark"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Finnish marka"
     IDS_CURRENCY_FRENCH_FRANC "Franga Franceze"
     IDS_CURRENCY_GREEK_DRACHMA "Drachma Greeke"
     IDS_CURRENCY_IRISH_POUND "Poundi irlandes"
     IDS_CURRENCY_ITALIAN_LIRA "Lira Italiane"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
     IDS_CURRENCY_MALTESE_LIRA "Lira Maltese"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo Portugez"

reactos/base/applications/calc/lang/sv-SE.rc

@@ -297,22 +297,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Om ReactOS Kalkylator"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS Kalkylator", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Skriven av Carlo Bramini, Övers.: Jaix Bly", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistik box"
@@ -420,11 +404,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Kalkylator är gratis programvara utgivet under GNU GPL licensen.\r\n\r\nDu kan få en kopia av GNU GPL licensen här:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDu kan också få en översättning av GNU GPL lisensen här:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Fel"
     IDS_QUICKHELP "Snabb hjälp"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS Kalkylator"
+    IDS_AUTHOR "Skriven av Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -508,12 +498,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Tjeckisk koruna"
     IDS_CURRENCY_DEUTSCHE_MARK "Tysk Mark"
     IDS_CURRENCY_DUTCH_GUILDER "Nederlänsk guilder"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Euro"
     IDS_CURRENCY_FINNISH_MARKKA "Finisk mark"
     IDS_CURRENCY_FRENCH_FRANC "Fransk franc"
     IDS_CURRENCY_GREEK_DRACHMA "Gresk Drachma"
     IDS_CURRENCY_IRISH_POUND "Irisk pound"
     IDS_CURRENCY_ITALIAN_LIRA "Italiask lire"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
     IDS_CURRENCY_MALTESE_LIRA "Maltesisk lire"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portogisisk escudo"

reactos/base/applications/calc/lang/th-TH.rc

@@ -290,22 +290,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "เกี่ยวกับ ReactOS Calc"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "ตกลง", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "เครื่องคิดเลข ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "รุ่น ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Written by Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "กล่องสถานะ"
@@ -413,11 +397,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "ผิดพลาด"
     IDS_QUICKHELP "สิ่งนี้คืออะไร ?"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "เครื่องคิดเลข ReactOS"
+    IDS_AUTHOR "Written by Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -501,12 +491,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Czech koruna"
     IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark"
     IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "ยูโร"
     IDS_CURRENCY_FINNISH_MARKKA "Finnish markka"
     IDS_CURRENCY_FRENCH_FRANC "French franc"
     IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma"
     IDS_CURRENCY_IRISH_POUND "Irish pound"
     IDS_CURRENCY_ITALIAN_LIRA "Italian lira"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
     IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"

reactos/base/applications/calc/lang/tr-TR.rc

@@ -292,22 +292,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Hesap Makinesi Üzerine"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "Tamam", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Hesap Makinesi", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Sürüm: ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Carlo Bramini eliyle yapılmıştır.", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Sayımlama Penceresi"
@@ -336,14 +320,14 @@ BEGIN
         MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC
         MENUITEM "&Dönüştürme", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "&Onaltılık\tİ5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "O&nluk\tİ6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "&Sekizlik\tİ7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "&İkilik\tİ8", IDM_VIEW_BIN, CHECKED
+        MENUITEM "&Onaltılık\tF5", IDM_VIEW_HEX, CHECKED
+        MENUITEM "O&nluk\tF6", IDM_VIEW_DEC, CHECKED
+        MENUITEM "&Sekizlik\tF7", IDM_VIEW_OCT, CHECKED
+        MENUITEM "&İkilik\tF8", IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "D&erece\tİ2", IDM_VIEW_DEG, CHECKED
-        MENUITEM "&Radyan\tİ3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "&Gradyan\tİ4", IDM_VIEW_GRAD, CHECKED
+        MENUITEM "D&erece\tF2", IDM_VIEW_DEG, CHECKED
+        MENUITEM "&Radyan\tF3", IDM_VIEW_RAD, CHECKED
+        MENUITEM "&Gradyan\tF4", IDM_VIEW_GRAD, CHECKED
         MENUITEM SEPARATOR
         MENUITEM "B&asamakları Takımla", IDM_VIEW_GROUP, CHECKED
     END
@@ -368,15 +352,15 @@ BEGIN
         MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC
         MENUITEM "&Dönüştürme", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "&Onaltılık\tİ5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "O&nluk\tİ6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "&Sekizlik\tİ7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "&İkilik\tİ8", IDM_VIEW_BIN, CHECKED
+        MENUITEM "&Onaltılık\tF5", IDM_VIEW_HEX, CHECKED
+        MENUITEM "O&nluk\tF6", IDM_VIEW_DEC, CHECKED
+        MENUITEM "&Sekizlik\tF7", IDM_VIEW_OCT, CHECKED
+        MENUITEM "&İkilik\tF8", IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Dö&rtlü Sözcük\tİ12", IDM_VIEW_QWORD, CHECKED
-        MENUITEM "İ&kili Sözcük\tİ2", IDM_VIEW_DWORD, CHECKED
-        MENUITEM "Sö&zcük\tİ3", IDM_VIEW_WORD, CHECKED
-        MENUITEM "&Çoklu\tİ4", IDM_VIEW_BYTE, CHECKED
+        MENUITEM "Dö&rtlü Sözcük\tF12", IDM_VIEW_QWORD, CHECKED
+        MENUITEM "İ&kili Sözcük\tF2", IDM_VIEW_DWORD, CHECKED
+        MENUITEM "Sö&zcük\tF3", IDM_VIEW_WORD, CHECKED
+        MENUITEM "&Çoklu\tF4", IDM_VIEW_BYTE, CHECKED
         MENUITEM SEPARATOR
         MENUITEM "B&asamakları Takımla", IDM_VIEW_GROUP, CHECKED
     END
@@ -415,11 +399,17 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_STRING_LICENSE "Hesap Makinesi, GNU GPL ruhsatıyla yayımlanan bir özgür yazılımdır.\r\n\r\nGNU GPL ruhsatının bir kopyasını şuradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nBir de GNU GPL ruhsatının bir çevirisini şuradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Yanlışlık"
     IDS_QUICKHELP "Hızlı Yardım"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Hesap Makinesi"
+    IDS_AUTHOR "Carlo Bramini eliyle yapılmıştır."
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -503,12 +493,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Çek Korunası"
     IDS_CURRENCY_DEUTSCHE_MARK "Alman Markı"
     IDS_CURRENCY_DUTCH_GUILDER "Hollanda Guilderi"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Avro"
     IDS_CURRENCY_FINNISH_MARKKA "Fin Markkası"
     IDS_CURRENCY_FRENCH_FRANC "Fransız Frangı"
     IDS_CURRENCY_GREEK_DRACHMA "Yunan Drahmisi"
     IDS_CURRENCY_IRISH_POUND "İrlanda Pondu"
     IDS_CURRENCY_ITALIAN_LIRA "İtalyan Lirası"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Lüksemburg Frangı"
     IDS_CURRENCY_MALTESE_LIRA "Malta Lirası"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Portekiz Esküdosu"

reactos/base/applications/calc/lang/uk-UA.rc

@@ -298,22 +298,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Про Калькулятор ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "Калькулятор ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "Версія ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "Написав Карло Браміні", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Статистика"
@@ -421,11 +405,17 @@ END
 
 STRINGTABLE
 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_MATH_ERROR "Помилка"
     IDS_QUICKHELP "Швидка довідка"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "Калькулятор ReactOS"
+    IDS_AUTHOR "Написав Карло Браміні"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -509,12 +499,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "Чешська крона"
     IDS_CURRENCY_DEUTSCHE_MARK "Немецька марка"
     IDS_CURRENCY_DUTCH_GUILDER "Голандський гульден"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "Євро"
     IDS_CURRENCY_FINNISH_MARKKA "Фінська марка"
     IDS_CURRENCY_FRENCH_FRANC "Французський франк"
     IDS_CURRENCY_GREEK_DRACHMA "Грецька драхма"
     IDS_CURRENCY_IRISH_POUND "Ірландський фунт"
     IDS_CURRENCY_ITALIAN_LIRA "Італьянськая ліра"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "Люксембургський франк"
     IDS_CURRENCY_MALTESE_LIRA "Мальтийськая ліра"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "Португальське ескудо"

reactos/base/applications/calc/lang/zh-CN.rc

@@ -292,22 +292,6 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
-IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "关于 ReactOS 计算器"
-FONT 9, "MS Shell Dlg"
-BEGIN
-    DEFPUSHBUTTON "确定", IDOK, 105, 148, 52, 16
-    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
-            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
-    LTEXT "ReactOS 计算器", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
-    LTEXT "版本 ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
-    LTEXT "作者 Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
-    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
-    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
-    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
-END
-
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "统计框"
@@ -415,11 +399,17 @@ END
 
 STRINGTABLE
 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你也可以从这儿取得其翻译：\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "错误"
     IDS_QUICKHELP "快速帮助"
 END
 
+/* About */
+STRINGTABLE
+BEGIN
+    IDS_CALC_NAME "ReactOS 计算器"
+    IDS_AUTHOR "作者 Carlo Bramini"
+END
+
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -503,12 +493,15 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "捷克克朗"
     IDS_CURRENCY_DEUTSCHE_MARK "德国马克"
     IDS_CURRENCY_DUTCH_GUILDER "荷兰盾"
+    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "欧元"
     IDS_CURRENCY_FINNISH_MARKKA "芬兰马克"
     IDS_CURRENCY_FRENCH_FRANC "法郎"
     IDS_CURRENCY_GREEK_DRACHMA "希腊德拉克马"
     IDS_CURRENCY_IRISH_POUND "爱尔兰镑"
     IDS_CURRENCY_ITALIAN_LIRA "意大利里拉"
+    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
+    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "卢森堡法郎"
     IDS_CURRENCY_MALTESE_LIRA "马耳他里拉"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯库多"

reactos/base/applications/calc/resource.h

@@ -1,17 +1,16 @@
 #pragma once
 
-#define IDS_STRING_LICENSE    1
+#define IDS_CALC_NAME         1
 #define IDS_MATH_ERROR        2
 #define IDS_QUICKHELP         3
+#define IDS_AUTHOR            4
 #define IDD_DIALOG_SCIENTIFIC 101
 #define IDD_DIALOG_STANDARD   102
-#define IDD_DIALOG_ABOUT      103
 #define IDD_DIALOG_STAT       104
 #define IDD_DIALOG_CONVERSION 105
 #define IDR_MENU_SCIENTIFIC_1 106
 #define IDR_MENU_SCIENTIFIC_2 107
 #define IDR_MENU_STANDARD     108
-#define IDB_BITMAP_ROS        109
 #define IDI_CALC_BIG          110
 #define IDI_CALC_SMALL        111
 #define IDC_RADIO_HEX         1002
@@ -88,7 +87,6 @@
 #define IDC_TEXT_OUTPUT       1074
 #define IDC_TEXT_PARENT       1075
 #define IDC_TEXT_MEMORY       1076
-#define IDC_EDIT_LICENSE      1078
 #define IDC_LIST_STAT         1079
 #define IDC_BUTTON_RET        1080
 #define IDC_BUTTON_LOAD       1081
@@ -98,7 +96,6 @@
 #define IDC_BUTTON_SQRT       1085
 #define IDC_BUTTON_PERCENT    1086
 #define IDC_BUTTON_CONVERT    1087
-#define IDC_TEXT_VERSION      1088
 #define IDC_BUTTON_FOCUS      1089
 #define IDC_COMBO_CATEGORY    1090
 #define IDC_COMBO_FROM        1091
@@ -174,18 +171,21 @@
 #define IDS_CURRENCY_CZECH_KORUNA       2403
 #define IDS_CURRENCY_DEUTSCHE_MARK      2404
 #define IDS_CURRENCY_DUTCH_GUILDER      2405
-#define IDS_CURRENCY_EURO               2406
-#define IDS_CURRENCY_FINNISH_MARKKA     2407
-#define IDS_CURRENCY_FRENCH_FRANC       2408
-#define IDS_CURRENCY_GREEK_DRACHMA      2409
-#define IDS_CURRENCY_IRISH_POUND        2410
-#define IDS_CURRENCY_ITALIAN_LIRA       2411
-#define IDS_CURRENCY_LUXEMBOURG_FRANC   2412
-#define IDS_CURRENCY_MALTESE_LIRA       2413
-#define IDS_CURRENCY_PORTOGUESE_ESCUDO  2414
-#define IDS_CURRENCY_SLOVAK_KORUNA      2415
-#define IDS_CURRENCY_SLOVENIAN_TOLAR    2416
-#define IDS_CURRENCY_SPANISH_PESETA     2417
+#define IDS_CURRENCY_ESTONIAN_KROON     2406
+#define IDS_CURRENCY_EURO               2407
+#define IDS_CURRENCY_FINNISH_MARKKA     2408
+#define IDS_CURRENCY_FRENCH_FRANC       2409
+#define IDS_CURRENCY_GREEK_DRACHMA      2410
+#define IDS_CURRENCY_IRISH_POUND        2411
+#define IDS_CURRENCY_ITALIAN_LIRA       2412
+#define IDS_CURRENCY_LATVIAN_LATS       2413
+#define IDS_CURRENCY_LITHUANIAN_LITAS   2414
+#define IDS_CURRENCY_LUXEMBOURG_FRANC   2415
+#define IDS_CURRENCY_MALTESE_LIRA       2416
+#define IDS_CURRENCY_PORTOGUESE_ESCUDO  2417
+#define IDS_CURRENCY_SLOVAK_KORUNA      2418
+#define IDS_CURRENCY_SLOVENIAN_TOLAR    2419
+#define IDS_CURRENCY_SPANISH_PESETA     2420
 
 /* TYPES OF ENERGIES */
 #define IDS_ENERGY_15_C_CALORIES      2500

reactos/base/applications/calc/resource.rc

@@ -22,9 +22,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDI_CALC_BIG ICON "res/calc.ico"
 IDI_CALC_SMALL ICON "res/calc_sm.ico"
 
-/* Bitmaps */
-IDB_BITMAP_ROS BITMAP "res/ROS_logo.bmp"
-
 #include <reactos/manifest_exe.rc>
 
 /* UTF-8 */

reactos/base/applications/calc/rpn.c

@@ -314,7 +314,7 @@ void run_operator(calc_node_t *result,
             calc.is_nan = TRUE;
     } else {
         operator_list[operation].op_i(&dc, &da, &db);
-        /* apply final limitator to result */
+        /* apply final limiter to result */
         apply_int_mask(&dc);
     }
 

reactos/base/applications/calc/rpn_mpfr.c

@@ -300,7 +300,7 @@ void run_operator(calc_node_t *result,
             operator_list[operation].op_f(&result->number, &a->number, &b->number);
     } else {
         operator_list[operation].op_i(&result->number, &a->number, &b->number);
-        /* apply final limitator to result */
+        /* apply final limiter to result */
         apply_int_mask(&result->number);
     }
 }

reactos/base/applications/calc/utl.c

@@ -11,7 +11,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
         break;
     case IDC_RADIO_DEC:
 /*
- * Modifed from 17 to 16 for fixing this bug:
+ * Modified from 17 to 16 for fixing this bug:
  * 14+14+6.3+6.3= 40.5999999 instead of 40.6
  * So, it's probably better to leave the least
  * significant digit out of the display.
@@ -25,7 +25,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
             TCHAR *ptr, *dst;
 
             ptr = buffer + _stprintf(buffer, TEXT("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
-            /* format sring ensures there is a '.': */
+            /* format string ensures there is a '.': */
             dst = _tcschr(buffer, TEXT('.'));
             while (--ptr > dst)
                 if (*ptr != TEXT('0'))

reactos/base/applications/calc/whatsnew.txt

@@ -34,7 +34,7 @@
 * Corrected precision underflow/overflow when working with trigonometric functions.
 * cbrt() function is not used if compiling into ReactOS build system.
 * Resources are moved into /res directory.
-* Added new (partial) support for other languages: bulgarian, spanish, german, dutch, polish, russian, slovak, ukraianian.
+* Added new (partial) support for other languages: bulgarian, spanish, german, dutch, polish, russian, slovak, ukrainian.
 * Decimal precision of number with standard layout has been limited to 16 digits because the output display is smaller here (GMP version only).
 * Fixed buffer overflow with function update_lcd_display().
 * The decimal point is now preserved when switching to temporary scientific notation.

reactos/base/applications/calc/winmain.c

@@ -3,6 +3,8 @@
 #include <winbase.h>
 #include <wingdi.h>
 #include <winreg.h>
+#include <shellapi.h>
+#include <commctrl.h>
 
 #define HTMLHELP_PATH(_pt)  TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt)
 
@@ -211,8 +213,8 @@ static const function_table_t function_table[] = {
     { IDC_BUTTON_DMS,  MODIFIER_INV,              1, rpn_dec2dms, rpn_dms2dec, NULL,     NULL      },
     { IDC_BUTTON_FE,   0,                         1, run_fe,      NULL,        NULL,     NULL      },
     { IDC_BUTTON_DAT,  0,                         1, run_dat_sta, NULL,        NULL,     NULL,     },
-    { IDC_BUTTON_MP,   MODIFIER_INV,              1, run_mp,      run_mm,      NULL,     NULL,     },
-    { IDC_BUTTON_MS,   MODIFIER_INV,              1, run_ms,      run_mw,      NULL,     NULL,     },
+    { IDC_BUTTON_MP,   MODIFIER_INV|NO_CHAIN,     1, run_mp,      run_mm,      NULL,     NULL,     },
+    { IDC_BUTTON_MS,   MODIFIER_INV|NO_CHAIN,     1, run_ms,      run_mw,      NULL,     NULL,     },
     { IDC_BUTTON_CANC, NO_CHAIN,                  0, run_canc,    NULL,        NULL,     NULL,     },
     { IDC_BUTTON_RIGHTPAR, NO_CHAIN,              1, run_rpar,    NULL,        NULL,     NULL,     },
     { IDC_BUTTON_LEFTPAR,  NO_CHAIN,              0, run_lpar,    NULL,        NULL,     NULL,     },
@@ -434,7 +436,7 @@ KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam)
 static void update_lcd_display(HWND hwnd)
 {
     /*
-     * muliply size of calc.buffer by 2 because it may
+     * multiply size of calc.buffer by 2 because it may
      * happen that separator is used between each digit.
      * Also added little additional space for dot and '\0'.
      */
@@ -932,15 +934,18 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
     return FALSE;
 }
 
-static WPARAM idm_2_idc(int idm)
+static BOOL idm_2_idc(int idm, WPARAM *pIdc)
 {
     int x;
 
     for (x=0; x<SIZEOF(upd); x++) {
         if (upd[x].idm == idm)
-            break;
+        {
+            *pIdc = (WPARAM)(upd[x].idc);
+            return TRUE;
+        }
     }
-    return (WPARAM)(upd[x].idc);
+    return FALSE;
 }
 
 static void CopyMemToClipboard(void *ptr)
@@ -1338,8 +1343,14 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
             SetFocus(GetDlgItem(hWnd, IDC_BUTTON_FOCUS));
         switch (LOWORD(wp)) {
         case IDM_HELP_ABOUT:
-            DialogBox(calc.hInstance,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWnd, AboutDlgProc);
+        {
+            TCHAR infotitle[100];
+            TCHAR infotext[200];
+            LoadString(calc.hInstance, IDS_CALC_NAME, infotitle, SIZEOF(infotitle));
+            LoadString(calc.hInstance, IDS_AUTHOR, infotext, SIZEOF(infotext));
+            ShellAbout(hWnd, infotitle, infotext, (HICON)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_BIG)));
             return TRUE;
+        }
         case IDM_HELP_HELP:
 #ifndef DISABLE_HTMLHELP_SUPPORT
             HtmlHelp(hWnd, HTMLHELP_PATH("/general_information.htm"), HH_DISPLAY_TOPIC, (DWORD_PTR)NULL);
@@ -1401,8 +1412,15 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
         case IDM_VIEW_DWORD:
         case IDM_VIEW_WORD:
         case IDM_VIEW_BYTE:
-            SendMessage(hWnd, WM_COMMAND, idm_2_idc(LOWORD(wp)), 0);
-            return TRUE;
+        {
+            WPARAM idc;
+            if(idm_2_idc(LOWORD(wp), &idc))
+            {
+                SendMessage(hWnd, WM_COMMAND, idc, 0);
+                return TRUE;
+            }
+            return FALSE;
+        }
         case IDM_EDIT_COPY:
             handle_copy_command(hWnd);
             return TRUE;
@@ -1768,6 +1786,8 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
     MSG msg;
     DWORD dwLayout;
 
+    InitCommonControls();
+
     calc.hInstance = hInstance;
 
     calc.x_coord = -1;

reactos/base/applications/charmap/lang/ru-RU.rc

@@ -6,18 +6,18 @@ IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
-    LTEXT "Шрифт:", IDC_STATIC, 6, 7, 27, 9
+    LTEXT "&Шрифт:", IDC_STATIC, 6, 7, 27, 9
     COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
              WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-    PUSHBUTTON "Справка", IDC_CMHELP, 249, 5, 35, 13
+    PUSHBUTTON "&Справка", IDC_CMHELP, 249, 5, 35, 13
     CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
             WS_VSCROLL, 20, 22, 266, 156
-    LTEXT "Для копирования:", IDC_STATIC, 6, 188, 95, 9
+    LTEXT "Д&ля копирования:", IDC_STATIC, 6, 188, 95, 9
     CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER |
             WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
-    DEFPUSHBUTTON "Выбрать", IDC_SELECT, 194, 186, 44, 13
-    PUSHBUTTON "Копировать", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-    CONTROL "Дополнительные параметры", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
+    DEFPUSHBUTTON "&Выбрать", IDC_SELECT, 194, 186, 44, 13
+    PUSHBUTTON "&Копировать", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+    CONTROL "&Дополнительные параметры", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
             WS_TABSTOP, 8, 208, 110, 10
 END
 
@@ -25,14 +25,14 @@ IDD_ADVANCED DIALOGEX 0, 0, 292, 64
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Набор символов:", IDC_STATIC, 8, 8, 55, 8
+    LTEXT "&Набор символов:", IDC_STATIC, 8, 8, 55, 8
     COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Группировка:", IDC_STATIC, 8, 28, 50, 8
+    LTEXT "&Группировка:", IDC_STATIC, 8, 28, 50, 8
     COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON "Найти", IDC_BUTTON_SEARCH, 200, 44, 50, 14
     EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL
-    LTEXT "Поиск:", IDC_STATIC, 8, 48, 42, 8
-    LTEXT "Юникод:", IDC_STATIC, 200, 8, 30, 8
+    LTEXT "П&оиск:", IDC_STATIC, 8, 48, 42, 8
+    LTEXT "&Юникод:", IDC_STATIC, 200, 8, 30, 8
     EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL
 END
 
@@ -42,7 +42,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
     LTEXT "Таблица символов v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
-    PUSHBUTTON "Закрыть", IDOK, 75, 162, 44, 15
+    PUSHBUTTON "&Закрыть", IDOK, 75, 162, 44, 15
     ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30
     EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL |
              WS_TABSTOP | ES_READONLY | ES_MULTILINE

reactos/base/applications/charmap/map.c

@@ -107,8 +107,9 @@ FillGrid(PMAP infoPtr,
     i = XCELLS * infoPtr->iYStart;
 
     added = 0;
-    x = y = 0;
-    while ((y <= YCELLS) && (x <= XCELLS))
+
+    for (y = 0; y < YCELLS; y++)
+    for (x = 0; x < XCELLS; x++)
     {
         ch = (WCHAR)infoPtr->ValidGlyphs[i];
 
@@ -131,14 +132,6 @@ FillGrid(PMAP infoPtr,
 
         i++;
         ch = (WCHAR)i;
-
-        // move to the next cell
-        x++;
-        if (x > XCELLS - 1)
-        {
-            x = 0;
-            y++;
-        }
     }
     SelectObject(ps->hdc,
                  hOldFont);

reactos/base/applications/charmap/settings.c

@@ -58,7 +58,7 @@ extern void LoadSettings(void)
     if (RegOpenKeyEx(HKEY_CURRENT_USER, g_szGeneralRegKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
     {
         TCHAR szBuffer[MAX_PATH];
-        DWORD dwAdvanChecked;
+        DWORD dwAdvancedChecked;
         unsigned long type = REG_DWORD, size = 1024;
 
         /* Restore last selected font */
@@ -89,9 +89,9 @@ extern void LoadSettings(void)
             }
         }
 
-        RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvanChecked, &size);
+        RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvancedChecked, &size);
 
-        if(dwAdvanChecked == TRUE)
+        if(dwAdvancedChecked == TRUE)
             SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, MF_CHECKED, 0);
 
     RegCloseKey(hKey);

reactos/base/applications/charmap_new/GridView.cpp

@@ -69,7 +69,7 @@ CGridView::SetFont(
     )
 {
 
-    // Create a temperary container for the new font
+    // Create a temporary container for the new font
     CurrentFont NewFont = { 0 };
     NewFont.FontName = FontName;
 
@@ -224,7 +224,7 @@ CGridView::OnSize(
                  SWP_NOZORDER | SWP_SHOWWINDOW);
 
     // Get the client area we can draw on. The position we set above includes
-    // a scrollbar which we obvioulsy can't draw on. GetClientRect gives us
+    // a scrollbar which we obviously can't draw on. GetClientRect gives us
     // the size without the scroll, and it's more efficient than getting the
     // scroll metrics and calculating the size from that
     RECT ClientRect;

reactos/base/applications/charmap_new/charmap.cpp

@@ -1,8 +1,7 @@
 /*
-* PROJECT:     ReactOS Device Managment
+* PROJECT:     ReactOS Character Map
 * LICENSE:     GPL - See COPYING in the top level directory
-* FILE:        base/applications/mscutils/devmgmt/devmgmt.c
-* PURPOSE:     Bootstrap for the device manager
+* FILE:        base/applications/charmap/charmap.cpp
 * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
 */
 

reactos/base/applications/clipbrd/clipbrd.c

@@ -256,12 +256,12 @@ static int ClipboardCommandHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l
 
         case CMD_ABOUT:
         {
-            WCHAR szTitle[MAX_STRING_LEN];
             HICON hIcon;
+            WCHAR szTitle[MAX_STRING_LEN];
 
             hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCE(CLIPBRD_ICON));
             LoadStringW(Globals.hInstance, STRING_CLIPBOARD, szTitle, ARRAYSIZE(szTitle));
-            ShellAboutW(Globals.hMainWnd, szTitle, 0, hIcon);
+            ShellAboutW(Globals.hMainWnd, szTitle, NULL, hIcon);
             DeleteObject(hIcon);
             break;
         }

reactos/base/applications/clipbrd/clipbrd.rc

@@ -16,6 +16,9 @@ CLPFILE_ICON ICON "res/clpfile.ico"
 /* UTF-8 */
 #pragma code_page(65001)
 
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif
@@ -31,6 +34,9 @@ CLPFILE_ICON ICON "res/clpfile.ico"
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif

reactos/base/applications/clipbrd/lang/cs-CZ.rc

@@ -0,0 +1,65 @@
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+ID_ACCEL ACCELERATORS
+BEGIN
+    VK_DELETE, CMD_DELETE, VIRTKEY
+END
+
+MAIN_MENU MENU
+BEGIN
+    POPUP "&Soubor"
+    BEGIN
+        MENUITEM "&Otevřít...", CMD_OPEN
+        MENUITEM "&Uložit jako...", CMD_SAVE_AS
+        MENUITEM SEPARATOR
+        MENUITEM "&Konec", CMD_EXIT
+    END
+    POPUP "&Upravit"
+    BEGIN
+        MENUITEM "&Smazat\tDel", CMD_DELETE
+    END
+    POPUP "&Zobrazení"
+    BEGIN
+        MENUITEM "&Automaticky", CMD_AUTOMATIC
+    END
+    POPUP "&Nápověda"
+    BEGIN
+        MENUITEM "&Zobrazit nápovědu", CMD_HELP
+        MENUITEM SEPARATOR
+        MENUITEM "&O programu", CMD_ABOUT
+    END
+END
+
+STRINGTABLE
+BEGIN
+    STRING_CLIPBOARD "Prohlížeč schránky"
+    STRING_CLIPFILE  "Prvek schránky"
+    STRING_DELETE_MSG "Vymazat obsah stránky?"
+    STRING_DELETE_TITLE "Vymazat schránku"
+    STRING_FORMAT_NT "Soubory schránky systému ReactOS (*.clp)"
+    STRING_FORMAT_GEN "Soubory schránky (*.clp)"
+END
+
+STRINGTABLE
+BEGIN
+    STRING_CF_UNKNOWN "Neznámý formát"
+    STRING_CF_TEXT "Text"
+    STRING_CF_BITMAP "Bitmapa"
+    STRING_CF_OEMTEXT "Text OEM"
+    STRING_CF_UNICODETEXT "Text Unicode"
+    STRING_CF_DIB "DIB bitmapa"
+    STRING_CF_LOCALE "Data znakové sady"
+    STRING_CF_ENHMETAFILE "Rožířený soubor Metafile"
+    STRING_CF_METAFILEPICT "Metafile"
+    STRING_CF_PALETTE "Barevná paleta"
+    STRING_CF_DIBV5 "DIB bitmapa (Verze 5)"
+    STRING_CF_SYLK "Symbolický odkaz"
+    STRING_CF_DIF "Formát výměny dat"
+    STRING_CF_HDROP "Data přetažení"
+END
+
+STRINGTABLE
+BEGIN
+    ERROR_UNSUPPORTED_FORMAT "Schránka obsahuje data ve formátu, který není možné zobrazit."
+    ERROR_INVALID_FILE_FORMAT "Vybraný soubor není platný soubor schránky."
+END

reactos/base/applications/clipbrd/lang/en-US.rc

@@ -10,7 +10,7 @@ BEGIN
     POPUP "&File"
     BEGIN
         MENUITEM "&Open...", CMD_OPEN
-        MENUITEM "Save &as...", CMD_SAVE_AS
+        MENUITEM "Save &As...", CMD_SAVE_AS
         MENUITEM SEPARATOR
         MENUITEM "E&xit", CMD_EXIT
     END

reactos/base/applications/clipbrd/lang/ru-RU.rc

@@ -0,0 +1,65 @@
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+ID_ACCEL ACCELERATORS
+BEGIN
+    VK_DELETE, CMD_DELETE, VIRTKEY
+END
+
+MAIN_MENU MENU
+BEGIN
+    POPUP "&Файл"
+    BEGIN
+        MENUITEM "&Открыть...", CMD_OPEN
+        MENUITEM "Сохранить &как...", CMD_SAVE_AS
+        MENUITEM SEPARATOR
+        MENUITEM "В&ыход", CMD_EXIT
+    END
+    POPUP "&Правка"
+    BEGIN
+        MENUITEM "&Удалить\tDel", CMD_DELETE
+    END
+    POPUP "&Вид"
+    BEGIN
+        MENUITEM "&Автоматически", CMD_AUTOMATIC
+    END
+    POPUP "&Справка"
+    BEGIN
+        MENUITEM "&Вызов справки", CMD_HELP
+        MENUITEM SEPARATOR
+        MENUITEM "&О программе", CMD_ABOUT
+    END
+END
+
+STRINGTABLE
+BEGIN
+    STRING_CLIPBOARD "Просмотр буфера обмена"
+    STRING_CLIPFILE  "Элемент буфера обмена"
+    STRING_DELETE_MSG "Очистить содержимое буфера обмена?"
+    STRING_DELETE_TITLE "Очистить буфер обмена"
+    STRING_FORMAT_NT "Файлы буфера обмена ReactOS (*.clp)"
+    STRING_FORMAT_GEN "Файлы буфера обмена (*.clp)"
+END
+
+STRINGTABLE
+BEGIN
+    STRING_CF_UNKNOWN "Неизвестный формат"
+    STRING_CF_TEXT "Текст"
+    STRING_CF_BITMAP "Точечный рисунок"
+    STRING_CF_OEMTEXT "Текст в кодировке OEM"
+    STRING_CF_UNICODETEXT "Текст в кодировке Юникод"
+    STRING_CF_DIB "Аппаратно-независимый точечный рисунок (DIB)"
+    STRING_CF_LOCALE "Языковые данные"
+    STRING_CF_ENHMETAFILE "Расширенный метафайл"
+    STRING_CF_METAFILEPICT "Метафайл"
+    STRING_CF_PALETTE "Цветовая палитра"
+    STRING_CF_DIBV5 "Аппаратно-независимый точечный рисунок (DIB) (Версия 5)"
+    STRING_CF_SYLK "Формат символических ссылок"
+    STRING_CF_DIF "Формат обмена данными"
+    STRING_CF_HDROP "Очистить данные"
+END
+
+STRINGTABLE
+BEGIN
+    ERROR_UNSUPPORTED_FORMAT "Буфер обмена содержит данные, которые невозможно отобразить."
+    ERROR_INVALID_FILE_FORMAT "Выбранный файл не является файлом буфера обмена."
+END

reactos/base/applications/clipbrd/lang/tr-TR.rc

@@ -35,7 +35,7 @@ END
 STRINGTABLE
 BEGIN
     STRING_CLIPBOARD "Pano Görüntüleyicisi"
-    STRING_CLIPFILE  "Pano Öğesi"
+    STRING_CLIPFILE  "Pano Ögesi"
     STRING_DELETE_MSG "Pano içeriğini sil?"
     STRING_DELETE_TITLE "Pano Sil"
     STRING_FORMAT_NT "ReactOS İçin Pano Kütükleri (*.clp)"

reactos/base/applications/clipbrd/scrollutils.c

@@ -2,7 +2,7 @@
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Clipboard Viewer
  * FILE:            base/applications/clipbrd/scrollutils.c
- * PURPOSE:         Scrolling releated helper functions.
+ * PURPOSE:         Scrolling related helper functions.
  * PROGRAMMERS:     Ricardo Hanke
  */
 

reactos/base/applications/clipbrd/scrollutils.h

@@ -2,7 +2,7 @@
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Clipboard Viewer
  * FILE:            base/applications/clipbrd/scrollutils.h
- * PURPOSE:         Scrolling releated helper functions.
+ * PURPOSE:         Scrolling related helper functions.
  * PROGRAMMERS:     Ricardo Hanke
  */
 

reactos/base/applications/clipbrd/winutils.c

@@ -14,9 +14,21 @@ void ShowLastWin32Error(HWND hwndParent)
     LPWSTR lpMsgBuf = NULL;
 
     dwError = GetLastError();
+    if (dwError == ERROR_SUCCESS)
+        return;
+
+    if (!FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                        FORMAT_MESSAGE_FROM_SYSTEM |
+                        FORMAT_MESSAGE_IGNORE_INSERTS,
+                        NULL,
+                        dwError,
+                        LANG_USER_DEFAULT,
+                        (LPWSTR)&lpMsgBuf,
+                        0, NULL))
+    {
+        return;
+    }
 
-    FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                   NULL, dwError, 0, (LPWSTR)&lpMsgBuf, 0, NULL);
     MessageBoxW(hwndParent, lpMsgBuf, NULL, MB_OK | MB_ICONERROR);
     LocalFree(lpMsgBuf);
 }

reactos/base/applications/cmdutils/CMakeLists.txt

@@ -1,15 +1,20 @@
+add_subdirectory(at)
 add_subdirectory(clip)
 add_subdirectory(comp)
 add_subdirectory(cscript)
 add_subdirectory(dbgprint)
 add_subdirectory(doskey)
+add_subdirectory(eventcreate)
 add_subdirectory(find)
+add_subdirectory(fsutil)
 add_subdirectory(help)
 add_subdirectory(hostname)
 add_subdirectory(lodctr)
 add_subdirectory(mode)
+add_subdirectory(mofcomp)
 add_subdirectory(more)
 add_subdirectory(reg)
+add_subdirectory(schtasks)
 add_subdirectory(sort)
 add_subdirectory(taskkill)
 add_subdirectory(tree)

reactos/base/applications/cmdutils/at/CMakeLists.txt

@@ -0,0 +1,8 @@
+
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
+add_executable(at at.c at.rc)
+set_module_type(at win32cui UNICODE)
+target_link_libraries(at conutils ${PSEH_LIB})
+add_importlibs(at msvcrt kernel32 user32 netapi32)
+add_cd_file(TARGET at DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/at/at.c

@@ -0,0 +1,936 @@
+/*
+ * PROJECT:     ReactOS AT utility
+ * COPYRIGHT:   See COPYING in the top level directory
+ * FILE:        base/applications/cmdutils/at/at.c
+ * PURPOSE:     ReactOS AT utility
+ * PROGRAMMERS: Eric Kohl <eric.kohl@reactos.org>
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <wincon.h>
+#include <winnls.h>
+#include <lm.h>
+
+#include <conutils.h>
+
+#include "resource.h"
+
+
+PWSTR pszDaysOfWeekArray[7] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+
+
+static
+VOID
+FreeDaysOfWeekArray(VOID)
+{
+    INT i;
+
+    for (i = 0; i < 7; i++)
+    {
+        if (pszDaysOfWeekArray[i] != NULL)
+            HeapFree(GetProcessHeap(), 0, pszDaysOfWeekArray[i]);
+    }
+}
+
+
+static
+BOOL
+InitDaysOfWeekArray(VOID)
+{
+    INT i, nLength;
+
+    for (i = 0; i < 7; i++)
+    {
+        nLength = GetLocaleInfo(LOCALE_USER_DEFAULT,
+                                LOCALE_SABBREVDAYNAME1 + i,
+                                NULL,
+                                0);
+
+        pszDaysOfWeekArray[i] = HeapAlloc(GetProcessHeap(),
+                                          HEAP_ZERO_MEMORY,
+                                          nLength * sizeof(WCHAR));
+        if (pszDaysOfWeekArray[i] == NULL)
+        {
+            FreeDaysOfWeekArray();
+            return FALSE;
+        }
+
+        GetLocaleInfo(LOCALE_USER_DEFAULT,
+                      LOCALE_SABBREVDAYNAME1 + i,
+                      pszDaysOfWeekArray[i],
+                      nLength);
+    }
+
+    return TRUE;
+}
+
+
+static
+BOOL
+ParseTime(
+    PWSTR pszTime,
+    PULONG pulJobHour,
+    PULONG pulJobMinute)
+{
+    WCHAR szHour[3], szMinute[3], szAmPm[5];
+    PWSTR startPtr, endPtr;
+    ULONG ulHour = 0, ulMinute = 0;
+    INT nLength;
+
+    if (pszTime == NULL)
+        return FALSE;
+
+    startPtr = pszTime;
+
+    /* Extract the hour string */
+    nLength = 0;
+    while (*startPtr != L'\0' && iswdigit(*startPtr))
+    {
+        if (nLength >= 2)
+            return FALSE;
+
+        szHour[nLength] = *startPtr;
+        nLength++;
+
+        startPtr++;
+    }
+    szHour[nLength] = L'\0';
+
+    /* Check for a valid time separator */
+    if (*startPtr != L':')
+        return FALSE;
+
+    /* Skip the time separator */
+    startPtr++;
+
+    /* Extract the minute string */
+    nLength = 0;
+    while (*startPtr != L'\0' && iswdigit(*startPtr))
+    {
+        if (nLength >= 2)
+            return FALSE;
+
+        szMinute[nLength] = *startPtr;
+        nLength++;
+
+        startPtr++;
+    }
+    szMinute[nLength] = L'\0';
+
+    /* Extract the optional AM/PM indicator string */
+    nLength = 0;
+    while (*startPtr != L'\0')
+    {
+        if (nLength >= 4)
+            return FALSE;
+
+        if (!iswspace(*startPtr))
+        {
+            szAmPm[nLength] = *startPtr;
+            nLength++;
+        }
+
+        startPtr++;
+    }
+    szAmPm[nLength] = L'\0';
+
+    /* Convert the hour string */
+    ulHour = wcstoul(szHour, &endPtr, 10);
+    if (ulHour == 0 && *endPtr != UNICODE_NULL)
+        return FALSE;
+
+    /* Convert the minute string */
+    ulMinute = wcstoul(szMinute, &endPtr, 10);
+    if (ulMinute == 0 && *endPtr != UNICODE_NULL)
+        return FALSE;
+
+    /* Check for valid AM/PM indicator */
+    if (wcslen(szAmPm) > 0 &&
+        _wcsicmp(szAmPm, L"a") != 0 &&
+        _wcsicmp(szAmPm, L"am") != 0 &&
+        _wcsicmp(szAmPm, L"p") != 0 &&
+        _wcsicmp(szAmPm, L"pm") != 0)
+        return FALSE;
+
+    /* Check for the valid minute range [0-59] */
+    if (ulMinute > 59)
+        return FALSE;
+
+    if (wcslen(szAmPm) > 0)
+    {
+        /* 12 hour time format */
+
+         /* Check for the valid hour range [1-12] */
+        if (ulHour == 0 || ulHour > 12)
+            return FALSE;
+
+        /* Convert 12 hour format to 24 hour format */
+        if (_wcsicmp(szAmPm, L"a") == 0 ||
+            _wcsicmp(szAmPm, L"am") == 0)
+        {
+            if (ulHour == 12)
+                ulHour = 0;
+        }
+        else
+        {
+            if (ulHour >= 1 && ulHour <= 11)
+                ulHour += 12;
+        }
+    }
+    else
+    {
+        /* 24 hour time format */
+
+        /* Check for the valid hour range [0-23] */
+        if (ulHour > 23)
+            return FALSE;
+    }
+
+    if (pulJobHour != NULL)
+        *pulJobHour = ulHour;
+
+    if (pulJobMinute != NULL)
+        *pulJobMinute = ulMinute;
+
+    return TRUE;
+}
+
+
+static
+BOOL
+ParseId(
+    PWSTR pszId,
+    PULONG pulId)
+{
+    PWSTR startPtr, endPtr;
+    ULONG ulId = 0;
+    BOOL bResult = FALSE;
+
+    startPtr = pszId;
+    endPtr = NULL;
+    ulId = wcstoul(startPtr, &endPtr, 10);
+    if (endPtr != NULL && *endPtr == UNICODE_NULL)
+    {
+        bResult = TRUE;
+
+        if (pulId != NULL)
+            *pulId = ulId;
+    }
+
+    return bResult;
+}
+
+
+static
+BOOL
+ParseDaysOfMonth(
+    PWSTR pszBuffer,
+    PULONG pulDaysOfMonth)
+{
+    PWSTR startPtr, endPtr;
+    ULONG ulValue;
+
+    if (wcslen(pszBuffer) == 0)
+        return FALSE;
+
+    startPtr = pszBuffer;
+    endPtr = NULL;
+    for (;;)
+    {
+        ulValue = wcstoul(startPtr, &endPtr, 10);
+        if (ulValue == 0)
+            return FALSE;
+
+        if (ulValue > 0 && ulValue <= 31)
+            *pulDaysOfMonth |= (1 << (ulValue - 1));
+
+        if (endPtr != NULL && *endPtr == UNICODE_NULL)
+            return TRUE;
+
+        startPtr = endPtr + 1;
+        endPtr = NULL;
+    }
+
+    return FALSE;
+}
+
+
+static
+BOOL
+ParseDaysOfWeek(
+    PWSTR pszBuffer,
+    PUCHAR pucDaysOfWeek)
+{
+    PWSTR startPtr, endPtr;
+    INT nLength, i;
+
+    if (wcslen(pszBuffer) == 0)
+        return FALSE;
+
+    startPtr = pszBuffer;
+    endPtr = NULL;
+    for (;;)
+    {
+        endPtr = wcschr(startPtr, L',');
+        if (endPtr == NULL)
+            nLength = wcslen(startPtr);
+        else
+            nLength = (INT)((ULONG_PTR)endPtr - (ULONG_PTR)startPtr) / sizeof(WCHAR);
+
+        for (i = 0; i < 7; i++)
+        {
+            if (nLength == wcslen(pszDaysOfWeekArray[i]) &&
+                _wcsnicmp(startPtr, pszDaysOfWeekArray[i], nLength) == 0)
+            {
+                *pucDaysOfWeek |= (1 << i);
+                break;
+            }
+        }
+
+        if (endPtr == NULL)
+            return TRUE;
+
+        startPtr = endPtr + 1;
+        endPtr = NULL;
+    }
+
+    return FALSE;
+}
+
+
+static
+VOID
+PrintErrorMessage(
+    DWORD dwError)
+{
+    PWSTR pszBuffer = NULL;
+
+    FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+                   NULL,
+                   dwError,
+                   0,
+                   (PWSTR)&pszBuffer,
+                   0,
+                   NULL);
+
+    ConPrintf(StdErr, L"%s\n", pszBuffer);
+    LocalFree(pszBuffer);
+}
+
+
+static
+VOID
+PrintHorizontalLine(VOID)
+{
+    WCHAR szBuffer[80];
+    INT i;
+
+    for (i = 0; i < 79; i++)
+        szBuffer[i] = L'-';
+    szBuffer[79] = UNICODE_NULL;
+
+    ConPrintf(StdOut, L"%s\n", szBuffer);
+}
+
+
+static
+BOOL
+Confirm(VOID)
+{
+    HINSTANCE hInstance;
+    WCHAR szYesBuffer[8];
+    WCHAR szNoBuffer[8];
+    WCHAR szInput[80];
+    DWORD dwOldMode;
+    DWORD dwRead = 0;
+    BOOL ret = FALSE;
+    HANDLE hFile;
+
+    hInstance = GetModuleHandleW(NULL);
+    LoadStringW(hInstance, IDS_CONFIRM_YES, szYesBuffer, _countof(szYesBuffer));
+    LoadStringW(hInstance, IDS_CONFIRM_NO, szNoBuffer, _countof(szNoBuffer));
+
+    ZeroMemory(szInput, sizeof(szInput));
+
+    hFile = GetStdHandle(STD_INPUT_HANDLE);
+    GetConsoleMode(hFile, &dwOldMode);
+
+    SetConsoleMode(hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT);
+
+    for (;;)
+    {
+        ConResPrintf(StdOut, IDS_CONFIRM_QUESTION);
+
+        ReadConsoleW(hFile, szInput, _countof(szInput), &dwRead, NULL);
+
+        szInput[0] = towupper(szInput[0]);
+        if (szInput[0] == szYesBuffer[0])
+        {
+            ret = TRUE;
+            break;
+        }
+        else if (szInput[0] == 13 || szInput[0] == szNoBuffer[0])
+        {
+            ret = FALSE;
+            break;
+        }
+
+        ConResPrintf(StdOut, IDS_CONFIRM_INVALID);
+    }
+
+    SetConsoleMode(hFile, dwOldMode);
+
+    return ret;
+}
+
+
+static
+DWORD_PTR
+GetTimeAsJobTime(VOID)
+{
+    SYSTEMTIME Time;
+    DWORD_PTR JobTime;
+
+    GetLocalTime(&Time);
+
+    JobTime = (DWORD_PTR)Time.wHour * 3600000 + 
+              (DWORD_PTR)Time.wMinute * 60000;
+
+    return JobTime;
+}
+
+
+static
+ULONG
+GetCurrentDayOfMonth(VOID)
+{
+    SYSTEMTIME Time;
+
+    GetLocalTime(&Time);
+
+    return 1UL << (Time.wDay - 1);
+}
+
+
+static
+VOID
+JobTimeToTimeString(
+    PWSTR pszBuffer,
+    INT cchBuffer,
+    WORD wHour,
+    WORD wMinute)
+{
+    SYSTEMTIME Time = {0, 0, 0, 0, 0, 0, 0, 0};
+
+    Time.wHour = wHour;
+    Time.wMinute = wMinute;
+
+    GetTimeFormat(LOCALE_USER_DEFAULT,
+                  TIME_NOSECONDS,
+                  &Time,
+                  NULL,
+                  pszBuffer,
+                  cchBuffer);
+}
+
+
+static
+INT
+PrintJobDetails(
+    PWSTR pszComputerName,
+    ULONG ulJobId)
+{
+    PAT_INFO pBuffer = NULL;
+    DWORD_PTR CurrentTime;
+    WCHAR szStatusBuffer[16];
+    WCHAR szScheduleBuffer[60];
+    WCHAR szTimeBuffer[16];
+    WCHAR szInteractiveBuffer[16];
+    WCHAR szDateBuffer[8];
+    INT i, nDateLength, nScheduleLength;
+    HINSTANCE hInstance;
+    NET_API_STATUS Status;
+
+    Status = NetScheduleJobGetInfo(pszComputerName,
+                                   ulJobId,
+                                   (PBYTE *)&pBuffer);
+    if (Status != NERR_Success)
+    {
+        PrintErrorMessage(Status);
+        return 1;
+    }
+
+    hInstance = GetModuleHandle(NULL);
+
+    if (pBuffer->Flags & JOB_EXEC_ERROR)
+        LoadStringW(hInstance, IDS_ERROR, szStatusBuffer, _countof(szStatusBuffer));
+    else
+        LoadStringW(hInstance, IDS_OK, szStatusBuffer, _countof(szStatusBuffer));
+
+    if (pBuffer->DaysOfMonth != 0)
+    {
+        if (pBuffer->Flags & JOB_RUN_PERIODICALLY)
+            LoadStringW(hInstance, IDS_EVERY, szScheduleBuffer, _countof(szScheduleBuffer));
+        else
+            LoadStringW(hInstance, IDS_NEXT, szScheduleBuffer, _countof(szScheduleBuffer));
+
+        nScheduleLength = wcslen(szScheduleBuffer);
+        for (i = 0; i < 31; i++)
+        {
+            if (pBuffer->DaysOfMonth & (1 << i))
+            {
+                swprintf(szDateBuffer, L" %d", i + 1);
+                nDateLength = wcslen(szDateBuffer);
+                if (nScheduleLength + nDateLength <= 55)
+                {
+                    wcscat(szScheduleBuffer, szDateBuffer);
+                    nScheduleLength += nDateLength;
+                }
+                else
+                {
+                    wcscat(szScheduleBuffer, L"...");
+                    break;
+                }
+            }
+        }
+    }
+    else if (pBuffer->DaysOfWeek != 0)
+    {
+        if (pBuffer->Flags & JOB_RUN_PERIODICALLY)
+            LoadStringW(hInstance, IDS_EVERY, szScheduleBuffer, _countof(szScheduleBuffer));
+        else
+            LoadStringW(hInstance, IDS_NEXT, szScheduleBuffer, _countof(szScheduleBuffer));
+
+        nScheduleLength = wcslen(szScheduleBuffer);
+        for (i = 0; i < 7; i++)
+        {
+            if (pBuffer->DaysOfWeek & (1 << i))
+            {
+                swprintf(szDateBuffer, L" %s", pszDaysOfWeekArray[i]);
+                nDateLength = wcslen(szDateBuffer);
+                if (nScheduleLength + nDateLength <= 55)
+                {
+                    wcscat(szScheduleBuffer, szDateBuffer);
+                    nScheduleLength += nDateLength;
+                }
+                else
+                {
+                    wcscat(szScheduleBuffer, L"...");
+                    break;
+                }
+            }
+        }
+    }
+    else
+    {
+        CurrentTime = GetTimeAsJobTime();
+        if (CurrentTime > pBuffer->JobTime)
+            LoadStringW(hInstance, IDS_TOMORROW, szScheduleBuffer, _countof(szScheduleBuffer));
+        else
+            LoadStringW(hInstance, IDS_TODAY, szScheduleBuffer, _countof(szScheduleBuffer));
+    }
+
+    JobTimeToTimeString(szTimeBuffer,
+                        _countof(szTimeBuffer),
+                        (WORD)(pBuffer->JobTime / 3600000),
+                        (WORD)((pBuffer->JobTime % 3600000) / 60000));
+
+    if (pBuffer->Flags & JOB_NONINTERACTIVE)
+        LoadStringW(hInstance, IDS_NO, szInteractiveBuffer, _countof(szInteractiveBuffer));
+    else
+        LoadStringW(hInstance, IDS_YES, szInteractiveBuffer, _countof(szInteractiveBuffer));
+
+    ConResPrintf(StdOut, IDS_TASKID, ulJobId);
+    ConResPrintf(StdOut, IDS_STATUS, szStatusBuffer);
+    ConResPrintf(StdOut, IDS_SCHEDULE, szScheduleBuffer);
+    ConResPrintf(StdOut, IDS_TIME, szTimeBuffer);
+    ConResPrintf(StdOut, IDS_INTERACTIVE, szInteractiveBuffer);
+    ConResPrintf(StdOut, IDS_COMMAND, pBuffer->Command);
+
+    NetApiBufferFree(pBuffer);
+
+    return 0;
+}
+
+
+static
+INT
+PrintAllJobs(
+    PWSTR pszComputerName)
+{
+    PAT_ENUM pBuffer = NULL;
+    DWORD dwRead = 0, dwTotal = 0;
+    DWORD dwResume = 0, i;
+    DWORD_PTR CurrentTime;
+    NET_API_STATUS Status;
+
+    WCHAR szScheduleBuffer[32];
+    WCHAR szTimeBuffer[16];
+    WCHAR szDateBuffer[8];
+    HINSTANCE hInstance;
+    INT j, nDateLength, nScheduleLength;
+
+    Status = NetScheduleJobEnum(pszComputerName,
+                                (PBYTE *)&pBuffer,
+                                MAX_PREFERRED_LENGTH,
+                                &dwRead,
+                                &dwTotal,
+                                &dwResume);
+    if (Status != NERR_Success)
+    {
+        PrintErrorMessage(Status);
+        return 1;
+    }
+
+    if (dwTotal == 0)
+    {
+        ConResPrintf(StdOut, IDS_NO_ENTRIES);
+        return 0;
+    }
+
+    ConResPrintf(StdOut, IDS_JOBS_LIST);
+    PrintHorizontalLine();
+
+    hInstance = GetModuleHandle(NULL);
+
+    for (i = 0; i < dwRead; i++)
+    {
+        if (pBuffer[i].DaysOfMonth != 0)
+        {
+            if (pBuffer[i].Flags & JOB_RUN_PERIODICALLY)
+                LoadStringW(hInstance, IDS_EVERY, szScheduleBuffer, _countof(szScheduleBuffer));
+            else
+                LoadStringW(hInstance, IDS_NEXT, szScheduleBuffer, _countof(szScheduleBuffer));
+
+            nScheduleLength = wcslen(szScheduleBuffer);
+            for (j = 0; j < 31; j++)
+            {
+                if (pBuffer[i].DaysOfMonth & (1 << j))
+                {
+                    swprintf(szDateBuffer, L" %d", j + 1);
+                    nDateLength = wcslen(szDateBuffer);
+                    if (nScheduleLength + nDateLength <= 19)
+                    {
+                        wcscat(szScheduleBuffer, szDateBuffer);
+                        nScheduleLength += nDateLength;
+                    }
+                    else
+                    {
+                        wcscat(szScheduleBuffer, L"...");
+                        break;
+                    }
+                }
+            }
+        }
+        else if (pBuffer[i].DaysOfWeek != 0)
+        {
+            if (pBuffer[i].Flags & JOB_RUN_PERIODICALLY)
+                LoadStringW(hInstance, IDS_EVERY, szScheduleBuffer, _countof(szScheduleBuffer));
+            else
+                LoadStringW(hInstance, IDS_NEXT, szScheduleBuffer, _countof(szScheduleBuffer));
+
+            nScheduleLength = wcslen(szScheduleBuffer);
+            for (j = 0; j < 7; j++)
+            {
+                if (pBuffer[i].DaysOfWeek & (1 << j))
+                {
+                    swprintf(szDateBuffer, L" %s", pszDaysOfWeekArray[j]);
+                    nDateLength = wcslen(szDateBuffer);
+                    if (nScheduleLength + nDateLength <= 55)
+                    {
+                        wcscat(szScheduleBuffer, szDateBuffer);
+                        nScheduleLength += nDateLength;
+                    }
+                    else
+                    {
+                        wcscat(szScheduleBuffer, L"...");
+                        break;
+                    }
+                }
+            }
+        }
+        else
+        {
+            CurrentTime = GetTimeAsJobTime();
+            if (CurrentTime > pBuffer[i].JobTime)
+                LoadStringW(hInstance, IDS_TOMORROW, szScheduleBuffer, _countof(szScheduleBuffer));
+            else
+                LoadStringW(hInstance, IDS_TODAY, szScheduleBuffer, _countof(szScheduleBuffer));
+        }
+
+        JobTimeToTimeString(szTimeBuffer,
+                            _countof(szTimeBuffer),
+                            (WORD)(pBuffer[i].JobTime / 3600000),
+                            (WORD)((pBuffer[i].JobTime % 3600000) / 60000));
+
+        ConPrintf(StdOut,
+                  L"   %6lu   %-21s   %-11s   %s\n",
+                  pBuffer[i].JobId,
+                  szScheduleBuffer,
+                  szTimeBuffer,
+                  pBuffer[i].Command);
+    }
+
+    NetApiBufferFree(pBuffer);
+
+    return 0;
+}
+
+
+static
+INT
+AddJob(
+    PWSTR pszComputerName,
+    ULONG ulJobHour,
+    ULONG ulJobMinute,
+    ULONG ulDaysOfMonth,
+    UCHAR ucDaysOfWeek,
+    BOOL bInteractiveJob,
+    BOOL bPeriodicJob,
+    PWSTR pszCommand)
+{
+    AT_INFO InfoBuffer;
+    ULONG ulJobId = 0;
+    NET_API_STATUS Status;
+
+    InfoBuffer.JobTime = (DWORD_PTR)ulJobHour * 3600000 + 
+                         (DWORD_PTR)ulJobMinute * 60000;
+    InfoBuffer.DaysOfMonth = ulDaysOfMonth;
+    InfoBuffer.DaysOfWeek = ucDaysOfWeek;
+    InfoBuffer.Flags = (bInteractiveJob ? 0 : JOB_NONINTERACTIVE) |
+                       (bPeriodicJob ? JOB_RUN_PERIODICALLY : 0);
+    InfoBuffer.Command = pszCommand;
+
+    Status = NetScheduleJobAdd(pszComputerName,
+                               (PBYTE)&InfoBuffer,
+                               &ulJobId);
+    if (Status != NERR_Success)
+    {
+        PrintErrorMessage(Status);
+        return 1;
+    }
+
+    ConResPrintf(StdOut, IDS_NEW_JOB, ulJobId);
+
+    return 0;
+}
+
+
+static
+INT
+DeleteJob(
+    PWSTR pszComputerName,
+    ULONG ulJobId,
+    BOOL bForceDelete)
+{
+    NET_API_STATUS Status;
+
+    if (ulJobId == (ULONG)-1 && bForceDelete == FALSE)
+    {
+        ConResPrintf(StdOut, IDS_DELETE_ALL);
+        if (!Confirm())
+            return 0;
+    }
+
+    Status = NetScheduleJobDel(pszComputerName,
+                               (ulJobId == (ULONG)-1) ? 0 : ulJobId,
+                               (ulJobId == (ULONG)-1) ? -1 : ulJobId);
+    if (Status != NERR_Success)
+    {
+        PrintErrorMessage(Status);
+        return 1;
+    }
+
+    return 0;
+}
+
+
+int wmain(int argc, WCHAR **argv)
+{
+    PWSTR pszComputerName = NULL;
+    PWSTR pszCommand = NULL;
+    ULONG ulJobId = (ULONG)-1;
+    ULONG ulJobHour = (ULONG)-1;
+    ULONG ulJobMinute = (ULONG)-1;
+    BOOL bDeleteJob = FALSE, bForceDelete = FALSE;
+    BOOL bInteractiveJob = FALSE, bPeriodicJob = FALSE;
+    BOOL bPrintUsage = FALSE;
+    ULONG ulDaysOfMonth = 0;
+    UCHAR ucDaysOfWeek = 0;
+    INT nResult = 0;
+    INT i, minIdx;
+
+    /* Initialize the Console Standard Streams */
+    ConInitStdStreams();
+
+    if (!InitDaysOfWeekArray())
+        return 1;
+
+    /* Parse the computer name */
+    i = 1;
+    minIdx = 1;
+    if (i < argc &&
+        argv[i][0] == L'\\' &&
+        argv[i][1] == L'\\')
+    {
+        pszComputerName = argv[i];
+        i++;
+        minIdx++;
+    }
+
+    /* Parse the time or job id */
+    if (i < argc && argv[i][0] != L'/')
+    {
+        if (ParseTime(argv[i], &ulJobHour, &ulJobMinute))
+        {
+            i++;
+            minIdx++;
+        }
+        else if (ParseId(argv[i], &ulJobId))
+        {
+            i++;
+            minIdx++;
+        }
+    }
+
+    /* Parse the options */
+    for (; i < argc; i++)
+    {
+        if (argv[i][0] == L'/')
+        {
+            if (_wcsicmp(argv[i], L"/?") == 0)
+            {
+                bPrintUsage = TRUE;
+                goto done;
+            }
+            else if (_wcsicmp(argv[i], L"/delete") == 0)
+            {
+                bDeleteJob = TRUE;
+            }
+            else if (_wcsicmp(argv[i], L"/yes") == 0)
+            {
+                bForceDelete = TRUE;
+            }
+            else if (_wcsicmp(argv[i], L"/interactive") == 0)
+            {
+                bInteractiveJob = TRUE;
+            }
+            else if (_wcsnicmp(argv[i], L"/every:", 7) == 0)
+            {
+                bPeriodicJob = TRUE;
+                if (ParseDaysOfMonth(&(argv[i][7]), &ulDaysOfMonth) == FALSE)
+                {
+                    if (ParseDaysOfWeek(&(argv[i][7]), &ucDaysOfWeek) == FALSE)
+                    {
+                        ulDaysOfMonth = GetCurrentDayOfMonth();
+                    }
+                }
+            }
+            else if (_wcsnicmp(argv[i], L"/next:", 6) == 0)
+            {
+                bPeriodicJob = FALSE;
+                if (ParseDaysOfMonth(&(argv[i][6]), &ulDaysOfMonth) == FALSE)
+                {
+                    if (ParseDaysOfWeek(&(argv[i][6]), &ucDaysOfWeek) == FALSE)
+                    {
+                        ulDaysOfMonth = GetCurrentDayOfMonth();
+                    }
+                }
+            }
+            else
+            {
+                bPrintUsage = TRUE;
+                nResult = 1;
+                goto done;
+            }
+        }
+    }
+
+    /* Parse the command */
+    if (argc > minIdx && argv[argc - 1][0] != L'/')
+    {
+        pszCommand = argv[argc - 1];
+    }
+
+    if (bDeleteJob == TRUE)
+    {
+        /* Check for invalid options or arguments */
+        if (bInteractiveJob == TRUE ||
+            ulJobHour != (ULONG)-1 ||
+            ulJobMinute != (ULONG)-1 ||
+            ulDaysOfMonth != 0 ||
+            ucDaysOfWeek != 0 ||
+            pszCommand != NULL)
+        {
+            bPrintUsage = TRUE;
+            nResult = 1;
+            goto done;
+        }
+
+        nResult = DeleteJob(pszComputerName,
+                            ulJobId,
+                            bForceDelete);
+    }
+    else
+    {
+        if (ulJobHour != (ULONG)-1 && ulJobMinute != (ULONG)-1)
+        {
+            /* Check for invalid options or arguments */
+            if (bForceDelete == TRUE ||
+                pszCommand == NULL)
+            {
+                bPrintUsage = TRUE;
+                nResult = 1;
+                goto done;
+            }
+
+            nResult = AddJob(pszComputerName,
+                             ulJobHour,
+                             ulJobMinute,
+                             ulDaysOfMonth,
+                             ucDaysOfWeek,
+                             bInteractiveJob,
+                             bPeriodicJob,
+                             pszCommand);
+        }
+        else
+        {
+            /* Check for invalid options or arguments */
+            if (bForceDelete == TRUE ||
+                bInteractiveJob == TRUE ||
+                ulDaysOfMonth != 0 ||
+                ucDaysOfWeek != 0 ||
+                pszCommand != NULL)
+            {
+                bPrintUsage = TRUE;
+                nResult = 1;
+                goto done;
+            }
+
+            if (ulJobId == (ULONG)-1)
+            {
+                nResult = PrintAllJobs(pszComputerName);
+            }
+            else
+            {
+                nResult = PrintJobDetails(pszComputerName,
+                                          ulJobId);
+            }
+        }
+    }
+
+done:
+    FreeDaysOfWeekArray();
+
+    if (bPrintUsage == TRUE)
+        ConResPuts(StdOut, IDS_USAGE);
+
+    return nResult;
+}
+
+/* EOF */

reactos/base/applications/cmdutils/at/at.rc

@@ -0,0 +1,26 @@
+#include <windef.h>
+
+#include "resource.h"
+
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS AT Command"
+#define REACTOS_STR_INTERNAL_NAME     "at"
+#define REACTOS_STR_ORIGINAL_FILENAME "at.exe"
+#include <reactos/version.rc>
+
+/* UTF-8 */
+#pragma code_page(65001)
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/tr-TR.rc"
+#endif

reactos/base/applications/cmdutils/at/lang/de-DE.rc

@@ -0,0 +1,57 @@
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Mit dem AT Befehl können Befehle und Programme zu einem vorbestimmten\n\
+Termin gestartet werden. Der Zeitplandienst muss gestartet sein, um den\n\
+Befehl AT zu verwenden.\n\n\
+AT [\\\\Computername] [ [Kennung] [/DELETE] | /DELETE [/YES]]\n\
+AT [\\\\Computername] Zeit [/INTERACTIVE]\n\
+    [ /EVERY:Datum[,...] | /NEXT:Datum[,...]] ""Befehl""\n\n\
+\\\\Computername     Gibt einen Remotecomputer an. Ohne diesen Parameter werden\n\
+                   die Befehle auf dem lokalen Computer ausgeführt.\n\
+Kennung            Eine Identifikationsnummer, die dem geplanten Befehl\n\
+                   zugeteilt wird.\n\
+/DELETE            Löscht geplante Befehle. Ohne Kennung werden alle geplanten\n\
+                   Befehle auf dem Computer gelöscht.\n\
+/YES               In Verbindung mit /DELETE werden die geplanten Befehle ohne\n\
+                   weitere Bestätiging gelöscht.\n\
+Zeit               Gibt die Zeit an, zu der ein Befehl ausgeführt werden soll.\n\
+/INTERACTIVE       Ermöglicht dem Aufrag, Eingaben von dem Benutzer\n\
+                   anzunehmen, der angemeldet ist, wenn der Auftrag ausgeführt\n\
+                   wird.\n\
+/EVERY:Datum[,...] Führt den Befehl zu jedem der angegebenen Tage der Woche\n\
+                   oder des Monats aus. Ohne Angabe eines Datums wird der\n\
+                   aktuelle Tag des Monats angenommen.\n\
+/NEXT:Datum[,...]  Führt den Befehl am nächsten angegebenen Tage der Woche\n\
+                   oder des Monats (z.B. nächsten Montag) aus. Ohne Angabe\n\
+                   eines Datums wird der aktuelle Tag des Monats angenommen.\n\
+""Befehl""           Ist der auszuführende Befehl oder das Stapelprogramm.\n"
+
+    IDS_DELETE_ALL "Dieser Vorgang wird alle geplanten Aufträge löschen.\n"
+    IDS_NEW_JOB "Neuer Auftrag hinzugefügt. Kennung = %lu\n"
+    IDS_JOBS_LIST "Statuskenn. Tag                     Zeit          Befehlszeile\n"
+    IDS_NO_ENTRIES "Es sind keine Einträge in der Liste.\n"
+
+    IDS_CONFIRM_QUESTION "Möchten Sie diesen Vorgang fortsetzen? (J/N) [N]: "
+    IDS_CONFIRM_INVALID  "\nDies ist eine ungültige Antwort.\n"
+    IDS_CONFIRM_YES "J"
+    IDS_CONFIRM_NO "N"
+
+    IDS_TODAY "Heute"
+    IDS_TOMORROW "Morgen"
+    IDS_EVERY "Jeden"
+    IDS_NEXT "Kommenden"
+
+    IDS_YES "Ja"
+    IDS_NO "Nein"
+    IDS_ERROR "ERROR"
+    IDS_OK "OK"
+
+    IDS_TASKID      "Taskkennung:   %lu\n"
+    IDS_STATUS      "Status:        %s\n"
+    IDS_SCHEDULE    "Zeitplan:      %s\n"
+    IDS_TIME        "Zeit:          %s\n"
+    IDS_INTERACTIVE "Interaktiv:    %s\n"
+    IDS_COMMAND     "Befehl:        %s\n"
+END

reactos/base/applications/cmdutils/at/lang/en-US.rc

@@ -0,0 +1,56 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "The AT command schedules commands and programs to run on a computer at\n\
+a specified time and date. The Schedule service must be running to use\n\
+the AT command.\n\n\
+AT [\\\\computername] [ [id] [/DELETE] | /DELETE [/YES]]\n\
+AT [\\\\computername] time [/INTERACTIVE]\n\
+    [ /EVERY:date[,...] | /NEXT:date[,...]] ""command""\n\n\
+\\\\computername     Specifies a remote computer. Commands are scheduled on the \n\
+                   local computer if this parameter is omitted.\n\
+id                 Is an identification number assigned to a scheduled\n\
+                   command.\n\
+/DELETE            Cancels a scheduled command. If id is omitted, all the\n\
+                   scheduled commands on the computer are canceled.\n\
+/YES               Used with cancel all jobs command when no further\n\
+                   confirmation is desired.\n\
+time               Specifies the time when command is to run.\n\
+/INTERACTIVE       Allows the job to interact with the desktop of the user\n\
+                   who is logged on at the time the job runs.\n\
+/EVERY:date[,...]  Runs the command on each specified day(s) of the week or\n\
+                   month. If date is omitted, the current day of the month\n\
+                   is assumed.\n\
+/NEXT:date[,...]   Runs the specified command on the next occurrence of the\n\
+                   day (for example, next Thursday). If date is omitted, the \n\
+                   current day of the month is assumed.\n\
+""command""          Is the command or batch program to be run.\n"
+
+    IDS_DELETE_ALL "This operation will delete all scheduled jobs.\n"
+    IDS_NEW_JOB "Added a new job with job ID = %lu\n"
+    IDS_JOBS_LIST "Status ID   Day                     Time          Command Line\n"
+    IDS_NO_ENTRIES "There are no entries in the list.\n"
+
+    IDS_CONFIRM_QUESTION "Do you want to continue this operation? (Y/N) [N]: "
+    IDS_CONFIRM_INVALID  "\nThis is an invalid response.\n"
+    IDS_CONFIRM_YES "Y"
+    IDS_CONFIRM_NO "N"
+
+    IDS_TODAY "Today"
+    IDS_TOMORROW "Tomorrow"
+    IDS_EVERY "Every"
+    IDS_NEXT "Next"
+
+    IDS_YES "Yes"
+    IDS_NO "No"
+    IDS_ERROR "ERROR"
+    IDS_OK "OK"
+
+    IDS_TASKID      "Task ID:       %lu\n"
+    IDS_STATUS      "Status:        %s\n"
+    IDS_SCHEDULE    "Schedule:      %s\n"
+    IDS_TIME        "Time of day:   %s\n"
+    IDS_INTERACTIVE "Interactive:   %s\n"
+    IDS_COMMAND     "Command:       %s\n"
+END

reactos/base/applications/cmdutils/at/lang/ro-RO.rc

@@ -0,0 +1,56 @@
+/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Comanda AT planifică comenzi și programe pentru fi executate într-un\n\
+calculator la o anumită dată și oră. Serviciul «Schedule» trebuie să fie\n\
+pornit pentru a utiliza această comandă.\n\n\
+AT [\\\\numecalculator] [ [id] [/DELETE] | /DELETE [/YES]]\n\
+AT [\\\\numecalculator] timp [/INTERACTIVE]\n\
+    [ /EVERY:dată[,...] | /NEXT:dată[,...]] ""comandă""\n\n\
+\\\\numecalculator   Specifică un calculator la distanță. Fără acest\n\
+                   parametru, planificarea va fi pentru calculatorul local.\n\
+id                 Un număr de identificare atribuit comenzii planificate.\n\
+/DELETE            Anulează o comandă planificată. Fără acest parametru,\n\
+                   vor fi anulate toate comenzile planificate.\n\
+/YES               Utilizat cu opțiunea «DELETE», pentru suprimarea cerințelor\n\
+                   de confirmare a eliminărilor de comenzi planificate.\n\
+timp               Specifică timpul de lansare a comenzii.\n\
+/INTERACTIVE       Permite programelor să interacționeze cu utilizatorul\n\
+                   autentificat la momentul execuției planificate.\n\
+/EVERY:dată[,...]  Execută comanda la ziua sau zilele specificate din fiecare\n\
+                   săptămână sau lună. Dacă data este omisă, este considerată\n\
+                   ziua curentă a lunii.\n\
+/NEXT:dată[,...]   Execută comanda în următoarea zi (spre exemplu marțea\n\
+                   viitoare). Dacă data este omisă, e considerată ziua\n\
+                   curentă a lunii.\n\
+""comandă""          Numele comenzii sau programului pentru execuție.\n"
+
+    IDS_DELETE_ALL "Această operație va elimina planificarea pentru toate comenzile.\n"
+    IDS_NEW_JOB "A fost planificată o nouă activitate cu ID = %lu\n"
+    IDS_JOBS_LIST "ID stare    Zi                      Oră           Comanda\n"
+    IDS_NO_ENTRIES "Nu există comenzi planificate.\n"
+
+    IDS_CONFIRM_QUESTION "Sigur doriți continuarea acestei operații? (D|N) [N]: "
+    IDS_CONFIRM_INVALID "\nAcesta nu este un răspuns valid.\n"
+    IDS_CONFIRM_YES "D"
+    IDS_CONFIRM_NO "N"
+
+    IDS_TODAY "Astăzi"
+    IDS_TOMORROW "Mâine"
+    IDS_EVERY "În fiecare"
+    IDS_NEXT "În următoarea"
+
+    IDS_YES "Da"
+    IDS_NO "Nu"
+    IDS_ERROR "EROARE"
+    IDS_OK "OK"
+
+    IDS_TASKID      "ID sarcină:    %lu\n"
+    IDS_STATUS      "Stare:         %s\n"
+    IDS_SCHEDULE    "Pentru:        %s\n"
+    IDS_TIME        "La ora:        %s\n"
+    IDS_INTERACTIVE "Interactiv:    %s\n"
+    IDS_COMMAND     "Comandă:       %s\n"
+END

reactos/base/applications/cmdutils/at/lang/ru-RU.rc

@@ -0,0 +1,54 @@
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Команда AT предназначена для запуска команд и программ\n\
+в указанное время по определенным дням. Для работы команды необходимо, чтобы\n\
+была запущена служба планировщика (Schedule service).\n\n\
+AT [\\\\имя_компьютера] [ [id] [/DELETE] | /DELETE [/YES]]\n\
+AT [\\\\имя_компьютера] время [/INTERACTIVE]\n\
+    [ /EVERY:день[,...] | /NEXT:день[,...]] ""команда""\n\n\
+\\\\имя_компьютера     Имя удаленного компьютера. Если этот параметр не указан, \n\
+                   используется локальный компьютер.\n\
+id                 Порядковый номер запланированной задачи.\n\
+/DELETE            Отменяет запланированную команду. Если параметр id не указан, то\n\
+                   все команды, запланированные на данном компьютере, будут отменены.\n\
+/YES               Отмена запроса на подтверждение при отмене всех\n\
+                   запланированных задач.\n\
+время              Время запуска команды.\n\
+/INTERACTIVE       Разрешает взаимодействие задачи с пользователем,\n\
+                   работающим на компьютере во время запуска задачи.\n\
+/EVERY:день[,...]  Задача будет выполняться каждый указанный день (дни) или\n\
+                   месяц. Если дата не указана, используется текущий день \n\
+                   месяца.\n\
+/NEXT:день[,...]   Задача будет запущена в следующий указанный день недели\n\
+                   (например, в следующий четверг). Если дата не указана, то \n\
+                   используется текущий день месяца.\n\
+""команда""          Команда или имя пакетного файла для запуска.\n"
+
+    IDS_CONFIRM_QUESTION "Продолжить выполнение операции? (Y-да/N-нет) [N] "
+    IDS_CONFIRM_INVALID  "\nНедопустимый ответ.\n"
+    IDS_CONFIRM_YES "Y"
+    IDS_CONFIRM_NO "N"
+
+    IDS_NEW_JOB "Добавлено новое задание с ID = %lu\n"
+    IDS_JOBS_LIST "Статус ID   День                     Время          Команда\n"
+    IDS_NO_ENTRIES "В списке нет запланированных задач.\n"
+
+    IDS_TODAY "Сегодня"
+    IDS_TOMORROW "Завтра"
+    IDS_EVERY "Каждый"
+    IDS_NEXT "Следующий"
+
+    IDS_YES "Да"
+    IDS_NO "Нет"
+    IDS_ERROR "ОШИБКА"
+    IDS_OK "ОК"
+
+    IDS_TASKID      "ID задачи:     %lu\n"
+    IDS_STATUS      "Состояние:     %s\n"
+    IDS_SCHEDULE    "Расписание:    %s\n"
+    IDS_TIME        "Время суток:   %s\n"
+    IDS_INTERACTIVE "Интерактивный: %s\n"
+    IDS_COMMAND     "Команда:       %s\n"
+END

reactos/base/applications/cmdutils/at/lang/tr-TR.rc

@@ -0,0 +1,56 @@
+/* TRANSLATOR: 2017 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+
+LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "AT komutu, belirlenen bir zamanda bilgisayarda çalıştırmak için komutları\n\
+ve izlenceleri zamanlar. AT komutunu çalıştırmak için Zamanlayıcı hizmeti \n\
+çalıştırılmalıdır.\n\n\
+AT [\\\\bilgisayar adı] [ [kimlik] [/DELETE] | /DELETE [/YES]]\n\
+AT [\\\\bilgisayar adı] saat [/INTERACTIVE]\n\
+    [ /EVERY:târih[,...] | /NEXT:târih[,...]] ""komut""\n\n\
+\\\\bilgisayar adı   Bir uzak bilgisayarı belirtir. Bu değişken yazılmazsa\n\
+                   komutlar yerli bilgisayarda zamanlanır.\n\
+kimlik             Zamanlanan bir komuta atanan bir kimlik numarasıdır.\n\
+/DELETE            Zamanlanan bir komutu iptâl eder. Kimlik yazılmadığında\n\
+                   bilgisayardaki tüm zamanlanan komutlar iptâl edilir.\n\
+/YES               Sonraki onaylamalar istenilmediğinde tüm işleri iptâl etme\n\
+                   komutuyla birlikte kullanılır.\n\
+saat               Komutun çalıştırılma saatini belirtir.\n\
+/INTERACTIVE       İşe, çalıştırılacağı saatte oturum açmış kullanıcının\n\
+                   masaüstüyle etkileşmesine izin verir.\n\
+/EVERY:târih[,...] Haftanın ya da ayın belirtilen tüm günlerinde komutu çalıştırır.\n\
+                   month. Târih yazılmadığında ayın şimdiki gününü varsayar.\n\
+/NEXT:târih[,...]  Günün bir sonraki oluşunda (örneğin bir sonraki perşembede)\n\
+                   belirtilen komutu çalıştırır. Târih yazılmadığında ayın\n\
+                   şimdiki gününü varsayar.\n\
+""komut""            Çalıştırılacak komut ya da toplu iş kütüğü.\n"
+
+    IDS_DELETE_ALL "Bu işlem tüm zamanlanan işleri silecek.\n"
+    IDS_NEW_JOB "%lu iş kimliğiyle yeni bir iş eklendi.\n"
+    IDS_JOBS_LIST "Durum  Km.  Gün                     Saat          Komut Yatacı\n"
+    IDS_NO_ENTRIES "Dizelgede bir giriş yok.\n"
+
+    IDS_CONFIRM_QUESTION "Bu işlemi sürdürmek ister misiniz? (E/H) [H]: "
+    IDS_CONFIRM_INVALID  "\nBu geçersiz bir yanıttır.\n"
+    IDS_CONFIRM_YES "E"
+    IDS_CONFIRM_NO "H"
+
+    IDS_TODAY "Bugün"
+    IDS_TOMORROW "Yarın"
+    IDS_EVERY "Her"
+    IDS_NEXT "Bir sonraki"
+
+    IDS_YES "Evet"
+    IDS_NO "Hayır"
+    IDS_ERROR "YANLIŞLIK"
+    IDS_OK "Tamam"
+
+    IDS_TASKID      "Görev kimliği: %lu\n"
+    IDS_STATUS      "Durum:         %s\n"
+    IDS_SCHEDULE    "Zamanlama:     %s\n"
+    IDS_TIME        "Günün saati:   %s\n"
+    IDS_INTERACTIVE "Etkileşme:     %s\n"
+    IDS_COMMAND     "Komut:         %s\n"
+END

reactos/base/applications/cmdutils/at/resource.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#define IDS_USAGE          100
+
+#define IDS_DELETE_ALL     105
+#define IDS_NEW_JOB        106
+#define IDS_JOBS_LIST      107
+#define IDS_NO_ENTRIES     108
+
+#define IDS_TODAY          109
+#define IDS_TOMORROW       110
+#define IDS_EVERY          111
+#define IDS_NEXT           112
+
+
+#define IDS_YES         101
+#define IDS_NO          102
+#define IDS_ERROR       103
+#define IDS_OK          104
+
+#define IDS_TASKID      122
+#define IDS_STATUS      123
+#define IDS_SCHEDULE    124
+#define IDS_TIME        125
+#define IDS_INTERACTIVE 126
+#define IDS_COMMAND     127
+
+#define IDS_CONFIRM_QUESTION 130
+#define IDS_CONFIRM_INVALID  131
+#define IDS_CONFIRM_YES      132
+#define IDS_CONFIRM_NO       133

reactos/base/applications/cmdutils/clip/CMakeLists.txt

@@ -1,5 +1,8 @@
 
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
 add_executable(clip clip.c clip.rc)
 set_module_type(clip win32cui UNICODE)
-add_importlibs(clip user32 msvcrt kernel32 advapi32)
+target_link_libraries(clip conutils ${PSEH_LIB})
+add_importlibs(clip advapi32 user32 msvcrt kernel32)
 add_cd_file(TARGET clip DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/clip/clip.c

@@ -12,31 +12,17 @@
 #include <winbase.h>
 #include <winuser.h>
 
+#include <conutils.h>
+
 #include "resource.h"
 
-static void PrintError(void)
+VOID PrintError(DWORD dwError)
 {
-    DWORD dwError;
-    LPWSTR lpMsgBuf = NULL;
-
-    dwError = GetLastError();
-    if (dwError == NO_ERROR)
+    if (dwError == ERROR_SUCCESS)
         return;
 
-    FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                   NULL, dwError, 0, (LPWSTR)&lpMsgBuf, 0,  NULL);
-    wprintf(L"%s", lpMsgBuf);
-    LocalFree(lpMsgBuf);
-}
-
-static void PrintResourceString(UINT uID)
-{
-    WCHAR buff[500];
-
-    if (LoadStringW(GetModuleHandle(NULL), uID, buff, ARRAYSIZE(buff)))
-    {
-        wprintf(L"%s", buff);
-    }
+    ConMsgPuts(StdErr, FORMAT_MESSAGE_FROM_SYSTEM,
+               NULL, dwError, LANG_USER_DEFAULT);
 }
 
 static BOOL IsDataUnicode(HGLOBAL hGlobal)
@@ -61,28 +47,27 @@ int wmain(int argc, wchar_t** argv)
     LPBYTE lpBuffer;
     SIZE_T dwSize = 0;
 
+    /* Initialize the Console Standard Streams */
     hInput = GetStdHandle(STD_INPUT_HANDLE);
+    ConInitStdStreams();
 
     /* Check for usage */
     if (argc > 1 && wcsncmp(argv[1], L"/?", 2) == 0)
     {
-        PrintResourceString(IDS_HELP);
+        ConResPuts(StdOut, IDS_HELP);
         return 0;
     }
 
     if (GetFileType(hInput) == FILE_TYPE_CHAR)
     {
-        PrintResourceString(IDS_USAGE);
+        ConResPuts(StdOut, IDS_USAGE);
         return 0;
     }
 
     /* Initialize a growable buffer for holding clipboard data */
     hBuffer = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, 4096);
     if (!hBuffer)
-    {
-        PrintError();
-        return -1;
-    }
+        goto Failure;
 
     /*
      * Read data from the input stream by chunks of 4096 bytes
@@ -92,7 +77,7 @@ int wmain(int argc, wchar_t** argv)
     {
         lpBuffer = GlobalLock(hBuffer);
         if (!lpBuffer)
-            goto cleanup;
+            goto Failure;
 
         bStatus = ReadFile(hInput, lpBuffer + dwSize, 4096, &dwBytesRead, NULL);
         dwSize += dwBytesRead;
@@ -100,11 +85,11 @@ int wmain(int argc, wchar_t** argv)
 
         hTemp = GlobalReAlloc(hBuffer, GlobalSize(hBuffer) + 4096, GMEM_ZEROINIT);
         if (!hTemp)
-            goto cleanup;
+            goto Failure;
 
         hBuffer = hTemp;
     }
-    while (dwBytesRead > 0 && bStatus);
+    while (bStatus && dwBytesRead > 0);
 
     /*
      * Resize the buffer to the total size of data read.
@@ -118,7 +103,7 @@ int wmain(int argc, wchar_t** argv)
 
     /* Attempt to open the clipboard */
     if (!OpenClipboard(NULL))
-        goto cleanup;
+        goto Failure;
 
     /* Empty it, copy our data, then close it */
 
@@ -138,8 +123,8 @@ int wmain(int argc, wchar_t** argv)
     CloseClipboard();
     return 0;
 
-cleanup:
-    GlobalFree(hBuffer);
-    PrintError();
+Failure:
+    if (hBuffer) GlobalFree(hBuffer);
+    PrintError(GetLastError());
     return -1;
 }

reactos/base/applications/cmdutils/clip/clip.rc

@@ -2,9 +2,11 @@
 
 #include "resource.h"
 
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Clip Command"
-#define REACTOS_STR_INTERNAL_NAME     "clip"
-#define REACTOS_STR_ORIGINAL_FILENAME "clip.exe"
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Clip Command"
+#define REACTOS_STR_INTERNAL_NAME       "clip"
+#define REACTOS_STR_ORIGINAL_FILENAME   "clip.exe"
 #include <reactos/version.rc>
 
 /* UTF-8 */

reactos/base/applications/cmdutils/clip/lang/ru-RU.rc

@@ -7,5 +7,5 @@ BEGIN
     IDS_USAGE "\nВведите ""CLIP /?"" для получения справки по использованию.\n"
     IDS_HELP "\nПеренаправляет вывод от утилит командной строки в буфер обмена.\n\n\
 CLIP [/?]\n\n\
-    /?  Вывод справки по использованию..\n"
+    /?  Вывод справки по использованию.\n"
 END

reactos/base/applications/cmdutils/comp/CMakeLists.txt

@@ -1,5 +1,8 @@
 
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
 add_executable(comp comp.c comp.rc)
-set_module_type(comp win32cui)
+set_module_type(comp win32cui UNICODE)
+target_link_libraries(comp conutils ${PSEH_LIB})
 add_importlibs(comp msvcrt kernel32)
 add_cd_file(TARGET comp DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/comp/comp.c

@@ -1,255 +1,245 @@
-/*
- *  ReactOS Win32 Applications
- *  Copyright (C) 2005 ReactOS Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     ReactOS comp utility
- * FILE:        base/applications/cmdutils/comp/comp.c
- * PURPOSE:     Compares the contents of two files
- * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com)
- * REVISIONS:
- *   GM 25/09/05 Created
- *
- */
-
-#include <windows.h>
-#include <tchar.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#define STRBUF 1024
-
-/* getline:  read a line, return length */
-INT GetBuff(char *buff, FILE *in)
-{
-    return fread(buff, 1, STRBUF, in);
-}
-
-INT FileSize(FILE * fd)
-{
-    INT result = -1;
-    if (fseek(fd, 0, SEEK_END) == 0 && (result = ftell(fd)) != -1)
-    {
-        /* Restoring file pointer */
-        rewind(fd);
-    }
-    return result;
-}
-
-/* Print program usage */
-VOID Usage(VOID)
-{
-    _tprintf(_T("\nCompares the contents of two files or sets of files.\n\n"
-                "COMP [/L] [/A] [data1] [data2]\n\n"
-                "  data1      Specifies location and name of first file to compare.\n"
-                "  data2      Specifies location and name of second file to compare.\n"
-                "  /A         Display differences in ASCII characters.\n"
-                "  /L         Display line numbers for differences.\n"));
-}
-
-
-int _tmain (int argc, TCHAR *argv[])
-{
-    INT i;
-
-    /* File pointers */
-    FILE *fp1 = NULL;
-    FILE *fp2 = NULL;
-
-    INT BufLen1, BufLen2;
-    PTCHAR Buff1 = NULL;
-    PTCHAR Buff2 = NULL;
-    TCHAR File1[_MAX_PATH + 1], // File paths
-          File2[_MAX_PATH + 1];
-    BOOL bAscii = FALSE,        // /A switch
-         bLineNos = FALSE;      // /L switch
-    UINT  LineNumber;
-    UINT  Offset;
-    INT  FileSizeFile1;
-    INT  FileSizeFile2;
-    INT  NumberOfOptions = 0;
-    INT  FilesOK = 1;
-    INT Status = EXIT_SUCCESS;
-
-    /* Parse command line for options */
-    for (i = 1; i < argc; i++)
-    {
-        if (argv[i][0] == '/')
-        {
-            switch (argv[i][1])
-            {
-                case 'A':
-                    bAscii = TRUE;
-                    NumberOfOptions++;
-                    break;
-
-                case 'L':
-                    bLineNos = TRUE;
-                    NumberOfOptions++;
-                    break;
-
-                case '?':
-                    Usage();
-                    return EXIT_SUCCESS;
-
-                default:
-                    _tprintf(_T("Invalid switch - /%c\n"), argv[i][1]);
-                    Usage();
-                    return EXIT_FAILURE;
-            }
-        }
-    }
-
-    if (argc - NumberOfOptions == 3)
-    {
-        _tcsncpy(File1, argv[1 + NumberOfOptions], _MAX_PATH);
-        _tcsncpy(File2, argv[2 + NumberOfOptions], _MAX_PATH);
-    }
-    else
-    {
-        _tprintf(_T("Bad command line syntax\n"));
-        return EXIT_FAILURE;
-    }
-
-    Buff1 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR));
-    if (Buff1 == NULL)
-    {
-        _tprintf(_T("Can't get free memory for Buff1\n"));
-        return EXIT_FAILURE;
-    }
-
-    Buff2 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR));
-    if (Buff2 == NULL)
-    {
-        _tprintf(_T("Can't get free memory for Buff2\n"));
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-
-    if ((fp1 = fopen(File1, "rb")) == NULL)
-    {
-        _tprintf(_T("Can't find/open file: %s\n"), File1);
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-    if ((fp2 = fopen(File2, "rb")) == NULL)
-    {
-        _tprintf(_T("Can't find/open file: %s\n"), File2);
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-
-
-    _tprintf(_T("Comparing %s and %s...\n"), File1, File2);
-
-    FileSizeFile1 = FileSize(fp1);
-    if (FileSizeFile1 == -1)
-    {
-        _tprintf(_T("Can't determine size of file: %s\n"), File1);
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-
-    FileSizeFile2 = FileSize(fp2);
-    if (FileSizeFile2 == -1)
-    {
-        _tprintf(_T("Can't determine size of file: %s\n"), File2);
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-
-    if (FileSizeFile1 != FileSizeFile2)
-    {
-        _tprintf(_T("Files are different sizes.\n"));
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-
-    LineNumber = 1;
-    Offset = 0;
-    while (1)
-    {
-        BufLen1 = GetBuff(Buff1, fp1);
-        BufLen2 = GetBuff(Buff2, fp2);
-
-        if (ferror(fp1) || ferror(fp2))
-        {
-            _tprintf(_T("Files read error.\n"));
-            Status = EXIT_FAILURE;
-            goto Cleanup;
-        }
-
-        if (!BufLen1 && !BufLen2)
-            break;
-
-        assert(BufLen1 == BufLen2);
-        for (i = 0; i < BufLen1; i++)
-        {
-            if (Buff1[i] != Buff2[i])
-            {
-                FilesOK = 0;
-
-                /* Reporting here a mismatch */
-                if (bLineNos)
-                {
-                    _tprintf(_T("Compare error at LINE %d\n"), LineNumber);
-                }
-                else
-                {
-                    _tprintf(_T("Compare error at OFFSET %d\n"), Offset);
-                }
-
-                if (bAscii)
-                {
-                    _tprintf(_T("file1 = %c\n"), Buff1[i]);
-                    _tprintf(_T("file2 = %c\n"), Buff2[i]);
-                }
-                else
-                {
-                    _tprintf(_T("file1 = %X\n"), Buff1[i]);
-                    _tprintf(_T("file2 = %X\n"), Buff2[i]);
-                }
-
-                Offset++;
-
-                if (Buff1[i] == '\n')
-                    LineNumber++;
-            }
-         }
-    }
-
-    if (FilesOK)
-        _tprintf(_T("Files compare OK\n"));
-
-Cleanup:
-    if (fp1)
-        fclose(fp1);
-    if (fp2)
-        fclose(fp2);
-
-    if (Buff1)
-        free(Buff1);
-    if (Buff2)
-        free(Buff2);
-
-    return Status;
-}
-
-/* EOF */
+/*
+ *  ReactOS Win32 Applications
+ *  Copyright (C) 2005 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/*
+ * PROJECT:     ReactOS Comp utility
+ * COPYRIGHT:   See COPYING in the top level directory
+ * FILE:        base/applications/cmdutils/comp/comp.c
+ * PURPOSE:     Compares the contents of two files
+ * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com)
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+
+#define WIN32_NO_STATUS
+#include <windef.h>
+#include <winbase.h>
+
+#include <conutils.h>
+
+#include "resource.h"
+
+#define STRBUF 1024
+
+/* getline: read a line, return length */
+INT GetBuff(PBYTE buff, FILE* in)
+{
+    return fread(buff, sizeof(BYTE), STRBUF, in);
+}
+
+INT FileSize(FILE* fd)
+{
+    INT result = -1;
+    if (fseek(fd, 0, SEEK_END) == 0 && (result = ftell(fd)) != -1)
+    {
+        /* Restoring file pointer */
+        rewind(fd);
+    }
+    return result;
+}
+
+
+int wmain(int argc, WCHAR* argv[])
+{
+    INT i;
+
+    /* File pointers */
+    FILE *fp1 = NULL;
+    FILE *fp2 = NULL;
+
+    INT BufLen1, BufLen2;
+    PBYTE Buff1 = NULL;
+    PBYTE Buff2 = NULL;
+    WCHAR File1[_MAX_PATH + 1], // File paths
+          File2[_MAX_PATH + 1];
+    BOOL bAscii = FALSE,        // /A switch
+         bLineNos = FALSE;      // /L switch
+    UINT LineNumber;
+    UINT Offset;
+    INT  FileSizeFile1;
+    INT  FileSizeFile2;
+    INT  NumberOfOptions = 0;
+    INT  FilesOK = 1;
+    INT  Status = EXIT_SUCCESS;
+
+    /* Initialize the Console Standard Streams */
+    ConInitStdStreams();
+
+    /* Parse command line for options */
+    for (i = 1; i < argc; i++)
+    {
+        if (argv[i][0] == L'/')
+        {
+            switch (towlower(argv[i][1]))
+            {
+                case L'a':
+                    bAscii = TRUE;
+                    NumberOfOptions++;
+                    break;
+
+                case L'l':
+                    bLineNos = TRUE;
+                    NumberOfOptions++;
+                    break;
+
+                case L'?':
+                    ConResPuts(StdOut, IDS_HELP);
+                    return EXIT_SUCCESS;
+
+                default:
+                    ConResPrintf(StdErr, IDS_INVALIDSWITCH, argv[i][1]);
+                    ConResPuts(StdOut, IDS_HELP);
+                    return EXIT_FAILURE;
+            }
+        }
+    }
+
+    if (argc - NumberOfOptions == 3)
+    {
+        wcsncpy(File1, argv[1 + NumberOfOptions], _MAX_PATH);
+        wcsncpy(File2, argv[2 + NumberOfOptions], _MAX_PATH);
+    }
+    else
+    {
+        ConResPuts(StdErr, IDS_BADSYNTAX);
+        return EXIT_FAILURE;
+    }
+
+    Buff1 = (PBYTE)malloc(STRBUF);
+    if (Buff1 == NULL)
+    {
+        ConPuts(StdErr, L"Can't get free memory for Buff1\n");
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    Buff2 = (PBYTE)malloc(STRBUF);
+    if (Buff2 == NULL)
+    {
+        ConPuts(StdErr, L"Can't get free memory for Buff2\n");
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    if ((fp1 = _wfopen(File1, L"rb")) == NULL)
+    {
+        ConResPrintf(StdErr, IDS_FILEERROR, File1);
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+    if ((fp2 = _wfopen(File2, L"rb")) == NULL)
+    {
+        ConResPrintf(StdErr, IDS_FILEERROR, File2);
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    ConResPrintf(StdOut, IDS_COMPARING, File1, File2);
+
+    FileSizeFile1 = FileSize(fp1);
+    if (FileSizeFile1 == -1)
+    {
+        ConResPrintf(StdErr, IDS_FILESIZEERROR, File1);
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    FileSizeFile2 = FileSize(fp2);
+    if (FileSizeFile2 == -1)
+    {
+        ConResPrintf(StdErr, IDS_FILESIZEERROR, File2);
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    if (FileSizeFile1 != FileSizeFile2)
+    {
+        ConResPuts(StdOut, IDS_SIZEDIFFERS);
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    LineNumber = 1;
+    Offset = 0;
+    while (1)
+    {
+        BufLen1 = GetBuff(Buff1, fp1);
+        BufLen2 = GetBuff(Buff2, fp2);
+
+        if (ferror(fp1) || ferror(fp2))
+        {
+            ConResPuts(StdErr, IDS_READERROR);
+            Status = EXIT_FAILURE;
+            goto Cleanup;
+        }
+
+        if (!BufLen1 && !BufLen2)
+            break;
+
+        assert(BufLen1 == BufLen2);
+        for (i = 0; i < BufLen1; i++)
+        {
+            if (Buff1[i] != Buff2[i])
+            {
+                FilesOK = 0;
+
+                /* Reporting here a mismatch */
+                if (bLineNos)
+                    ConResPrintf(StdOut, IDS_MISMATCHLINE, LineNumber);
+                else
+                    ConResPrintf(StdOut, IDS_MISMATCHOFFSET, Offset);
+
+                if (bAscii)
+                {
+                    ConResPrintf(StdOut, IDS_ASCIIDIFF, 1, Buff1[i]);
+                    ConResPrintf(StdOut, IDS_ASCIIDIFF, 2, Buff2[i]);
+                }
+                else
+                {
+                    ConResPrintf(StdOut, IDS_HEXADECIMALDIFF, 1, Buff1[i]);
+                    ConResPrintf(StdOut, IDS_HEXADECIMALDIFF, 2, Buff2[i]);
+                }
+            }
+
+            Offset++;
+
+            if (Buff1[i] == '\n')
+                LineNumber++;
+        }
+    }
+
+    if (FilesOK)
+        ConResPuts(StdOut, IDS_MATCH);
+
+Cleanup:
+    if (fp2)
+        fclose(fp2);
+    if (fp1)
+        fclose(fp1);
+
+    if (Buff2)
+        free(Buff2);
+    if (Buff1)
+        free(Buff1);
+
+    return Status;
+}
+
+/* EOF */

reactos/base/applications/cmdutils/comp/comp.rc

@@ -1,5 +1,29 @@
+#include <windef.h>
 
-#define REACTOS_STR_FILE_DESCRIPTION    "File Compare Utility"
+#include "resource.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS File Compare Utility"
 #define REACTOS_STR_INTERNAL_NAME       "comp"
 #define REACTOS_STR_ORIGINAL_FILENAME   "comp.exe"
 #include <reactos/version.rc>
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/tr-TR.rc"
+#endif

reactos/base/applications/cmdutils/comp/lang/en-US.rc

@@ -0,0 +1,23 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE
+BEGIN
+    IDS_HELP "Compares the contents of two files or sets of files.\n\n\
+COMP [/L] [/A] [data1] [data2]\n\n\
+  data1      Specifies location and name of first file to compare.\n\
+  data2      Specifies location and name of second file to compare.\n\
+  /A         Display differences in ASCII characters (default: hexadecimal).\n\
+  /L         Display line numbers for differences.\n"
+    IDS_INVALIDSWITCH "Invalid switch - /%c\n"
+    IDS_BADSYNTAX "Bad command line syntax\n"
+    IDS_FILEERROR "Cannot find/open file: %s\n"
+    IDS_COMPARING "Comparing %s and %s...\n"
+    IDS_FILESIZEERROR "Cannot determine size of file: %s\n"
+    IDS_SIZEDIFFERS "Files are different sizes.\n"
+    IDS_READERROR "Files read error.\n"
+    IDS_MISMATCHLINE "Compare error at LINE %d\n"
+    IDS_MISMATCHOFFSET "Compare error at OFFSET 0x%X\n"
+    IDS_ASCIIDIFF "file%d = %c\n"
+    IDS_HEXADECIMALDIFF "file%d = %X\n"
+    IDS_MATCH "Files compare OK\n"
+END

reactos/base/applications/cmdutils/comp/lang/fr-FR.rc

@@ -0,0 +1,23 @@
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_HELP "Compare le contenu de deux fichiers ou ensembles de fichiers.\n\n\
+COMP [/L] [/A] [data1] [data2]\n\n\
+  data1      Spécifie l'emplacement et le nom du premier fichier à comparer.\n\
+  data2      Spécifie l'emplacement et le nom du second fichier à comparer.\n\
+  /A         Affiche les différences en caractères ASCII (défaut: hexadécimal).\n\
+  /L         Affiche les numéros de ligne des différences.\n"
+    IDS_INVALIDSWITCH "Paramètre invalide - /%c\n"
+    IDS_BADSYNTAX "Syntaxe incorrecte\n"
+    IDS_FILEERROR "Impossible de trouver/ouvrir le fichier : %s\n"
+    IDS_COMPARING "Comparaison de %s et %s...\n"
+    IDS_FILESIZEERROR "Ne peut pas déterminer la taille du fichier : %s\n"
+    IDS_SIZEDIFFERS "Les fichiers sont de taille différente.\n"
+    IDS_READERROR "Erreur lors de la lecture des fichiers.\n"
+    IDS_MISMATCHLINE "Erreur de comparaison à LIGNE %d\n"
+    IDS_MISMATCHOFFSET "Erreur de comparaison à OFFSET 0x%X\n"
+    IDS_ASCIIDIFF "fichier%d = %c\n"
+    IDS_HEXADECIMALDIFF "fichier%d = %X\n"
+    IDS_MATCH "Comparaison des fichiers OK\n"
+END

reactos/base/applications/cmdutils/comp/lang/ro-RO.rc

@@ -0,0 +1,24 @@
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
+LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_HELP "Compară conținuturile a două fișiere sau grupuri de fișiere.\n\n\
+COMP [/L] [/A] [data1] [data2]\n\n\
+  data1      Calea și numele primului fișier de comparat.\n\
+  data2      Calea și numele celui de-al doilea fișier de comparat.\n\
+  /A         Afișează diferențele în caractere ASCII (implicit: hexazecimal).\n\
+  /L         Afișează numărul liniei pentru diferențe.\n"
+    IDS_INVALIDSWITCH "Parametru nevalid - /%c\n"
+    IDS_BADSYNTAX "Sintaxă eronată\n"
+    IDS_FILEERROR "Nu poate fi găsit/deschis fișierul: %s\n"
+    IDS_COMPARING "%s este comparat cu %s...\n"
+    IDS_FILESIZEERROR "Eroare la determinarea dimensiunii fișierului: %s\n"
+    IDS_SIZEDIFFERS "Fișierele au dimensiuni diferite.\n"
+    IDS_READERROR "Eroare la citirea fișierelor.\n"
+    IDS_MISMATCHLINE "Diferență identificată la linia %d\n"
+    IDS_MISMATCHOFFSET "Diferență identificată la poziția 0x%X\n"
+    IDS_ASCIIDIFF "fișier%d = %c\n"
+    IDS_HEXADECIMALDIFF "fișier%d = %X\n"
+    IDS_MATCH "Fișierele sunt identice\n"
+END

reactos/base/applications/cmdutils/comp/lang/ru-RU.rc

@@ -0,0 +1,23 @@
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_HELP "Сравнение содержимого двух файлов или наборов файлов.\n\n\
+COMP [/L] [/A] [данные1] [данные2]\n\n\
+  данные1    Расположение и имя первого файла для сравнения.\n\
+  данные2    Расположение и имя второго файла для сравнения.\n\
+  /A         Вывод различий в формате ASCII (по умолчанию: шестнадцатиричный).\n\
+  /L         Вывод номеров строк, в которых обнаружены различия.\n"
+    IDS_INVALIDSWITCH "Недопустимый ключ - /%c\n"
+    IDS_BADSYNTAX "Не верный формат командной строки\n"
+    IDS_FILEERROR "Не удалось найти/открыть файл: %s\n"
+    IDS_COMPARING "Сравнение %s и %s...\n"
+    IDS_FILESIZEERROR "Не удалось определить размер файла: %s\n"
+    IDS_SIZEDIFFERS "Файлы разных размеров.\n"
+    IDS_READERROR "Ошибка чтения файлов.\n"
+    IDS_MISMATCHLINE "Ошибка сравнения в СТРОКЕ %d\n"
+    IDS_MISMATCHOFFSET "Ошибка сравнения в ПОЗИЦИИ 0x%X\n"
+    IDS_ASCIIDIFF "файл%d = %c\n"
+    IDS_HEXADECIMALDIFF "файл%d = %X\n"
+    IDS_MATCH "Различия не найдены\n"
+END

reactos/base/applications/cmdutils/comp/lang/tr-TR.rc

@@ -0,0 +1,25 @@
+/* TRANSLATOR: 2016 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+
+LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_HELP "İki kütüğün ya da iki kütük öbeğinin içeriklerini karşılaştırır.\n\n\
+COMP [/L] [/A] [veri1] [veri2]\n\n\
+  veri1      Karşılaştırılacak birinci kütüğün adını ve konumunu belirtir.\n\
+  veri2      Karşılaştırılacak ikinci kütüğün adını ve konumunu belirtir.\n\
+  /A         ASCII damgalarındaki ayrımları görüntüle. (Ön tanımlı: On altılık.)\n\
+  /L         Ayrımlar için yataç numaraları görüntüle.\n"
+    IDS_INVALIDSWITCH "Geçersiz seçenek - /%c\n"
+    IDS_BADSYNTAX "Geçersiz komut yatacı söz dizimi.\n"
+    IDS_FILEERROR "Kütük açılamıyor ya da aranamıyor: %s\n"
+    IDS_COMPARING "%s ve %s karşılaştırılıyor...\n"
+    IDS_FILESIZEERROR "Kütüğün büyüklüğü saptanamıyor: %s\n"
+    IDS_SIZEDIFFERS "Kütükler ayrı büyüklüklerde.\n"
+    IDS_READERROR "Kütükleri okuma yanlışlığı.\n"
+    IDS_MISMATCHLINE "%d. yataçta karşılaştırma yanlışlığı.\n"
+    IDS_MISMATCHOFFSET "0x%X ofsetinde karşılaştırma yanlışlığı.\n"
+    IDS_ASCIIDIFF "kütük%d = %c\n"
+    IDS_HEXADECIMALDIFF "kütük%d = %X\n"
+    IDS_MATCH "Kütükleri karşılaştırma bitti.\n"
+END

reactos/base/applications/cmdutils/comp/resource.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#define IDS_HELP            100
+#define IDS_INVALIDSWITCH   101
+#define IDS_BADSYNTAX       102
+#define IDS_FILEERROR       103
+#define IDS_COMPARING       104
+#define IDS_FILESIZEERROR   105
+#define IDS_SIZEDIFFERS     106
+#define IDS_READERROR       107
+#define IDS_MISMATCHLINE    108
+#define IDS_MISMATCHOFFSET  109
+#define IDS_ASCIIDIFF       110
+#define IDS_HEXADECIMALDIFF 111
+#define IDS_MATCH           112

reactos/base/applications/cmdutils/dbgprint/dbgprint.c

@@ -44,7 +44,7 @@ int _tmain(int argc, TCHAR ** argv)
 
         /* get available tests */
         strcpy(cmd, argv[2]);
-        strcat(cmd, " --list");        
+        strcat(cmd, " --list");
         pPipe = _tpopen(cmd, "r");
         if (pPipe != NULL)
         {
@@ -68,6 +68,8 @@ int _tmain(int argc, TCHAR ** argv)
                             if (nlptr2)
                                 *nlptr2 = '\0';
                             puts(psBuffer2);
+                            if (nlptr2)
+                                *nlptr2 = '\n';
                             OutputDebugStringA(psBuffer2);
                         }
                         _pclose(pPipe2);

reactos/base/applications/cmdutils/doskey/doskey.c

@@ -1,12 +1,31 @@
-#include <stdarg.h>
+#include <stdio.h>
+#include <wchar.h>
+#include <locale.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winuser.h>
 #include <wincon.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <assert.h>
-#include <locale.h>
+
+/* Console API functions which are absent from wincon.h */
+VOID
+WINAPI
+ExpungeConsoleCommandHistoryW(LPCWSTR lpExeName);
+
+DWORD
+WINAPI
+GetConsoleCommandHistoryW(LPWSTR lpHistory,
+                          DWORD cbHistory,
+                          LPCWSTR lpExeName);
+
+DWORD
+WINAPI
+GetConsoleCommandHistoryLengthW(LPCWSTR lpExeName);
+
+BOOL
+WINAPI
+SetConsoleNumberOfCommandsW(DWORD dwNumCommands,
+                            LPCWSTR lpExeName);
 
 #include "doskey.h"
 
@@ -14,19 +33,12 @@
 WCHAR szStringBuf[MAX_STRING];
 LPWSTR pszExeName = L"cmd.exe";
 
-/* Function pointers */
-typedef DWORD (WINAPI *GetConsoleCommandHistoryW_t) (LPWSTR sCommands, DWORD nBufferLength, LPWSTR sExeName);
-typedef DWORD (WINAPI *GetConsoleCommandHistoryLengthW_t) (LPWSTR sExeName);
-typedef BOOL (WINAPI *SetConsoleNumberOfCommandsW_t)(DWORD nNumber, LPWSTR sExeName);
-typedef VOID (WINAPI *ExpungeConsoleCommandHistoryW_t)(LPWSTR sExeName);
-
-GetConsoleCommandHistoryW_t pGetConsoleCommandHistoryW;
-GetConsoleCommandHistoryLengthW_t pGetConsoleCommandHistoryLengthW;
-SetConsoleNumberOfCommandsW_t pSetConsoleNumberOfCommandsW;
-ExpungeConsoleCommandHistoryW_t pExpungeConsoleCommandHistoryW;
-
 static VOID SetInsert(DWORD dwFlag)
 {
+    /*
+     * NOTE: Enabling the ENABLE_INSERT_MODE mode can also be done by calling
+     * kernel32:SetConsoleCommandHistoryMode(CONSOLE_OVERSTRIKE) .
+     */
     DWORD dwMode;
     HANDLE hConsole = GetStdHandle(STD_INPUT_HANDLE);
     GetConsoleMode(hConsole, &dwMode);
@@ -36,7 +48,7 @@ static VOID SetInsert(DWORD dwFlag)
 
 static VOID PrintHistory(VOID)
 {
-    DWORD Length = pGetConsoleCommandHistoryLengthW(pszExeName);
+    DWORD Length = GetConsoleCommandHistoryLengthW(pszExeName);
     PBYTE HistBuf;
     WCHAR *Hist;
     WCHAR *HistEnd;
@@ -48,9 +60,13 @@ static VOID PrintHistory(VOID)
     Hist = (WCHAR *)HistBuf;
     HistEnd = (WCHAR *)&HistBuf[Length];
 
-    if (pGetConsoleCommandHistoryW(Hist, Length, pszExeName))
+    if (GetConsoleCommandHistoryW(Hist, Length, pszExeName))
+    {
         for (; Hist < HistEnd; Hist += wcslen(Hist) + 1)
+        {
             wprintf(L"%s\n", Hist);
+        }
+    }
 
     HeapFree(GetProcessHeap(), 0, HistBuf);
 }
@@ -102,8 +118,12 @@ static VOID PrintMacros(LPWSTR pszExeName, LPWSTR Indent)
     AliasEnd = (WCHAR *)&AliasBuf[Length];
 
     if (GetConsoleAliasesW(Alias, Length * sizeof(BYTE), pszExeName))
+    {
         for (; Alias < AliasEnd; Alias += wcslen(Alias) + 1)
+        {
             wprintf(L"%s%s\n", Indent, Alias);
+        }
+    }
 
     HeapFree(GetProcessHeap(), 0, AliasBuf);
 }
@@ -198,23 +218,12 @@ wmain(VOID)
 {
     WCHAR *pArgStart;
     WCHAR *pArgEnd;
-    HMODULE hKernel32;
 
     setlocale(LC_ALL, "");
 
     /* Get the full command line using GetCommandLine(). We can't just use argv,
      * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */
     pArgEnd = GetCommandLineW();
-	hKernel32 = LoadLibraryW(L"kernel32.dll");
-
-	/* Get function pointers */
-	pGetConsoleCommandHistoryW = (GetConsoleCommandHistoryW_t)GetProcAddress( hKernel32,  "GetConsoleCommandHistoryW");
-	pGetConsoleCommandHistoryLengthW = (GetConsoleCommandHistoryLengthW_t)GetProcAddress( hKernel32,  "GetConsoleCommandHistoryLengthW");
-	pSetConsoleNumberOfCommandsW = (SetConsoleNumberOfCommandsW_t)GetProcAddress( hKernel32,  "SetConsoleNumberOfCommandsW");
-	pExpungeConsoleCommandHistoryW = (ExpungeConsoleCommandHistoryW_t)GetProcAddress( hKernel32,  "ExpungeConsoleCommandHistoryW");
-
-	assert(pGetConsoleCommandHistoryW && pGetConsoleCommandHistoryLengthW &&
-		pSetConsoleNumberOfCommandsW && pExpungeConsoleCommandHistoryW);
 
     /* Skip the application name */
     GetArg(&pArgStart, &pArgEnd);
@@ -242,11 +251,11 @@ wmain(VOID)
         }
         else if (!_wcsnicmp(pArgStart, L"/LISTSIZE=", 10))
         {
-            pSetConsoleNumberOfCommandsW(_wtoi(pArgStart + 10), pszExeName);
+            SetConsoleNumberOfCommandsW(_wtoi(pArgStart + 10), pszExeName);
         }
         else if (!wcsicmp(pArgStart, L"/REINSTALL"))
         {
-            pExpungeConsoleCommandHistoryW(pszExeName);
+            ExpungeConsoleCommandHistoryW(pszExeName);
         }
         else if (!wcsicmp(pArgStart, L"/INSERT"))
         {

reactos/base/applications/cmdutils/eventcreate/CMakeLists.txt

@@ -0,0 +1,12 @@
+
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
+## The message string templates are in ANSI to reduce binary size
+add_message_headers(ANSI evtmsgstr.mc)
+
+add_executable(eventcreate eventcreate.c eventcreate.rc)
+set_module_type(eventcreate win32cui UNICODE)
+add_dependencies(eventcreate evtmsgstr)
+target_link_libraries(eventcreate conutils ${PSEH_LIB})
+add_importlibs(eventcreate advapi32 msvcrt kernel32)
+add_cd_file(TARGET eventcreate DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/eventcreate/eventcreate.rc

@@ -0,0 +1,32 @@
+#include <windef.h>
+
+#include "resource.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS EventCreate Command"
+#define REACTOS_STR_INTERNAL_NAME       "eventcreate"
+#define REACTOS_STR_ORIGINAL_FILENAME   "eventcreate.exe"
+#include <reactos/version.rc>
+
+/* Message Table resource for the message string templates */
+#include <evtmsgstr.rc>
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/tr-TR.rc"
+#endif

reactos/base/applications/cmdutils/eventcreate/evtmsggen.c

@@ -0,0 +1,105 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS EventCreate Command
+ * FILE:            base/applications/cmdutils/eventcreate/evtmsggen.c
+ * PURPOSE:         Generator for the event message string templates file.
+ *                  Creates the message string file in the current directory.
+ * PROGRAMMER:      Hermes Belusca-Maito
+ *
+ * You can compile this generator:
+ *   with GCC : $ gcc -o evtmsggen.exe evtmsggen.c
+ *   with MSVC: $ cl evtmsggen.c (or: $ cl /Fe"evtmsggen.exe" evtmsggen.c)
+ */
+
+#include <stdio.h>
+
+/*
+ * Enable/disable this option to use "English" for the message table language.
+ * The default behaviour when the option is disabled selects "Neutral" language.
+ */
+// #define ENGLISH
+
+/* The default End-Of-Line control for the message file */
+#define EOL     "\r\n"
+
+
+static void usage(char* name)
+{
+    fprintf(stdout, "Usage: %s ID_min ID_max outfile.mc\n", name);
+}
+
+int main(int argc, char* argv[])
+{
+    FILE* outFile;
+    unsigned int id_min, id_max;
+    unsigned int i;
+
+    /* Validate the arguments */
+    if (argc != 4)
+    {
+        usage(argv[0]);
+        return -1;
+    }
+
+    id_min = (unsigned int)atoi(argv[1]);
+    id_max = (unsigned int)atoi(argv[2]);
+    if (id_min > id_max)
+    {
+        fprintf(stderr, "ERROR: Min ID %u cannot be strictly greater than Max ID %u !\n", id_min, id_max);
+        return -1;
+    }
+
+    /* Open the file */
+    outFile = fopen(argv[3], "wb");
+    if (!outFile)
+    {
+        fprintf(stderr, "ERROR: Could not create output file '%s'.\n", argv[3]);
+        return -1;
+    }
+
+    /* Generate the file */
+
+    /* Write the header */
+    fprintf(outFile,
+        ";/*"    EOL
+        "; * %s" EOL
+        "; * Contains event message string templates for the EventCreate Command." EOL
+        "; *"    EOL
+        "; * This file is autogenerated, do not edit." EOL
+        "; * Generated with:" EOL
+        "; *   %s %u %u %s"   EOL
+        "; */"   EOL
+        EOL
+#ifdef ENGLISH
+        "LanguageNames=(English=0x409:MSG00409)"  EOL
+#else
+        "LanguageNames=(Neutral=0x0000:MSG00000)" EOL
+#endif
+        "MessageIdTypedef=DWORD" EOL
+        EOL,
+        argv[3],
+        argv[0], id_min /* argv[1] */, id_max /* argv[2] */, argv[3]);
+
+    /* Write the message string templates */
+    for (i = id_min; i <= id_max; ++i)
+    {
+        fprintf(outFile,
+            "MessageId=0x%X"   EOL
+#ifdef ENGLISH
+            "Language=English" EOL
+#else
+            "Language=Neutral" EOL
+#endif
+            "%%1" EOL
+            "."   EOL
+            EOL,
+            i);
+    }
+
+    /* Close the file */
+    fclose(outFile);
+
+    return 0;
+}
+
+/* EOF */

reactos/base/applications/cmdutils/eventcreate/lang/en-US.rc

@@ -0,0 +1,69 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Type ""EVENTCREATE /?"" for usage information.\n"
+    IDS_HELP "\n\
+EVENTCREATE [/S computer [/U [domain\\]user [/P password]]] /ID EventID\n\
+            {[/L logname] | [/SO source]} /T type /C category /D description\n\
+\n\
+Description:\n\
+    This tool enables an administrator to create a custom event in\n\
+    a specified event log.\n\
+\n\
+Parameters:\n\
+    /S  computer          Specifies the remote computer where to connect.\n\
+\n\
+    /U  [domain\\]user     Specifies the user account under which the command\n\
+                          should execute.\n\
+\n\
+    /P  [password]        Specifies the password of the user account.\n\
+                          Prompts for input if omitted.\n\
+\n\
+    /L  logname           Specifies the name of the log where the event will be\n\
+                          created. The valid names are:\n\
+                          Application, System, Security\n\
+                          (the latter is reserved only for the SYSTEM account).\n\
+\n\
+    /SO source            Specifies the source name to use for the event\n\
+                          (if not specified, the default source name\n\
+                           will be 'eventcreate').\n\
+                          A valid source can be any string and should represent\n\
+                          the application or the component that is generating\n\
+                          the event.\n\
+\n\
+    /T  type              Specifies the type of event to create.\n\
+                          The valid types are: SUCCESS, ERROR, WARNING,\n\
+                          INFORMATION.\n\
+\n\
+    /C  category          Specifies the event category (integer) for the event.\n\
+\n\
+    /ID EventID           Specifies the event ID for the event. This must be\n\
+                          an integer between 0 and 65535.\n\
+\n\
+    /D  description       Specifies the description to use for the newly\n\
+                          created event.\n\
+\n\
+    /?                    Displays this help screen.\n\
+"
+    IDS_INVALIDSWITCH "Invalid switch - '%s'.\n"
+    IDS_BADSYNTAX_0 "Bad command line syntax.\n"
+    IDS_BADSYNTAX_1 "Bad command line syntax. The option '%s' requires a value.\n"
+    IDS_BADSYNTAX_2 "Bad command line syntax. The value for the option '%s' cannot be empty.\n"
+    IDS_BADSYNTAX_3 "Bad command line syntax. The value '%s' is not allowed for the option '%s'.\n"
+    IDS_BADSYNTAX_4 "Bad command line syntax. The value cannot be specified for the option '%s'.\n"
+    IDS_BADSYNTAX_5 "Bad command line syntax. The option '%s' is not allowed more than %lu times.\n"
+    IDS_BADSYNTAX_6 "Bad command line syntax. The mandatory option '%s' is absent.\n"
+    // IDS_BADSYNTAX_7 "Bad command line syntax. The value for the option '%s' is outside the allowed range.\n"
+    IDS_BADSYNTAX_7 "Bad command line syntax. The value for the option '%s' must be between %d and %d.\n"
+
+    IDS_LOG_NOT_FOUND "The log '%s' does not exist. Cannot create the event.\n"
+    IDS_SOURCE_NOCREATE "The new source cannot be created because the log name is not specified.\nPlease use the /L switch to specify the log name.\n"
+    IDS_SOURCE_EXISTS "The source already exists in the log '%s' and cannot be duplicated.\n"
+    IDS_SOURCE_NOT_CUSTOM "The Source parameter is used to identify the custom scripts/applications\n(not the installed applications).\n"
+
+    IDS_SUCCESS_1   "Operation successful: an event of type '%s' has been created in the log '%s'.\n"
+    IDS_SUCCESS_2   "Operation successful: an event of type '%s' has been created with the source '%s'.\n"
+    IDS_SUCCESS_3   "Operation successful: an event of type '%s' has been created\nin the log '%s' with the source '%s'.\n"
+    IDS_SWITCH_UNIMPLEMENTED "The option '%s' is not currently supported, sorry for the inconvenience!\n"
+END

reactos/base/applications/cmdutils/eventcreate/lang/fr-FR.rc

@@ -0,0 +1,70 @@
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Entrez ""EVENTCREATE /?"" pour afficher la syntaxe.\n"
+    IDS_HELP "\n\
+EVENTCREATE [/S système [/U utilisateur [/P mot_de_passe]]] /ID id_événement\n\
+            {[/L journal] | [/SO source]} /T type /C catégorie /D description\n\
+\n\
+Description :\n\
+    Cet outil permet à un administrateur de créer un événement ayant un\n\
+    message et un identificateur personnalisés dans un journal d'événements\n\
+    spécifié.\n\
+\n\
+Liste de paramètres :\n\
+    /S  système           Spécifie le système distant auquel se connecter.\n\
+\n\
+    /U  [domaine\\]utili.  Spécifie le contexte de l'utilisateur\n\
+                          sous lequel la commande doit s'exécuter.\n\
+\n\
+    /P  [mot_de_passe]    Spécifie le mot de passe du contexte\n\
+                          utilisateur donné. Il est demandé s'il est omis.\n\
+\n\
+    /L  journal           Spécifie le journal d'événement dans lequel\n\
+                          l'événementest créé. Les noms valides sont :\n\
+                          Application, System, Security\n\
+                          (le dernier est réservé seulement pour le compte\n\
+                           SYSTEM).\n\
+\n\
+    /SO source            Spécifie la source devant être utilisée pour\n\
+                          l'événement (s'il n'est pas spécifié, la valeur\n\
+                          par défaut de la source sera 'eventcreate').\n\
+                          Une source valide peut être une chaîne et doit\n\
+                          représenter l'application ou le composant qui génère\n\
+                          l'événement.\n\
+\n\
+    /T  type              Spécifie le type d'événement à créer.\n\
+                          Les types autorisés sont : SUCCESS, ERROR, WARNING,\n\
+                          INFORMATION.\n\
+\n\
+    /C  catégorie         Spécifie la catégorie de l'événement (nombre entier).\n\
+\n\
+    /ID identificateur    Spécifie l'ID de l'événement. Un identificateur\n\
+                          peut être un nombre entier compris entre 0 et 65535.\n\
+\n\
+    /D  description       Spécifie la description du nouvel événement.\n\
+\n\
+    /?                    Affiche cet écran d'aide.\n\
+"
+    IDS_INVALIDSWITCH "Option invalide - '%s'.\n"
+    IDS_BADSYNTAX_0 "Syntaxe incorrecte.\n"
+    IDS_BADSYNTAX_1 "Syntaxe incorrecte. L'option '%s' requiert une valeur.\n"
+    IDS_BADSYNTAX_2 "Syntaxe incorrecte. La valeur pour l'option '%s' ne peut pas être vide.\n"
+    IDS_BADSYNTAX_3 "Syntaxe incorrecte. La valeur '%s' n'est pas autorisée pour l'option '%s'.\n"
+    IDS_BADSYNTAX_4 "Syntaxe incorrecte. La valeur ne peut pas être spécifiée pour l'option '%s'.\n"
+    IDS_BADSYNTAX_5 "Syntaxe incorrecte. L'option '%s' n'est pas autorisée plus de %lu fois.\n"
+    IDS_BADSYNTAX_6 "Syntaxe incorrecte. L'option obligatoire '%s' est absente.\n"
+    // IDS_BADSYNTAX_7 "Syntaxe incorrecte. La valeur pour l'option '%s' est en dehors de la plage autorisée.\n"
+    IDS_BADSYNTAX_7 "Syntaxe incorrecte. La valeur pour l'option '%s' doit être comprise entre %d et %d.\n"
+
+    IDS_LOG_NOT_FOUND "Le journal '%s' n'existe pas. Impossible de créer l'événement.\n"
+    IDS_SOURCE_NOCREATE "La nouvelle source ne peut être créée car le nom du journal n'est pas spécifié.\nUtilisez le commutateur /L pour spécifier le nom du journal.\n"
+    IDS_SOURCE_EXISTS "La source existe déjà dans le journal '%s' et ne peut pas être dupliquée.\n"
+    IDS_SOURCE_NOT_CUSTOM "Le paramètre Source est utilisé pour identifier les scripts/applications\npersonnalisées (pas les applications installées).\n"
+
+    IDS_SUCCESS_1   "Opération réussie : un événement de type '%s' a été créé dans le journal '%s'.\n"
+    IDS_SUCCESS_2   "Opération réussie : un événement de type '%s' a été créé avec la source '%s'.\n"
+    IDS_SUCCESS_3   "Opération réussie : un événement de type '%s' a été créé\ndans le journal '%s' avec la source '%s'.\n"
+    IDS_SWITCH_UNIMPLEMENTED "L'option '%s' n'est pas supporté pour le moment, désolé pour le désagrément!\n"
+END

reactos/base/applications/cmdutils/eventcreate/lang/ro-RO.rc

@@ -0,0 +1,71 @@
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Tastați «EVENTCREATE /?» pentru informații de utilizare.\n"
+    IDS_HELP "\n\
+EVENTCREATE [/S calculator [/U [domeniu\\]nume [/P parolă]]]\n\
+            /ID id_eveniment {[/L nume_jurnal] | [/SO sursă]}\n\
+            /T tip /C categorie /D descriere\n\
+\n\
+Descriere:\n\
+    Acest instrument oferă unui administrator crearea unui eveniment\n\
+    particular într-un jurnal de evenimente specificat.\n\
+\n\
+Parametri:\n\
+    /S  calculator        Specifică sistemul la care se face conectarea.\n\
+\n\
+    /U  [domeniu\\]nume    Numele contului de utilizator sub care va fi\n\
+                          executată comanda.\n\
+\n\
+    /P  [parolă]          Specifică parola contului de utilizator.\n\
+                          Va fi cerută la prompt în cazul omiterii.\n\
+\n\
+    /L  nume_jurnal       Specifică numele jurnalului în care evenimentul va fi\n\
+                          creat. Numele valide sunt:\n\
+                          Application, System, Security\n\
+                          (ultimul este rezervat doar pentru contul SYSTEM).\n\
+\n\
+    /SO sursă             Specifică numele sursei utilizate pentru eveniment.\n\
+                          (Dacă nu e specificat, numele implicit al sursei va\n\
+                           fi «eventcreate».)\n\
+                          O sursă validă poate fi orice șir de caractere și ar\n\
+                          trebui să reprezinte aplicația sau evenimentul care\n\
+                          generează evenimentul.\n\
+\n\
+    /T  tip               Specifică tipul de eveniment creat.\n\
+                          Tipurile valide sunt: SUCCESS, ERROR, WARNING,\n\
+                          INFORMATION.\n\
+\n\
+    /C  categorie         Specifică categoria de eveniment (ca număr întreg).\n\
+\n\
+    /ID id_eveniment      Specifică numărul de identificare pentru eveniment.\n\
+                          Acesta trebuie să fie un număr între 0 și 65535.\n\
+\n\
+    /D  descriere         Specifică o descriere pentru evenimentul nou creat.\n\
+\n\
+    /?                    Afișează acest manual de utilizare.\n\
+"
+    IDS_INVALIDSWITCH "Parametru eronat - «%s».\n"
+    IDS_BADSYNTAX_0 "Comandă cu sintaxă eronată.\n"
+    IDS_BADSYNTAX_1 "Comandă cu sintaxă eronată. Opțiunea «%s» necesită o valoare.\n"
+    IDS_BADSYNTAX_2 "Comandă cu sintaxă eronată. Valoarea pentru opțiunea «%s» nu poate fi omisă.\n"
+    IDS_BADSYNTAX_3 "Comandă cu sintaxă eronată. Valoarea «%s» nu este permisă pentru opțiunea «%s».\n"
+    IDS_BADSYNTAX_4 "Comandă cu sintaxă eronată. Valoarea dată nu poate fi specificată pentru opțiunea «%s».\n"
+    IDS_BADSYNTAX_5 "Comandă cu sintaxă eronată. Opțiunea «%s» nu este permisă mai mult de %lu ori.\n"
+    IDS_BADSYNTAX_6 "Comandă cu sintaxă eronată. Opțiunea obligatorie «%s» a fost omisă.\n"
+    // IDS_BADSYNTAX_7 "Comandă cu sintaxă eronată. Valoarea pentru opțiunea «%s» este în afara domeniului permis.\n"
+    IDS_BADSYNTAX_7 "Comandă cu sintaxă eronată. Valoarea pentru opțiunea «%s» trebuie să fie între %d și %d.\n"
+
+    IDS_LOG_NOT_FOUND "Jurnalul «%s» nu există. Evenimentul nu poate fi creat.\n"
+    IDS_SOURCE_NOCREATE "Sursa nu poate fi creată deoarece numele de jurnal nu este specificat.\nUtilizați parametrul /L pentru a specifica un nume de jurnal.\n"
+    IDS_SOURCE_EXISTS "Sursa deja există în jurnalul «%s» și nu poate fi duplicată.\n"
+    IDS_SOURCE_NOT_CUSTOM "Parametrul de sursă este utilizat pentru a identifica scripturi/aplicații particularizate (nicidecum aplicații instalate).\n"
+
+    IDS_SUCCESS_1   "Operație realizată: un eveniment de tip «%s» a fost creat în jurnalul «%s».\n"
+    IDS_SUCCESS_2   "Operație realizată: un eveniment de tip «%s» a fost creat cu sursa «%s».\n"
+    IDS_SUCCESS_3   "Operație realizată: un eveniment de tip «%s» a fost creat în jurnalul «%s» cu sursa «%s».\n"
+    IDS_SWITCH_UNIMPLEMENTED "Opțiunea «%s» nu este acceptată deocamdată!\n"
+END

reactos/base/applications/cmdutils/eventcreate/lang/ru-RU.rc

@@ -0,0 +1,68 @@
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Введите ""EVENTCREATE /?"" для получения справки по использованию.\n"
+    IDS_HELP "\n\
+EVENTCREATE [/S система [/U [домен\\]пользователь [/P пароль]]] /ID код_события\n\
+            {[/L имя_журнала] | [/SO источник]} /T тип /C категория /D описание\n\
+\n\
+Описание:\n\
+    Эта команда позволяет администратору создать запись об особом событии \n\
+    в указанном журнале событий.\n\
+\n\
+Список параметров:\n\
+    /S  система           Определяет удаленную систему для подключения.\n\
+\n\
+    /U  [домен\\]польз.    Определяет контекст пользователя, под которым\n\
+                          выполняется данная команда.\n\
+\n\
+    /P  [пароль]          Задает пароль для данного контекста пользователя.\n\
+                          Запрашивает ввод пароля, если он не был задан.\n\
+\n\
+    /L  журнал            Журнал в котором будет создано событие.\n\
+                          Доступными именами являются:\n\
+                          Application, System, Security\n\
+                          (последний зарезервирован только для учетной записи SYSTEM).\n\
+\n\
+    /SO источник          Задает имя источника, используемого для события\n\
+                          (если не указано, то по умолчанию имя источника\n\
+                          будет 'eventcreate').\n\
+                          Допустимым источником является любая строка, представляющая\n\
+                          приложение или компонент, который генерирует\n\
+                          событие.\n\
+\n\
+    /T  тип               Тип создаваемого события.\n\
+                          Допустимыми типами являются: SUCCESS, ERROR, WARNING,\n\
+                          INFORMATION.\n\
+\n\
+    /C  категория         Определяет категорию события (число) для события.\n\
+\n\
+    /ID код_события       Код события для этого события. Допустимым кодом\n\
+                          является число в диапазоне от 0 до 65535.\n\
+\n\
+    /D  описание          Описание для создаваемого события.\n\
+\n\
+    /?                    Показать эту справку.\n\
+"
+    IDS_INVALIDSWITCH "Неправильный параметр или аргумент - '%s'.\n"
+    IDS_BADSYNTAX_0 "Синтаксическая ошибка.\n"
+    IDS_BADSYNTAX_1 "Синтаксическая ошибка. Для параметра '%s' должно быть указано значение.\n"
+    IDS_BADSYNTAX_2 "Синтаксическая ошибка. Значение опции '%s' не может быть пустым.\n"
+    IDS_BADSYNTAX_3 "Синтаксическая ошибка. Значение '%s' является недопустимым для опции '%s'.\n"
+    IDS_BADSYNTAX_4 "Синтаксическая ошибка. Для опции '%s' не может быть указано значение.\n"
+    IDS_BADSYNTAX_5 "Синтаксическая ошибка. Опция '%s' не допускается более чем %lu раз.\n"
+    IDS_BADSYNTAX_6 "Синтаксическая ошибка. Отсутствует обязательный параметр '%s'.\n"
+    // IDS_BADSYNTAX_7 "Синтаксическая ошибка. Значение для опции '%s' за пределами разрешенного диапазона.\n"
+    IDS_BADSYNTAX_7 "Синтаксическая ошибка. Значение для опции '%s' должно быть в диапазоне от %d до %d.\n"
+
+    IDS_LOG_NOT_FOUND "Журнал '%s' не существует. Не удалось создать событие.\n"
+    IDS_SOURCE_NOCREATE "Новый источник не может быть создан, поскольку имя журнала не указано.\nИспользуйте параметр /L чтобы указать имя журнала.\n"
+    IDS_SOURCE_EXISTS "Источник уже существует в журнале '%s' и не может быть продублирован.\n"
+    IDS_SOURCE_NOT_CUSTOM "Параметр Источник используется для идентификации сценариев/программ\nпользовательских приложений (не установленных приложений).\n"
+
+    IDS_SUCCESS_1   "Операция выполнена успешно: событие с типом '%s' было успешно создано в журнале '%s'.\n"
+    IDS_SUCCESS_2   "Операция выполнена успешно: событие с типом '%s' было успешно создано с источником '%s'.\n"
+    IDS_SUCCESS_3   "Операция выполнена успешно: событие с типом '%s' было успешно создано\nв журнале '%s' с источником '%s'.\n"
+    IDS_SWITCH_UNIMPLEMENTED "Опция '%s' не поддерживается, приносим извинения за возможное неудобство!\n"
+END