[REACTOS] Fix LoadCursorW() incorrect usage cases

Fix wrong MAKEINTRESOURCEW() macro usage cases in LoadCursorW() system-wide. MSDN documentation for this function states we need to use MAKEINTRESOURCEW() macro only for internal application-defined cursors (loaded from the app instance specified by hInstance parameter), but not for system-defined cursors (those begin with IDC_* prefix), in case when hInstance is NULL. So get rid from MAKEINTRESOURCEW() macro usage for all cases when hInstance parameter is NULL. And on the contrary, when hInstance is valid and points to the application instance, then use it for the resource identifier.
2025-10-07 17:02:50 +02:00 · 2024-06-30 00:24:40 +02:00
5328 changed files with 178228 additions and 467753 deletions
--- a/.cursor/coding-style.json
+++ b/.cursor/coding-style.json
@@ -1,19 +0,0 @@
-{
-    "indentation": {
-        "type": "spaces",
-        "size": 4
-    },
-    "lineLength": 100,
-    "braceStyle": "allman",
-    "namingConventions": {
-        "functions": {
-            "public": "PascalCase",
-            "private": "_PascalCase"
-        },
-        "variables": {
-            "local": "camelCase",
-            "global": "PascalCase",
-            "constants": "UPPER_CASE"
-        }
-    }
-}
--- a/.cursor/editor.json
+++ b/.cursor/editor.json
@@ -1,52 +0,0 @@
-{
-    "editor": {
-        "defaultFormatter": null
-    },
-    "[c,cpp]": {
-        "editor": {
-            "tabSize": 4,
-            "insertSpaces": true,
-            "detectIndentation": false,
-            "trimAutoWhitespace": true,
-            "formatOnSave": false,
-            "formatOnType": true,
-            "defaultFormatter": "clang-format",
-            "rulers": [100],
-            "wordWrap": "off"
-        }
-    },
-    "files": {
-        "associations": {
-            "*.c": "c",
-            "*.h": "c",
-            "*.cpp": "cpp",
-            "*.hpp": "cpp"
-        },
-        "encoding": "utf8",
-        "trimTrailingWhitespace": true,
-        "insertFinalNewline": true,
-        "exclude": {
-            "**/.git": true,
-            "compile_commands.json": true,
-            "output-*": true,
-            "modules/optional": true,
-            "modules/3rdparty": true,
-            "modules/bootcd_extras": true,
-            "modules/livecd_extras": true,
-            "modules/hybridcd_extras": true,
-            "modules/[Aa][Hh][Kk]_[Tt]ests": true,
-            ".cache": true,
-            ".cproject": true,
-            ".DS_Store": true,
-            ".project": true,
-            ".settings": true,
-            ".vscode": true,
-            "sdk/tools/winesync/winesync.cfg": true,
-            "**/build": true,
-            "**/obj": true,
-            "**/bin": true,
-            "**/*.o": true,
-            "**/*.obj": true
-        }
-    }
-}
--- a/.cursor/settings.json
+++ b/.cursor/settings.json
@@ -1,46 +0,0 @@
-{
-    "projectType": "reactos",
-    "language": {
-        "c": {
-            "standard": "c99",
-            "warnings": ["all", "error", "pedantic", "unused"],
-            "formatter": "clang-format",
-            "linter": "clang-tidy"
-        },
-        "cpp": {
-            "standard": "c++11",
-            "warnings": ["all", "error", "pedantic", "unused"],
-            "formatter": "clang-format",
-            "linter": "clang-tidy"
-        }
-    },
-    "codingStyle": "reactos",
-    "formatOnSave": false,
-    "lintOnSave": false,
-    "paths": {
-        "source": [
-            "base",
-            "boot",
-            "dll",
-            "drivers",
-            "hal",
-            "ntoskrnl",
-            "subsystems",
-            "win32ss"
-        ],
-        "include": [
-            "sdk/include"
-        ],
-        "docs": [
-            "**/*.md",
-            "media/doc/*.md",
-            "media/doc/*.txt"
-        ],
-        "tests": [
-            "modules/rostests"
-        ], 
-        "build": [
-            "output-*"
-        ]
-    }
-}
--- a/.gitattributes
+++ b/.gitattributes
@@ -30,9 +30,6 @@
 *.TXT text
 *.y text

-# Files with these extensions must always have LF (Unix) line endings.
-*.sh text eol=lf
-
 # Files with these extensions end up in the built ReactOS system, so they
 # need to have CRLF line endings.
 *.bat text eol=crlf
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -17,8 +17,3 @@ _Use a TODO when your pull request is Work in Progress._

 - [ ] 
 - [ ] 
-
-## Testbot runs (Filled in by Devs)
-
- [ ] KVM x86:
- [ ] KVM x64:
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -43,14 +43,3 @@ Win32SS:
 - changed-files:
  - any-glob-to-any-file:
    - win32ss/**
-
-"input method":
- changed-files:
-  - any-glob-to-any-file:
-    - base/applications/ctfmon/**
-    - dll/ime/**
-    - dll/win32/imm32/**
-    - dll/win32/msctf/**
-    - dll/win32/msutb/**
-    - win32ss/user/ntuser/ime.c
-    - win32ss/user/user32/misc/imm.c
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
          - dllver: 0x600
            config: Release
      fail-fast: false
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    steps:
    - name: Get RosBE build specifics
      id: get_rosbe_spec
@@ -165,7 +165,6 @@ jobs:
      uses: ilammy/msvc-dev-cmd@v1
      with:
        arch: amd64_arm
-        sdk: 10.0.22621.0   # Windows SDK 10.0.26100.0 dropped support for 32-bit ARM
        toolset: ${{matrix.toolset}}
    - name: Activate VS cmd (arm64)
      if: ${{ matrix.arch == 'arm64' }}
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,3 @@ modules/[Aa][Hh][Kk]_[Tt]ests
 .settings
 .vscode
 sdk/tools/winesync/winesync.cfg
-.cursor/cache/
-.cursor/logs/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,9 +68,6 @@ include(sdk/cmake/config.cmake)
 # Compiler flags handling
 include(sdk/cmake/compilerflags.cmake)

-# set_wine_module function
-include(sdk/cmake/set_wine_module.cmake)
-
 add_definitions(
    -D__REACTOS__
    # swprintf without count argument is used in most of the codebase
@@ -143,10 +140,6 @@ if(NOT CMAKE_CROSSCOMPILING)
            add_definitions(/D_X86_ /D__i386__ /DWIN32 /D_WINDOWS)
        elseif(ARCH STREQUAL "amd64")
            add_definitions(-D_AMD64_ -D__x86_64__ /DWIN32 -D_WINDOWS)
-        elseif(ARCH STREQUAL "arm")
-            add_definitions(-D__arm__)
-        elseif(ARCH STREQUAL "arm64")
-            add_definitions(-D__aarch64__)
        endif()
        if(MSVC_VERSION GREATER 1699)
            add_definitions(/D_ALLOW_KEYWORD_MACROS)
@@ -160,10 +153,7 @@ if(NOT CMAKE_CROSSCOMPILING)

    set(NATIVE_TARGETS asmpp bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb)
    if(NOT MSVC)
-        list(APPEND NATIVE_TARGETS pefixup)
-        if (ARCH STREQUAL "i386")
-            list(APPEND NATIVE_TARGETS rsym)
-        endif()
+        list(APPEND NATIVE_TARGETS rsym pefixup)
    endif()

    install(TARGETS ${NATIVE_TARGETS})
@@ -243,8 +233,6 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
                    -D_WIN32_WINDOWS=0x502
                    -D_SETUPAPI_VER=0x502
                    -DMINGW_HAS_SECURE_API=1
-                    -DD3D_UMD_INTERFACE_VERSION=0x000C # Vista
-                    -DDXGKDDI_INTERFACE_VERSION=0x1052 # Vista
                    -DDLL_EXPORT_VERSION=${DLL_EXPORT_VERSION})

    # Arch Options
@@ -262,7 +250,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
    elseif(ARCH STREQUAL "amd64")
        # clang-cl defines this one for itself
        if (NOT (MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang"))
-            add_compile_definitions(_M_AMD64 _M_X64)
+            add_compile_definitions(_M_AMD64)
        endif()
        add_definitions(-D_AMD64_ -D__x86_64__ -D_WIN64)
    elseif(ARCH STREQUAL "arm")
@@ -322,7 +310,6 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
        sdk/include
        sdk/include/psdk
        sdk/include/dxsdk
-        sdk/include/winrt
        ${REACTOS_BINARY_DIR}/sdk/include
        ${REACTOS_BINARY_DIR}/sdk/include/psdk
        ${REACTOS_BINARY_DIR}/sdk/include/dxsdk
@@ -330,12 +317,10 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
        ${REACTOS_BINARY_DIR}/sdk/include/reactos
        ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc
        sdk/include/crt
-        sdk/include/vcruntime
        sdk/include/ddk
        sdk/include/ndk
        sdk/include/reactos
-        sdk/include/reactos/libs
-        sdk/lib/pseh/include)
+        sdk/include/reactos/libs)

    if(ARCH STREQUAL "arm")
        include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/arm)
@@ -352,7 +337,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
    add_subdirectory(sdk/include/asm)

    if(ARCH MATCHES "64$")
-        include(sdk/cmake/baseaddress64.cmake)
+        include(sdk/cmake/baseaddress64.cmake)  
    elseif(NO_ROSSYM)
        include(sdk/cmake/baseaddress_dwarf.cmake)
    elseif(MSVC)
--- a/156
+++ b/156
@@ -116,20 +116,6 @@
 #   S: Abandoned
 /ntoskrnl/cache/

-# Client/Server Runtime Subsystem
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/sdk/include/reactos/subsys/csr/    @HBelusca
-/subsystems/csr/                    @HBelusca
-/win32ss/user/ntuser/csr.*          @HBelusca
-
-# Clipboard Viewer
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   R: Mondgestein, Ricardo Hanke
-#   S: Maintained
-/base/applications/clipbrd/         @HBelusca
-/base/applications/cmdutils/clip/   @HBelusca
-
 # CMake Build Scripts
 #   M:
 #   R: learn-more, learn_more, Mark Jansen
@@ -138,56 +124,6 @@
 /sdk/cmake/
 *.cmake

-# Command-line Utilities
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/base/applications/cmdutils/attrib/         @HBelusca
-/base/applications/cmdutils/chcp/           @HBelusca
-/base/applications/cmdutils/doskey/         @HBelusca
-/base/applications/cmdutils/eventcreate/    @HBelusca
-/base/applications/cmdutils/find/           @HBelusca
-/base/applications/cmdutils/help/           @HBelusca
-/base/applications/cmdutils/mode/           @HBelusca
-/base/applications/cmdutils/more/           @HBelusca
-/base/applications/cmdutils/taskkill/       @HBelusca
-/base/applications/cmdutils/timeout/        @HBelusca
-/sdk/lib/conutils/                          @HBelusca
-
-# Command-line Prompt Interpreter
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/base/shell/cmd/    @HBelusca
-
-# Console Client/Server Subsystem, Terminal Emulator / Text-Mode
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/dll/cpl/console/                           @HBelusca
-/dll/win32/kernel32/client/console/         @HBelusca
-/dll/win32/kernel32/include/console.h       @HBelusca
-/drivers/base/condrv/                       @HBelusca
-/drivers/setup/blue/                        @HBelusca
-/modules/rostests/winetests/kernel32/console.c  @HBelusca
-/sdk/include/reactos/drivers/condrv/        @HBelusca
-/sdk/include/reactos/drivers/blue/          @HBelusca
-/sdk/include/reactos/subsys/win/conmsg.h    @HBelusca
-/sdk/include/reactos/subsys/win/console.h   @HBelusca
-/win32ss/user/ntuser/console.c              @HBelusca
-/win32ss/user/winsrv/concfg/                @HBelusca
-/win32ss/user/winsrv/consrv/                @HBelusca
-
-# Event Log Subsystem
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   M: EricKohl, ekohl, Eric Kohl
-#   S: Maintained
-/base/services/eventlog/                @EricKohl @HBelusca
-/dll/win32/advapi32/service/eventlog.c  @EricKohl @HBelusca
-/sdk/lib/evtlib/                        @HBelusca
-
-# Event Log Viewer
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/base/applications/mscutils/eventvwr/   @HBelusca
-
 # File Patch API
 #   M: learn-more, learn_more, Mark Jansen
 #   S: Maintained
@@ -203,7 +139,7 @@
 # Filesystem Filter Manager
 #   M: gedmurphy, Ged, Ged Murphy
 #   S: Maintained
-/drivers/filters/fltmgr/    @gedmurphy
+/drivers/filters/fltmgr/ @gedmurphy

 # File Systems Run Time Library
 #   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
@@ -214,13 +150,11 @@
 /sdk/lib/drivers/ntoskrnl_vista/fsrtl.c     @HeisSpiter

 # Freeloader
-#   M: HBelusca, Hermès Bélusca-Maïto
+#   M:
 #   R: tkreuzer, ThePhysicist, Timo Kreuzer
 #   R: Extravert-ir, extravert34, Victor Perevertkin
 #   S: Maintained
-/boot/freeldr/freeldr/  @HBelusca @tkreuzer @Extravert-ir
-/boot/rtl/              @HBelusca
-/ntoskrnl/config/cmboot.c   @HBelusca
+/boot/freeldr/freeldr/  @tkreuzer @Extravert-ir

 # HAL / APIC
 #   M: tkreuzer, ThePhysicist, Timo Kreuzer
@@ -253,12 +187,6 @@
 #   S: Maintained
 /drivers/storage/mountmgr/ @HeisSpiter

-# MSConfig
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/base/applications/msconfig/        @HBelusca
-/base/applications/msconfig_new/    @HBelusca
-
 # Network Drivers
 #   M:
 #   R: ThFabba, Thomas Faber
@@ -287,29 +215,11 @@
 #   S: Maintained
 /dll/ntdll/ @HeisSpiter @learn-more @ThFabba @tkreuzer

-# NT Virtual DOS Machine
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   R: reactos573, aandrejevic, Aleksandar Andrejevic
-#   S: Maintained
-/dll/win32/kernel32/client/vdm.c        @reactos573 @HBelusca
-/dll/win32/kernel32/include/vdm.h       @reactos573 @HBelusca
-/sdk/include/reactos/subsys/win/vdm.h   @reactos573 @HBelusca
-/ntoskrnl/vdm                           @reactos573 @HBelusca
-/sdk/include/reactos/libs/fast486/      @reactos573 @HBelusca
-/sdk/lib/fast486/                       @reactos573 @HBelusca
-/subsystems/mvdm/                       @reactos573 @HBelusca
-/subsystems/win/basesrv/vdm.*           @reactos573 @HBelusca
-
 # Printing
 #   M: ColinFinck, Colin Finck
 #   S: Maintained
 /win32ss/printing/ @ColinFinck

-# Program Manager
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/base/shell/progman/    @HBelusca
-
 # ReactOS API Tests
 #   M:
 #   R: learn-more, learn_more, Mark Jansen
@@ -322,25 +232,7 @@
 #   S: Maintained
 /modules/rostests/kmtests/  @ThFabba

-# ReactOS Setup
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   R: EricKohl, ekohl, Eric Kohl
-#   S: Maintained
-/base/setup/                        @HBelusca
-/base/system/winlogon/setup.c       @EricKohl
-/dll/win32/setupapi/
-/dll/win32/syssetup/                @EricKohl
-/drivers/setup/                     @HBelusca
-/sdk/include/reactos/libs/syssetup/ @EricKohl
-
-# ReactOS miscellaneous tools
-#   M:
-#   R: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/modules/rosapps/applications/cmdutils/cat/             @HBelusca
-/modules/rosapps/applications/sysutils/utils/partinfo/  @HBelusca
-
-# ReactOS internals tools
+# ROS internals tools
 #   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
 #   S: Maintained
 /modules/rosapps/applications/rosinternals/ @HeisSpiter
@@ -360,26 +252,15 @@
 /modules/rostests/kmtests/ntos_se/   @GeoB99
 /ntoskrnl/se/                        @GeoB99

-# Session Manager Subsystem
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/base/system/smss/              @HBelusca
-/sdk/include/reactos/subsys/sm/ @HBelusca
-/sdk/lib/smlib/                 @HBelusca
-
 # Shell
 #   M:
 #   R: learn-more, learn_more, Mark Jansen
 #   R: yagoulas, Giannis Adamopoulos
-#   R: HBelusca, Hermès Bélusca-Maïto
 #   S: Maintained
 /base/shell/explorer/   @learn-more @yagoulas
 /base/shell/rshell/     @learn-more @yagoulas
 /dll/win32/browseui/    @learn-more @yagoulas
 /dll/win32/shell32/     @learn-more @yagoulas
-/dll/win32/shell32/CShellLink.*         @HBelusca
-/dll/win32/shell32/CUserNotification.*  @HBelusca
-/dll/win32/shell32/systray.cpp          @HBelusca

 # Shell Extensions
 #   M:
@@ -430,30 +311,8 @@

 # Win32 file functions
 #   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
-#   R: HBelusca, Hermès Bélusca-Maïto
 #   S: Maintained
-/dll/win32/kernel32/client/file/        @HeisSpiter
-/dll/win32/kernel32/client/file/find.c  @HBelusca
-
-# Win32 Subsystem - User Server
-#   M:
-#   R: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/win32ss/user/winsrv/
-/win32ss/user/winsrv/usersrv/harderror.c    @HBelusca
-
-# Win32 Subsystem Shutdown
-#   M: HBelusca, Hermès Bélusca-Maïto
-#   R: EricKohl, ekohl, Eric Kohl
-#   S: Maintained
-/base/system/winlogon/sas.c             @EricKohl @HBelusca
-/base/system/winlogon/shutdown.c        @EricKohl @HBelusca
-/dll/win32/advapi32/misc/shutdown.c     @EricKohl
-/dll/win32/msgina/shutdown.c            @EricKohl @HBelusca
-/win32ss/user/ntuser/shutdown.*         @HBelusca
-/win32ss/user/user32/misc/exit.c        @HBelusca
-/win32ss/user/winsrv/consrv/shutdown.c  @HBelusca
-/win32ss/user/winsrv/usersrv/shutdown.c @HBelusca
+/dll/win32/kernel32/client/file/    @HeisSpiter

 # Windows Network File Systems functions
 #   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
@@ -479,11 +338,6 @@
 amd64/                                      @tkreuzer
 /boot/freeldr/freeldr/arch/realmode/amd64.S @tkreuzer

-# Wine DirectX
-#   M: DarkFire01, The_DarkFire_, Justin Miller
-#   S: Upstream
-/dll/directx/wine/  @DarkFire01
-
 # Translations
 # This is the list of translation teams in ReactOS GitHub organization.
 # If you want to be part of one - hit us at https://chat.reactos.org/
--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
@@ -1,356 +0,0 @@
-# Coding Style
-
-This article describes general coding style guidelines, which should be used for new ReactOS code. These guidelines apply exclusively to C and C++ source files. The Members of ReactOS agreed on this document in the October 2013 meeting.
-
-As much existing ReactOS code as possible should be converted to this style unless there are reasons against doing this (like if the code is going to be rewritten from scratch in the near future). See [Notes on reformatting existing code](#notes-on-reformatting-existing-code) for more details.
-
-Code synchronized with other sources (like Wine) must not be rewritten. [3rd Party Files.txt](https://github.com/reactos/reactos/blob/master/media/doc/3rd%20Party%20Files.txt) and [WINESYNC.txt](https://github.com/reactos/reactos/blob/master/media/doc/WINESYNC.txt) files can be used for tracking synchronized files.
-
-## File Structure
-
-1. Every ReactOS source code file should include a file header like this:
-
-```
-/*
- * PROJECT:     ReactOS Kernel
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Does cool things like Memory Management
- * COPYRIGHT:   Copyright 2017 Arno Nymous <abc@mailaddress.com>
- *              Copyright 2017 Mike Blablabla <mike@blabla.com>
- */
-```
-
-Please use SPDX license identifiers available at https://spdx.org/licenses.
-This makes our source file parseable by licensing tools!
-
-You should add yourself to the `COPYRIGHT` section of a file if you did a major contribution to it and could take responsibility for the whole file or a part of it. Not more than 3 people shall be in that list for each file.
-
-`FILE` line of the old header should be removed.
-
-2. [Doxygen](https://doxygen.reactos.org/) documentation generator is used for ReactOS codebase, so use a proper header for functions, see [API Documentation](https://reactos.org/wiki/Documentation_Guidelines#API_Documentation) for details.
-
-## Indentation and line width
-
-1. Line width must be at most **100 characters**.
-2. Do not add a space or tab at the end of any line.
-3. Indent with **4 spaces**, don't use tabs!
-4. Indent both a case label and the case statement of a switch statement.
-
-**Right:**
-```c
-switch (Condition)
-{
-    case 1:
-        DoSomething();
-        break;
-
-    case 2:
-    {
-        DoMany();
-        ManyMore();
-        OtherThings();
-        break;
-    }
-}
-```
-
-**Wrong:**
-```c
-switch(Condition)
-{
-case 1:
-     DoSomething();
-     break;
-case 2:
-    DoMany();
-    ManyMore();
-    OtherThings();
-    break;
-}
-```
-
-5. When a function call does not fit onto a line, align arguments like this:
-```c
-FunctionCall(arg1,
-             arg2,
-             arg3);
-```
-
-6. Function headers should have this format (preserving the order as in the example):
-```c
-static    // scope identifier
-CODE_SEG("PAGE")    // section placement
-// other attributes
-BOOLEAN    // return type
-FASTCALL    // calling convention
-IsOdd(
-    _In_ UINT32 Number);
-```
-
-## Spacing
-
-1. Do not use spaces around unary operators.  
-**Right:** `i++;`  
-**Wrong:** `i ++;`
-
-2. Place spaces around binary and ternary operators.  
-**Right:** `a = b + c;`  
-**Wrong:** `a=b+c;`
-
-3. Do not place spaces before comma and semicolon.
-
-**Right:**
-```c
-for (int i = 0; i < 5; i++)
-    DoSomething();
-
-func1(a, b);
-```
-
-**Wrong:**
-```c
-for (int i = 0; i < 5 ; i++)
-    DoSomething();
-
-func1(a , b) ;
-```
-
-4. Place spaces between control statements and their parentheses.
-
-**Right:**
-```c
-if (Condition)
-    DoSomething();
-```
-
-**Wrong:**
-```c
-if(Condition)
-    DoSomething();
-```
-
-5. Do not place spaces between a function and its parentheses, or between a parenthesis and its content.
-
-**Right:**
-```c
-func(a, b);
-```
-
-**Wrong:**
-```c
-func (a, b);
-func( a, b );
-```
-
-## Line breaking
-
-1. Each statement should get its own line.
-
-**Right:**
-```c
-x++;
-y++;
-
-if (Condition)
-    DoSomething();
-```
-
-**Wrong:**
-```c
-x++; y++;
-
-if (Condition) DoSomething();
-```
-
-## Braces
-
-1. Always put braces (`{` and `}`) on their own lines.
-2. One-line control clauses may use braces, but this is not a requirement. An exception are one-line control clauses including additional comments.
-
-**Right:**
-```c
-if (Condition)
-    DoSomething();
-
-if (Condition)
-{
-    DoSomething();
-}
-
-if (Condition)
-{
-    // This is a comment
-    DoSomething();
-}
-
-if (A_Very || (Very && Long || Condition) &&
-    On_Many && Lines)
-{
-    DoSomething();
-}
-
-if (Condition)
-    DoSomething();
-else
-    DoSomethingElse();
-
-if (Condition)
-{
-    DoSomething();
-}
-else
-{
-    DoSomethingElse();
-    YetAnother();
-}
-```
-
-**Wrong:**
-```c
-if (Condition) {
-    DoSomething();
-}
-
-if (Condition)
-    // This is a comment
-    DoSomething();
-
-if (A_Very || (Very && Long || Condition) &&
-    On_Many && Lines)
-    DoSomething();
-
-if (Condition)
-    DoSomething();
-else {
-    DoSomethingElse();
-    YetAnother();
-}
-```
-
-## Control structures
-
-1. Don't use inverse logic in control clauses.  
-**Right:** `if (i == 1)`  
-**Wrong:** `if (1 == i)`
-
-2. Avoid too many levels of cascaded control structures. Prefer a "linear style" over a "tree style". Use `goto` when it helps to make the code cleaner (e.g. for cleanup paths).
-
-**Right:**
-```c
-if (!func1())
-    return;
-
-i = func2();
-if (i == 0)
-    return;
-
-j = func3();
-if (j == 1)
-    return;
-...
-```
-
-**Wrong:**
-```c
-if (func1())
-{
-    i = func2();
-    if (func2())
-    {
-        j = func3();
-        if (func3())
-        {
-            ...
-        }
-    }
-}
-```
-
-## Naming
-
-1. Capitalize names of variables and functions. Hungarian Notation may be used when developing for Win32, but it is not required. If you don't use it, the first letter of a name must be a capital too (no lowerCamelCase). Do not use underscores as separators either.
-
-**Right:**
-```c
-PLIST_ENTRY FirstEntry;
-VOID NTAPI IopDeleteIoCompletion(PVOID ObjectBody);
-PWSTR pwszTest;
-```
-
-**Wrong:**
-```c
-PLIST_ENTRY first_entry;
-VOID NTAPI iop_delete_io_completion(PVOID objectBody);
-PWSTR pwsztest;
-```
-
-2. Avoid abbreviating function and variable names, use descriptive verbs where possible.
-
-3. Precede boolean values with meaningful verbs like "is" and "did" if possible and if it fits the usage.
-
-**Right:**
-```c
-BOOLEAN IsValid;
-BOOLEAN DidSendData;
-```
-
-**Wrong:**
-```c
-BOOLEAN Valid;
-BOOLEAN SentData;
-```
-
-## Commenting
-
-1. Avoid line-wasting comments, which could fit into a single line.
-
-**Right:**
-```c
-// This is a one-line comment
-
-/* This is a C-style comment */
-
-// This is a comment over multiple lines.
-// We don't define any strict rules for it.
-```
-
-**Wrong:**
-```c
-//
-// This comment wastes two lines
-//
-```
-
-## Null, false and 0
-
-1. The null pointer should be written as `NULL`. In the rare case that your environment recommends a different null pointer (e.g. C++11 `nullptr`), you may use this one of course. Just don't use the value `0`.
-
-2. Win32/NT Boolean values should be written as `TRUE` and `FALSE`. In the rare case that you use C/C++ `bool` variables, you should write them as `true` and `false`.
-
-3. When you need to terminate ANSI or OEM string, or check for its terminator, use `ANSI_NULL`. If the string is Unicode or Wide string, use `UNICODE_NULL`.
-
-## Notes on reformatting existing code
-
- Never totally reformat a file and put a code change into it. Do this in separate commits.
- If a commit only consists of formatting changes, say this clearly in the commit message by preceding it with *[FORMATTING]*.
-
-## Other points
-
- Do not use `LARGE_INTEGER`/`ULARGE_INTEGER` unless needed for using APIs. Use `INT64`/`UINT64` instead
- Use `#pragma once` instead of guard defines in headers
- Don't specify a calling convention for a function unless required (usually for APIs or exported symbols)
-
-## Using an automatic code style tool
-
-TO BE ADDED BY User:Zefklop
-
-## Points deliberately left out
-
-Additional ideas were suggested during the discussion of this document, but a consensus couldn't be reached on them. Therefore we refrain from enforcing any rules on these points:
-
- TO BE ADDED BY User:Hbelusca
-
-## See also
-
- [Kernel Coding Style](https://reactos.org/wiki/Kernel_Coding_Style)
- [GNU Indent](https://reactos.org/wiki/GNU_Indent)
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@
 ---

 <p align=center>
-  <a href="https://reactos.org/project-news/reactos-0415-released/">
-    <img alt="ReactOS 0.4.15 Release" src="https://img.shields.io/badge/release-0.4.15-0688CB.svg"></a>
+  <a href="https://reactos.org/project-news/reactos-0414-released/">
+    <img alt="ReactOS 0.4.14 Release" src="https://img.shields.io/badge/release-0.4.14-0688CB.svg"></a>
  <a href="https://reactos.org/download/">
    <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg"></a>
  <a href="https://sourceforge.net/projects/reactos/">
--- a/base/applications/CMakeLists.txt
+++ b/base/applications/CMakeLists.txt
@@ -3,7 +3,6 @@ add_subdirectory(atactl)
 add_subdirectory(cacls)
 add_subdirectory(calc)
 add_subdirectory(charmap)
-add_subdirectory(cleanmgr)
 add_subdirectory(clipbrd)
 add_subdirectory(cmdutils)
 add_subdirectory(control)
--- a/base/applications/atactl/helper.h
+++ b/base/applications/atactl/helper.h
@@ -35,4 +35,4 @@ typedef struct _SENDCMDINPARAMS {
 	ULONG  dwReserved[4];
 	UCHAR  bBuffer[1];
 } SENDCMDINPARAMS, *PSENDCMDINPARAMS, *LPSENDCMDINPARAMS;
-#include <poppack.h>
+#include <poppack.h>
--- a/base/applications/calc/convert.c
+++ b/base/applications/calc/convert.c
@@ -181,7 +181,7 @@ static const conv_t conv_CURRENCY[] = {
    DECLARE_CONV_UNIT(CURRENCY, LITHUANIAN_LITAS,   "$/3,45280", "$*3,45280")
    DECLARE_CONV_UNIT(CURRENCY, LUXEMBOURG_FRANC,   "$/40,3399", "$*40,3399")
    DECLARE_CONV_UNIT(CURRENCY, MALTESE_LIRA,       "$/0.42930", "$*0.42930")
-    DECLARE_CONV_UNIT(CURRENCY, PORTUGUESE_ESCUDO,  "$/200,482", "$*200,482")
+    DECLARE_CONV_UNIT(CURRENCY, PORTOGUESE_ESCUDO,  "$/200,482", "$*200,482")
    DECLARE_CONV_UNIT(CURRENCY, SLOVAK_KORUNA,      "$/30,126",  "$*30,126")
    DECLARE_CONV_UNIT(CURRENCY, SLOVENIAN_TOLAR,    "$/239,640", "$*239,640")
    DECLARE_CONV_UNIT(CURRENCY, SPANISH_PESETA,     "$/166,386", "$*166,386")
--- a/base/applications/calc/lang/bg-BG.rc
+++ b/base/applications/calc/lang/bg-BG.rc
@@ -1,5 +1,7 @@
 /* Превод на Български/ Bulgarian translation
 * https://reactos.org/wiki/Bulgarian_translation
+ * FILE: base/applications/calc/lang/bg-BG.rc
+ * Недовършен / Incomplete
 */

 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
@@ -8,15 +10,15 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калкулатор"
+CAPTION "Калкулатор за ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Шстн", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Дстн", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Осм", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Двоич", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Шстн", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Дстн", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Осм", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    CONTROL "Двоич", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 107, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 5, 34, 84, 20
    CONTROL "Обр", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Хип", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -133,13 +135,17 @@ BEGIN
    PUSHBUTTON "Дроб", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "ЧДума", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "ДДума", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Дума", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Байт", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Градуси", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Радиани", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Градиани", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "ЧДума", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "ДДума", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Дума", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Байт", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Градуси", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Радиани", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Градиани", 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 |
@@ -152,7 +158,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калкулатор"
+CAPTION "Калкулатор за ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -217,7 +223,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калкулатор"
+CAPTION "Калкулатор за ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -309,8 +315,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "&Обработка"
    BEGIN
-        MENUITEM "Запомняне\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Поставяне\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Запомняне\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Поставяне\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Изглед"
    BEGIN
@@ -341,8 +347,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "&Обработка"
    BEGIN
-        MENUITEM "Запомняне\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Поставяне\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Запомняне\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Поставяне\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Изглед"
    BEGIN
@@ -374,8 +380,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "&Обработка"
    BEGIN
-        MENUITEM "Запомняне\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Поставяне\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Запомняне\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Поставяне\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Изглед"
    BEGIN
@@ -504,7 +510,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Люксембургски франк"
    IDS_CURRENCY_MALTESE_LIRA "Малтийска лира"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Португалско ескудо"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Португалско ескудо"
    IDS_CURRENCY_SLOVAK_KORUNA "Словашка крона"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Словенси толар"
    IDS_CURRENCY_SPANISH_PESETA "Испанска песета"
--- a/base/applications/calc/lang/cs-CZ.rc
+++ b/base/applications/calc/lang/cs-CZ.rc
@@ -1,5 +1,6 @@
-/*
- * TRANSLATOR: 2010 Radek Liska (Black_Fox) <radekliska@gmail.com>
+/* FILE:       base/applications/calc/lang/cs-CZ.rc
+ * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
+ * UPDATED:    2010-05-30
 */

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
@@ -8,15 +9,15 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulačka"
+CAPTION "ReactOS kalkulačka"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -133,13 +134,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Stupně", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radiány", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Grady", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Stupně", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radiány", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Grady", 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 |
@@ -152,7 +157,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulačka"
+CAPTION "ReactOS Kalkulačka"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -217,7 +222,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulačka"
+CAPTION "ReactOS Kalkulačka"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -309,8 +314,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Úpravy"
    BEGIN
-        MENUITEM "Kopírovat\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Vložit\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopírovat\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Vložit\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Zobrazit"
    BEGIN
@@ -341,8 +346,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Úpravy"
    BEGIN
-        MENUITEM "Kopírovat\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Vložit\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopírovat\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Vložit\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Zobrazit"
    BEGIN
@@ -374,8 +379,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Úpravy"
    BEGIN
-        MENUITEM "Kopírovat\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Vložit\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopírovat\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Vložit\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Zobrazit"
    BEGIN
@@ -504,7 +509,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Lucemburský frank"
    IDS_CURRENCY_MALTESE_LIRA "Maltská lira"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugalské escudo"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalské escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovenská koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinský tolar"
    IDS_CURRENCY_SPANISH_PESETA "Španělská peseta"
--- a/base/applications/calc/lang/de-DE.rc
+++ b/base/applications/calc/lang/de-DE.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Rechner"
+CAPTION "ReactOS Rechner"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dez", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Okt", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dez", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Okt", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,13 +129,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Degree", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radiant", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Grad", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Degree", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radiant", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Grad", 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 |
@@ -148,7 +152,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Rechner"
+CAPTION "ReactOS Rechner"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -213,7 +217,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Rechner"
+CAPTION "ReactOS Rechner"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -303,89 +307,89 @@ END

 IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
-    POPUP "&Bearbeiten"
+    POPUP "Bearbeiten"
    BEGIN
-        MENUITEM "&Kopieren\tStrg-C", IDM_EDIT_COPY
-        MENUITEM "&Einfügen\tStrg-V", IDM_EDIT_PASTE
+        MENUITEM "Kopieren\tSTRG-C", IDM_EDIT_COPY
+        MENUITEM "Einfügen\tSTRG-V", IDM_EDIT_PASTE
    END
-    POPUP "&Ansicht"
+    POPUP "Ansicht"
    BEGIN
-        MENUITEM "&Standard", IDM_VIEW_STANDARD
-        MENUITEM "&Wissenschaftlich", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Kon&version", IDM_VIEW_CONVERSION
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Konversion", IDM_VIEW_CONVERSION
        MENUITEM SEPARATOR
-        MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "De&zimal\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "O&ktal\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "&Binär\tF8", IDM_VIEW_BIN, CHECKED
+        MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
+        MENUITEM "Dezimal\tF6", IDM_VIEW_DEC, CHECKED
+        MENUITEM "Oktal\tF7", IDM_VIEW_OCT, CHECKED
+        MENUITEM "Binär\tF8", IDM_VIEW_BIN, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "&Deg\tF2", IDM_VIEW_DEG, CHECKED
-        MENUITEM "&Rad\tF3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "&Grad\tF4", IDM_VIEW_GRAD, CHECKED
+        MENUITEM "Degree\tF2", IDM_VIEW_DEG, CHECKED
+        MENUITEM "Radiant\tF3", IDM_VIEW_RAD, CHECKED
+        MENUITEM "Grad\tF4", IDM_VIEW_GRAD, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "Zifferngr&uppierung", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED
    END
-    POPUP "&?"
+    POPUP "Hilfe"
    BEGIN
-        MENUITEM "&Hilfethemen", IDM_HELP_HELP
+        MENUITEM "Hilfethemen", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "&Info", IDM_HELP_ABOUT
+        MENUITEM "Info", IDM_HELP_ABOUT
    END
 END

 IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
-    POPUP "&Bearbeiten"
+    POPUP "Bearbeiten"
    BEGIN
-        MENUITEM "&Kopieren\tStrg-C", IDM_EDIT_COPY
-        MENUITEM "&Einfügen\tStrg-V", IDM_EDIT_PASTE
+        MENUITEM "Kopieren\tSTRG-C", IDM_EDIT_COPY
+        MENUITEM "Einfügen\tSTRG-V", IDM_EDIT_PASTE
    END
-    POPUP "&Ansicht"
+    POPUP "Ansicht"
    BEGIN
-        MENUITEM "&Standard", IDM_VIEW_STANDARD
-        MENUITEM "&Wissenschaftlich", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Kon&version", IDM_VIEW_CONVERSION
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Konversion", IDM_VIEW_CONVERSION
        MENUITEM SEPARATOR
-        MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "&Dezimal\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "O&ktal\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "Bi&när\tF8", IDM_VIEW_BIN, CHECKED
+        MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
+        MENUITEM "Dezimal\tF6", IDM_VIEW_DEC, CHECKED
+        MENUITEM "Oktal\tF7", IDM_VIEW_OCT, CHECKED
+        MENUITEM "Binär\tF8", IDM_VIEW_BIN, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "&Qword\tF12", IDM_VIEW_QWORD, CHECKED
-        MENUITEM "Dw&ord\tF2", IDM_VIEW_DWORD, CHECKED
-        MENUITEM "Wo&rd\tF3", IDM_VIEW_WORD, CHECKED
-        MENUITEM "&Byte\tF4", IDM_VIEW_BYTE, CHECKED
+        MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED
+        MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED
+        MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED
+        MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "Zifferngr&uppierung", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED
    END
-    POPUP "&?"
+    POPUP "Hilfe"
    BEGIN
-        MENUITEM "&Hilfethemen", IDM_HELP_HELP
+        MENUITEM "Hilfethemen", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "&Info", IDM_HELP_ABOUT
+        MENUITEM "Über ReactOS Rechner", IDM_HELP_ABOUT
    END
 END

 IDR_MENU_STANDARD MENU
 BEGIN
-    POPUP "&Bearbeiten"
+    POPUP "Bearbeiten"
    BEGIN
-        MENUITEM "&Kopieren\tStrg-C", IDM_EDIT_COPY
-        MENUITEM "&Einfügen\tStrg-V", IDM_EDIT_PASTE
+        MENUITEM "Kopieren\tSTRG-C", IDM_EDIT_COPY
+        MENUITEM "Einfügen\tSTRG-V", IDM_EDIT_PASTE
    END
-    POPUP "&Ansicht"
+    POPUP "Ansicht"
    BEGIN
-        MENUITEM "&Standard", IDM_VIEW_STANDARD
-        MENUITEM "&Wissenschaftlich", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Kon&version", IDM_VIEW_CONVERSION
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Konversion", IDM_VIEW_CONVERSION
        MENUITEM SEPARATOR
-        MENUITEM "Zifferngr&uppierung", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED
    END
-    POPUP "&?"
+    POPUP "Hilfe"
    BEGIN
-        MENUITEM "&Hilfethemen", IDM_HELP_HELP
+        MENUITEM "Hilfethemen", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "&Info", IDM_HELP_ABOUT
+        MENUITEM "Über ReactOS Rechner", IDM_HELP_ABOUT
    END
 END

@@ -500,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgische Franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltesische Lire"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugiesische Escudo"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugiesische Escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slowakische Krone"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenische Tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spanische Peseta"
--- a/base/applications/calc/lang/el-GR.rc
+++ b/base/applications/calc/lang/el-GR.rc
@@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,13 +129,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Βαθμοί", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Μοίρες", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Ακτίνια", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Βαθμοί", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Μοίρες", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Ακτίνια", 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 |
@@ -305,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Επεξεργασία"
    BEGIN
-        MENUITEM "Αντιγραφή\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Επικόλληση\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Αντιγραφή\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Επικόλληση\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "View"
    BEGIN
@@ -337,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Επεξεργασία"
    BEGIN
-        MENUITEM "Αντιγραφή\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Επικόλληση\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Αντιγραφή\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Επικόλληση\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "View"
    BEGIN
@@ -370,8 +374,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Επεξεργασία"
    BEGIN
-        MENUITEM "Αντιγραφή\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Επικόλληση\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Αντιγραφή\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Επικόλληση\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "View"
    BEGIN
@@ -500,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Μαλτέζικη λίρα"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Πορτογαλικό εσκούδο"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Πορτογαλικό εσκούδο"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
    IDS_CURRENCY_SPANISH_PESETA "Ισπανική πεσέτα"
--- a/base/applications/calc/lang/en-US.rc
+++ b/base/applications/calc/lang/en-US.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculator"
+CAPTION "ReactOS Calculator"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,13 +129,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Degrees", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Degrees", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradians", 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 |
@@ -148,7 +152,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculator"
+CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -213,7 +217,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculator"
+CAPTION "ReactOS Calculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -500,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portuguese escudo"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portuguese escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
--- a/base/applications/calc/lang/es-ES.rc
+++ b/base/applications/calc/lang/es-ES.rc
@@ -10,15 +10,15 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora"
+CAPTION "Calculadora de ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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
@@ -135,13 +135,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Grados", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radianes", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradianes", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            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
    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 |
@@ -154,7 +158,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora"
+CAPTION "Calculadora de ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -219,7 +223,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora"
+CAPTION "Calculadora de ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -311,8 +315,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Edición"
    BEGIN
-        MENUITEM "Copiar\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Pegar\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Copiar\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Pegar\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Ver"
    BEGIN
@@ -343,8 +347,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Edición"
    BEGIN
-        MENUITEM "Copiar\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Pegar\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Copiar\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Pegar\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Ver"
    BEGIN
@@ -376,8 +380,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Edición"
    BEGIN
-        MENUITEM "Copiar\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Pegar\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Copiar\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Pegar\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Ver"
    BEGIN
@@ -506,7 +510,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburgués"
    IDS_CURRENCY_MALTESE_LIRA "Lira maltesa"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo portugués"
+    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"
--- a/base/applications/calc/lang/fr-FR.rc
+++ b/base/applications/calc/lang/fr-FR.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculatrice"
+CAPTION "Calculatrice ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,13 +129,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Q-mot", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "D-mot", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Mot", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Octet", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Degrés", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Grades", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Q-mot", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "D-mot", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Mot", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Octet", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Degrés", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Grades", 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 |
@@ -148,7 +152,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculatrice"
+CAPTION "Calculatrice ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -213,7 +217,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculatrice"
+CAPTION "Calculatrice ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -305,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Édition"
    BEGIN
-        MENUITEM "Copier\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Coller\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Copier\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Coller\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Affichage"
    BEGIN
@@ -337,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Édition"
    BEGIN
-        MENUITEM "Copier\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Coller\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Copier\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Coller\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Affichage"
    BEGIN
@@ -370,8 +374,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Édition"
    BEGIN
-        MENUITEM "Copier\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Coller\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Copier\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Coller\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Affichage"
    BEGIN
@@ -500,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franc luxembourgeois"
    IDS_CURRENCY_MALTESE_LIRA "Lire maltaise"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo portugaise"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portugaise"
    IDS_CURRENCY_SLOVAK_KORUNA "Couronne slovaque"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar slovène"
    IDS_CURRENCY_SPANISH_PESETA "Peseta espagnole"
--- a/base/applications/calc/lang/he-IL.rc
+++ b/base/applications/calc/lang/he-IL.rc
@@ -1,4 +1,4 @@
-/* TRANSLATOR: Baruch Rutman */
+/* Translated by Baruch Rutman */

 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT

@@ -7,15 +7,15 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_LAYOUTRTL
-CAPTION "מחשבון"
+CAPTION "מחשבון ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 4 ,14, 141, 20
-    AUTORADIOBUTTON "הקס", IDC_RADIO_HEX, 6, 21, 30, 10
-    AUTORADIOBUTTON "עשרוני", IDC_RADIO_DEC, 36, 21, 34, 10
-    AUTORADIOBUTTON "אוקטלי", IDC_RADIO_OCT, 73, 21, 37, 10
-    AUTORADIOBUTTON "בינרי", IDC_RADIO_BIN, 113, 21, 30, 10
+    CONTROL "הקס", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 6, 21, 30, 10
+    CONTROL "עשרוני", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 36, 21, 34, 10
+    CONTROL "אוקטלי", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 73, 21, 37, 10
+    CONTROL "בינרי", IDC_RADIO_BIN, "Button", BS_AUTORADIOBUTTON, 113, 21, 30, 10
    GROUPBOX "", IDC_STATIC, 4, 34, 84, 20
    CONTROL "Inv", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
    CONTROL "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -132,13 +132,17 @@ BEGIN
    PUSHBUTTON "A", IDC_BUTTON_A, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "מעלות", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "רדיאנים", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "גרדיאנים", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "מעלות", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "רדיאנים", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "גרדיאנים", 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 |
@@ -152,7 +156,7 @@ END
 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_LAYOUTRTL
-CAPTION "מחשבון"
+CAPTION "מחשבון ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -218,7 +222,7 @@ END
 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_LAYOUTRTL
-CAPTION "מחשבון"
+CAPTION "מחשבון ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -506,7 +510,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "פרנק לוקסמבורגי"
    IDS_CURRENCY_MALTESE_LIRA "לירה מלטזי"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "אסקודו פורטגלי"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "אסקודו פורטגלי"
    IDS_CURRENCY_SLOVAK_KORUNA "קורונה סלובקית"
    IDS_CURRENCY_SLOVENIAN_TOLAR "טולר סלובני"
    IDS_CURRENCY_SPANISH_PESETA "פזטה ספרדית"
--- a/base/applications/calc/lang/hu-HU.rc
+++ b/base/applications/calc/lang/hu-HU.rc
@@ -1,8 +1,9 @@
 /*
 * PROJECT:    ReactOS Calculator
 * LICENSE:    GPL - See COPYING in the top level directory
+ * FILE:       base/applications/calc/lang/hu-HU.rc
 * PURPOSE:    Hungarian Language File for ReactOS Calc
- * TRANSLATOR: Nagy Tibor <xnagytibor@gmail.com>
+ * TRANSLATOR: Nagy Tibor (xnagytibor at gmail dot com)
 */

 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
@@ -11,15 +12,15 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Számológép"
+CAPTION "ReactOS Számológép"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -136,13 +137,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Négyszó", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Duplaszó", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Szó", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Bájt", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Fok", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radián", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradián", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Négyszó", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Duplaszó", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Szó", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Bájt", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Fok", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radián", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradián", 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 |
@@ -155,7 +160,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Számológép"
+CAPTION "ReactOS Számológép"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -220,7 +225,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Számológép"
+CAPTION "ReactOS Számológép"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -447,12 +452,12 @@ BEGIN
    IDS_AREA_ACRES_FRANCE "Acre (Franciaország)"
    IDS_AREA_ACRES_SCOTS "Acre (Skót)"
    IDS_AREA_ACRES_US "Acre (Egyesült Államok)"
-    IDS_AREA_ARES "Are"
+    IDS_AREA_ARES "Are" // ?
    IDS_AREA_CHOU "Chou"
    IDS_AREA_DANBO "Danbo"
    IDS_AREA_HECTARES "Hektár"
    IDS_AREA_JEONGBO "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY "Hold (Magyarország)"
+    IDS_AREA_MORGEN_HUNGARY "Hold (Magyarország)" // ?
    IDS_AREA_MU "Mu"
    IDS_AREA_PING "Ping"
    IDS_AREA_PYEONG "Pyeong"
@@ -460,19 +465,19 @@ BEGIN
    IDS_AREA_RAI "Rai"
    IDS_AREA_SE "Se"
    IDS_AREA_SQUARE_CENTIMETERS "Négyzetcentiméter"
-    IDS_AREA_SQUARE_CHR "Négyzetchr"
-    IDS_AREA_SQUARE_FATHOMS "Négyzetöl"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Négyzetöl (Magyarország)"
-    IDS_AREA_SQUARE_FEET "Négyzetláb"
-    IDS_AREA_SQUARE_INCHES "Négyzethüvelyk"
+    IDS_AREA_SQUARE_CHR "Négyzetchr" // ?
+    IDS_AREA_SQUARE_FATHOMS "Négyzetöl" // Alt.: Négyszögöl
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Négyzetöl (Magyarország)" // Alt.: Négyszögöl (Magyarország)
+    IDS_AREA_SQUARE_FEET "Négyzetláb" // Alt.: Négyszögláb
+    IDS_AREA_SQUARE_INCHES "Négyzethüvelyk" // Alt.: Négyszöghüvelyk
    IDS_AREA_SQUARE_KILOMETERS "Négyzetkilométer"
-    IDS_AREA_SQUARE_LAR "Négyzetlar"
+    IDS_AREA_SQUARE_LAR "Négyzetlar" // ?
    IDS_AREA_SQUARE_METER "Négyzetméter"
    IDS_AREA_SQUARE_MILES "Négyzetmérföld"
    IDS_AREA_SQUARE_MILLIMETERS "Négyzetmilliméter"
-    IDS_AREA_SQUARE_SHAKU "Négyzetshaku"
-    IDS_AREA_SQUARE_TSUEN "Négyzettsuen"
-    IDS_AREA_SQUARE_VA "Négyzetva"
+    IDS_AREA_SQUARE_SHAKU "Négyzetshaku" // ?
+    IDS_AREA_SQUARE_TSUEN "Négyzettsuen" // ?
+    IDS_AREA_SQUARE_VA "Négyzetva" // ?
    IDS_AREA_SQUARE_YARD "Négyzetyard"
    IDS_AREA_TAN "Tan"
    IDS_AREA_TSUBO "Tsubo"
@@ -507,7 +512,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgi frank"
    IDS_CURRENCY_MALTESE_LIRA "Máltai líra"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugál escudo"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugál escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Szlovák korona"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Szlovén tolár"
    IDS_CURRENCY_SPANISH_PESETA "Spanyol pezeta"
--- a/base/applications/calc/lang/id-ID.rc
+++ b/base/applications/calc/lang/id-ID.rc
@@ -11,15 +11,15 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator"
+CAPTION "Kalkulator ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -136,13 +136,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Derajat", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radian", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradian", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Derajat", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radian", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradian", 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 |
@@ -155,7 +159,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator"
+CAPTION "Kalkulator ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -220,7 +224,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator"
+CAPTION "Kalkulator ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -507,7 +511,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Litas Lithuania"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franc Luksemburg"
    IDS_CURRENCY_MALTESE_LIRA "Lira Malta"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo Portugis"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo Portugis"
    IDS_CURRENCY_SLOVAK_KORUNA "Koruna Slovakia"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar Slovenia"
    IDS_CURRENCY_SPANISH_PESETA "Peseta Spanyol"
--- a/base/applications/calc/lang/it-IT.rc
+++ b/base/applications/calc/lang/it-IT.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calcolatrice"
+CAPTION "Calcolatrice ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,13 +129,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Gradi", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radianti", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradienti", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Gradi", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radianti", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradienti", 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 |
@@ -148,7 +152,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calcolatrice"
+CAPTION "Calcolatrice ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -213,7 +217,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calcolatrice"
+CAPTION "Calcolatrice ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -305,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Modifica"
    BEGIN
-        MENUITEM "Copia\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Incolla\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Copia\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Incolla\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Visualizza"
    BEGIN
@@ -337,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Modifica"
    BEGIN
-        MENUITEM "Copia\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Incolla\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Copia\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Incolla\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Visualizza"
    BEGIN
@@ -370,8 +374,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Modifica"
    BEGIN
-        MENUITEM "Copia\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Incolla\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Copia\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Incolla\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Visualizza"
    BEGIN
@@ -500,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franco Lussemburghese"
    IDS_CURRENCY_MALTESE_LIRA "Lira maltese"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo portoghese"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portoghese"
    IDS_CURRENCY_SLOVAK_KORUNA "Corona slovacca"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tallero sloveno"
    IDS_CURRENCY_SPANISH_PESETA "Peseta spagnola"
--- a/base/applications/calc/lang/ja-JP.rc
+++ b/base/applications/calc/lang/ja-JP.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "電卓"
+CAPTION "ReactOS 電卓"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 9, "MS UI Gothic", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "16進", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "10進", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "8進", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "2進", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "16進", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "10進", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "8進", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    CONTROL "2進", 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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,13 +129,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Degrees", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Degrees", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradians", 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 |
@@ -148,7 +152,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "電卓"
+CAPTION "ReactOS 電卓"
 MENU IDR_MENU_STANDARD
 FONT 9, "MS UI Gothic", 0, 0, 0x1
 BEGIN
@@ -213,7 +217,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "電卓"
+CAPTION "ReactOS 電卓"
 MENU IDR_MENU_STANDARD
 FONT 9, "MS UI Gothic"
 BEGIN
@@ -373,7 +377,7 @@ BEGIN
        MENUITEM "コピー(&C)\tCtrl+C", IDM_EDIT_COPY
        MENUITEM "貼り付け(&P)\tCtrl+V", IDM_EDIT_PASTE
    END
-    POPUP "表示(&V)"
+    POPUP "表示"
    BEGIN
        MENUITEM "標準(&T)", IDM_VIEW_STANDARD
        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC
@@ -500,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "ルクセンブルク フラン"
    IDS_CURRENCY_MALTESE_LIRA "マルタ リラ"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "ポルトガル エスクード"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "ポルトガル エスクード"
    IDS_CURRENCY_SLOVAK_KORUNA "スロバキア コルナ"
    IDS_CURRENCY_SLOVENIAN_TOLAR "スロベニア tolar"
    IDS_CURRENCY_SPANISH_PESETA "スペイン ペセタ"
--- a/base/applications/calc/lang/ko-KR.rc
+++ b/base/applications/calc/lang/ko-KR.rc
@@ -6,15 +6,15 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "계산기"
+CAPTION "ReactOS 계산기"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 9, "굴림", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -131,13 +131,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Degrees", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Degrees", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradians", 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 |
@@ -150,7 +154,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "계산기"
+CAPTION "ReactOS 계산기"
 MENU IDR_MENU_STANDARD
 FONT 9, "굴림", 0, 0, 0x1
 BEGIN
@@ -215,7 +219,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "계산기"
+CAPTION "ReactOS 계산기 정보"
 MENU IDR_MENU_STANDARD
 FONT 9, "굴림"
 BEGIN
@@ -307,8 +311,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "편집"
    BEGIN
-        MENUITEM "복사\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "붙여넣기\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "복사\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "붙여넣기\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "보기"
    BEGIN
@@ -339,8 +343,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "편집"
    BEGIN
-        MENUITEM "복사\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "붙여넣기\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "복사\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "붙여넣기\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "보기"
    BEGIN
@@ -372,8 +376,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "편집"
    BEGIN
-        MENUITEM "복사\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "붙여넣기\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "복사\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "붙여넣기\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "보기"
    BEGIN
@@ -502,7 +506,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portuguese escudo"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
--- a/base/applications/calc/lang/nl-NL.rc
+++ b/base/applications/calc/lang/nl-NL.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Rekenmachine"
+CAPTION "ReactOS Rekenmachine"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,13 +129,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Graden", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radialen", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradiënten", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Graden", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radialen", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradiënten", 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 |
@@ -148,7 +152,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Rekenmachine"
+CAPTION "ReactOS Rekenmachine"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -213,7 +217,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Rekenmachine"
+CAPTION "ReactOS Rekenmachine"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -305,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Bewerken"
    BEGIN
-        MENUITEM "Kopiëren\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Plakken\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiëren\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Plakken\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Beeld"
    BEGIN
@@ -337,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Edit"
    BEGIN
-        MENUITEM "Kopiëren\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Plakken\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiëren\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Plakken\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Beeld"
    BEGIN
@@ -370,8 +374,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Edit"
    BEGIN
-        MENUITEM "Kopiëren\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Plakken\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiëren\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Plakken\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "View"
    BEGIN
@@ -500,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburgse franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugese escudo"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugese escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slowaakse kroon"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Sloveense tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spaanse peseta"
--- a/base/applications/calc/lang/no-NO.rc
+++ b/base/applications/calc/lang/no-NO.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator"
+CAPTION "ReactOS Kalkulator"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Heks", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Des", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Okt", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Heks", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Des", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Okt", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,13 +129,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Tegn", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Grader", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radianer", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradienter", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Tegn", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Grader", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radianer", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradienter", 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 |
@@ -148,7 +152,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator"
+CAPTION "ReactOS Kalkulator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -213,7 +217,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator"
+CAPTION "ReactOS Kalkulator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -305,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Rediger"
    BEGIN
-        MENUITEM "Kopier\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Lim inn\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopier\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Lim inn\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Vis"
    BEGIN
@@ -337,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Rediger"
    BEGIN
-        MENUITEM "Kopier\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Lim inn\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopier\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Lim inn\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Vis"
    BEGIN
@@ -370,8 +374,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Rediger"
    BEGIN
-        MENUITEM "Kopier\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Lim inn\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopier\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Lim inn\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Vis"
    BEGIN
@@ -500,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltesisk lira"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugisisk escudo"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portogisisk escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovansk koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenansk tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spansk peseta"
--- a/base/applications/calc/lang/pl-PL.rc
+++ b/base/applications/calc/lang/pl-PL.rc
@@ -1,8 +1,10 @@
 /*
- * Translated by Caemyr - Olaf Siejka 2008-2011
- * Use ReactOS forum PM or IRC to contact me
- * IRC: irc.freenode.net #reactos-pl;
- * Updated by Saibamen - Adam Stachowicz <saibamenppl@gmail.com> 2011
+ *    Translated by Caemyr - Olaf Siejka (Feb, Jun 2008)
+ *    Use ReactOS forum PM or IRC to contact me
+ *    https://reactos.org
+ *    IRC: irc.freenode.net #reactos-pl;
+ *    Updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (Apr, 2011)
+ *    UTF-8 conversion by Caemyr (May, 2011)
 */

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@@ -11,15 +13,15 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator"
+CAPTION "Kalkulator ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -136,13 +138,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Bajt", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Stopnie", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radiany", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradusy", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Bajt", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Stopnie", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radiany", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradusy", 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 |
@@ -155,7 +161,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator"
+CAPTION "Kalkulator ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -220,7 +226,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator"
+CAPTION "Kalkulator ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -312,8 +318,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Edycja"
    BEGIN
-        MENUITEM "Kopiuj\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Wklej\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiuj\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Wklej\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Wygląd"
    BEGIN
@@ -344,8 +350,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Edycja"
    BEGIN
-        MENUITEM "Kopiuj\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Wklej\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiuj\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Wklej\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Wygląd"
    BEGIN
@@ -377,8 +383,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Edycja"
    BEGIN
-        MENUITEM "Kopiuj\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Wklej\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiuj\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Wklej\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Wygląd"
    BEGIN
@@ -507,7 +513,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Litewski lit"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luksemburski frank"
    IDS_CURRENCY_MALTESE_LIRA "Maltańskie liry"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugalskie escudo"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalskie escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Słowacka korona"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Słoveński tolar"
    IDS_CURRENCY_SPANISH_PESETA "Hiszpańska peseta"
--- a/base/applications/calc/lang/pt-BR.rc
+++ b/base/applications/calc/lang/pt-BR.rc
@@ -1,4 +1,4 @@
-/* TRANSLATOR: 2011 mkbu95 <mkbu95@gmail.com> */
+/* Translation and UTF-8 Conversion by mkbu95 <mkbu95@gmail.com> (August, 2011) */

 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

@@ -6,15 +6,15 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora"
+CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -131,13 +131,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Graus", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radianos", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Grados", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Graus", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radianos", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Grados", 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 |
@@ -150,7 +154,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora"
+CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -215,7 +219,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora"
+CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -502,7 +506,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburguês"
    IDS_CURRENCY_MALTESE_LIRA "Lira maltesa"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo português"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo português"
    IDS_CURRENCY_SLOVAK_KORUNA "Coroa eslovaca"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar"
    IDS_CURRENCY_SPANISH_PESETA "Peseta"
--- a/base/applications/calc/lang/pt-PT.rc
+++ b/base/applications/calc/lang/pt-PT.rc
@@ -1,4 +1,4 @@
-/* TRANSLATOR: 2021 Gabriel Aguiar <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> */
+/* Translation and UTF-8 Conversion by Gabriel Aguiar <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> (July, 2021) */

 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

@@ -6,15 +6,15 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora"
+CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -131,13 +131,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Graus", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radianos", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Grados", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Graus", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radianos", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Grados", 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 |
@@ -150,7 +154,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora"
+CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -215,7 +219,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora"
+CAPTION "Calculadora ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -502,7 +506,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburguês"
    IDS_CURRENCY_MALTESE_LIRA "Lira maltesa"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo português"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo português"
    IDS_CURRENCY_SLOVAK_KORUNA "Coroa eslovaca"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar"
    IDS_CURRENCY_SPANISH_PESETA "Peseta"
--- a/base/applications/calc/lang/ro-RO.rc
+++ b/base/applications/calc/lang/ro-RO.rc
@@ -18,10 +18,10 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -138,13 +138,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "64 biți", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "32 biți", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "16 biți", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "8 biți", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Grade", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radiani", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradiani", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "64 biți", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "32 biți", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "16 biți", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "8 biți", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Grade", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radiani", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradiani", 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 |
@@ -346,8 +350,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "&Editare"
    BEGIN
-        MENUITEM "&Copiere\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "&Lipire\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "&Copiere\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "&Lipire\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "&Vizualizare"
    BEGIN
@@ -379,8 +383,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "&Editare"
    BEGIN
-        MENUITEM "&Copiere\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "&Lipire\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "&Copiere\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "&Lipire\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "&Vizualizare"
    BEGIN
@@ -509,7 +513,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Litas lituanian"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Franc luxemburghez"
    IDS_CURRENCY_MALTESE_LIRA "Litră malteză"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo portughez"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portughez"
    IDS_CURRENCY_SLOVAK_KORUNA "Coroană slovacă"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar sloven"
    IDS_CURRENCY_SPANISH_PESETA "Peseta spaniolă"
--- a/base/applications/calc/lang/ru-RU.rc
+++ b/base/applications/calc/lang/ru-RU.rc
@@ -9,10 +9,10 @@ MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,13 +129,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "8 байт", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "4 байт", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "2 байт", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "1 байт", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Градусы", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Радианы", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Грады", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "8 байт", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "4 байт", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "2 байт", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "1 байт", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Градусы", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Радианы", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Грады", 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 |
@@ -305,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "&Правка"
    BEGIN
-        MENUITEM "&Копировать\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Вст&авить\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "&Копировать\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Вст&авить\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "В&ид"
    BEGIN
@@ -337,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "&Правка"
    BEGIN
-        MENUITEM "&Копировать\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Вст&авить\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "&Копировать\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Вст&авить\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "В&ид"
    BEGIN
@@ -370,8 +374,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "&Правка"
    BEGIN
-        MENUITEM "&Копировать\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Вст&авить\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "&Копировать\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Вст&авить\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "В&ид"
    BEGIN
@@ -500,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Литовский лит"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Люксембургский франк"
    IDS_CURRENCY_MALTESE_LIRA "Мальтийская лира"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Португальское эскудо"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Португальское эскудо"
    IDS_CURRENCY_SLOVAK_KORUNA "Словацкая крона"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Словенский толар"
    IDS_CURRENCY_SPANISH_PESETA "Испанская песета"
--- a/base/applications/calc/lang/sk-SK.rc
+++ b/base/applications/calc/lang/sk-SK.rc
@@ -1,4 +1,7 @@
-/* TRANSLATOR: 2008-2011 Mário Kačmár /Mario Kacmar/ aka Kario <kario@szm.sk>
+/* TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario@szm.sk)
+ * DATE OF TR.: 30-01-2008
+ * LAST CHANGE: 09-08-2011
+ * ---------------------------------------
 * TODO: pridanie navigačných značiek "&" ?
 */

@@ -8,15 +11,15 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulačka"
+CAPTION "Kalkulačka systému ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -133,13 +136,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Bajt", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Stupne", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radiány", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Grady", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Bajt", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Stupne", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radiány", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Grady", 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 |
@@ -152,7 +159,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulačka"
+CAPTION "Kalkulačka systému ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -217,7 +224,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulačka"
+CAPTION "Kalkulačka systému ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -309,8 +316,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Úpravy"
    BEGIN
-        MENUITEM "Kopírovať\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Prilepiť\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopírovať\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Prilepiť\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Zobraziť"
    BEGIN
@@ -341,8 +348,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Úpravy"
    BEGIN
-        MENUITEM "Kopírovať\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Prilepiť\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopírovať\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Prilepiť\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Zobraziť"
    BEGIN
@@ -374,8 +381,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Úpravy"
    BEGIN
-        MENUITEM "Kopírovať\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Prilepiť\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopírovať\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Prilepiť\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Zobraziť"
    BEGIN
@@ -504,7 +511,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburský frank"
    IDS_CURRENCY_MALTESE_LIRA "Maltská líra"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugalské escudo"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalské escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovenská koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinský toliar"
    IDS_CURRENCY_SPANISH_PESETA "Španielska peseta"
--- a/base/applications/calc/lang/sq-AL.rc
+++ b/base/applications/calc/lang/sq-AL.rc
@@ -1,4 +1,5 @@
-/* TRANSLATOR: 2013 Ardit Dani (Ard1t) <ardit.dani@gmail.com>
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+ * DATE OF TR:  29-11-2013
 */

 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
@@ -7,15 +8,15 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Makine Llogaritje"
+CAPTION "ReactOS Makine Llogaritje"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -132,13 +133,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Degrees", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radians", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Degrees", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radians", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradians", 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 |
@@ -151,7 +156,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Makine Llogaritje"
+CAPTION "ReactOS Makine Llogaritje"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -216,7 +221,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Makine Llogaritje"
+CAPTION "ReactOS Makine Llogaritje"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -503,7 +508,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Lira Maltese"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Escudo Portugez"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo Portugez"
    IDS_CURRENCY_SLOVAK_KORUNA "Koruna Sllovake"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolari Slloven"
    IDS_CURRENCY_SPANISH_PESETA "Peseta Spanjolle"
--- a/base/applications/calc/lang/sv-SE.rc
+++ b/base/applications/calc/lang/sv-SE.rc
@@ -1,5 +1,6 @@
 /*
 * PROJECT:     ReactOS CALC
+ * FILE:        base/applications/calc/lang/sv-SE.rc
 * PURPOSE:     Swedish resource file
 * Translation: Jaix Bly
 */
@@ -10,15 +11,15 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkylator"
+CAPTION "ReactOS Kalkylator"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Okt", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Okt", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -135,13 +136,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Grader", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radianer", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradienter", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Grader", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radianer", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradienter", 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 |
@@ -154,7 +159,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkylator"
+CAPTION "ReactOS Kalkylator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -219,7 +224,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkylator"
+CAPTION "ReactOS Kalkylator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -311,8 +316,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Redigera"
    BEGIN
-        MENUITEM "Kopiera\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Klistra in\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiera\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Klistra in\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Visa"
    BEGIN
@@ -343,8 +348,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Redigera"
    BEGIN
-        MENUITEM "Kopiera\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Klistra in\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiera\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Klistra in\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Vis"
    BEGIN
@@ -376,8 +381,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Redigera"
    BEGIN
-        MENUITEM "Kopiera\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Klistra in\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Kopiera\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Klistra in\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Visa"
    BEGIN
@@ -506,7 +511,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Litauenisk litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltesisk lire"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portugisisk escudo"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugisisk escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovakisk koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovensk tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spansk peseta"
--- a/base/applications/calc/lang/th-TH.rc
+++ b/base/applications/calc/lang/th-TH.rc
@@ -4,15 +4,15 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "เครื่องคิดเลข"
+CAPTION "เครื่องคิดเลข ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "สิบหก", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "สิบ", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "แปด", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "สอง", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "สิบหก", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "สิบ", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "แปด", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    CONTROL "สอง", 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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -129,13 +129,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "สี่เวิร์ด", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "สองเวิร์ด", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "เวิร์ด", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "ไบต", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "องศา", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "เกรเดียน", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradians", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "สี่เวิร์ด", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "สองเวิร์ด", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "เวิร์ด", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "ไบต์", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "องศา", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "เรเดียน", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "เกรเดียน", 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 |
@@ -213,7 +217,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "เครื่องคิดเลข"
+CAPTION "เครื่องคิดเลข ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -305,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "แ&ก้ไข"
    BEGIN
-        MENUITEM "คัดลอก\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "วาง\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "คัดลอก\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "วาง\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "&มุมมอง"
    BEGIN
@@ -337,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "แ&ก้ไข"
    BEGIN
-        MENUITEM "คัดลอก\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "วาง\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "คัดลอก\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "วาง\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "&มุมมอง"
    BEGIN
@@ -370,8 +374,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "แ&ก้ไข"
    BEGIN
-        MENUITEM "คัดลอก\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "วาง\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "คัดลอก\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "วาง\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "&มุมมอง"
    BEGIN
@@ -500,7 +504,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc"
    IDS_CURRENCY_MALTESE_LIRA "Maltese lira"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portuguese escudo"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar"
    IDS_CURRENCY_SPANISH_PESETA "Spanish peseta"
--- a/base/applications/calc/lang/tr-TR.rc
+++ b/base/applications/calc/lang/tr-TR.rc
@@ -1,6 +1,6 @@
 /* TRANSLATOR:
-2013-2019 Erdem Ersoy (eersoy93) <erdemersoy@erdemersoy.net>
-2021 Süleyman Poyraz <zaryob.dev@gmail.com>
+2013-2014, 2016, 2019 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net),
+2021 Süleyman Poyraz (zaryob [dot] dev [at] gmail [dot] com)
 */

 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
@@ -9,15 +9,15 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Hesap Makinesi"
+CAPTION "ReactOS Hesap Makinesi"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Onaltılık", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Onluk", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Sekizlik", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "İkilik", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Onaltılık", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Onluk", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Sekizlik", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    CONTROL "İkilik", 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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -134,13 +134,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Byte", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Derece", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Radian", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Gradian", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Derece", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Radian", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradian", 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 |
@@ -153,7 +157,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Hesap Makinesi"
+CAPTION "ReactOS Hesap Makinesi"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -218,7 +222,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Hesap Makinesi"
+CAPTION "ReactOS Hesap Makinesi"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -505,7 +509,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Litvanya litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Lüksemburg Frangı"
    IDS_CURRENCY_MALTESE_LIRA "Malta Lirası"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Portekiz Esküdosu"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Portekiz Esküdosu"
    IDS_CURRENCY_SLOVAK_KORUNA "Slovak Korunası"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenya Toları"
    IDS_CURRENCY_SPANISH_PESETA "İspanyol Pesetası"
--- a/base/applications/calc/lang/uk-UA.rc
+++ b/base/applications/calc/lang/uk-UA.rc
@@ -1,7 +1,8 @@
 /*
- * PROJECT:     ReactOS Calc
+ * PROJECT:     ReactOS Calculator
 * LICENSE:     GPL - See COPYING in the top level directory
- * PURPOSE:     Ukrainian Language File
+ * FILE:        base/applications/calc/lang/uk-UA.rc
+ * PURPOSE:     Ukraianian Language File for ReactOS Calc
 * TRANSLATORS: Artem Reznikov & Sakara Yevhen
 */

@@ -11,15 +12,15 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калькулятор"
+CAPTION "Калькулятор ReactOS"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -136,13 +137,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "8 байт", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "4 байт", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "2 байт", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "1 байт", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Градуси", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "Радіани", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "Гради", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "8 байт", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "4 байт", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "2 байт", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "1 байт", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "Градуси", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "Радіани", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Гради", 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 |
@@ -155,7 +160,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калькулятор"
+CAPTION "Калькулятор ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -220,7 +225,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калькулятор"
+CAPTION "Калькулятор ReactOS"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -312,8 +317,8 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "Правка"
    BEGIN
-        MENUITEM "Копіювати\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Вставити\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Копіювати\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Вставити\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Вигляд"
    BEGIN
@@ -344,8 +349,8 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "Правка"
    BEGIN
-        MENUITEM "Копіювати\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Вставити\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Копіювати\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Вставити\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Вигляд"
    BEGIN
@@ -377,8 +382,8 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "Правка"
    BEGIN
-        MENUITEM "Копіювати\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "Вставити\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "Копіювати\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "Вставити\tCTRL-V", IDM_EDIT_PASTE
    END
    POPUP "Вигляд"
    BEGIN
@@ -507,7 +512,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "Люксембургський франк"
    IDS_CURRENCY_MALTESE_LIRA "Мальтийськая ліра"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "Португальське ескудо"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "Португальське ескудо"
    IDS_CURRENCY_SLOVAK_KORUNA "Словацька крона"
    IDS_CURRENCY_SLOVENIAN_TOLAR "Словенський толар"
    IDS_CURRENCY_SPANISH_PESETA "Іспанська песета"
--- a/base/applications/calc/lang/zh-CN.rc
+++ b/base/applications/calc/lang/zh-CN.rc
@@ -12,15 +12,15 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "计算器"
+CAPTION "ReactOS 计算器"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 9, "宋体", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -137,13 +137,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "四字", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "双字", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "字", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "字节", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "角度", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "弧度", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "梯度", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "四字", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "双字", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "字", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "字节", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "角度", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "弧度", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "梯度", 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 |
@@ -156,7 +160,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "计算器"
+CAPTION "ReactOS 计算器"
 MENU IDR_MENU_STANDARD
 FONT 9, "宋体", 0, 0, 0x1
 BEGIN
@@ -221,7 +225,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "计算器"
+CAPTION "ReactOS 计算器"
 MENU IDR_MENU_STANDARD
 FONT 9, "宋体"
 BEGIN
@@ -508,7 +512,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
    IDS_CURRENCY_LUXEMBOURG_FRANC "卢森堡法郎"
    IDS_CURRENCY_MALTESE_LIRA "马耳他里拉"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "葡萄牙埃斯库多"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯库多"
    IDS_CURRENCY_SLOVAK_KORUNA "斯洛伐克克朗"
    IDS_CURRENCY_SLOVENIAN_TOLAR "斯洛文尼亚拖拉"
    IDS_CURRENCY_SPANISH_PESETA "西班牙比塞塔"
--- a/base/applications/calc/lang/zh-HK.rc
+++ b/base/applications/calc/lang/zh-HK.rc
@@ -12,15 +12,15 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "計數機"
+CAPTION "ReactOS 計數機"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 9, "新細明體", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -137,13 +137,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "位元組", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "角度", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "弧度", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "梯度", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "位元組", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "角度", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "弧度", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "梯度", 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 |
@@ -156,7 +160,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "計數機"
+CAPTION "ReactOS 計數機"
 MENU IDR_MENU_STANDARD
 FONT 9, "新細明體", 0, 0, 0x1
 BEGIN
@@ -221,7 +225,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "計數機"
+CAPTION "ReactOS 計數機"
 MENU IDR_MENU_STANDARD
 FONT 9, "新細明體"
 BEGIN
@@ -508,7 +512,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "拉脫維亞拉分"
    IDS_CURRENCY_LUXEMBOURG_FRANC "盧森堡法郎"
    IDS_CURRENCY_MALTESE_LIRA "馬爾他里拉"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "葡萄牙埃斯庫多"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯庫多"
    IDS_CURRENCY_SLOVAK_KORUNA "斯洛伐克克朗"
    IDS_CURRENCY_SLOVENIAN_TOLAR "斯洛維尼亞拖拉"
    IDS_CURRENCY_SPANISH_PESETA "西班牙比塞塔"
--- a/base/applications/calc/lang/zh-TW.rc
+++ b/base/applications/calc/lang/zh-TW.rc
@@ -1,4 +1,4 @@
-// TRANSLATOR: 2021 Chan Chilung <eason066@gmail.com>
+// Traditional Chinese translation by 2021 Chan Chilung <eason066@gmail.com>

 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

@@ -6,15 +6,15 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

 IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "計算機"
+CAPTION "ReactOS 計算機"
 MENU IDR_MENU_SCIENTIFIC_1
 FONT 9, "新細明體", 0, 0, 0x1
 BEGIN
    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    AUTORADIOBUTTON "Hex", IDC_RADIO_HEX, 8, 21, 30, 10
-    AUTORADIOBUTTON "Dec", IDC_RADIO_DEC, 41, 21, 30, 10
-    AUTORADIOBUTTON "Oct", IDC_RADIO_OCT, 74, 21, 30, 10
-    AUTORADIOBUTTON "Bin", IDC_RADIO_BIN, 107, 21, 30, 10
+    CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10
+    CONTROL "Dec", IDC_RADIO_DEC, "Button", BS_AUTORADIOBUTTON, 41, 21, 30, 10
+    CONTROL "Oct", IDC_RADIO_OCT, "Button", BS_AUTORADIOBUTTON, 74, 21, 30, 10
+    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 "Hyp", IDC_CHECK_HYP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 49, 41, 29, 10
@@ -131,13 +131,17 @@ BEGIN
    PUSHBUTTON "F", IDC_BUTTON_F, 286, 140, 24, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    GROUPBOX "", IDC_STATIC, 147, 14, 163, 20
-    AUTORADIOBUTTON "Qword", IDC_RADIO_QWORD, 150, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Dword", IDC_RADIO_DWORD, 190, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "Word", IDC_RADIO_WORD, 230, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "位元組", IDC_RADIO_BYTE, 270, 21, 38, 10, NOT WS_VISIBLE
-    AUTORADIOBUTTON "角度", IDC_RADIO_DEG, 150, 21, 45, 10
-    AUTORADIOBUTTON "弧度", IDC_RADIO_RAD, 204, 21, 45, 10
-    AUTORADIOBUTTON "梯度", IDC_RADIO_GRAD, 258, 21, 45, 10
+    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 150, 21, 38, 10
+    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 190, 21, 38, 10
+    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 230, 21, 38, 10
+    CONTROL "位元組", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+            NOT WS_VISIBLE, 270, 21, 38, 10
+    CONTROL "角度", IDC_RADIO_DEG, "Button", BS_AUTORADIOBUTTON, 150, 21, 45, 10
+    CONTROL "弧度", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "梯度", 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 |
@@ -150,7 +154,7 @@ END

 IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "計算機"
+CAPTION "ReactOS 計算機"
 MENU IDR_MENU_STANDARD
 FONT 9, "新細明體", 0, 0, 0x1
 BEGIN
@@ -215,7 +219,7 @@ END

 IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "計算機"
+CAPTION "ReactOS 計算機"
 MENU IDR_MENU_STANDARD
 FONT 9, "新細明體"
 BEGIN
@@ -502,7 +506,7 @@ BEGIN
    IDS_CURRENCY_LITHUANIAN_LITAS "拉脫維亞拉分"
    IDS_CURRENCY_LUXEMBOURG_FRANC "盧森堡法郎"
    IDS_CURRENCY_MALTESE_LIRA "馬爾他里拉"
-    IDS_CURRENCY_PORTUGUESE_ESCUDO "葡萄牙埃斯庫多"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯庫多"
    IDS_CURRENCY_SLOVAK_KORUNA "斯洛伐克克朗"
    IDS_CURRENCY_SLOVENIAN_TOLAR "斯洛維尼亞拖拉"
    IDS_CURRENCY_SPANISH_PESETA "西班牙比塞塔"
--- a/base/applications/calc/resource.h
+++ b/base/applications/calc/resource.h
@@ -194,7 +194,7 @@
 #define IDS_CURRENCY_LITHUANIAN_LITAS   2414
 #define IDS_CURRENCY_LUXEMBOURG_FRANC   2415
 #define IDS_CURRENCY_MALTESE_LIRA       2416
-#define IDS_CURRENCY_PORTUGUESE_ESCUDO  2417
+#define IDS_CURRENCY_PORTOGUESE_ESCUDO  2417
 #define IDS_CURRENCY_SLOVAK_KORUNA      2418
 #define IDS_CURRENCY_SLOVENIAN_TOLAR    2419
 #define IDS_CURRENCY_SPANISH_PESETA     2420
--- a/base/applications/calc/resource.rc
+++ b/base/applications/calc/resource.rc
@@ -28,7 +28,7 @@
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

 /* Icons */
-IDI_CALC ICON "res/calc.ico"
+IDI_CALC ICON DISCARDABLE "res/calc.ico"

 /* Manifest */
 #include <reactos/manifest_exe.rc>
--- a/base/applications/calc/winmain.c
+++ b/base/applications/calc/winmain.c
@@ -1015,16 +1015,10 @@ static void handle_copy_command(HWND hWnd)
    TCHAR display[MAX_CALC_SIZE];
    UINT  n;

-    // Read current text from output display
    n = GetDlgItemText(hWnd, IDC_TEXT_OUTPUT, display, SIZEOF(display));

-    // Check if result is a true number
-    if (!calc.is_nan)
-    {
-        // Remove trailing decimal point if no decimal digits exist
-        if (calc.base == IDC_RADIO_DEC && _tcschr(calc.buffer, _T('.')) == NULL)
-            display[n - calc.sDecimal_len] = _T('\0');
-    }
+    if (calc.base == IDC_RADIO_DEC && _tcschr(calc.buffer, _T('.')) == NULL)
+        display[n - calc.sDecimal_len] = _T('\0');

    CopyMemToClipboard(display);
 }
--- a/base/applications/charmap/lang/ro-RO.rc
+++ b/base/applications/charmap/lang/ro-RO.rc
@@ -11,18 +11,18 @@ IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
-    LTEXT "&Font:", IDC_STATIC, 6, 7, 24, 9
+    LTEXT "F&ont:", IDC_STATIC, 6, 7, 24, 9
    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-    PUSHBUTTON "Ajut&or", IDC_CMHELP, 249, 5, 35, 13
+    PUSHBUTTON "&Manual…", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
            WS_VSCROLL, 20, 22, 266, 156
    LTEXT "C&aractere de copiat:", 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 "Se&lectare", IDC_SELECT, 194, 186, 44, 13
-    PUSHBUTTON "&Copiere", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-    CONTROL "&Vizualizare complexă", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
+    DEFPUSHBUTTON "S&electează", IDC_SELECT, 194, 186, 44, 13
+    PUSHBUTTON "&Copiază", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+    CONTROL "Mod a&vansat", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
            WS_TABSTOP, 8, 208, 95, 10
 END

@@ -30,14 +30,14 @@ IDD_ADVANCED DIALOGEX 0, 0, 292, 64
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Se&t de caractere:", IDC_STATIC, 8, 8, 60, 8
+    LTEXT "Co&dificare:", IDC_STATIC, 8, 8, 48, 8
    COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
    LTEXT "&Grupare după:", IDC_STATIC, 8, 28, 50, 8
    COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "Căutar&e", IDC_BUTTON_SEARCH, 200, 44, 50, 14
+    PUSHBUTTON "&Caută", IDC_BUTTON_SEARCH, 200, 44, 50, 14
    EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL
-    LTEXT "Că&utare:", IDC_STATIC, 8, 48, 42, 8
-    LTEXT "U&nicode:", IDC_STATIC, 200, 8, 30, 8
+    LTEXT "Căuta&re:", 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

--- a/base/applications/charmap_new/Cell.cpp
+++ b/base/applications/charmap_new/Cell.cpp
@@ -91,4 +91,4 @@ CCell::SetCellCoordinates(
    )
 {
    m_CellCoordinates = Coordinates;
-}
+}
--- a/base/applications/charmap_new/GridView.cpp
+++ b/base/applications/charmap_new/GridView.cpp
@@ -519,4 +519,4 @@ CGridView::SetCellFocus(
    // Set the new active cell and give it focus
    m_ActiveCell = NewActiveCell;
    m_ActiveCell->SetFocus(true);
-}
+}
--- a/base/applications/charmap_new/MainWindow.h
+++ b/base/applications/charmap_new/MainWindow.h
@@ -81,4 +81,4 @@ private:

    bool ChangeMapFont(
        );
-};
+};
--- a/base/applications/charmap_new/precomp.h
+++ b/base/applications/charmap_new/precomp.h
@@ -51,4 +51,4 @@

 //WINE_DEFAULT_DEBUG_CHANNEL(charmap);

-#endif
+#endif
--- a/base/applications/cleanmgr/CMakeLists.txt
+++ b/base/applications/cleanmgr/CMakeLists.txt
@@ -1,9 +0,0 @@
-
-project(cleanmgr)
-
-# The main application
-add_subdirectory(cleanmgr)
-
-# Cleanup handlers
-#add_subdirectory(dataclen)     # Data Driven Cleaner
-
--- a/base/applications/cleanmgr/cleanmgr/CCleanupHandler.cpp
+++ b/base/applications/cleanmgr/cleanmgr/CCleanupHandler.cpp
@@ -1,212 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CCleanupHandler implementation
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#include "cleanmgr.h"
-
-
-CCleanupHandler::CCleanupHandler(CRegKey &subKey, const CStringW &keyName, const GUID &guid)
-    : hSubKey(subKey)
-    , KeyName(keyName)
-    , Guid(guid)
-    , dwFlags(0)
-    , Priority(0)
-    , StateFlags(0)
-    , SpaceUsed(0)
-    , ShowHandler(true)
-    , hIcon(NULL)
-{
-}
-
-CCleanupHandler::~CCleanupHandler()
-{
-    Deactivate();
-    ::DestroyIcon(hIcon);
-}
-
-void
-CCleanupHandler::Deactivate()
-{
-    if (Handler)
-    {
-        DWORD dwFlags = 0;
-        Handler->Deactivate(&dwFlags);
-        if (dwFlags & EVCF_REMOVEFROMLIST)
-            UNIMPLEMENTED_DBGBREAK();
-    }
-}
-
-bool
-CCleanupHandler::Initialize(LPCWSTR pcwszVolume)
-{
-    if (FAILED_UNEXPECTEDLY(
-            ::CoCreateInstance(Guid, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IEmptyVolumeCache, &Handler))))
-    {
-        return false;
-    }
-
-    DWORD dwSize = sizeof(Priority);
-    if (hSubKey.QueryBinaryValue(L"Priority", &Priority, &dwSize) != ERROR_SUCCESS)
-    {
-        if (hSubKey.QueryDWORDValue(L"Priority", Priority) != ERROR_SUCCESS)
-            Priority = 200;
-    }
-
-    dwSize = sizeof(StateFlags);
-    if (hSubKey.QueryDWORDValue(L"StateFlags", StateFlags) != ERROR_SUCCESS)
-        StateFlags = 0;
-
-    WCHAR PathBuffer[MAX_PATH] = {};
-    ULONG nChars = _countof(PathBuffer);
-    if (hSubKey.QueryStringValue(L"IconPath", PathBuffer, &nChars) != ERROR_SUCCESS)
-    {
-        CStringW Tmp;
-        WCHAR GuidStr[50] = {};
-        if (StringFromGUID2(Guid, GuidStr, _countof(GuidStr)))
-        {
-            Tmp.Format(L"CLSID\\%s\\DefaultIcon", GuidStr);
-            CRegKey clsid;
-            nChars = _countof(PathBuffer);
-            if (clsid.Open(HKEY_CLASSES_ROOT, Tmp, KEY_READ) != ERROR_SUCCESS ||
-                clsid.QueryStringValue(NULL, PathBuffer, &nChars) != ERROR_SUCCESS)
-            {
-                PathBuffer[0] = UNICODE_NULL;
-            }
-        }
-    }
-    if (!PathBuffer[0])
-        StringCchCopyW(PathBuffer, _countof(PathBuffer), L"%systemroot%\\system32\\shell32.dll");
-
-    int Index = 0;
-    WCHAR *ptr = wcschr(PathBuffer, L',');
-    if (ptr)
-    {
-        *ptr++ = UNICODE_NULL;
-        Index = wcstol(ptr, NULL, 10);
-    }
-    HICON Large, Small;
-    UINT Result = ExtractIconExW(PathBuffer, Index, &Large, &Small, 1);
-    if (Result < 1)
-        Result = ExtractIconExW(L"%systemroot%\\system32\\shell32.dll", 0, &Large, &Small, 1);
-    if (Result >= 1)
-    {
-        hIcon = Small;
-        if (!hIcon)
-        {
-            hIcon = Large;
-        }
-        else
-        {
-            ::DestroyIcon(Large);
-        }
-    }
-
-    // These options should come from the command line
-    // dwFlags |= EVCF_SETTINGSMODE;
-    // dwFlags |= EVCF_OUTOFDISKSPACE;
-
-    CComPtr<IEmptyVolumeCache2> spHandler2;
-    HRESULT hr = Handler->QueryInterface(IID_PPV_ARG(IEmptyVolumeCache2, &spHandler2));
-    if (SUCCEEDED(hr))
-    {
-        hr = spHandler2->InitializeEx(
-            hSubKey, pcwszVolume, KeyName, &wszDisplayName, &wszDescription, &wszBtnText, &dwFlags);
-        if (FAILED_UNEXPECTEDLY(hr))
-            return false;
-
-        // No files to clean will return S_FALSE;
-        if (hr != S_OK)
-            return false;
-    }
-    else
-    {
-        // Observed behavior:
-        // When Initialize is called, wszDescription is actually pointing to data
-        // wszDescription.AllocateBytes(0x400u);
-        hr = Handler->Initialize(hSubKey, pcwszVolume, &wszDisplayName, &wszDescription, &dwFlags);
-        if (FAILED_UNEXPECTEDLY(hr))
-            return false;
-
-        // No files to clean will return S_FALSE;
-        if (hr != S_OK)
-            return false;
-
-        CComPtr<IPropertyBag> spBag;
-        WCHAR GuidStr[50] = {};
-        nChars = _countof(GuidStr);
-        if (hSubKey.QueryStringValue(L"PropertyBag", GuidStr, &nChars) == ERROR_SUCCESS)
-        {
-            GUID guid = {};
-            if (!FAILED_UNEXPECTEDLY(CLSIDFromString(GuidStr, &guid)))
-            {
-                FAILED_UNEXPECTEDLY(
-                    CoCreateInstance(guid, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IPropertyBag, &spBag)));
-            }
-        }
-        ReadProperty(L"Display", spBag, wszDisplayName);
-        ReadProperty(L"Description", spBag, wszDescription);
-
-        if (dwFlags & EVCF_HASSETTINGS)
-        {
-            ReadProperty(L"AdvancedButtonText", spBag, wszBtnText);
-        }
-    }
-
-    if ((dwFlags & EVCF_ENABLEBYDEFAULT) && !(StateFlags & HANDLER_STATE_SELECTED))
-    {
-        StateFlags |= HANDLER_STATE_SELECTED;
-    }
-
-    // For convenience
-    if (!wszDisplayName)
-        SHStrDupW(KeyName, &wszDisplayName);
-
-    return true;
-}
-
-void
-CCleanupHandler::ReadProperty(LPCWSTR Name, IPropertyBag *pBag, CComHeapPtr<WCHAR> &storage)
-{
-    if (storage)
-        return;
-
-    if (pBag)
-    {
-        CComVariant tmp;
-        tmp.vt = VT_BSTR;
-        HRESULT hr = pBag->Read(Name, &tmp, NULL);
-        if (!FAILED_UNEXPECTEDLY(hr) && tmp.vt == VT_BSTR)
-        {
-            SHStrDupW(tmp.bstrVal, &storage);
-        }
-    }
-
-    if (!storage)
-    {
-        WCHAR TmpStr[0x200] = {};
-        DWORD dwSize = _countof(TmpStr);
-
-        if (hSubKey.QueryStringValue(Name, TmpStr, &dwSize) == ERROR_SUCCESS)
-        {
-            WCHAR ResolvedStr[0x200] = {};
-            SHLoadIndirectString(TmpStr, ResolvedStr, _countof(ResolvedStr), NULL);
-            SHStrDupW(ResolvedStr, &storage);
-        }
-    }
-}
-
-BOOL
-CCleanupHandler::HasSettings() const
-{
-    return !!(dwFlags & EVCF_HASSETTINGS);
-}
-
-BOOL
-CCleanupHandler::DontShowIfZero() const
-{
-    return !!(dwFlags & EVCF_DONTSHOWIFZERO);
-}
-
--- a/base/applications/cleanmgr/cleanmgr/CCleanupHandler.hpp
+++ b/base/applications/cleanmgr/cleanmgr/CCleanupHandler.hpp
@@ -1,48 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CCleanupHandler definition
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#define HANDLER_STATE_SELECTED 1
-
-
-struct CCleanupHandler
-{
-    CCleanupHandler(CRegKey &subKey, const CStringW &keyName, const GUID &guid);
-    ~CCleanupHandler();
-
-    void Deactivate();
-
-    bool
-    Initialize(LPCWSTR pcwszVolume);
-
-    void
-    ReadProperty(LPCWSTR Name, IPropertyBag *pBag, CComHeapPtr<WCHAR> &storage);
-
-    BOOL
-    HasSettings() const;
-
-    BOOL
-    DontShowIfZero() const;
-
-    CRegKey hSubKey;
-    CStringW KeyName;
-    GUID Guid;
-
-    CComHeapPtr<WCHAR> wszDisplayName;
-    CComHeapPtr<WCHAR> wszDescription;
-    CComHeapPtr<WCHAR> wszBtnText;
-
-    CStringW IconPath;
-    DWORD dwFlags;
-    DWORD Priority;
-    DWORD StateFlags;
-
-    CComPtr<IEmptyVolumeCache> Handler;
-    DWORDLONG SpaceUsed;
-    bool ShowHandler;
-    HICON hIcon;
-};
-
--- a/base/applications/cleanmgr/cleanmgr/CCleanupHandlerList.cpp
+++ b/base/applications/cleanmgr/cleanmgr/CCleanupHandlerList.cpp
@@ -1,163 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CCleanupHandlerList implementation
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#include "cleanmgr.h"
-
-void CCleanupHandlerList::LoadHandlers(WCHAR Drive)
-{
-    m_DriveStr.Format(L"%c:", Drive);
-
-    CRegKey VolumeCaches;
-    if (VolumeCaches.Open(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\VolumeCaches", KEY_READ) != ERROR_SUCCESS)
-        return;
-
-    LONG ItemIndex = 0;
-    WCHAR szKeyName[MAX_PATH];
-
-    WCHAR wszVolume[] = { Drive, L':', L'\\', UNICODE_NULL };
-
-    while (TRUE)
-    {
-        DWORD dwSize = _countof(szKeyName);
-        if (VolumeCaches.EnumKey(ItemIndex++, szKeyName, &dwSize) != ERROR_SUCCESS)
-        {
-            break;
-        }
-
-
-        CRegKey hSubKey;
-        if (hSubKey.Open(VolumeCaches, szKeyName, KEY_READ) == ERROR_SUCCESS)
-        {
-            WCHAR GuidStr[50] = {};
-            dwSize = _countof(GuidStr);
-            if (hSubKey.QueryStringValue(NULL, GuidStr, &dwSize) != ERROR_SUCCESS)
-            {
-                continue;
-            }
-
-            GUID guid = {};
-            if (FAILED_UNEXPECTEDLY(CLSIDFromString(GuidStr, &guid)))
-                continue;
-
-            CCleanupHandler* handler = new CCleanupHandler(hSubKey, szKeyName, guid);
-
-            if (!handler->Initialize(wszVolume))
-            {
-                delete handler;
-                continue;
-            }
-
-            m_Handlers.AddTail(handler);
-        }
-    }
-
-    // Sort handlers
-    BOOL fChanged = m_Handlers.GetCount() > 0;
-    while (fChanged)
-    {
-        fChanged = FALSE;
-
-        for (size_t n = 0; n < m_Handlers.GetCount() - 1; n++)
-        {
-            POSITION leftPos = m_Handlers.FindIndex(n);
-            POSITION rightPos = m_Handlers.FindIndex(n+1);
-            CCleanupHandler* left = m_Handlers.GetAt(leftPos);
-            CCleanupHandler* right = m_Handlers.GetAt(rightPos);
-
-            if (right->Priority < left->Priority)
-            {
-                m_Handlers.SwapElements(leftPos, rightPos);
-                fChanged = TRUE;
-            }
-            else if (right->Priority == left->Priority)
-            {
-                CStringW leftStr(left->wszDisplayName);
-                if (leftStr.Compare(right->wszDisplayName) > 0)
-                {
-                    m_Handlers.SwapElements(leftPos, rightPos);
-                    fChanged = TRUE;
-                }
-            }
-        }
-    }
-}
-
-
-DWORDLONG
-CCleanupHandlerList::ScanDrive(IEmptyVolumeCacheCallBack *picb)
-{
-    CProgressDlg progress;
-    CString Caption;
-    Caption.Format(IDS_CALCULATING, m_DriveStr.GetString());
-    CStringW Title(MAKEINTRESOURCE(IDS_DISK_CLEANUP));
-    progress.Start((DWORD)m_Handlers.GetCount(), Title, Caption);
-    int ItemIndex = 0;
-    DWORDLONG TotalSpaceUsed = 0;
-    ForEach(
-        [&](CCleanupHandler *current)
-        {
-            Caption.Format(IDS_SCANNING, current->wszDisplayName.m_pData);
-            progress.Step(++ItemIndex, Caption);
-
-            HRESULT hr = current->Handler->GetSpaceUsed(&current->SpaceUsed, picb);
-
-            if (FAILED_UNEXPECTEDLY(hr))
-            {
-                current->ShowHandler = false;
-                current->StateFlags &= ~HANDLER_STATE_SELECTED;
-                return;
-            }
-
-            if (current->SpaceUsed == 0 && current->DontShowIfZero())
-            {
-                current->ShowHandler = false;
-                current->StateFlags &= ~HANDLER_STATE_SELECTED;
-            }
-            TotalSpaceUsed += current->SpaceUsed;
-        });
-    progress.Stop();
-
-    return TotalSpaceUsed;
-}
-
-void
-CCleanupHandlerList::ExecuteCleanup(IEmptyVolumeCacheCallBack *picb)
-{
-    CProgressDlg progress;
-    CString Caption;
-    Caption.Format(IDS_CLEANING_CAPTION, m_DriveStr.GetString());
-
-    DWORD TotalSelected = 0;
-    ForEach(
-        [&](CCleanupHandler *current)
-        {
-            if (current->StateFlags & HANDLER_STATE_SELECTED)
-                TotalSelected++;
-        });
-
-    CStringW Title(MAKEINTRESOURCE(IDS_DISK_CLEANUP));
-    progress.Start(TotalSelected, Title, Caption);
-    int ItemIndex = 0;
-    ForEach(
-        [&](CCleanupHandler *current)
-        {
-            if (!(current->StateFlags & HANDLER_STATE_SELECTED))
-                return;
-
-            Caption.Format(IDS_CLEANING, current->wszDisplayName.m_pData);
-            progress.Step(++ItemIndex, Caption);
-
-            // If there is nothing to clean, we might get STG_E_NOMOREFILES
-            if (current->SpaceUsed > 0)
-            {
-                HRESULT hr = current->Handler->Purge(-1, picb);
-                if (FAILED_UNEXPECTEDLY(hr))
-                    return;
-            }
-        });
-    progress.Stop();
-}
--- a/base/applications/cleanmgr/cleanmgr/CCleanupHandlerList.hpp
+++ b/base/applications/cleanmgr/cleanmgr/CCleanupHandlerList.hpp
@@ -1,31 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CCleanupHandlerList definition
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-
-class CCleanupHandlerList
-{
-private:
-    CAtlList<CCleanupHandler *> m_Handlers;
-    CStringW m_DriveStr;
-
-public:
-
-    void LoadHandlers(WCHAR Drive);
-    DWORDLONG ScanDrive(IEmptyVolumeCacheCallBack* picb);
-    void ExecuteCleanup(IEmptyVolumeCacheCallBack *picb);
-
-    template<typename Fn>
-    void ForEach(Fn callback)
-    {
-        for (POSITION it = m_Handlers.GetHeadPosition(); it; m_Handlers.GetNext(it))
-        {
-            CCleanupHandler *current = m_Handlers.GetAt(it);
-
-            callback(current);
-        }
-    }
-};
--- a/base/applications/cleanmgr/cleanmgr/CEmptyVolumeCacheCallBack.hpp
+++ b/base/applications/cleanmgr/cleanmgr/CEmptyVolumeCacheCallBack.hpp
@@ -1,54 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CEmptyVolumeCacheCallBack definition / implementation
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-
-// We don't really use this, but some windows handlers crash without it
-struct CEmptyVolumeCacheCallBack
-    : public IEmptyVolumeCacheCallBack
-{
-
-    STDMETHOD_(ULONG, AddRef)() throw()
-    {
-        return 2;
-    }
-    STDMETHOD_(ULONG, Release)() throw()
-    {
-        return 1;
-    }
-    STDMETHOD(QueryInterface)(
-        REFIID riid,
-        _COM_Outptr_ void** ppvObject) throw()
-    {
-        if (riid == IID_IUnknown || riid == IID_IEmptyVolumeCacheCallBack)
-        {
-            *ppvObject = (IUnknown*)this;
-            return S_OK;
-        }
-        *ppvObject = NULL;
-        return E_NOINTERFACE;
-    }
-
-
-    STDMETHODIMP ScanProgress(
-        _In_ DWORDLONG dwlSpaceUsed,
-        _In_ DWORD dwFlags,
-        _In_ LPCWSTR pcwszStatus) override
-    {
-        DPRINT("dwlSpaceUsed: %lld, dwFlags: %x\n", dwlSpaceUsed, dwFlags);
-        return S_OK;
-    }
-
-    STDMETHODIMP PurgeProgress(
-        _In_ DWORDLONG dwlSpaceFreed,
-        _In_ DWORDLONG dwlSpaceToFree,
-        _In_ DWORD dwFlags,
-        _In_ LPCWSTR pcwszStatus) override
-    {
-        DPRINT("dwlSpaceFreed: %lld, dwlSpaceToFree: %lld, dwFlags: %x\n", dwlSpaceFreed, dwlSpaceToFree, dwFlags);
-        return S_OK;
-    }
-};
--- a/base/applications/cleanmgr/cleanmgr/CMakeLists.txt
+++ b/base/applications/cleanmgr/cleanmgr/CMakeLists.txt
@@ -1,19 +0,0 @@
-
-add_executable(cleanmgr
-    cleanmgr.cpp
-    cleanmgr.h
-    cleanmgr.rc
-    resource.h
-    CEmptyVolumeCacheCallBack.hpp
-    CProgressDlg.hpp
-    CSelectDriveDlg.cpp
-    CCleanupHandler.cpp
-    CCleanupHandler.hpp
-    CCleanupHandlerList.cpp
-    CCleanupHandlerList.hpp
-)
-set_module_type(cleanmgr win32gui UNICODE)
-target_link_libraries(cleanmgr uuid cpprt atl_classes)
-add_importlibs(cleanmgr shlwapi oleaut32 ole32 shell32 comctl32 user32 advapi32 msvcrt kernel32 ntdll)
-add_dependencies(cleanmgr psdk)
-add_cd_file(TARGET cleanmgr DESTINATION reactos/system32 FOR all)
--- a/base/applications/cleanmgr/cleanmgr/CProgressDlg.hpp
+++ b/base/applications/cleanmgr/cleanmgr/CProgressDlg.hpp
@@ -1,50 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     Progress dialog implementation
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#pragma once
-
-class CProgressDlg
-{
-    CComPtr<IProgressDialog> m_spProgress;
-    DWORD m_dwTotal = 0;
-public:
-
-    ~CProgressDlg()
-    {
-        Stop();
-    }
-
-
-    void Start(DWORD dwTotalSteps, LPCWSTR Title, LPCWSTR Text)
-    {
-        HRESULT hr = CoCreateInstance(CLSID_ProgressDialog, NULL, CLSCTX_INPROC, IID_PPV_ARG(IProgressDialog, &m_spProgress));
-        if (FAILED_UNEXPECTEDLY(hr))
-            return;
-
-        m_dwTotal = dwTotalSteps;
-
-        m_spProgress->SetTitle(Title);
-        m_spProgress->SetLine(2, Text, TRUE, NULL);
-        m_spProgress->StartProgressDialog(NULL, NULL, PROGDLG_NOMINIMIZE, NULL);
-        m_spProgress->SetProgress(0, m_dwTotal);
-    }
-
-    void Step(DWORD dwProgress, LPCWSTR Text)
-    {
-        m_spProgress->SetProgress(dwProgress, m_dwTotal);
-        m_spProgress->SetLine(1, Text, TRUE, NULL);
-    }
-
-    void Stop()
-    {
-        if (m_spProgress)
-        {
-            m_spProgress->StopProgressDialog();
-            m_spProgress.Release();
-        }
-    }
-};
--- a/base/applications/cleanmgr/cleanmgr/CSelectDriveDlg.cpp
+++ b/base/applications/cleanmgr/cleanmgr/CSelectDriveDlg.cpp
@@ -1,80 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     Drive selection dialog
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#include "cleanmgr.h"
-
-class CSelectDriveDlg : public CDialogImpl<CSelectDriveDlg>
-{
-public:
-    enum { IDD = IDD_SELECTDRIVE };
-
-    BEGIN_MSG_MAP(CSelectDriveDlg)
-        MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
-        COMMAND_ID_HANDLER(IDOK, OnEndDialog)
-        COMMAND_ID_HANDLER(IDCANCEL, OnEndDialog)
-    END_MSG_MAP()
-
-    CSelectDriveDlg()
-        :m_SelectedDrive(UNICODE_NULL)
-    {
-    }
-
-    LRESULT OnInitDialog(UINT, WPARAM, LPARAM, BOOL&)
-    {
-        // Try to find an existing instance of this dialog
-        WCHAR buf[300];
-        GetWindowTextW(buf, _countof(buf));
-        for (HWND hNext = NULL, hFind; (hFind = ::FindWindowExW(NULL, hNext, NULL, buf)) != NULL; hNext = hFind)
-        {
-            if (hFind != *this && ::IsWindowVisible(hFind))
-            {
-                ::SetForegroundWindow(hFind);
-                EndDialog(IDCANCEL);
-                return FALSE;
-            }
-        }
-
-        CWindow cbo = GetDlgItem(IDC_DRIVES);
-        WCHAR VolumeNameBuffer[MAX_PATH + 1];
-        CStringW Tmp;
-        for (WCHAR Drive = 'A'; Drive <= 'Z'; ++Drive)
-        {
-            WCHAR RootPathName[] = { Drive,':','\\',0 };
-            UINT Type = GetDriveTypeW(RootPathName);
-            if (Type == DRIVE_FIXED)
-            {
-                GetVolumeInformationW(RootPathName, VolumeNameBuffer, _countof(VolumeNameBuffer), 0, 0, 0, 0, 0);
-                Tmp.Format(L"%s (%.2s)", VolumeNameBuffer, RootPathName);
-
-                int index = (int)cbo.SendMessage(CB_ADDSTRING, NULL, (LPARAM)Tmp.GetString());
-                cbo.SendMessage(CB_SETITEMDATA, index, Drive);
-            }
-        }
-        cbo.SendMessage(CB_SETCURSEL, 0);
-        return 1;
-    }
-    LRESULT OnEndDialog(WORD, WORD wID, HWND, BOOL&)
-    {
-        CWindow cbo = GetDlgItem(IDC_DRIVES);
-        m_SelectedDrive = (WCHAR)cbo.SendMessage(CB_GETITEMDATA, cbo.SendMessage(CB_GETCURSEL));
-        EndDialog(wID);
-        return 0;
-    }
-
-    WCHAR m_SelectedDrive;
-};
-
-
-void
-SelectDrive(WCHAR &Drive)
-{
-    CSelectDriveDlg dlgSelectDrive;
-    if (dlgSelectDrive.DoModal() == IDOK)
-    {
-        Drive = dlgSelectDrive.m_SelectedDrive;
-    }
-}
--- a/base/applications/cleanmgr/cleanmgr/cleanmgr.cpp
+++ b/base/applications/cleanmgr/cleanmgr/cleanmgr.cpp
@@ -1,328 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     Disk cleanup entrypoint
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#include "cleanmgr.h"
-
-// for listview with extend style LVS_EX_CHECKBOXES, State image 1 is the unchecked box, and state image 2 is the
-// checked box. see this: https://docs.microsoft.com/en-us/windows/win32/controls/extended-list-view-styles
-#define STATEIMAGETOINDEX(x) (((x)&LVIS_STATEIMAGEMASK) >> 12)
-#define STATEIMAGE_UNCHECKED 1
-#define STATEIMAGE_CHECKED 2
-
-
-struct CCleanMgrProperties :
-    public CPropertyPageImpl<CCleanMgrProperties>
-{
-    enum { IDD = IDD_PROPERTIES_MAIN };
-    CWindow m_HandlerListControl;
-    WCHAR m_Drive;
-    DWORDLONG m_TotalSpaceUsed;
-    CCleanupHandlerList* m_HandlerList;
-    bool m_IgnoreChanges = true;
-
-
-    CCleanMgrProperties(WCHAR Drive, DWORDLONG TotalSpaceUsed, CCleanupHandlerList *handlerList)
-        : m_Drive(Drive)
-        , m_TotalSpaceUsed(TotalSpaceUsed)
-        , m_HandlerList(handlerList)
-    {
-    }
-
-    int OnApply()
-    {
-        CStringW Title(MAKEINTRESOURCE(IDS_DISK_CLEANUP));
-        CStringW Text(MAKEINTRESOURCE(IDS_CONFIRM_DELETE));
-
-        if (MessageBoxW(Text, Title, MB_YESNO | MB_ICONQUESTION) != IDYES)
-            return PSNRET_INVALID;
-
-        return PSNRET_NOERROR;
-    }
-
-    LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-    {
-        HICON hIcon = (HICON)::LoadImageW(
-            _AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCEW(IDI_CLEANMGR), IMAGE_ICON, 0, 0,
-            LR_DEFAULTSIZE | LR_SHARED);
-        SendDlgItemMessage(IDC_DISKICON, STM_SETICON, (WPARAM)hIcon);
-
-        m_HandlerListControl = GetDlgItem(IDC_HANDLERLIST);
-        RECT rc;
-        m_HandlerListControl.GetClientRect(&rc);
-        rc.right -= GetSystemMetrics(SM_CXVSCROLL);
-
-        LV_COLUMN column = {};
-        column.mask = LVCF_FMT | LVCF_WIDTH;
-        column.fmt = LVCFMT_LEFT;
-        column.cx = rc.right * 80 / 100;
-        ListView_InsertColumn(m_HandlerListControl, 0, &column);
-        column.fmt = LVCFMT_RIGHT;
-        column.cx = rc.right * 20 / 100;
-
-        ListView_InsertColumn(m_HandlerListControl, 1, &column);
-        HIMAGELIST hImagelist = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, 1, 1);
-        ListView_SetImageList(m_HandlerListControl, hImagelist, LVSIL_SMALL);
-
-        ListView_SetExtendedListViewStyleEx(m_HandlerListControl, LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT, LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
-
-        m_HandlerList->ForEach(
-            [&](CCleanupHandler *current)
-            {
-                if (!current->ShowHandler)
-                    return;
-
-                LV_ITEM item = {};
-                item.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;
-                item.lParam = (LPARAM)current;
-                item.pszText = (LPWSTR)current->wszDisplayName;
-                item.iItem = ListView_GetItemCount(m_HandlerListControl);
-                item.iImage = ImageList_AddIcon(hImagelist, current->hIcon);
-                item.iItem = ListView_InsertItem(m_HandlerListControl, &item);
-                ListView_SetCheckState(
-                    m_HandlerListControl, item.iItem, !!(current->StateFlags & HANDLER_STATE_SELECTED));
-
-                item.mask = LVIF_TEXT;
-                WCHAR ByteSize[100] = {};
-                StrFormatByteSizeW(current->SpaceUsed, ByteSize, _countof(ByteSize));
-                ListView_SetItemText(m_HandlerListControl, item.iItem, 1, ByteSize);
-            });
-
-        // Now we should start responding to changes
-        m_IgnoreChanges = false;
-
-        // Select the first item
-        ListView_SetItemState(m_HandlerListControl, 0, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
-
-        UpdateSpaceUsed();
-        return TRUE;
-    }
-
-    CCleanupHandler* GetHandler(int Index)
-    {
-        LVITEMW item = {};
-        item.iItem = Index;
-        if (item.iItem >= 0)
-        {
-            item.mask = LVIF_PARAM;
-            ListView_GetItem(m_HandlerListControl, &item);
-            return (CCleanupHandler*)item.lParam;
-        }
-        return nullptr;
-    }
-
-
-    LRESULT OnDetails(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
-    {
-        CCleanupHandler *handler = GetHandler(ListView_GetNextItem(m_HandlerListControl, -1, LVIS_FOCUSED));
-        if (handler)
-        {
-            handler->Handler->ShowProperties(m_hWnd);
-        }
-        return 0L;
-    }
-
-    LRESULT OnHandlerItemchanged(int idCtrl, LPNMHDR pnmh, BOOL& bHandled)
-    {
-        if (idCtrl == IDC_HANDLERLIST)
-        {
-            // We are still initializing, don't respond to changes just yet!
-            if (m_IgnoreChanges)
-                return 0L;
-
-            LPNMLISTVIEW pnic = (LPNMLISTVIEW)pnmh;
-
-            // We only care about state changes
-            if (!(pnic->uChanged & LVIF_STATE))
-                return 0L;
-
-
-            INT ItemIndex = pnic->iItem;
-            if (ItemIndex == -1 || ItemIndex >= ListView_GetItemCount(pnic->hdr.hwndFrom))
-            {
-                return 0L;
-            }
-
-            bool GotSelected = (pnic->uNewState & LVIS_SELECTED) && !(pnic->uOldState & LVIS_SELECTED);
-            if (GotSelected)
-            {
-                CWindow DetailsButton = GetDlgItem(IDC_DETAILS);
-                CCleanupHandler* handler = (CCleanupHandler*)pnic->lParam;
-
-                SetDlgItemText(IDC_DESCRIPTION, handler->wszDescription ? handler->wszDescription : L"");
-                if (handler->HasSettings())
-                {
-                    DetailsButton.ShowWindow(SW_SHOW);
-                    DetailsButton.SetWindowText(handler->wszBtnText);
-                }
-                else
-                {
-                    DetailsButton.ShowWindow(SW_HIDE);
-                }
-            }
-
-            int iOldState = STATEIMAGETOINDEX(pnic->uOldState);
-            int iNewState = STATEIMAGETOINDEX(pnic->uNewState);
-
-            if ((iOldState ^ iNewState) == (STATEIMAGE_UNCHECKED ^ STATEIMAGE_CHECKED))
-            {
-                CCleanupHandler* handler = (CCleanupHandler*)pnic->lParam;
-                if (iNewState == STATEIMAGE_CHECKED)
-                    handler->StateFlags |= HANDLER_STATE_SELECTED;
-                else
-                    handler->StateFlags &= ~HANDLER_STATE_SELECTED;
-                UpdateSpaceUsed();
-            }
-        }
-        return 0L;
-    }
-
-    void UpdateSpaceUsed()
-    {
-        CStringW tmp;
-        WCHAR ByteSize[100];
-        StrFormatByteSizeW(m_TotalSpaceUsed, ByteSize, _countof(ByteSize));
-
-        tmp.Format(IDS_TOTAL_CLEANABLE_CAPTION, ByteSize, m_Drive);
-        SetDlgItemText(IDC_TOTAL_CLEANABLE, tmp);
-
-        DWORDLONG SelectedGained = 0;
-
-        m_HandlerList->ForEach(
-            [&](CCleanupHandler *current)
-            {
-                if (current->StateFlags & HANDLER_STATE_SELECTED)
-                {
-                    SelectedGained += current->SpaceUsed;
-                }
-            });
-
-        StrFormatByteSizeW(SelectedGained, ByteSize, _countof(ByteSize));
-        SetDlgItemText(IDC_SELECTED_GAINED, ByteSize);
-    }
-
-    BEGIN_MSG_MAP(CCleanMgrProperties)
-        MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
-        COMMAND_ID_HANDLER(IDC_DETAILS, OnDetails)
-        NOTIFY_HANDLER(IDC_HANDLERLIST, LVN_ITEMCHANGED, OnHandlerItemchanged)
-        CHAIN_MSG_MAP(CPropertyPageImpl<CCleanMgrProperties>)  // Allow the default handler to call 'OnApply' etc
-    END_MSG_MAP()
-};
-
-
-
-class CCleanMgrModule : public ATL::CAtlExeModuleT< CCleanMgrModule >
-{
-public:
-    WCHAR m_Drive = UNICODE_NULL;
-
-    bool ParseCommandLine(
-        _In_z_ LPCTSTR lpCmdLine,
-        _Out_ HRESULT* pnRetCode) throw()
-    {
-        int argc = 0;
-        CLocalPtr<LPWSTR> argv(CommandLineToArgvW(lpCmdLine, &argc));
-
-        for (int n = 1; n < argc; ++n)
-        {
-            if ((argv[n][0] == '/' || argv[n][0] == '-') && towlower(argv[n][1]) == 'd')
-            {
-                if (iswalpha(argv[n][2]))
-                {
-                    m_Drive = towupper(argv[n][2]);
-                    continue;
-                }
-                if ((n + 1) < argc)
-                {
-                    m_Drive = towupper(argv[n + 1][0]);
-                    ++n;
-                    continue;
-                }
-            }
-        }
-        *pnRetCode = S_OK;
-        return true;
-    }
-
-    static inline UINT GetWindowProcessId(_In_ HWND hWnd)
-    {
-        DWORD pid;
-        return GetWindowThreadProcessId(hWnd, &pid) ? pid : 0;
-    }
-
-    static BOOL CALLBACK EnumSingleInstanceCallback(_In_ HWND hWnd, _In_ LPARAM lParam)
-    {
-        if (::IsWindowVisible(hWnd) && (LPARAM)GetWindowProcessId(hWnd) == lParam)
-        {
-            ::SetForegroundWindow(hWnd);
-            return FALSE;
-        }
-        return TRUE;
-    }
-
-    HRESULT Run(_In_ int nShowCmd) throw()
-    {
-        if (m_Drive == UNICODE_NULL)
-        {
-            SelectDrive(m_Drive);
-        }
-
-        if (m_Drive == UNICODE_NULL)
-            return E_FAIL;
-
-        CStringW Title;
-        Title.Format(IDS_PROPERTIES_MAIN_TITLE, m_Drive);
-
-        HWND hWndInstance = ::CreateWindowExW(WS_EX_TOOLWINDOW, WC_STATIC, Title, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
-        for (HWND hNext = NULL, hFind; (hFind = ::FindWindowExW(NULL, hNext, WC_STATIC, Title)) != NULL; hNext = hFind)
-        {
-            if (hFind != hWndInstance)
-            {
-                ::EnumWindows(EnumSingleInstanceCallback, GetWindowProcessId(hFind));
-                return S_FALSE;
-            }
-        }
-
-        CCleanupHandlerList Handlers;
-        CEmptyVolumeCacheCallBack CacheCallBack;
-
-        Handlers.LoadHandlers(m_Drive);
-        DWORDLONG TotalSpaceUsed = Handlers.ScanDrive(&CacheCallBack);
-
-        CCleanMgrProperties cleanMgr(m_Drive, TotalSpaceUsed, &Handlers);
-        HPROPSHEETPAGE hpsp[1] = { cleanMgr.Create() };
-
-        PROPSHEETHEADERW psh = {  };
-        psh.dwSize = sizeof(psh);
-        psh.dwFlags = PSH_NOAPPLYNOW | PSH_USEICONID | PSH_NOCONTEXTHELP;
-        psh.hInstance = _AtlBaseModule.GetResourceInstance();
-        psh.pszIcon = MAKEINTRESOURCEW(IDI_CLEANMGR);
-        psh.pszCaption = Title;
-        psh.nPages = _countof(hpsp);
-        psh.phpage = hpsp;
-
-        if (PropertySheetW(&psh) >= 1)
-        {
-            ::DestroyWindow(hWndInstance); // Allow new "cleanmgr /D" without waiting for these handlers
-            Handlers.ExecuteCleanup(&CacheCallBack);
-        }
-        else
-        {
-            ::DestroyWindow(hWndInstance);
-        }
-        return S_OK;
-    }
-};
-
-CCleanMgrModule _AtlModule;
-
-
-
-extern "C" int WINAPI wWinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/,
-								LPWSTR /*lpCmdLine*/, int nShowCmd)
-{
-    return _AtlModule.WinMain(nShowCmd);
-}
--- a/base/applications/cleanmgr/cleanmgr/cleanmgr.h
+++ b/base/applications/cleanmgr/cleanmgr/cleanmgr.h
@@ -1,66 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     Main header file
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#pragma once
-
-#ifndef STRICT
-#define STRICT
-#endif
-
-#define _ATL_APARTMENT_THREADED
-#define _ATL_NO_AUTOMATIC_NAMESPACE
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
-#define ATL_NO_ASSERT_ON_DESTROY_NONEXISTENT_WINDOW
-
-#define _FORCENAMELESSUNION
-
-#include <ndk/rtlfuncs.h>
-#include <windef.h>
-#include <winbase.h>
-#include <shlobj.h>
-#include <shlwapi.h>
-
-
-#include <atlbase.h>
-#include <atlcom.h>
-#include <atlstr.h>
-#include <strsafe.h>
-#include <emptyvc.h>
-#include <atlcoll.h>
-
-
-using namespace ATL;
-
-#define NDEBUG
-#include <reactos/debug.h>
-#include <reactos/shellutils.h>
-#include <ui/rosdlgs.h>
-
-
-template <class T> class CLocalPtr
-    : public CHeapPtr<T, CLocalAllocator>
-{
-public:
-    CLocalPtr() throw()
-    {
-    }
-
-    explicit CLocalPtr(_In_ T* pData) throw() :
-        CHeapPtr<T, CLocalAllocator>(pData)
-    {
-    }
-};
-
-#include "resource.h"
-#include "CProgressDlg.hpp"
-#include "CCleanupHandler.hpp"
-#include "CCleanupHandlerList.hpp"
-#include "CEmptyVolumeCacheCallBack.hpp"
-
-// CSelectDriveDlg.cpp
-void
-SelectDrive(WCHAR &Drive);
--- a/base/applications/cleanmgr/cleanmgr/cleanmgr.rc
+++ b/base/applications/cleanmgr/cleanmgr/cleanmgr.rc
@@ -1,64 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     Resources
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#include <windef.h>
-#include <winuser.h>
-#include <commctrl.h>
-#include "resource.h"
-
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Disk Cleanup"
-#define REACTOS_STR_INTERNAL_NAME     "cleanmgr"
-#define REACTOS_STR_ORIGINAL_FILENAME "cleanmgr.exe"
-#include <reactos/version.rc>
-
-#include <reactos/manifest_exe.rc>
-
-IDI_CLEANMGR ICON "resources/cleanmgr.ico"
-
-#pragma code_page(65001)
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-STRINGTABLE
-BEGIN
-    IDS_PROPERTIES_MAIN_TITLE "Disk Cleanup for (%c:)"
-    IDS_TOTAL_CLEANABLE_CAPTION "You can use Disk Cleanup to free up to %s of disk space on (%c:)."
-    IDS_DISK_CLEANUP "Disk Cleanup"
-    IDS_CONFIRM_DELETE "Are you sure you want to delete these files permanently?"
-    IDS_CALCULATING "Disk Cleanup is calculating how much space can be gained on (%s)."
-    IDS_SCANNING "Scanning: %s"
-    IDS_CLEANING_CAPTION "Disk Cleanup is cleaning up files on %s."
-    IDS_CLEANING "Cleaning: %s"
-END
-
-IDD_PROPERTIES_MAIN DIALOGEX 0, 0, 235, 215
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Disk Cleanup"
-FONT 8, "MS Shell Dlg", 400, 0, 0x0
-BEGIN
-    CONTROL         "",IDC_DISKICON,"Static",SS_ICON,6,6,20,20
-    LTEXT           "You can use Disk Cleanup to free up to 0.0MB of disk space on drive C.",IDC_TOTAL_CLEANABLE,36,6,192,18
-    LTEXT           "Files to delete:",IDC_STATIC,6,30,222,8
-    CONTROL         "",IDC_HANDLERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,6,42,222,66
-    LTEXT           "Total amount of disk space gained:",IDC_STATIC,6,114,144,8
-    RTEXT           "",IDC_SELECTED_GAINED,156,114,73,8
-    GROUPBOX        "Description",IDC_STATIC,6,126,222,84
-    LTEXT           "",IDC_DESCRIPTION,12,138,210,54
-    PUSHBUTTON      "Details...",IDC_DETAILS,150,192,74,14
-END
-
-IDD_SELECTDRIVE DIALOGEX 0, 0, 177, 74
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Disk Cleanup - Select Drive"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,30,48,50,14
-    PUSHBUTTON      "E&xit",IDCANCEL,96,48,50,14
-    LTEXT           "Select the drive to clean up.",IDC_STATIC,12,6,150,8
-    COMBOBOX        IDC_DRIVES,12,24,150,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-END
-
--- a/base/applications/cleanmgr/cleanmgr/resource.h
+++ b/base/applications/cleanmgr/cleanmgr/resource.h
@@ -1,30 +0,0 @@
-/*
- * PROJECT:     ReactOS Disk Cleanup
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     Resource definitions
- * COPYRIGHT:   Copyright 2023-2025 Mark Jansen <mark.jansen@reactos.org>
- */
-
-#define IDC_STATIC                      -1
-
-#define IDI_CLEANMGR                    100
-
-#define IDD_PROPERTIES_MAIN             200
-#define IDC_DISKICON                    201
-#define IDC_TOTAL_CLEANABLE             202
-#define IDC_HANDLERLIST                 203
-#define IDC_SELECTED_GAINED             204
-#define IDC_DESCRIPTION                 205
-#define IDC_DETAILS                     206
-
-#define IDD_SELECTDRIVE                 220
-#define IDC_DRIVES                      221
-
-#define IDS_PROPERTIES_MAIN_TITLE       1000
-#define IDS_TOTAL_CLEANABLE_CAPTION     1001
-#define IDS_DISK_CLEANUP                1002
-#define IDS_CONFIRM_DELETE              1003
-#define IDS_CALCULATING                 1004
-#define IDS_SCANNING                    1005
-#define IDS_CLEANING_CAPTION            1006
-#define IDS_CLEANING                    1007
--- a/base/applications/cleanmgr/cleanmgr/resources/cleanmgr.ico
+++ b/base/applications/cleanmgr/cleanmgr/resources/cleanmgr.ico
--- a/base/applications/clipbrd/lang/ro-RO.rc
+++ b/base/applications/clipbrd/lang/ro-RO.rc
@@ -2,7 +2,7 @@
 * PROJECT:     ReactOS Clipboard
 * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
 * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea@mail.com>
+ * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea@mail.com>
 *              Copyright 2023-2024 Andrei Miloiu <miloiuandrei@gmail.com>
 */

@@ -18,23 +18,23 @@ BEGIN
    POPUP "&Fișier"
    BEGIN
        MENUITEM "&Deschidere…", CMD_OPEN
-        MENUITEM "&Salvare ca…", CMD_SAVE_AS
+        MENUITEM "S&alvare ca…", CMD_SAVE_AS
        MENUITEM SEPARATOR
        MENUITEM "I&eșire", CMD_EXIT
    END
    POPUP "&Editare"
    BEGIN
-        MENUITEM "Ș&tergere\tDel", CMD_DELETE
+        MENUITEM "Șt&ergere\tDel", CMD_DELETE
    END
    POPUP "&Afișare"
    BEGIN
-        MENUITEM "A&utomată", CMD_AUTOMATIC
+        MENUITEM "&Automată", CMD_AUTOMATIC
    END
-    POPUP "A&jutor"
+    POPUP "Aj&utor"
    BEGIN
-        MENUITEM "Aj&utor", CMD_HELP
+        MENUITEM "&Manual…", CMD_HELP
        MENUITEM SEPARATOR
-        MENUITEM "&Despre", CMD_ABOUT
+        MENUITEM "&Despre…", CMD_ABOUT
    END
 END

@@ -60,10 +60,10 @@ BEGIN
    STRING_CF_ENHMETAFILE "Metafișier îmbunătățit"
    STRING_CF_METAFILEPICT "Metafișier"
    STRING_CF_PALETTE "Paletă de culori"
-    STRING_CF_DIBV5 "Bitmap DIB (versiunea 5)"
+    STRING_CF_DIBV5 "Bitmap DIB (versiune 5)"
    STRING_CF_SYLK "Format de legătură simbolică"
-    STRING_CF_DIF "Format de schimb de date"
-    STRING_CF_HDROP "Ștergere a datelor"
+    STRING_CF_DIF "Format de transfer al datelor"
+    STRING_CF_HDROP "Abandon date"
 END

 STRINGTABLE
--- a/base/applications/clipbrd/winutils.c
+++ b/base/applications/clipbrd/winutils.c
@@ -257,9 +257,9 @@ void SetDIBitsToDeviceFromClipboard(UINT uFormat, PAINTSTRUCT ps, SCROLLSTATE st
         *
         * FIXME: investigate!!
         * ANSWER: this is a Windows bug; part of the answer is there:
-         * https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/ac7ab3b5-8609-4478-b86a-976dab44c271/bug-clipboard-format-conversions-cfdib-cfdibv5-cfdib (DEAD_LINK)
+         * https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/ac7ab3b5-8609-4478-b86a-976dab44c271/bug-clipboard-format-conversions-cfdib-cfdibv5-cfdib
         * May be related:
-         * https://blog.talosintelligence.com/dangerous-clipboard/
+         * https://blog.talosintelligence.com/2015/10/dangerous-clipboard.html
         */
 #if 0
        if ((lpInfoHeader->biSize == sizeof(BITMAPINFOHEADER)) &&
--- a/base/applications/cmdutils/CMakeLists.txt
+++ b/base/applications/cmdutils/CMakeLists.txt
@@ -19,7 +19,6 @@ add_subdirectory(mode)
 add_subdirectory(mofcomp)
 add_subdirectory(more)
 add_subdirectory(reg)
-add_subdirectory(replace)
 add_subdirectory(schtasks)
 add_subdirectory(sort)
 add_subdirectory(taskkill)
--- a/base/applications/cmdutils/at/at.rc
+++ b/base/applications/cmdutils/at/at.rc
@@ -9,7 +9,6 @@

 /* UTF-8 */
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_DE_DE
    #include "lang/de-DE.rc"
 #endif
--- a/base/applications/cmdutils/attrib/attrib.c
+++ b/base/applications/cmdutils/attrib/attrib.c
@@ -150,7 +150,7 @@ typedef struct _ENUMFILES_CTX
 static BOOL
 EnumFilesWorker(
    _Inout_ PENUMFILES_CTX EnumCtx,
-    _Inout_ _off_t offFilePart) // Offset to the file name inside FullPathBuffer
+    _Inout_ off_t offFilePart) // Offset to the file name inside FullPathBuffer
 {
    BOOL bFound = FALSE;
    HRESULT hRes;
@@ -243,7 +243,7 @@ EnumFilesWorker(
    do
    {
        BOOL bIsDir = !!(EnumCtx->findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
-        BOOL bExactMatch = (_wcsicmp(findFileName, EnumCtx->FileName) == 0);
+        BOOL bExactMatch = (wcsicmp(findFileName, EnumCtx->FileName) == 0);

        if (bIsDir && !(EnumCtx->Flags & ENUM_DIRECTORIES) && !bExactMatch)
            continue;
@@ -330,9 +330,9 @@ int wmain(int argc, WCHAR *argv[])
            }
            else
            /* Retrieve the enumeration modes */
-            if (_wcsicmp(argv[i], L"/s") == 0)
+            if (wcsicmp(argv[i], L"/s") == 0)
                dwEnumFlags |= ENUM_RECURSE;
-            else if (_wcsicmp(argv[i], L"/d") == 0)
+            else if (wcsicmp(argv[i], L"/d") == 0)
                dwEnumFlags |= ENUM_DIRECTORIES;
            else
            {
--- a/base/applications/cmdutils/certutil/CMakeLists.txt
+++ b/base/applications/cmdutils/certutil/CMakeLists.txt
@@ -2,14 +2,12 @@
 include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)

 list(APPEND SOURCE
-    asn.cpp
-    certutil.cpp
-    hashfile.cpp
+    certutil.c
    precomp.h)

 add_executable(certutil ${SOURCE})
 set_module_type(certutil win32cui UNICODE)
 target_link_libraries(certutil conutils ${PSEH_LIB})
-add_importlibs(certutil crypt32 advapi32 msvcrt kernel32)
+add_importlibs(certutil advapi32 msvcrt kernel32)
 add_pch(certutil precomp.h SOURCE)
 add_cd_file(TARGET certutil DESTINATION reactos/system32 FOR all)
--- a/base/applications/cmdutils/certutil/asn.cpp
+++ b/base/applications/cmdutils/certutil/asn.cpp
@@ -1,508 +0,0 @@
-/*
- * PROJECT:     ReactOS certutil
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CertUtil asn implementation
- * COPYRIGHT:   Copyright 2020 Mark Jansen (mark.jansen@reactos.org)
- *
- * NOTES:
- *  To keep it simple, Tag and Class are combined in one identifier
- *  See for more details:
- *      https://en.wikipedia.org/wiki/X.690#BER_encoding
- *      https://www.strozhevsky.com/free_docs/asn1_by_simple_words.pdf
- *      http://mikk.net/~chris/asn1.pdf
- *
- *  And for a test suite:
- *      https://github.com/YuryStrozhevsky/asn1-test-suite
- */
-
-#include "precomp.h"
-#include <math.h>
-#include <wincrypt.h>
-#include <stdlib.h>
-
-
-#define ASN_TAG_IS_CONSTRUCTED          0x20
-
-
-#define ASN_TAG_BITSTRING               0x03
-#define ASN_TAG_OCTET_STRING            0x04
-#define ASN_TAG_OBJECT_ID               0x06
-
-#define ASN_TAG_SEQUENCE_RAW            0x10
-#define ASN_TAG_SET_RAW                 0x11
-
-#define ASN_TAG_SEQUENCE                0x30
-#define ASN_TAG_SET                     0x31
-
-
-#define ASN_TAG_CONTEXT_SPECIFIC        0x80
-#define ASN_TAG_CONTEXT_SPECIFIC_N(n)   (ASN_TAG_CONTEXT_SPECIFIC | (n))
-
-#define ASN_TAG_OPTIONAL                0xA0
-#define ASN_TAG_OPTIONAL_N(n)           (ASN_TAG_OPTIONAL | (n))
-
-/* NOTE: These names are not the names listed in f.e. the wikipedia pages,
-   they are made to look like MS's names for this */
-LPCWSTR TagToName(DWORD dwTag)
-{
-    switch (dwTag)
-    {
-    case 0x0: return L"EOC";
-    case 0x1: return L"BOOL";
-    case 0x2: return L"INTEGER";
-    case ASN_TAG_BITSTRING: return L"BIT_STRING";
-    case ASN_TAG_OCTET_STRING: return L"OCTET_STRING";
-    case 0x5: return L"NULL";
-    case ASN_TAG_OBJECT_ID: return L"OBJECT_ID";
-    case 0x7: return L"Object Descriptor";
-    case 0x8: return L"EXTERNAL";
-    case 0x9: return L"REAL";
-    case 0xA: return L"ENUMERATED";
-    case 0xB: return L"EMBEDDED PDV";
-    case 0xC: return L"UTF8String";
-    case 0xD: return L"RELATIVE-OID";
-    case 0xE: return L"TIME";
-    case 0xF: return L"Reserved";
-    case ASN_TAG_SEQUENCE_RAW: __debugbreak(); return L"SEQUENCE_RAW";
-    case ASN_TAG_SET_RAW: __debugbreak(); return L"SET_RAW";
-    case 0x12: return L"NumericString";
-    case 0x13: return L"PRINTABLE_STRING";
-    case 0x14: return L"T61String";
-    case 0x15: return L"VideotexString";
-    case 0x16: return L"IA5String";
-    case 0x17: return L"UTC_TIME";
-    case 0x18: return L"GeneralizedTime";
-    case 0x19: return L"GraphicString";
-    case 0x1A: return L"VisibleString";
-    case 0x1B: return L"GeneralString";
-    case 0x1C: return L"UniversalString";
-    case 0x1D: return L"CHARACTER STRING";
-    case 0x1E: return L"BMPString";
-    case 0x1F: return L"DATE";
-    case 0x20: return L"CONSTRUCTED";
-
-    case ASN_TAG_SEQUENCE: return L"SEQUENCE";
-    case ASN_TAG_SET: return L"SET";
-
-
-    case ASN_TAG_CONTEXT_SPECIFIC_N(0): return L"CONTEXT_SPECIFIC[0]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(1): return L"CONTEXT_SPECIFIC[1]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(2): return L"CONTEXT_SPECIFIC[2]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(3): return L"CONTEXT_SPECIFIC[3]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(4): return L"CONTEXT_SPECIFIC[4]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(5): return L"CONTEXT_SPECIFIC[5]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(6): return L"CONTEXT_SPECIFIC[6]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(7): return L"CONTEXT_SPECIFIC[7]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(8): return L"CONTEXT_SPECIFIC[8]";
-    case ASN_TAG_CONTEXT_SPECIFIC_N(9): return L"CONTEXT_SPECIFIC[9]";
-    /* Experiments show that Windows' certutil only goes up to 9 */
-
-
-    case ASN_TAG_OPTIONAL_N(0): return L"OPTIONAL[0]";
-    case ASN_TAG_OPTIONAL_N(1): return L"OPTIONAL[1]";
-    case ASN_TAG_OPTIONAL_N(2): return L"OPTIONAL[2]";
-    case ASN_TAG_OPTIONAL_N(3): return L"OPTIONAL[3]";
-    case ASN_TAG_OPTIONAL_N(4): return L"OPTIONAL[4]";
-    case ASN_TAG_OPTIONAL_N(5): return L"OPTIONAL[5]";
-    case ASN_TAG_OPTIONAL_N(6): return L"OPTIONAL[6]";
-    case ASN_TAG_OPTIONAL_N(7): return L"OPTIONAL[7]";
-    case ASN_TAG_OPTIONAL_N(8): return L"OPTIONAL[8]";
-    case ASN_TAG_OPTIONAL_N(9): return L"OPTIONAL[9]";
-    /* Experiments show that Windows' certutil only goes up to 9 */
-
-    default:
-        return L"???";
-    }
-}
-
-BOOL Move(DWORD dwLen, PBYTE& pData, DWORD& dwSize)
-{
-    if (dwSize < dwLen)
-        return FALSE;
-
-    pData += dwLen;
-    dwSize -= dwLen;
-
-    return TRUE;
-}
-
-BOOL ParseTag(PBYTE& pData, DWORD& dwSize, DWORD& dwTagAndClass)
-{
-    if (dwSize == 0)
-        return FALSE;
-
-    /* Is this a long form? */
-    if ((pData[0] & 0x1f) != 0x1f)
-    {
-        /* No, so extract the tag and class (in one identifier) */
-        dwTagAndClass = pData[0];
-        return Move(1, pData, dwSize);
-    }
-
-    DWORD dwClass = (pData[0] & 0xE0) >> 5;
-    dwTagAndClass = 0;
-    DWORD n;
-    for (n = 1; n < dwSize; ++n)
-    {
-        dwTagAndClass <<= 7;
-        dwTagAndClass |= (pData[n] & 0x7f);
-
-        if (!(pData[n] & 0x80))
-        {
-            break;
-        }
-    }
-
-    Move(n, pData, dwSize);
-
-    /* Any number bigger than this, we shift data out! */
-    if (n > 4)
-        return FALSE;
-
-    /* Just drop this in the hightest bits*/
-    dwTagAndClass |= (dwClass << (32-3));
-
-    return TRUE;
-}
-
-BOOL ParseLength(PBYTE& pData, DWORD& dwSize, DWORD& dwLength)
-{
-    if (dwSize == 0)
-        return FALSE;
-
-    if (!(pData[0] & 0x80))
-    {
-        dwLength = pData[0];
-        return Move(1, pData, dwSize);
-    }
-
-    DWORD dwBytes = pData[0] & 0x7f;
-    if (dwBytes == 0 || dwBytes > 8 || dwBytes + 1 > dwSize)
-    {
-        return FALSE;
-    }
-
-    dwLength = 0;
-    for (DWORD n = 0; n < dwBytes; ++n)
-    {
-        dwLength <<= 8;
-        dwLength += pData[1 + n];
-    }
-
-    return Move(dwBytes + 1, pData, dwSize);
-}
-
-
-DWORD HexDump(PBYTE pRoot, PBYTE pData, DWORD dwSize, PWSTR wszPrefix)
-{
-    while (TRUE)
-    {
-        SIZE_T Address = pData - pRoot;
-        ConPrintf(StdOut, L"%04x: ", Address);
-        ConPuts(StdOut, wszPrefix);
-
-        for (DWORD n = 0; n < min(dwSize, 0x10); ++n)
-        {
-            ConPrintf(StdOut, L"%02x ", pData[n]);
-        }
-
-        if (dwSize <= 0x10)
-            break;
-
-        Move(0x10, pData, dwSize);
-        ConPuts(StdOut, L"\n");
-    }
-
-    return 3 * dwSize;
-}
-
-void PrintTag(PBYTE pRoot, PBYTE pHeader, DWORD dwTag, DWORD dwTagLength, PBYTE pData, PWSTR wszPrefix)
-{
-    DWORD dwRemainder = HexDump(pRoot, pHeader, pData - pHeader, wszPrefix);
-
-    LPCWSTR wszTag = TagToName(dwTag);
-    DWORD dwPadding = dwRemainder + wcslen(wszPrefix);
-    while (dwPadding > 50)
-        dwPadding -= 50;
-    ConPrintf(StdOut, L"%*s; %s (%x Bytes)\n", 50 - dwPadding, L"", wszTag, dwTagLength);
-}
-
-struct OID_NAMES
-{
-    CHAR* Oid;
-    LPCWSTR Names[20];
-    DWORD NumberOfNames;
-};
-
-BOOL WINAPI CryptOIDEnumCallback(_In_ PCCRYPT_OID_INFO pInfo, _Inout_opt_ void *pvArg)
-{
-    OID_NAMES* Names = (OID_NAMES*)pvArg;
-
-    if (pInfo && pInfo->pszOID && !_stricmp(pInfo->pszOID, Names->Oid))
-    {
-        if (Names->NumberOfNames < RTL_NUMBER_OF(Names->Names))
-        {
-            for (DWORD n = 0; n < Names->NumberOfNames; ++n)
-            {
-                // We already have this..
-                if (!_wcsicmp(Names->Names[n], pInfo->pwszName))
-                    return TRUE;
-            }
-
-            Names->Names[Names->NumberOfNames++] = pInfo->pwszName;
-        }
-    }
-
-    return TRUE;
-}
-
-void PrintOID(PBYTE pRoot, PBYTE pHeader, PBYTE pData, DWORD dwSize, PWSTR wszPrefix)
-{
-    /* CryptFindOIDInfo expects the OID to be in ANSI.. */
-    CHAR szOID[250];
-    CHAR* ptr = szOID;
-    size_t cchRemaining = RTL_NUMBER_OF(szOID);
-
-    /* CryptFindOIDInfo just returns the first, we want multiple */
-    OID_NAMES Names = {0};
-
-    if (dwSize == 0)
-        return;
-
-    DWORD dwValue = 0, count = 0;
-    for (DWORD n = 0; n < dwSize; ++n)
-    {
-        dwValue <<= 7;
-        dwValue |= pData[n] & 0x7f;
-
-        if (pData[n] & 0x80)
-        {
-            if (++count >= 4)
-                break;
-            continue;
-        }
-        count = 0;
-
-        /* First & second octet have a special encoding */
-        if (ptr == szOID)
-        {
-            DWORD id1 = dwValue / 40;
-            DWORD id2 = dwValue % 40;
-
-            /* The first one can only be 0, 1 or 2, so handle special case: tc24.ber */
-            if (id1 > 2)
-            {
-                id2 += (id1 - 2) * 40;
-                id1 = 2;
-            }
-            StringCchPrintfExA(ptr, cchRemaining, &ptr, &cchRemaining, 0, "%d.%d", id1, id2);
-        }
-        else
-        {
-            StringCchPrintfExA(ptr, cchRemaining, &ptr, &cchRemaining, 0, ".%d", dwValue);
-        }
-
-        dwValue = 0;
-    }
-
-    if (dwValue || count)
-    {
-        /* We cannot format this, so just add abort */
-        return;
-    }
-
-    SIZE_T Address = pData - pRoot;
-    /* Pad with spaces instead of printing the address again */
-    DWORD addrDigits = (DWORD)log10((double)Address) + 1;
-    ConPrintf(StdOut, L"%*s  ", max(addrDigits, 4), L"");
-    ConPrintf(StdOut, L"%s; %S", wszPrefix, szOID);
-
-    Names.Oid = szOID;
-
-    /* The order does not match a naive call with '0'... */
-    CryptEnumOIDInfo(0, 0, &Names, CryptOIDEnumCallback);
-
-    for (DWORD n = 0; n < Names.NumberOfNames; ++n)
-    {
-        if (n == 0)
-            ConPrintf(StdOut, L" %s", Names.Names[n]);
-        else if (n == 1)
-            ConPrintf(StdOut, L" (%s", Names.Names[n]);
-        else
-            ConPrintf(StdOut, L" / %s", Names.Names[n]);
-    }
-
-    ConPrintf(StdOut, L"%s\n", Names.NumberOfNames > 1 ? L")" : L"");
-}
-
-
-BOOL ParseAsn(PBYTE pRoot, PBYTE pData, DWORD dwSize, PWSTR wszPrefix, BOOL fPrint)
-{
-    while (dwSize)
-    {
-        PBYTE pHeader = pData;
-        DWORD dwTagAndClass;
-
-        if (!ParseTag(pData, dwSize, dwTagAndClass))
-        {
-            if (fPrint)
-                ConPrintf(StdOut, L"CertUtil: -asn command failed to parse tag near 0x%x\n", pHeader - pRoot);
-            return FALSE;
-        }
-
-        DWORD dwTagLength;
-        if (!ParseLength(pData, dwSize, dwTagLength))
-        {
-            if (fPrint)
-                ConPrintf(StdOut, L"CertUtil: -asn command failed to parse tag length near 0x%x\n", pHeader - pRoot);
-            return FALSE;
-        }
-
-        if (dwTagLength > dwSize)
-        {
-            if (fPrint)
-                ConPrintf(StdOut, L"CertUtil: -asn command malformed tag length near 0x%x\n", pHeader - pRoot);
-            return FALSE;
-        }
-
-
-        if (fPrint)
-            PrintTag(pRoot, pHeader, dwTagAndClass, dwTagLength, pData, wszPrefix);
-
-        size_t len = wcslen(wszPrefix);
-        StringCchCatW(wszPrefix, MAX_PATH, dwTagLength != dwSize ? L"|  " : L"   ");
-
-        if (dwTagAndClass & ASN_TAG_IS_CONSTRUCTED)
-        {
-            if (!ParseAsn(pRoot, pData, dwTagLength, wszPrefix, fPrint))
-            {
-                return FALSE;
-            }
-        }
-        else
-        {
-            if (fPrint)
-            {
-                /* Special case for a bit string / octet string */
-                if ((dwTagAndClass == ASN_TAG_BITSTRING || dwTagAndClass == ASN_TAG_OCTET_STRING) && dwTagLength)
-                {
-                    if (dwTagAndClass == ASN_TAG_BITSTRING)
-                    {
-                        /* First, we print the 'unused bits' field of the bit string */
-                        HexDump(pRoot, pData, 1, wszPrefix);
-                        ConPuts(StdOut, L"\n");
-
-                        /* Move past it */
-                        Move(1, pData, dwSize);
-                        dwTagLength--;
-                    }
-
-                    /* Do we have any data left? */
-                    if (dwTagLength)
-                    {
-                        /* Try to parse this as ASN */
-                        if (ParseAsn(pRoot, pData, dwTagLength, wszPrefix, FALSE))
-                        {
-                            /* We succeeded, this _could_ be ASN, so display it as if it is */
-                            if (!ParseAsn(pRoot, pData, dwTagLength, wszPrefix, TRUE))
-                            {
-                                /* Uhhh, did someone edit the data? */
-                                ConPrintf(StdOut, L"CertUtil: -asn command unexpected failure parsing tag near 0x%x\n", pData - pRoot);
-                                return FALSE;
-                            }
-
-                            /* Move past what we just parsed */
-                            Move(dwTagLength, pData, dwSize);
-                            /* Lie about this so that we don't also print a hexdump */
-                            dwTagLength = 0;
-                        }
-                    }
-                }
-
-                /* Is there any data (left) to print? */
-                if (dwTagLength)
-                {
-                    HexDump(pRoot, pData, dwTagLength, wszPrefix);
-                    ConPuts(StdOut, L"\n");
-
-                    StringCchCatW(wszPrefix, MAX_PATH, L"   ");
-
-                    /* Do we have additional formatters? */
-                    switch (dwTagAndClass)
-                    {
-                    case ASN_TAG_OBJECT_ID:
-                        PrintOID(pRoot, pHeader, pData, dwTagLength, wszPrefix);
-                        break;
-                    default:
-                        break;
-                    }
-                }
-            }
-        }
-
-        wszPrefix[len] = '\0';
-
-        if (!Move(dwTagLength, pData, dwSize))
-        {
-            /* This should not be possible, it was checked before! */
-            return FALSE;
-        }
-    }
-
-    return TRUE;
-}
-
-
-BOOL asn_dump(LPCWSTR Filename)
-{
-    HANDLE hFile = CreateFileW(Filename, GENERIC_READ, FILE_SHARE_READ, NULL,
-                               OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
-
-    if (hFile == INVALID_HANDLE_VALUE)
-    {
-        ConPrintf(StdOut, L"CertUtil: -asn command failed to open: %d\n", GetLastError());
-        return FALSE;
-    }
-
-    DWORD dwSize = GetFileSize(hFile, NULL);
-    if (dwSize == INVALID_FILE_SIZE)
-    {
-        ConPrintf(StdOut, L"CertUtil: -asn command failed to get file size: %d\n", GetLastError());
-        CloseHandle(hFile);
-        return FALSE;
-    }
-
-    if (dwSize == 0)
-    {
-        ConPrintf(StdOut, L"CertUtil: -asn command got an empty file\n");
-        CloseHandle(hFile);
-        return FALSE;
-    }
-
-    PBYTE pData = (PBYTE)LocalAlloc(0, dwSize);
-    if (!pData)
-    {
-        ConPrintf(StdOut, L"CertUtil: -asn command failed to allocate: %d\n", GetLastError());
-        CloseHandle(hFile);
-        return FALSE;
-    }
-
-    DWORD cbRead;
-    BOOL fRead = ReadFile(hFile, pData, dwSize, &cbRead, NULL);
-    DWORD dwErr = GetLastError();
-    CloseHandle(hFile);
-
-    if (!fRead || cbRead != dwSize)
-    {
-        ConPrintf(StdOut, L"CertUtil: -asn command failed to read: %d\n", dwErr);
-        LocalFree(pData);
-        return FALSE;
-    }
-
-    WCHAR Buffer[MAX_PATH] = {0};
-    BOOL fSucceeded = ParseAsn(pData, pData, dwSize, Buffer, TRUE);
-
-    LocalFree(pData);
-    return fSucceeded;
-}
-
--- a/base/applications/cmdutils/certutil/hashfile.cpp
+++ b/base/applications/cmdutils/certutil/hashfile.cpp
@@ -1,8 +1,10 @@
 /*
 * PROJECT:     ReactOS certutil
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CertUtil hashfile implementation
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     CertUtil stub
 * COPYRIGHT:   Copyright 2020 Mark Jansen (mark.jansen@reactos.org)
+ *
+ * Note: Only -hashfile is implemented for now, the rest is not present!
 */

 #include "precomp.h"
@@ -10,7 +12,7 @@
 #include <stdlib.h>


-BOOL hash_file(LPCWSTR Filename)
+static BOOL hash_file(LPCWSTR Filename)
 {
    HCRYPTPROV hProv;
    BOOL bSuccess = FALSE;
@@ -85,3 +87,69 @@ BOOL hash_file(LPCWSTR Filename)
    return bSuccess;
 }

+
+static void print_usage()
+{
+    ConPuts(StdOut, L"Verbs:\n");
+    ConPuts(StdOut, L"  -hashfile           -- Display cryptographic hash over a file\n");
+    ConPuts(StdOut, L"\n");
+    ConPuts(StdOut, L"CertUtil -?           -- Display a list of all verbs\n");
+    ConPuts(StdOut, L"CertUtil -hashfile -? -- Display help text for the 'hashfile' verb\n");
+}
+
+int wmain(int argc, WCHAR *argv[])
+{
+    int n;
+
+    /* Initialize the Console Standard Streams */
+    ConInitStdStreams();
+
+    if (argc == 1) /* i.e. no commandline arguments given */
+    {
+        print_usage();
+        return EXIT_SUCCESS;
+    }
+
+    for (n = 1; n < argc; ++n)
+    {
+        if (!_wcsicmp(argv[n], L"-?"))
+        {
+            print_usage();
+            return EXIT_SUCCESS;
+        }
+        else if (!_wcsicmp(argv[n], L"-hashfile"))
+        {
+            if (argc == 3)
+            {
+                if (!_wcsicmp(argv[n+1], L"-?"))
+                {
+                    print_usage();
+                    return EXIT_SUCCESS;
+                }
+                else
+                {
+                    if (!hash_file(argv[n+1]))
+                    {
+                        /* hash_file prints the failure itself */
+                        return EXIT_FAILURE;
+                    }
+
+                    ConPuts(StdOut, L"CertUtil: -hashfile command completed successfully\n");
+                    return EXIT_SUCCESS;
+                }
+            }
+            else
+            {
+                ConPrintf(StdOut, L"CertUtil: -hashfile expected 1 argument, got %d\n", argc - 2);
+                return EXIT_FAILURE;
+            }
+        }
+        else
+        {
+            ConPrintf(StdOut, L"CertUtil: Unknown verb: %s\n", argv[n]);
+            return EXIT_FAILURE;
+        }
+    }
+
+    return EXIT_SUCCESS;
+}
--- a/base/applications/cmdutils/certutil/certutil.cpp
+++ b/base/applications/cmdutils/certutil/certutil.cpp
@@ -1,107 +0,0 @@
-/*
- * PROJECT:     ReactOS certutil
- * LICENSE:     MIT (https://spdx.org/licenses/MIT)
- * PURPOSE:     CertUtil commandline handling
- * COPYRIGHT:   Copyright 2020 Mark Jansen (mark.jansen@reactos.org)
- *
- * Note: Only -hashfile and -asn are implemented for now, the rest is not present!
- */
-
-#include "precomp.h"
-#include <wincrypt.h>
-#include <stdlib.h>
-
-typedef struct
-{
-    LPCWSTR Name;
-    BOOL (*pfn)(LPCWSTR Filename);
-} Verb;
-
-
-Verb verbs[] = {
-    { L"hashfile", hash_file },
-    { L"asn", asn_dump },
-};
-
-static void print_usage()
-{
-    ConPuts(StdOut, L"Verbs:\n");
-    ConPuts(StdOut, L"  -hashfile           -- Display cryptographic hash over a file\n");
-    ConPuts(StdOut, L"  -asn                -- Display ASN.1 encoding of a file\n");
-    ConPuts(StdOut, L"\n");
-    ConPuts(StdOut, L"CertUtil -?           -- Display a list of all verbs\n");
-    ConPuts(StdOut, L"CertUtil -hashfile -? -- Display help text for the 'hashfile' verb\n");
-}
-
-
-Verb* MatchVerb(LPCWSTR arg)
-{
-    if (arg[0] != '-' && arg[0] != '/')
-        return NULL;
-
-    for (size_t n = 0; n < RTL_NUMBER_OF(verbs); ++n)
-    {
-        if (!_wcsicmp(verbs[n].Name, arg + 1))
-        {
-            return verbs + n;
-        }
-    }
-
-    return NULL;
-}
-
-int wmain(int argc, WCHAR *argv[])
-{
-    int n;
-
-    /* Initialize the Console Standard Streams */
-    ConInitStdStreams();
-
-    if (argc == 1) /* i.e. no commandline arguments given */
-    {
-        print_usage();
-        return EXIT_SUCCESS;
-    }
-
-    for (n = 1; n < argc; ++n)
-    {
-        if (!_wcsicmp(argv[n], L"-?"))
-        {
-            print_usage();
-            return EXIT_SUCCESS;
-        }
-
-        Verb* verb = MatchVerb(argv[n]);
-
-        if (verb)
-        {
-            if (argc != 3)
-            {
-                ConPrintf(StdOut, L"CertUtil: -%s expected 1 argument, got %d\n", verb->Name, argc - 2);
-                return EXIT_FAILURE;
-            }
-
-            if (!_wcsicmp(argv[n+1], L"-?"))
-            {
-                print_usage();
-                return EXIT_SUCCESS;
-            }
-
-            if (!verb->pfn(argv[n+1]))
-            {
-                /* The verb prints the failure */
-                return EXIT_FAILURE;
-            }
-
-            ConPrintf(StdOut, L"CertUtil: -%s command completed successfully\n", verb->Name);
-            return EXIT_SUCCESS;
-        }
-        else
-        {
-            ConPrintf(StdOut, L"CertUtil: Unknown verb: %s\n", argv[n]);
-            return EXIT_FAILURE;
-        }
-    }
-
-    return EXIT_SUCCESS;
-}
--- a/base/applications/cmdutils/certutil/precomp.h
+++ b/base/applications/cmdutils/certutil/precomp.h
@@ -7,14 +7,10 @@

 #include <windef.h>
 #include <winbase.h>
-#include <strsafe.h>
+#include <winreg.h>
+#include <winuser.h>

 #include <conutils.h>


-BOOL hash_file(LPCWSTR Filename);
-BOOL asn_dump(LPCWSTR Filename);
-
-
-
 #endif /* __CERTUTIL_PRECOMP_H */
--- a/base/applications/cmdutils/cscript/CMakeLists.txt
+++ b/base/applications/cmdutils/cscript/CMakeLists.txt
@@ -1,5 +1,5 @@

-add_definitions(-DCSCRIPT_BUILD)
+add_definitions(-DCSCRIPT_BUILD -D__WINESRC__)
 set(wscript_folder ${REACTOS_SOURCE_DIR}/base/applications/cmdutils/wscript)
 include_directories(${wscript_folder})

@@ -13,11 +13,10 @@ 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 oldnames)
+target_link_libraries(cscript uuid wine)
 set_module_type(cscript win32cui UNICODE)
 add_delay_importlibs(cscript shlwapi)
 add_importlibs(cscript shell32 oleaut32 ole32 advapi32 user32 msvcrt kernel32 ntdll)
 add_dependencies(cscript stdole2 cscript_idlheader)
 add_pch(cscript ${wscript_folder}/precomp.h SOURCE)
 add_cd_file(TARGET cscript DESTINATION reactos/system32 FOR all)
-set_wine_module_FIXME(cscript) # CORE-5743: No ARRAY_SIZE macro
--- a/base/applications/cmdutils/doskey/doskey.c
+++ b/base/applications/cmdutils/doskey/doskey.c
@@ -305,8 +305,8 @@ wmain(VOID)
        {
            pszExeName = RemoveQuotes(pArgStart + 9);
        }
-        else if (!_wcsicmp(pArgStart, L"/H") ||
-                 !_wcsicmp(pArgStart, L"/HISTORY"))
+        else if (!wcsicmp(pArgStart, L"/H") ||
+                 !wcsicmp(pArgStart, L"/HISTORY"))
        {
            PrintHistory();
        }
@@ -314,20 +314,20 @@ wmain(VOID)
        {
            SetConsoleNumberOfCommandsW(_wtoi(pArgStart + 10), pszExeName);
        }
-        else if (!_wcsicmp(pArgStart, L"/REINSTALL"))
+        else if (!wcsicmp(pArgStart, L"/REINSTALL"))
        {
            ExpungeConsoleCommandHistoryW(pszExeName);
        }
-        else if (!_wcsicmp(pArgStart, L"/INSERT"))
+        else if (!wcsicmp(pArgStart, L"/INSERT"))
        {
            SetInsert(ENABLE_INSERT_MODE);
        }
-        else if (!_wcsicmp(pArgStart, L"/OVERSTRIKE"))
+        else if (!wcsicmp(pArgStart, L"/OVERSTRIKE"))
        {
            SetInsert(0);
        }
-        else if (!_wcsicmp(pArgStart, L"/M") ||
-                 !_wcsicmp(pArgStart, L"/MACROS"))
+        else if (!wcsicmp(pArgStart, L"/M") ||
+                 !wcsicmp(pArgStart, L"/MACROS"))
        {
            PrintMacros(pszExeName, L"");
        }
@@ -335,7 +335,7 @@ wmain(VOID)
                 !_wcsnicmp(pArgStart, L"/MACROS:", 8))
        {
            LPWSTR exe = RemoveQuotes(wcschr(pArgStart, L':') + 1);
-            if (!_wcsicmp(exe, L"ALL"))
+            if (!wcsicmp(exe, L"ALL"))
                PrintAllMacros();
            else
                PrintMacros(exe, L"");
--- a/base/applications/cmdutils/fc/fc.rc
+++ b/base/applications/cmdutils/fc/fc.rc
@@ -6,9 +6,7 @@
 #define REACTOS_STR_ORIGINAL_FILENAME   "fc.exe"
 #include <reactos/version.rc>

-/* UTF-8 */
-#pragma code_page(65001)
-
+#pragma code_page(65001) /* UTF-8 */
 #ifdef LANGUAGE_BG_BG
    #include "lang/bg-BG.rc"
 #endif
--- a/base/applications/cmdutils/fc/lang/fr-FR.rc
+++ b/base/applications/cmdutils/fc/lang/fr-FR.rc
@@ -2,40 +2,40 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

 STRINGTABLE
 BEGIN
-    IDS_USAGE "Compare deux fichiers ou un ensemble de fichiers et affiche les différences\n\
-entre eux.\n\
+    IDS_USAGE "Compares two files or sets of files and displays the differences between\n\
+them.\n\
 \n\
 FC [/A] [/C] [/L] [/LBn] [/N] [/OFF[LINE]] [/T] [/U] [/W] [/nnnn]\n\
   [drive1:][path1]filename1 [drive2:][path2]filename2\n\
 FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\
 \n\
-  /A         Affiche uniquement la première et la dernière ligne pour chaque ensemble de différences.\n\
-  /B         Effectue une comparaison binaire.\n\
-  /C         Ne tient pas compte de la casse des lettres.\n\
-  /L         Compare les fichiers sous forme de texte ASCII.\n\
-  /LBn       Définit le nombre maximal de différences consécutives\n\
-             au nombre de lignes spécifié (par défaut : 100).\n\
-  /N         Affiche les numéros de ligne sur une comparaison ASCII.\n\
-  /OFF[LINE] N'ignore pas les fichiers ayant l'attribut hors-ligne.\n\
-  /T         Ne transforme pas les tabulations en espaces (par défaut : transformer).\n\
-  /U         Compare les fichiers en tant que fichiers texte UNICODE.\n\
-  /W         Compresse les espaces blancs (tabulations et espaces) pour la comparaison.\n\
-  /nnnn      Spécifie le nombre de lignes consécutives qui doivent correspondre\n\
-             après une différence (par défaut : 2).\n\
+  /A         Displays only first and last lines for each set of differences.\n\
+  /B         Performs a binary comparison.\n\
+  /C         Disregards the case of letters.\n\
+  /L         Compares files as ASCII text.\n\
+  /LBn       Sets the maximum consecutive mismatches to the specified\n\
+             number of lines (default: 100).\n\
+  /N         Displays the line numbers on an ASCII comparison.\n\
+  /OFF[LINE] Doesn't skip files with offline attribute set.\n\
+  /T         Doesn't expand tabs to spaces (default: expand).\n\
+  /U         Compare files as UNICODE text files.\n\
+  /W         Compresses white space (tabs and spaces) for comparison.\n\
+  /nnnn      Specifies the number of consecutive lines that must match\n\
+             after a mismatch (default: 2).\n\
  [drive1:][path1]filename1\n\
-             Spécifie le premier fichier ou ensemble de fichiers à comparer.\n\
+             Specifies the first file or set of files to compare.\n\
  [drive2:][path2]filename2\n\
-             Spécifie le second fichier ou ensemble de fichiers à comparer.\n"
-    IDS_NO_DIFFERENCE "FC: Aucune différence constatée\n"
-    IDS_LONGER_THAN "FC: %ls plus grand que %ls\n"
-    IDS_COMPARING "Compare les fichiers %ls et %ls\n"
-    IDS_OUT_OF_MEMORY "FC: Dépassement de mémoire\n"
-    IDS_CANNOT_READ "FC: Ne peut pas lire depuis %ls\n"
-    IDS_INVALID_SWITCH "FC: Option invalide\n"
-    IDS_CANNOT_OPEN "FC: Ne peut pas ouvrir %ls - Fichier ou répertoire inexistant\n"
-    IDS_NEEDS_FILES "FC: Nombre insuffisant de fichiers spécifiés\n"
-    IDS_CANT_USE_WILDCARD "Les caractères joker ('*' et '?') ne sont pas encore supportés\n"
-    IDS_DIFFERENT "FC: Les fichiers %ls et %ls sont différents\n"
-    IDS_TOO_LARGE "FC: Fichier %ls trop grand\n"
-    IDS_RESYNC_FAILED "La resynchronisation a échoué. Les fichiers sont trop différents.\n"
+             Specifies the second file or set of files to compare.\n"
+    IDS_NO_DIFFERENCE "FC: no differences encountered\n"
+    IDS_LONGER_THAN "FC: %ls longer than %ls\n"
+    IDS_COMPARING "Comparing files %ls and %ls\n"
+    IDS_OUT_OF_MEMORY "FC: Out of memory\n"
+    IDS_CANNOT_READ "FC: cannot read from %ls\n"
+    IDS_INVALID_SWITCH "FC: Invalid Switch\n"
+    IDS_CANNOT_OPEN "FC: cannot open %ls - No such file or folder\n"
+    IDS_NEEDS_FILES "FC: Insufficient number of file specifications\n"
+    IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n"
+    IDS_DIFFERENT "FC: File %ls and %ls are different\n"
+    IDS_TOO_LARGE "FC: File %ls too large\n"
+    IDS_RESYNC_FAILED "Resync failed.  Files are too different.\n"
 END
--- a/base/applications/cmdutils/find/find.rc
+++ b/base/applications/cmdutils/find/find.rc
@@ -9,7 +9,6 @@

 /* UTF-8 */
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_BG_BG
    #include "lang/bg-BG.rc"
 #endif
--- a/base/applications/cmdutils/help/help.rc
+++ b/base/applications/cmdutils/help/help.rc
@@ -12,7 +12,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

 /* UTF-8 */
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_DE_DE
    #include "lang/de-DE.rc"
 #endif
--- a/base/applications/cmdutils/hostname/hostname.c
+++ b/base/applications/cmdutils/hostname/hostname.c
@@ -56,7 +56,7 @@ int wmain(int argc, WCHAR* argv[])
    }
    else
    {
-        if ((_wcsicmp(argv[1], L"-s") == 0) || (_wcsicmp(argv[1], L"/s") == 0))
+        if ((wcsicmp(argv[1], L"-s") == 0) || (wcsicmp(argv[1], L"/s") == 0))
        {
            /* The program doesn't allow the user to set the host name */
            LoadStringW(GetModuleHandle(NULL), IDS_NOSET, Msg, _countof(Msg));
--- a/base/applications/cmdutils/more/more.c
+++ b/base/applications/cmdutils/more/more.c
@@ -176,20 +176,19 @@ PagePrompt(PCON_PAGER Pager, DWORD Done, DWORD Total)
    static WCHAR StrLineAt[80]  = L"";
    static WCHAR StrOptions[80] = L"";
    static WCHAR StrLines[80]   = L"";
-    static BOOL AreStrLoaded = FALSE;

    WCHAR szPercent[80] = L"";
    WCHAR szLineAt[80]  = L"";

    /* Load the prompt strings */
-    if (!AreStrLoaded)
-    {
+    if (!*StrPercent)
        K32LoadStringW(NULL, IDS_CONTINUE_PERCENT, StrPercent, ARRAYSIZE(StrPercent));
+    if (!*StrLineAt)
        K32LoadStringW(NULL, IDS_CONTINUE_LINE_AT, StrLineAt, ARRAYSIZE(StrLineAt));
+    if (!*StrOptions)
        K32LoadStringW(NULL, IDS_CONTINUE_OPTIONS, StrOptions, ARRAYSIZE(StrOptions));
+    if (!*StrLines)
        K32LoadStringW(NULL, IDS_CONTINUE_LINES, StrLines, ARRAYSIZE(StrLines));
-        AreStrLoaded = TRUE;
-    }

    /*
     * Check whether the pager is prompting, but we have actually finished
@@ -487,7 +486,7 @@ Restart:
 * See base/applications/cmdutils/clip/clip.c!IsDataUnicode()
 * and base/applications/notepad/text.c!ReadText() for more details.
 * Also some good code example can be found at:
- * https://github.com/AutoItConsulting/text-encoding-detect
+ * https://github.com/AutoIt/text-encoding-detect
 */
 typedef enum
 {
--- a/base/applications/cmdutils/reg/CMakeLists.txt
+++ b/base/applications/cmdutils/reg/CMakeLists.txt
@@ -2,9 +2,9 @@
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)

+add_definitions(-D__WINESRC__)
 add_executable(reg add.c copy.c delete.c export.c import.c query.c reg.c reg.rc)
 set_module_type(reg win32cui UNICODE)
-target_link_libraries(reg wine oldnames)
+target_link_libraries(reg wine)
 add_importlibs(reg advapi32 advapi32_vista user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all)
-set_wine_module_FIXME(reg) # CORE-5743: No ARRAY_SIZE macro
--- a/base/applications/cmdutils/replace/CMakeLists.txt
+++ b/base/applications/cmdutils/replace/CMakeLists.txt
@@ -1,8 +0,0 @@
-
-include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
-
-add_executable(replace replace.c util.c replace.rc)
-set_module_type(replace win32cui UNICODE)
-target_link_libraries(replace conutils ${PSEH_LIB})
-add_importlibs(replace user32 msvcrt kernel32)
-add_cd_file(TARGET replace DESTINATION reactos/system32 FOR all)
--- a/base/applications/cmdutils/replace/lang/cs-CZ.rc
+++ b/base/applications/cmdutils/replace/lang/cs-CZ.rc
@@ -1,54 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Czech resource file
- * TRANSLATOR:  Copyright 2015 Radek Liška (Black_Fox) <radekliska@gmail.com>
- */
-
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Replaces files.\n\n\
-REPLACE [drive1:][path1]filename [drive2:][path2] [/A] [/P] [/R] [/W]\n\
-REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\
-  [drive1:][path1]filename Specifies the source file or files.\n\
-  [drive2:][path2]         Specifies the directory where files are to be\n\
-                           replaced.\n\
-  /A                       Adds new files to destination directory. Cannot\n\
-                           use with /S or /U switches.\n\
-  /P                       Prompts for confirmation before replacing a file or\n\
-                           adding a source file.\n\
-  /R                       Replaces read-only files as well as unprotected\n\
-                           files.\n\
-  /S                       Replaces files in all subdirectories of the\n\
-                           destination directory. Cannot use with the /A\n\
-                           switch.\n\
-  /W                       Waits for you to insert a disk before beginning.\n\
-  /U                       Replaces (updates) only files that are older than\n\
-                           source files. Cannot use with the /A switch.\n"
-    STRING_REPLACE_HELP2 "Source path required\n"
-    STRING_REPLACE_HELP3 "No files replaced\n"
-    STRING_REPLACE_HELP4 "%lu file(s) replaced\n"
-    STRING_REPLACE_HELP5 "Replacing %s\n"
-    STRING_REPLACE_HELP7 "No files added\n"
-    STRING_REPLACE_HELP8 "%lu file(s) added\n"
-    STRING_REPLACE_HELP9 "Add %s (Y/N)? "
-    STRING_REPLACE_HELP10 "Replace %s (Y/N)? "
-    STRING_REPLACE_HELP11 "Adding %s\n"
-
-    STRING_REPLACE_ERROR1 "Neplatný přepínač - %s\n"
-    STRING_REPLACE_ERROR2 "Cesta nenalezena - %s\n"
-    STRING_REPLACE_ERROR3 "Název souboru, adresáře nebo popisek svazku je neplatný.\n"
-    STRING_REPLACE_ERROR4 "Neplatná kombinace parametrů\n"
-    STRING_REPLACE_ERROR5 "Přístup odepřen - %s\n"
-    STRING_REPLACE_ERROR6 "Nebyly nazeleny žádné soubory - %s\n"
-    STRING_REPLACE_ERROR7 "Rozšířená chyba 32\n"
-
-    STRING_COPY_OPTION "ANV"
-    STRING_COPY_ERROR1 "Chyba: Nelze otevřít zdroj - %s!\n"
-    STRING_COPY_ERROR3 "Chyba při zápisu do cíle!\n"
-    STRING_CONSOLE_ERROR "Neznámá chyba: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Chyba - nedostatek paměti.\n"
-    STRING_ERROR_D_PAUSEMSG "Pokračujte stisknutím libovolné klávesy . . . "
-END
--- a/base/applications/cmdutils/replace/lang/de-DE.rc
+++ b/base/applications/cmdutils/replace/lang/de-DE.rc
@@ -1,56 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     German (Germany) resource file
- * TRANSLATORS: Copyright 2005 Klemens Friedl <frik85@gmail.com>
- *              Copyright 2007 Daniel Reimer <reimer.daniel@freenet.de>
- */
-
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Ersetzt Dateien.\n\n\
-REPLACE [Laufwerk1:][Pfad1]Dateiname [Laufwerk2:][Pfad2] [/A] [/P] [/R] [/W]\n\
-REPLACE [Laufwerk1:][Pfad1]Dateiname [Laufwerk2:][Pfad2] [/P] [/R] [/S] [/W] [/U]\n\n\
-  [Laufwerk1:][Pfad1]Dateiname Bezeichnet die Quelldatei(en).\n\
-  [Laufwerk2:][Pfad2]          Bezeichnet den Pfad in dem die Dateien ersetzt\n\
-                               werden sollen.\n\
-  /A                           Fügt neue Dateien dem Zielpfad hinzu. Kann nicht\n\
-                               mit /S oder /U Parameter genutzt werden.\n\
-  /P                           Wartet auf Bestätigung bevor eine Datei ersetzt\n\
-                               oder eine Quelldatei hinzugefügt wird.\n\
-  /R                           Ersetzt schreibgeschützte Dateien.\n\
-  /S                           Ersetzt Dateien in allen Unterordnern des Ziel-\n\
-                               pfades. Kann nicht mit Parameter /A genutzt\n\
-                               werden.\n\
-  /W                           Wartet vor dem Start, bis ein Datenträger\n\
-                               eingelegt wurde.\n\
-  /U                           Ersetzt (aktualisiert) nur Dateien, die älter\n\
-                               sind als die Quelldaten. Kann nicht mit Parameter\n\
-                               /A genutzt werden.\n"
-    STRING_REPLACE_HELP2 "Quellpfad benötigt\n"
-    STRING_REPLACE_HELP3 "Keine Dateien ersetzt\n"
-    STRING_REPLACE_HELP4 "%lu Datei(en) ersetzt\n"
-    STRING_REPLACE_HELP5 "Ersetze %s\n"
-    STRING_REPLACE_HELP7 "Keine Dateien hinzugefügt\n"
-    STRING_REPLACE_HELP8 "%lu Datei(en) hinzugefügt\n"
-    STRING_REPLACE_HELP9 "Füge %s hinzu (J/N)? "
-    STRING_REPLACE_HELP10 "Ersetze %s (J/N)? "
-    STRING_REPLACE_HELP11 "Füge %s hinzu\n"
-
-    STRING_REPLACE_ERROR1 "Ungültiger Parameter - %s\n"
-    STRING_REPLACE_ERROR2 "Pfad wurde nicht gefunden - %s\n"
-    STRING_REPLACE_ERROR3 "Der Dateiname, Ordnername oder die Syntax der Volumenbezeichung sind inkorrekt.\n"
-    STRING_REPLACE_ERROR4 "Ungültige Parameterkombination\n"
-    STRING_REPLACE_ERROR5 "Zugriff verweigert - %s\n"
-    STRING_REPLACE_ERROR6 "Keine Dateien gefunden - %s\n"
-    STRING_REPLACE_ERROR7 "Erweiterter Fehler 32\n"
-
-    STRING_COPY_OPTION "JNA"
-    STRING_COPY_ERROR1 "Fehler: Quelle kann nicht geöffnet werden - %s!\n"
-    STRING_COPY_ERROR3 "Fehler: Schreibziel!\n"
-    STRING_ERROR_D_PAUSEMSG "Drücken Sie eine beliebige Taste . . . "
-    STRING_CONSOLE_ERROR "Unbekannter Fehler: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Fehler: Zu wenig Speicher verfügbar.\n"
-END
--- a/base/applications/cmdutils/replace/lang/el-GR.rc
+++ b/base/applications/cmdutils/replace/lang/el-GR.rc
@@ -1,54 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Greek resource file
- * TRANSLATOR:  Copyright 2008 Apostolos Alexiadis <djapal@gmail.com>
- */
-
-LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Replaces files.\n\n\
-REPLACE [drive1:][path1]filename [drive2:][path2] [/A] [/P] [/R] [/W]\n\
-REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\
-  [drive1:][path1]filename Specifies the source file or files.\n\
-  [drive2:][path2]         Specifies the directory where files are to be\n\
-                           replaced.\n\
-  /A                       Adds new files to destination directory. Cannot\n\
-                           use with /S or /U switches.\n\
-  /P                       Prompts for confirmation before replacing a file or\n\
-                           adding a source file.\n\
-  /R                       Replaces read-only files as well as unprotected\n\
-                           files.\n\
-  /S                       Replaces files in all subdirectories of the\n\
-                           destination directory. Cannot use with the /A\n\
-                           switch.\n\
-  /W                       Waits for you to insert a disk before beginning.\n\
-  /U                       Replaces (updates) only files that are older than\n\
-                           source files. Cannot use with the /A switch.\n"
-    STRING_REPLACE_HELP2 "Απαιτείται το μονοπάτι-πηγή\n"
-    STRING_REPLACE_HELP3 "Δεν έγινε αντικατάσταση αρχείων\n"
-    STRING_REPLACE_HELP4 "%lu αρχείο(α) αντικαταστάθηκαν\n"
-    STRING_REPLACE_HELP5 "Γίνεται αντικατάσταση του %s\n"
-    STRING_REPLACE_HELP7 "Δεν προστέθηκαν αρχεία\n"
-    STRING_REPLACE_HELP8 "%lu αρχείο(α) προστέθηκαν\n"
-    STRING_REPLACE_HELP9 "Προσθήκη %s (Y/N)? "
-    STRING_REPLACE_HELP10 "Αντικατάσταση %s (Y/N)? "
-    STRING_REPLACE_HELP11 "Γίνεται προσθήκη του %s\n"
-
-    STRING_REPLACE_ERROR1 "Invalid switch - %s\n"
-    STRING_REPLACE_ERROR2 "Δε βρέθηκε το μονοπάτι - %s\n"
-    STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n"
-    STRING_REPLACE_ERROR4 "Invalid parameter combination\n"
-    STRING_REPLACE_ERROR5 "Δεν επιτρέπεται η πρόσβαση - %s\n"
-    STRING_REPLACE_ERROR6 "Δε βρέθηκαν αρχεία - %s\n"
-    STRING_REPLACE_ERROR7 "Extended Error 32\n"
-
-    STRING_COPY_OPTION "YNA"
-    STRING_COPY_ERROR1 "Σφάλμα: Δεν ήταν δυνατό το άνοιγμα της πηγής - %s!\n"
-    STRING_COPY_ERROR3 "Σφάλμα: writing destination!\n"
-    STRING_ERROR_D_PAUSEMSG "Πατήστε οποιοδήποτε πλήκτρο για συνέχεια . . . "
-    STRING_CONSOLE_ERROR "Άγνωστο σφάλμα: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Out of memory error.\n"
-END
--- a/base/applications/cmdutils/replace/lang/en-US.rc
+++ b/base/applications/cmdutils/replace/lang/en-US.rc
@@ -1,54 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     English (United States) resource file
- * TRANSLATOR:  Copyright 2007 Samuel Erdtman <samuel@erdtman.se>
- */
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Replaces files.\n\n\
-REPLACE [drive1:][path1]filename [drive2:][path2] [/A] [/P] [/R] [/W]\n\
-REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\
-  [drive1:][path1]filename Specifies the source file or files.\n\
-  [drive2:][path2]         Specifies the directory where files are to be\n\
-                           replaced.\n\
-  /A                       Adds new files to destination directory. Cannot\n\
-                           use with /S or /U switches.\n\
-  /P                       Prompts for confirmation before replacing a file or\n\
-                           adding a source file.\n\
-  /R                       Replaces read-only files as well as unprotected\n\
-                           files.\n\
-  /S                       Replaces files in all subdirectories of the\n\
-                           destination directory. Cannot use with the /A\n\
-                           switch.\n\
-  /W                       Waits for you to insert a disk before beginning.\n\
-  /U                       Replaces (updates) only files that are older than\n\
-                           source files. Cannot use with the /A switch.\n"
-    STRING_REPLACE_HELP2 "Source path required\n"
-    STRING_REPLACE_HELP3 "No files replaced\n"
-    STRING_REPLACE_HELP4 "%lu file(s) replaced\n"
-    STRING_REPLACE_HELP5 "Replacing %s\n"
-    STRING_REPLACE_HELP7 "No files added\n"
-    STRING_REPLACE_HELP8 "%lu file(s) added\n"
-    STRING_REPLACE_HELP9 "Add %s (Y/N)? "
-    STRING_REPLACE_HELP10 "Replace %s (Y/N)? "
-    STRING_REPLACE_HELP11 "Adding %s\n"
-
-    STRING_REPLACE_ERROR1 "Invalid switch - %s\n"
-    STRING_REPLACE_ERROR2 "Path not found - %s\n"
-    STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n"
-    STRING_REPLACE_ERROR4 "Invalid parameter combination\n"
-    STRING_REPLACE_ERROR5 "Access denied - %s\n"
-    STRING_REPLACE_ERROR6 "No files found - %s\n"
-    STRING_REPLACE_ERROR7 "Extended Error 32\n"
-
-    STRING_COPY_OPTION "YNA"
-    STRING_COPY_ERROR1 "Error: Cannot open source - %s!\n"
-    STRING_COPY_ERROR3 "Error writing destination!\n"
-    STRING_ERROR_D_PAUSEMSG "Press any key to continue . . . "
-    STRING_CONSOLE_ERROR "Unknown error: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Out of memory error.\n"
-END
--- a/base/applications/cmdutils/replace/lang/es-ES.rc
+++ b/base/applications/cmdutils/replace/lang/es-ES.rc
@@ -1,57 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Spanish (Spain) resource file
- * TRANSLATORS: Copyright 2005 Jose Pedro Fernández Pascual <huma2000@terra.es>
- *              Copyright 2015 Ismael Ferreras Morezuelas <swyterzone+ros@gmail.com>
- *              Copyright 2020 Catalin Gabriel Draghita <catalin.draghita@hotmail.es>
- */
-
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Reemplaza archivos.\n\n\
-REPLACE [drive1:][path1]filename [drive2:][path2] [/A] [/P] [/R] [/W]\n\
-REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\
-  [drive1:][path1]filename Especifica el archivo o archivos de origen.\n\
-  [drive2:][path2]         Especifica el nombre de la carpeta donde se\n\
-                           reemplacen los archivos.\n\
-  /A                       Añade nuevos archivos al directorio destino. No\n\
-                           se puede usar con las opciones /S o /U.\n\
-  /P                       Pregunta para confirmación antes de reemplazar un\n\
-                           archivo o añadir un archivo origen.\n\
-  /R                       Reemplaza todos los archivos solo lectura y los\n\
-                           archivos no protegidos.\n\
-  /S                       Reemplaza todos los archivos en todos los\n\
-                           subdirectorios\n\
-                           del directorio destino. No se puede usar con la opción /A.\n\
-  /W                       Espera que insertes un disco antes de empezar.\n\
-  /U                       Reemplaza (actualiza) solo los archivos que son más\n\
-                           antiguos que los de origen. No se puede usar con\n\
-                           la opción /A.\n"
-    STRING_REPLACE_HELP2 "Ruta de origen requerida\n"
-    STRING_REPLACE_HELP3 "No se han reemplazado archivos\n"
-    STRING_REPLACE_HELP4 "Se han reemplazado %lu archivo(s)\n"
-    STRING_REPLACE_HELP5 "Reemplazando %s\n"
-    STRING_REPLACE_HELP7 "No se han añadido archivos\n"
-    STRING_REPLACE_HELP8 "%lu archivo(s) añadidos\n"
-    STRING_REPLACE_HELP9 "Añadir %s (S/N)? "
-    STRING_REPLACE_HELP10 "Reemplazar %s (S/N)? "
-    STRING_REPLACE_HELP11 "Añadiendo %s\n"
-
-    STRING_REPLACE_ERROR1 "Argumento no válido - %s\n"
-    STRING_REPLACE_ERROR2 "Ruta no encontrada - %s\n"
-    STRING_REPLACE_ERROR3 "La sintaxis del nombre de archivo, carpeta o volúmen es incorrecta.\n"
-    STRING_REPLACE_ERROR4 "Combinación de parámetros incorrecta\n"
-    STRING_REPLACE_ERROR5 "Acceso denegado - %s\n"
-    STRING_REPLACE_ERROR6 "No se han encontrado archivos - %s\n"
-    STRING_REPLACE_ERROR7 "Error extendido 32\n"
-
-    STRING_COPY_OPTION "SNT"
-    STRING_COPY_ERROR1 "Error: No se puede abrir el origen - %s!\n"
-    STRING_COPY_ERROR3 "¡Error escribiendo destino!\n"
-    STRING_ERROR_D_PAUSEMSG "Pulse una tecla para continuar ... "
-    STRING_CONSOLE_ERROR "Error desconocido: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Error fuera de memoria.\n"
-END
--- a/base/applications/cmdutils/replace/lang/fr-FR.rc
+++ b/base/applications/cmdutils/replace/lang/fr-FR.rc
@@ -1,55 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     French (France) resource file
- * TRANSLATORS: Copyright 2005 Sylvain Pétréolle <spetreolle@yahoo.fr>
- *              Copyright 2007 Pierre Schweitzer <heis_spiter@hotmail.com>
- *              Copyright 2018 Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
- */
-
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Remplace les fichiers.\n\n\
-REPLACE [lecteur1:][chemin1]nomdefichier [lecteur2:][chemin2] [/A] [/P] [/R] [/W]\n\
-REPLACE [lecteur1:][chemin1]nomdefichier [lecteur2:][chemin2] [/P] [/R] [/S] [/W] [/U]\n\n\
-  [lecteur1:][chemin1]nomdefichier Spécifie le ou les fichier(s) source.\n\
-  [lecteur2:][chemin2]             Spécifie le répertoire où les fichiers doivent être\n\
-                                   remplacés.\n\
-  /A                               Ajoute les nouveaux fichiers dans le répertoire de destination. Ne peut\n\
-                                   être utilisé avec /S ou /U.\n\
-  /P                               Demande une confirmation avant de remplacer un fichier ou\n\
-                                   d'ajouter un fichier source.\n\
-  /R                               Remplace les fichiers en lecture-seule aussi bien que les\n\
-                                   fichiers sans protection.\n\
-  /S                               Remplace les fichiers dans tous les sous-répertoires du\n\
-                                   répertoire de destination. Ne peut être utilisé avec /A.\n\
-  /W                               Attend que vous insériez un disque avant de commencer.\n\
-  /U                               Remplace (met à jour) uniquement les fichiers qui sont plus anciens que\n\
-                                   les fichiers sources. Ne peut être utilisé avec /A.\n"
-    STRING_REPLACE_HELP2 "Chemin source requis\n"
-    STRING_REPLACE_HELP3 "Aucun fichier remplacé\n"
-    STRING_REPLACE_HELP4 "%lu fichier(s) remplacé(s)\n"
-    STRING_REPLACE_HELP5 "Remplace %s\n"
-    STRING_REPLACE_HELP7 "Aucun fichier ajouté\n"
-    STRING_REPLACE_HELP8 "%lu fichier(s) ajouté(s)\n"
-    STRING_REPLACE_HELP9 "Ajouter %s (O/N) ? "
-    STRING_REPLACE_HELP10 "Remplacer %s (O/N) ? "
-    STRING_REPLACE_HELP11 "Ajoute %s\n"
-
-    STRING_REPLACE_ERROR1 "Commutateur invalide - %s\n"
-    STRING_REPLACE_ERROR2 "Chemin introuvable - %s\n"
-    STRING_REPLACE_ERROR3 "La syntaxe du nom de fichier, du répertoire, ou du nom de volume est incorrecte.\n"
-    STRING_REPLACE_ERROR4 "Combinaison de paramètres invalide\n"
-    STRING_REPLACE_ERROR5 "Accès refusé - %s\n"
-    STRING_REPLACE_ERROR6 "Aucun fichier trouvé - %s\n"
-    STRING_REPLACE_ERROR7 "Erreur étendue 32\n"
-
-    STRING_COPY_OPTION "ONT"
-    STRING_COPY_ERROR1 "Erreur : Ne peut ouvrir la source - %s !\n"
-    STRING_COPY_ERROR3 "Erreur à l'écriture de la destination !\n"
-    STRING_ERROR_D_PAUSEMSG "Appuyez sur une touche pour continuer . . . "
-    STRING_CONSOLE_ERROR "Erreur inconnue : %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Pas assez de mémoire.\n"
-END
--- a/base/applications/cmdutils/replace/lang/hu-HU.rc
+++ b/base/applications/cmdutils/replace/lang/hu-HU.rc
@@ -1,53 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Hungarian resource file
- * TRANSLATORS: Copyright 2005 Robert Horvath <talley@cubeclub.hu>
- *              Copyright 2020 Tibor Lajos Füzi <tibor.fuzi@gmail.com>
- */
-
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Fájlok cseréje.\n\n\
-REPLACE [meghajt1:][útvonal1]fájl [meghajt2:][útvonal2] [/A] [/P] [/R] [/W]\n\
-REPLACE [meghajt1:][útvonal1]fájl [meghajt2:][útvonal2] [/P] [/R] [/S] [/W] [/U]\n\n\
-  [meghajt1:][útvonal1]fájl A forrás fájl vagy fájlok.\n\
-  [meghajt2:][útvonal2]     A cél mappa, ahol a fájlok lecserélődnek.\n\
-  /A                        Új fájlokat ad a cél mappába. Nem lehet\n\
-                            a /S vagy /U kapcsolókkal együtt használni.\n\
-  /P                        Rákérdez fájlcsere vagy fájl hozzáadása előtt.\n\
-  /R                        A csak olvasható fájlokat is ugyanúgy cseréli, mint\n\
-                            a védelem nélküli fájlokat.\n\
-  /S                        Az célmappa összes almappájában cseréli a fájlokat.\n\
-                            Nem lehet a /A kapcsolóval együtt használni.\n\
-  /W                        Lemez behelyezésére vár a kezdés előtt.\n\
-  /U                        Csak azokat a fájlokat cseréli (frissíti), amik\n\
-                            régebbiek mint a forrás fájl.\n\
-                            Nem lehet a /A kapcsolóval együtt használni.\n"
-    STRING_REPLACE_HELP2 "Meg kell adni a forrás útvonalat\n"
-    STRING_REPLACE_HELP3 "Egy fájl sem lett cserélve\n"
-    STRING_REPLACE_HELP4 "%lu fájl lett cserélve\n"
-    STRING_REPLACE_HELP5 "Csere: %s\n"
-    STRING_REPLACE_HELP7 "Egy fájl sem lett hozzáadva\n"
-    STRING_REPLACE_HELP8 "%lu fájl lett hozzáadva\n"
-    STRING_REPLACE_HELP9 "Hozzáadja %s (I/N)? "
-    STRING_REPLACE_HELP10 "Cseréli %s (I/N)? "
-    STRING_REPLACE_HELP11 "Hozzáadás: %s\n"
-
-    STRING_REPLACE_ERROR1 "Érvénytelen kapcsoló - %s\n"
-    STRING_REPLACE_ERROR2 "Útvonal nem található - %s\n"
-    STRING_REPLACE_ERROR3 "A fájlnév, mappanév, vagy kötetcímke szintaxis hibás.\n"
-    STRING_REPLACE_ERROR4 "Érvénytelen paraméter kombináció\n"
-    STRING_REPLACE_ERROR5 "Hozzáférés megtagadva - %s\n"
-    STRING_REPLACE_ERROR6 "Nem találhatóak fájlok - %s\n"
-    STRING_REPLACE_ERROR7 "Kiterjesztett hiba 32\n"
-
-    STRING_COPY_OPTION "INM"
-    STRING_COPY_ERROR1 "Hiba: a forrás nem nyitható meg - %s!\n"
-    STRING_COPY_ERROR3 "Hiba a cél írása közben!\n"
-    STRING_ERROR_D_PAUSEMSG "A folytatáshoz nyomjon meg egy billentyűt . . . "
-    STRING_CONSOLE_ERROR "Ismeretlen hiba: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Nincs elég memória.\n"
-END
--- a/base/applications/cmdutils/replace/lang/id-ID.rc
+++ b/base/applications/cmdutils/replace/lang/id-ID.rc
@@ -1,55 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Indonesian resource file
- * TRANSLATORS: Copyright 2007 Zaenal Mutaqin <ade999@gmail.com>
- *              Copyright 2021 Reinhart Previano Koentjoro <reinhart_previano@yahoo.com>
- */
-
-LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Replaces files.\n\n\
-REPLACE [drive1:][path1]filename [drive2:][path2] [/A] [/P] [/R] [/W]\n\
-REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\
-  [drive1:][path1]filename Specifies the source file or files.\n\
-  [drive2:][path2]         Specifies the directory where files are to be\n\
-                           replaced.\n\
-  /A                       Adds new files to destination directory. Cannot\n\
-                           use with /S or /U switches.\n\
-  /P                       Prompts for confirmation before replacing a file or\n\
-                           adding a source file.\n\
-  /R                       Replaces read-only files as well as unprotected\n\
-                           files.\n\
-  /S                       Replaces files in all subdirectories of the\n\
-                           destination directory. Cannot use with the /A\n\
-                           switch.\n\
-  /W                       Waits for you to insert a disk before beginning.\n\
-  /U                       Replaces (updates) only files that are older than\n\
-                           source files. Cannot use with the /A switch.\n"
-    STRING_REPLACE_HELP2 "Source path required\n"
-    STRING_REPLACE_HELP3 "No files replaced\n"
-    STRING_REPLACE_HELP4 "%lu file(s) replaced\n"
-    STRING_REPLACE_HELP5 "Replacing %s\n"
-    STRING_REPLACE_HELP7 "No files added\n"
-    STRING_REPLACE_HELP8 "%lu file(s) added\n"
-    STRING_REPLACE_HELP9 "Add %s (Y/N)? "
-    STRING_REPLACE_HELP10 "Replace %s (Y/N)? "
-    STRING_REPLACE_HELP11 "Adding %s\n"
-
-    STRING_REPLACE_ERROR1 "Saklar perintah tidak valid - %s\n"
-    STRING_REPLACE_ERROR2 "Alamat file/direktori tidak ditemukan - %s\n"
-    STRING_REPLACE_ERROR3 "Sintaks nama file, direktori, atau label volume tidak benar.\n"
-    STRING_REPLACE_ERROR4 "Kombinasi parameter tidak valid\n"
-    STRING_REPLACE_ERROR5 "Akses ditolak - %s\n"
-    STRING_REPLACE_ERROR6 "No files found - %s\n"
-    STRING_REPLACE_ERROR7 "Extended Error 32\n"
-
-    STRING_COPY_OPTION "YTS"
-    STRING_COPY_ERROR1 "Salah: Tidak dapat membuka sumber - %s!\n"
-    STRING_COPY_ERROR3 "Kesalahan menulis tujuan!\n"
-    STRING_ERROR_D_PAUSEMSG "Tekan tombol untuk melanjutkan . . . "
-    STRING_CONSOLE_ERROR "Kesalahan tidak dikenal: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Kesalahan kekurangan memori.\n"
-END
--- a/base/applications/cmdutils/replace/lang/it-IT.rc
+++ b/base/applications/cmdutils/replace/lang/it-IT.rc
@@ -1,54 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Italian resource file
- * TRANSLATOR:  Copyright 2007-2008 Paolo Devoti <devotip@tiscali.it>
- */
-
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Sostituisce i file.\n\n\
-REPLACE [disco1:][percorso1]nomefile [disco2:][percorso2] [/A] [/P] [/R] [/W]\n\
-REPLACE [disco1:][percorso1]nomefile [disco2:][percorso2] [/P] [/R] [/S] [/W] [/U]\n\n\
-  [drive1:][path1]nomefile Specifica il o i file sorgenti.\n\
-  [disco2:][percorso2]     Specifica la cartella dove i file devono essere\n\
-                           sostituiti.\n\
-  /A                       Aggiunge i file alla cartella di destinazione. Non può\n\
-                           essere usato con /S o /U .\n\
-  /P                       Chiede conferma prima di sostituire o aggiungere\n\
-                           un file.\n\
-  /R                       Sostituisce sia i file in sola lettura che quelli\n\
-                           non protetti.\n\
-  /S                       Sostituisce i file in tutte le sottocartelle\n\
-                           della cartella di destinazione. Non può essere\n\
-                           usato con /A .\n\
-  /W                       Aspetta che sia inserito un disco prima di iniziare.\n\
-  /U                       Sostituisce (aggiorna) solo i file più vecchi\n\
-                           dei file sorgenti. Non può essere usato con /A .\n"
-    STRING_REPLACE_HELP2 "Il percorso sorgente è obbligatorio\n"
-    STRING_REPLACE_HELP3 "Nessun file sostituito\n"
-    STRING_REPLACE_HELP4 "%lu file sostituiti\n"
-    STRING_REPLACE_HELP5 "Sostituzione di %s in corso\n"
-    STRING_REPLACE_HELP7 "Nessun file aggiunto\n"
-    STRING_REPLACE_HELP8 "%lu file aggiunti\n"
-    STRING_REPLACE_HELP9 "Aggiungere %s (S/N)? "
-    STRING_REPLACE_HELP10 "Sostituire %s (S/N)? "
-    STRING_REPLACE_HELP11 "Aggiunta di %s in corso\n"
-
-    STRING_REPLACE_ERROR1 "Parametro non valido - %s\n"
-    STRING_REPLACE_ERROR2 "Percorso non trovato - %s\n"
-    STRING_REPLACE_ERROR3 "Il nome del file, della cartella o della etichetta di volume è errato.\n"
-    STRING_REPLACE_ERROR4 "Combinazione di parametri non valida\n"
-    STRING_REPLACE_ERROR5 "Accesso negato - %s\n"
-    STRING_REPLACE_ERROR6 "Nessun file trovato - %s\n"
-    STRING_REPLACE_ERROR7 "Errore esteso 32\n"
-
-    STRING_COPY_OPTION "SNT"
-    STRING_COPY_ERROR1 "Errore: Impossibile aprire il file sorgente - %s!\n"
-    STRING_COPY_ERROR3 "Errore durante la scrittura della destinazione!\n"
-    STRING_ERROR_D_PAUSEMSG "Premi un tasto per continuare . . . "
-    STRING_CONSOLE_ERROR "Errore sconosciuto: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Errore di memoria esaurita.\n"
-END
--- a/base/applications/cmdutils/replace/lang/ja-JP.rc
+++ b/base/applications/cmdutils/replace/lang/ja-JP.rc
@@ -1,56 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Japanese resource file
- * TRANSLATORS: Copyright 2005 tsk <tsk_n@mail.goo.ne.jp>
- *              Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
- */
-
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "ファイルを置き換えます。\n\n\
-REPLACE [ドライブ1:][パス1]ファイル名 [ドライブ2:][パス2] [/A] [/P] [/R] [/W]\n\
-REPLACE [ドライブ1:][パス1]ファイル名 [ドライブ2:][パス2] [/P] [/R] [/S] [/W]\n\
-        [/U]\n\n\
-  [ドライブ1:][パス1]ファイル名 ソースファイルを指定します(複数可)。\n\
-  [ドライブ2:][パス2]           置き換えるファイルのあるディレクトリを\n\
-                                指定します。\n\
-  /A                            新しいファイルを転送先ディレクトリに追加\n\
-                                します。/S や /U とは一緒には使えません。\n\
-  /P                            置き換えまたは追加の前に確認プロンプトを表示\n\
-                                します。\n\
-  /R                            読み込み専用のファイルを書き込み可能にして\n\
-                                ファイルを置き換えます。\n\
-  /S                            転送先ディレクトリのすべての子ディレクトリ\n\
-                                でファイルを置き換えます。/A と一緒には使え\n\
-                                ません。\n\
-  /W                            開始前にディスクの挿入を待ちます。\n\
-  /U                            転送先の古いファイルのみを置き換えまたは\n\
-                                更新します。/A と一緒には使えません。\n"
-    STRING_REPLACE_HELP2 "ソースパスが必要です。\n"
-    STRING_REPLACE_HELP3 "何も置き換えていません。\n"
-    STRING_REPLACE_HELP4 "%lu 個のファイルを置き換えました。\n"
-    STRING_REPLACE_HELP5 "置き換え中: %s\n"
-    STRING_REPLACE_HELP7 "何も追加していません。\n"
-    STRING_REPLACE_HELP8 "%lu 個のファイルを追加しました。\n"
-    STRING_REPLACE_HELP9 "%s を追加しますか (Y/N) ?"
-    STRING_REPLACE_HELP10 "%s を置き換えますか (Y/N) ?"
-    STRING_REPLACE_HELP11 "追加中: %s\n"
-
-    STRING_REPLACE_ERROR1 "無効なスイッチ - %s\n"
-    STRING_REPLACE_ERROR2 "パスが見つかりません - %s\n"
-    STRING_REPLACE_ERROR3 "ファイル名、ディレクトリ名、ボリュームラベルの文法が不正です。\n"
-    STRING_REPLACE_ERROR4 "無効なパラメータの組み合わせです。\n"
-    STRING_REPLACE_ERROR5 "アクセスが拒否されました - %s\n"
-    STRING_REPLACE_ERROR6 "ファイルが見つかりませんでした - %s\n"
-    STRING_REPLACE_ERROR7 "拡張エラー 32\n"
-
-    STRING_COPY_OPTION "YNA"
-    STRING_COPY_ERROR1 "エラー: 元のファイル %s を開けません!\n"
-    STRING_COPY_ERROR3 "指定先への書き込みでエラーが発生しました!\n"
-    STRING_ERROR_D_PAUSEMSG "続行するには何かキーを押してください . . . "
-    STRING_CONSOLE_ERROR "不明なエラー: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "メモリ不足エラー。\n"
-END
--- a/base/applications/cmdutils/replace/lang/no-NO.rc
+++ b/base/applications/cmdutils/replace/lang/no-NO.rc
@@ -1,55 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Norwegian resource file
- * TRANSLATORS: Copyright 2007 Frode Lillerud (Scalpel78) <frode@enkelt.no>
- *              Copyright 2009 Lars Martin Hambro (LMH1) <lars_martin4@hotmail.com>
- */
-
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Replaces files.\n\n\
-REPLACE [drive1:][path1]filename [drive2:][path2] [/A] [/P] [/R] [/W]\n\
-REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\
-  [drive1:][path1]filename Specifies the source file or files.\n\
-  [drive2:][path2]         Specifies the directory where files are to be\n\
-                           replaced.\n\
-  /A                       Adds new files to destination directory. Cannot\n\
-                           use with /S or /U switches.\n\
-  /P                       Prompts for confirmation before replacing a file or\n\
-                           adding a source file.\n\
-  /R                       Replaces read-only files as well as unprotected\n\
-                           files.\n\
-  /S                       Replaces files in all subdirectories of the\n\
-                           destination directory. Cannot use with the /A\n\
-                           switch.\n\
-  /W                       Waits for you to insert a disk before beginning.\n\
-  /U                       Replaces (updates) only files that are older than\n\
-                           source files. Cannot use with the /A switch.\n"
-    STRING_REPLACE_HELP2 "Source path required\n"
-    STRING_REPLACE_HELP3 "No files replaced\n"
-    STRING_REPLACE_HELP4 "%lu file(s) replaced\n"
-    STRING_REPLACE_HELP5 "Replacing %s\n"
-    STRING_REPLACE_HELP7 "No files added\n"
-    STRING_REPLACE_HELP8 "%lu file(s) added\n"
-    STRING_REPLACE_HELP9 "Add %s (Y/N)? "
-    STRING_REPLACE_HELP10 "Replace %s (Y/N)? "
-    STRING_REPLACE_HELP11 "Adding %s\n"
-
-    STRING_REPLACE_ERROR1 "Invalid switch - %s\n"
-    STRING_REPLACE_ERROR2 "Mappen ble ikke funnet - %s\n"
-    STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n"
-    STRING_REPLACE_ERROR4 "Invalid parameter combination\n"
-    STRING_REPLACE_ERROR5 "Tilgang nektet - %s\n"
-    STRING_REPLACE_ERROR6 "Ingen filer ble funnet - %s\n"
-    STRING_REPLACE_ERROR7 "Extended Error 32\n"
-
-    STRING_COPY_OPTION "YNA"
-    STRING_COPY_ERROR1 "Feil: kan ikke åpne kilden - %s!\n"
-    STRING_COPY_ERROR3 "Feil ved skriving til destinasjon!\n"
-    STRING_ERROR_D_PAUSEMSG "Trykk en tast for å fortsette . . . "
-    STRING_CONSOLE_ERROR "Ukjent feil: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Feil: Minne fullt.\n"
-END
--- a/base/applications/cmdutils/replace/lang/pl-PL.rc
+++ b/base/applications/cmdutils/replace/lang/pl-PL.rc
@@ -1,53 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Polish resource file
- * TRANSLATOR:  Copyright 2007-2011 Olaf Siejka <caemyr@gmail.com>
- */
-
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Zamienia pliki.\n\n\
-REPLACE [napęd1:][ścieżka1] pliki [napęd2:][ścieżka2] [/A] [/P] [/R] [/W]\n\
-REPLACE [napęd1:][ścieżka1] pliki [napęd2:][ścieżka2] [/P] [/R] [/S] [/W] [/U]\n\n\
-  [napęd1:][ścieżka1]nazwa_pliku Wyznacza źródło pliku bądź plików.\n\
-  [napęd2:][ścieżka2]      Wyznacza lokalizacje gdzie pliki mają być\n\
-                           zamienione.\n\
-  /A                       Dodaje nowe pliki do lokalizacji docelowej. Nie można\n\
-                           łączyć z opcjami /S lub /U.\n\
-  /P                       Żąda potwierdzenia przed zamianą istniejącego lub\n\
-                           dodaniem nowego pliku.\n\
-  /R                       Zamienia pliki tylko do odczytu na równi z niezabez-\n\
-                           pieczonymi.\n\
-  /S                       Zamienia pliki we wszystkich podkatalogach w lokazlizacji\n\
-                           docelowej. Nie można łączyć z opcją /A.\n\
-  /W                       Czeka na włożenie dyskietki przed rozpoczęciem zamiany.\n\
-  /U                       Zamienia (aktualizuje) wyłącznie pliki starsze od\n\
-                           źródłowych. Nie można łączyć z opcją /A.\n"
-    STRING_REPLACE_HELP2 "Brak ścieżki do źródła\n"
-    STRING_REPLACE_HELP3 "Nie zamieniono żadnego pliku\n"
-    STRING_REPLACE_HELP4 "Zamieniono %lu plik(i/ów)\n"
-    STRING_REPLACE_HELP5 "Zamiana %s\n"
-    STRING_REPLACE_HELP7 "Nie dodano nowych plików\n"
-    STRING_REPLACE_HELP8 "Dodano %lu plik(i/ów)\n"
-    STRING_REPLACE_HELP9 "Czy dodać %s (T/N)? "
-    STRING_REPLACE_HELP10 "Czy zamienić %s (T/N)? "
-    STRING_REPLACE_HELP11 "Dodawanie %s\n"
-
-    STRING_REPLACE_ERROR1 "Nieprawidłowy parametr - %s\n"
-    STRING_REPLACE_ERROR2 "Ścieżka nie została odnaleziona - %s\n"
-    STRING_REPLACE_ERROR3 "Nazwa pliku, katalogu lub napędu nie jest prawidłowa.\n"
-    STRING_REPLACE_ERROR4 "Nieprawidłowa kombinacja parametrów\n"
-    STRING_REPLACE_ERROR5 "Dostęp zabroniony - %s\n"
-    STRING_REPLACE_ERROR6 "Nie znaleziono plików - %s\n"
-    STRING_REPLACE_ERROR7 "Extended Error 32 -  Błąd współdzielenia\n"
-
-    STRING_COPY_OPTION "TNZ"
-    STRING_COPY_ERROR1 "Błąd: Nie można otworzyć źródła - %s!\n"
-    STRING_COPY_ERROR3 "Błąd zapisu na miejscu docelowym!\n"
-    STRING_ERROR_D_PAUSEMSG "Naciśnij dowolny klawisz, aby kontynuować . . . "
-    STRING_CONSOLE_ERROR "Nieznany błąd: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Błąd - brak pamięci.\n"
-END
--- a/base/applications/cmdutils/replace/lang/pt-BR.rc
+++ b/base/applications/cmdutils/replace/lang/pt-BR.rc
@@ -1,54 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Portuguese (Brazilian) resource file
- * TRANSLATOR:  Copyright 2022 Fernando Isnaldo Silva de Faria <fernando-i@outlook.com>
- */
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Substitui arquivos.\n\n\
-REPLACE [unidade1:][caminho1]arquivo [unidade2:][caminho2][/A][/P][/R][/W]\n\
-REPLACE [unidade1:][caminho1]arquivo [unidade2:][caminho2][/P][/R][/S][/W][/U]\n\n\
-  [unidade1:] [caminho1] arquivo\n\
-                   Especifica o arquivo ou arquivos de origem.\n\
-  [unidade2:] [caminho2]\n\
-                   Especifica o diretório onde os arquivos devem ser\n\
-                   substituídos.\n\
-  /A               Adiciona novos arquivos ao diretório de destino.\n\
-                   Não pode usar com as opções /S ou /U.\n\
-  /P               Solicita confirmação antes de substituir ou adicionar\n\
-                   um arquivo.\n\
-  /R               Substitui arquivos só de leitura e arquivos desprotegidos\n\
-  /S               Substitui os arquivos em todos os subdiretórios do\n\
-                   diretório de destino. Não é possível usar com a opção /A.\n\
-  /W               Espera que insira um disco antes de começar.\n\
-  /U               Substitui (atualiza) apenas os arquivos mais antigos que os\n\
-                   arquivos fonte. Não é possível usar com a opção /A.\n"
-    STRING_REPLACE_HELP2 "Caminho de origem obrigatório\n"
-    STRING_REPLACE_HELP3 "Nenhum arquivo substituído\n"
-    STRING_REPLACE_HELP4 "%lu arquivo(s) substituído(s)\n"
-    STRING_REPLACE_HELP5 "A substituir %s\n"
-    STRING_REPLACE_HELP7 "Nenhum arquivo adicionado\n"
-    STRING_REPLACE_HELP8 "%lu arquivo(s) adicionado(s)\n"
-    STRING_REPLACE_HELP9 "Adicionar %s (S/N)?"
-    STRING_REPLACE_HELP10 "Substituir %s (S/N)?"
-    STRING_REPLACE_HELP11 "A adicionar %s\n"
-
-    STRING_REPLACE_ERROR1 "Opção inválida - %s\n"
-    STRING_REPLACE_ERROR2 "Caminho não encontrado - %s\n"
-    STRING_REPLACE_ERROR3 "O nome do arquivo, nome do diretório ou sintaxe do rótulo do volume está incorreto.\n"
-    STRING_REPLACE_ERROR4 "Combinação de parâmetro inválida\n"
-    STRING_REPLACE_ERROR5 "Acesso negado - %s\n"
-    STRING_REPLACE_ERROR6 "Nenhum arquivo encontrado - %s\n"
-    STRING_REPLACE_ERROR7 "Erro estendido 32\n"
-
-    STRING_COPY_OPTION "SNT"
-    STRING_COPY_ERROR1 "Erro: Não é possível abrir o código - %s!\n"
-    STRING_COPY_ERROR3 "Erro ao escrever destino!\n"
-    STRING_ERROR_D_PAUSEMSG "Pressione qualquer tecla para continuar..."
-    STRING_CONSOLE_ERROR "Erro desconhecido: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Erro de falta de memória.\n"
-END
--- a/base/applications/cmdutils/replace/lang/pt-PT.rc
+++ b/base/applications/cmdutils/replace/lang/pt-PT.rc
@@ -1,54 +0,0 @@
-/*
- * PROJECT:     ReactOS Replace Command
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Portuguese (Portugal) resource file
- * TRANSLATOR:  Copyright 2020 Jose Carlos Jesus <zecarlos1957@hotmail.com>
- */
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-
-STRINGTABLE
-BEGIN
-    STRING_REPLACE_HELP1 "Substitui ficheiros.\n\n\
-REPLACE [unidade1:][caminho1]ficheiro [unidade2:][caminho2][/A][/P][/R][/W]\n\
-REPLACE [unidade1:][caminho1]ficheiro [unidade2:][caminho2][/P][/R][/S][/W][/U]\n\n\
-  [unidade1:] [caminho1] ficheiro\n\
-                   Especifica o ficheiro ou ficheiros de origem.\n\
-  [unidade2:] [caminho2]\n\
-                   Especifica o directório onde os ficheiros devem ser\n\
-                   substituídos.\n\
-  /A               Adiciona novos ficheiros ao directório de destino.\n\
-                   Não pode usar com as opções /S ou /U.\n\
-  /P               Solicita confirmação antes de substituir ou adicionar\n\
-                   um ficheiro.\n\
-  /R               Substitui ficheiros só de leitura e ficheiros desprotegidos\n\
-  /S               Substitui os ficheiros em todos os subdiretórios do\n\
-                   directório de destino. Não é possível usar com a opção /A.\n\
-  /W               Espera que insira um disco antes de começar.\n\
-  /U               Substitui (atualiza) apenas os ficheiros mais antigos que os\n\
-                   arquivos fonte. Não é possível usar com a opção /A.\n"
-    STRING_REPLACE_HELP2 "Caminho de origem obrigatório\n"
-    STRING_REPLACE_HELP3 "Nenhum ficheiro substituído\n"
-    STRING_REPLACE_HELP4 "%lu ficheiro(s) substituído(s)\n"
-    STRING_REPLACE_HELP5 "A substituir %s\n"
-    STRING_REPLACE_HELP7 "Nenhum ficheiro adicionado\n"
-    STRING_REPLACE_HELP8 "%lu ficheiro(s) adicionado(s)\n"
-    STRING_REPLACE_HELP9 "Adicionar %s (S/N)?"
-    STRING_REPLACE_HELP10 "Substituir %s (S/N)?"
-    STRING_REPLACE_HELP11 "A adicionar %s\n"
-
-    STRING_REPLACE_ERROR1 "Opção inválida - %s\n"
-    STRING_REPLACE_ERROR2 "Caminho não encontrado - %s\n"
-    STRING_REPLACE_ERROR3 "O nome do ficheiro, nome do directório ou sintaxe do rótulo do volume está incorrecto.\n"
-    STRING_REPLACE_ERROR4 "Combinação de parâmetro inválida\n"
-    STRING_REPLACE_ERROR5 "Acesso negado - %s\n"
-    STRING_REPLACE_ERROR6 "Nenhum ficheiro encontrado - %s\n"
-    STRING_REPLACE_ERROR7 "Erro estendido 32\n"
-
-    STRING_COPY_OPTION "SNT"
-    STRING_COPY_ERROR1 "Erro: Não é possível abrir o código - %s!\n"
-    STRING_COPY_ERROR3 "Erro ao escrever destino!\n"
-    STRING_ERROR_D_PAUSEMSG "Pressione qualquer tecla para continuar..."
-    STRING_CONSOLE_ERROR "Erro desconhecido: %d\n"
-    STRING_ERROR_OUT_OF_MEMORY "Erro de falta de memória.\n"
-END
--- a/Show More
+++ b/Show More