[0.3.16]

Disable Lautus as default theme due to major showstopper bug involving non-English languages.

svn path=/branches/ReactOS-0.3.16/; revision=61930

reactos/CMakeLists.txt

@@ -1,16 +1,11 @@
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 2.6)
 
 if(POLICY CMP0017)
     # Shadow cmake provided modules
     cmake_policy(SET CMP0017 OLD)
 endif()
 
-if(POLICY CMP0026)
-    # Allow use of the LOCATION property
-    cmake_policy(SET CMP0026 OLD)
-endif()
-
 project(REACTOS)
 
 # Versioning
@@ -30,11 +25,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 CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS")
-    set(CMAKE_DISABLE_NINJA_DEPSLOG TRUE)
-endif()
 
 if(NOT ARCH)
     set(ARCH i386)
@@ -68,9 +58,6 @@ if(NOT CMAKE_CROSSCOMPILING)
         if(ARCH STREQUAL "i386")
             add_definitions(/D_X86_ /DWIN32 /D_WINDOWS)
         endif()
-        if(MSVC_VERSION GREATER 1699)
-            add_definitions(/D_ALLOW_KEYWORD_MACROS)
-        endif()
         add_definitions(/Dinline=__inline)
     else()
         add_compile_flags("-fshort-wchar -Wno-multichar")
@@ -85,9 +72,9 @@ if(NOT CMAKE_CROSSCOMPILING)
     add_subdirectory(lib)
 
     if(NOT MSVC)
-        export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+        export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
     else()
-        export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+        export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
     endif()
 
 else()
@@ -142,12 +129,6 @@ else()
         add_definitions(-D_WINKD_=1)
     endif()
 
-    if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS")
-        set(PCH 1 CACHE BOOL "Whether to use precompiled headers")
-    else()
-        set(PCH 0 CACHE BOOL "Whether to use precompiled headers")
-    endif()
-
     # Version Options
     add_definitions(-DWINVER=0x502
                     -D_WIN32_IE=0x600
@@ -226,11 +207,7 @@ else()
     add_subdirectory(include/reactos/mc)
     add_subdirectory(include/asm)
 
-    if(NO_ROSSYM)
-        include(cmake/baseaddress_dwarf.cmake)
-    else()
-        include(cmake/baseaddress.cmake)
-    endif()
+    include(cmake/baseaddress.cmake)
 
     # For MSVC builds, this puts all debug symbols file in the same directory.
     set(CMAKE_PDB_OUTPUT_DIRECTORY "${REACTOS_BINARY_DIR}/msvc_pdb")

reactos/CREDITS

@@ -7,7 +7,7 @@ Andrew Greenwood <lists@silverblade.co.uk>
 Andrew Munger <waxdragon@gmail.com>
 Arindam Das
 Art Yerkes <ayerkes@speakeasy.net>
-Boudewijn Dekker (Ariadne)
+Ariadne
 Brandon Turner <turnerb7@msu.edu>
 Brian Palmer <brianp@sginet.com>
 Cameron M. Gutman <cgutman@reactos.org>

reactos/base/applications/CMakeLists.txt

@@ -19,11 +19,10 @@ add_subdirectory(mmc)
 add_subdirectory(mplay32)
 add_subdirectory(msconfig)
 add_subdirectory(mscutils)
-add_subdirectory(mspaint)
 add_subdirectory(mstsc)
 add_subdirectory(network)
 add_subdirectory(notepad)
-add_subdirectory(osk)
+add_subdirectory(mspaint)
 add_subdirectory(rapps)
 add_subdirectory(regedit)
 add_subdirectory(regedt32)

reactos/base/applications/atactl/CMakeLists.txt

@@ -1,8 +1,16 @@
 
 set_cpp()
+
 add_definitions(-DUSER_MODE)
 include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/ide/uniata)
 add_executable(atactl atactl.cpp atactl.rc)
 set_module_type(atactl win32cui)
 add_importlibs(atactl advapi32 msvcrt kernel32 ntdll)
+
+if(NOT MSVC)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(atactl)
+    set_source_files_properties(atactl.cpp PROPERTIES COMPILE_FLAGS "-Wno-error")
+endif()
+
 add_cd_file(TARGET atactl DESTINATION reactos/system32 FOR all)

reactos/base/applications/atactl/atactl.cpp

@@ -727,7 +727,6 @@ ata_check_unit(
                 }
                 */
 
-                addr.Length = sizeof(addr);
                 addr.PortNumber = -1;
                 addr.PathId   = inquiryData->PathId;
                 addr.TargetId = inquiryData->TargetId;
@@ -987,14 +986,12 @@ ata_adapter_info(
     h = ata_open_dev(dev_name);
     if(!h)
         return FALSE;
-    addr.Length     = sizeof(addr);
     addr.PortNumber = bus_id;
 
     len = sizeof(ADAPTERINFO)+sizeof(CHANINFO)*AHCI_MAX_PORT;
     if(!g_AdapterInfo) {
         AdapterInfo = (PADAPTERINFO)GlobalAlloc(GMEM_FIXED, len);
         if(!AdapterInfo) {
-            ata_close_dev(h);
             return FALSE;
         }
     } else {
@@ -1114,7 +1111,6 @@ ata_mode(
     h = ata_open_dev(dev_name);
     if(!h)
         return FALSE;
-    addr.Length   = sizeof(addr);
     addr.PortNumber = bus_id;
     addr.PathId   = (UCHAR)(dev_id >> 16);
     addr.TargetId = (UCHAR)(dev_id >> 8);
@@ -1159,7 +1155,6 @@ ata_reset(
     h = ata_open_dev(dev_name);
     if(!h)
         return FALSE;
-    addr.Length   = sizeof(addr);
     addr.PortNumber = bus_id;
     addr.PathId   = (UCHAR)(dev_id >> 16);
     addr.TargetId = (UCHAR)(dev_id >> 8);
@@ -1218,7 +1213,6 @@ ata_hide(
     h = ata_open_dev(dev_name);
     if(!h)
         return FALSE;
-    addr.Length   = sizeof(addr);
     addr.PortNumber = bus_id;
     addr.PathId   = (UCHAR)(dev_id >> 16);
     addr.TargetId = (UCHAR)(dev_id >> 8);
@@ -1274,7 +1268,6 @@ ata_scan(
     if((UCHAR)(dev_id) != 0xff &&
        (UCHAR)(dev_id >> 8) != 0xff) {
 
-        addr.Length   = sizeof(addr);
         addr.PortNumber = bus_id;
         addr.PathId   = (UCHAR)(dev_id >> 16);
         addr.TargetId = 0;

reactos/base/applications/cacls/cacls.c

@@ -19,11 +19,6 @@
 
 #include "precomp.h"
 
-/* command line options */
-BOOL OptionT = FALSE, OptionE = FALSE, OptionC = FALSE;
-BOOL OptionG = FALSE, OptionR = FALSE, OptionP = FALSE, OptionD = FALSE;
-LPCTSTR GUser, GPerm, RUser, PUser, PPerm, DUser;
-
 static GENERIC_MAPPING FileGenericMapping =
 {
     FILE_GENERIC_READ,
@@ -517,500 +512,92 @@ PrintSpecialAccess:
     return Ret;
 }
 
-/* add a backslash at end to a path string if necessary */
-static VOID
-AddBackslash(LPTSTR FilePath)
-{
-    INT len = lstrlen(FilePath);
-    LPTSTR pch = CharPrev(FilePath, FilePath + len);
-    if (*pch != _T('\\'))
-        lstrcat(pch, _T("\\"));
-}
-
-static BOOL
-GetPathOfFile(LPTSTR FilePath, LPCTSTR pszFiles)
-{
-    TCHAR FullPath[MAX_PATH];
-    LPTSTR pch;
-    DWORD attrs;
-
-    lstrcpyn(FilePath, pszFiles, MAX_PATH);
-    pch = _tcsrchr(FilePath, _T('\\'));
-    if (pch != NULL)
-    {
-        *pch = 0;
-        if (!GetFullPathName(FilePath, MAX_PATH, FullPath, NULL))
-        {
-            PrintErrorMessage(GetLastError());
-            return FALSE;
-        }
-        lstrcpyn(FilePath, FullPath, MAX_PATH);
-
-        attrs = GetFileAttributes(FilePath);
-        if (attrs == 0xFFFFFFFF || !(attrs & FILE_ATTRIBUTE_DIRECTORY))
-        {
-            PrintErrorMessage(ERROR_DIRECTORY);
-            return FALSE;
-        }
-    }
-    else
-        GetCurrentDirectory(MAX_PATH, FilePath);
-
-    AddBackslash(FilePath);
-    return TRUE;
-}
-
-static BOOL
-PrintDaclsOfFiles(LPCTSTR pszFiles)
-{
-    TCHAR FilePath[MAX_PATH];
-    WIN32_FIND_DATA FindData;
-    HANDLE hFind;
-    DWORD LastError;
-
-    /*
-     * get the file path
-     */
-    if (!GetPathOfFile(FilePath, pszFiles))
-        return FALSE;
-
-    /*
-     * search for the files
-     */
-    hFind = FindFirstFile(pszFiles, &FindData);
-    if (hFind == INVALID_HANDLE_VALUE)
-        return FALSE;
-
-    do
-    {
-        if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-            continue;
-
-        if (!PrintFileDacl(FilePath, FindData.cFileName))
-        {
-            LastError = GetLastError();
-            if (LastError == ERROR_ACCESS_DENIED)
-            {
-                PrintErrorMessage(LastError);
-                if (!OptionC)
-                {
-                    FindClose(hFind);
-                    return FALSE;
-                }
-            }
-            else
-                break;
-        }
-        else
-            _tprintf(_T("\n"));
-    } while(FindNextFile(hFind, &FindData));
-    LastError = GetLastError();
-    FindClose(hFind);
-
-    if (LastError != ERROR_NO_MORE_FILES)
-    {
-        PrintErrorMessage(LastError);
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-static BOOL
-GrantUserAccessRights(LPCTSTR FilePath, LPCTSTR File, LPCTSTR User, TCHAR Perm)
-{
-    /* TODO & FIXME */
-    switch(Perm)
-    {
-        case _T('R'): // Read
-            break;
-        case _T('W'): // Write
-            break;
-        case _T('C'): // Change (write)
-            break;
-        case _T('F'): // Full control
-            break;
-        default:
-            break;
-    }
-    return FALSE;
-}
-
-static BOOL
-ReplaceUserAccessRights(
-    LPCTSTR FilePath,
-    LPCTSTR File,
-    LPCTSTR User,
-    TCHAR Perm)
-{
-    /* TODO & FIXME */
-    switch(Perm)
-    {
-        case _T('N'): // None
-            break;
-        case _T('R'): // Read
-            break;
-        case _T('W'): // Write
-            break;
-        case _T('C'): // Change (write)
-            break;
-        case _T('F'): // Full control
-            break;
-        default:
-            break;
-    }
-    return FALSE;
-}
-
-static BOOL
-EditUserAccessRights(
-    LPCTSTR FilePath,
-    LPCTSTR File,
-    LPCTSTR User,
-    TCHAR Perm)
-{
-    /* TODO & FIXME */
-    switch(Perm)
-    {
-        case _T('N'): // None
-            break;
-        case _T('R'): // Read
-            break;
-        case _T('W'): // Write
-            break;
-        case _T('C'): // Change (write)
-            break;
-        case _T('F'): // Full control
-            break;
-        default:
-            break;
-    }
-    return FALSE;
-}
-
-static BOOL
-DenyUserAccess(LPCTSTR FilePath, LPCTSTR File, LPCTSTR User)
-{
-    /* TODO & FIXME */
-    return FALSE;
-}
-
-static BOOL
-RevokeUserAccessRights(LPCTSTR FilePath, LPCTSTR File, LPCTSTR User)
-{
-    /* TODO & FIXME */
-    return FALSE;
-}
-
-static BOOL
-ChangeFileACL(LPCTSTR FilePath, LPCTSTR File)
-{
-    if (OptionG)
-    {
-        /* Grant specified user access rights. */
-        GrantUserAccessRights(FilePath, File, GUser, *GPerm);
-    }
-
-    if (OptionP)
-    {
-        if (!OptionE)
-        {
-            /* Replace specified user's access rights. */
-            ReplaceUserAccessRights(FilePath, File, PUser, *PPerm);
-        }
-        else
-        {
-            /* Edit ACL instead of replacing it. */
-            EditUserAccessRights(FilePath, File, PUser, *PPerm);
-        }
-    }
-
-    if (OptionD)
-    {
-        /* Deny specified user access. */
-        DenyUserAccess(FilePath, File, DUser);
-    }
-
-    if (OptionR)
-    {
-        /* Revoke specified user's access rights. */
-        RevokeUserAccessRights(FilePath, File, RUser);
-    }
-
-    return TRUE;
-}
-
-static BOOL
-ChangeACLsOfFiles(LPCTSTR pszFiles)
-{
-    TCHAR FilePath[MAX_PATH];
-    HANDLE hFind;
-    WIN32_FIND_DATA FindData;
-    DWORD LastError;
-
-    /*
-     * get the file path
-     */
-    if (!GetPathOfFile(FilePath, pszFiles))
-        return FALSE;
-
-    /*
-     * search for files in current directory
-     */
-    hFind = FindFirstFile(pszFiles, &FindData);
-    if (hFind == INVALID_HANDLE_VALUE)
-        return FALSE;
-
-    do
-    {
-        if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-            continue;
-
-        if (!ChangeFileACL(FilePath, FindData.cFileName))
-        {
-            LastError = GetLastError();
-            if (LastError == ERROR_ACCESS_DENIED)
-            {
-                PrintErrorMessage(LastError);
-                if (!OptionC)
-                {
-                    FindClose(hFind);
-                    return FALSE;
-                }
-            }
-            else
-                break;
-        }
-    } while(FindNextFile(hFind, &FindData));
-
-    LastError = GetLastError();
-    FindClose(hFind);
-
-    if (LastError != ERROR_NO_MORE_FILES)
-    {
-        PrintErrorMessage(LastError);
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-static BOOL
-ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
-{
-    HANDLE hFind;
-    WIN32_FIND_DATA FindData;
-    TCHAR szCurDir[MAX_PATH];
-    DWORD LastError;
-
-    /*
-     * get the file path (current directory)
-     */
-    GetCurrentDirectory(MAX_PATH, szCurDir);
-    AddBackslash(szCurDir);
-
-    /*
-     * search for files in current directory
-     */
-    hFind = FindFirstFile(pszFiles, &FindData);
-    if (hFind == INVALID_HANDLE_VALUE)
-        return FALSE;
-
-    do
-    {
-        if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-            continue;
-
-        if (!ChangeFileACL(szCurDir, FindData.cFileName))
-        {
-            LastError = GetLastError();
-            if (LastError == ERROR_ACCESS_DENIED)
-            {
-                PrintErrorMessage(LastError);
-                if (!OptionC)
-                {
-                    FindClose(hFind);
-                    return FALSE;
-                }
-            }
-            else
-                break;
-        }
-    } while(FindNextFile(hFind, &FindData));
-
-    LastError = GetLastError();
-    FindClose(hFind);
-
-    if (LastError != ERROR_NO_MORE_FILES)
-    {
-        PrintErrorMessage(LastError);
-        return FALSE;
-    }
-
-    /*
-     * search for subdirectory in current directory
-     */
-    hFind = FindFirstFile(_T("*"), &FindData);
-    if (hFind == INVALID_HANDLE_VALUE)
-        return FALSE;
-    do
-    {
-        if (_tcscmp(FindData.cFileName, _T(".")) == 0 ||
-            _tcscmp(FindData.cFileName, _T("..")) == 0)
-            continue;
-
-        if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-        {
-            GetCurrentDirectory(MAX_PATH, szCurDir);
-            if (SetCurrentDirectory(FindData.cFileName))
-            {
-                ChangeACLsOfFilesInCurDir(pszFiles);
-                SetCurrentDirectory(szCurDir);
-            }
-            else
-            {
-                LastError = GetLastError();
-                if (LastError == ERROR_ACCESS_DENIED)
-                {
-                    PrintErrorMessage(LastError);
-                    if (!OptionC)
-                    {
-                        FindClose(hFind);
-                        return FALSE;
-                    }
-                }
-                else
-                    break;
-            }
-        }
-    } while(FindNextFile(hFind, &FindData));
-    LastError = GetLastError();
-    FindClose(hFind);
-
-    if (LastError != ERROR_NO_MORE_FILES)
-    {
-        PrintErrorMessage(LastError);
-        return FALSE;
-    }
-    return TRUE;
-}
 
 int
 __cdecl
 _tmain(int argc, const TCHAR *argv[])
 {
-    INT i;
-    LPTSTR pch;
-    BOOL InvalidParameter = FALSE;
-
-    if (argc <= 1)
+    if (argc < 2)
     {
-        PrintHelp();
-        return 0;
-    }
-
-    /*
-     * parse command line options
-     */
-    for (i = 2; i < argc; i++)
-    {
-        if (lstrcmpi(argv[i], _T("/T")) == 0)
-        {
-            OptionT = TRUE;
-        }
-        else if (lstrcmpi(argv[i], _T("/E")) == 0)
-        {
-            OptionE = TRUE;
-        }
-        else if (lstrcmpi(argv[i], _T("/C")) == 0)
-        {
-            OptionC = TRUE;
-        }
-        else if (lstrcmpi(argv[i], _T("/G")) == 0)
-        {
-            if (i + 1 < argc)
-            {
-                pch = _tcschr(argv[++i], _T(':'));
-                if (pch != NULL)
-                {
-                    OptionG = TRUE;
-                    *pch = 0;
-                    GUser = argv[i];
-                    GPerm = pch + 1;
-                    continue;
-                }
-            }
-            InvalidParameter = TRUE;
-            break;
-        }
-        else if (lstrcmpi(argv[i], _T("/R")) == 0)
-        {
-            if (i + 1 < argc)
-            {
-                RUser = argv[++i];
-                OptionR = TRUE;
-                continue;
-            }
-            InvalidParameter = TRUE;
-            break;
-        }
-        else if (lstrcmpi(argv[i], _T("/P")) == 0)
-        {
-            if (i + 1 < argc)
-            {
-                pch = _tcschr(argv[++i], _T(':'));
-                if (pch != NULL)
-                {
-                    OptionP = TRUE;
-                    *pch = 0;
-                    PUser = argv[i];
-                    PPerm = pch + 1;
-                    continue;
-                }
-            }
-            InvalidParameter = TRUE;
-            break;
-        }
-        else if (lstrcmpi(argv[i], _T("/D")) == 0)
-        {
-            if (i + 1 < argc)
-            {
-                OptionD = TRUE;
-                DUser = argv[++i];
-                continue;
-            }
-            InvalidParameter = TRUE;
-            break;
-        }
-        else
-        {
-            InvalidParameter = TRUE;
-            break;
-        }
-    }
-
-    if (InvalidParameter)
-    {
-        PrintErrorMessage(ERROR_INVALID_PARAMETER);
         PrintHelp();
         return 1;
     }
-
-    /* /R is only valid with /E */
-    if (OptionR && !OptionE)
-    {
-        OptionR = FALSE;
-    }
-
-    PrintDaclsOfFiles(argv[1]);
-
-    if (OptionT)
-    {
-        ChangeACLsOfFilesInCurDir(argv[1]);
-    }
     else
     {
-        ChangeACLsOfFiles(argv[1]);
+        TCHAR FullPath[MAX_PATH + 1];
+        TCHAR *FilePart = NULL;
+        WIN32_FIND_DATA FindData;
+        HANDLE hFind;
+        DWORD LastError;
+
+        if (argc > 2)
+        {
+            /* FIXME - parse arguments */
+        }
+
+        /* get the full path of where we're searching in */
+        if (GetFullPathName(argv[1],
+                            sizeof(FullPath) / sizeof(FullPath[0]),
+                            FullPath,
+                            &FilePart) != 0)
+        {
+            if (FilePart != NULL)
+                *FilePart = _T('\0');
+        }
+        else
+            goto Error;
+
+        /* find the file(s) */
+        hFind = FindFirstFile(argv[1],
+                              &FindData);
+        if (hFind != INVALID_HANDLE_VALUE)
+        {
+            do
+            {
+                if (!(FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ||
+                    (_tcscmp(FindData.cFileName,
+                             _T(".")) &&
+                     _tcscmp(FindData.cFileName,
+                             _T(".."))))
+                {
+                    if (argc > 2)
+                    {
+                        /* FIXME - edit or replace the descriptor */
+                    }
+                    else
+                    {
+                        if (!PrintFileDacl(FullPath,
+                                           FindData.cFileName))
+                        {
+                            LastError = GetLastError();
+
+                            if (LastError == ERROR_ACCESS_DENIED)
+                            {
+                                PrintErrorMessage(LastError);
+                            }
+                            else
+                                break;
+                        }
+                        else
+                            _tprintf(_T("\n"));
+                    }
+                }
+            } while (FindNextFile(hFind,
+                                  &FindData));
+
+            FindClose(hFind);
+
+            if (GetLastError() != ERROR_NO_MORE_FILES)
+            {
+                goto Error;
+            }
+        }
+        else
+        {
+Error:
+            PrintErrorMessage(GetLastError());
+            return 1;
+        }
     }
 
     return 0;

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

@@ -1,40 +1,37 @@
-/* Spanish Language resource file.
- * Translated by: ?? and Ismael Ferreras Morezuelas <2014-11-07> */
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_HELP "Muestra o modifica listas de control de acceso (ACL) de archivos\n\n\
+    IDS_HELP "Muestra o modifica la lista de control de accesos (ACLs) de los archivos\n\n\
 CACLS archivo  [/T] [/E] [/C] [/G user:perm [...]] [/R usuario [...]]\n\
                [/P user:perm [...]] [/D usuario [...]]\n\
-   archivo       Mostrar ACL.\n\
-   /T            Cambia ACL de los archivos especificados en\n\
+   archivo       Mostrar ACLs.\n\
+   /T            Cambia ACLs de los archivos especificados en\n\
                  el directorio actual y todos sus subdirectorios.\n\
    /E            Edita la ACL en lugar de reemplazarla.\n\
    /C            Continúa en caso de errores de acceso.\n\
    /G user:perm  Da los derechos de acceso al usuario especificado.\n\
-                 Perm puede ser: R  Leer\n\
-                                 W  Escribir\n\
-                                 C  Cambiar (escribir)\n\
+                 Perm puede ser: R  Lectura\n\
+                                 W  Escritura\n\
+                                 C  Modificación (Escritura)\n\
                                  F  Control total\n\
    /R usuario    Revoca los derechos de acceso al usuario especificado (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\
-                                 W  Escribir\n\
-                                 C  Cambiar (escribir)\n\
+                 Perm puede ser: N  Nada\n\
+                                 R  Lectura\n\
+                                 W  Escritura\n\
+                                 C  Modificación (Escritura)\n\
                                  F  Control total\n\
    /D usuario    Revoca el acceso al usuario especificado.\n\
 Es posible usar comodines para especificar más de un archivo por comando.\n\
 Se puede especificar más de un usuario por comando.\n\n\
-Abreviaturas:\n\
+Abreviaciones:\n\
    CI - Herencia del contenedor.\n\
-        ACE se heredará por directorios.\n\
+        ACE será heredado a los directorios.\n\
    OI - Herencia del objeto.\n\
-        ACE se heredará por archivos.\n\
-   IO - Sólo heredar.\n\
-        ACE no se aplicará al archivo o directorio actual.\n"
+        ACE sera heredado a los archivos.\n\
+   IO - Herencia sola.\n\
+        ACE no se aplicará al archivo/directorio actual.\n"
     IDS_ABBR_CI "(CI)"
     IDS_ABBR_OI "(OI)"
     IDS_ABBR_IO "(IO)"

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

@@ -2,7 +2,7 @@
  *    Translated by TestamenT
  *    testament@users.sourceforge.net
  *    https://sourceforge.net/projects/reactospl
- *    Updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (May, 2014)
+ *    Updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
  *    UTF-8 conversion by Caemyr (May, 2011)
  */
 
@@ -51,8 +51,8 @@ Skróty:\n\
     IDS_ABBR_CHANGE "C"
     IDS_ABBR_NONE "N"
     IDS_ALLOW ""
-    IDS_DENY "(ODMÓW)"
-    IDS_SPECIAL_ACCESS "(dostęp specjalny:)"
+    IDS_DENY "(DENY)"
+    IDS_SPECIAL_ACCESS "(special access:)"
     IDS_GENERIC_READ "GENERIC_READ"
     IDS_GENERIC_WRITE "GENERIC_WRITE"
     IDS_GENERIC_EXECUTE "GENERIC_EXECUTE"

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

@@ -1,39 +1,38 @@
-/* Russian language resource file by Kudratov Olimjon (olim98@bk.ru) */
-
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_HELP "Просмотр и изменение списков управления доступом (Access Control List, ACL) к файлам\n\n\
-CACLS имя_файла [/T] [/E] [/C] [/G имя:доступ [...]] [/R имя [...]]\n\
-               [/P имя:доступ [...]] [/D имя [...]]\n\
-   имя_файла     Просмотр списков управления доступом.\n\
-   /T            Изменение списков управления доступом для указанных файлов\n\
-                 в текущем и вложенных каталогах.\n\
-   /E            Изменение списка управления доступом вместо его замены.\n\
-   /C            Продолжение при ошибках отказа в доступе.\n\
-   /G имя:доступ Разрешения для указанных пользователей.\n\
-                 Доступ: R  чтение\n\
-                         W  запись\n\
-                         C  изменение (запись)\n\
-                         F  полный доступ\n\
-   /R имя        Отзыв разрешений для пользователя (только вместе с /E).\n\
-   /P имя:доступ Замена разрешений указанного пользователя.\n\
-                 Доступ: N  нет доступа\n\
-                         R  чтение\n\
-                         W  запись\n\
-                         C  изменение (запись)\n\
-                         F  полный доступ\n\
-   /D имя        Запрет доступа для указанного пользователя.\n\
-Для выбора нескольких файлов используются подстановочные знаки.\n\
+    IDS_HELP "Отображает или изменяет списки доступа (ACLs) к файлам\n\n\
+CACLS имя_Файла [/T] [/E] [/C] [/G имя:право [...]] [/R имя [...]]\n\
+               [/P имя:право[...]] [/D имя [...]]\n\
+   имя_файла     Вывод списков ACL.\n\
+   /T            Замена списков ACL для указанных файлов в текущем каталоге\n\
+                 и всех подкаталогах.\n\
+   /E            Редактирование списка ACL вместо его замены.\n\
+   /C            Продолжать при ошибках отказа доступа.\n\
+   /G имя:право  Предоставление указанному пользователю прав доступа.\n\
+                 Право может быть: R  Чтение\n\
+                                   W  Запись\n\
+                                   C  Изменение (запись)\n\
+                                   F  Полный контроль\n\
+   /R имя        Отозвать права доступа для указанного пользователя\n\
+                 (верно только с /E).\n\
+   /P имя:право  Заменить права указанного пользователя.\n\
+                 Право может быть: N  Нет доступа\n\
+                                   R  Чтение\n\
+                                   W  Запись\n\
+                                   C  Изменение (запись)\n\
+                                   F  Полный доступ\n\
+   /D имя        Запретить доступ для указанного пользователя.\n\
+В команде можно использовать шаблоны для обработки более одного файла.\n\
 В команде можно указывать более одного пользователя.\n\n\
 Сокращения:\n\
-   CI - наследование контейнерами.\n\
-        ACE наследуется каталогами.\n\
-   OI - наследование объектами.\n\
-        ACE наследуется файлами.\n\
-   IO - только наследование.\n\
-        ACE не применяется к текущему файлу или каталогу.\n"
+   CI - Наследование контейнерами.\n\
+        ACE будет унаследован папками.\n\
+   OI - Наследование объектами.\n\
+        ACE будет унаследован файлами.\n\
+   IO - Только наследованное.\n\
+        ACE не будет применён к данному файлу/папке.\n"
     IDS_ABBR_CI "(CI)"
     IDS_ABBR_OI "(OI)"
     IDS_ABBR_IO "(IO)"

reactos/base/applications/calc/CMakeLists.txt

@@ -1,24 +1,19 @@
 
 add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
 
-list(APPEND SOURCE
+add_executable(calc 
     about.c
     convert.c
     function.c
     rpn.c
     utl.c
     winmain.c
-    calc.h)
+    resource.rc)
 
-add_executable(calc ${SOURCE} resource.rc)
 set_module_type(calc win32gui UNICODE)
 add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32)
-
-if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    target_link_libraries(calc mingwex)
-elseif(MSVC)
+if(MSVC)
     add_importlibs(calc ntdll)
 endif()
-
-add_pch(calc calc.h SOURCE)
+add_pch(calc calc.h)
 add_cd_file(TARGET calc DESTINATION reactos/system32 FOR all)

reactos/base/applications/calc/calc.h

@@ -1,6 +1,3 @@
-#ifndef _CALC_H
-#define _CALC_H
-
 #include <stdarg.h>
 #include <windef.h>
 #include <winuser.h>
@@ -228,5 +225,3 @@ INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
 void ConvExecute(HWND hWnd);
 void ConvAdjust(HWND hWnd, int n_cat);
 void ConvInit(HWND hWnd);
-
-#endif /* _CALC_H */

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

@@ -336,8 +336,8 @@ BEGIN
     END
     POPUP "Изглед"
     BEGIN
-        MENUITEM "Обикновен", IDM_VIEW_STANDARD
-        MENUITEM "Научен", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Обикновен", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Научен", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Преобразуване", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Шестнaдесетичен\tF5", IDM_VIEW_HEX, CHECKED
@@ -368,8 +368,8 @@ BEGIN
     END
     POPUP "Изглед"
     BEGIN
-        MENUITEM "Стандартно", IDM_VIEW_STANDARD
-        MENUITEM "Научен", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Стандартно", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Научен", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Преобразуване", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Шестнaдесетичен\tF5", IDM_VIEW_HEX, CHECKED
@@ -401,8 +401,8 @@ BEGIN
     END
     POPUP "Изглед"
     BEGIN
-        MENUITEM "Стандартно", IDM_VIEW_STANDARD
-        MENUITEM "Научен", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Стандартно", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Научен", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Преобразуване", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Разделяне на хилядите", IDM_VIEW_GROUP, CHECKED

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

@@ -335,8 +335,8 @@ BEGIN
     END
     POPUP "Zobrazit"
     BEGIN
-        MENUITEM "Standardní", IDM_VIEW_STANDARD
-        MENUITEM "Vědecká", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standardní", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vědecká", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Převody", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Šestnáctkově\tF5", IDM_VIEW_HEX, CHECKED
@@ -367,8 +367,8 @@ BEGIN
     END
     POPUP "Zobrazit"
     BEGIN
-        MENUITEM "Standardní", IDM_VIEW_STANDARD
-        MENUITEM "Vědecká", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standardní", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vědecká", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Převody", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Šestnáctkově\tF5", IDM_VIEW_HEX, CHECKED
@@ -400,8 +400,8 @@ BEGIN
     END
     POPUP "Zobrazit"
     BEGIN
-        MENUITEM "Standardní", IDM_VIEW_STANDARD
-        MENUITEM "Vědecká", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standardní", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vědecká", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Převody", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Seskupování číslic", IDM_VIEW_GROUP, CHECKED

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "Ansicht"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Konversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "Ansicht"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Konversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "Ansicht"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Konversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Τυπική", IDM_VIEW_STANDARD
-        MENUITEM "Επιστημονική", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Τυπική", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Επιστημονική", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Μετατροπή", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Τυπική", IDM_VIEW_STANDARD
-        MENUITEM "Επιστημονική", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Τυπική", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Επιστημονική", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Μετατροπή", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Δεκαεξαδικό\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Τυπική", IDM_VIEW_STANDARD
-        MENUITEM "Επιστημονική", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Τυπική", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Επιστημονική", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Μετατροπή", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Ομαδοποίηση ψηφίων", IDM_VIEW_GROUP, CHECKED

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Group digits", IDM_VIEW_GROUP, CHECKED

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

@@ -1,7 +1,6 @@
 /*
  * Spanish Language resource file
  * Traducido por: Javier Remacha 2008
- * Corregido por: Ismael Ferreras Morezuelas 2014
  */
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
@@ -10,7 +9,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora de ReactOS"
+CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -21,7 +20,7 @@ BEGIN
     CONTROL "Bin", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
     GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
     CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
-    CONTROL "Hipotenusa", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 37, 41, 48, 10
+    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
     CTEXT "", IDC_TEXT_PARENT, 93, 38, 18, 16, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
     CTEXT "", IDC_TEXT_MEMORY, 126, 38, 18, 16, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
     PUSHBUTTON "Sta", IDC_BUTTON_STA, 5, 60, 24, 18, BS_CENTER | BS_VCENTER |
@@ -143,14 +142,14 @@ BEGIN
             NOT WS_VISIBLE, 230, 21, 38, 10
     CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
             NOT WS_VISIBLE, 270, 21, 38, 10
-    CONTROL "Grados", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 151, 21, 45, 10
-    CONTROL "Radianes", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 198, 21, 45, 10
-    CONTROL "Gradianes", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 248, 21, 45, 10
+    CONTROL "Sexagesimal", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radián", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Centesimal", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
     PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Atrás", IDC_BUTTON_BACK, 177, 38, 43, 18, BS_CENTER |
+    PUSHBUTTON "Back", IDC_BUTTON_BACK, 177, 38, 43, 18, BS_CENTER |
                BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 305, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
@@ -158,7 +157,7 @@ END
 
 IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora de ReactOS"
+CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -223,7 +222,7 @@ END
 
 IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora de ReactOS"
+CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -241,7 +240,7 @@ BEGIN
             BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 276, 24, 40, 17
     CONTROL "CE", IDC_BUTTON_CE, "Button", BS_OWNERDRAW | BS_CENTER |
             BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 232, 24, 40, 17
-    CONTROL "Atrás", IDC_BUTTON_BACK, "Button", BS_OWNERDRAW | BS_CENTER |
+    CONTROL "Back", IDC_BUTTON_BACK, "Button", BS_OWNERDRAW | BS_CENTER |
             BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 24, 40,17
     RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 312, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
     CONTROL "7", IDC_BUTTON_7, "Button", BS_OWNERDRAW | BS_CENTER |
@@ -298,15 +297,15 @@ 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"
+CAPTION "Acerca de Calculadora 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 "Calculadora 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
+    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
@@ -336,8 +335,8 @@ BEGIN
     END
     POPUP "Ver"
     BEGIN
-        MENUITEM "Estándar", IDM_VIEW_STANDARD
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Estándar", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversión", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -345,17 +344,17 @@ BEGIN
         MENUITEM "Octal\tF7", IDM_VIEW_OCT, CHECKED
         MENUITEM "Binario\tF8", IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Grados\tF2", IDM_VIEW_DEG, CHECKED
-        MENUITEM "Radianes\tF3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "Gradianes\tF4", IDM_VIEW_GRAD, CHECKED
+        MENUITEM "Sexagesimal\tF2", IDM_VIEW_DEG, CHECKED
+        MENUITEM "Radián\tF3", IDM_VIEW_RAD, CHECKED
+        MENUITEM "Centesimal\tF4", IDM_VIEW_GRAD, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Agrupar dígitos", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Número de dígitos en grupo", IDM_VIEW_GROUP, CHECKED
     END
     POPUP "Ayuda"
     BEGIN
         MENUITEM "Temas de ayuda", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Acerca de la Calculadora de ReactOS", IDM_HELP_ABOUT
+        MENUITEM "Acerca de Calculadora ReactOS", IDM_HELP_ABOUT
     END
 END
 
@@ -368,8 +367,8 @@ BEGIN
     END
     POPUP "Ver"
     BEGIN
-        MENUITEM "Estándar", IDM_VIEW_STANDARD
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Estándar", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversión", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -382,13 +381,13 @@ BEGIN
         MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED
         MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Agrupar dígitos", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Número de dígitos en grupo", IDM_VIEW_GROUP, CHECKED
     END
     POPUP "Ayuda"
     BEGIN
         MENUITEM "Temas de ayuda", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Acerca de la Calculadora de ReactOS", IDM_HELP_ABOUT
+        MENUITEM "Acerca de Calculadora ReactOS", IDM_HELP_ABOUT
     END
 END
 
@@ -401,17 +400,17 @@ BEGIN
     END
     POPUP "Ver"
     BEGIN
-        MENUITEM "Estándar", IDM_VIEW_STANDARD
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Estándar", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversión", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "Agrupar dígitos", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Número de dígitos en grupo", IDM_VIEW_GROUP, CHECKED
     END
     POPUP "Ayuda"
     BEGIN
         MENUITEM "Temas de ayuda", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Acerca de la Calculadora de ReactOS", IDM_HELP_ABOUT
+        MENUITEM "Acerca de Calculadora ReactOS", IDM_HELP_ABOUT
     END
 END
 
@@ -419,14 +418,7 @@ 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_STRING_LICENSE "Calculadora ReactOS es software gratuito realizado bajo licencia GNU GPL.\r\n\r\nPuedes coger una copia de la licencia GNU GPL aquí:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nPuedes también coger una traducción de la licencia GNU GPL aquí:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Error"
     IDS_QUICKHELP "Ayuda rápida"
 END
@@ -452,9 +444,9 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
-    IDS_ANGLE_DEGREES  "Grados"
-    IDS_ANGLE_GRADIANS "Gradianes"
-    IDS_ANGLE_RADIANS  "Radianes"
+    IDS_ANGLE_DEGREES "Grados sexagesimales"
+    IDS_ANGLE_GRADIANS "Grados centesimales"
+    IDS_ANGLE_RADIANS "Radianes"
 END
 
 /* Areas */
@@ -464,7 +456,7 @@ BEGIN
     IDS_AREA_ACRES_BRAZIL "Acres (Brasil)"
     IDS_AREA_ACRES_FRANCE "Acres (Francia)"
     IDS_AREA_ACRES_SCOTS "Acres (Escocia)"
-    IDS_AREA_ACRES_US "Acres (EE.UU.)"
+    IDS_AREA_ACRES_US "Acres (US)"
     IDS_AREA_ARES "Área"
     IDS_AREA_CHOU "Chou"
     IDS_AREA_DANBO "Danbo"
@@ -488,10 +480,10 @@ BEGIN
     IDS_AREA_SQUARE_METER "Metros cuadrado"
     IDS_AREA_SQUARE_MILES "Millas cuadradas"
     IDS_AREA_SQUARE_MILLIMETERS "Milímetros cuadrados"
-    IDS_AREA_SQUARE_SHAKU "Shaku cuadrado"
-    IDS_AREA_SQUARE_TSUEN "Tsuen cuadrados"
-    IDS_AREA_SQUARE_VA "Va cuadrados" /* ??? (unused in the source code) */
-    IDS_AREA_SQUARE_YARD "Yarda cuadrada"
+    IDS_AREA_SQUARE_SHAKU "Square shaku"
+    IDS_AREA_SQUARE_TSUEN "Square tsuen"
+    IDS_AREA_SQUARE_VA "Square va"
+    IDS_AREA_SQUARE_YARD "Square yard"
     IDS_AREA_TAN "Tan"
     IDS_AREA_TSUBO "Tsubo"
 END
@@ -499,48 +491,48 @@ END
 /* Consumptions */
 STRINGTABLE
 BEGIN
-    IDS_CONSUMPTION_KM_PER_L "Kilómetros/litro"
-    IDS_CONSUMPTION_L_PER_100_KM "Litros/100 kilómetros"
+    IDS_CONSUMPTION_KM_PER_L "Kilometros/litro"
+    IDS_CONSUMPTION_L_PER_100_KM "Litros/100 kilometros"
     IDS_CONSUMPTION_MILES_GALLON_UK "Millas/galón (UK)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Millas/galón (EE.UU.)"
+    IDS_CONSUMPTION_MILES_GALLON_US "Millas/galón (US)"
 END
 
 /* Currencies */
 STRINGTABLE
 BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Schilling austriaco"
-    IDS_CURRENCY_BELGIAN_FRANC "Franco belga"
-    IDS_CURRENCY_CYPRIOT_POUND "Libra chipriota"
-    IDS_CURRENCY_CZECH_KORUNA "Corona checa"
-    IDS_CURRENCY_DEUTSCHE_MARK "Marco alemán"
-    IDS_CURRENCY_DUTCH_GUILDER "Florín neerlandés"
+    IDS_CURRENCY_AUSTRIAN_SCHILLING "Schilling Austriaco"
+    IDS_CURRENCY_BELGIAN_FRANC "Franco Belga"
+    IDS_CURRENCY_CYPRIOT_POUND "Libra Chipriota"
+    IDS_CURRENCY_CZECH_KORUNA "Corona Checa"
+    IDS_CURRENCY_DEUTSCHE_MARK "Marco Alemán"
+    IDS_CURRENCY_DUTCH_GUILDER "Florín Neerlandés"
     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_LUXEMBOURG_FRANC "Franco luxemburgués"
-    IDS_CURRENCY_MALTESE_LIRA "Lira maltesa"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portugués"
-    IDS_CURRENCY_SLOVAK_KORUNA "Corona eslovaca"
-    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar esloveno"
-    IDS_CURRENCY_SPANISH_PESETA "Peseta española"
+    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_LUXEMBOURG_FRANC "Franco Luxemburgués"
+    IDS_CURRENCY_MALTESE_LIRA "Lira Maltesa"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo Portugués"
+    IDS_CURRENCY_SLOVAK_KORUNA "Corona Eslovaca"
+    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar Esloveno"
+    IDS_CURRENCY_SPANISH_PESETA "Peseta Española"
 END
 
 /* Energies */
 STRINGTABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES "Calorías a 15°C"
+    IDS_ENERGY_15_C_CALORIES "15 °C calorías"
     IDS_ENERGY_BTUS "BTU"
     IDS_ENERGY_ERGS "Ergios"
-    IDS_ENERGY_EVS "Electronvoltio"
+    IDS_ENERGY_EVS "Electronovoltios"
     IDS_ENERGY_FOOT_POUNDS "Ft·Lbs"
     IDS_ENERGY_IT_CALORIES "Tabla internacional de calorías"
     IDS_ENERGY_IT_KILOCALORIES "Tabla internacional de kilocalorías"
     IDS_ENERGY_JOULES "Julios"
     IDS_ENERGY_KILOJOULES "Kilojulios"
-    IDS_ENERGY_KILOWATT_HOURS "Kilovatios hora"
+    IDS_ENERGY_KILOWATT_HOURS "Kilowatios hora"
     IDS_ENERGY_NUTRITION_CALORIES "Calorías nutricionales"
     IDS_ENERGY_TH_CALORIES "Calorías termoquímicas"
 END
@@ -549,16 +541,16 @@ END
 STRINGTABLE
 BEGIN
     IDS_LENGTH_ANGSTROMS "Ångströms"
-    IDS_LENGTH_ASTRONOMICAL_UNITS "Unidades astronómicas"
-    IDS_LENGTH_BARLEYCORNS "Granos de cebada"
+    IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units"
+    IDS_LENGTH_BARLEYCORNS "Barleycorns"
     IDS_LENGTH_CENTIMETERS "Centímetros"
     IDS_LENGTH_CHAINS_UK "Cadenas (UK)"
     IDS_LENGTH_CHI "Chi"
     IDS_LENGTH_CHOU "Chou"
     IDS_LENGTH_CHR "Chr"
     IDS_LENGTH_CUN "Cun"
-    IDS_LENGTH_FATHOMS "Brazas"
-    IDS_LENGTH_FATHOMS_HUNGARY "Brazas (Hungría)"
+    IDS_LENGTH_FATHOMS "Fathoms"
+    IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Hungary)"
     IDS_LENGTH_FEET "Pies"
     IDS_LENGTH_FURLONGS "Furlongs"
     IDS_LENGTH_GAN "Gan"
@@ -570,7 +562,7 @@ BEGIN
     IDS_LENGTH_KABIET "Kabiet"
     IDS_LENGTH_KEN "Ken"
     IDS_LENGTH_KEUB "Keub"
-    IDS_LENGTH_KILOMETERS "Kilómetros"
+    IDS_LENGTH_KILOMETERS "Kilometros"
     IDS_LENGTH_LAR "Lar"
     IDS_LENGTH_LIGHT_YEARS "Años luz"
     IDS_LENGTH_LINKS_UK "Links (UK)"
@@ -578,7 +570,7 @@ BEGIN
     IDS_LENGTH_MICRONS "Micrómetros"
     IDS_LENGTH_MILES "Millas"
     IDS_LENGTH_MILLIMETERS "Milímetros"
-    IDS_LENGTH_NAUTICAL_MILES "Millas náuticas"
+    IDS_LENGTH_NAUTICAL_MILES "Millas nauticas"
     IDS_LENGTH_NIEU "Nieu"
     IDS_LENGTH_PARSECS "Parsecs"
     IDS_LENGTH_PICAS "Picas"
@@ -588,11 +580,11 @@ BEGIN
     IDS_LENGTH_SAWK "Sawk"
     IDS_LENGTH_SEN "Sen"
     IDS_LENGTH_SHAKU "Shaku"
-    IDS_LENGTH_SPAN "Palmo"
+    IDS_LENGTH_SPAN "Span"
     IDS_LENGTH_SUN "Sun"
     IDS_LENGTH_TSUEN "Tsuen"
     IDS_LENGTH_VA "Va"
-    IDS_LENGTH_YARDS "Yardas"
+    IDS_LENGTH_YARDS "Yards"
     IDS_LENGTH_YOTE "Yote"
     IDS_LENGTH_ZHANG "Zhang"
 END
@@ -603,8 +595,8 @@ BEGIN
     IDS_POWER_BTUS_PER_MINUTE "BTU/Minuto"
     IDS_POWER_FPS_PER_MINUTE "Ft·Lbs/Minuto"
     IDS_POWER_HORSEPOWER "Caballos de vapor"
-    IDS_POWER_KILOWATTS "Kilovatios"
-    IDS_POWER_MEGAWATTS "Megavatios"
+    IDS_POWER_KILOWATTS "Kilowatios"
+    IDS_POWER_MEGAWATTS "Megawatios"
     IDS_POWER_WATTS "Watios"
 END
 
@@ -617,7 +609,7 @@ BEGIN
     IDS_PRESSURE_KILOPASCALS "Hectopascales"
     IDS_PRESSURE_MM_OF_MERCURY "Milímetros de mercurio"
     IDS_PRESSURE_PASCALS "Pascales"
-    IDS_PRESSURE_PSI "PSI"
+    IDS_PRESSURE_PSI "Libras fuerza por pulgada cuadrada"
 END
 
 /* Temperatures */
@@ -634,7 +626,7 @@ STRINGTABLE
 BEGIN
     IDS_TIME_DAYS "Días"
     IDS_TIME_HOURS "Horas"
-    IDS_TIME_NANOSECONDS "Nanosegundos"
+    IDS_TIME_NANOSECONDS "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microsegundos"
     IDS_TIME_MILLISECONDS "Milisegundos"
     IDS_TIME_MINUTES "Minutos"
@@ -649,8 +641,8 @@ BEGIN
     IDS_VELOCITY_CMS_SECOND "Centímetros/segundo"
     IDS_VELOCITY_FEET_HOUR "Pies/hora"
     IDS_VELOCITY_FEET_SECOND "Pies/segundo"
-    IDS_VELOCITY_KILOMETERS_HOUR "Kilómetros/hora"
-    IDS_VELOCITY_KNOTS "Nudos"
+    IDS_VELOCITY_KILOMETERS_HOUR "Kilometros/hora"
+    IDS_VELOCITY_KNOTS "Knots"
     IDS_VELOCITY_MACH "Mach"
     IDS_VELOCITY_METERS_SECOND "Metros/segundo"
     IDS_VELOCITY_MILES_HOUR "Millas/hora"
@@ -660,10 +652,10 @@ END
 STRINGTABLE
 BEGIN
     IDS_VOLUME_BARRELS_UK "Barriles (UK)"
-    IDS_VOLUME_BARRELS_OIL "Barriles de petróleo"
+    IDS_VOLUME_BARRELS_OIL "Barriles de petroleo"
     IDS_VOLUME_BUN "Bun"
     IDS_VOLUME_BUSHELS_UK "Celemín (UK)"
-    IDS_VOLUME_BUSHELS_US "Celemín (EE.UU.)"
+    IDS_VOLUME_BUSHELS_US "Celemín (US)"
     IDS_VOLUME_CUBIC_CENTIMETERS "Centímetros cúbicos"
     IDS_VOLUME_CUBIC_FEET "Píes cúbicos"
     IDS_VOLUME_CUBIC_INCHES "Pulgadas cúbicas"
@@ -671,10 +663,10 @@ BEGIN
     IDS_VOLUME_CUBIC_YARDS "Yardas cúbicas"
     IDS_VOLUME_DOE "Doe"
     IDS_VOLUME_FLUID_OUNCES_UK "Onza líquida (UK)"
-    IDS_VOLUME_FLUID_OUNCES_US "Onza líquida (EE.UU.)"
+    IDS_VOLUME_FLUID_OUNCES_US "Onza líquida (US)"
     IDS_VOLUME_GALLONS_UK "Galones (UK)"
-    IDS_VOLUME_GALLONS_DRY_US "Galones, secos (EE.UU.)"
-    IDS_VOLUME_GALLONS_LIQUID_US "Galones, líquidos (EE.UU.)"
+    IDS_VOLUME_GALLONS_DRY_US "Galones, dry (US)"
+    IDS_VOLUME_GALLONS_LIQUID_US "Galones, liquid (US)"
     IDS_VOLUME_GOU "Gou"
     IDS_VOLUME_HOP "Hop"
     IDS_VOLUME_ICCE "Icce"
@@ -683,11 +675,11 @@ BEGIN
     IDS_VOLUME_MAL "Mal"
     IDS_VOLUME_MILLILITERS "Mililitros"
     IDS_VOLUME_PINTS_UK "Pintas (UK)"
-    IDS_VOLUME_PINTS_DRY_US "Pintas, secas (EE.UU.)"
-    IDS_VOLUME_PINTS_LIQUID_US "Pintas, líquidas (EE.UU.)"
+    IDS_VOLUME_PINTS_DRY_US "Pintas, dry (US)"
+    IDS_VOLUME_PINTS_LIQUID_US "Pintas, liquid (US)"
     IDS_VOLUME_QUARTS_UK "Cuartos (UK)"
-    IDS_VOLUME_QUARTS_DRY_US "Cuartos, secos (EE.UU.)"
-    IDS_VOLUME_QUARTS_LIQUID_US "Cuartos, líquidos (EE.UU.)"
+    IDS_VOLUME_QUARTS_DRY_US "Cuartos, dry (US)"
+    IDS_VOLUME_QUARTS_LIQUID_US "Cuartos, liquid (US)"
     IDS_VOLUME_SEKI "Seki"
     IDS_VOLUME_SYOU "Syou"
     IDS_VOLUME_TANANLOUNG "Tananloung"
@@ -717,11 +709,11 @@ BEGIN
     IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Onza, avoirdupois"
     IDS_WEIGHT_OUNCES_TROY "Onza, troy"
     IDS_WEIGHT_POUNDS "Libras"
-    IDS_WEIGHT_QUINTAL_METRIC "Quintal (métrico)"
+    IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)"
     IDS_WEIGHT_SALOUNG "Saloung"
     IDS_WEIGHT_STONES "Stones"
     IDS_WEIGHT_TAMLUNG "Tamlung"
     IDS_WEIGHT_TONNES "Toneladas"
     IDS_WEIGHT_TONS_UK "Toneladas (UK)"
-    IDS_WEIGHT_TONS_US "Toneladas (EE.UU.)"
+    IDS_WEIGHT_TONS_US "Toneladas (US)"
 END

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "Affichage"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hexadécimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "Affichage"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hexadécimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "Affichage"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Grouper les chiffres", IDM_VIEW_GROUP, CHECKED

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

@@ -332,8 +332,8 @@ BEGIN
     END
     POPUP "תצוגה"
     BEGIN
-        MENUITEM "רגילה", IDM_VIEW_STANDARD
-        MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC
+        MENUITEM "רגילה", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "המרה", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "הקס\tF5", IDM_VIEW_HEX, CHECKED
@@ -364,8 +364,8 @@ BEGIN
     END
     POPUP "תצוגה"
     BEGIN
-        MENUITEM "רגילה", IDM_VIEW_STANDARD
-        MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC
+        MENUITEM "רגילה", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "המרה", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "הקס\tF5", IDM_VIEW_HEX, CHECKED
@@ -397,8 +397,8 @@ BEGIN
     END
     POPUP "תצוגה"
     BEGIN
-        MENUITEM "רגילה", IDM_VIEW_STANDARD
-        MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC
+        MENUITEM "רגילה", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "המרה", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "קיבוץ ספרות", IDM_VIEW_GROUP, CHECKED

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

@@ -338,8 +338,8 @@ BEGIN
     END
     POPUP "&Nézet"
     BEGIN
-        MENUITEM "&Szokásos", IDM_VIEW_STANDARD
-        MENUITEM "&Tudományos", IDM_VIEW_SCIENTIFIC
+        MENUITEM "&Szokásos", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "&Tudományos", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Át&váltás", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "&Hexadecimális\tF5", IDM_VIEW_HEX, CHECKED
@@ -370,8 +370,8 @@ BEGIN
     END
     POPUP "&Nézet"
     BEGIN
-        MENUITEM "&Szokásos", IDM_VIEW_STANDARD
-        MENUITEM "&Tudományos", IDM_VIEW_SCIENTIFIC
+        MENUITEM "&Szokásos", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "&Tudományos", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Át&váltás", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "&Hexadecimális\tF5", IDM_VIEW_HEX, CHECKED
@@ -403,8 +403,8 @@ BEGIN
     END
     POPUP "&Nézet"
     BEGIN
-        MENUITEM "&Szokásos", IDM_VIEW_STANDARD
-        MENUITEM "&Tudományos", IDM_VIEW_SCIENTIFIC
+        MENUITEM "&Szokásos", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "&Tudományos", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Át&váltás", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Számjegyek &csoportosítása", IDM_VIEW_GROUP, CHECKED

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "Visualizza"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversione", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "Visualizza"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversione", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "Visualizza"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversione", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Raggruppamento cifre", IDM_VIEW_GROUP, CHECKED

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "表示(&V)"
     BEGIN
-        MENUITEM "標準(&T)", IDM_VIEW_STANDARD
-        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC
+        MENUITEM "標準(&T)", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "変換(&C)", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "1&6進\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "表示(&V)"
     BEGIN
-        MENUITEM "標準(&T)", IDM_VIEW_STANDARD
-        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC
+        MENUITEM "標準(&T)", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "変換(&C)", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "1&6進\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "表示"
     BEGIN
-        MENUITEM "標準(&T)", IDM_VIEW_STANDARD
-        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC
+        MENUITEM "標準(&T)", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "変換(&C)", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "桁を区切る(&I)", IDM_VIEW_GROUP, CHECKED

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

@@ -332,8 +332,8 @@ BEGIN
     END
     POPUP "보기"
     BEGIN
-        MENUITEM "일반", IDM_VIEW_STANDARD
-        MENUITEM "공학", IDM_VIEW_SCIENTIFIC
+        MENUITEM "일반", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "공학", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "전환", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -364,8 +364,8 @@ BEGIN
     END
     POPUP "보기"
     BEGIN
-        MENUITEM "일반", IDM_VIEW_STANDARD
-        MENUITEM "공학", IDM_VIEW_SCIENTIFIC
+        MENUITEM "일반", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "공학", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "전환", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -397,8 +397,8 @@ BEGIN
     END
     POPUP "보기"
     BEGIN
-        MENUITEM "일반", IDM_VIEW_STANDARD
-        MENUITEM "공학", IDM_VIEW_SCIENTIFIC
+        MENUITEM "일반", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "공학", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "전환", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "자릿수 구분 단위", IDM_VIEW_GROUP, CHECKED

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "Beeld"
     BEGIN
-        MENUITEM "Standaard", IDM_VIEW_STANDARD
-        MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Converteren", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "Beeld"
     BEGIN
-        MENUITEM "Standaard", IDM_VIEW_STANDARD
-        MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Converteren", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Standaard", IDM_VIEW_STANDARD
-        MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Converteren", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Cijfergroeperingen", IDM_VIEW_GROUP, CHECKED

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "Vis"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Konvertering", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Heksadesimalt\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "Vis"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "konvertering", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Heksadesimalt\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "Vis"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Konvertering", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED
@@ -405,7 +405,7 @@ BEGIN
     BEGIN
         MENUITEM "Emner i hjelp", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Om ReactOS Kalkulator", IDM_HELP_ABOUT
+        MENUITEM "Om Reactos Kalkulator", IDM_HELP_ABOUT
     END
 END
 

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

@@ -339,8 +339,8 @@ BEGIN
     END
     POPUP "Wygląd"
     BEGIN
-        MENUITEM "Standardowy", IDM_VIEW_STANDARD
-        MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Szesnastkowy\tF5", IDM_VIEW_HEX, CHECKED
@@ -371,8 +371,8 @@ BEGIN
     END
     POPUP "Wygląd"
     BEGIN
-        MENUITEM "Standardowy", IDM_VIEW_STANDARD
-        MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Szesnastkowo\tF5", IDM_VIEW_HEX, CHECKED
@@ -404,8 +404,8 @@ BEGIN
     END
     POPUP "Wygląd"
     BEGIN
-        MENUITEM "Standardowy", IDM_VIEW_STANDARD
-        MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Grupowanie cyfr", IDM_VIEW_GROUP, CHECKED

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

@@ -332,8 +332,8 @@ BEGIN
     END
     POPUP "Visualizar"
     BEGIN
-        MENUITEM "Padrão", IDM_VIEW_STANDARD
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Padrão", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversão", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -364,8 +364,8 @@ BEGIN
     END
     POPUP "Visualizar"
     BEGIN
-        MENUITEM "Padrão", IDM_VIEW_STANDARD
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Padrão", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversão", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -397,8 +397,8 @@ BEGIN
     END
     POPUP "Visualizar"
     BEGIN
-        MENUITEM "Padrão", IDM_VIEW_STANDARD
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Padrão", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Conversão", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Agrupar dígitos", IDM_VIEW_GROUP, CHECKED

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

@@ -331,8 +331,8 @@ BEGIN
     END
     POPUP "&Afișare"
     BEGIN
-        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD
-        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Con&versie", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "&Hexazecimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -363,8 +363,8 @@ BEGIN
     END
     POPUP "&Afișare"
     BEGIN
-        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD
-        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Con&versie", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "&Hexazecimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -396,8 +396,8 @@ BEGIN
     END
     POPUP "&Afișare"
     BEGIN
-        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD
-        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Con&versie", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Grupează &cifre", IDM_VIEW_GROUP, CHECKED

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "Вид"
     BEGIN
-        MENUITEM "Обычный", IDM_VIEW_STANDARD
-        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Обычный", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Преобразование", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Шестнадцатеричный\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "Вид"
     BEGIN
-        MENUITEM "Обычный", IDM_VIEW_STANDARD
-        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Обычный", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Преобразование", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Шестнадцатеричный\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "Вид"
     BEGIN
-        MENUITEM "Обычный", IDM_VIEW_STANDARD
-        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Обычный", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Преобразование", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Количество цифр в группе", IDM_VIEW_GROUP, CHECKED

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

@@ -337,8 +337,8 @@ BEGIN
     END
     POPUP "Zobraziť"
     BEGIN
-        MENUITEM "Štandardná", IDM_VIEW_STANDARD
-        MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Štandardná", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Prevody", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Šestnástková\tF5", IDM_VIEW_HEX, CHECKED
@@ -369,8 +369,8 @@ BEGIN
     END
     POPUP "Zobraziť"
     BEGIN
-        MENUITEM "Štandardná", IDM_VIEW_STANDARD
-        MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Štandardná", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Prevody", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Šestnástková\tF5", IDM_VIEW_HEX, CHECKED
@@ -402,8 +402,8 @@ BEGIN
     END
     POPUP "Zobraziť"
     BEGIN
-        MENUITEM "Štandardná", IDM_VIEW_STANDARD
-        MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Štandardná", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Prevody", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Zoskupovať číslice", IDM_VIEW_GROUP, CHECKED

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

@@ -334,8 +334,8 @@ BEGIN
     END
     POPUP "Modifko"
     BEGIN
-        MENUITEM "Standart", IDM_VIEW_STANDARD
-        MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standart", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Konvertim", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -366,8 +366,8 @@ BEGIN
     END
     POPUP "Vëzhgo"
     BEGIN
-        MENUITEM "Standart", IDM_VIEW_STANDARD
-        MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standart", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Konverto", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -399,8 +399,8 @@ BEGIN
     END
     POPUP "Vëzhgo"
     BEGIN
-        MENUITEM "Standar", IDM_VIEW_STANDARD
-        MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standar", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Konverto", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Grupim numeror", IDM_VIEW_GROUP, CHECKED

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

@@ -337,8 +337,8 @@ BEGIN
     END
     POPUP "Visa"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Konvertering", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -369,8 +369,8 @@ BEGIN
     END
     POPUP "Vis"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Konvertering", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -402,8 +402,8 @@ BEGIN
     END
     POPUP "Visa"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD
-        MENUITEM "Vetenskapelig", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Vetenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Konvertering", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED
@@ -412,7 +412,7 @@ BEGIN
     BEGIN
         MENUITEM "Visa hjälp", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Om ReactOS Kalkylator", IDM_HELP_ABOUT
+        MENUITEM "Om Reactos Kalkylator", IDM_HELP_ABOUT
     END
 END
 

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "&มุมมอง"
     BEGIN
-        MENUITEM "แบบมาตรฐาน", IDM_VIEW_STANDARD
-        MENUITEM "แบบวิทยาศาสตร์", IDM_VIEW_SCIENTIFIC
+        MENUITEM "แบบมาตรฐาน", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "แบบวิทยาศาสตร์", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "ความเปลี่ยนแปลง", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "ฐานสิบหก\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "&มุมมอง"
     BEGIN
-        MENUITEM "แบบมาตรฐาน", IDM_VIEW_STANDARD
-        MENUITEM "แบบวิทยาศาสตร์", IDM_VIEW_SCIENTIFIC
+        MENUITEM "แบบมาตรฐาน", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "แบบวิทยาศาสตร์", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "ความเปลี่ยนแปลง", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "ฐานสิบหก\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "&มุมมอง"
     BEGIN
-        MENUITEM "แบบมาตรฐาน", IDM_VIEW_STANDARD
-        MENUITEM "แบบวิทยาศาสตร์", IDM_VIEW_SCIENTIFIC
+        MENUITEM "แบบมาตรฐาน", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "แบบวิทยาศาสตร์", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "ความเปลี่ยนแปลง", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "แสดงหลักตัวเลข", IDM_VIEW_GROUP, CHECKED

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

@@ -1,4 +1,4 @@
-/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -66,7 +66,7 @@ BEGIN
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON "BK", IDC_BUTTON_MS, 123, 100, 24, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "BE", IDC_BUTTON_MP, 123, 120, 24, 18, BS_CENTER | BS_VCENTER |
+    PUSHBUTTON "BA", IDC_BUTTON_MP, 123, 120, 24, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON "pi", IDC_BUTTON_PI, 123, 140, 24, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
@@ -212,7 +212,7 @@ BEGIN
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON "BK", IDC_BUTTON_MS, 5, 85, 24, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "BE", IDC_BUTTON_MP, 5, 105, 24, 18, BS_CENTER | BS_VCENTER |
+    PUSHBUTTON "BA", IDC_BUTTON_MP, 5, 105, 24, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
@@ -226,13 +226,13 @@ BEGIN
     PUSHBUTTON "Dönüştür:", IDC_BUTTON_CONVERT, 35, 105, 76, 17
     COMBOBOX IDC_COMBO_CATEGORY, 5, 31, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
              WS_TABSTOP | CBS_SORT
-    LTEXT "Ulam:", IDC_STATIC, 5, 20, 56, 8
+    LTEXT "Tür:", IDC_STATIC, 5, 20, 56, 8
     COMBOBOX IDC_COMBO_FROM, 5, 60, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
              WS_TABSTOP | CBS_SORT
-    LTEXT "Şundan Dönüştür:", IDC_STATIC, 5, 49, 56, 8
+    LTEXT "Şundan:", IDC_STATIC, 5, 49, 56, 8
     COMBOBOX IDC_COMBO_TO, 5, 87, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
              WS_TABSTOP | CBS_SORT
-    LTEXT "Şuna Dönüştür:", IDC_STATIC, 5, 76, 56, 8
+    LTEXT "Şuna:", IDC_STATIC, 5, 76, 56, 8
     CONTROL "Baştan", IDC_BUTTON_CANC, "Button", BS_OWNERDRAW | BS_CENTER |
             BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 276, 24, 40, 17
     CONTROL "Sil", IDC_BUTTON_CE, "Button", BS_OWNERDRAW | BS_CENTER |
@@ -287,14 +287,14 @@ BEGIN
             BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 67, 24, 18
     CONTROL "BK", IDC_BUTTON_MS, "Button", BS_OWNERDRAW | BS_CENTER |
             BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 86, 24, 18
-    CONTROL "BE", IDC_BUTTON_MP, "Button", BS_OWNERDRAW | BS_CENTER |
+    CONTROL "BA", IDC_BUTTON_MP, "Button", BS_OWNERDRAW | BS_CENTER |
             BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 105, 24, 18
     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"
+CAPTION "Hesap Makinesi Hakkında"
 FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "Tamam", IDOK, 105, 148, 52, 16
@@ -302,7 +302,7 @@ BEGIN
             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
+    LTEXT "Carlo Bramini tarafndan 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
@@ -310,14 +310,14 @@ END
 
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Sayımlama Penceresi"
+CAPTION "Sayımlama Kutusu"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX IDC_LIST_STAT, 4, 4, 156, 40, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "&Geri Dön", IDC_BUTTON_RET, 4, 48, 36, 16
+    PUSHBUTTON "&Dön", IDC_BUTTON_RET, 4, 48, 36, 16
     PUSHBUTTON "&Yükle", IDC_BUTTON_LOAD, 44, 48, 36, 16
     PUSHBUTTON "&Sil", IDC_BUTTON_CD, 84, 48, 36, 16
-    PUSHBUTTON "&Tümünü Sil", IDC_BUTTON_CAD, 124, 48, 36, 16
+    PUSHBUTTON "&Hepsini Sil", IDC_BUTTON_CAD, 124, 48, 36, 16
     CTEXT "n=0", IDC_TEXT_NITEMS, 4, 68, 156, 12, SS_CENTERIMAGE | SS_SUNKEN
 END
 
@@ -332,11 +332,11 @@ BEGIN
     END
     POPUP "&Görünüm"
     BEGIN
-        MENUITEM "&Ölçünlü", IDM_VIEW_STANDARD
-        MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC
-        MENUITEM "&Dönüştürme", IDM_VIEW_CONVERSION
+        MENUITEM "&Ölçünlü", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "&Dönüştürücü", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "&Onaltılık\tF5", IDM_VIEW_HEX, 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
@@ -345,13 +345,13 @@ BEGIN
         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
+        MENUITEM "B&asamak Ayırıcısı", IDM_VIEW_GROUP, CHECKED
     END
     POPUP "&Yardım"
     BEGIN
         MENUITEM "&Yardım Konuları", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "&Üzerine...", IDM_HELP_ABOUT
+        MENUITEM "&Hakkında", IDM_HELP_ABOUT
     END
 END
 
@@ -364,9 +364,9 @@ BEGIN
     END
     POPUP "&Görünüm"
     BEGIN
-        MENUITEM "&Ölçünlü", IDM_VIEW_STANDARD
-        MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC
-        MENUITEM "&Dönüştürme", IDM_VIEW_CONVERSION
+        MENUITEM "&Ölçünlü", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "&Dönüştürücü", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "&Onaltılık\tF5", IDM_VIEW_HEX, CHECKED
         MENUITEM "O&nluk\tF6", IDM_VIEW_DEC, CHECKED
@@ -378,13 +378,13 @@ BEGIN
         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
+        MENUITEM "B&asamak Ayırıcısı", IDM_VIEW_GROUP, CHECKED
     END
     POPUP "&Yardım"
     BEGIN
-        MENUITEM "&Yardım Konuları", IDM_HELP_HELP
+        MENUITEM "%Yardım Konuları", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "&Üzerine...", IDM_HELP_ABOUT
+        MENUITEM "&Hakkında", IDM_HELP_ABOUT
     END
 END
 
@@ -397,17 +397,17 @@ BEGIN
     END
     POPUP "&Görünüm"
     BEGIN
-        MENUITEM "&Ölçünlü", IDM_VIEW_STANDARD
-        MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC
-        MENUITEM "&Dönüştürme", IDM_VIEW_CONVERSION
+        MENUITEM "&Ölçünlü", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "&Dönüştürücü", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "B&asamakları Takımla", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "B&asamak Ayırıcısı", IDM_VIEW_GROUP, CHECKED
     END
     POPUP "&Yardım"
     BEGIN
         MENUITEM "&Yardım Konuları", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "&Üzerine...", IDM_HELP_ABOUT
+        MENUITEM "&Hakkında", IDM_HELP_ABOUT
     END
 END
 
@@ -415,7 +415,7 @@ 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_STRING_LICENSE "Hesap Makinesi, GNU GPL ile yayınlanan özgür bir yazılımdır.\r\n\r\nGNU GPL'nin bir tıpkısını buradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nBir de GNU GPL'nin çevirilerini buradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "Yanlışlık"
     IDS_QUICKHELP "Hızlı Yardım"
 END
@@ -467,7 +467,7 @@ BEGIN
     IDS_AREA_RAI "Rai"
     IDS_AREA_SE "Se"
     IDS_AREA_SQUARE_CENTIMETERS "Santimetrekare"
-    IDS_AREA_SQUARE_CHR "Çırkare"
+    IDS_AREA_SQUARE_CHR "Chrkare"
     IDS_AREA_SQUARE_FATHOMS "Kulaçkare"
     IDS_AREA_SQUARE_FATHOMS_HUNGARY "Kulaçkare (Macaristan)"
     IDS_AREA_SQUARE_FEET "Ayakkare"
@@ -490,7 +490,7 @@ STRINGTABLE
 BEGIN
     IDS_CONSUMPTION_KM_PER_L "Kilometre/Litre"
     IDS_CONSUMPTION_L_PER_100_KM "Litre/100 Kilometre"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Mil/Galon (BK)"
+    IDS_CONSUMPTION_MILES_GALLON_UK "Mil/Galon (BB)"
     IDS_CONSUMPTION_MILES_GALLON_US "Mil/Galon (ABD)"
 END
 
@@ -520,7 +520,7 @@ END
 /* Energies */
 STRINGTABLE
 BEGIN
-    IDS_ENERGY_15_C_CALORIES "Kalori (15°C'luk)"
+    IDS_ENERGY_15_C_CALORIES "Kalori (15°C)"
     IDS_ENERGY_BTUS "İngiliz Isı Birimi"
     IDS_ENERGY_ERGS "Erg"
     IDS_ENERGY_EVS "Elektronvolt"
@@ -541,10 +541,10 @@ BEGIN
     IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomi birimi"
     IDS_LENGTH_BARLEYCORNS "Arpa tânesi"
     IDS_LENGTH_CENTIMETERS "Santimetre"
-    IDS_LENGTH_CHAINS_UK "Zincir (BK)"
+    IDS_LENGTH_CHAINS_UK "Zincir (BB)"
     IDS_LENGTH_CHI "Çi"
     IDS_LENGTH_CHOU "Çou"
-    IDS_LENGTH_CHR "Çır"
+    IDS_LENGTH_CHR "Chr"
     IDS_LENGTH_CUN "Cun"
     IDS_LENGTH_FATHOMS "Kulaç"
     IDS_LENGTH_FATHOMS_HUNGARY "Kulaç (Macaristan)"
@@ -562,7 +562,7 @@ BEGIN
     IDS_LENGTH_KILOMETERS "Kilometre"
     IDS_LENGTH_LAR "Lar"
     IDS_LENGTH_LIGHT_YEARS "Işık yılı"
-    IDS_LENGTH_LINKS_UK "Zincir bağlantısı (BK)"
+    IDS_LENGTH_LINKS_UK "Zincir bağlantısı (BB)"
     IDS_LENGTH_METERS "Metre"
     IDS_LENGTH_MICRONS "Mikron"
     IDS_LENGTH_MILES "Mil"
@@ -600,7 +600,7 @@ END
 /* Pressures */
 STRINGTABLE
 BEGIN
-    IDS_PRESSURE_ATMOSPHERES "Hava yuvarı"
+    IDS_PRESSURE_ATMOSPHERES "Gaz yuvarı"
     IDS_PRESSURE_BARS "Bar"
     IDS_PRESSURE_HECTOPASCALS "Hektopaskal"
     IDS_PRESSURE_KILOPASCALS "Kilopaskal"
@@ -639,7 +639,7 @@ BEGIN
     IDS_VELOCITY_FEET_HOUR "Ayak/Saat"
     IDS_VELOCITY_FEET_SECOND "Ayak/Sâniye"
     IDS_VELOCITY_KILOMETERS_HOUR "Kilometre/Saat"
-    IDS_VELOCITY_KNOTS "Deniz mili"
+    IDS_VELOCITY_KNOTS "Düğüm"
     IDS_VELOCITY_MACH "Maç"
     IDS_VELOCITY_METERS_SECOND "Metre/Saat"
     IDS_VELOCITY_MILES_HOUR "Mil/Saat"
@@ -648,10 +648,10 @@ END
 /* Volumes */
 STRINGTABLE
 BEGIN
-    IDS_VOLUME_BARRELS_UK "Fıçı (BK)"
+    IDS_VOLUME_BARRELS_UK "Fıçı (BB)"
     IDS_VOLUME_BARRELS_OIL "Yağ Fıçısı"
     IDS_VOLUME_BUN "Bun"
-    IDS_VOLUME_BUSHELS_UK "Ölçek (BK)"
+    IDS_VOLUME_BUSHELS_UK "Ölçek (BB)"
     IDS_VOLUME_BUSHELS_US "Ölçek (ABD)"
     IDS_VOLUME_CUBIC_CENTIMETERS "Santimetreküp"
     IDS_VOLUME_CUBIC_FEET "Ayakküp"
@@ -659,9 +659,9 @@ BEGIN
     IDS_VOLUME_CUBIC_METERS "Metreküp"
     IDS_VOLUME_CUBIC_YARDS "Yardaküp"
     IDS_VOLUME_DOE "Do"
-    IDS_VOLUME_FLUID_OUNCES_UK "Sıvı onsu (BK)"
+    IDS_VOLUME_FLUID_OUNCES_UK "Sıvı onsu (BB)"
     IDS_VOLUME_FLUID_OUNCES_US "Sıvı onsu (ABD)"
-    IDS_VOLUME_GALLONS_UK "Galon (BK)"
+    IDS_VOLUME_GALLONS_UK "Galon (BB)"
     IDS_VOLUME_GALLONS_DRY_US "Galon, kuru (ABD)"
     IDS_VOLUME_GALLONS_LIQUID_US "Galon, sıvı (ABD)"
     IDS_VOLUME_GOU "Go"
@@ -671,10 +671,10 @@ BEGIN
     IDS_VOLUME_LITERS "Litre"
     IDS_VOLUME_MAL "Mal"
     IDS_VOLUME_MILLILITERS "Mililitre"
-    IDS_VOLUME_PINTS_UK "Bira bardağı (BK)"
+    IDS_VOLUME_PINTS_UK "Bira bardağı (BB)"
     IDS_VOLUME_PINTS_DRY_US "Bira bardağı, katı (ABD)"
     IDS_VOLUME_PINTS_LIQUID_US "Bira bardağı, sıvı (ABD)"
-    IDS_VOLUME_QUARTS_UK "Kuart (BK)"
+    IDS_VOLUME_QUARTS_UK "Kuart (BB)"
     IDS_VOLUME_QUARTS_DRY_US "Kuart, katı (ABD)"
     IDS_VOLUME_QUARTS_LIQUID_US "Kuart, sıvı (ABD)"
     IDS_VOLUME_SEKI "Seki"
@@ -703,14 +703,14 @@ BEGIN
     IDS_WEIGHT_LIANG_CHINA "Liang (Çin)"
     IDS_WEIGHT_LIANG_TAIWAN "Liang (Tayvan)"
     IDS_WEIGHT_MONME "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ons, İngiliz tartısı"
+    IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ons, İngiliz tarısı"
     IDS_WEIGHT_OUNCES_TROY "Ons, kuyumcu tartısı"
     IDS_WEIGHT_POUNDS "Pond"
-    IDS_WEIGHT_QUINTAL_METRIC "Kental (metrelik)"
+    IDS_WEIGHT_QUINTAL_METRIC "Kental (ölçümlü)"
     IDS_WEIGHT_SALOUNG "Salong"
     IDS_WEIGHT_STONES "Taş"
     IDS_WEIGHT_TAMLUNG "Tamlung"
     IDS_WEIGHT_TONNES "Ton"
-    IDS_WEIGHT_TONS_UK "Ton (BK)"
+    IDS_WEIGHT_TONS_UK "Ton (BB)"
     IDS_WEIGHT_TONS_US "Ton (ABD)"
 END

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

@@ -338,8 +338,8 @@ BEGIN
     END
     POPUP "Вигляд"
     BEGIN
-        MENUITEM "Звичайний", IDM_VIEW_STANDARD
-        MENUITEM "Науковий", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Звичайний", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Науковий", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Перетворення", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Шістнадцятковий\tF5", IDM_VIEW_HEX, CHECKED
@@ -370,8 +370,8 @@ BEGIN
     END
     POPUP "Вигляд"
     BEGIN
-        MENUITEM "Звичайний", IDM_VIEW_STANDARD
-        MENUITEM "Науковий", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Звичайний", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Науковий", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Перетворення", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Шістнадцятковий\tF5", IDM_VIEW_HEX, CHECKED
@@ -403,8 +403,8 @@ BEGIN
     END
     POPUP "Вигляд"
     BEGIN
-        MENUITEM "Звичайний", IDM_VIEW_STANDARD
-        MENUITEM "Науковий", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Звичайний", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "Науковий", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "Перетворення", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Кількість цифр у групі", IDM_VIEW_GROUP, CHECKED

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

@@ -332,8 +332,8 @@ BEGIN
     END
     POPUP "查看"
     BEGIN
-        MENUITEM "标准型", IDM_VIEW_STANDARD
-        MENUITEM "科学型", IDM_VIEW_SCIENTIFIC
+        MENUITEM "标准型", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "科学型", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "转换", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "十六进制\tF5", IDM_VIEW_HEX, CHECKED
@@ -364,8 +364,8 @@ BEGIN
     END
     POPUP "查看"
     BEGIN
-        MENUITEM "标准型", IDM_VIEW_STANDARD
-        MENUITEM "科学型", IDM_VIEW_SCIENTIFIC
+        MENUITEM "标准型", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "科学型", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "转换", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "十六进制\tF5", IDM_VIEW_HEX, CHECKED
@@ -397,8 +397,8 @@ BEGIN
     END
     POPUP "查看"
     BEGIN
-        MENUITEM "标准型", IDM_VIEW_STANDARD
-        MENUITEM "科学型", IDM_VIEW_SCIENTIFIC
+        MENUITEM "标准型", IDM_VIEW_STANDARD, CHECKED
+        MENUITEM "科学型", IDM_VIEW_SCIENTIFIC, CHECKED
         MENUITEM "转换", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "数字分组", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/resource.rc

@@ -91,12 +91,12 @@ IDB_BITMAP_ROS BITMAP "res/ROS_logo.bmp"
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
-#ifdef LANGUAGE_SQ_AL
-    #include "lang/sq-AL.rc"
-#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_TH_TH
     #include "lang/th-TH.rc"
 #endif

reactos/base/applications/calc/winmain.c

@@ -225,40 +225,38 @@ calc_t calc;
 
 static void load_config(void)
 {
+    TCHAR buf[32];
     DWORD tmp;
+#if _WIN32_WINNT >= 0x0500
     HKEY hKey;
-    
-    /* If no settings are found in the registry, then use the default options */
-    calc.layout = CALC_LAYOUT_STANDARD;
-    calc.usesep = FALSE;
+#endif
 
-    /* Get the configuration based on what version of Windows that's being used */
-    if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Calc"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) 
-    {
-        /* Try to load last selected layout */
-        tmp = sizeof(calc.layout);
-        if (RegQueryValueEx(hKey, TEXT("layout"), NULL, NULL, (LPBYTE)&calc.layout, &tmp) != ERROR_SUCCESS)
-            calc.layout = CALC_LAYOUT_STANDARD;
+    /* Try to load last selected layout */
+    GetProfileString(TEXT("SciCalc"), TEXT("layout"), TEXT("0"), buf, SIZEOF(buf));
+    if (_stscanf(buf, TEXT("%lu"), &calc.layout) != 1)
+        calc.layout = CALC_LAYOUT_STANDARD;
 
-        /* Try to load last selected formatting option */
-        tmp = sizeof(calc.usesep);
-        if (RegQueryValueEx(hKey, TEXT("UseSep"), NULL, NULL, (LPBYTE)&calc.usesep, &tmp) != ERROR_SUCCESS)
-            calc.usesep = FALSE;
-
-        /* close the key */
-        RegCloseKey(hKey);
-    }
+    /* Try to load last selected formatting option */
+    GetProfileString(TEXT("SciCalc"), TEXT("UseSep"), TEXT("0"), buf, SIZEOF(buf));
+    if (_stscanf(buf, TEXT("%lu"), &tmp) != 1)
+        calc.usesep = FALSE;
+    else
+        calc.usesep = (tmp == 1) ? TRUE : FALSE;
 
     /* memory is empty at startup */
     calc.is_memory = FALSE;
 
+#if _WIN32_WINNT >= 0x0500
     /* empty these values */
     calc.sDecimal[0] = TEXT('\0');
     calc.sThousand[0] = TEXT('\0');
 
     /* try to open the registry */
-    if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\International"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
-    {
+    if (RegOpenKeyEx(HKEY_CURRENT_USER, 
+                     TEXT("Control Panel\\International"),
+                     0,
+                     KEY_QUERY_VALUE,
+                     &hKey) == ERROR_SUCCESS) {
         /* get these values (ignore errors) */
         tmp = sizeof(calc.sDecimal);
         RegQueryValueEx(hKey, TEXT("sDecimal"), NULL, NULL, (LPBYTE)calc.sDecimal, &tmp);
@@ -279,24 +277,20 @@ static void load_config(void)
     /* get the string lengths */
     calc.sDecimal_len = _tcslen(calc.sDecimal);
     calc.sThousand_len = _tcslen(calc.sThousand);
+#else
+    /* acquire regional settings */
+    calc.sDecimal_len  = GetProfileString(TEXT("intl"), TEXT("sDecimal"), TEXT("."), calc.sDecimal, SIZEOF(calc.sDecimal));
+    calc.sThousand_len = GetProfileString(TEXT("intl"), TEXT("sThousand"), TEXT(","), calc.sThousand, SIZEOF(calc.sThousand));
+#endif
 }
 
 static void save_config(void)
 {
-    HKEY hKey;
-    DWORD sepValue;
+    TCHAR buf[32];
 
-    if (RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Calc"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL) != ERROR_SUCCESS)
-    {
-        return;
-    }
-    
-    sepValue = (calc.usesep) ? 1 : 0;
-
-    RegSetValueEx(hKey, TEXT("layout"), 0, REG_DWORD, (const BYTE*)&calc.layout, sizeof(calc.layout));
-    RegSetValueEx(hKey, TEXT("UseSep"), 0, REG_DWORD, (const BYTE*)&sepValue, sizeof(sepValue));
-
-    RegCloseKey(hKey);
+    _stprintf(buf, TEXT("%lu"), calc.layout);
+    WriteProfileString(TEXT("SciCalc"), TEXT("layout"), buf);
+    WriteProfileString(TEXT("SciCalc"), TEXT("UseSep"), (calc.usesep==TRUE) ? TEXT("1") : TEXT("0"));
 }
 
 static LRESULT post_key_press(LPARAM lParam, WORD idc)
@@ -663,33 +657,7 @@ static void update_menu(HWND hwnd)
     HMENU        hMenu = GetSubMenu(GetMenu(hwnd), 1);
     unsigned int x;
 
-    /* Sets the state of the layout in the menu based on the configuration file */
-    if (calc.layout == CALC_LAYOUT_SCIENTIFIC)
-    {
-        CheckMenuRadioItem(GetMenu(hwnd),
-                           IDM_VIEW_STANDARD,
-                           IDM_VIEW_CONVERSION,
-                           IDM_VIEW_SCIENTIFIC,
-                           MF_BYCOMMAND);
-    }
-    else if (calc.layout == CALC_LAYOUT_CONVERSION)
-    {
-        CheckMenuRadioItem(GetMenu(hwnd),
-                           IDM_VIEW_STANDARD,
-                           IDM_VIEW_CONVERSION,
-                           IDM_VIEW_CONVERSION,
-                           MF_BYCOMMAND);
-    }
-    else
-    {
-        CheckMenuRadioItem(GetMenu(hwnd),
-                           IDM_VIEW_STANDARD,
-                           IDM_VIEW_CONVERSION,
-                           IDM_VIEW_STANDARD,
-                           MF_BYCOMMAND);
-    }
-
-    for (x=3; x<SIZEOF(upd); x++) {
+    for (x=0; x<SIZEOF(upd); x++) {
         if (*(upd[x].sel) != upd[x].idc) {
             CheckMenuItem(hMenu, upd[x].idm, MF_BYCOMMAND|MF_UNCHECKED);
             SendMessage((HWND)GetDlgItem(hwnd,upd[x].idc),BM_SETCHECK,FALSE,0L);
@@ -1257,7 +1225,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
     unsigned int x;
     RECT         rc;
-    HMENU        hMenu;
 
     switch (msg) {
     case WM_DRAWITEM:
@@ -1291,11 +1258,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
         /* set our calc icon */
         SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_BIG)));
         SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_SMALL)));
-
-        /* Sets the state of the option to group digits */
-        hMenu = GetSubMenu(GetMenu(hWnd), 1);
-        CheckMenuItem(hMenu, IDM_VIEW_GROUP, (calc.usesep ? MF_CHECKED : MF_UNCHECKED));
-
         /* update text for decimal button */
         SendDlgItemMessage(hWnd, IDC_BUTTON_DOT, WM_SETTEXT, (WPARAM)0, (LPARAM)calc.sDecimal);
         /* Fill combo box for conversion */
@@ -1350,36 +1312,18 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
             calc.action = IDM_VIEW_STANDARD;
             DestroyWindow(hWnd);
             save_config();
-
-            CheckMenuRadioItem(GetMenu(hWnd),
-                               IDM_VIEW_STANDARD,
-                               IDM_VIEW_CONVERSION,
-                               IDM_VIEW_STANDARD,
-                               MF_BYCOMMAND);
             return TRUE;
         case IDM_VIEW_SCIENTIFIC:
             calc.layout = CALC_LAYOUT_SCIENTIFIC;
             calc.action = IDM_VIEW_SCIENTIFIC;
             DestroyWindow(hWnd);
             save_config();
-
-            CheckMenuRadioItem(GetMenu(hWnd),
-                               IDM_VIEW_STANDARD,
-                               IDM_VIEW_CONVERSION,
-                               IDM_VIEW_SCIENTIFIC,
-                               MF_BYCOMMAND);
             return TRUE;
         case IDM_VIEW_CONVERSION:
             calc.layout = CALC_LAYOUT_CONVERSION;
             calc.action = IDM_VIEW_CONVERSION;
             DestroyWindow(hWnd);
             save_config();
-
-            CheckMenuRadioItem(GetMenu(hWnd),
-                               IDM_VIEW_STANDARD,
-                               IDM_VIEW_CONVERSION,
-                               IDM_VIEW_CONVERSION,
-                               MF_BYCOMMAND);
             return TRUE;
         case IDM_VIEW_HEX:
         case IDM_VIEW_DEC:
@@ -1682,7 +1626,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
             if (IsWindow(calc.hStatWnd))
                 break;
             calc.hStatWnd = CreateDialog(calc.hInstance,
-                                    MAKEINTRESOURCE(IDD_DIALOG_STAT), hWnd, DlgStatProc);
+                                    MAKEINTRESOURCE(IDD_DIALOG_STAT), hWnd, (DLGPROC)DlgStatProc);
             if (calc.hStatWnd != NULL) {
                 enable_allowed_controls(hWnd, calc.base);
                 SendMessage(calc.hStatWnd, WM_SETFOCUS, 0, 0);
@@ -1771,13 +1715,14 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
         /* ignore hwnd: dialogs are already visible! */
         if (calc.layout == CALC_LAYOUT_SCIENTIFIC)
             dwLayout = IDD_DIALOG_SCIENTIFIC;
-        else if (calc.layout == CALC_LAYOUT_CONVERSION)
+        else
+        if (calc.layout == CALC_LAYOUT_CONVERSION)
             dwLayout = IDD_DIALOG_CONVERSION;
         else
             dwLayout = IDD_DIALOG_STANDARD;
 
         /* This call will always fail if UNICODE for Win9x */
-        if (NULL == CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, DlgMainProc))
+        if (NULL == CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, (DLGPROC)DlgMainProc))
             break;
 
         while (GetMessage(&msg, NULL, 0, 0)) {

reactos/base/applications/charmap/CMakeLists.txt

@@ -5,10 +5,10 @@ list(APPEND SOURCE
     lrgcell.c
     map.c
     settings.c
-    precomp.h)
+    charmap.rc)
 
-add_executable(charmap ${SOURCE} charmap.rc)
+add_executable(charmap ${SOURCE})
 set_module_type(charmap win32gui UNICODE)
 add_importlibs(charmap advapi32 user32 gdi32 comctl32 msvcrt kernel32)
-add_pch(charmap precomp.h SOURCE)
+add_pch(charmap precomp.h)
 add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all)

reactos/base/applications/charmap/about.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include "precomp.h"
+#include <precomp.h>
 
 static
 INT_PTR

reactos/base/applications/charmap/charmap.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include "precomp.h"
+#include <precomp.h>
 
 #include <commctrl.h>
 #include <richedit.h>
@@ -34,12 +34,9 @@ EnumFontNames(ENUMLOGFONTEXW *lpelfe,
     HWND hwndCombo = (HWND)lParam;
     LPWSTR pszName  = lpelfe->elfLogFont.lfFaceName;
 
-    /* Skip rotated font */
-    if(pszName[0] == L'@') return 1;
-
     /* make sure font doesn't already exist in our list */
     if(SendMessageW(hwndCombo,
-                    CB_FINDSTRINGEXACT,
+                    CB_FINDSTRING,
                     0,
                     (LPARAM)pszName) == CB_ERR)
     {
@@ -324,7 +321,7 @@ CharMapDlgProc(HWND hDlg,
 
             ChangeMapFont(hDlg);
 
-            // Configure Richedit control for sending notification changes.
+            // Configure Richedi control for sending notification changes.
             evMask = SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_GETEVENTMASK, 0, 0);
             evMask |= ENM_CHANGE;
             SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_SETEVENTMASK, 0, (LPARAM)evMask);

reactos/base/applications/charmap/charmap.rc

@@ -81,15 +81,15 @@ IDI_ICON ICON "res/charmap.ico"
 #ifdef LANGUAGE_SK_SK
     #include "lang/sk-SK.rc"
 #endif
-#ifdef LANGUAGE_SQ_AL
-    #include "lang/sq-AL.rc"
-#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif

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

@@ -1,24 +1,21 @@
-/* Spanish Language resource file.
- * Translated by: ?? and Ismael Ferreras Morezuelas <2014-11-07> */
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
-    LTEXT "Fuente:", IDC_STATIC, 6, 7, 24, 9
+    LTEXT "Fuente :", IDC_STATIC, 6, 7, 24, 9
     COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
              WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
     PUSHBUTTON "Ayuda", IDC_CMHELP, 249, 5, 35, 13
     CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
             WS_VSCROLL, 20, 22, 266, 156
-    LTEXT "Caracteres a copiar:", IDC_STATIC, 6, 188, 66, 9
+    LTEXT "Caracteres a copiar :", IDC_STATIC, 6, 188, 66, 9
     CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER |
             WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
     DEFPUSHBUTTON "Seleccionar", IDC_SELECT, 194, 186, 44, 13
     PUSHBUTTON "Copiar", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-    CONTROL "Vista avanzada", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
+    CONTROL "Advanced view", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
             WS_TABSTOP, 8, 208, 95, 10
 END
 
@@ -26,23 +23,23 @@ IDD_ADVANCED DIALOGEX 0, 0, 292, 64
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Juego de caracteres:", IDC_STATIC, 2, 7, 68, 8, SS_RIGHT
-    COMBOBOX IDC_COMBO_CHARSET, 74, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Agrupar:", IDC_STATIC, 2, 26, 68, 8, SS_RIGHT
-    COMBOBOX IDC_COMBO_GROUPBY, 74, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "Buscar", IDC_BUTTON_SEARCH, 200, 44, 50, 14
-    EDITTEXT IDC_EDIT_SEARCH, 74, 44, 116, 14, ES_AUTOHSCROLL
-    LTEXT "Buscar por:", IDC_STATIC, 2, 47, 68, 8, SS_RIGHT
+    LTEXT "Charset:", IDC_STATIC, 8, 8, 48, 8
+    COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Group by:", IDC_STATIC, 8, 28, 50, 8
+    COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Search", IDC_BUTTON_SEARCH, 200, 44, 50, 14
+    EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL
+    LTEXT "Search for:", IDC_STATIC, 8, 48, 42, 8
     LTEXT "Unicode:", IDC_STATIC, 200, 8, 30, 8
     EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22, 16, 210, 182
-CAPTION "Acerca del Mapa de caracteres"
+CAPTION "Acerca de  Character Map"
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-    LTEXT "Mapa de caracteres v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
+    LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
     PUSHBUTTON "Cerrar", 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 |
@@ -51,7 +48,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LICENSE "Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo los términos de la GNU General Public License tal y como se publica por la Free Software Foundation; ya sea la versión 2 de la Licencia, o (bajo tu discreción) cualquier versión posterior.\r\n\r\nEste programa se distribuye con el fin de ser útil, pero viene SIN NINGUNA GARANTÍA; sin tan siquiera la garantía implícita de COMERCIALIZACIÓN o la de IDONEIDAD PARA UN PROPÓSITO CONCRETO. Para más información lee la GNU General Public License.\r\n\r\nDeberías de haber recibido una copia de la GNU General Public License con el programa; si no, puedes escribir a la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 EE.UU."
+    IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
     IDS_ABOUT "&Acerca de ..."
-    IDS_TITLE "Mapa de caracteres"
+    IDS_TITLE "Character Map"
 END

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

@@ -1,7 +1,8 @@
 /*
  * FILE:             base/applications/charmap/lang/ro-RO.rc
  *                   ReactOS Project (http://www.reactos.org)
- * TRANSLATOR:       Ștefan Fulea (stefan dot fulea at mail dot md)
+ * TRANSLATOR:       Fulea Ștefan (PM on ReactOS Forum at fulea.stefan)
+ * LAST CHANGE:      2011-12-19  corrections
  */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -41,11 +42,11 @@ BEGIN
 END
 
 IDD_ABOUTBOX DIALOGEX 22, 16, 270, 182
-CAPTION "Despre"
+CAPTION "Despre Harta caracterelor"
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-    LTEXT "Hartă a caracterelor v0.1\nDrept de autor (C) 2007 Ged Murphy (gedmurphy@reactos.org)\nTraducere de Ștefan Fulea (stefan.fulea@mail.md)", IDC_STATIC, 48, 7, 210, 36
+    LTEXT "Harta caracterelor v0.1\nDrept de autor (C) 2007 Ged Murphy (gedmurphy@reactos.org)\nTraducere de Fulea Ștefan", IDC_STATIC, 48, 7, 210, 36
     PUSHBUTTON "Î&nchide", IDOK, 105, 162, 44, 15
     ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30
     EDITTEXT IDC_LICENSE_EDIT, 8, 44, 254, 107, WS_VISIBLE | WS_VSCROLL |
@@ -56,5 +57,5 @@ STRINGTABLE
 BEGIN
     IDS_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_ABOUT "&Despre…"
-    IDS_TITLE "Hartă a caracterelor"
+    IDS_TITLE "Harta caracterelor"
 END

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

@@ -1,4 +1,4 @@
-/* Russian language resource file by Dmitry Chapyshev, 2007-06-10,Kudratov Olimjon (olim98@bk.ru) */
+/* Russian language resource file (Dmitry Chapyshev, 2007-06-10) */
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
@@ -12,12 +12,12 @@ BEGIN
     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 |
+    CONTROL "Расширенный вид", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
             WS_TABSTOP, 8, 208, 95, 10
 END
 
@@ -27,11 +27,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     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, 8, 48, 42, 8
     LTEXT "Юникод:", IDC_STATIC, 200, 8, 30, 8
     EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL
 END

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

@@ -1,4 +1,4 @@
-/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+/* TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -6,7 +6,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
-    LTEXT "Yazı Tipi:", IDC_STATIC, 6, 7, 24, 9
+    LTEXT "Yazı Türü:", IDC_STATIC, 6, 7, 24, 9
     COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
              WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
     PUSHBUTTON "Yardım", IDC_CMHELP, 249, 5, 35, 13
@@ -25,23 +25,23 @@ IDD_ADVANCED DIALOGEX 0, 0, 292, 64
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Damga Öbeği:", IDC_STATIC, 8, 8, 48, 8
+    LTEXT "Damga Kümesi:", IDC_STATIC, 8, 8, 48, 8
     COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "Takımla:", IDC_STATIC, 8, 28, 50, 8
     COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON "Ara", IDC_BUTTON_SEARCH, 200, 44, 50, 14
     EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL
     LTEXT "Ada Göre Ara:", IDC_STATIC, 8, 48, 42, 8
-    LTEXT "Evrenlik Kod:", IDC_STATIC, 200, 8, 30, 8
+    LTEXT "Evrenlik Düzgü:", IDC_STATIC, 200, 8, 30, 8
     EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22, 16, 210, 182
-CAPTION "Damga Eşlemi Üzerine"
+CAPTION "Karakter Eşlem Hakkında"
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-    LTEXT "Damga Eşlemi - Sürüm: 0.1\nTelif Hakkı: 2007 - Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
+    LTEXT "Karakter Eşlem - Sürüm: 0.1\nTelif Hakkı: 2007 - Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
     PUSHBUTTON "Tamam", 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 |
@@ -50,7 +50,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) şartları altında yeniden dağıtabilir veyâ değiştirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceği beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBİR GÜVENCESİ YOKTUR, SATILABİLİRLİĞİN ve BELİRLİ BİR AMACA UYGUNLUĞUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eğer yoksa Özgür Yazılım Vakfı AŞ'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis 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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
-    IDS_ABOUT "&Üzerine..."
-    IDS_TITLE "Damga Eşlemi"
+    IDS_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu yazılım özgürdür, yâni bu yazılım Özgür Yazılım Vakfı'nın yayınladığı GNU Umûmî Kamu Ruhsatı'nın 2. sürümü veyâ daha sonraki sürümleri altında yeniden dağıtabilir veyâ değiştirebilirsiniz.\r\n\r\nBu yazılım, kullanışlı olabileceği umuduyla dağıtılmıştır, ancak bilhassa SATILABİLİRLİK ve BELİRLİ BİR AMACA UYGUNLUK açısından olmak üzere bu yazılımın hiçbir güvencesi yoktur. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu yazılımla birlikte GNU Umûmî Kamu Ruhsatı'nın bir sûretine de iye olmanız gerekir, eğer yoksa Özgür Yazılım Vakfı A.Ş.'ne (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis 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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+    IDS_ABOUT "&Hakkında"
+    IDS_TITLE "Karakter Eşlem"
 END

reactos/base/applications/charmap/lrgcell.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include "precomp.h"
+#include <precomp.h>
 
 static
 HFONT
@@ -35,7 +35,7 @@ SetLrgFont(PMAP infoPtr)
         {
             SendMessageW(hCombo,
                          WM_GETTEXT,
-                         Len + 1,
+                         31,
                          (LPARAM)lpFontName);
 
             ZeroMemory(&lf,
@@ -48,9 +48,8 @@ SetLrgFont(PMAP infoPtr)
                       hdc);
 
             lf.lfCharSet =  DEFAULT_CHARSET;
-            wcsncpy(lf.lfFaceName,
-                    lpFontName,
-                    sizeof(lf.lfFaceName) / sizeof(lf.lfFaceName[0]));
+            wcscpy(lf.lfFaceName,
+                   lpFontName);
 
             hFont = CreateFontIndirectW(&lf);
 

reactos/base/applications/charmap/map.c

@@ -7,15 +7,13 @@
  *
  */
 
-#include "precomp.h"
+#include <precomp.h>
 
 #include <stdlib.h>
 
 static const WCHAR szMapWndClass[] = L"FontMapWnd";
 static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd";
 
-#define MAX_ROWS (0xFFFF / XCELLS) + 1 - YCELLS
-
 static
 VOID
 TagFontToCell(PCELL pCell,
@@ -230,9 +228,8 @@ SetFont(PMAP infoPtr,
     ReleaseDC(infoPtr->hMapWnd, hdc);
 
     infoPtr->CurrentFont.lfCharSet =  DEFAULT_CHARSET;
-    wcsncpy(infoPtr->CurrentFont.lfFaceName,
-            lpFontName,
-            sizeof(infoPtr->CurrentFont.lfFaceName) / sizeof(infoPtr->CurrentFont.lfFaceName[0]));
+    wcscpy(infoPtr->CurrentFont.lfFaceName,
+           lpFontName);
 
     infoPtr->hFont = CreateFontIndirectW(&infoPtr->CurrentFont);
 
@@ -379,7 +376,7 @@ OnCreate(PMAP infoPtr,
 
             SetGrid(infoPtr);
 
-            SetScrollRange(hwnd, SB_VERT, 0, MAX_ROWS, FALSE);
+            SetScrollRange(hwnd, SB_VERT, 0, 255, FALSE);
             SetScrollPos(hwnd, SB_VERT, 0, TRUE);
 
             Ret = TRUE;
@@ -425,7 +422,7 @@ OnVScroll(PMAP infoPtr,
        }
 
     infoPtr->iYStart = max(0,
-                         min(infoPtr->iYStart, MAX_ROWS));
+                         min(infoPtr->iYStart, 255*16));
 
     iYDiff = iOldYStart - infoPtr->iYStart;
     if (iYDiff)

reactos/base/applications/charmap/settings.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include "precomp.h"
+#include <precomp.h>
 
 #include <winreg.h>
 #include <windowsx.h>
@@ -90,9 +90,8 @@ extern void LoadSettings(void)
         }
 
         RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvanChecked, &size);
-
         if(dwAdvanChecked == TRUE)
-            SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, MF_CHECKED, 0);
+            SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, (dwAdvanChecked ? MF_CHECKED : MF_UNCHECKED), 0);
 
     RegCloseKey(hKey);
     }
@@ -123,13 +122,13 @@ extern void SaveSettings(void)
             hWnd = GetDlgItem(hCharmapDlg, IDC_FONTCOMBO);
             ComboBox_GetText(hWnd, szBuffer, MAX_PATH);
 
-            if(*szBuffer != '\0')
+            if(szBuffer != NULL && *szBuffer != '\0')
                 RegSetValueEx(hKey, _T("Font"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) MAX_PATH);
 
             hWnd = GetDlgItem(hCharmapDlg, IDC_COMBO_CHARSET);
             ComboBox_GetText(hWnd, szBuffer, MAX_PATH);
 
-            if(*szBuffer != '\0')
+            if(szBuffer != NULL && *szBuffer != '\0')
                 RegSetValueEx(hKey, _T("CodePage"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) MAX_PATH);
 
             RegSetValueEx(hKey, _T("Advanced"), 0, REG_DWORD, (LPBYTE)&Settings.IsAdvancedView, (DWORD) sizeof(DWORD));

reactos/base/applications/cmdutils/CMakeLists.txt

@@ -1,18 +1,11 @@
-add_subdirectory(comp)
-add_subdirectory(cscript)
 add_subdirectory(dbgprint)
 add_subdirectory(doskey)
 add_subdirectory(find)
 add_subdirectory(help)
 add_subdirectory(hostname)
 add_subdirectory(lodctr)
-add_subdirectory(mode)
 add_subdirectory(more)
 add_subdirectory(reg)
-add_subdirectory(sort)
 add_subdirectory(taskkill)
-add_subdirectory(tree)
-add_subdirectory(whoami)
 add_subdirectory(wmic)
-add_subdirectory(wscript)
 add_subdirectory(xcopy)

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

@@ -1,255 +0,0 @@
-/*
- *  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:        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/base/applications/cmdutils/comp/comp.rc

@@ -1,5 +0,0 @@
-
-#define REACTOS_STR_FILE_DESCRIPTION    "File Compare Utility"
-#define REACTOS_STR_INTERNAL_NAME       "comp"
-#define REACTOS_STR_ORIGINAL_FILENAME   "comp.exe"
-#include <reactos/version.rc>

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

@@ -1,21 +0,0 @@
-
-add_definitions(-DCSCRIPT_BUILD)
-set(wscript_folder ${REACTOS_SOURCE_DIR}/base/applications/cmdutils/wscript)
-include_directories(${wscript_folder})
-
-list(APPEND SOURCE
-    ${wscript_folder}/arguments.c
-    ${wscript_folder}/host.c
-    ${wscript_folder}/main.c
-    ${wscript_folder}/wscript.h)
-
-add_executable(cscript ${SOURCE} rsrc.rc)
-add_idl_headers(cscript_idlheader ihost.idl)
-add_typelib(ihost.idl)
-set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb)
-target_link_libraries(cscript uuid wine)
-set_module_type(cscript win32cui UNICODE)
-add_importlibs(cscript shell32 oleaut32 ole32 advapi32 msvcrt kernel32 ntdll)
-add_dependencies(cscript stdole2 cscript_idlheader)
-add_pch(cscript ${wscript_folder}/wscript.h SOURCE)
-add_cd_file(TARGET cscript DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/cscript/ihost.idl

@@ -1,188 +0,0 @@
-/*
- * Copyright 2010 Jacek Caban for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#pragma makedep typelib
-
-#include "ihost_dispid.h"
-
-import "oaidl.idl";
-
-[
-    uuid(60254ca0-953b-11cf-8c96-00aa00b8708c),
-    version(5.6),
-]
-library IHost
-{
-    importlib("stdole2.tlb");
-
-    [
-        odl,
-        uuid(2cc5a9d1-b1e5-11d3-a286-00104bd35090),
-        dual,
-        oleautomation
-    ]
-    interface IArguments2 : IDispatch {
-        [id(DISPID_VALUE)]
-        HRESULT Item(
-            [in] LONG Index,
-            [out, retval] BSTR *out_Value);
-
-        [id(IARGUMENTS2_COUNT_DISPID)]
-        HRESULT Count([out, retval] LONG *out_Count);
-
-        [id(IARGUMENTS2_LENGTH_DISPID), propget]
-        HRESULT length([out, retval] LONG *out_Count);
-    }
-
-    [
-        odl,
-        uuid(53bad8c1-e718-11cf-893d-00a0c9054228),
-        hidden,
-        dual,
-        nonextensible,
-        oleautomation
-    ]
-    interface ITextStream : IDispatch {
-        [id(ITEXTSTREAM_LINE_DISPID), propget]
-        HRESULT Line([out, retval] LONG *Line);
-
-        [id(ITEXTSTREAM_COLUMN_DISPID), propget]
-        HRESULT Column([out, retval] LONG *Column);
-
-        [id(ITEXTSTREAM_ATENDOFSTREAM_DISPID), propget]
-        HRESULT AtEndOfStream([out, retval] VARIANT_BOOL *EOS);
-
-        [id(ITEXTSTREAM_ATENDOFLINE_DISPID), propget]
-        HRESULT AtEndOfLine([out, retval] VARIANT_BOOL *EOL);
-
-        [id(ITEXTSTREAM_READ_DISPID)]
-        HRESULT Read(
-            [in] LONG Characters,
-            [out, retval] BSTR *Text);
-
-        [id(ITEXTSTREAM_READLINE_DISPID)]
-        HRESULT ReadLine([out, retval] BSTR *Text);
-
-        [id(ITEXTSTREAM_READALL_DISPID)]
-        HRESULT ReadAll([out, retval] BSTR *Text);
-
-        [id(ITEXTSTREAM_WRITE_DISPID)]
-        HRESULT Write([in] BSTR Text);
-
-        [id(ITEXTSTREAM_WRITELINE_DISPID)]
-        HRESULT WriteLine([in, optional, defaultvalue("")] BSTR Text);
-
-        [id(ITEXTSTREAM_WRITEBLANKLINES_DISPID)]
-        HRESULT WriteBlankLines([in] LONG Lines);
-
-        [id(ITEXTSTREAM_SKIP_DISPID)]
-        HRESULT Skip([in] LONG Characters);
-
-        [id(ITEXTSTREAM_SKIPLINE_DISPID)]
-        HRESULT SkipLine();
-
-        [id(ITEXTSTREAM_CLOSE_DISPID)]
-        HRESULT Close();
-    }
-
-    [
-        odl,
-        uuid(91afbd1b-5feb-43f5-b028-e2ca960617ec),
-        dual,
-        oleautomation
-    ]
-    interface IHost : IDispatch {
-        [id(IHOST_NAME_DISPID), propget]
-        HRESULT Name([out, retval] BSTR *out_Name);
-
-        [id(IHOST_APPLICATION_DISPID), propget]
-        HRESULT Application([out, retval] IDispatch **out_Dispatch);
-
-        [id(IHOST_FULLNAME_DISPID), propget]
-        HRESULT FullName([out, retval] BSTR *out_Path);
-
-        [id(IHOST_PATH_DISPID), propget]
-        HRESULT Path([out, retval] BSTR* out_Path);
-
-        [id(IHOST_INTERACTIVE_DISPID), propget]
-        HRESULT Interactive([out, retval] VARIANT_BOOL *out_Interactive);
-
-        [id(IHOST_INTERACTIVE_DISPID), propput]
-        HRESULT Interactive([in] VARIANT_BOOL out_Interactive);
-
-        [id(IHOST_QUIT_DISPID)]
-        HRESULT Quit([in, optional, defaultvalue(0)] int ExitCode);
-
-        [id(IHOST_SCRIPTNAME_DISPID), propget]
-        HRESULT ScriptName([out, retval] BSTR *out_ScriptName);
-
-        [id(IHOST_SCRIPTFULLNAME_DISPID), propget]
-        HRESULT ScriptFullName([out, retval] BSTR* out_ScriptFullName);
-
-        [id(IHOST_ARGUMENTS_DISPID), propget]
-        HRESULT Arguments([out, retval] IArguments2 **out_Arguments);
-
-        [id(IHOST_VERSION_DISPID), propget]
-        HRESULT Version([out, retval] BSTR *out_Version);
-
-        [id(IHOST_BUILDVERSION_DISPID), propget]
-        HRESULT BuildVersion([out, retval] int *out_Build);
-
-        [id(IHOST_TIMEOUT_DISPID), propget]
-        HRESULT Timeout([out, retval] LONG *out_Timeout);
-
-        [id(IHOST_TIMEOUT_DISPID), propput]
-        HRESULT Timeout([in] LONG out_Timeout);
-
-        [id(IHOST_CREATEOBJECT_DISPID)]
-        HRESULT CreateObject(
-                [in] BSTR ProgID,
-                [in, optional, defaultvalue("")] BSTR Prefix,
-                [out, retval] IDispatch **out_Dispatch);
-
-        [id(IHOST_ECHO_DISPID), vararg]
-        HRESULT Echo([in] SAFEARRAY(VARIANT) pArgs);
-
-        [id(IHOST_GETOBJECT_DISPID)]
-        HRESULT GetObject(
-            [in] BSTR Pathname,
-            [in, optional, defaultvalue("")] BSTR ProgID,
-            [in, optional, defaultvalue("")] BSTR Prefix,
-            [out, retval] IDispatch **out_Dispatch);
-
-        [id(IHOST_DISCONNECTOBJECT_DISPID)]
-        HRESULT DisconnectObject([in] IDispatch *Object);
-
-        [id(IHOST_SLEEP_DISPID)]
-        HRESULT Sleep([in] LONG Time);
-
-        [id(IHOST_CONNECTOBJECT_DISPID)]
-        HRESULT ConnectObject(
-            [in] IDispatch *Object,
-            [in] BSTR Prefix);
-
-        [id(IHOST_STDIN_DISPID), propget]
-        HRESULT StdIn([out, retval] ITextStream **out_ppts);
-
-        [id(IHOST_STDOUT_DISPID), propget]
-        HRESULT StdOut([out, retval] ITextStream **ppts);
-
-        [id(IHOST_STDERR_DISPID), propget]
-        HRESULT StdErr([out, retval] ITextStream **ppts);
-    }
-}

reactos/base/applications/cmdutils/cscript/rsrc.rc

@@ -1,20 +0,0 @@
-/*
- * Copyright 2010 Jacek Caban for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/* @makedep: ihost.tlb */
-1 TYPELIB ihost.tlb

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

@@ -16,111 +16,109 @@
 
 int _tmain(int argc, TCHAR ** argv)
 {
-    TCHAR * buf;
-    int bufsize;
-    int i;
-    int offset;
+	TCHAR * buf;
+	int bufsize;
+	int i;
+	int offset;
 
-    bufsize = 0;
-    for(i = 1; i < argc; i++)
-    {
-        bufsize += _tcslen(argv[i]) + 1;
-    }
+	bufsize = 0;
+	for(i = 1; i < argc; i++)
+	{
+		bufsize += _tcslen(argv[i]) + 1;
+	}
 
-    if (!bufsize)
-    {
-        return -1;
-    }
+	if (!bufsize)
+	{
+		return -1;
+	}
 
-    if (_tcsstr(argv[1], "--winetest") && (argc == 3))
-    {
-        char   psBuffer[128];
-        char   psBuffer2[128];
-        char   *nlptr2;
-        char   cmd[255];
-        char   test[300];
-        FILE   *pPipe;
-        FILE   *pPipe2;
+	if (_tcsstr(argv[1], "--winetest") && (argc == 3))
+	{
+		char   psBuffer[128];
+		char   psBuffer2[128];
+		char   *nlptr2;
+		char   cmd[255];
+		char   test[300];
+		FILE   *pPipe;
+		FILE   *pPipe2;
 
-        /* get available tests */
-        strcpy(cmd, argv[2]);
-        strcat(cmd, " --list");        
-        pPipe = _tpopen(cmd, "r");
-        if (pPipe != NULL)
-        {
-            while(fgets(psBuffer, 128, pPipe))
-            {
-                if (psBuffer[0] == ' ')
-                {
-                    strcpy(cmd, argv[2]);
-                    strcat(cmd, " ");
-                    strcat(cmd, psBuffer+4);
-                    /* run the current test */
-                    strcpy(test, "\n\nRunning ");
-                    strcat(test, cmd);
-                    OutputDebugStringA(test);
-                    pPipe2 = _popen(cmd, "r");
-                    if (pPipe2 != NULL)
-                    {
-                        while(fgets(psBuffer2, 128, pPipe2))
-                        {
-                            nlptr2 = strchr(psBuffer2, '\n');
-                            if (nlptr2)
-                                *nlptr2 = '\0';
-                            puts(psBuffer2);
-                            OutputDebugStringA(psBuffer2);
-                        }
-                        _pclose(pPipe2);
-                    }
-                }
-            }
-            _pclose(pPipe);
-        }
-    }
-    else if (_tcsstr(argv[1], "--process") && (argc == 3))
-    {
-        char   psBuffer[128];
-        FILE   *pPipe;
+		/* get available tests */
+		pPipe = _tpopen(argv[2], "r");
+		if (pPipe != NULL)
+		{
+			while(fgets(psBuffer, 128, pPipe))
+			{
+				if (psBuffer[0] == ' ')
+				{
+					strcpy(cmd, argv[2]);
+					strcat(cmd, " ");
+					strcat(cmd, psBuffer+4);
+					/* run the current test */
+					strcpy(test, "\n\nRunning ");
+					strcat(test, cmd);
+					OutputDebugStringA(test);
+					pPipe2 = _popen(cmd, "r");
+					if (pPipe2 != NULL)
+					{
+						while(fgets(psBuffer2, 128, pPipe2))
+						{
+							nlptr2 = strchr(psBuffer2, '\n');
+							if (nlptr2)
+								*nlptr2 = '\0';
+							puts(psBuffer2);
+							OutputDebugStringA(psBuffer2);
+						}
+						_pclose(pPipe2);
+					}
+				}
+			}
+			_pclose(pPipe);
+		}
+	}
+	else if (_tcsstr(argv[1], "--process") && (argc == 3))
+	{
+		char   psBuffer[128];
+		FILE   *pPipe;
 
-        pPipe = _tpopen(argv[2], "r");
-        if (pPipe != NULL)
-        {
-            while(fgets(psBuffer, 128, pPipe))
-            {
-                puts(psBuffer);
-                OutputDebugStringA(psBuffer);
-            }
-            _pclose(pPipe);
-        }
-    }
-    else
-    {
-        buf = HeapAlloc(GetProcessHeap(), 0, (bufsize+1) * sizeof(TCHAR));
-        if (!buf)
-        {
-            return -1;
-        }
+		pPipe = _tpopen(argv[2], "r");
+		if (pPipe != NULL)
+		{
+			while(fgets(psBuffer, 128, pPipe))
+			{
+				puts(psBuffer);
+				OutputDebugStringA(psBuffer);
+			}
+			_pclose(pPipe);
+		}
+	}
+	else
+	{
+		buf = HeapAlloc(GetProcessHeap(), 0, (bufsize+1) * sizeof(TCHAR));
+		if (!buf)
+		{
+			return -1;
+		}
 
-        offset = 0;
-        for(i = 1; i < argc; i++)
-        {
-            int length = _tcslen(argv[i]);
-            _tcsncpy(&buf[offset], argv[i], length);
-            offset += length;
-            if (i + 1 < argc)
-            {
-                buf[offset] = _T(' ');
-            }
-            else
-            {
-                buf[offset] = _T('\n');
-                buf[offset+1] = _T('\0');
-            }
-            offset++;
-        }
-        _putts(buf);
-        OutputDebugString(buf);
-        HeapFree(GetProcessHeap(), 0, buf);
-    }
-    return 0;
+		offset = 0;
+		for(i = 1; i < argc; i++)
+		{
+			int length = _tcslen(argv[i]);
+			_tcsncpy(&buf[offset], argv[i], length);
+			offset += length;
+			if (i + 1 < argc)
+			{
+				buf[offset] = _T(' ');
+			}
+			else
+			{
+				buf[offset] = _T('\n');
+				buf[offset+1] = _T('\0');
+			}
+			offset++;
+		}
+		_putts(buf);
+		OutputDebugString(buf);
+		HeapFree(GetProcessHeap(), 0, buf);
+	}
+	return 0;
 }

reactos/base/applications/cmdutils/doskey/doskey.rc

@@ -2,7 +2,7 @@
 
 #include "doskey.h"
 
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Doskey Command"
+#define REACTOS_STR_FILE_DESCRIPTION  "W32 doskey command"
 #define REACTOS_STR_INTERNAL_NAME     "doskey"
 #define REACTOS_STR_ORIGINAL_FILENAME "doskey.exe"
 #include <reactos/version.rc>
@@ -34,9 +34,6 @@
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif

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

@@ -9,9 +9,9 @@ DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\
 \n\
   /INSERT             Aktiviert den Einfügemodus.\n\
   /OVERSTRIKE         Deaktiviert den Einfügemodus.\n\
-  /EXENAME=exename    Gibt den Namen der Anwendung an, deren Einstellungen\n\
-                      angezeigt oder geändert werden sollen.\n\
-                      Der Standardwert ist cmd.exe.\n\
+  /EXENAME=exename    Legt den Namen der Anwendung, auf die die Einstel-\n\
+                      lungen angewendet werden sollen, fest. Der Standard-\n\
+                      wert ist cmd.exe.\n\
   /HISTORY            Zeigt den Befehlsverlauf an.\n\
   /LISTSIZE=size      Legt die Anzahl der Befehle per Verlaufspuffer fest.\n\
   /REINSTALL          Leert den Befehlsverlauf.\n\

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

@@ -6,7 +6,7 @@
  *             2011-10-17  diacritics change, other minor changes
  */
 
-LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN

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

@@ -1,26 +0,0 @@
-/* Russian translation by Kudratov Olimjon (olim98@bk.ru) */
-
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    IDS_HELP "Редактирование и повторный вызов команд ReactOS; создание макросов DOSKey.\n\
-\n\
-DOSKEY [/REINSTALL] [/LISTSIZE=размер] [/MACROS[:ALL | :модуль]]\n\
-  [/HISTORY] [/INSERT | /OVERSTRIKE] [/EXENAME=модуль] [/MACROFILE=файл]\n\
-  [макрос=[текст]]\n\n\
-  /REINSTALL          Установка новой копии DOSKey.\n\
-  /LISTSIZE=размер    Размер буфера журнала команд.\n\
-  /MACROS             Вывод всех макросов DOSKey.\n\
-  /MACROS:ALL         Вывод всех макросов DOSKey для всех исполняемых\n\
-                      модулей, содержащих макросы DOSKey.\n\
-  /MACROS:модуль      Вывод всех макросов DOSKey для указанного модуля.\n\
-  /HISTORY            Вывод всех команд, хранящихся в памяти.\n\
-  /INSERT             Включение режима вставки.\n\
-  /OVERSTRIKE         Включение режима замены.\n\
-  /EXENAME=модуль     Исполняемый модуль.\n\
-  /MACROFILE=файл     Файл макросов, который следует установить.\n\
-  макрос              Имя нового макроса.\n\
-  текст               Команды, которые следует включить в макрос."
-    IDS_INVALID_MACRO_DEF "Неверный макрос: %s\n"
-END

reactos/base/applications/cmdutils/find/find.c

@@ -125,12 +125,11 @@ find_str (char *sz, FILE *p, int invert_search,
 void
 usage (void)
 {
-  WCHAR wszUsage[4096];
-  char oemUsage[4096];
+	TCHAR lpUsage[4096];
 
-  LoadStringW (GetModuleHandleW (NULL), IDS_USAGE, wszUsage, sizeof(wszUsage) / sizeof(wszUsage[0]));
-  CharToOemW (wszUsage, oemUsage);
-  fputs (oemUsage, stdout);
+	LoadString( GetModuleHandle(NULL), IDS_USAGE, (LPTSTR)lpUsage, 4096);
+	CharToOem(lpUsage, lpUsage);
+	printf( lpUsage );
 }
 
 
@@ -140,8 +139,7 @@ main (int argc, char **argv)
 {
   char *opt, *needle = NULL;
   int ret = 0;
-  WCHAR wszMessage[4096];
-  char oemMessage[4096];
+  TCHAR lpMessage[4096];
 
   int invert_search = 0;		/* flag to invert the search */
   int count_lines = 0;			/* flag to whether/not count lines */
@@ -218,9 +216,9 @@ main (int argc, char **argv)
 	{
 	  /* We were not able to find a file. Display a message and
 	     set the exit status. */
-	  LoadStringW (GetModuleHandleW (NULL), IDS_NO_SUCH_FILE, wszMessage, sizeof(wszMessage) / sizeof(wszMessage[0]));
-	  CharToOemW (wszMessage, oemMessage);
-	  fprintf (stderr, oemMessage, *argv);
+	  LoadString( GetModuleHandle(NULL), IDS_NO_SUCH_FILE, (LPTSTR)lpMessage, 4096);
+	  CharToOem(lpMessage, lpMessage);
+	  fprintf (stderr, lpMessage, *argv);//
 	}
       else
         {
@@ -237,9 +235,9 @@ main (int argc, char **argv)
 	        }
  	      else
 	        {
-	          LoadStringW (GetModuleHandleW (NULL), IDS_CANNOT_OPEN, wszMessage, sizeof(wszMessage) / sizeof(wszMessage[0]));
-	          CharToOemW (wszMessage, oemMessage);
-	          fprintf (stderr, oemMessage,
+	          LoadString(GetModuleHandle(NULL), IDS_CANNOT_OPEN, (LPTSTR)lpMessage, 4096);
+	          CharToOem(lpMessage, lpMessage);
+	          fprintf (stderr, lpMessage,
 		           finddata.name);
                 }
 	    }

reactos/base/applications/cmdutils/find/find.rc

@@ -2,7 +2,7 @@
 
 #include "resource.h"
 
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Find Command"
+#define REACTOS_STR_FILE_DESCRIPTION  "W32 find command"
 #define REACTOS_STR_INTERNAL_NAME     "find"
 #define REACTOS_STR_ORIGINAL_FILENAME "find.exe"
 #include <reactos/version.rc>

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

@@ -3,8 +3,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 STRINGTABLE
 BEGIN
     IDS_USAGE "Sucht in einer Datei nach einer Zeichenfolge.\n\n\
-  FIND [ /C ] [ /I ] [ /N ] [ /V ] ""Zeichenfolge""\n\
-     [[Laufwerk:][Pfad]Dateiname]]\n\
+  FIND [ /C ] [ /I ] [ /N ] [ /V ] ""string"" [ file... ]\n\
     /C  Zeigt nur die Anzahl der die Zeichenfolge enthaltenen Zeilen an.\n\
     /I  Ignoriert Groß-/Kleinbuchstaben bei der Suche.\n\
     /N  Zeigt die Zeilen mit ihren Zeilennummern an.\n\

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

@@ -2,15 +2,12 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "Поиск текстовой строки в одном или нескольких файлах.\n\n\
-FIND [/V] [/C] [/N] [/I] ""строка"" [[диск:][путь]имя_файла[ ...]]\n\
-  /V         Вывод всех строк, НЕ содержащих заданную строку.\n\
-  /C         Вывод только общего числа строк, содержащих заданную строку.\n\
-  /N         Вывод номеров отображаемых строк.\n\
-  /I         Поиск без учета регистра символов.\n\
-  ""строка""   Искомая строка.\n\
-  [диск:][путь]имя_файла\n\
-             Один или несколько файлов, в которых выполняется поиск."
+    IDS_USAGE "FIND: Поиск текстовой строки в одном или нескольких файлах.\n\n\
+  FIND [ /C ] [ /I ] [ /N ] [ /V ] ""строка"" [ файл... ]\n\
+    /C  Вывод только общего числа строк, содержащих заданную строку.\n\
+    /I  Поиск без учета регистра символов.\n\
+    /N  Вывод номеров отображаемых строк (начиная с 1).\n\
+    /V  Вывод всех строк, НЕ содержащих заданную строку."
     IDS_NO_SUCH_FILE "FIND: %s: Файл не существует.\n"
     IDS_CANNOT_OPEN "FIND: %s: Невозможно открыть файл.\n"
 END

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

@@ -1,6 +1,10 @@
 
-add_executable(cmd_help help.c help.rc)
+add_executable(cmd_help
+    help.c
+    help.rc)
+
 set_module_type(cmd_help win32cui UNICODE)
-add_importlibs(cmd_help user32 msvcrt kernel32)
+add_importlibs(cmd_help msvcrt kernel32 user32)
+
 set_target_properties(cmd_help PROPERTIES OUTPUT_NAME "help")
 add_cd_file(TARGET cmd_help DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/help/help.c

@@ -16,7 +16,6 @@
 #include <winbase.h>
 #include <winuser.h>
 #include <wincon.h>
-#include <strsafe.h>
 
 #include "help.h"
 #include "resource.h"
@@ -26,8 +25,7 @@ BOOL IsConsoleHandle(HANDLE hHandle)
     DWORD dwMode;
 
     /* Check whether the handle may be that of a console... */
-    if ((GetFileType(hHandle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR)
-        return FALSE;
+    if ((GetFileType(hHandle) & FILE_TYPE_CHAR) == 0) return FALSE;
 
     /*
      * It may be. Perform another test... The idea comes from the
@@ -57,7 +55,7 @@ VOID PrintResourceString(INT resID, ...)
     // FIXME: Optimize by using Win32 console functions.
     if (IsConsoleHandle(OutputHandle))
     {
-        vfwprintf(stdout, tmpBuffer, arg_ptr);
+        _vcwprintf(tmpBuffer, arg_ptr);
     }
     else
     {
@@ -136,8 +134,9 @@ int wmain(int argc, WCHAR* argv[])
     /*
      * Run "<command> /?" in the current command processor.
      */
-    StringCbPrintfW(CmdLine, sizeof(CmdLine), L"%ls /?", argv[1]);
-    
+    wcsncpy(CmdLine, argv[1], CMDLINE_LENGTH - wcslen(CmdLine));
+    wcsncat(CmdLine, L" /?" , CMDLINE_LENGTH - wcslen(CmdLine));
+
     _flushall();
     return _wsystem(CmdLine);
 }

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

@@ -9,7 +9,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "Zeigt die Hilfe für Kommandozeilenbefehle an.\n\n\
+    IDS_USAGE "Liefert Informationen über ReactOS Befehle.\n\n\
 HELP [Befehl]\n\n\
   Befehl - Zeige Informationen über diesen Befehl.\n"
     IDS_HELP1 "Übersicht aller verfügbaren Befehle und deren Kurzbeschreibungen\n\n\
@@ -19,11 +19,12 @@ HELP [Befehl]\n\n\
 ?        Listet alle Befehle auf (ohne Erklärung).\n\
 ALIAS    Setzt, löscht oder zeigt den Alias.\n\
 ATTRIB   Zeigt Dateiattribute an bzw. ändert sie.\n\
-BEEP     Gibt einen Piepton durch den Systemlautsprecher aus.\n\
-CALL     Ruft eine Batchdatei aus einer anderen heraus auf.\n\
+BEEP     Gibt einen Piepton durch den PC-Speaker aus.\n\
+CALL     Ruft eine Batchdatei aus einer anderen Batchdatei heraus auf.\n\
 CD       Zeigt den Namen des aktuellen Verzeichnisses an bzw. ändert diesen.\n\
 CHCP     Zeigt die aktive Codepagenummer an bzw. legt diese fest.\n\
-CHOICE   Lässt den Benutzer eine Auswahl aus vorgegebenen Optionen treffen.\n\
+CHOICE   Wartet auf den Benutzer, welcher aus einer Auswahl eine Option\n\
+         wählen muss.\n\
 CLS      Löscht den Bildschirminhalt.\n\
 CMD      Startet eine neue Instanz des ReactOS-Befehlsinterpreters.\n\
 COLOR    Legt die Farben für Hinter- und Vordergrund der Konsole fest.\n\
@@ -36,10 +37,10 @@ ERASE    Löscht eine oder mehrere Dateien.\n\
 EXIT     Beendet das Programm CMD.EXE (Befehlsinterpreter).\n\
 FOR      Führt einen angegebenen Befehl für jede Datei in einem Dateiensatz\n\
          aus.\n\
-FREE     Zeigt die aktuelle Speicherausnutzung für Laufwerke an.\n\
+FREE     Zeigt den (freien) Speicherplatz an.\n\
 GOTO     Setzt den ReactOS-Befehlsinterpreter auf eine markierte Zeile in\n\
          einem Batchprogramm.\n\
-HELP     Zeigt die Hilfe für Kommandozeilenbefehle an.\n\
+HELP     Zeigt Hilfeinformationen zu ReactOS-Befehlen an.\n\
 HISTORY  Listet alle Befehle auf, welche sich im Speicher befinden.\n\
 IF       Verarbeitet Ausdrücke in einer Batchdatei abhängig von Bedingungen.\n\
 LABEL    Erstellt, ändert oder löscht die Bezeichnung eines Volumes.\n\
@@ -55,22 +56,22 @@ PROMPT   Ändert die Eingabeaufforderung.\n\
 PUSHD    Speichert das aktuelle Verzeichnis, und wechselt dann zu einem\n\
          anderen Verzeichnis.\n\
 RD       Entfernt ein Verzeichnis.\n\
-REM      Leitet Kommentare in einer Batchdatei ein.\n\
-REN      Benennt eine oder mehrere Dateien um.\n\
-RENAME   Benennt eine oder mehrere Dateien um.\n\
+REM      Leitet Kommentare in einer Batchdatei.\n\
+REN      Benennt eine od. mehrere Dateien um.\n\
+RENAME   Benennt eine od. mehrere Dateien um.\n\
 REPLACE  Ersetzt Dateien.\n\
 RMDIR    Löscht ein Verzeichnis.\n\
-SCREEN   Bewegt den Eingabezeiger und gibt optional Text aus.\n\
+SCREEN   Bewegt den Cursor und optional die Ausgabe.\n\
 SET      Setzt oder löscht die Umgebungsvariablen bzw. zeigt sie an.\n\
 SHIFT    Verändert die Position ersetzbarer Parameter in Batchdateien.\n\
 START    Startet ein eigenes Fenster, um ein bestimmtes Programm oder einen\n\
          Befehl auszuführen.\n\
 TIME     Zeigt die Systemzeit an bzw. legt sie fest.\n\
-TIMER    Erlaubt die Benutzung von bis zu 10 Stoppuhren.\n\
+TIMER    Erlaubt die Benutzung von bis zu 10 Stoppuhren\n\
 TITLE    Legt den Fenstertitel für das Eingabeaufforderungsfenster fest.\n\
 TYPE     Zeigt den Inhalt einer Textdatei an.\n\
 VER      Zeigt die ReactOS-Version an.\n\
-VERIFY   Legt fest, ob das ordnungsgemäße Schreiben von Dateien auf den\n\
-         Datenträger überprüft werden soll.\n\
+VERIFY   Legt fest, ob überwacht werden soll, ob Dateien korrekt auf den\n\
+         Datenträger geschrieben werden.\n\
 VOL      Zeigt die Datenträgervolumebezeichnung und die Seriennummer an.\n"
 END

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

@@ -1,5 +1,5 @@
 /*
- * FILE:       base/applications/cmdutils/help/lang/ro-RO.rc
+ * FILE:       base/shell/cmd/lang/ro-RO.rc
  *             ReactOS Project (http://www.reactos.org)
  * AUTHOR:     Magnus Olsen, 2005
  * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot md)

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

@@ -7,70 +7,68 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_NO_ENTRY "Данная команда не поддерживается. Воспользуйтесь параметром ""%s /?""\n."
+    IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n."
 END
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "Предоставляет информацию для команд ReactOS.\n\n\
-HELP [команда]\n\n\
-  команда - Отображает информацию для этой команды.\n"
+    IDS_USAGE "Provides Help information for ReactOS commands.\n\n\
+HELP [command]\n\n\
+  command - Display help information for this command.\n"
     IDS_HELP1 "Список всех доступных команд с коротким описанием\n\n\
-HELP [команда]\n\
-команда /?     Выводит подробную информацию о команде\n\n\
+  help команда\n\
+  команда /?     Выводит подробную информацию о команде\n\n\
 ?        Список всех доступных команд без описания.\n\
 ALIAS    Вывод, установка или удаление псевдонимов.\n\
-ATTRIB   Отображение и изменение атрибутов файлов.\n\
+ATTRIB   Вывод и изменение атрибутов файлов.\n\
 BEEP     Звуковой сигнал.\n\
 CALL     Вызов одного пакетного файла из другого.\n\
-CD       Вывод имени либо смена текущей папки.\n\
-CHCP     Вывод либо установка активной кодовой страницы.\n\
-CHOICE   Ждет, пока пользователь не выберет один из указанных\n\
-         в списке символов.\n\
+CD       Вывод имени либо смена текущего каталога.\n\
+CHCP     Вывод или смена текущего номера кодовой страницы.\n\
+CHOICE   Ждет, пока пользователь не выберет один из указанных в списке символов.\n\
 CLS      Очистка экрана.\n\
-CMD      Запуск еще одного интерпретатора командных строк ReactOS.\n\
-COLOR    Установка цветов переднего плана и фона, используемых по умолчанию.\n\
+CMD      Запуск новой копии интерпретатора команд.\n\
+COLOR    Установка цветов по умолчанию для текста и фона.\n\
 COPY     Копирование одного или нескольких файлов в другое место.\n\
-DATE     Вывод либо установка текущей даты.\n\
+DATE     Вывод или изменение даты.\n\
 DELETE   Удаление одного или нескольких файлов.\n\
-DIR      Вывод списка файлов и подпапок из указанной папки.\n\
+DIR      Вывод списка файлов и подкаталогов каталога.\n\
 ECHO     Вывод сообщений и переключение режима отображения команд на экране.\n\
 ERASE    Удаление одного или нескольких файлов.\n\
-EXIT     Завершение работы программы CMD.EXE (интерпретатора командных строк).\n\
-FOR      Запуск указанной команды для каждого из файлов в наборе.\n\
+EXIT     Завершает интерпретатор команд.\n\
+FOR      Запускает указанную команду для каждого файла из набора файлов.\n\
 FREE     (Свободное) дисковое пространство.\n\
-GOTO     Передача управления в отмеченную строку пакетного файла.\n\
-HELP     Выводит справочную информацию о командах ReactOS.\n\
+GOTO     Передача управления содержащей метку строке пакетного файла\n\
+HELP     Предоставляет справочную информацию о командах ReactOS.\n\
 HISTORY  Список запущенных команд\n\
 IF       Оператор условного выполнения команд в пакетном файле.\n\
-LABEL    Создание, изменение и удаление меток тома для дисков.\n\
-MD       Создание папки.\n\
-MKDIR    Создание папки.\n\
-MKLINK   Создание символических и жестких ссылок.\n\
-MOVE     Перемещение одного или нескольких файлов из одной папки в другую.\n\
-PATH     Отображает или устанавливает путь поиска исполняемых файлов.\n\
-PAUSE    Приостанавливает выполнение пакетного файла и выводит сообщение.\n\
-POPD     Восстанавливает предыдущее значение активной папки,\n\
-         сохраненное с помощью команды PUSHD.\n\
-PROMPT   Изменяет приглашение в командной строке ReactOS.\n\
-PUSHD    Сохраняет значение активной папки и переходит к другой папке.\n\
-RD       Удаляет папку.\n\
-REM      Помещает комментарии в пакетные файлы.\n\
-REN      Переименовывает файлы или папки.\n\
-RENAME   Переименовывает файлы или папки.\n\
-REPLACE  Заменяет файлы.\n\
-RMDIR    Удаляет папку.\n\
+LABEL    Создание, изменение и удаление меток тома.\n\
+MD       Создание каталога.\n\
+MKDIR    Создание каталога.\n\
+MKLINK   Creates a filesystem link object.\n\
+MOVE     Перемещение файлов и переименование файлов и каталогов\n\
+PATH     Вывод или задание пути поиска исполняемых файлов.\n\
+PAUSE    Приостановка выполнения пакетного файла.\n\
+POPD     Восттанавливает предыдущее значение текущей директории сохраненное командой\n\
+         PUSHD.\n\
+PROMPT   Изменение приглашения командной строки.\n\
+PUSHD    Сохраняет текущую директорию, а потом меняет ее.\n\
+RD       Удаление каталога.\n\
+REM      Записывает комментарии (замечения) в пакетных файлах.\n\
+REN      Переименование одного или нескольких файлов или каталогов.\n\
+RENAME   Переименование одного или нескольких файлов или каталогов.\n\
+RMDIR    Удаление каталога.\n\
 SCREEN   Перемещение курсора и вывод текста.\n\
-SET      Показывает, устанавливает и удаляет переменные среды ReactOS.\n\
-SHIFT    Изменение положения (сдвиг) подставляемых параметров для\n\
-         пакетного файла.\n"
-    IDS_HELP2 "START    Выполнение программы или команды в отдельном окне.\n\
-TIME     Вывод и установка системного времени.\n\
+SET      Вывод, задание и удаление переменных среды.\n\
+SHIFT    Изменение содержимого (сдвиг) подставляемых параметров для пакетного файла\n"
+    IDS_HELP2 "START    Открывает отдельное окно для запуска указанных команд или программ.\n\
+         Выполняет команду.\n\
+TIME     Вывод или изменение времени.\n\
 TIMER    Секундомер.\n\
-TITLE    Назначение заголовка окна для текущего сеанса интерпретатора\n\
-         командных строк CMD.EXE.\n\
-TYPE     Вывод на экран содержимого текстовых файлов.\n\
-VER      Вывод сведений о версии ReactOS.\n\
-VERIFY   Установка режима проверки правильности записи файлов на диск.\n\
-VOL      Вывод метки и серийного номера тома для диска.\n"
+TITLE    Изменение заголовка окна командной строки.\n\
+TYPE     Вывод содержимого одного или нескольких текстовых файлов.\n\
+VER      Вывод версии ОС.\n\
+VERIFY   Включение или отключение режима проверки правильности записи файлов\n\
+         на диск.\n\
+VOL      Выводит метку тома и серийный номер.\n"
 END

reactos/base/applications/cmdutils/help/lang/uk-UA.rc

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     Command-line interface
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/cmdutils/help/lang/uk-UA.rc
+ * FILE:        base/shell/cmd/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for Command-line interface
  * TRANSLATORS: Artem Reznikov, Igor Paliychuk
  */

reactos/base/applications/cmdutils/help/lang/zh-CN.rc

@@ -4,14 +4,14 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 STRINGTABLE
 BEGIN
-    IDS_NO_ENTRY "通过帮助实用程序不支持此命令。\n试 ""%s /?""\n。"
+    IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n."
 END
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "提供ReactOS命令的帮助信息。\n\n\
+    IDS_USAGE "Provides Help information for ReactOS commands.\n\n\
 HELP [command]\n\n\
-  command - 显示此命令的帮助信息。\n"
+  command - Display help information for this command.\n"
     IDS_HELP1 "列出所有可用命令 (+ 它们的描述)\n\n\
   help 命令\n\
   命令 /?         得到特定命令的更多信息\n\n\

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

@@ -1,5 +1,6 @@
 
 add_executable(hostname hostname.c hostname.rc)
+
 set_module_type(hostname win32cui UNICODE)
 add_importlibs(hostname user32 msvcrt kernel32)
 add_cd_file(TARGET hostname DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/hostname/hostname.rc

@@ -33,9 +33,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
 #ifdef LANGUAGE_SQ_AL
     #include "lang/sq-AL.rc"
 #endif

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

@@ -4,5 +4,5 @@ STRINGTABLE
 BEGIN
     IDS_USAGE "Zeigt den Computernamen an.\n\nhostname"
     IDS_NOSET "Der Befehl hostname -s wird nicht unterstützt."
-    IDS_ERROR "Win32-Fehler"
+    IDS_ERROR "Win32 Fehler"
 END

reactos/base/applications/cmdutils/hostname/lang/pl-PL.rc

@@ -2,7 +2,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "Wyświetla obecną nazwę komputera.\n\nhostname"
+    IDS_USAGE "Wy<EFBFBD>wietla obecn<EFBFBD> nazw<EFBFBD> komputera.\n\nhostname"
     IDS_NOSET "Opcja hostname -s nie jest wspierana."
-    IDS_ERROR "Błąd Win32"
+    IDS_ERROR "B<EFBFBD><EFBFBD>d Win32"
 END

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

@@ -1,8 +0,0 @@
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    IDS_USAGE "Печать имени текущего узла.\n\nhostname"
-    IDS_NOSET "hostname -s не поддерживается."
-    IDS_ERROR "Ошибка Win32"
-END

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

@@ -1,5 +1,7 @@
 
+
 add_executable(lodctr lodctr_main.c)
+
 set_module_type(lodctr win32cui UNICODE)
 add_importlibs(lodctr loadperf msvcrt kernel32)
 add_cd_file(TARGET lodctr DESTINATION reactos/system32 FOR all)

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

@@ -1,6 +0,0 @@
-
-add_executable(mode mode.c mode.rc)
-set_module_type(mode win32cui UNICODE)
-set_target_properties(mode PROPERTIES SUFFIX ".com")
-add_importlibs(mode user32 msvcrt kernel32)
-add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/mode/mode.c

@@ -1,551 +0,0 @@
-/*
- *  ReactOS mode console command
- *
- *  mode.c
- *
- *  Copyright (C) 2002  Robert Dickenson <robd@reactos.org>
- *
- *  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.
- */
-
-#include <windows.h>
-#include <stdio.h>
-
-#define MAX_PORTNAME_LEN 20
-#define MAX_COMPORT_NUM  10
-#define MAX_COMPARAM_LEN 20
-
-#define NUM_ELEMENTS(a) (sizeof(a)/sizeof(a[0]))
-#define ASSERT(a)
-
-const WCHAR* const usage_strings[] =
-{
-    L"Device Status:     MODE [device] [/STATUS]",
-    L"Select code page:  MODE CON[:] CP SELECT=yyy",
-    L"Code page status:  MODE CON[:] CP [/STATUS]",
-    L"Display mode:      MODE CON[:] [COLS=c] [LINES=n]",
-    L"Typematic rate:    MODE CON[:] [RATE=r DELAY=d]",
-    L"Redirect printing: MODE LPTn[:]=COMm[:]",
-    L"Serial port:       MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n" \
-    L"                            [to=on|off] [xon=on|off] [odsr=on|off]\n"    \
-    L"                            [octs=on|off] [dtr=on|off|hs]\n"             \
-    L"                            [rts=on|off|hs|tg] [idsr=on|off]",
-};
-
-const WCHAR* const parity_strings[] =
-{
-    L"None",    // default
-    L"Odd",     // only symbol in this set to have a 'd' in it
-    L"Even",    // ... 'v' in it
-    L"Mark",    // ... 'm' in it
-    L"Space"    // ... 's' and/or a 'c' in it
-};
-
-const WCHAR* const control_strings[] = { L"OFF", L"ON", L"HANDSHAKE", L"TOGGLE" };
-
-const WCHAR* const stopbit_strings[] = { L"1", L"1.5", L"2" };
-
-
-int Usage()
-{
-    int i;
-
-    wprintf(L"\nConfigures system devices.\n\n");
-    for (i = 0; i < NUM_ELEMENTS(usage_strings); i++)
-    {
-        wprintf(L"%s\n", usage_strings[i]);
-    }
-    wprintf(L"\n");
-    return 0;
-}
-
-int QueryDevices()
-{
-    WCHAR buffer[20240];
-    int len;
-    WCHAR* ptr = buffer;
-
-    *ptr = L'\0';
-    if (QueryDosDeviceW(NULL, buffer, NUM_ELEMENTS(buffer)))
-    {
-        while (*ptr != L'\0')
-        {
-            len = wcslen(ptr);
-            if (wcsstr(ptr, L"COM"))
-            {
-                wprintf(L"    Found serial device - %s\n", ptr);
-            }
-            else if (wcsstr(ptr, L"PRN"))
-            {
-                wprintf(L"    Found printer device - %s\n", ptr);
-            }
-            else if (wcsstr(ptr, L"LPT"))
-            {
-                wprintf(L"    Found parallel device - %s\n", ptr);
-            }
-            else
-            {
-                // wprintf(L"    Found other device - %s\n", ptr);
-            }
-            ptr += (len+1);
-        }
-    }
-    else
-    {
-        wprintf(L"    ERROR: QueryDosDeviceW(...) failed: 0x%lx\n", GetLastError());
-    }
-    return 1;
-}
-
-int ShowParallelStatus(int nPortNum)
-{
-    WCHAR buffer[250];
-    WCHAR szPortName[MAX_PORTNAME_LEN];
-
-    swprintf(szPortName, L"LPT%d", nPortNum);
-    wprintf(L"\nStatus for device LPT%d:\n", nPortNum);
-    wprintf(L"-----------------------\n");
-    if (QueryDosDeviceW(szPortName, buffer, NUM_ELEMENTS(buffer)))
-    {
-        WCHAR* ptr = wcsrchr(buffer, L'\\');
-        if (ptr != NULL)
-        {
-            if (0 == wcscmp(szPortName, ++ptr))
-            {
-                wprintf(L"    Printer output is not being rerouted.\n");
-            }
-            else
-            {
-                wprintf(L"    Printer output is being rerouted to serial port %s\n", ptr);
-            }
-            return 0;
-        }
-        else
-        {
-            wprintf(L"    QueryDosDeviceW(%s) returned unrecognised form %s.\n", szPortName, buffer);
-        }
-    }
-    else
-    {
-        wprintf(L"    ERROR: QueryDosDeviceW(%s) failed: 0x%lx\n", szPortName, GetLastError());
-    }
-    return 1;
-}
-
-int ShowConsoleStatus()
-{
-    DWORD dwKbdDelay;
-    DWORD dwKbdSpeed;
-    CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo;
-    HANDLE hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-
-    wprintf(L"\nStatus for device CON:\n");
-    wprintf(L"-----------------------\n");
-    if (GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo))
-    {
-        wprintf(L"    Lines:          %d\n", ConsoleScreenBufferInfo.dwSize.Y);
-        wprintf(L"    Columns:        %d\n", ConsoleScreenBufferInfo.dwSize.X);
-    }
-    if (SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0))
-    {
-        wprintf(L"    Keyboard delay: %ld\n", dwKbdDelay);
-    }
-    if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0))
-    {
-        wprintf(L"    Keyboard rate:  %ld\n", dwKbdSpeed);
-    }
-    wprintf(L"    Code page:      %d\n", GetConsoleOutputCP());
-    return 0;
-}
-
-static
-BOOL SerialPortQuery(int nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWrite)
-{
-    BOOL result;
-    HANDLE hPort;
-    WCHAR szPortName[MAX_PORTNAME_LEN];
-
-    ASSERT(pDCB);
-    ASSERT(pCommTimeouts);
-
-    swprintf(szPortName, L"COM%d", nPortNum);
-    hPort = CreateFileW(szPortName,
-                        GENERIC_READ | GENERIC_WRITE,
-                        0,     // exclusive
-                        NULL,  // sec attr
-                        OPEN_EXISTING,
-                        0,     // no attributes
-                        NULL); // no template
-
-    if (hPort == INVALID_HANDLE_VALUE)
-    {
-        wprintf(L"Illegal device name - %s\n", szPortName);
-        wprintf(L"Last error = 0x%lx\n", GetLastError());
-        return FALSE;
-    }
-
-    result = bWrite ? SetCommState(hPort, pDCB)
-                    : GetCommState(hPort, pDCB);
-    if (!result)
-    {
-        wprintf(L"Failed to %s the status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum);
-        CloseHandle(hPort);
-        return FALSE;
-    }
-
-    result = bWrite ? SetCommTimeouts(hPort, pCommTimeouts)
-                    : GetCommTimeouts(hPort, pCommTimeouts);
-    if (!result)
-    {
-        wprintf(L"Failed to %s Timeout status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum);
-        CloseHandle(hPort);
-        return FALSE;
-    }
-    CloseHandle(hPort);
-    return TRUE;
-}
-
-int ShowSerialStatus(int nPortNum)
-{
-    DCB dcb;
-    COMMTIMEOUTS CommTimeouts;
-
-    if (!SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE))
-    {
-        return 1;
-    }
-    if (dcb.Parity > NUM_ELEMENTS(parity_strings))
-    {
-        wprintf(L"ERROR: Invalid value for Parity Bits %d:\n", dcb.Parity);
-        dcb.Parity = 0;
-    }
-    if (dcb.StopBits > NUM_ELEMENTS(stopbit_strings))
-    {
-        wprintf(L"ERROR: Invalid value for Stop Bits %d:\n", dcb.StopBits);
-        dcb.StopBits = 0;
-    }
-    wprintf(L"\nStatus for device COM%d:\n", nPortNum);
-    wprintf(L"-----------------------\n");
-    wprintf(L"    Baud:            %ld\n", dcb.BaudRate);
-    wprintf(L"    Parity:          %s\n", parity_strings[dcb.Parity]);
-    wprintf(L"    Data Bits:       %d\n", dcb.ByteSize);
-    wprintf(L"    Stop Bits:       %s\n", stopbit_strings[dcb.StopBits]);
-    wprintf(L"    Timeout:         %s\n", CommTimeouts.ReadIntervalTimeout ? L"ON" : L"OFF");
-    wprintf(L"    XON/XOFF:        %s\n", dcb.fOutX           ? L"ON" : L"OFF");
-    wprintf(L"    CTS handshaking: %s\n", dcb.fOutxCtsFlow    ? L"ON" : L"OFF");
-    wprintf(L"    DSR handshaking: %s\n", dcb.fOutxDsrFlow    ? L"ON" : L"OFF");
-    wprintf(L"    DSR sensitivity: %s\n", dcb.fDsrSensitivity ? L"ON" : L"OFF");
-    wprintf(L"    DTR circuit:     %s\n", control_strings[dcb.fDtrControl]);
-    wprintf(L"    RTS circuit:     %s\n", control_strings[dcb.fRtsControl]);
-    return 0;
-}
-
-int SetParallelState(int nPortNum)
-{
-    WCHAR szPortName[MAX_PORTNAME_LEN];
-    WCHAR szTargetPath[MAX_PORTNAME_LEN];
-
-    swprintf(szPortName, L"LPT%d", nPortNum);
-    swprintf(szTargetPath, L"COM%d", nPortNum);
-    if (!DefineDosDeviceW(DDD_REMOVE_DEFINITION, szPortName, szTargetPath))
-    {
-        wprintf(L"SetParallelState(%d) - DefineDosDevice(%s) failed: 0x%lx\n", nPortNum, szPortName, GetLastError());
-    }
-    return 0;
-}
-
-/*
-    \??\COM1
-    \Device\NamedPipe\Spooler\LPT1
-BOOL DefineDosDevice(
-  DWORD dwFlags,         // options
-  LPCTSTR lpDeviceName,  // device name
-  LPCTSTR lpTargetPath   // path string
-);
-DWORD QueryDosDevice(
-  LPCTSTR lpDeviceName, // MS-DOS device name string
-  LPTSTR lpTargetPath,  // query results buffer
-  DWORD ucchMax         // maximum size of buffer
-);
- */
-
-int SetConsoleState()
-{
-/*
-    "Select code page:  MODE CON[:] CP SELECT=yyy",
-    "Code page status:  MODE CON[:] CP [/STATUS]",
-    "Display mode:      MODE CON[:] [COLS=c] [LINES=n]",
-    "Typematic rate:    MODE CON[:] [RATE=r DELAY=d]",
- */
-    return 0;
-}
-
-static
-int ExtractModeSerialParams(const WCHAR* param)
-{
-    if (wcsstr(param, L"OFF"))
-        return 0;
-    else if (wcsstr(param, L"ON"))
-        return 1;
-    else if (wcsstr(param, L"HS"))
-        return 2;
-    else if (wcsstr(param, L"TG"))
-        return 3;
-
-    return -1;
-}
-
-int SetSerialState(int nPortNum, int args, WCHAR *argv[])
-{
-    int arg;
-    int value;
-    DCB dcb;
-    COMMTIMEOUTS CommTimeouts;
-    WCHAR buf[MAX_COMPARAM_LEN+1];
-
-    if (SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE))
-    {
-        for (arg = 2; arg < args; arg++)
-        {
-            if (wcslen(argv[arg]) > MAX_COMPARAM_LEN)
-            {
-                wprintf(L"Invalid parameter (too long) - %s\n", argv[arg]);
-                return 1;
-            }
-            wcscpy(buf, argv[arg]);
-            _wcslwr(buf);
-            if (wcsstr(buf, L"baud="))
-            {
-                wscanf(buf+5, L"%lu", &dcb.BaudRate);
-            }
-            else if (wcsstr(buf, L"parity="))
-            {
-                if (wcschr(buf, L'D'))
-                    dcb.Parity = 1;
-                else if (wcschr(buf, L'V'))
-                    dcb.Parity = 2;
-                else if (wcschr(buf, L'M'))
-                    dcb.Parity = 3;
-                else if (wcschr(buf, L'S'))
-                    dcb.Parity = 4;
-                else
-                    dcb.Parity = 0;
-            }
-            else if (wcsstr(buf, L"data="))
-            {
-                wscanf(buf+5, L"%lu", &dcb.ByteSize);
-            }
-            else if (wcsstr(buf, L"stop="))
-            {
-                if (wcschr(buf, L'5'))
-                    dcb.StopBits = 1;
-                else if (wcschr(buf, L'2'))
-                    dcb.StopBits = 2;
-                else
-                    dcb.StopBits = 0;
-            }
-            else if (wcsstr(buf, L"to=")) // to=on|off
-            {
-                value = ExtractModeSerialParams(buf);
-                if (value != -1)
-                {
-                }
-                else
-                {
-                    goto invalid_serial_parameter;
-                }
-            }
-            else if (wcsstr(buf, L"xon=")) // xon=on|off
-            {
-                value = ExtractModeSerialParams(buf);
-                if (value != -1)
-                {
-                    dcb.fOutX = value;
-                    dcb.fInX = value;
-                }
-                else
-                {
-                    goto invalid_serial_parameter;
-                }
-            }
-            else if (wcsstr(buf, L"odsr=")) // odsr=on|off
-            {
-                value = ExtractModeSerialParams(buf);
-                if (value != -1)
-                {
-                    dcb.fOutxDsrFlow = value;
-                }
-                else
-                {
-                    goto invalid_serial_parameter;
-                }
-            }
-            else if (wcsstr(buf, L"octs=")) // octs=on|off
-            {
-                value = ExtractModeSerialParams(buf);
-                if (value != -1)
-                {
-                    dcb.fOutxCtsFlow = value;
-                }
-                else
-                {
-                    goto invalid_serial_parameter;
-                }
-            }
-            else if (wcsstr(buf, L"dtr=")) // dtr=on|off|hs
-            {
-                value = ExtractModeSerialParams(buf);
-                if (value != -1)
-                {
-                    dcb.fDtrControl = value;
-                }
-                else
-                {
-                    goto invalid_serial_parameter;
-                }
-            }
-            else if (wcsstr(buf, L"rts=")) // rts=on|off|hs|tg
-            {
-                value = ExtractModeSerialParams(buf);
-                if (value != -1)
-                {
-                    dcb.fRtsControl = value;
-                }
-                else
-                {
-                    goto invalid_serial_parameter;
-                }
-            }
-            else if (wcsstr(buf, L"idsr=")) // idsr=on|off
-            {
-                value = ExtractModeSerialParams(buf);
-                if (value != -1)
-                {
-                    dcb.fDsrSensitivity = value;
-                }
-                else
-                {
-                    goto invalid_serial_parameter;
-                }
-            }
-            else
-            {
-invalid_serial_parameter:;
-                wprintf(L"Invalid parameter - %s\n", buf);
-                return 1;
-            }
-        }
-        SerialPortQuery(nPortNum, &dcb, &CommTimeouts, TRUE);
-    }
-    return 0;
-}
-
-int find_portnum(const WCHAR* cmdverb)
-{
-    int portnum = -1;
-
-    if (cmdverb[3] >= L'0' && cmdverb[3] <= L'9')
-    {
-        portnum = cmdverb[3] - L'0';
-        if (cmdverb[4] >= L'0' && cmdverb[4] <= L'9')
-        {
-            portnum *= 10;
-            portnum += cmdverb[4] - L'0';
-        }
-    }
-    return portnum;
-}
-
-int wmain(int argc, WCHAR* argv[])
-{
-    int nPortNum;
-    WCHAR param1[MAX_COMPARAM_LEN+1];
-    WCHAR param2[MAX_COMPARAM_LEN+1];
-
-    if (argc > 1)
-    {
-        if (wcslen(argv[1]) > MAX_COMPARAM_LEN)
-        {
-            wprintf(L"Invalid parameter (too long) - %s\n", argv[1]);
-            return 1;
-        }
-        wcscpy(param1, argv[1]);
-        _wcslwr(param1);
-        if (argc > 2)
-        {
-            if (wcslen(argv[2]) > MAX_COMPARAM_LEN)
-            {
-                wprintf(L"Invalid parameter (too long) - %s\n", argv[2]);
-                return 1;
-            }
-            wcscpy(param2, argv[2]);
-            _wcslwr(param2);
-        }
-        else
-        {
-            param2[0] = L'\0';
-        }
-        if (wcsstr(param1, L"/?") || wcsstr(param1, L"-?"))
-        {
-            return Usage();
-        }
-        else if (wcsstr(param1, L"/status"))
-        {
-            goto show_status;
-        }
-        else if (wcsstr(param1, L"lpt"))
-        {
-            nPortNum = find_portnum(param1);
-            if (nPortNum != -1)
-                return ShowParallelStatus(nPortNum);
-        }
-        else if (wcsstr(param1, L"con"))
-        {
-            return ShowConsoleStatus();
-        }
-        else if (wcsstr(param1, L"com"))
-        {
-            nPortNum = find_portnum(param1);
-            if (nPortNum != -1)
-            {
-                if (param2[0] == L'\0' || wcsstr(param2, L"/status"))
-                {
-                    return ShowSerialStatus(nPortNum);
-                }
-                else
-                {
-                    return SetSerialState(nPortNum, argc, argv);
-                }
-            }
-        }
-        wprintf(L"Invalid parameter - %s\n", param1);
-        return 1;
-    }
-    else
-    {
-show_status:;
-
-        QueryDevices();
-/*
-        ShowParallelStatus(1);
-        for (nPortNum = 0; nPortNum < MAX_COMPORT_NUM; nPortNum++)
-        {
-            ShowSerialStatus(nPortNum + 1);
-        }
-        ShowConsoleStatus();
- */
-    }
-    return 0;
-}

reactos/base/applications/cmdutils/mode/mode.rc

@@ -1,5 +0,0 @@
-
-#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Mode Utility"
-#define REACTOS_STR_INTERNAL_NAME       "mode"
-#define REACTOS_STR_ORIGINAL_FILENAME   "mode.com"
-#include <reactos/version.rc>

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

@@ -1,6 +1,5 @@
 
 add_executable(more more.c more.rc)
 set_module_type(more win32cui)
-set_target_properties(more PROPERTIES SUFFIX ".com")
 add_importlibs(more user32 msvcrt kernel32)
 add_cd_file(TARGET more DESTINATION reactos/system32 FOR all)

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

@@ -11,11 +11,11 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 STRINGTABLE
 BEGIN
     IDS_USAGE "Показывать данные постранично заполняя экран.\n\n\
-  MORE < [диск:][путь]имя_файла\n\
-  имя_команды | MORE \n\
-  MORE [диск:][путь]имя_файла\n\n\
-  [диск:][путь]имя_файла    Файл, отображаемый по фрагментам.\n\
-  имя_команды             Команда, вывод которой отображается на экране.\n\n\
+  MORE < [Том:][Путь]Имя файла\n\
+  Command | MORE \n\
+  MORE [Том:][Путь]Имя файла\n\n\
+  [Том:][Путь]Имя Файла    Имя файла содержимое которого будет отображено.\n\
+  Command\t\t     Команда, результат работы которой требуется выводить на экран.\n\n\
   При запросе  ""-- Продолжить --"" вы можете нажать любую клавишу для отображения следующего экрана.\n"
     IDS_CONTINUE " -- Продолжить (100%) -- "
     IDS_FILE_ACCESS "Нет доступа к файлу %s."

reactos/base/applications/cmdutils/more/more.rc

@@ -2,9 +2,9 @@
 
 #include "resource.h"
 
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS More Command"
+#define REACTOS_STR_FILE_DESCRIPTION  "W32 more command"
 #define REACTOS_STR_INTERNAL_NAME     "more"
-#define REACTOS_STR_ORIGINAL_FILENAME "more.com"
+#define REACTOS_STR_ORIGINAL_FILENAME "more.exe"
 #include <reactos/version.rc>
 
 /* UTF-8 */

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

@@ -1,5 +1,8 @@
 
+remove_definitions(-D_WIN32_WINNT=0x502)
+add_definitions(-D_WIN32_WINNT=0x600)
+
 add_executable(reg reg.c reg.rc)
 set_module_type(reg win32cui UNICODE)
-add_importlibs(reg advapi32 user32 shlwapi msvcrt kernel32)
+add_importlibs(reg advapi32 user32 msvcrt kernel32)
 add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/reg/lang/bg-BG.rc

@@ -1,14 +1,14 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
-{
-    STRING_USAGE, "Синтаксисът на командата е:\n\nREG [ ADD | DELETE | QUERY ]\nREG команда /?\n"
-    STRING_ADD_USAGE, "REG ADD ключ_име [/v стойност_име | /ve] [/t вид] [/s разделител] [/d данни] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE ключ_име [/v стойност_име | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY ключ_име [/v стойност_име | /ve] [/s]\n"
-    STRING_SUCCESS, "Десйствието е приключено успешно\n"
-    STRING_INVALID_KEY, "Грешка: Недопустимо име за ключ\n"
-    STRING_INVALID_CMDLINE, "Грешка: Неправилни параметри на командия ред\n"
-    STRING_NO_REMOTE, "Грешка: Неуспешно добавяне на ключове в отдалечената машина\n"
-    STRING_CANNOT_FIND, "Грешка: Уредбата не откри указания регистърен ключ или стойност\n"
-}
+BEGIN
+    STRING_USAGE "Синтаксисът на командата е:\n\nREG [ ADD | DELETE | QUERY ]\nREG команда /?\n"
+    STRING_ADD_USAGE "REG ADD ключ_име [/v стойност_име | /ve] [/t вид] [/s разделител] [/d данни] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE ключ_име [/v стойност_име | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY ключ_име [/v стойност_име | /ve] [/s]\n"
+    STRING_SUCCESS "Десйствието е приключено успешно\n"
+    STRING_INVALID_KEY "Грешка: Недопустимо име за ключ\n"
+    STRING_INVALID_CMDLINE "Грешка: Неправилни параметри на командия ред\n"
+    STRING_NO_REMOTE "Грешка: Неуспешно добавяне на ключове в отдалечената машина\n"
+    STRING_CANNOT_FIND "Грешка: Уредбата не откри указания регистърен ключ или стойност\n"
+END

reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc

@@ -6,14 +6,14 @@
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 STRINGTABLE
-{
-    STRING_USAGE, "Syntaxe tohoto příkazu:\n\nREG [ ADD | DELETE | QUERY ]\nREG operace /?\n"
-    STRING_ADD_USAGE, "REG ADD název_klíče [/v název_hodnoty | /ve] [/t type] [/s oddělovač] [/d data] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE název_klíče [/v název_hodnoty | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY název_klíče [/v název_hodnoty | /ve] [/s]\n"
-    STRING_SUCCESS, "Operace byla úspěšně dokončena\n"
-    STRING_INVALID_KEY, "Chyba: Neplatný název klíče\n"
-    STRING_INVALID_CMDLINE, "Chyba: Neplatné parametry příkazové řádky\n"
-    STRING_NO_REMOTE, "Chyba: Nelze přidat klíče na vzdálený stroj\n"
-    STRING_CANNOT_FIND, "Chyba: Systém nenalezl zadaný klíč nebo hodnotu registru\n"
-}
+BEGIN
+    STRING_USAGE "Syntaxe tohoto příkazu:\n\nREG [ ADD | DELETE | QUERY ]\nREG operace /?\n"
+    STRING_ADD_USAGE "REG ADD název_klíče [/v název_hodnoty | /ve] [/t type] [/s oddělovač] [/d data] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE název_klíče [/v název_hodnoty | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY název_klíče [/v název_hodnoty | /ve] [/s]\n"
+    STRING_SUCCESS "Operace byla úspěšně dokončena\n"
+    STRING_INVALID_KEY "Chyba: Neplatný název klíče\n"
+    STRING_INVALID_CMDLINE "Chyba: Neplatné parametry příkazové řádky\n"
+    STRING_NO_REMOTE "Chyba: Nelze přidat klíče na vzdálený stroj\n"
+    STRING_CANNOT_FIND "Chyba: Systém nenalezl zadaný klíč nebo hodnotu registru\n"
+END

reactos/base/applications/cmdutils/reg/lang/da-DK.rc

@@ -1,14 +1,14 @@
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
-{
-    STRING_USAGE, "Syntaksen for dette kommando er:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n"
-    STRING_ADD_USAGE, "REG ADD nøgle_navn [/v værdi | /ve] [/t type] [/s separator] [/d data] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nøgle_navn [/v værdi | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nøgle_navn [/v værdi | /ve] [/s]\n"
-    STRING_SUCCESS, "Operationen blev afsluttet med succes\n"
-    STRING_INVALID_KEY, "Fejl: Ugyldigt nøgle navn\n"
-    STRING_INVALID_CMDLINE, "Fejl: Ugyldige kommando linje parametre\n"
-    STRING_NO_REMOTE, "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n"
-    STRING_CANNOT_FIND, "Fejl: Systemet kunne ikke finde, den angivet registrerings nøgle eller værdi\n"
-}
+BEGIN
+    STRING_USAGE "Syntaksen for dette kommando er:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n"
+    STRING_ADD_USAGE "REG ADD nøgle_navn [/v værdi | /ve] [/t type] [/s separator] [/d data] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE nøgle_navn [/v værdi | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY nøgle_navn [/v værdi | /ve] [/s]\n"
+    STRING_SUCCESS "Operationen blev afsluttet med succes\n"
+    STRING_INVALID_KEY "Fejl: Ugyldigt nøgle navn\n"
+    STRING_INVALID_CMDLINE "Fejl: Ugyldige kommando linje parametre\n"
+    STRING_NO_REMOTE "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n"
+    STRING_CANNOT_FIND "Fejl: Systemet kunne ikke finde, den angivet registrerings nøgle eller værdi\n"
+END

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

@@ -1,14 +1,14 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
-{
-    STRING_USAGE, "Syntax:\n\nREG [ ADD | DELETE | QUERY ]\nREG Befehl /?\n"
-    STRING_ADD_USAGE, "REG ADD Schlüssel [/v Wert | /ve] [/t Typ] [/s Trenner] [/d Daten] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE Schlüssel [/v Wert | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY Schlüssel [/v Wert | /ve] [/s]\n"
-    STRING_SUCCESS, "Der Vorgang wurde erfolgreich abgeschlossen\n"
-    STRING_INVALID_KEY, "Fehler: Ungültiger Schlüssel\n"
-    STRING_INVALID_CMDLINE, "Fehler: Ungültige Befehlszeilenargumente\n"
-    STRING_NO_REMOTE, "Fehler: Konnte Schlüssel nicht zum entfernten Rechner hinzufügen\n"
-    STRING_CANNOT_FIND, "Fehler: Der angegebene Schlüssel oder Wert konnte nicht gefunden werden\n"
-}
+BEGIN
+    STRING_USAGE "Die Syntax von diesem Befehl ist:\n\nREG [ ADD | DELETE | QUERY ]\nREG Befehl /?\n"
+    STRING_ADD_USAGE "REG ADD Schlüssel [/v Wert | /ve] [/t Typ] [/s Trenner] [/d Daten] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE Schlüssel [/v Wert | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY Schlüssel [/v Wert | /ve] [/s]\n"
+    STRING_SUCCESS "Der Vorgang wurde erfolgreich abgeschlossen\n"
+    STRING_INVALID_KEY "Fehler: Ungültiger Schlüssel\n"
+    STRING_INVALID_CMDLINE "Fehler: Ungültige Befehlszeilenargumente\n"
+    STRING_NO_REMOTE "Fehler: Konnte Schlüssel nicht zum remote Rechner hinzufügen\n"
+    STRING_CANNOT_FIND "Fehler: Der angegebene Schlüssel oder Wert konnte nicht gefunden werden\n"
+END

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

@@ -1,14 +1,14 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
-{
-    STRING_USAGE, "The syntax of this command is:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n"
-    STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n"
-    STRING_SUCCESS, "The operation completed successfully\n"
-    STRING_INVALID_KEY, "Error: Invalid key name\n"
-    STRING_INVALID_CMDLINE, "Error: Invalid command line parameters\n"
-    STRING_NO_REMOTE, "Error: Unable to add keys to remote machine\n"
-    STRING_CANNOT_FIND, "Error: The system was unable to find the specified registry key or value\n"
-}
+BEGIN
+    STRING_USAGE "The syntax of this command is:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n"
+    STRING_ADD_USAGE "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY key_name [/v value_name | /ve] [/s]\n"
+    STRING_SUCCESS "The operation completed successfully\n"
+    STRING_INVALID_KEY "Error: Invalid key name\n"
+    STRING_INVALID_CMDLINE "Error: Invalid command line parameters\n"
+    STRING_NO_REMOTE "Error: Unable to add keys to remote machine\n"
+    STRING_CANNOT_FIND "Error: The system was unable to find the specified registry key or value\n"
+END

reactos/base/applications/cmdutils/reg/lang/es-ES.rc

@@ -1,14 +1,14 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
-{
-    STRING_USAGE, "La sintaxis de este comando es:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n"
-    STRING_ADD_USAGE, "REG ADD nombre_clave [/v nombre_valor | /ve] [/t tipo] [/s separador] [/d datos] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nombre_clave [/v nombre_valor | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nombre_clave [/v nombre_valor | /ve] [/s]\n"
-    STRING_SUCCESS, "La operación finalizó con éxito\n"
-    STRING_INVALID_KEY, "Error: nombre de clave no válido\n"
-    STRING_INVALID_CMDLINE, "Error: parámetros de línea de comandos inválidos\n"
-    STRING_NO_REMOTE, "Error: No se puede agregar claves al equipo remoto\n"
-    STRING_CANNOT_FIND, "Error: El sistema no pudo encontrar la clave o el valor del Registro especificado\n"
-}
+BEGIN
+    STRING_USAGE "La sintaxis de este comando es:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n"
+    STRING_ADD_USAGE "REG ADD nombre_clave [/v nombre_valor | /ve] [/t tipo] [/s separador] [/d datos] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE nombre_clave [/v nombre_valor | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY nombre_clave [/v nombre_valor | /ve] [/s]\n"
+    STRING_SUCCESS "La operación finalizó con éxito\n"
+    STRING_INVALID_KEY "Error: nombre de clave no válido\n"
+    STRING_INVALID_CMDLINE "Error: parámetros de línea de comandos inválidos\n"
+    STRING_NO_REMOTE "Error: No se puede agregar claves al equipo remoto\n"
+    STRING_CANNOT_FIND "Error: El sistema no pudo encontrar la clave o el valor del Registro especificado\n"
+END

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

@@ -1,14 +1,14 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
-{
-    STRING_USAGE, "La syntaxe de cette commande est :\n\nREG [ ADD | DELETE | QUERY ]\nREG commande /?\n"
-    STRING_ADD_USAGE, "REG ADD nom_de_clé [/v nom_de_valeur | /ve] [/t type] [/s séparateur] [/d données] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nom_de_clé [/v nom_de_valeur | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nom_de_clé [/v nom_de_valeur | /ve] [/s]\n"
-    STRING_SUCCESS, "L'opération s'est terminée avec succès\n"
-    STRING_INVALID_KEY, "Erreur : nom de clé non valable\n"
-    STRING_INVALID_CMDLINE, "Erreur : paramètre de ligne de commande non valable\n"
-    STRING_NO_REMOTE, "Erreur : impossible d'ajouter des clés à une machine distante\n"
-    STRING_CANNOT_FIND, "Erreur : le système n'a pas pu trouver la clé ou la valeur de registre spécifiée\n"
-}
+BEGIN
+    STRING_USAGE "La syntaxe de cette commande est :\n\nREG [ ADD | DELETE | QUERY ]\nREG commande /?\n"
+    STRING_ADD_USAGE "REG ADD nom_de_clé [/v nom_de_valeur | /ve] [/t type] [/s séparateur] [/d données] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE nom_de_clé [/v nom_de_valeur | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY nom_de_clé [/v nom_de_valeur | /ve] [/s]\n"
+    STRING_SUCCESS "L'opération s'est terminée avec succès\n"
+    STRING_INVALID_KEY "Erreur : nom de clé non valable\n"
+    STRING_INVALID_CMDLINE "Erreur : paramètre de ligne de commande non valable\n"
+    STRING_NO_REMOTE "Erreur : impossible d'ajouter des clés à une machine distante\n"
+    STRING_CANNOT_FIND "Erreur : le système n'a pas pu trouver la clé ou la valeur de registre spécifiée\n"
+END

reactos/base/applications/cmdutils/reg/lang/it-IT.rc

@@ -1,14 +1,14 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
-{
-    STRING_USAGE, "La sintassi di questo comando è:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n"
-    STRING_ADD_USAGE, "REG ADD nome_della_chiave [/v nome_del_valore | /ve] [/t tipo] [/s separatore] [/d dati] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nome_della_chiave [/v nome_del_valore | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nome_della_chiave [/v nome_del_valore | /ve] [/s]\n"
-    STRING_SUCCESS, "Operazione completata con successo\n"
-    STRING_INVALID_KEY, "Errore: nome della chiave non valido\n"
-    STRING_INVALID_CMDLINE, "Errore: parametri della linea di comando non validi\n"
-    STRING_NO_REMOTE, "Errore: impossibile aggiungere chiavi alla macchina remota\n"
-    STRING_CANNOT_FIND, "Errore: il sistema non è riuscito a trovare la chiave di registro o il valore specificati\n"
-}
+BEGIN
+    STRING_USAGE "La sintassi di questo comando è:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n"
+    STRING_ADD_USAGE "REG ADD nome_della_chiave [/v nome_del_valore | /ve] [/t tipo] [/s separatore] [/d dati] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE nome_della_chiave [/v nome_del_valore | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY nome_della_chiave [/v nome_del_valore | /ve] [/s]\n"
+    STRING_SUCCESS "Operazione completata con successo\n"
+    STRING_INVALID_KEY "Errore: nome della chiave non valido\n"
+    STRING_INVALID_CMDLINE "Errore: parametri della linea di comando non validi\n"
+    STRING_NO_REMOTE "Errore: impossibile aggiungere chiavi alla macchina remota\n"
+    STRING_CANNOT_FIND "Errore: il sistema non è riuscito a trovare la chiave di registro o il valore specificati\n"
+END

reactos/base/applications/cmdutils/reg/lang/ja-JP.rc

@@ -1,14 +1,14 @@
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 STRINGTABLE
-{
-    STRING_USAGE, "このコマンドの構文は次のとおりです:\n\nREG [ ADD | DELETE | QUERY ]\nREG コマンド /?\n"
-    STRING_ADD_USAGE, "REG ADD キー名 [/v 値名 | /ve] [/t type] [/s セパレータ] [/d データ] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE キー名 [/v 値名 | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY キー名 [/v 値名 | /ve] [/s]\n"
-    STRING_SUCCESS, "操作は正常に完了しました\n"
-    STRING_INVALID_KEY, "エラー: キー名が無効です\n"
-    STRING_INVALID_CMDLINE, "エラー: コマンド ライン引数が無効です\n"
-    STRING_NO_REMOTE, "エラー: リモート マシンにキーを追加できませんでした\n"
-    STRING_CANNOT_FIND, "エラー: システムは指定されたキーまたは値を見つけられませんでした\n"
-}
+BEGIN
+    STRING_USAGE "このコマンドの構文は次のとおりです:\n\nREG [ ADD | DELETE | QUERY ]\nREG コマンド /?\n"
+    STRING_ADD_USAGE "REG ADD キー名 [/v 値名 | /ve] [/t type] [/s セパレータ] [/d データ] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE キー名 [/v 値名 | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY キー名 [/v 値名 | /ve] [/s]\n"
+    STRING_SUCCESS "操作は正常に完了しました\n"
+    STRING_INVALID_KEY "エラー: キー名が無効です\n"
+    STRING_INVALID_CMDLINE "エラー: コマンド ライン引数が無効です\n"
+    STRING_NO_REMOTE "エラー: リモート マシンにキーを追加できませんでした\n"
+    STRING_CANNOT_FIND "エラー: システムは指定されたキーまたは値を見つけられませんでした\n"
+END

reactos/base/applications/cmdutils/reg/lang/ko-KR.rc

@@ -1,14 +1,14 @@
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
-{
-    STRING_USAGE, "명령어 형식:\n\nREG [ ADD | DELETE | QUERY ]\nREG 명령어 /?\n"
-    STRING_ADD_USAGE, "REG ADD 값 [/v 값 | /ve] [/t 형식] [/s 분리기호] [/d 데이타] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE 키 이름 [/v 값 | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY 키 이름 [/v 값| /ve] [/s]\n"
-    STRING_SUCCESS, "작업이 성공적으로 끝났습니다\n"
-    STRING_INVALID_KEY, "에러: 올바르지 않은 키 이름\n"
-    STRING_INVALID_CMDLINE, "에러:올바르지 않은 명령라인 매개변수\n"
-    STRING_NO_REMOTE, "에러: 원격 머신에  키를 더하는 것은 가능하지 않습니다\n"
-    STRING_CANNOT_FIND, "에러: 이 시스템에서 지정된 레지스트리 키나 값을 찾을수 없습니다\n"
-}
+BEGIN
+    STRING_USAGE "명령어 형식:\n\nREG [ ADD | DELETE | QUERY ]\nREG 명령어 /?\n"
+    STRING_ADD_USAGE "REG ADD 값 [/v 값 | /ve] [/t 형식] [/s 분리기호] [/d 데이타] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE 키 이름 [/v 값 | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY 키 이름 [/v 값| /ve] [/s]\n"
+    STRING_SUCCESS "작업이 성공적으로 끝났습니다\n"
+    STRING_INVALID_KEY "에러: 올바르지 않은 키 이름\n"
+    STRING_INVALID_CMDLINE "에러:올바르지 않은 명령라인 매개변수\n"
+    STRING_NO_REMOTE "에러: 원격 머신에  키를 더하는 것은 가능하지 않습니다\n"
+    STRING_CANNOT_FIND "에러: 이 시스템에서 지정된 레지스트리 키나 값을 찾을수 없습니다\n"
+END

reactos/base/applications/cmdutils/reg/lang/lt-LT.rc

@@ -1,14 +1,14 @@
 LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
-{
-    STRING_USAGE, "Šios komandos sintaksė yra:\n\nREG [ ADD | DELETE | QUERY ]\nREG komanda /?\n"
-    STRING_ADD_USAGE, "REG ADD rakto_vardas [/v reikšmės_vardas | /ve] [/t tipas] [/s skirtukas] [/d duomenys] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE rakto_vardas [/v reikšmės_vardas | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY rakto_vardas [/v reikšmės_vardas | /ve] [/s]\n"
-    STRING_SUCCESS, "Operacija sėkmingai įvykdyta\n"
-    STRING_INVALID_KEY, "Klaida: Netinkamas rakto vardas\n"
-    STRING_INVALID_CMDLINE, "Klaida: Netinkami komandos eilutės parametrai\n"
-    STRING_NO_REMOTE, "Klaida: Negalima pridėti raktų nuotoliniame kompiuteryje\n"
-    STRING_CANNOT_FIND, "Klaida: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n"
-}
+BEGIN
+    STRING_USAGE "Šios komandos sintaksė yra:\n\nREG [ ADD | DELETE | QUERY ]\nREG komanda /?\n"
+    STRING_ADD_USAGE "REG ADD rakto_vardas [/v reikšmės_vardas | /ve] [/t tipas] [/s skirtukas] [/d duomenys] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE rakto_vardas [/v reikšmės_vardas | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY rakto_vardas [/v reikšmės_vardas | /ve] [/s]\n"
+    STRING_SUCCESS "Operacija sėkmingai įvykdyta\n"
+    STRING_INVALID_KEY "Klaida: Netinkamas rakto vardas\n"
+    STRING_INVALID_CMDLINE "Klaida: Netinkami komandos eilutės parametrai\n"
+    STRING_NO_REMOTE "Klaida: Negalima pridėti raktų nuotoliniame kompiuteryje\n"
+    STRING_CANNOT_FIND "Klaida: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n"
+END

reactos/base/applications/cmdutils/reg/lang/nl-NL.rc

@@ -1,14 +1,14 @@
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
-{
-    STRING_USAGE, "Gebruik van dit commando is:\n\nREG [ ADD | DELETE | QUERY ]\nREG commando /?\n"
-    STRING_ADD_USAGE, "REG ADD sleutel_naam [/v waarde_naam | /ve] [/t type] [/s scheidingsteken] [/d data] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE sleutel_naam [/v waarde_naam | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY sleutel_naam [/v waarde_naam | /ve] [/s]\n"
-    STRING_SUCCESS, "De bewerking is succesvol voltooid\n"
-    STRING_INVALID_KEY, "Fout: Foutieve sleutelnaam\n"
-    STRING_INVALID_CMDLINE, "Fout: Foutieve commandoregel-parameters\n"
-    STRING_NO_REMOTE, "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n"
-    STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registersleutel of waarde niet vinden\n"
-}
+BEGIN
+    STRING_USAGE "Gebruik van dit commando is:\n\nREG [ ADD | DELETE | QUERY ]\nREG commando /?\n"
+    STRING_ADD_USAGE "REG ADD sleutel_naam [/v waarde_naam | /ve] [/t type] [/s scheidingsteken] [/d data] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE sleutel_naam [/v waarde_naam | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY sleutel_naam [/v waarde_naam | /ve] [/s]\n"
+    STRING_SUCCESS "De bewerking is succesvol voltooid\n"
+    STRING_INVALID_KEY "Fout: Foutieve sleutelnaam\n"
+    STRING_INVALID_CMDLINE "Fout: Foutieve commandoregel-parameters\n"
+    STRING_NO_REMOTE "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n"
+    STRING_CANNOT_FIND "Fout: Het systeem kon de gespecificeerde registersleutel of waarde niet vinden\n"
+END

reactos/base/applications/cmdutils/reg/lang/no-NO.rc

@@ -1,14 +1,14 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE
-{
-    STRING_USAGE, "Programmer kjøres som følger:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n"
-    STRING_ADD_USAGE, "REG ADD nøkkelnavn [/v verdi | /ve] [/t type] [/s separator] [/d data] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nøkkelnavn [/v verdi | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nøkkelnavn [/v verdi | /ve] [/s]\n"
-    STRING_SUCCESS, "Operasjonen ble utført\n"
-    STRING_INVALID_KEY, "Feil: Ugyldig nøkkelnavn\n"
-    STRING_INVALID_CMDLINE, "Feil: Ugyldige parametere på kommandolinjen\n"
-    STRING_NO_REMOTE, "Feil: Kan ikke legge til nøkler på ekstern maskin\n"
-    STRING_CANNOT_FIND, "Feil: Systemet klarte ikke finne den angitte registernøkkelen eller -verdien\n"
-}
+BEGIN
+    STRING_USAGE "Programmer kjøres som følger:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n"
+    STRING_ADD_USAGE "REG ADD nøkkelnavn [/v verdi | /ve] [/t type] [/s separator] [/d data] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE nøkkelnavn [/v verdi | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY nøkkelnavn [/v verdi | /ve] [/s]\n"
+    STRING_SUCCESS "Operasjonen ble utført\n"
+    STRING_INVALID_KEY "Feil: Ugyldig nøkkelnavn\n"
+    STRING_INVALID_CMDLINE "Feil: Ugyldige parametere på kommandolinjen\n"
+    STRING_NO_REMOTE "Feil: Kan ikke legge til nøkler på ekstern maskin\n"
+    STRING_CANNOT_FIND "Feil: Systemet klarte ikke finne den angitte registernøkkelen eller -verdien\n"
+END

reactos/base/applications/cmdutils/reg/lang/pl-PL.rc

@@ -1,14 +1,14 @@
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
-{
-    STRING_USAGE, "Składnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n"
-    STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartości | /ve] [/t typ] [/s separator] [/d dane] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartości | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartości | /ve] [/s]\n"
-    STRING_SUCCESS, "Operacja zakończona pomyślnie\n"
-    STRING_INVALID_KEY, "Błąd: Niewłaściwa nazwa klucza\n"
-    STRING_INVALID_CMDLINE, "Błąd: Niewłaściwe parametry wiersza poleceń\n"
-    STRING_NO_REMOTE, "Błąd: Nie można dodać kluczy do zdalnej maszyny\n"
-    STRING_CANNOT_FIND, "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n"
-}
+BEGIN
+    STRING_USAGE "Składnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n"
+    STRING_ADD_USAGE "REG ADD nazwa_klucza [/v nazwa_wartości | /ve] [/t typ] [/s separator] [/d dane] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE nazwa_klucza [/v nazwa_wartości | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY nazwa_klucza [/v nazwa_wartości | /ve] [/s]\n"
+    STRING_SUCCESS "Operacja zakończona pomyślnie\n"
+    STRING_INVALID_KEY "Błąd: Niewłaściwa nazwa klucza\n"
+    STRING_INVALID_CMDLINE "Błąd: Niewłaściwe parametry wiersza poleceń\n"
+    STRING_NO_REMOTE "Błąd: Nie można dodać kluczy do zdalnej maszyny\n"
+    STRING_CANNOT_FIND "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n"
+END

reactos/base/applications/cmdutils/reg/lang/pt-PT.rc

@@ -1,14 +1,14 @@
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE
-{
-    STRING_USAGE, "A sintaxe deste comando é:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n"
-    STRING_ADD_USAGE, "REG ADD nome_chave [/v nome_valor | /ve] [/t tipo] [/s separador] [/d dados] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nome_chave [/v nome_valor | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nome_chave [/v nome_valor | /ve] [/s]\n"
-    STRING_SUCCESS, "A operação foi completada com sucesso\n"
-    STRING_INVALID_KEY, "Erro: Nome de chave inválido\n"
-    STRING_INVALID_CMDLINE, "Erro: Parâmetros da linha de comandos inválidos\n"
-    STRING_NO_REMOTE, "Erro: Incapaz de adicionar chaves à máquina remota\n"
-    STRING_CANNOT_FIND, "Erro: O sistema foi incapaz de encontrar a chave de registo ou valor especificado\n"
-}
+BEGIN
+    STRING_USAGE "A sintaxe deste comando é:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n"
+    STRING_ADD_USAGE "REG ADD nome_chave [/v nome_valor | /ve] [/t tipo] [/s separador] [/d dados] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE nome_chave [/v nome_valor | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY nome_chave [/v nome_valor | /ve] [/s]\n"
+    STRING_SUCCESS "A operação foi completada com sucesso\n"
+    STRING_INVALID_KEY "Erro: Nome de chave inválido\n"
+    STRING_INVALID_CMDLINE "Erro: Parâmetros da linha de comandos inválidos\n"
+    STRING_NO_REMOTE "Erro: Incapaz de adicionar chaves à máquina remota\n"
+    STRING_CANNOT_FIND "Erro: O sistema foi incapaz de encontrar a chave de registo ou valor especificado\n"
+END

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

@@ -1,20 +1,14 @@
-/*
-Translators: Claudia Cotună
-             Michael Stefaniuc
-             Ștefan Fulea (stefan dot fulea at mail dot md)
-*/
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
-{
-    STRING_USAGE, "Sintaxa acestei comenzi este:\n\nREG [ ADD | DELETE | QUERY ]\nREG comandă /?\n"
-    STRING_ADD_USAGE, "REG ADD nume_cheie [/v nume_valoare | /ve] [/t tip] [/s separator] [/d date] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nume_cheie [/v nume_valoare | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nume_cheie [/v nume_valoare | /ve] [/s]\n"
-    STRING_SUCCESS, "Operația a fost îndeplinită cu succes\n"
-    STRING_INVALID_KEY, "Eroare: Nume de cheie nevalid\n"
-    STRING_INVALID_CMDLINE, "Eroare: Parametri nevalizi pentru linia de comandă\n"
-    STRING_NO_REMOTE, "Eroare: Nu se pot adăuga chei pe calculatorul de la distanță\n"
-    STRING_CANNOT_FIND, "Eroare: Sistemul nu a putut găsi cheia sau valoarea de registru specificată\n"
-}
+BEGIN
+    STRING_USAGE "Sintaxa acestei comenzi este:\n\nREG [ ADD | DELETE | QUERY ]\nREG comandă /?\n"
+    STRING_ADD_USAGE "REG ADD nume_cheie [/v nume_valoare | /ve] [/t tip] [/s separator] [/d date] [/f]\n"
+    STRING_DELETE_USAGE "REG DELETE nume_cheie [/v nume_valoare | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE "REG QUERY nume_cheie [/v nume_valoare | /ve] [/s]\n"
+    STRING_SUCCESS "Operațiunea a fost finalizată cu succes\n"
+    STRING_INVALID_KEY "Eroare: Nume de cheie nevalid\n"
+    STRING_INVALID_CMDLINE "Eroare: Parametri nevalizi pentru linia de comandă\n"
+    STRING_NO_REMOTE "Eroare: Nu se pot adăuga chei pe calculatorul de la distanță\n"
+    STRING_CANNOT_FIND "Eroare: Sistemul nu a putut găsi cheia sau valoarea de registru specificată\n"
+END