[CRT] Fix MSVC version of call_handler

[NTOS:MM] Randomly allocate from special pool
[WIN32K:NTUSER] Regularly validate thread window list. CORE-18002
2025-10-08 09:22:51 +02:00 · 2022-01-16 23:31:07 -05:00 · 2022-01-16 23:31:07 -05:00 · 2022-01-16 23:31:07 -05:00 · 2022-01-16 23:30:55 -05:00 · 2022-01-16 23:30:50 -05:00
10832 changed files with 536559 additions and 1123731 deletions
--- 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/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1,2 @@
 custom: ['https://reactos.org/donate/', 'https://www.paypal.me/ReactOS']
+liberapay: ReactOS
--- 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
@@ -1,53 +1,15 @@
 # Labelling by the files touched
-
-ATL:
- changed-files:
-  - any-glob-to-any-file:
-    - sdk/lib/atl/**
-
 drivers:
- changed-files:
-  - any-glob-to-any-file:
-    - drivers/**
-    - sdk/lib/drivers/**
-  - all-globs-to-any-file:
-    - win32ss/drivers/**
-    - '!win32ss/drivers/font/**'
+  - drivers/**
+  - sdk/lib/drivers/**
+  - any: ["win32ss/drivers/**", "!win32ss/drivers/font/**"]

 freeldr:
- changed-files:
-  - any-glob-to-any-file:
-    - boot/freeldr/**
+  - boot/freeldr/**

 "kernel&hal":
- changed-files:
-  - any-glob-to-any-file:
-    - hal/**
-    - ntoskrnl/**
+  - hal/**
+  - ntoskrnl/**

 ROSTESTS:
- changed-files:
-  - any-glob-to-any-file:
-    - modules/rostests/**
-
-shell:
- changed-files:
-  - any-glob-to-any-file:
-    - base/shell/explorer/**
-    - base/shell/rshell/**
-    - dll/shellext/**
-    - dll/win32/browseui/**
-    - dll/win32/shell32/**
-
-Win32SS:
- changed-files:
-  - any-glob-to-any-file:
-    - win32ss/**
-
-"input method":
- changed-files:
-  - any-glob-to-any-file:
-    - base/ctf/**
-    - win32ss/user/imm32/**
-    - win32ss/user/ntuser/ime.c
-    - win32ss/user/user32/misc/imm.c
+  - modules/rostests/**
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,25 +8,19 @@ jobs:
        compiler: [gcc, clang]
        arch: [i386, amd64]
        config: [Debug, Release]
-        dllver: ['0x502', '0x600']
-        exclude:
-          - dllver: 0x600
-            compiler: clang
-          - 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
      run: |
        gcc -march=native -Q --help=target | grep "\-march= " | awk '{print $NF}'
-        echo march-sha=$(gcc -march=native -Q --help=target | sha1sum | awk '{print $1}') >> $GITHUB_OUTPUT
-        echo git-sha=$(git ls-remote https://github.com/zefklop/RosBE.git | grep unix_amd64 | awk '{print $1}') >> $GITHUB_OUTPUT
+        echo ::set-output name=march-sha::$(gcc -march=native -Q --help=target | sha1sum | awk '{print $1}')
+        echo ::set-output name=git-sha::$(git ls-remote https://github.com/zefklop/RosBE.git | grep unix_amd64 | awk '{print $1}')
        wget https://gist.githubusercontent.com/zefklop/b2d6a0b470c70183e93d5285a03f5899/raw/build_rosbe_ci.sh
    - name: Get RosBE
      id: get_rosbe
-      uses: actions/cache@v4
+      uses: actions/cache@v2
      with:
        path: RosBE-CI
        key: RosBE-CI-${{runner.os}}-${{steps.get_rosbe_spec.outputs.march-sha}}-${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}}
@@ -46,16 +40,16 @@ jobs:
        sudo ./llvm.sh $LLVM_VERSION
        echo "D_CLANG_VERSION=-DCLANG_VERSION=$LLVM_VERSION" >> $GITHUB_ENV
    - name: Source checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
      with:
        path: src
    - name: Set up cache for ccache
-      uses: actions/cache@v4
+      uses: actions/cache@v2
      with:
        path: ccache
-        key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
+        key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        restore-keys: |
-          ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-
+          ccache-${{matrix.compiler}}-${{matrix.arch}}-
    - name: Set ccache settings
      run: |
        echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV
@@ -66,7 +60,7 @@ jobs:
      if: ${{ matrix.compiler == 'gcc' }}
      run: echo "CCACHE_COMPILERCHECK=string:${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}}" >> $GITHUB_ENV
    - name: Configure
-      run: echo 'cmake -S ${{github.workspace}}/src -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DDLL_EXPORT_VERSION=${{matrix.dllver}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{env.D_CLANG_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}}
+      run: echo 'cmake -S ${{github.workspace}}/src -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{env.D_CLANG_VERSION}}' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}}
    - name: Build
      run: echo 'cmake --build ${{github.workspace}}/build -- -k0' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}}
    - name: Generate ISOs
@@ -74,9 +68,9 @@ jobs:
    - name: Print ccache statistics
      run: ccache -s
    - name: Upload ISOs
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
-        name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
+        name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: |
          build/bootcd.iso
          build/livecd.iso
@@ -84,18 +78,14 @@ jobs:
  build-msvc:
    strategy:
      matrix:
-        os: [windows-latest]
-        toolset: ['14','14.2'] # VS 2022, and 2019 (see below)
+        toolset: ['14.2', '14.1'] # VS 2019, 2017
        arch: [i386, amd64]
        config: [Debug, Release]
-        dllver: ['0x502', '0x600']
-        exclude: # Build NT6 ISOs only with the latest toolset when compiled as a debug build
-          - dllver: 0x600
-            toolset: 14.2
-          - dllver: 0x600
-            config: Release
+        include:
+        - arch: i386 # Not compiling on amd64 prompt
+          toolset: '14.0' # VS 2015
      fail-fast: false
-    runs-on: ${{matrix.os}}
+    runs-on: windows-latest
    steps:
    - name: Install ninja
      run: choco install -y ninja
@@ -119,34 +109,34 @@ jobs:
        arch: amd64
        toolset: ${{matrix.toolset}}
    - name: Source checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
      with:
        path: src
    - name: Configure
-      run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DDLL_EXPORT_VERSION=${{matrix.dllver}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1
+      run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1
    - name: Build
-      run: cmake --build build -- -k0
+      run: cmake --build build  -- -k0
    - name: Generate ISOs
      run: cmake --build build --target bootcd --target livecd
    - name: Upload ISOs
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
-        name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
+        name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: |
          build/bootcd.iso
          build/livecd.iso
    - name: Upload debug symbols
      if: ${{ matrix.config == 'Debug' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
-        name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}}
+        name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: build/msvc_pdb

  build-msvc-arm:
    strategy:
      matrix:
-        toolset: ['14','14.2'] # VS 2022, 2019
-        arch: [arm, arm64]
+        toolset: ['14.2', '14.1'] # VS 2019, 2017
+        arch: [arm]
        config: [Debug, Release]
      fail-fast: false
    runs-on: windows-latest
@@ -161,48 +151,30 @@ jobs:
        echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
        echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
    - name: Activate VS cmd (arm)
-      if: ${{ matrix.arch == 'arm' }}
      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' }}
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: amd64_arm64
+        arch: x86_arm
        toolset: ${{matrix.toolset}}
    - name: Source checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
      with:
        path: src
    - name: Configure
      run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1
-    - name: Build base module
-      if: ${{ matrix.arch == 'arm' }}
-      run: cmake --build build --target base/all
+    - name: Build applications
+      run: cmake --build build --target base/applications/all
    - name: Build control panel applets
-      if: ${{ matrix.arch == 'arm' }}
      run: cmake --build build --target dll/cpl/all
    - name: Build rosapps
-      if: ${{ matrix.arch == 'arm' }}
      run: cmake --build build --target modules/rosapps/all
-    - name: Build subsystems
-      if: ${{ matrix.arch == 'arm' }}
-      run: cmake --build build --target subsystems/all
-    - name: Build some applications (arm64)
-      if: ${{ matrix.arch == 'arm64' }}
-      run: cmake --build build --target calc magnify mstsc notepad osk regedit taskmgr winmine wordpad base/applications/screensavers/all -- -k0
    - name: Upload compiled binaries
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
        name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: |
-          build/base
+          build/base/applications
          build/dll/cpl
          build/modules/rosapps
-          build/subsystems
          !**/CMakeFiles
          !**/cmake_install.cmake
          !**/*.asm
@@ -218,12 +190,11 @@ jobs:
          !**/*.tlb
    - name: Upload debug symbols
      if: ${{ matrix.config == 'Debug' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
        name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: build/msvc_pdb

-  # FIXME: Does not boot on toolset 14.1, 14.3+ is untested
  build-clang-cl:
    strategy:
      matrix:
@@ -236,7 +207,7 @@ jobs:
      run: choco install -y ninja
    - name: Install LLVM
      run: |
-        choco install -y --allow-downgrade llvm --version 13.0.1
+        choco install -y llvm
        echo "LLVM_PATH=${env:PROGRAMFILES}\llvm\bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
    - name: Install Flex & Bison
      run: |
@@ -250,17 +221,17 @@ jobs:
      uses: ilammy/msvc-dev-cmd@v1
      with:
        arch: amd64_x86
-        toolset: '14'
+        toolset: '14.1' # latest masm build known to make bootable builds
    - name: Activate VS cmd (amd64)
      if: ${{ matrix.arch == 'amd64' }}
      uses: ilammy/msvc-dev-cmd@v1
      with:
        arch: amd64
-        toolset: '14'
+        toolset: '14.1' # latest masm build known to make bootable builds
    - name: Add LLVM to PATH
      run: echo "${env:LLVM_PATH}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
    - name: Source checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
      with:
        path: src
    - name: Configure
@@ -270,7 +241,7 @@ jobs:
    - name: Generate ISOs
      run: cmake --build build --target bootcd --target livecd
    - name: Upload ISOs
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
        name: reactos-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: |
@@ -278,7 +249,7 @@ jobs:
          build/livecd.iso
    - name: Upload debug symbols
      if: ${{ matrix.config == 'Debug' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
        name: reactos-syms-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
        path: build/msvc_pdb
@@ -298,13 +269,13 @@ jobs:
      uses: ilammy/msvc-dev-cmd@v1
      with:
        arch: amd64_x86
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
      with:
        path: src
    - name: Configure
      run: |
        mkdir build
        cd build
-        cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src
+        cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src
    - name: Build
      run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -6,6 +6,6 @@ jobs:
  triage:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@v3
      with:
-        sync-labels: true
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,32 +0,0 @@
-# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
-#
-# You can adjust the behavior by modifying this file.
-# For more information, see:
-# https://github.com/actions/stale
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: '43 0 * * *'
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-
-    steps:
-    - uses: actions/stale@v9
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        days-before-stale: 120
-        days-before-issue-stale: -1
-        days-before-close: 14
-        days-before-issue-close: -1
-        exempt-all-assignees: true
-        exempt-draft-pr: true
-        stale-pr-message: 'This PR is stale because it received no updates in the last 4 months. Without removing the stale label, or commenting on this ticket it will be closed in 2 weeks.'
-        stale-issue-label: 'no-issue-activity'
-        stale-pr-label: 'no-pr-activity'
-        operations-per-run: 100
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ modules/3rdparty
 modules/[Aa][Hh][Kk]_[Tt]ests
 .cache
 .cproject
-.DS_Store
 .project
 .settings
 .vscode
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,19 +68,12 @@ 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
-    -D_CRT_NON_CONFORMING_SWPRINTFS
-)
+add_definitions(-D__REACTOS__)

 # There doesn't seem to be a standard for __FILE__ being relative or absolute, so detect it at runtime.
 file(RELATIVE_PATH _PATH_PREFIX ${REACTOS_BINARY_DIR} ${REACTOS_SOURCE_DIR})
-if (NOT MSVC AND ((CMAKE_C_COMPILER_ID STREQUAL "GNU") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0")
-               OR (CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0.0")))
+if (GCC AND ((CMAKE_C_COMPILER_ID STREQUAL "GNU") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0")
+    OR ((CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0.0"))))
    # Thankfully, GCC has this
    add_compile_options(-ffile-prefix-map=${REACTOS_SOURCE_DIR}=)
    add_compile_options(-ffile-prefix-map=${_PATH_PREFIX}=)
@@ -143,10 +136,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)
@@ -154,16 +143,15 @@ if(NOT CMAKE_CROSSCOMPILING)
    endif()
    add_subdirectory(sdk/include/host)

-    add_subdirectory(dll/win32/dbghelp)
+    if(NOT MSVC)
+        add_subdirectory(dll/win32/dbghelp)
+    endif()
    add_subdirectory(sdk/tools)
    add_subdirectory(sdk/lib)

-    set(NATIVE_TARGETS asmpp bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb)
+    set(NATIVE_TARGETS 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})
@@ -225,11 +213,19 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
        add_definitions(-DDBG=0)
    endif()

+    if(KDBG)
+        add_definitions(-DKDBG)
+    endif()
+
+    if(_WINKD_)
+        add_definitions(-D_WINKD_)
+    endif()
+
    if(ENABLE_CCACHE)
        message(WARNING "-- Disabling precompiled headers support (ccache).")
        option(PCH "Whether to use precompiled headers" OFF)
        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    elseif(GCC)
        message(WARNING "-- Disabling precompiled headers on GCC by default CORE-17108.")
        option(PCH "Whether to use precompiled headers" OFF)
    else()
@@ -242,15 +238,11 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
                    -D_WIN32_WINNT=0x502
                    -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})
+                    -DMINGW_HAS_SECURE_API=1)

    # Arch Options
    if(ARCH STREQUAL "i386")
-        # clang-cl defines this one for itself
-        if(NOT (MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang"))
+        if(NOT USE_CLANG_CL)
            add_definitions(-D_M_IX86)
        endif()
        add_definitions(-D_X86_ -D__i386__ -Di386)
@@ -262,7 +254,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")
@@ -284,8 +276,6 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
        add_compile_definitions(USE_COMPILER_EXCEPTIONS)
    elseif(ARCH STREQUAL "arm")
        add_compile_definitions(USE_COMPILER_EXCEPTIONS)
-    elseif(ARCH STREQUAL "arm64")
-        add_compile_definitions(USE_COMPILER_EXCEPTIONS)
    endif()

    # Activate support for assembly source files
@@ -322,7 +312,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 +319,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)
@@ -347,15 +334,18 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
    add_subdirectory(sdk/include/xdk)
    add_subdirectory(sdk/include/psdk)
    add_subdirectory(sdk/include/dxsdk)
-    add_subdirectory(sdk/include/reactos)
+    add_subdirectory(sdk/include/reactos/wine)
+    add_subdirectory(sdk/include/reactos/mc)
    add_subdirectory(sdk/include/asm)

-    if(ARCH MATCHES "64$")
-        include(sdk/cmake/baseaddress64.cmake)
-    elseif(NO_ROSSYM)
+    if(NO_ROSSYM)
        include(sdk/cmake/baseaddress_dwarf.cmake)
    elseif(MSVC)
-        include(sdk/cmake/baseaddress_msvc.cmake)
+        if (ARCH STREQUAL "amd64")
+            include(sdk/cmake/baseaddress_msvc_x64.cmake)
+        else()
+            include(sdk/cmake/baseaddress_msvc.cmake)
+        endif()
    else()
        include(sdk/cmake/baseaddress.cmake)
    endif()
--- a/182
+++ b/182
@@ -96,7 +96,7 @@
 # Apisets
 #   M: learn-more, learn_more, Mark Jansen
 #   S: Maintained
-/sdk/lib/apisets/   @learn-more
+/dll/apisets/   @learn-more

 # Application Compatibility subystem
 #   M: learn-more, learn_more, Mark Jansen
@@ -116,79 +116,13 @@
 #   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
 #   R: ThFabba, Thomas Faber
 #   S: Maintained
-/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/psdk/wincon.h                  @HBelusca
-/sdk/include/reactos/wincon_undoc.h         @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
+/sdk/cmake/     @learn-more
+*.cmake         @learn-more

 # File Patch API
 #   M: learn-more, learn_more, Mark Jansen
@@ -205,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
@@ -216,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
@@ -255,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
@@ -289,60 +215,24 @@
 #   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
 #   R: ThFabba, Thomas Faber
 #   S: Maintained
-/modules/rostests/apitests/
+/modules/rostests/apitests/ @learn-more

 # ReactOS Kernel-Mode Tests
 #   M: ThFabba, Thomas Faber
 #   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
@@ -362,27 +252,6 @@
 /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:
 #   R: learn-more, learn_more, Mark Jansen
@@ -403,7 +272,7 @@
 /drivers/filesystems/btrfs/         @HeisSpiter
 /drivers/filesystems/cdfs/          @HeisSpiter
 /drivers/filesystems/ext2/          @HeisSpiter
-/drivers/filesystems/fastfat/       @HeisSpiter
+/drivers/filesystems/fastfat_new/   @HeisSpiter
 /drivers/filesystems/nfs/           @HeisSpiter
 /media/doc/README.FSD               @HeisSpiter
 /sdk/lib/fslib/btrfslib/            @HeisSpiter
@@ -430,34 +299,10 @@
 /modules/rosapps/applications/cmdutils/vfdcmd/  @HeisSpiter
 /modules/rosapps/drivers/vfd/                   @HeisSpiter

-# Win32 Subsystem
-#   M:
-#   R: HBelusca, Hermès Bélusca-Maïto
-#   S: Maintained
-/sdk/include/reactos/winbase_undoc.h        @HBelusca
-/subsystems/win/basesrv/
-/win32ss/user/winsrv/
-/win32ss/user/winsrv/usersrv/harderror.c    @HBelusca
-
-# Win32 Subsystem - File functions
+# 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 - 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
@@ -483,11 +328,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/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,9 +2,9 @@

 There are several ways to contribute to the development of ReactOS. The most often encountered problem is not knowing where to begin or what to do. If you are able to program or understand the technical information that is pertinent to this project, helping the development can be easy.

- [What To Do?](#what-to-do)
- [How To Contribute?](#how-to-contribute)
- [Where To Start?](#where-to-start)
+- [What To Do?](#what-to-do?)
+- [How To Contribute?](#how-to-contribute?)
+- [Where To Start?](#where-to-start?)

 **Legal notice:** If you have seen Microsoft Windows source code, your contribution won't be accepted because of potential copyright violation. Before contributing, you must affirm that the following is true:
 >I hereby swear that I have not used nor seen the source code to any version of the Windows operating system
@@ -63,19 +63,13 @@ Our commit style is defined in a __[commit template]__. Use it as a reference or

 ### Rules and Recommendations

- *Use your __real name__ and __real email__.* We do not accept anonymous code contributions!
-  - Every commit that changes code or translations should have author's full legal name (in latin letters, diacritics allowed).
-  - It's recommended to have the same full name set in GitHub profile (in the [Name field here][GitHub Profile Settings]) that matches one specified in commits.
- There is an exception for media changes, such as changes of art (wallpapers, themes, icons, sounds) and out-of-code documentation.
-  - In these specific cases it's allowed to use a nickname or alias as author's name, and it's recommended to have the same name set in GitHub profile (in the [Name field here][GitHub Profile Settings]) matching one specified in commits.
- In any case the author must use a real e-mail address, this includes git commits (`user.email` setting) and GitHub [e-mail settings][GitHub Email Settings] - the checkbox "Keep my email addresses private" must be unchecked there.
-  - In order to *keep your privacy*, select appropriate "Primary email address" that will be applied to your commits in GitHub [e-mail settings][GitHub Email Settings].
+- *Use your __real name__ and __real email__.* We do not accept anonymous contributions!
 - *Ensure your contribution is properly described.* Include the relevant issue number if applicable.
 - *Put only related changes.* It will make reviewing easier as the reviewer needs to recall less information about the existing source code that is changed.
 - *Search for similar pull requests/patches before submitting.* It may be that a similar pull request or issue was opened previously. Comment and review on that one instead.
 - *Keep your contribution small and focused on the topic.* It can be tempting to fix existing issues as you come across them while reading the source code. Resist the temptation and put in a note in the source code instead, or (even better) put the issue in the issue tracking system.
 - *Respect our __[Coding Style]__ and __[Programming Guidelines]__.*
- *Do not be afraid to ask questions.* Ask our developers in the [chat].
+- *Do not be afraid to ask questions.* Ask our developers on JIRA or [IRC] channel.

 To amend your commit with your name and e-mail (in any case you've forgot to set your name/e-mail) please take a look at this [guide](https://reactos.org/wiki/ReactOS_Git_For_Dummies#Amending_your_commit_with_name.2FE-mail). To set your name/e-mail globally for future commits that you push, [read this](https://reactos.org/wiki/ReactOS_Git_For_Dummies#Assign_commits_with_your_name_.26_E-mail_automatically).

@@ -85,7 +79,7 @@ Finding a good project to start with can be a challenge, because when starting o

 - Find a test that fails, and try to make it succeed: <https://reactos.org/testman/>
 - Look around in JIRA, and if you have problems finding nice projects to start with, there is a label for this: <https://jira.reactos.org/issues/?jql=labels%20%3D%20starter-project>
- Ask for help in the [chat]
+- Ask for help on [IRC]
 - Additionally, there are some tests that cause crashes/hangs, but these might be slightly harder: <https://jira.reactos.org/browse/ROSTESTS-125>

  [clean room reverse engineering]:                              https://en.wikipedia.org/wiki/Clean_room_design
@@ -96,14 +90,12 @@ Finding a good project to start with can be a challenge, because when starting o
  [migration to GitHub]:                                         https://reactos.org/project-news/reactos-repository-migrated-github/
  [humans are terrible at tracking large amount of information]: https://www.eurekalert.org/pub_releases/2005-03/aps-hmc030805.php
  [Pull requests]:                                               https://help.github.com/articles/about-pull-requests/
-  [GitHub Profile Settings]:                                     https://github.com/settings/profile
-  [GitHub Email Settings]:                                       https://github.com/settings/emails
  [tips for reviewing patches]:                                  https://www.drupal.org/patch/review
  [missing functionality]:                                       https://reactos.org/wiki/Missing_ReactOS_Functionality
  [patch]:                                                       https://git-scm.com/docs/git-format-patch
  [Submitting Patches]:                                          https://reactos.org/wiki/Submitting_Patches
  [Coding Style]:                                                https://reactos.org/wiki/Coding_Style
-  [chat]:                                                        https://reactos.org/wiki/Mattermost
+  [IRC]:                                                         https://reactos.org/wiki/Connect_to_the_ReactOS_IRC_Channels
  [Programming Guidelines]:                                      https://reactos.org/wiki/Programming_Guidelines
  [3rd Party Files.txt]:                                         /media/doc/3rd_Party_Files.txt
  [README.WINE]:                                                 /media/doc/README.WINE
--- a/PULL_REQUEST_MANAGEMENT.md
+++ b/PULL_REQUEST_MANAGEMENT.md
@@ -14,17 +14,3 @@ In addition, in order to avoid coming off as rude to helpful contributors, pleas
 - Asking the contributor to do unrelated work
 - Closing without providing a reason
 - Merging with the intention to rewrite that code soon after
-
-Before merging a PR, make sure it follows the [contributing rules](CONTRIBUTING.md#rules-and-recommendations), but more importantly:
- Make sure the author has specified a real e-mail in all PR commits
- If PR contains code or translations, make sure the author has not specified a nickname or alias, but a full legal name in all PR commits
- If PR contains media (wallpapers, themes, icons, sounds) or out-of-code documentation, make sure the author has specified the name or alias in all PR commits
- If PR contains mixed code with media changes, handle it as PR with code
- Important notes before using "Squash and merge" strategy on a PR:
-  - Make sure the author's name in GitHub profile matches one in commits. If this is not the case, ask the author to set it accordingly.
-  - If the author does not want to set the name in GitHub profile:
-    - "no squash merge" label needs to be added to a PR.
-	- Make sure every commit message is formatted correctly as in [.gitmessage](https://github.com/reactos/reactos/blob/master/.gitmessage).
-	- Finally in this case a PR has to be merged either using "Rebase and merge" strategy or manually.
-  - By pressing "Squash and merge" button in a PR you can make sure the author does not use no-reply e-mail -
-  under the commit message there will be a text label saying: `This commit will be authored by <address@email.com>`
--- a/README.md
+++ b/README.md
@@ -7,18 +7,24 @@
 ---

 <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>
+    <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg">
+  </a>
  <a href="https://sourceforge.net/projects/reactos/">
-    <img alt="SourceForge Download" src="https://img.shields.io/sourceforge/dm/reactos.svg?colorB=0688CB"></a>
+    <img alt="SourceForge Download" src="https://img.shields.io/sourceforge/dm/reactos.svg?colorB=0688CB">
+  </a>
  <a href="https://github.com/reactos/reactos/blob/master/COPYING">
-    <img alt="License" src="https://img.shields.io/badge/license-GNU_GPL_2.0-0688CB.svg"></a>
+    <img alt="License" src="https://img.shields.io/badge/license-GNU_GPL_2.0-0688CB.svg">
+  </a>
  <a href="https://reactos.org/donate/">
-    <img alt="Donate" src="https://img.shields.io/badge/%24-donate-E44E4A.svg"></a>
+    <img alt="Donate" src="https://img.shields.io/badge/%24-donate-E44E4A.svg">
+  </a>
  <a href="https://twitter.com/reactos">
-    <img alt="Follow on Twitter" src="https://img.shields.io/twitter/follow/reactos.svg?style=social&label=Follow%20%40reactos"></a>
+    <img alt="Follow on Twitter" src="https://img.shields.io/twitter/follow/reactos.svg?style=social&label=Follow%20%40reactos">
+  </a>
 </p>

 ## Quick Links
@@ -26,7 +32,6 @@
 [Official chat](https://chat.reactos.org/) &bull;
 [Wiki](https://reactos.org/wiki/) &bull;
 [Forum](https://reactos.org/forum/) &bull;
-[Community Discord](https://discord.gg/7knjvhT) &bull;
 [JIRA Bug Tracker](https://jira.reactos.org/issues/) &bull;
 [ReactOS Git mirror](https://git.reactos.org/) &bull;
 [Testman](https://reactos.org/testman/)
@@ -50,7 +55,7 @@ The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/r
 To build the system it is strongly advised to use the _ReactOS Build Environment (RosBE)._
 Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: ["Build Environment"](https://reactos.org/wiki/Build_Environment).

-Alternatively one can use Microsoft Visual C++ (MSVC) version 2019+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B).
+Alternatively one can use Microsoft Visual C++ (MSVC) version 2015+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B).

 See ["Building ReactOS"](https://reactos.org/wiki/Building_ReactOS) article for more details.

@@ -121,10 +126,10 @@ The main development is done on [GitHub](https://github.com/reactos/reactos). We
 There is also an obsolete [SVN archive repository](https://svn.reactos.org/reactos/) that is kept for historical purposes.

 [coverity.badge]:   https://scan.coverity.com/projects/205/badge.svg?flat=1
-[rosbewin.badge]:   https://img.shields.io/badge/RosBE_Windows-2.2.1-0688CB.svg
-[rosbeunix.badge]:  https://img.shields.io/badge/RosBE_Unix-2.2.1-0688CB.svg
+[rosbewin.badge]:   https://img.shields.io/badge/RosBE_Windows-2.2.0-0688CB.svg
+[rosbeunix.badge]:  https://img.shields.io/badge/RosBE_Unix-2.2-0688CB.svg
 [prwelcome.badge]:  https://img.shields.io/badge/PR-welcome-0688CB.svg

 [coverity.link]:    https://scan.coverity.com/projects/205
-[rosbewin.link]:    https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.2.1/
-[rosbeunix.link]:   https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.2.1/
+[rosbewin.link]:    https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.2.0/
+[rosbeunix.link]:   https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.2/
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -1,6 +1,5 @@

 add_subdirectory(applications)
-add_subdirectory(ctf)
 add_subdirectory(services)
 add_subdirectory(setup)
 add_subdirectory(shell)
--- 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)
@@ -22,7 +21,7 @@ add_subdirectory(magnify)
 add_subdirectory(mmc)
 add_subdirectory(mplay32)
 add_subdirectory(msconfig)
-#add_subdirectory(msconfig_new) #excluded from the build because it is significantly more buggy than the old msconfig. see CORE-18067 for examples
+add_subdirectory(msconfig_new)
 add_subdirectory(mscutils)
 add_subdirectory(mshta)
 add_subdirectory(mspaint)
@@ -34,7 +33,6 @@ add_subdirectory(rapps)
 add_subdirectory(rapps_com)
 add_subdirectory(regedit)
 add_subdirectory(regedt32)
-add_subdirectory(runas)
 add_subdirectory(sc)
 add_subdirectory(screensavers)
 add_subdirectory(sdbinst)
--- 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/cacls/lang/ro-RO.rc
+++ b/base/applications/cacls/lang/ro-RO.rc
@@ -1,11 +1,4 @@
-/*
- * PROJECT:     ReactOS CACLS
- * LICENSE:     LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2024 Andrei Miloiu <miloiuandrei@gmail.com>
- */
-
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 STRINGTABLE
@@ -41,7 +34,7 @@ Abrevieri:\n\
   OI - Moștenire obiecte.\n\
        ACE moștenită de fișiere.\n\
   IO - Moștenire simplă.\n\
-        ACE neaplicată folderelor/fișierelor curente.\n"
+        ACE neaplicată dosarelor/fișierelor curente.\n"
    IDS_ABBR_CI "(CI)"
    IDS_ABBR_OI "(OI)"
    IDS_ABBR_IO "(IO)"
--- a/base/applications/cacls/lang/zh-CN.rc
+++ b/base/applications/cacls/lang/zh-CN.rc
@@ -13,13 +13,13 @@ BEGIN
    IDS_HELP "显示或者修改文件的访问控制表\n\n\
 CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
               [/P user:perm [...]] [/D user [...]]\n\
-   filename      显示访问控制表。\n\
+   filename      显示 ACLs。\n\
   /T            更改当前目录及其所有子目录中\n\
                 指定文件的 ACL。\n\
-   /E            编辑访问控制表而不替换。\n\
+   /E            编辑 ACL 而不替换。\n\
   /C            在出现拒绝访问错误时继续。\n\
   /G user:perm  赋予指定用户访问权限。\n\
-                 perm 可以是：R  读取\n\
+                 Perm 可以是: R  读取\n\
                              W  写入\n\
                              C  更改(写入)\n\
                              F  完全控制\n\
@@ -33,7 +33,7 @@ CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
   /D user       拒绝指定用户的访问。\n\
 在命令中可以使用通配符指定多个文件。\n\
 您也可以在命令中指定多个用户。\n\n\
-缩写：\n\
+缩写:\n\
   CI - 容器继承。\n\
        ACE会由目录继承。\n\
   OI - 对象继承。\n\
--- a/base/applications/calc/calc.h
+++ b/base/applications/calc/calc.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __CALC_H__
+#define __CALC_H__

 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -15,7 +16,6 @@
 #include <htmlhelp.h>
 #endif
 #include <limits.h>
-#include <strsafe.h>

 /* RESOURCES */
 #include "resource.h"
@@ -280,3 +280,5 @@ INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
 void ConvExecute(HWND hWnd);
 void ConvAdjust(HWND hWnd, int n_cat);
 void ConvInit(HWND hWnd);
+
+#endif /* __CALC_H__ */
--- 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,22 +1,24 @@
 /* Превод на Български/ Bulgarian translation
- * https://reactos.org/wiki/Bulgarian_translation
+ * http://www.reactos.org/wiki/Bulgarian_translation
+ * FILE: base/applications/calc/lang/bg-BG.rc
+ * Недовършен / Incomplete
 */

 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калкулатор"
+CAPTION "Изчислителят на РеактОС"
 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 |
@@ -150,9 +156,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калкулатор"
+CAPTION "Изчислителян на РеактОС"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -215,9 +221,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Калкулатор"
+CAPTION "Изчислителят на РеактОС"
 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
@@ -325,7 +331,7 @@ BEGIN
        MENUITEM SEPARATOR
        MENUITEM "Градуси\tF2", IDM_VIEW_DEG, CHECKED
        MENUITEM "Радиани\tF3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "Градиани\tF4", IDM_VIEW_GRAD, CHECKED
+        MENUITEM "Градове\tF4", IDM_VIEW_GRAD, CHECKED
        MENUITEM SEPARATOR
        MENUITEM "Разделяне на хилядите", IDM_VIEW_GROUP, CHECKED
    END
@@ -333,7 +339,7 @@ BEGIN
    BEGIN
        MENUITEM "Помощ", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "За ReactOS Calculator", IDM_HELP_ABOUT
+        MENUITEM "За ReactOS Calc", IDM_HELP_ABOUT
    END
 END

@@ -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
@@ -366,7 +372,7 @@ BEGIN
    BEGIN
        MENUITEM "Помощ", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "За ReactOS Calculator", IDM_HELP_ABOUT
+        MENUITEM "За ReactOS Calc", IDM_HELP_ABOUT
    END
 END

@@ -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
@@ -389,7 +395,7 @@ BEGIN
    BEGIN
        MENUITEM "Помощ", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "За ReactOS Calculator", IDM_HELP_ABOUT
+        MENUITEM "За ReactOS Calc", IDM_HELP_ABOUT
    END
 END

@@ -404,7 +410,7 @@ END
 /* About */
 STRINGTABLE
 BEGIN
-    IDS_CALC_NAME "Калкулатор за ReactOS"
+    IDS_CALC_NAME "Изчислителят на РеактОС"
    IDS_AUTHOR "Написано от Carlo Bramini"
 END

@@ -413,7 +419,7 @@ STRINGTABLE
 BEGIN
    IDS_CONV_ANGLE "Ъгъл"
    IDS_CONV_AREA "Площ"
-    IDS_CONV_CONSUMPTION "Разход (двигатели)"
+    IDS_CONV_CONSUMPTION "Потребление (двигатели)"
    IDS_CONV_CURRENCY "Парични единици"
    IDS_CONV_ENERGY "Енергия"
    IDS_CONV_LENGTH "Дължина"
@@ -429,10 +435,10 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
-    IDS_ANGLE_ARCMINUTES "Минути от arc"
-    IDS_ANGLE_ARCSECONDS "Секунди от arc"
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Градуси"
-    IDS_ANGLE_GRADIANS "Градиани"
+    IDS_ANGLE_GRADIANS "Гради"
    IDS_ANGLE_RADIANS "Радиани"
 END

@@ -480,7 +486,7 @@ STRINGTABLE
 BEGIN
    IDS_CONSUMPTION_KM_PER_L "Километри/литър"
    IDS_CONSUMPTION_L_PER_100_KM "Литри/100 километра"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Мили/галон (ВБ)"
+    IDS_CONSUMPTION_MILES_GALLON_UK "Мили/галон (ОК)"
    IDS_CONSUMPTION_MILES_GALLON_US "Мили/галон (САЩ)"
 END

@@ -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 "Испанска песета"
@@ -704,6 +710,6 @@ BEGIN
    IDS_WEIGHT_STONES "Камъни"
    IDS_WEIGHT_TAMLUNG "Tamlung"
    IDS_WEIGHT_TONNES "Тонове"
-    IDS_WEIGHT_TONS_UK "Тонове (ВБ)"
+    IDS_WEIGHT_TONS_UK "Тонове (ОК)"
    IDS_WEIGHT_TONS_US "Тонове (САЩ)"
 END
--- a/base/applications/calc/lang/cs-CZ.rc
+++ b/base/applications/calc/lang/cs-CZ.rc
@@ -1,22 +1,23 @@
-/*
- * 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

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -150,9 +155,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -215,9 +220,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -2,17 +2,17 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -146,9 +150,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -211,9 +215,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -2,17 +2,17 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Αριθμομηχανή"
 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 |
@@ -146,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Αριθμομηχανή"
 MENU IDR_MENU_STANDARD
@@ -211,7 +215,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Αριθμομηχανή"
 MENU IDR_MENU_STANDARD
@@ -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
@@ -2,17 +2,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -146,9 +150,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -211,9 +215,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -8,17 +8,17 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -152,9 +156,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -217,9 +221,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -2,17 +2,17 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -146,9 +150,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -211,9 +215,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -425,8 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
-    IDS_ANGLE_ARCMINUTES "Minute d'arc"
-    IDS_ANGLE_ARCSECONDS "Seconde d'arc"
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Degrés"
    IDS_ANGLE_GRADIANS "Grades"
    IDS_ANGLE_RADIANS "Radians"
@@ -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"
@@ -595,7 +599,7 @@ BEGIN
    IDS_PRESSURE_KILOPASCALS "Kilopascals"
    IDS_PRESSURE_MM_OF_MERCURY "Millimètres de mercure"
    IDS_PRESSURE_PASCALS "Pascals"
-    IDS_PRESSURE_PSI "Livre-force par pouce-carrés"
+    IDS_PRESSURE_PSI "Pounds-force per square inch"
 END

 /* Temperatures */
--- a/base/applications/calc/lang/he-IL.rc
+++ b/base/applications/calc/lang/he-IL.rc
@@ -1,21 +1,21 @@
-/* TRANSLATOR: Baruch Rutman */
+/* Translated by Baruch Rutman */

 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -149,10 +153,10 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -215,10 +219,10 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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,25 +1,26 @@
 /*
 * 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

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -153,9 +158,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -218,9 +223,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -1,712 +0,0 @@
-/*
- * PROJECT:     ReactOS Calc
- * LICENSE:     LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later)
- * PURPOSE:     Indonesian resource file
- * TRANSLATORS: Copyright 2022 Wilson Simanjuntak <wilsontulus5@gmail.com>
- */
-
-LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
-
-/* Dialogs */
-
-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator"
-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
-    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
-    CTEXT "", IDC_TEXT_PARENT, 93, 38, 18, 16, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    CTEXT "", IDC_TEXT_MEMORY, 126, 38, 18, 16, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    PUSHBUTTON "Sta", IDC_BUTTON_STA, 5, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Ave", IDC_BUTTON_AVE, 5, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Sum", IDC_BUTTON_SUM, 5, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "s", IDC_BUTTON_S, 5, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Dat", IDC_BUTTON_DAT, 5, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "F-E", IDC_BUTTON_FE, 38, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "dms", IDC_BUTTON_DMS, 38, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "sin", IDC_BUTTON_SIN, 38, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "cos", IDC_BUTTON_COS, 38, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "tan", IDC_BUTTON_TAN, 38, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "(", IDC_BUTTON_LEFTPAR, 64, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Exp", IDC_BUTTON_EXP, 64, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "x^y", IDC_BUTTON_XeY, 64, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "x^2", IDC_BUTTON_Xe2, 64, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "x^3", IDC_BUTTON_Xe3, 64, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON ")", IDC_BUTTON_RIGHTPAR, 90, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "ln", IDC_BUTTON_LN, 90, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "log", IDC_BUTTON_LOG, 90, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "n!", IDC_BUTTON_NF, 90, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "1/x", IDC_BUTTON_RX, 90, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "MC", IDC_BUTTON_MC, 123, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "MR", IDC_BUTTON_MR, 123, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "MS", IDC_BUTTON_MS, 123, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "M+", IDC_BUTTON_MP, 123, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "pi", IDC_BUTTON_PI, 123, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "7", IDC_BUTTON_7, 156, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "4", IDC_BUTTON_4, 156, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "1", IDC_BUTTON_1, 156, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "0", IDC_BUTTON_0, 156, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "A", IDC_BUTTON_A, 156, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "8", IDC_BUTTON_8, 182, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "5", IDC_BUTTON_5, 182, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "2", IDC_BUTTON_2, 182, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "+/-", IDC_BUTTON_SIGN, 182, 120, 24, 18,BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "B", IDC_BUTTON_B, 182, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "9", IDC_BUTTON_9, 208, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "6", IDC_BUTTON_6, 208, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "3", IDC_BUTTON_3, 208, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON ",", IDC_BUTTON_DOT, 208, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "C", IDC_BUTTON_C, 208, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "/", IDC_BUTTON_DIV, 234, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "*", IDC_BUTTON_MULT, 234, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "-", IDC_BUTTON_SUB, 234, 100, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "+", IDC_BUTTON_ADD, 234, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "D", IDC_BUTTON_D, 234, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Mod", IDC_BUTTON_MOD, 260, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Or", IDC_BUTTON_OR, 260, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Lsh", IDC_BUTTON_LSH, 260, 100, 24, 18, BS_CENTER |
-               BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "=", IDC_BUTTON_EQU, 260, 120, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "E", IDC_BUTTON_E, 260, 140, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "And", IDC_BUTTON_AND, 286, 60, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Xor", IDC_BUTTON_XOR, 286, 80, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Not", IDC_BUTTON_NOT, 286, 100, 24, 18, BS_CENTER |
-               BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Int", IDC_BUTTON_INT, 286, 120, 24, 18, BS_CENTER |
-               BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    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
-    PUSHBUTTON "C", IDC_BUTTON_CANC, 267, 38, 43, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Kembali", IDC_BUTTON_BACK, 177, 38, 43, 18, BS_CENTER |
-               BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 305, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    PUSHBUTTON "C", IDC_BUTTON_CANC, 123, 23, 41, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "CE", IDC_BUTTON_CE, 80, 23, 41, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Kembali", IDC_BUTTON_BACK, 36, 23, 42, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 159, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    PUSHBUTTON "7", IDC_BUTTON_7, 36, 45, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "4", IDC_BUTTON_4, 36, 65, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "1", IDC_BUTTON_1, 36, 85, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "0", IDC_BUTTON_0, 36, 105, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "8", IDC_BUTTON_8, 62, 45, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "5", IDC_BUTTON_5, 62, 65, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "2", IDC_BUTTON_2, 62, 85, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "+/-", IDC_BUTTON_SIGN, 62, 105, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "9", IDC_BUTTON_9, 88, 45, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "6", IDC_BUTTON_6, 88, 65, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "3", IDC_BUTTON_3, 88, 85, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON ",", IDC_BUTTON_DOT, 88, 105, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "/", IDC_BUTTON_DIV, 114, 45, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "*", IDC_BUTTON_MULT, 114, 65, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "-", IDC_BUTTON_SUB, 114, 85, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "+", IDC_BUTTON_ADD, 114, 105, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Sqrt", IDC_BUTTON_SQRT, 140, 45, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "%", IDC_BUTTON_PERCENT, 140, 65, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "1/x", IDC_BUTTON_RX, 140, 85, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "=", IDC_BUTTON_EQU, 140, 105, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    CTEXT "", IDC_TEXT_MEMORY, 8, 24, 18, 16, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    PUSHBUTTON "MC", IDC_BUTTON_MC, 5, 45, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "MR", IDC_BUTTON_MR, 5, 65, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "MS", IDC_BUTTON_MS, 5, 85, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "M+", IDC_BUTTON_MP, 5, 105, 24, 18, BS_CENTER | BS_VCENTER |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kalkulator"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg"
-BEGIN
-    PUSHBUTTON "Konversi", IDC_BUTTON_CONVERT, 35, 105, 76, 17
-    COMBOBOX IDC_COMBO_CATEGORY, 5, 31, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
-             WS_TABSTOP | CBS_SORT
-    LTEXT "Kategori:", IDC_STATIC, 5, 20, 56, 8
-    COMBOBOX IDC_COMBO_FROM, 5, 60, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
-             WS_TABSTOP | CBS_SORT
-    LTEXT "Konversikan dari:", IDC_STATIC, 5, 49, 56, 8
-    COMBOBOX IDC_COMBO_TO, 5, 87, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
-             WS_TABSTOP | CBS_SORT
-    LTEXT "Konversikan ke:", IDC_STATIC, 5, 76, 56, 8
-    CONTROL "C", IDC_BUTTON_CANC, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 276, 24, 40, 17
-    CONTROL "CE", IDC_BUTTON_CE, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 232, 24, 40, 17
-    CONTROL "Kembali", IDC_BUTTON_BACK, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 24, 40,17
-    RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 312, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    CONTROL "7", IDC_BUTTON_7, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 48, 24, 18
-    CONTROL "4", IDC_BUTTON_4, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 67, 24, 18
-    CONTROL "1", IDC_BUTTON_1, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 86, 24, 18
-    CONTROL "0", IDC_BUTTON_0, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 105, 24, 18
-    CONTROL "8", IDC_BUTTON_8, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 214, 48, 24, 18
-    CONTROL "5", IDC_BUTTON_5, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 214, 67, 24, 18
-    CONTROL "2", IDC_BUTTON_2, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 214, 86, 24, 18
-    CONTROL "+/-", IDC_BUTTON_SIGN, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 214, 105, 24, 18
-    CONTROL "9", IDC_BUTTON_9, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 240, 48, 24, 18
-    CONTROL "6", IDC_BUTTON_6, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 240, 67, 24, 18
-    CONTROL "3", IDC_BUTTON_3, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 240, 86, 24, 18
-    CONTROL ",", IDC_BUTTON_DOT, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 240, 105, 24, 18
-    CONTROL "/", IDC_BUTTON_DIV, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 266, 48, 24, 18
-    CONTROL "*", IDC_BUTTON_MULT, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 266, 67, 24, 18
-    CONTROL "-", IDC_BUTTON_SUB, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 266, 86, 24, 18
-    CONTROL "+", IDC_BUTTON_ADD, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 266, 105, 24, 18
-    CONTROL "Sqrt", IDC_BUTTON_SQRT, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 292, 48, 24, 18
-    CONTROL "%", IDC_BUTTON_PERCENT, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 292, 67, 24, 18
-    CONTROL "1/x", IDC_BUTTON_RX, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 292, 86, 24, 18
-    CONTROL "=", IDC_BUTTON_EQU, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 292, 105, 24, 18
-    CTEXT "", IDC_TEXT_MEMORY, 152, 24, 24, 18, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    CONTROL "MC", IDC_BUTTON_MC, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 48, 24, 18
-    CONTROL "MR", IDC_BUTTON_MR, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 67, 24, 18
-    CONTROL "MS", IDC_BUTTON_MS, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 86, 24, 18
-    CONTROL "M+", IDC_BUTTON_MP, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 152, 105, 24, 18
-    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
-END
-
-IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
-STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Kotak statistik"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LISTBOX IDC_LIST_STAT, 4, 4, 156, 40, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "RET", IDC_BUTTON_RET, 4, 48, 36, 16
-    PUSHBUTTON "LOAD", IDC_BUTTON_LOAD, 44, 48, 36, 16
-    PUSHBUTTON "CD", IDC_BUTTON_CD, 84, 48, 36, 16
-    PUSHBUTTON "CAD", IDC_BUTTON_CAD, 124, 48, 36, 16
-    CTEXT "n=0", IDC_TEXT_NITEMS, 4, 68, 156, 12, SS_CENTERIMAGE | SS_SUNKEN
-END
-
-/* Menus */
-
-IDR_MENU_SCIENTIFIC_1 MENU
-BEGIN
-    POPUP "&Ubah"
-    BEGIN
-        MENUITEM "&Salin\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "&Tempel\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "&Lihat"
-    BEGIN
-        MENUITEM "S&tandar", IDM_VIEW_STANDARD
-        MENUITEM "&Ilmiah", IDM_VIEW_SCIENTIFIC
-        MENUITEM "K&onversi", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "&Desimal\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "&Oktal\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "&Biner\tF8", IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "D&erajat\tF2", IDM_VIEW_DEG, CHECKED
-        MENUITEM "&Radian\tF3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "&Gradian\tF4", IDM_VIEW_GRAD, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Grup d&igit", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "&Bantuan"
-    BEGIN
-        MENUITEM "&Topik Bantuan", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "&Tentang Kalkulator ReactOS", IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_SCIENTIFIC_2 MENU
-BEGIN
-    POPUP "&Ubah"
-    BEGIN
-        MENUITEM "&Salin\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "&Tempel\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "&Lihat"
-    BEGIN
-        MENUITEM "S&tandar", IDM_VIEW_STANDARD
-        MENUITEM "&Ilmiah", IDM_VIEW_SCIENTIFIC
-        MENUITEM "K&onversi", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "&Desimal\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "&Oktal\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "&Biner\tF8", IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "&Qword\tF12", IDM_VIEW_QWORD, CHECKED
-        MENUITEM "&Dword\tF2", IDM_VIEW_DWORD, CHECKED
-        MENUITEM "&Word\tF3", IDM_VIEW_WORD, CHECKED
-        MENUITEM "B&yte\tF4", IDM_VIEW_BYTE, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Grup d&igit", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "&Bantuan"
-    BEGIN
-        MENUITEM "&Topik Bantuan", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "&Tentang Kalkulator ReactOS", IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_STANDARD MENU
-BEGIN
-    POPUP "&Ubah"
-    BEGIN
-        MENUITEM "&Salin\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "&Tempel\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "&Lihat"
-    BEGIN
-        MENUITEM "S&tandar", IDM_VIEW_STANDARD
-        MENUITEM "&Ilmiah", IDM_VIEW_SCIENTIFIC
-        MENUITEM "K&onversi", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Grup d&igit", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "&Bantuan"
-    BEGIN
-        MENUITEM "&Topik Bantuan", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "&Tentang Kalkulator ReactOS", IDM_HELP_ABOUT
-    END
-END
-
-/* String Tables */
-
-STRINGTABLE
-BEGIN
-    IDS_MATH_ERROR "Kesalahan"
-    IDS_QUICKHELP "Bantuan cepat"
-END
-
-/* About */
-STRINGTABLE
-BEGIN
-    IDS_CALC_NAME "Kalkulator ReactOS"
-    IDS_AUTHOR "Dibuat oleh Carlo Bramini"
-END
-
-/* Types of conversion */
-STRINGTABLE
-BEGIN
-    IDS_CONV_ANGLE "Sudut"
-    IDS_CONV_AREA "Area"
-    IDS_CONV_CONSUMPTION "Konsumsi (mesin)"
-    IDS_CONV_CURRENCY "Mata Uang"
-    IDS_CONV_ENERGY "Energi"
-    IDS_CONV_LENGTH "Panjang"
-    IDS_CONV_POWER "Daya"
-    IDS_CONV_PRESSURE "Tekanan"
-    IDS_CONV_TEMPERATURE "Suhu"
-    IDS_CONV_TIME "Waktu"
-    IDS_CONV_VELOCITY "Kecepatan"
-    IDS_CONV_VOLUME "Volume"
-    IDS_CONV_WEIGHT "Berat"
-END
-
-/* Angles */
-STRINGTABLE
-BEGIN
-    IDS_ANGLE_ARCMINUTES "Busur menit"
-    IDS_ANGLE_ARCSECONDS "Busur detik"
-    IDS_ANGLE_DEGREES "Derajat"
-    IDS_ANGLE_GRADIANS "Gradian"
-    IDS_ANGLE_RADIANS "Radian"
-END
-
-/* Areas */
-STRINGTABLE
-BEGIN
-    IDS_AREA_ACRES "Hektar"
-    IDS_AREA_ACRES_BRAZIL "Hektar (Brazil)"
-    IDS_AREA_ACRES_FRANCE "Hektar (Perancis)"
-    IDS_AREA_ACRES_SCOTS "Hektar (Skotlandia)"
-    IDS_AREA_ACRES_US "Hektar (US)"
-    IDS_AREA_ARES "Ares"
-    IDS_AREA_CHOU "Chou"
-    IDS_AREA_DANBO "Danbo"
-    IDS_AREA_HECTARES "Hektar"
-    IDS_AREA_JEONGBO "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY "Morgen (Hungaria)"
-    IDS_AREA_MU "Mu"
-    IDS_AREA_PING "Ping"
-    IDS_AREA_PYEONG "Pyeong"
-    IDS_AREA_PYEONGBANGJA "Pyeongbangja"
-    IDS_AREA_RAI "Rai"
-    IDS_AREA_SE "Se"
-    IDS_AREA_SQUARE_CENTIMETERS "Centimeter persegi"
-    IDS_AREA_SQUARE_CHR "Chr persegi"
-    IDS_AREA_SQUARE_FATHOMS "Fathom persegi"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Fathom persegi (Hungaria)"
-    IDS_AREA_SQUARE_FEET "Kaki persegi"
-    IDS_AREA_SQUARE_INCHES "Inci persegi"
-    IDS_AREA_SQUARE_KILOMETERS "Kilometer persegi"
-    IDS_AREA_SQUARE_LAR "Lar persegi"
-    IDS_AREA_SQUARE_METER "Meter persegi"
-    IDS_AREA_SQUARE_MILES "Mil persegi"
-    IDS_AREA_SQUARE_MILLIMETERS "Milimeter persegi"
-    IDS_AREA_SQUARE_SHAKU "Shaku persegi"
-    IDS_AREA_SQUARE_TSUEN "Tsuen persegi"
-    IDS_AREA_SQUARE_VA "Va persegi"
-    IDS_AREA_SQUARE_YARD "Yard persegi"
-    IDS_AREA_TAN "Tan"
-    IDS_AREA_TSUBO "Tsubo"
-END
-
-/* Consumptions */
-STRINGTABLE
-BEGIN
-    IDS_CONSUMPTION_KM_PER_L "Kilometer/liter"
-    IDS_CONSUMPTION_L_PER_100_KM "Liter/100 kilometer"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Mil/galon (UK)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Mil/galon (US)"
-END
-
-/* Currencies */
-STRINGTABLE
-BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Schilling Austria"
-    IDS_CURRENCY_BELGIAN_FRANC "Franc Belgia"
-    IDS_CURRENCY_CYPRIOT_POUND "Pound Siprus"
-    IDS_CURRENCY_CZECH_KORUNA "Koruna Ceko"
-    IDS_CURRENCY_DEUTSCHE_MARK "Mark Jerman"
-    IDS_CURRENCY_DUTCH_GUILDER "Gulden Belanda"
-    IDS_CURRENCY_ESTONIAN_KROON "Kroon Estonia"
-    IDS_CURRENCY_EURO "Euro"
-    IDS_CURRENCY_FINNISH_MARKKA "Markka Finlandia"
-    IDS_CURRENCY_FRENCH_FRANC "Franc Perancis"
-    IDS_CURRENCY_GREEK_DRACHMA "Drakhma Yunani"
-    IDS_CURRENCY_IRISH_POUND "Pound Irlandia"
-    IDS_CURRENCY_ITALIAN_LIRA "Lira Italia"
-    IDS_CURRENCY_LATVIAN_LATS "Lats Latvia"
-    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_SLOVAK_KORUNA "Koruna Slovakia"
-    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar Slovenia"
-    IDS_CURRENCY_SPANISH_PESETA "Peseta Spanyol"
-END
-
-/* Energies */
-STRINGTABLE
-BEGIN
-    IDS_ENERGY_15_C_CALORIES "15 °C Kalori"
-    IDS_ENERGY_BTUS "British Thermal Unit"
-    IDS_ENERGY_ERGS "Erg"
-    IDS_ENERGY_EVS "Voltase elektron"
-    IDS_ENERGY_FOOT_POUNDS "Pon kaki"
-    IDS_ENERGY_IT_CALORIES "Tabel Kalori Internasional"
-    IDS_ENERGY_IT_KILOCALORIES "Tabel Kilokalori Internasional"
-    IDS_ENERGY_JOULES "Joule"
-    IDS_ENERGY_KILOJOULES "Kilojoule"
-    IDS_ENERGY_KILOWATT_HOURS "Kilowatt per jam"
-    IDS_ENERGY_NUTRITION_CALORIES "Kalori pangan"
-    IDS_ENERGY_TH_CALORIES "Kalori termokimia"
-END
-
-/* Lengths */
-STRINGTABLE
-BEGIN
-    IDS_LENGTH_ANGSTROMS "Ångström"
-    IDS_LENGTH_ASTRONOMICAL_UNITS "Satuan astronomi"
-    IDS_LENGTH_BARLEYCORNS "Barleycorn"
-    IDS_LENGTH_CENTIMETERS "Centimeter"
-    IDS_LENGTH_CHAINS_UK "Rantai (UK)"
-    IDS_LENGTH_CHI "Chi"
-    IDS_LENGTH_CHOU "Chou"
-    IDS_LENGTH_CHR "Chr"
-    IDS_LENGTH_CUN "Cun"
-    IDS_LENGTH_FATHOMS "Fathom"
-    IDS_LENGTH_FATHOMS_HUNGARY "Fathom (Hungaria)"
-    IDS_LENGTH_FEET "Kaki"
-    IDS_LENGTH_FURLONGS "Furlong"
-    IDS_LENGTH_GAN "Gan"
-    IDS_LENGTH_HANDS "Tangan"
-    IDS_LENGTH_HUNH "Hunh"
-    IDS_LENGTH_INCHES "Inci"
-    IDS_LENGTH_JA "Ja"
-    IDS_LENGTH_JEONG "Jeong"
-    IDS_LENGTH_KABIET "Kabiet"
-    IDS_LENGTH_KEN "Ken"
-    IDS_LENGTH_KEUB "Keub"
-    IDS_LENGTH_KILOMETERS "Kilometer"
-    IDS_LENGTH_LAR "Lar"
-    IDS_LENGTH_LIGHT_YEARS "Tahun cahaya"
-    IDS_LENGTH_LINKS_UK "Link (UK)"
-    IDS_LENGTH_METERS "Meter"
-    IDS_LENGTH_MICRONS "Mikron"
-    IDS_LENGTH_MILES "Mil"
-    IDS_LENGTH_MILLIMETERS "Milimeter"
-    IDS_LENGTH_NAUTICAL_MILES "Mil laut"
-    IDS_LENGTH_NIEU "Nieu"
-    IDS_LENGTH_PARSECS "Parsec"
-    IDS_LENGTH_PICAS "Pica"
-    IDS_LENGTH_RI_JAPAN "Ri (Jepang)"
-    IDS_LENGTH_RI_KOREA "Ri (Korea)"
-    IDS_LENGTH_RODS "Rod"
-    IDS_LENGTH_SAWK "Sawk"
-    IDS_LENGTH_SEN "Sen"
-    IDS_LENGTH_SHAKU "Shaku"
-    IDS_LENGTH_SPAN "Jengkal"
-    IDS_LENGTH_SUN "Sun"
-    IDS_LENGTH_TSUEN "Tsuen"
-    IDS_LENGTH_VA "Va"
-    IDS_LENGTH_YARDS "Yard"
-    IDS_LENGTH_YOTE "Yote"
-    IDS_LENGTH_ZHANG "Zhang"
-END
-
-/* Powers */
-STRINGTABLE
-BEGIN
-    IDS_POWER_BTUS_PER_MINUTE "British Thermal Unit per menit"
-    IDS_POWER_FPS_PER_MINUTE "Pon Kaki per menit"
-    IDS_POWER_HORSEPOWER "Tenaga kuda"
-    IDS_POWER_KILOWATTS "Kilowatt"
-    IDS_POWER_MEGAWATTS "Megawatt"
-    IDS_POWER_WATTS "Watt"
-END
-
-/* Pressures */
-STRINGTABLE
-BEGIN
-    IDS_PRESSURE_ATMOSPHERES "Atmosfir"
-    IDS_PRESSURE_BARS "Bar"
-    IDS_PRESSURE_HECTOPASCALS "Hektopascal"
-    IDS_PRESSURE_KILOPASCALS "Kilopascal"
-    IDS_PRESSURE_MM_OF_MERCURY "Milimeter merkuri"
-    IDS_PRESSURE_PASCALS "Pascal"
-    IDS_PRESSURE_PSI "Pon per inci persegi"
-END
-
-/* Temperatures */
-STRINGTABLE
-BEGIN
-    IDS_TEMPERATURE_CELSIUS "Celsius"
-    IDS_TEMPERATURE_FAHRENHEIT "Fahrenheit"
-    IDS_TEMPERATURE_KELVIN "Kelvin"
-    IDS_TEMPERATURE_RANKINE "Rankine"
-END
-
-/* Time */
-STRINGTABLE
-BEGIN
-    IDS_TIME_DAYS "Hari"
-    IDS_TIME_HOURS "Jam"
-    IDS_TIME_NANOSECONDS "Nanodetik"
-    IDS_TIME_MICROSECONDS "Mikrodetik"
-    IDS_TIME_MILLISECONDS "Milidetik"
-    IDS_TIME_MINUTES "Menit"
-    IDS_TIME_SECONDS "Detik"
-    IDS_TIME_WEEKS "Minggu"
-    IDS_TIME_YEARS "Tahun"
-END
-
-/* Velocities */
-STRINGTABLE
-BEGIN
-    IDS_VELOCITY_CMS_SECOND "Centimeter/jam"
-    IDS_VELOCITY_FEET_HOUR "Kaki/jam"
-    IDS_VELOCITY_FEET_SECOND "Kaki/detik"
-    IDS_VELOCITY_KILOMETERS_HOUR "Kilometer/jam"
-    IDS_VELOCITY_KNOTS "Knot"
-    IDS_VELOCITY_MACH "Mach"
-    IDS_VELOCITY_METERS_SECOND "Meter/detik"
-    IDS_VELOCITY_MILES_HOUR "Mil/jam"
-END
-
-/* Volumes */
-STRINGTABLE
-BEGIN
-    IDS_VOLUME_BARRELS_UK "Barel (UK)"
-    IDS_VOLUME_BARRELS_OIL "Barel minyak"
-    IDS_VOLUME_BUN "Bun"
-    IDS_VOLUME_BUSHELS_UK "Bushel (UK)"
-    IDS_VOLUME_BUSHELS_US "Bushel (US)"
-    IDS_VOLUME_CUBIC_CENTIMETERS "Centimeter kubik"
-    IDS_VOLUME_CUBIC_FEET "Kaki kubik"
-    IDS_VOLUME_CUBIC_INCHES "Inci Kubik"
-    IDS_VOLUME_CUBIC_METERS "Meter kubik"
-    IDS_VOLUME_CUBIC_YARDS "Yard kubik"
-    IDS_VOLUME_DOE "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK "Ons cairan (UK)"
-    IDS_VOLUME_FLUID_OUNCES_US "Ons cairan (US)"
-    IDS_VOLUME_GALLONS_UK "Galon (UK)"
-    IDS_VOLUME_GALLONS_DRY_US "Galon, beku (US)"
-    IDS_VOLUME_GALLONS_LIQUID_US "Galon, cair (US)"
-    IDS_VOLUME_GOU "Gou"
-    IDS_VOLUME_HOP "Hop"
-    IDS_VOLUME_ICCE "Icce"
-    IDS_VOLUME_KWIAN "Kwian"
-    IDS_VOLUME_LITERS "Liter"
-    IDS_VOLUME_MAL "Mal"
-    IDS_VOLUME_MILLILITERS "Mililiter"
-    IDS_VOLUME_PINTS_UK "Pint (UK)"
-    IDS_VOLUME_PINTS_DRY_US "Pint, beku (US)"
-    IDS_VOLUME_PINTS_LIQUID_US "Pint, cair (US)"
-    IDS_VOLUME_QUARTS_UK "Quart (UK)"
-    IDS_VOLUME_QUARTS_DRY_US "Quart, beku (US)"
-    IDS_VOLUME_QUARTS_LIQUID_US "Quart, cair (US)"
-    IDS_VOLUME_SEKI "Seki"
-    IDS_VOLUME_SYOU "Syou"
-    IDS_VOLUME_TANANLOUNG "Tananloung"
-    IDS_VOLUME_TANG "Tang"
-    IDS_VOLUME_TO "To"
-END
-
-/* Weights */
-STRINGTABLE
-BEGIN
-    IDS_WEIGHT_BAHT "Baht"
-    IDS_WEIGHT_CARATS "Karat"
-    IDS_WEIGHT_CHUNG "Chung"
-    IDS_WEIGHT_DON "Don"
-    IDS_WEIGHT_GEUN "Geun"
-    IDS_WEIGHT_GRAMS "Gram"
-    IDS_WEIGHT_GWAN "Gwan"
-    IDS_WEIGHT_HARB "Harb"
-    IDS_WEIGHT_JIN_CHINA "Jin (China)"
-    IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)"
-    IDS_WEIGHT_KAN "Kan"
-    IDS_WEIGHT_KILOGRAMS "Kilogram"
-    IDS_WEIGHT_KIN "Kin"
-    IDS_WEIGHT_LIANG_CHINA "Liang (China)"
-    IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)"
-    IDS_WEIGHT_MONME "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ons, avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY "Ons, troy"
-    IDS_WEIGHT_POUNDS "Pon"
-    IDS_WEIGHT_QUINTAL_METRIC "Kuintal (metrik)"
-    IDS_WEIGHT_SALOUNG "Saloung"
-    IDS_WEIGHT_STONES "Batu"
-    IDS_WEIGHT_TAMLUNG "Tamlung"
-    IDS_WEIGHT_TONNES "Tonne"
-    IDS_WEIGHT_TONS_UK "Ton (UK)"
-    IDS_WEIGHT_TONS_US "Ton (US)"
-END
--- a/base/applications/calc/lang/it-IT.rc
+++ b/base/applications/calc/lang/it-IT.rc
@@ -2,17 +2,17 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -146,9 +150,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -211,9 +215,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -2,17 +2,17 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -146,9 +150,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -211,9 +215,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -4,17 +4,17 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -148,9 +152,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -213,9 +217,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -2,17 +2,17 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -146,9 +150,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -211,9 +215,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -2,17 +2,17 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -146,9 +150,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -211,9 +215,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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,25 +1,27 @@
 /*
- * 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
+ *    http://www.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

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -153,9 +159,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -218,9 +224,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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,20 +1,20 @@
-/* TRANSLATOR: 2011 mkbu95 <mkbu95@gmail.com> */
+/* Translation and UTF-8 Conversion by mkbu95 <mkbu95@gmail.com> (August, 2011) */

 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -148,9 +152,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -213,9 +217,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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,20 +1,20 @@
-/* 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

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -148,9 +152,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -213,9 +217,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -1,27 +1,23 @@
 /*
- * PROJECT:     ReactOS Calc
- * LICENSE:     LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later)
- * PURPOSE:     Romanian resource file
- * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri@gmail.com>
- *              Copyright 2011-2018 Ștefan Fulea <stefan.fulea@mail.com>
- *              Copyright 2022-2024 Andrei Miloiu <miloiuandrei@gmail.com>
+ * Translators: Petru Dimitriu (petrimetri at gmail dot com)
+ *              Ștefan Fulea (stefan dot fulea at mail dot com)
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculator"
+CAPTION "Minicalculator"
 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,26 +134,30 @@ 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 |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Backspace", IDC_BUTTON_BACK, 177, 38, 43, 18, BS_CENTER |
+    PUSHBUTTON "Înapoi", IDC_BUTTON_BACK, 177, 38, 43, 18, BS_CENTER |
               BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 305, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculator"
+CAPTION "Minicalculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -165,7 +165,7 @@ BEGIN
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    PUSHBUTTON "CE", IDC_BUTTON_CE, 80, 23, 41, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Backspace", IDC_BUTTON_BACK, 36, 23, 42, 18, BS_CENTER | BS_VCENTER |
+    PUSHBUTTON "Înapoi", IDC_BUTTON_BACK, 36, 23, 42, 18, BS_CENTER | BS_VCENTER |
               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
    RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 159, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
    PUSHBUTTON "7", IDC_BUTTON_7, 36, 45, 24, 18, BS_CENTER | BS_VCENTER |
@@ -220,9 +220,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculator"
+CAPTION "Minicalculator"
 MENU IDR_MENU_STANDARD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -240,7 +240,7 @@ BEGIN
            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 276, 24, 40, 17
    CONTROL "CE", IDC_BUTTON_CE, "Button", BS_OWNERDRAW | BS_CENTER |
            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 232, 24, 40, 17
-    CONTROL "Backspace", IDC_BUTTON_BACK, "Button", BS_OWNERDRAW | BS_CENTER |
+    CONTROL "Înapoi", IDC_BUTTON_BACK, "Button", BS_OWNERDRAW | BS_CENTER |
            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 24, 40,17
    RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 312, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
    CONTROL "7", IDC_BUTTON_7, "Button", BS_OWNERDRAW | BS_CENTER |
@@ -314,31 +314,31 @@ IDR_MENU_SCIENTIFIC_1 MENU
 BEGIN
    POPUP "&Editare"
    BEGIN
-        MENUITEM "&Copiere\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "&Lipire\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "&Copiază\tCtrl-C", IDM_EDIT_COPY
+        MENUITEM "&Lipește\tCtrl-V", IDM_EDIT_PASTE
    END
-    POPUP "&Vizualizare"
+    POPUP "&Afișare"
    BEGIN
-        MENUITEM "&Standard", IDM_VIEW_STANDARD
-        MENUITEM "&Ştiinţific", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Co&nversie", IDM_VIEW_CONVERSION
+        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD
+        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Con&versie", IDM_VIEW_CONVERSION
        MENUITEM SEPARATOR
        MENUITEM "&Hexazecimal\tF5", IDM_VIEW_HEX, CHECKED
        MENUITEM "&Zecimal\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "O&ctal\tF7", IDM_VIEW_OCT, CHECKED
+        MENUITEM "&Octal\tF7", IDM_VIEW_OCT, CHECKED
        MENUITEM "&Binar\tF8", IDM_VIEW_BIN, CHECKED
        MENUITEM SEPARATOR
        MENUITEM "&Grade\tF2", IDM_VIEW_DEG, CHECKED
        MENUITEM "&Radiani\tF3", IDM_VIEW_RAD, CHECKED
        MENUITEM "Gra&diani\tF4", IDM_VIEW_GRAD, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "G&ruparea cifrelor", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Grupează &cifrele", IDM_VIEW_GROUP, CHECKED
    END
    POPUP "Aj&utor"
    BEGIN
-        MENUITEM "&Termeni din Ajutor", IDM_HELP_HELP
+        MENUITEM "&Manual…", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "&Despre Calculator ReactOS", IDM_HELP_ABOUT
+        MENUITEM "&Despre…", IDM_HELP_ABOUT
    END
 END

@@ -346,32 +346,32 @@ IDR_MENU_SCIENTIFIC_2 MENU
 BEGIN
    POPUP "&Editare"
    BEGIN
-        MENUITEM "&Copiere\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "&Lipire\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "&Copiază\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "&Lipește\tCTRL-V", IDM_EDIT_PASTE
    END
-    POPUP "&Vizualizare"
+    POPUP "&Afișare"
    BEGIN
-        MENUITEM "&Standard", IDM_VIEW_STANDARD
-        MENUITEM "&Ştiinţific", IDM_VIEW_SCIENTIFIC
-        MENUITEM "G&ruparea cifrelor", IDM_VIEW_CONVERSION
+        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD
+        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Con&versie", IDM_VIEW_CONVERSION
        MENUITEM SEPARATOR
        MENUITEM "&Hexazecimal\tF5", IDM_VIEW_HEX, CHECKED
        MENUITEM "&Zecimal\tF6", IDM_VIEW_DEC, CHECKED
        MENUITEM "&Octal\tF7", IDM_VIEW_OCT, CHECKED
        MENUITEM "&Binar\tF8", IDM_VIEW_BIN, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "&64 de biți\tF12", IDM_VIEW_QWORD, CHECKED
-        MENUITEM "&32 de biți\tF2", IDM_VIEW_DWORD, CHECKED
+        MENUITEM "&64 biți\tF12", IDM_VIEW_QWORD, CHECKED
+        MENUITEM "&32 biți\tF2", IDM_VIEW_DWORD, CHECKED
        MENUITEM "&16 biți\tF3", IDM_VIEW_WORD, CHECKED
        MENUITEM "&8 biți\tF4", IDM_VIEW_BYTE, CHECKED
        MENUITEM SEPARATOR
-        MENUITEM "Gr&uparea cifrelor", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Grupează &cifrele", IDM_VIEW_GROUP, CHECKED
    END
    POPUP "Aj&utor"
    BEGIN
-        MENUITEM "&Termeni din Ajutor", IDM_HELP_HELP
+        MENUITEM "&Manual…", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "&Despre Calculator ReactOS", IDM_HELP_ABOUT
+        MENUITEM "&Despre…", IDM_HELP_ABOUT
    END
 END

@@ -379,22 +379,22 @@ IDR_MENU_STANDARD MENU
 BEGIN
    POPUP "&Editare"
    BEGIN
-        MENUITEM "&Copiere\tCtrl-C", IDM_EDIT_COPY
-        MENUITEM "&Lipire\tCtrl-V", IDM_EDIT_PASTE
+        MENUITEM "&Copiază\tCTRL-C", IDM_EDIT_COPY
+        MENUITEM "&Lipește\tCTRL-V", IDM_EDIT_PASTE
    END
-    POPUP "&Vizualizare"
+    POPUP "&Afișare"
    BEGIN
-        MENUITEM "&Standard", IDM_VIEW_STANDARD
-        MENUITEM "&Ştiinţific", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Co&nversie", IDM_VIEW_CONVERSION
+        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD
+        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC
+        MENUITEM "Con&versie", IDM_VIEW_CONVERSION
        MENUITEM SEPARATOR
-        MENUITEM "Gr&uparea cifrelor", IDM_VIEW_GROUP, CHECKED
+        MENUITEM "Grupează &cifre", IDM_VIEW_GROUP, CHECKED
    END
    POPUP "Aj&utor"
    BEGIN
-        MENUITEM "&Termeni din Ajutor", IDM_HELP_HELP
+        MENUITEM "&Manual…", IDM_HELP_HELP
        MENUITEM SEPARATOR
-        MENUITEM "&Despre Calculator ReactOS", IDM_HELP_ABOUT
+        MENUITEM "&Despre…", IDM_HELP_ABOUT
    END
 END

@@ -403,13 +403,13 @@ END
 STRINGTABLE
 BEGIN
    IDS_MATH_ERROR "Eroare"
-    IDS_QUICKHELP "Termeni din Ajutor"
+    IDS_QUICKHELP "Manual"
 END

 /* About */
 STRINGTABLE
 BEGIN
-    IDS_CALC_NAME "Calculator ReactOS"
+    IDS_CALC_NAME "Minicalculator ReactOS"
    IDS_AUTHOR "Scris de Carlo Bramini"
 END

@@ -434,8 +434,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
-    IDS_ANGLE_ARCMINUTES "Minut de arc"
-    IDS_ANGLE_ARCSECONDS "Secundă de arc"
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Grade"
    IDS_ANGLE_GRADIANS "Gradiani"
    IDS_ANGLE_RADIANS "Radiani"
@@ -466,7 +466,7 @@ BEGIN
    IDS_AREA_SQUARE_FATHOMS "Fathomi pătrați"
    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Fathomi pătrați (Ungaria)"
    IDS_AREA_SQUARE_FEET "Picioare pătrate"
-    IDS_AREA_SQUARE_INCHES "Inci pătrați"
+    IDS_AREA_SQUARE_INCHES "Țoli pătrați"
    IDS_AREA_SQUARE_KILOMETERS "Kilometri pătrați"
    IDS_AREA_SQUARE_LAR "Lar pătrați"
    IDS_AREA_SQUARE_METER "Metri pătrați"
@@ -501,7 +501,7 @@ BEGIN
    IDS_CURRENCY_ESTONIAN_KROON "Coroană estoniană"
    IDS_CURRENCY_EURO "Euro"
    IDS_CURRENCY_FINNISH_MARKKA "Marcă finlandeză"
-    IDS_CURRENCY_FRENCH_FRANC "Franc francez"
+    IDS_CURRENCY_FRENCH_FRANC "Franc framcez"
    IDS_CURRENCY_GREEK_DRACHMA "Drahmă grecească"
    IDS_CURRENCY_IRISH_POUND "Liră irlandeză"
    IDS_CURRENCY_ITALIAN_LIRA "Liră italiană"
@@ -509,7 +509,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ă"
@@ -520,7 +520,7 @@ STRINGTABLE
 BEGIN
    IDS_ENERGY_15_C_CALORIES "Calorii 15 °C"
    IDS_ENERGY_BTUS "Unități termale britanice"
-    IDS_ENERGY_ERGS "Ergi"
+    IDS_ENERGY_ERGS "Erg"
    IDS_ENERGY_EVS "Electroni-Volt"
    IDS_ENERGY_FOOT_POUNDS "Picioare-Livră"
    IDS_ENERGY_IT_CALORIES "Calorii Tabel Internațional"
@@ -551,7 +551,7 @@ BEGIN
    IDS_LENGTH_GAN "Gan"
    IDS_LENGTH_HANDS "Palme"
    IDS_LENGTH_HUNH "Hunh"
-    IDS_LENGTH_INCHES "Inci"
+    IDS_LENGTH_INCHES "Țoli"
    IDS_LENGTH_JA "Ja"
    IDS_LENGTH_JEONG "Jeong"
    IDS_LENGTH_KABIET "Kabiet"
@@ -588,7 +588,7 @@ END
 STRINGTABLE
 BEGIN
    IDS_POWER_BTUS_PER_MINUTE "Unități termice britanice pe minut"
-    IDS_POWER_FPS_PER_MINUTE "Picior-lire pe minut"
+    IDS_POWER_FPS_PER_MINUTE "Picior-livre pe minut"
    IDS_POWER_HORSEPOWER "Cai putere"
    IDS_POWER_KILOWATTS "Kilowați"
    IDS_POWER_MEGAWATTS "Megawați"
@@ -604,7 +604,7 @@ BEGIN
    IDS_PRESSURE_KILOPASCALS "Kilopascali"
    IDS_PRESSURE_MM_OF_MERCURY "Milimetri coloană de mercur"
    IDS_PRESSURE_PASCALS "Pascali"
-    IDS_PRESSURE_PSI "Livre-forță pe inci pătrați"
+    IDS_PRESSURE_PSI "Livre-forță pe țol pătrat"
 END

 /* Temperatures */
@@ -653,7 +653,7 @@ BEGIN
    IDS_VOLUME_BUSHELS_US "Bushel (SUA)"
    IDS_VOLUME_CUBIC_CENTIMETERS "Centrimetri cubi"
    IDS_VOLUME_CUBIC_FEET "Picioare^3"
-    IDS_VOLUME_CUBIC_INCHES "Inci cubi"
+    IDS_VOLUME_CUBIC_INCHES "Țoli cubi"
    IDS_VOLUME_CUBIC_METERS "Metri cubi"
    IDS_VOLUME_CUBIC_YARDS "Yarzi cubi"
    IDS_VOLUME_DOE "Doe"
@@ -704,11 +704,11 @@ BEGIN
    IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Uncii, avoirdupois"
    IDS_WEIGHT_OUNCES_TROY "Uncii, troy"
    IDS_WEIGHT_POUNDS "Livre"
-    IDS_WEIGHT_QUINTAL_METRIC "Quintale (metric)"
+    IDS_WEIGHT_QUINTAL_METRIC "Chintale (metric)"
    IDS_WEIGHT_SALOUNG "Saloung"
    IDS_WEIGHT_STONES "Stones"
    IDS_WEIGHT_TAMLUNG "Tamlung"
-    IDS_WEIGHT_TONNES "Tone"
+    IDS_WEIGHT_TONNES "Tonni"
    IDS_WEIGHT_TONS_UK "Tone (Marea Britanie)"
    IDS_WEIGHT_TONS_US "Tone (SUA)"
 END
--- a/base/applications/calc/lang/ru-RU.rc
+++ b/base/applications/calc/lang/ru-RU.rc
@@ -2,17 +2,17 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 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
@@ -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 |
@@ -146,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Калькулятор ReactOS"
 MENU IDR_MENU_STANDARD
@@ -211,7 +215,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Калькулятор ReactOS"
 MENU IDR_MENU_STANDARD
@@ -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
@@ -425,8 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
-    IDS_ANGLE_ARCMINUTES "Угловая минута"
-    IDS_ANGLE_ARCSECONDS "Угловая секунда"
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "градус"
    IDS_ANGLE_GRADIANS "град"
    IDS_ANGLE_RADIANS "радиан"
@@ -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 "&" ?
 */

@@ -6,17 +9,17 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -150,9 +157,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -215,9 +222,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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,21 +1,22 @@
-/* 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

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -149,9 +154,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -214,9 +219,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
 */
@@ -8,17 +9,17 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -152,9 +157,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -217,9 +222,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -2,17 +2,17 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -146,7 +150,7 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "สถานภาพทั่วไป"
 MENU IDR_MENU_STANDARD
@@ -211,9 +215,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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,23 +1,23 @@
 /* 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

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -151,9 +155,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -216,9 +220,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
 */

@@ -9,17 +10,17 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -153,9 +158,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -218,9 +223,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -1,26 +1,20 @@
-/*
- * PROJECT:     ReactOS Calc
- * LICENSE:     LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later)
- * PURPOSE:     Chinese (Simplified) resource file
- * TRANSLATORS: Copyright 2011 Song Fuchang (0xfc) <sfc_0@yahoo.com.cn>
- *              Copyright 2021 Wu Haotian <rigoligo03@gmail.com>
- */
+/* Simplified Chinese translation for calc. By Song Fuchang (0xfc) <sfc_0@yahoo.com.cn> */

 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 +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 "四字", 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 |
@@ -154,9 +152,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -219,22 +217,22 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "计算器"
+CAPTION "ReactOS 计算器"
 MENU IDR_MENU_STANDARD
 FONT 9, "宋体"
 BEGIN
    PUSHBUTTON "转换", IDC_BUTTON_CONVERT, 35, 105, 76, 17
    COMBOBOX IDC_COMBO_CATEGORY, 5, 31, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
             WS_TABSTOP | CBS_SORT
-    LTEXT "类别：", IDC_STATIC, 5, 20, 56, 8
+    LTEXT "类别:", IDC_STATIC, 5, 20, 56, 8
    COMBOBOX IDC_COMBO_FROM, 5, 60, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
             WS_TABSTOP | CBS_SORT
-    LTEXT "从...转换：", IDC_STATIC, 5, 49, 56, 8
+    LTEXT "从...转换:", IDC_STATIC, 5, 49, 56, 8
    COMBOBOX IDC_COMBO_TO, 5, 87, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
             WS_TABSTOP | CBS_SORT
-    LTEXT "转换为：", IDC_STATIC, 5, 76, 56, 8
+    LTEXT "转换为:", IDC_STATIC, 5, 76, 56, 8
    CONTROL "C", IDC_BUTTON_CANC, "Button", BS_OWNERDRAW | BS_CENTER |
            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 276, 24, 40, 17
    CONTROL "CE", IDC_BUTTON_CE, "Button", BS_OWNERDRAW | BS_CENTER |
@@ -417,7 +415,7 @@ STRINGTABLE
 BEGIN
    IDS_CONV_ANGLE "角"
    IDS_CONV_AREA "面积"
-    IDS_CONV_CONSUMPTION "油耗（引擎）"
+    IDS_CONV_CONSUMPTION "油耗 (引擎)"
    IDS_CONV_CURRENCY "货币"
    IDS_CONV_ENERGY "能量"
    IDS_CONV_LENGTH "长度"
@@ -433,8 +431,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
-    IDS_ANGLE_ARCMINUTES "分"
-    IDS_ANGLE_ARCSECONDS "秒"
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "角度"
    IDS_ANGLE_GRADIANS "梯度"
    IDS_ANGLE_RADIANS "弧度"
@@ -444,26 +442,26 @@ END
 STRINGTABLE
 BEGIN
    IDS_AREA_ACRES "英亩"
-    IDS_AREA_ACRES_BRAZIL "英亩（巴西）"
-    IDS_AREA_ACRES_FRANCE "英亩（法国）"
-    IDS_AREA_ACRES_SCOTS "英亩（苏格兰）"
-    IDS_AREA_ACRES_US "英亩（美国）"
+    IDS_AREA_ACRES_BRAZIL "英亩 (巴西)"
+    IDS_AREA_ACRES_FRANCE "英亩 (法国)"
+    IDS_AREA_ACRES_SCOTS "英亩 (苏格兰)"
+    IDS_AREA_ACRES_US "英亩 (美国)"
    IDS_AREA_ARES "公亩"
    IDS_AREA_CHOU "畴"
    IDS_AREA_DANBO "大亩"
    IDS_AREA_HECTARES "公顷"
    IDS_AREA_JEONGBO "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY "摩根（匈牙利）"
+    IDS_AREA_MORGEN_HUNGARY "摩根 (匈牙利)"
    IDS_AREA_MU "亩"
    IDS_AREA_PING "坪"
-    IDS_AREA_PYEONG "坪（韩国）"
+    IDS_AREA_PYEONG "坪 (韩国)"
    IDS_AREA_PYEONGBANGJA "Pyeongbangja"
    IDS_AREA_RAI "莱"
-    IDS_AREA_SE "亩（日本）"
+    IDS_AREA_SE "亩 (日本)"
    IDS_AREA_SQUARE_CENTIMETERS "平方厘米"
    IDS_AREA_SQUARE_CHR "Square chr"
    IDS_AREA_SQUARE_FATHOMS "平方英寻"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "平方英寻（匈牙利）"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "平方英寻 (匈牙利)"
    IDS_AREA_SQUARE_FEET "平方英尺"
    IDS_AREA_SQUARE_INCHES "平方英寸"
    IDS_AREA_SQUARE_KILOMETERS "平方千米"
@@ -476,7 +474,7 @@ BEGIN
    IDS_AREA_SQUARE_VA "Square va"
    IDS_AREA_SQUARE_YARD "平方码"
    IDS_AREA_TAN "段"
-    IDS_AREA_TSUBO "坪（日本）"
+    IDS_AREA_TSUBO "坪 (日本)"
 END

 /* Consumptions */
@@ -484,8 +482,8 @@ STRINGTABLE
 BEGIN
    IDS_CONSUMPTION_KM_PER_L "千米/升"
    IDS_CONSUMPTION_L_PER_100_KM "升/100 千米"
-    IDS_CONSUMPTION_MILES_GALLON_UK "英里/加仑（英国）"
-    IDS_CONSUMPTION_MILES_GALLON_US "英里/加仑（美国）"
+    IDS_CONSUMPTION_MILES_GALLON_UK "英里/加仑 (英国)"
+    IDS_CONSUMPTION_MILES_GALLON_US "英里/加仑 (美国)"
 END

 /* Currencies */
@@ -508,7 +506,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 "西班牙比塞塔"
@@ -538,20 +536,20 @@ BEGIN
    IDS_LENGTH_ASTRONOMICAL_UNITS "天文单位"
    IDS_LENGTH_BARLEYCORNS "巴利肯"
    IDS_LENGTH_CENTIMETERS "厘米"
-    IDS_LENGTH_CHAINS_UK "链（英国）"
+    IDS_LENGTH_CHAINS_UK "链 (英国)"
    IDS_LENGTH_CHI "尺"
    IDS_LENGTH_CHOU "畴"
    IDS_LENGTH_CHR "Chr"
    IDS_LENGTH_CUN "寸"
    IDS_LENGTH_FATHOMS "英寻"
-    IDS_LENGTH_FATHOMS_HUNGARY "英寻（匈牙利）"
+    IDS_LENGTH_FATHOMS_HUNGARY "英寻 (匈牙利)"
    IDS_LENGTH_FEET "英尺"
    IDS_LENGTH_FURLONGS "浪"
    IDS_LENGTH_GAN "杆"
    IDS_LENGTH_HANDS "掌宽"
    IDS_LENGTH_HUNH "Hunh"
    IDS_LENGTH_INCHES "英尺"
-    IDS_LENGTH_JA "尺（韩国）"
+    IDS_LENGTH_JA "尺 (韩国)"
    IDS_LENGTH_JEONG "Jeong"
    IDS_LENGTH_KABIET "Kabiet"
    IDS_LENGTH_KEN "Ken"
@@ -568,14 +566,14 @@ BEGIN
    IDS_LENGTH_NIEU "Nieu"
    IDS_LENGTH_PARSECS "Parsecs"
    IDS_LENGTH_PICAS "Picas"
-    IDS_LENGTH_RI_JAPAN "里（日本）"
-    IDS_LENGTH_RI_KOREA "里（韩国）"
+    IDS_LENGTH_RI_JAPAN "里 (日本)"
+    IDS_LENGTH_RI_KOREA "里 (韩国)"
    IDS_LENGTH_RODS "杆"
    IDS_LENGTH_SAWK "Sawk"
    IDS_LENGTH_SEN "Sen"
-    IDS_LENGTH_SHAKU "尺（日本）"
+    IDS_LENGTH_SHAKU "尺 (日本)"
    IDS_LENGTH_SPAN "Span"
-    IDS_LENGTH_SUN "寸（日本）"
+    IDS_LENGTH_SUN "寸 (日本)"
    IDS_LENGTH_TSUEN "寸"
    IDS_LENGTH_VA "Va"
    IDS_LENGTH_YARDS "码"
@@ -645,22 +643,22 @@ END
 /* Volumes */
 STRINGTABLE
 BEGIN
-    IDS_VOLUME_BARRELS_UK "桶（英国）"
+    IDS_VOLUME_BARRELS_UK "桶 (英国)"
    IDS_VOLUME_BARRELS_OIL "桶油"
    IDS_VOLUME_BUN "Bun"
-    IDS_VOLUME_BUSHELS_UK "蒲式耳（英国）"
-    IDS_VOLUME_BUSHELS_US "蒲式耳（美国）"
+    IDS_VOLUME_BUSHELS_UK "蒲式耳 (英国)"
+    IDS_VOLUME_BUSHELS_US "蒲式耳 (美国)"
    IDS_VOLUME_CUBIC_CENTIMETERS "立方厘米"
    IDS_VOLUME_CUBIC_FEET "立方英尺"
    IDS_VOLUME_CUBIC_INCHES "立方英寸"
    IDS_VOLUME_CUBIC_METERS "立方米"
    IDS_VOLUME_CUBIC_YARDS "立方码"
    IDS_VOLUME_DOE "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK "液盎司（英国）"
-    IDS_VOLUME_FLUID_OUNCES_US "液盎司（美国）"
-    IDS_VOLUME_GALLONS_UK "加仑（英国）"
-    IDS_VOLUME_GALLONS_DRY_US "干量加仑（美国）"
-    IDS_VOLUME_GALLONS_LIQUID_US "液加仑（美国）"
+    IDS_VOLUME_FLUID_OUNCES_UK "液盎司 (英国)"
+    IDS_VOLUME_FLUID_OUNCES_US "液盎司 (美国)"
+    IDS_VOLUME_GALLONS_UK "加仑 (英国)"
+    IDS_VOLUME_GALLONS_DRY_US "干量加仑 (美国)"
+    IDS_VOLUME_GALLONS_LIQUID_US "液加仑 (美国)"
    IDS_VOLUME_GOU "合"
    IDS_VOLUME_HOP "Hop"
    IDS_VOLUME_ICCE "Icce"
@@ -668,17 +666,17 @@ BEGIN
    IDS_VOLUME_LITERS "升"
    IDS_VOLUME_MAL "Mal"
    IDS_VOLUME_MILLILITERS "毫升"
-    IDS_VOLUME_PINTS_UK "品脱（英国）"
-    IDS_VOLUME_PINTS_DRY_US "干量品脱（美国）"
-    IDS_VOLUME_PINTS_LIQUID_US "液品脱（美国）"
-    IDS_VOLUME_QUARTS_UK "夸脱（英国）"
-    IDS_VOLUME_QUARTS_DRY_US "干量夸脱（美国）"
-    IDS_VOLUME_QUARTS_LIQUID_US "液夸脱（美国）"
+    IDS_VOLUME_PINTS_UK "品脱 (英国)"
+    IDS_VOLUME_PINTS_DRY_US "干量品脱 (美国)"
+    IDS_VOLUME_PINTS_LIQUID_US "液品脱 (美国)"
+    IDS_VOLUME_QUARTS_UK "夸脱 (英国)"
+    IDS_VOLUME_QUARTS_DRY_US "干量夸脱 (美国)"
+    IDS_VOLUME_QUARTS_LIQUID_US "液夸脱 (美国)"
    IDS_VOLUME_SEKI "Seki"
    IDS_VOLUME_SYOU "Syou"
    IDS_VOLUME_TANANLOUNG "Tananloung"
    IDS_VOLUME_TANG "Tang"
-    IDS_VOLUME_TO "斗（日本）"
+    IDS_VOLUME_TO "斗 (日本)"
 END

 /* Weights */
@@ -692,14 +690,14 @@ BEGIN
    IDS_WEIGHT_GRAMS "克"
    IDS_WEIGHT_GWAN "Gwan"
    IDS_WEIGHT_HARB "Harb"
-    IDS_WEIGHT_JIN_CHINA "斤（中国）"
-    IDS_WEIGHT_JIN_TAIWAN "斤（中国台湾）"
-    IDS_WEIGHT_KAN "贯（日本）"
+    IDS_WEIGHT_JIN_CHINA "斤 (中国)"
+    IDS_WEIGHT_JIN_TAIWAN "斤 (中国台湾)"
+    IDS_WEIGHT_KAN "贯 (日本)"
    IDS_WEIGHT_KILOGRAMS "千克"
-    IDS_WEIGHT_KIN "斤（日本）"
-    IDS_WEIGHT_LIANG_CHINA "两（中国）"
-    IDS_WEIGHT_LIANG_TAIWAN "两（中国台湾）"
-    IDS_WEIGHT_MONME "两（日本）"
+    IDS_WEIGHT_KIN "斤 (日本)"
+    IDS_WEIGHT_LIANG_CHINA "两 (中国)"
+    IDS_WEIGHT_LIANG_TAIWAN "两 (中国台湾)"
+    IDS_WEIGHT_MONME "两 (日本)"
    IDS_WEIGHT_OUNCES_AVOIRDUPOIS "常衡盎司"
    IDS_WEIGHT_OUNCES_TROY "金衡盎司"
    IDS_WEIGHT_POUNDS "英磅"
@@ -708,6 +706,6 @@ BEGIN
    IDS_WEIGHT_STONES "石"
    IDS_WEIGHT_TAMLUNG "Tamlung"
    IDS_WEIGHT_TONNES "吨"
-    IDS_WEIGHT_TONS_UK "吨（英国）"
-    IDS_WEIGHT_TONS_US "吨（美国）"
+    IDS_WEIGHT_TONS_UK "吨 (英国)"
+    IDS_WEIGHT_TONS_US "吨 (美国)"
 END
--- a/base/applications/calc/lang/zh-HK.rc
+++ b/base/applications/calc/lang/zh-HK.rc
@@ -10,17 +10,17 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -154,9 +158,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -219,9 +223,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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,20 +1,20 @@
-// TRANSLATOR: 2021 Chan Chilung <eason066@gmail.com>
+// Traditional Chinese translation by 2021 Chan Chilung <eason066@gmail.com>

 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

 /* Dialogs */

-IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163
+IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 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 |
@@ -148,9 +152,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128
+IDD_DIALOG_STANDARD DIALOGEX 0, 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
@@ -213,9 +217,9 @@ BEGIN
    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END

-IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130
+IDD_DIALOG_CONVERSION DIALOGEX 0, 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
@@ -4,8 +4,6 @@
 #define IDC_STATIC  -1
 #endif

-#define CW_USEDEFAULT16 0x8000
-
 #define IDS_CALC_NAME                   1
 #define IDS_MATH_ERROR                  2
 #define IDS_QUICKHELP                   3
@@ -194,7 +192,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
@@ -19,7 +19,7 @@
 */

 #include <windef.h>
-#include <winuser.rh>
+#include <winuser.h>

 #include "resource.h"

@@ -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>
@@ -63,9 +63,6 @@ IDI_CALC ICON "res/calc.ico"
 #ifdef LANGUAGE_HU_HU
    #include "lang/hu-HU.rc"
 #endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
 #ifdef LANGUAGE_IT_IT
    #include "lang/it-IT.rc"
 #endif
--- a/base/applications/calc/utl_ieee.c
+++ b/base/applications/calc/utl_ieee.c
@@ -27,7 +27,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)

    switch (base) {
    case IDC_RADIO_HEX:
-        StringCchPrintf(buffer, size, _T("%I64X"), rpn->i);
+        _stprintf(buffer, _T("%I64X"), rpn->i);
        break;
    case IDC_RADIO_DEC:
 /*
@@ -40,11 +40,11 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
        /* calculate the width of integer number */
        width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1;
        if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH)
-            StringCchPrintf(buffer, size, _T("%#.*e"), MAX_LD_WIDTH-1, rpn->f);
+            _stprintf(buffer, _T("%#.*e"), MAX_LD_WIDTH-1, rpn->f);
        else {
            TCHAR *ptr, *dst;

-            StringCchPrintfEx(buffer, size, &ptr, NULL, 0, _T("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
+            ptr = buffer + _stprintf(buffer, _T("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
            /* format string ensures there is a '.': */
            dst = _tcschr(buffer, _T('.'));
            while (--ptr > dst)
@@ -61,7 +61,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
 #undef MAX_LD_WIDTH
        break;
    case IDC_RADIO_OCT:
-        StringCchPrintf(buffer, size, _T("%I64o"), rpn->i);
+        _stprintf(buffer, _T("%I64o"), rpn->i);
        break;
    case IDC_RADIO_BIN:
        if (rpn->i == 0) {
--- a/base/applications/calc/utl_mpfr.c
+++ b/base/applications/calc/utl_mpfr.c
@@ -107,7 +107,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
    }
    mpz_clear(zz);
    mpf_clear(ff);
-    StringCchPrintf(buffer, size, _T("%hs"), temp);
+    _sntprintf(buffer, SIZEOF(calc.buffer), _T("%hs"), temp);
 }

 void convert_text2number_2(calc_number_t *a)
--- a/base/applications/calc/winmain.c
+++ b/base/applications/calc/winmain.c
@@ -254,10 +254,10 @@ static void UpdateNumberIntl(void)
 {
    /* Get current user defaults */
    if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, calc.sDecimal, SIZEOF(calc.sDecimal)))
-        StringCbCopy(calc.sDecimal, sizeof(calc.sDecimal), _T("."));
+        _tcscpy(calc.sDecimal, _T("."));

    if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, calc.sThousand, SIZEOF(calc.sThousand)))
-        StringCbCopy(calc.sThousand, sizeof(calc.sThousand), _T(","));
+        _tcscpy(calc.sThousand, _T(","));

    /* get the string lengths */
    calc.sDecimal_len = _tcslen(calc.sDecimal);
@@ -342,7 +342,7 @@ static void save_config(void)
    switch (osvi.dwPlatformId) {
    case VER_PLATFORM_WIN32s:
    case VER_PLATFORM_WIN32_WINDOWS:
-        StringCbPrintf(buf, sizeof(buf), _T("%lu"), calc.layout);
+        _stprintf(buf, _T("%lu"), calc.layout);
        WriteProfileString(_T("SciCalc"), _T("layout"), buf);
        WriteProfileString(_T("SciCalc"), _T("UseSep"), (calc.usesep==TRUE) ? _T("1") : _T("0"));
        break;
@@ -496,16 +496,16 @@ static void update_lcd_display(HWND hwnd)
    TCHAR tmp[MAX_CALC_SIZE * 2 + 2];

    if (calc.buffer[0] == _T('\0'))
-        StringCbCopy(tmp, sizeof(tmp), _T("0"));
+        _tcscpy(tmp, _T("0"));
    else
-        StringCbCopy(tmp, sizeof(tmp), calc.buffer);
+        _tcscpy(tmp, calc.buffer);

    /* Add final '.' in decimal mode (if it's missing), but
     * only if it's a result: no append if it prints "ERROR".
     */
    if (calc.base == IDC_RADIO_DEC && !calc.is_nan) {
        if (_tcschr(tmp, _T('.')) == NULL)
-            StringCbCat(tmp, sizeof(tmp), _T("."));
+            _tcscat(tmp, _T("."));
    }
    /* if separator mode is on, let's add an additional space */
    if (calc.usesep && !calc.sci_in && !calc.sci_out && !calc.is_nan) {
@@ -573,14 +573,13 @@ static void update_parent_display(HWND hWnd)
    if (!n)
        str[0] = _T('\0');
    else
-        StringCbPrintf(str, sizeof(str), _T("(=%d"), n);
+        _stprintf(str,_T("(=%d"), n);
    SetDlgItemText(hWnd, IDC_TEXT_PARENT, str);
 }

 static void build_operand(HWND hwnd, DWORD idc)
 {
    unsigned int i = 0, n;
-    size_t cbPtr;

    if (idc == IDC_BUTTON_DOT) {
        /* if dot is the first char, it's added automatically */
@@ -618,14 +617,12 @@ static void build_operand(HWND hwnd, DWORD idc)
            if (idc != IDC_STATIC)
                calc.esp = (calc.esp * 10 + (key2code[i].key-'0')) % LOCAL_EXP_SIZE;
            if (calc.ptr == calc.buffer)
-                StringCbPrintf(calc.ptr, sizeof(calc.buffer), _T("0.e%+d"), calc.esp);
+                _stprintf(calc.ptr, _T("0.e%+d"), calc.esp);
            else {
                /* adds the dot at the end if the number has no decimal part */
                if (!_tcschr(calc.buffer, _T('.')))
                    *calc.ptr++ = _T('.');
-
-                cbPtr = sizeof(calc.buffer) - ((BYTE*)calc.ptr - (BYTE*)calc.buffer);
-                StringCbPrintf(calc.ptr, cbPtr, _T("e%+d"), calc.esp);
+                _stprintf(calc.ptr, _T("e%+d"), calc.esp);
            }
            update_lcd_display(hwnd);
            return;
@@ -640,11 +637,7 @@ static void build_operand(HWND hwnd, DWORD idc)
            return;
        break;
    }
-
-    cbPtr = sizeof(calc.buffer) - ((BYTE*)calc.ptr - (BYTE*)calc.buffer);
-    StringCbPrintfEx(calc.ptr, cbPtr, &calc.ptr, NULL, STRSAFE_FILL_ON_FAILURE,
-                     _T("%C"), key2code[i].key);
-
+    calc.ptr += _stprintf(calc.ptr, _T("%C"), key2code[i].key);
    update_lcd_display(hwnd);
 }

@@ -857,11 +850,11 @@ static void update_memory_flag(HWND hWnd, BOOL mem_flag)
    SetDlgItemText(hWnd, IDC_TEXT_MEMORY, mem_flag ? _T("M") : _T(""));
 }

-static void update_n_stats_items(HWND hWnd, TCHAR *buffer, size_t cbBuffer)
+static void update_n_stats_items(HWND hWnd, TCHAR *buffer)
 {
    unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0);

-    StringCbPrintf(buffer, cbBuffer, _T("n=%u"), n);
+    _stprintf(buffer, _T("n=%u"), n);
    SetDlgItemText(hWnd, IDC_TEXT_NITEMS, buffer);
 }

@@ -912,7 +905,7 @@ static char *ReadConversion(const char *formula)
    str[len+1] = ')';
    str[len+2] = '\0';

-    StringCbCopy(calc.source, sizeof(calc.source), (*calc.buffer == _T('\0')) ? _T("0") : calc.buffer);
+    _tcscpy(calc.source, (*calc.buffer == _T('\0')) ? _T("0") : calc.buffer);

    /* clear display content before proceeding */
    calc.ptr = calc.buffer;
@@ -949,13 +942,13 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
            if (n == LB_ERR)
                return TRUE;
            SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0);
-            update_n_stats_items(hWnd, buffer, sizeof(buffer));
+            update_n_stats_items(hWnd, buffer);
            delete_stat_item(n);
            return TRUE;
        case IDC_BUTTON_CAD:
            SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0);
            clean_stat_list();
-            update_n_stats_items(hWnd, buffer, sizeof(buffer));
+            update_n_stats_items(hWnd, buffer);
            return TRUE;
        }
        break;
@@ -971,7 +964,7 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
                           buffer, SIZEOF(buffer),
                           ((statistic_t *)lp)->base);
        SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_ADDSTRING, 0, (LPARAM)buffer);
-        update_n_stats_items(hWnd, buffer, sizeof(buffer));
+        update_n_stats_items(hWnd, buffer);
        return TRUE;
    }
    return FALSE;
@@ -993,13 +986,11 @@ static void CopyMemToClipboard(void *ptr)
    if(OpenClipboard(NULL)) {
        HGLOBAL  clipbuffer;
        TCHAR   *buffer;
-        size_t cbBuffer;

        EmptyClipboard();
-        cbBuffer = (_tcslen(ptr) + 1) * sizeof(TCHAR);
-        clipbuffer = GlobalAlloc(GMEM_DDESHARE, cbBuffer);
+        clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR));
        buffer = (TCHAR *)GlobalLock(clipbuffer);
-        StringCbCopy(buffer, cbBuffer, ptr);
+        _tcscpy(buffer, ptr);
        GlobalUnlock(clipbuffer);
 #ifdef UNICODE
        SetClipboardData(CF_UNICODETEXT,clipbuffer);
@@ -1015,16 +1006,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);
 }
@@ -1071,8 +1056,9 @@ static char *handle_sequence_input(HWND hwnd, sequence_t *seq)
        }
    } else
    if (ch == '$') {
-        StringCbCopyEx(calc.buffer, sizeof(calc.buffer), calc.source, &calc.ptr, NULL,
-                       STRSAFE_FILL_ON_FAILURE);
+        calc.ptr =
+        _tcscpy(calc.buffer, calc.source) +
+        _tcslen(calc.source);
    } else {
        for (x=0; x<SIZEOF(key2code); x++) {
            if (!(key2code[x].mask & BITMASK_IS_ASCII) ||
@@ -1641,7 +1627,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
        case IDC_BUTTON_D:
        case IDC_BUTTON_E:
        case IDC_BUTTON_F:
-            if (calc.is_nan) break;
+            calc.is_nan = FALSE;
            build_operand(hWnd, LOWORD(wp));
            return TRUE;
        case IDC_BUTTON_PERCENT:
@@ -1707,7 +1693,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
            }
            return TRUE;
        case IDC_BUTTON_BACK:
-            if (calc.is_nan) break;
            if (calc.sci_in) {
                if (calc.esp == 0) {
                    TCHAR *ptr;
@@ -1960,9 +1945,9 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
                    hInstance,
                    MAKEINTRESOURCE(IDI_CALC),
                    IMAGE_ICON,
-                    0,
-                    0,
-                    LR_DEFAULTSIZE | LR_SHARED);
+                    GetSystemMetrics(SM_CXICON),
+                    GetSystemMetrics(SM_CYICON),
+                    0);

    calc.hSmIcon = LoadImage(
                    hInstance,
@@ -1970,7 +1955,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
                    IMAGE_ICON,
                    GetSystemMetrics(SM_CXSMICON),
                    GetSystemMetrics(SM_CYSMICON),
-                    LR_SHARED);
+                    0);

    do {
        /* ignore hwnd: dialogs are already visible! */
@@ -2000,6 +1985,12 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
        save_config();
    } while (calc.action != IDC_STATIC);

+    if (calc.hBgIcon != NULL)
+        DestroyIcon(calc.hBgIcon);
+
+    if (calc.hSmIcon != NULL)
+        DestroyIcon(calc.hSmIcon);
+
    stop_rpn_engine();

    Theme_Stop();
--- a/base/applications/charmap/charmap.c
+++ b/base/applications/charmap/charmap.c
@@ -4,6 +4,7 @@
 * FILE:        base/applications/charmap/charmap.c
 * PURPOSE:     main dialog implementation
 * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
+ *
 */

 #include "precomp.h"
@@ -566,8 +567,6 @@ PanelOnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
        }
    }

-    SetFocus(hCharmapDlg);
-
    return 0;
 }

@@ -711,14 +710,6 @@ wWinMain(HINSTANCE hInst,
                    break;
                }

-                /* NOTE: CreateDialog needs IsDialogMessage call in message loop */
-                if (hCharmapDlg && IsDialogMessage(hCharmapDlg, &Msg))
-                    continue;
-#ifndef REMOVE_ADVANCED
-                if (hAdvancedDlg && IsDialogMessage(hAdvancedDlg, &Msg))
-                    continue;
-#endif
-
                TranslateMessage(&Msg);
                DispatchMessage(&Msg);
            }
--- a/base/applications/charmap/lang/bg-BG.rc
+++ b/base/applications/charmap/lang/bg-BG.rc
@@ -1,5 +1,5 @@
 /* Превод на Български/ Bulgarian translation */
-/* https://reactos.org/wiki/Bulgarian_translation */
+/* http://www.reactos.org/wiki/Bulgarian_translation */

 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT

@@ -8,7 +8,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Шрифт :", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Помощ", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/ca-ES.rc
+++ b/base/applications/charmap/lang/ca-ES.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Ajuda", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/cs-CZ.rc
+++ b/base/applications/charmap/lang/cs-CZ.rc
@@ -10,7 +10,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Písmo:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Nápověda", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/de-DE.rc
+++ b/base/applications/charmap/lang/de-DE.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Schrift:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "&Hilfe", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/el-GR.rc
+++ b/base/applications/charmap/lang/el-GR.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Γραμματοσειρά :", IDC_STATIC, 6, 7, 60, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Βοήθεια", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/en-US.rc
+++ b/base/applications/charmap/lang/en-US.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "&Font:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "&Help", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/es-ES.rc
+++ b/base/applications/charmap/lang/es-ES.rc
@@ -8,7 +8,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Fuente:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Ayuda", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/et-EE.rc
+++ b/base/applications/charmap/lang/et-EE.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "&Font:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "&Spikker", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/fr-FR.rc
+++ b/base/applications/charmap/lang/fr-FR.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Police :", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Aide", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/he-IL.rc
+++ b/base/applications/charmap/lang/he-IL.rc
@@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 EXSTYLE WS_EX_LAYOUTRTL
 BEGIN
    LTEXT "גופן", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "עזרה", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/id-ID.rc
+++ b/base/applications/charmap/lang/id-ID.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Fon:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Bantuan", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/it-IT.rc
+++ b/base/applications/charmap/lang/it-IT.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Aiuto", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/ja-JP.rc
+++ b/base/applications/charmap/lang/ja-JP.rc
@@ -5,7 +5,7 @@ FONT 9, "MS UI Gothic", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "フォント:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "ヘルプ", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
@@ -15,7 +15,7 @@ BEGIN
            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
    DEFPUSHBUTTON "選択", IDC_SELECT, 194, 186, 44, 13
    PUSHBUTTON "コピー", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-    CONTROL "詳細表示", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
+    CONTROL "Advanced view", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
            WS_TABSTOP, 8, 208, 95, 10
 END

@@ -23,13 +23,13 @@ IDD_ADVANCED DIALOGEX 0, 0, 292, 64
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 9, "MS UI Gothic"
 BEGIN
-    LTEXT "文字セット:", IDC_STATIC, 8, 8, 48, 8
+    LTEXT "Charset:", IDC_STATIC, 8, 8, 48, 8
    COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "分類:", IDC_STATIC, 8, 28, 50, 8
+    LTEXT "Group by:", IDC_STATIC, 8, 28, 50, 8
    COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "検索", IDC_BUTTON_SEARCH, 200, 44, 50, 14
+    PUSHBUTTON "Search", IDC_BUTTON_SEARCH, 200, 44, 50, 14
    EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL
-    LTEXT "検索文字列:", IDC_STATIC, 8, 48, 42, 8
+    LTEXT "Search for:", IDC_STATIC, 8, 48, 42, 8
    LTEXT "Unicode:", IDC_STATIC, 200, 8, 30, 8
    EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL
 END
@@ -48,9 +48,9 @@ END

 STRINGTABLE
 BEGIN
-    IDS_LICENSE "本プログラムはフリーソフトウェアです。フリーソフトウェア財団が発行した GNU 一般公衆利用許諾契約書のバージョン2、またはそれ以降のバージョン（任意選択）の条件の下で再配布、または改変することができます。\r\n\r\n本プログラムは、有用であることを期待して配布されていますが、商品性や特定目的への適合性についての暗黙の保証もなく、いかなる保証もありません。詳細は GNU 一般公衆利用許諾契約書をご覧ください。\r\n\r\nあなたはこのプログラムとともに GNU 一般公衆利用許諾書のコピーを受け取っているはずです。そうでない場合は、フリーソフトウェア財団（Free Software Foundation, Inc, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA）までご連絡ください。"
+    IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
    IDS_ABOUT "バージョン情報(&B)..."
-    IDS_TITLE "文字コード表"
+    IDS_TITLE "Character Map"
    IDS_UNICODE "Unicode"
-    IDS_ALL "すべて"
+    IDS_ALL "All"
 END
--- a/base/applications/charmap/lang/ko-KR.rc
+++ b/base/applications/charmap/lang/ko-KR.rc
@@ -9,7 +9,7 @@ FONT 9, "굴림", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "글꼴:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "도움말", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/lt-LT.rc
+++ b/base/applications/charmap/lang/lt-LT.rc
@@ -14,7 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Šriftas:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Pagalba", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/nl-NL.rc
+++ b/base/applications/charmap/lang/nl-NL.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Lettertype:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Help", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/no-NO.rc
+++ b/base/applications/charmap/lang/no-NO.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Skrift:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Hjelp", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/pl-PL.rc
+++ b/base/applications/charmap/lang/pl-PL.rc
@@ -14,7 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Czci&onka:", IDC_STATIC, 7, 9, 32, 8
-    COMBOBOX IDC_FONTCOMBO, 49, 7, 183, 60, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 49, 7, 183, 60, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Pomo&c", IDC_CMHELP, 237, 7, 50, 14
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/pt-BR.rc
+++ b/base/applications/charmap/lang/pt-BR.rc
@@ -5,7 +5,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "&Fonte:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Aj&uda", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/ro-RO.rc
+++ b/base/applications/charmap/lang/ro-RO.rc
@@ -1,8 +1,7 @@
 /*
 * FILE:             base/applications/charmap/lang/ro-RO.rc
- *                   ReactOS Project (https://reactos.org)
- * TRANSLATORS:      Copyright 2011-2018 Ștefan Fulea <stefan.fulea@mail.com>
- *                   Copyright 2023-2024 Andrei Miloiu <miloiuandrei@gmail.com>
+ *                   ReactOS Project (http://www.reactos.org)
+ * TRANSLATOR:       Ștefan Fulea (stefan dot fulea at mail dot com)
 */

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -11,18 +10,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
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    LTEXT "F&ont:", IDC_STATIC, 6, 7, 24, 9
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-    PUSHBUTTON "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 +29,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

@@ -46,7 +45,7 @@ CAPTION "Despre"
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-    LTEXT "Plan caractere v0.1\nDrept de autor (C) 2007 Ged Murphy (gedmurphy@reactos.org)\nTraducere de Ștefan Fulea (stefan.fulea@mail.com)", IDC_STATIC, 48, 7, 210, 36
+    LTEXT "Hartă de caractere v0.1\nDrept de autor (C) 2007 Ged Murphy (gedmurphy@reactos.org)\nTraducere de Ștefan Fulea (stefan.fulea@mail.com)", IDC_STATIC, 48, 7, 210, 36
    PUSHBUTTON "Î&nchide", IDOK, 105, 162, 44, 15
    ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30
    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 254, 107, WS_VISIBLE | WS_VSCROLL |
@@ -57,7 +56,7 @@ STRINGTABLE
 BEGIN
    IDS_LICENSE "Această aplicație este publică; fiind permisă modificarea și/sau (re)distribuția sa în termenii Licenței Publice Generale GNU publicată de Free Software Foundation; sau versiunea 2 a Licenței, sau (la alegere) a oricărei versiuni ulterioare.\r\n\r\nAceastă aplicație este distribuită doar în speranța de a fi utilă, FĂRĂ însă NICI O GARANȚIE; nici măcar cu garanția implicită a VANDABILITĂȚII sau a UTILITĂȚII ÎNTR-UN SCOP ANUME. Pentru mai multe detalii consultați Licența Publică Generală GNU.\r\n\r\nPuteți vedea această licență aici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDe asemenea puteți consulta traduceri neoficiale ale acestei licențe aici:\r\nhttp://www.gnu.org/licenses/translations.html"
    IDS_ABOUT "&Despre…"
-    IDS_TITLE "Plan caractere"
+    IDS_TITLE "Hartă de caractere"
    IDS_UNICODE "Unicode"
-    IDS_ALL "Toate"
+    IDS_ALL "All"
 END
--- a/base/applications/charmap/lang/ru-RU.rc
+++ b/base/applications/charmap/lang/ru-RU.rc
@@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "&Шрифт:", IDC_STATIC, 6, 7, 27, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "&Справка", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
@@ -54,5 +54,5 @@ BEGIN
    IDS_ABOUT "&О программе..."
    IDS_TITLE "Таблица символов"
    IDS_UNICODE "Unicode"
-    IDS_ALL "Все"
+    IDS_ALL "All"
 END
--- a/base/applications/charmap/lang/sk-SK.rc
+++ b/base/applications/charmap/lang/sk-SK.rc
@@ -14,7 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Pís&mo:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "&Pomocník", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/sq-AL.rc
+++ b/base/applications/charmap/lang/sq-AL.rc
@@ -9,7 +9,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Ndihmë", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/sv-SE.rc
+++ b/base/applications/charmap/lang/sv-SE.rc
@@ -12,7 +12,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Typsnitt:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Hjälp", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/tr-TR.rc
+++ b/base/applications/charmap/lang/tr-TR.rc
@@ -10,7 +10,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Yazı Tipi:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Yardım", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
@@ -57,5 +57,5 @@ BEGIN
    IDS_ABOUT "&Hakkında..."
    IDS_TITLE "Karakter Seçici"
    IDS_UNICODE "Unicode"
-    IDS_ALL "Tümü"
+    IDS_ALL "Hepsi"
 END
--- a/base/applications/charmap/lang/uk-UA.rc
+++ b/base/applications/charmap/lang/uk-UA.rc
@@ -13,7 +13,7 @@ FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "Шрифт :", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "Довідка", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/zh-CN.rc
+++ b/base/applications/charmap/lang/zh-CN.rc
@@ -12,13 +12,13 @@ IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 9, "宋体", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
-    LTEXT "字体：", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    LTEXT "字体:", IDC_STATIC, 6, 7, 24, 9
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "说明", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
            WS_VSCROLL, 20, 22, 266, 156
-    LTEXT "待复制的字符：", IDC_STATIC, 6, 188, 66, 9
+    LTEXT "待复制的字符:", 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 "选择", IDC_SELECT, 194, 186, 44, 13
@@ -31,14 +31,14 @@ IDD_ADVANCED DIALOGEX 0, 0, 292, 64
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 9, "宋体"
 BEGIN
-    LTEXT "字符集：", IDC_STATIC, 8, 8, 48, 8
+    LTEXT "字符集:", IDC_STATIC, 8, 8, 48, 8
    COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "分组：", IDC_STATIC, 8, 28, 50, 8
+    LTEXT "分组:", IDC_STATIC, 8, 28, 50, 8
    COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
    PUSHBUTTON "搜索", IDC_BUTTON_SEARCH, 200, 44, 50, 14
    EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL
-    LTEXT "搜索目标：", IDC_STATIC, 8, 48, 42, 8
-    LTEXT "到 Unicode：", IDC_STATIC, 200, 8, 30, 8
+    LTEXT "搜索目标:", 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/lang/zh-HK.rc
+++ b/base/applications/charmap/lang/zh-HK.rc
@@ -13,7 +13,7 @@ FONT 9, "新細明體", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "字型：", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "説明", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/lang/zh-TW.rc
+++ b/base/applications/charmap/lang/zh-TW.rc
@@ -13,7 +13,7 @@ FONT 9, "新細明體", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
    LTEXT "字型：", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
    PUSHBUTTON "說明", IDC_CMHELP, 249, 5, 35, 13
    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
--- a/base/applications/charmap/map.c
+++ b/base/applications/charmap/map.c
@@ -4,7 +4,6 @@
 * FILE:        base/applications/charmap/map.c
 * PURPOSE:     class implementation for painting glyph region
 * COPYRIGHT:   Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
- *              Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
 *
 */

@@ -18,118 +17,128 @@ static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd";

 #define MAX_ROWS (0xFFFF / XCELLS) + 1 - YCELLS

+
 static
 VOID
 SetGrid(PMAP infoPtr)
 {
    INT x, y;
+
+    for (y = 0; y < YCELLS; y++)
+    for (x = 0; x < XCELLS; x++)
+    {
+        infoPtr->Cells[y][x].CellExt.left = x * infoPtr->CellSize.cx + 1;
+        infoPtr->Cells[y][x].CellExt.top = y * infoPtr->CellSize.cy + 1;
+        infoPtr->Cells[y][x].CellExt.right = (x + 1) * infoPtr->CellSize.cx + 2;
+        infoPtr->Cells[y][x].CellExt.bottom = (y + 1) * infoPtr->CellSize.cy + 2;
+
+        CopyRect(&infoPtr->Cells[y][x].CellInt,
+                 &infoPtr->Cells[y][x].CellExt);
+
+        InflateRect(&infoPtr->Cells[y][x].CellInt,
+                    -1,
+                    -1);
+    }
+}
+
+
+static
+VOID
+DrawActiveCell(PMAP infoPtr,
+               HDC hdc)
+{
+    Rectangle(hdc,
+              infoPtr->pActiveCell->CellInt.left,
+              infoPtr->pActiveCell->CellInt.top,
+              infoPtr->pActiveCell->CellInt.right,
+              infoPtr->pActiveCell->CellInt.bottom);
+
+}
+
+
+static
+VOID
+DrawGrid(PMAP infoPtr,
+         PAINTSTRUCT *ps)
+{
+    INT x, y;
+    RECT rc;
    PCELL Cell;

    for (y = 0; y < YCELLS; y++)
    for (x = 0; x < XCELLS; x++)
    {
        Cell = &infoPtr->Cells[y][x];
-        Cell->CellExt.left = x * infoPtr->CellSize.cx + 1;
-        Cell->CellExt.top = y * infoPtr->CellSize.cy + 1;
-        Cell->CellExt.right = (x + 1) * infoPtr->CellSize.cx + 2;
-        Cell->CellExt.bottom = (y + 1) * infoPtr->CellSize.cy + 2;

-        Cell->CellInt = Cell->CellExt;
-
-        InflateRect(&Cell->CellInt, -1, -1);
-    }
-}
-
-static
-VOID
-UpdateCells(PMAP infoPtr)
-{
-    INT x, y;
-    INT i = XCELLS * infoPtr->iYStart;
-    WCHAR ch;
-    PCELL Cell;
-
-    for (y = 0; y < YCELLS; ++y)
-    {
-        for (x = 0; x < XCELLS; ++x, ++i)
+        if (!IntersectRect(&rc,
+                           &ps->rcPaint,
+                           &Cell->CellExt))
        {
-            if (i < infoPtr->NumValidGlyphs)
-                ch = (WCHAR)infoPtr->ValidGlyphs[i];
-            else
-                ch = 0xFFFF;
+            continue;
+        }

-            Cell = &infoPtr->Cells[y][x];
-            Cell->ch = ch;
+        Rectangle(ps->hdc,
+                  Cell->CellExt.left,
+                  Cell->CellExt.top,
+                  Cell->CellExt.right,
+                  Cell->CellExt.bottom);
+
+        if (infoPtr->pActiveCell == Cell)
+        {
+            DrawActiveCell(infoPtr, ps->hdc);
        }
    }
 }

+
 static
 VOID
 FillGrid(PMAP infoPtr,
         PAINTSTRUCT *ps)
 {
    HFONT hOldFont;
+    WCHAR ch;
    INT x, y;
    RECT rc;
    PCELL Cell;
-    INT i;
-    HBRUSH hOldBrush, hbrGray = (HBRUSH)GetStockObject(LTGRAY_BRUSH);
-    HPEN hOldPen, hPenGray = CreatePen(PS_SOLID, 1, RGB(140, 140, 140));
+    INT i, added;

-    UpdateCells(infoPtr);
-
-    hOldFont = SelectObject(ps->hdc, infoPtr->hFont);
-    hOldPen = SelectObject(ps->hdc, GetStockObject(BLACK_PEN));
-    hOldBrush = SelectObject(ps->hdc, GetStockObject(WHITE_BRUSH));
+    hOldFont = SelectObject(ps->hdc,
+                            infoPtr->hFont);

    i = XCELLS * infoPtr->iYStart;

+    added = 0;
+
    for (y = 0; y < YCELLS; y++)
+    for (x = 0; x < XCELLS; x++)
    {
-        for (x = 0; x < XCELLS; x++, i++)
+        if (i >= infoPtr->NumValidGlyphs) break;
+
+        ch = (WCHAR)infoPtr->ValidGlyphs[i];
+
+        Cell = &infoPtr->Cells[y][x];
+
+        if (IntersectRect(&rc,
+                            &ps->rcPaint,
+                            &Cell->CellExt))
        {
-            Cell = &infoPtr->Cells[y][x];
-            if (!IntersectRect(&rc, &ps->rcPaint, &Cell->CellExt))
-                continue;
+            Cell->ch = ch;

-            rc = Cell->CellExt;
-            Rectangle(ps->hdc, rc.left, rc.top, rc.right, rc.bottom);
+            DrawTextW(ps->hdc,
+                        &ch,
+                        1,
+                        &Cell->CellInt,
+                        DT_CENTER | DT_VCENTER | DT_SINGLELINE);

-            if (i < infoPtr->NumValidGlyphs)
-            {
-                DrawTextW(ps->hdc, &Cell->ch, 1, &Cell->CellInt,
-                          DT_CENTER | DT_VCENTER | DT_SINGLELINE);
-                if (Cell == infoPtr->pActiveCell)
-                {
-                    rc = Cell->CellInt;
-
-                    /* Draw gray box */
-                    SelectObject(ps->hdc, GetStockObject(NULL_BRUSH));
-                    SelectObject(ps->hdc, hPenGray);
-                    Rectangle(ps->hdc, rc.left, rc.top, rc.right, rc.bottom);
-                    SelectObject(ps->hdc, hOldPen);
-                    SelectObject(ps->hdc, hOldBrush);
-
-                    if (GetFocus() == infoPtr->hMapWnd)
-                    {
-                        /* Draw focus rectangle */
-                        InflateRect(&rc, -1, -1);
-                        DrawFocusRect(ps->hdc, &rc);
-                    }
-                }
-            }
-            else
-            {
-                FillRect(ps->hdc, &Cell->CellInt, hbrGray);
-            }
+            added++;
        }
-    }

-    SelectObject(ps->hdc, hOldFont);
-    SelectObject(ps->hdc, hOldPen);
-    SelectObject(ps->hdc, hOldBrush);
-    DeleteObject(hPenGray);
+        i++;
+        ch = (WCHAR)i;
+    }
+    SelectObject(ps->hdc,
+                 hOldFont);
 }


@@ -137,11 +146,19 @@ static
 BOOL
 CreateLargeCell(PMAP infoPtr)
 {
-    RECT rLarge = infoPtr->pActiveCell->CellExt;
+    RECT rLarge;

-    MapWindowPoints(infoPtr->hMapWnd, infoPtr->hParent, (LPPOINT)&rLarge, 2);
+    CopyRect(&rLarge,
+             &infoPtr->pActiveCell->CellExt);

-    InflateRect(&rLarge, XLARGE - XCELLS, YLARGE - YCELLS);
+    MapWindowPoints(infoPtr->hMapWnd,
+                    infoPtr->hParent,
+                    (VOID*)&rLarge,
+                    2);
+
+    InflateRect(&rLarge,
+                XLARGE - XCELLS,
+                YLARGE - YCELLS);

    infoPtr->hLrgWnd = CreateWindowExW(0,
                                       szLrgCellWndClass,
@@ -166,11 +183,19 @@ static
 VOID
 MoveLargeCell(PMAP infoPtr)
 {
-    RECT rLarge = infoPtr->pActiveCell->CellExt;
+    RECT rLarge;

-    MapWindowPoints(infoPtr->hMapWnd, infoPtr->hParent, (LPPOINT)&rLarge, 2);
+    CopyRect(&rLarge,
+             &infoPtr->pActiveCell->CellExt);

-    InflateRect(&rLarge, XLARGE - XCELLS, YLARGE - YCELLS);
+    MapWindowPoints(infoPtr->hMapWnd,
+                    infoPtr->hParent,
+                    (VOID*)&rLarge,
+                    2);
+
+    InflateRect(&rLarge,
+                XLARGE - XCELLS,
+                YLARGE - YCELLS);

    MoveWindow(infoPtr->hLrgWnd,
               rLarge.left,
@@ -179,7 +204,9 @@ MoveLargeCell(PMAP infoPtr)
               rLarge.bottom - rLarge.top,
               TRUE);

-    InvalidateRect(infoPtr->hLrgWnd, NULL, TRUE);
+    InvalidateRect(infoPtr->hLrgWnd,
+                   NULL,
+                   TRUE);
 }


@@ -189,7 +216,7 @@ GetPossibleCharacters(WCHAR* ch, INT chLen, INT codePageIdx)
 {
    INT i, j;

-    ZeroMemory(ch, sizeof(ch[0]) * chLen);
+    memset(ch, 0, sizeof(ch[0]) * chLen);

    if (codePageIdx <= 0 || codePageIdx > SIZEOF(codePages))
    {
@@ -249,6 +276,11 @@ SetFont(PMAP infoPtr,
                   NULL,
                   TRUE);

+    if (infoPtr->pActiveCell)
+        infoPtr->pActiveCell->bActive = FALSE;
+    infoPtr->pActiveCell = &infoPtr->Cells[0][0];
+    infoPtr->pActiveCell->bActive = TRUE;
+
    // Get all the valid glyphs in this font

    SelectObject(hdc, infoPtr->hFont);
@@ -313,88 +345,14 @@ NotifyParentOfSelection(PMAP infoPtr,
 }


-static
-VOID
-LimitCaretXY(PMAP infoPtr, INT *pX, INT *pY)
-{
-    INT i, X = *pX, Y = *pY, iYStart = infoPtr->iYStart;
-
-    i = XCELLS * (iYStart + Y) + X;
-    while (i >= infoPtr->NumValidGlyphs)
-    {
-        if (X > 0)
-        {
-            --X;
-        }
-        else
-        {
-            X = XCELLS - 1;
-            --Y;
-        }
-        i = XCELLS * (iYStart + Y) + X;
-    }
-
-    *pX = X;
-    *pY = Y;
-}
-
-static
-VOID
-SetCaretXY(PMAP infoPtr, INT X, INT Y, BOOL bLarge, BOOL bInvalidateAll)
-{
-
-    /* set previous active cell to inactive */
-    if (!bInvalidateAll)
-    {
-        InvalidateRect(infoPtr->hMapWnd,
-                       &infoPtr->pActiveCell->CellInt,
-                       FALSE);
-    }
-
-    LimitCaretXY(infoPtr, &X, &Y);
-    infoPtr->CaretX = X;
-    infoPtr->CaretY = Y;
-    UpdateCells(infoPtr);
-
-    /* set new cell to active */
-    infoPtr->pActiveCell = &infoPtr->Cells[Y][X];
-    if (!bInvalidateAll)
-    {
-        InvalidateRect(infoPtr->hMapWnd,
-                       &infoPtr->pActiveCell->CellInt,
-                       FALSE);
-    }
-
-    /* Create if needed */
-    if (bLarge)
-    {
-        if (infoPtr->hLrgWnd)
-            MoveLargeCell(infoPtr);
-        else
-            CreateLargeCell(infoPtr);
-    }
-    else
-    {
-        /* Destroy large window */
-        if (infoPtr->hLrgWnd)
-        {
-            DestroyWindow(infoPtr->hLrgWnd);
-            infoPtr->hLrgWnd = NULL;
-        }
-    }
-
-    if (bInvalidateAll)
-        InvalidateRect(infoPtr->hMapWnd, NULL, FALSE);
-
-    UpdateStatusBar(infoPtr->pActiveCell->ch);
-}
-
 static
 VOID
 OnClick(PMAP infoPtr,
        WORD ptx,
        WORD pty)
 {
+    INT x, y, i;
+
    /*
     * Find the cell the mouse pointer is over.
     * Since each cell is the same size, this can be done quickly using CellSize.
@@ -402,10 +360,47 @@ OnClick(PMAP infoPtr,
     * larger than infoPtr.CellSize * XCELLS , due to the map size being a non integer
     * multiple of infoPtr.CellSize .
     */
-    INT x = min(XCELLS - 1, ptx / max(1, infoPtr->CellSize.cx));
-    INT y = min(YCELLS - 1, pty / max(1, infoPtr->CellSize.cy));
+    x = min(XCELLS - 1, ptx / max(1, infoPtr->CellSize.cx));
+    y = min(YCELLS - 1, pty / max(1, infoPtr->CellSize.cy));

-    SetCaretXY(infoPtr, x, y, TRUE, FALSE);
+    /* Make sure the mouse is within a valid glyph */
+    i = XCELLS * infoPtr->iYStart + y * XCELLS + x;
+    if (i >= infoPtr->NumValidGlyphs)
+    {
+        if (infoPtr->pActiveCell)
+            infoPtr->pActiveCell->bActive = FALSE;
+        infoPtr->pActiveCell = NULL;
+        return;
+    }
+
+    /* if the cell is not already active */
+    if (!infoPtr->Cells[y][x].bActive)
+    {
+        /* set previous active cell to inactive */
+        if (infoPtr->pActiveCell)
+        {
+            /* invalidate normal cells, required when
+             * moving a small active cell via keyboard */
+            if (!infoPtr->pActiveCell->bLarge)
+            {
+                InvalidateRect(infoPtr->hMapWnd,
+                               &infoPtr->pActiveCell->CellInt,
+                               TRUE);
+            }
+
+            infoPtr->pActiveCell->bActive = FALSE;
+            infoPtr->pActiveCell->bLarge = FALSE;
+        }
+
+        /* set new cell to active */
+        infoPtr->pActiveCell = &infoPtr->Cells[y][x];
+        infoPtr->pActiveCell->bActive = TRUE;
+        infoPtr->pActiveCell->bLarge = TRUE;
+        if (infoPtr->hLrgWnd)
+            MoveLargeCell(infoPtr);
+        else
+            CreateLargeCell(infoPtr);
+    }
 }


@@ -416,30 +411,45 @@ MapOnCreate(PMAP infoPtr,
            HWND hParent)
 {
    RECT rc;
+    BOOL Ret = FALSE;

-    infoPtr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MAP));
-    if (!infoPtr)
-        return FALSE;
+    infoPtr = HeapAlloc(GetProcessHeap(),
+                        0,
+                        sizeof(MAP));
+    if (infoPtr)
+    {
+        SetLastError(0);
+        SetWindowLongPtrW(hwnd,
+                          0,
+                          (DWORD_PTR)infoPtr);
+        if (GetLastError() == 0)
+        {
+            ZeroMemory(infoPtr,
+                       sizeof(MAP));

-    SetWindowLongPtrW(hwnd, 0, (LONG_PTR)infoPtr);
+            infoPtr->hMapWnd = hwnd;
+            infoPtr->hParent = hParent;

-    infoPtr->hMapWnd = hwnd;
-    infoPtr->hParent = hParent;
+            GetClientRect(hwnd, &rc);
+            infoPtr->ClientSize.cx = rc.right;
+            infoPtr->ClientSize.cy = rc.bottom;
+            infoPtr->CellSize.cx = infoPtr->ClientSize.cx / XCELLS;
+            infoPtr->CellSize.cy = infoPtr->ClientSize.cy / YCELLS;

-    GetClientRect(hwnd, &rc);
-    infoPtr->ClientSize.cx = rc.right;
-    infoPtr->ClientSize.cy = rc.bottom;
-    infoPtr->CellSize.cx = infoPtr->ClientSize.cx / XCELLS;
-    infoPtr->CellSize.cy = infoPtr->ClientSize.cy / YCELLS;
+            infoPtr->pActiveCell = NULL;

-    infoPtr->pActiveCell = &infoPtr->Cells[0][0];
+            SetGrid(infoPtr);

-    SetGrid(infoPtr);
+            SetScrollPos(infoPtr->hParent, SB_VERT, 0, TRUE);

-    SetScrollPos(infoPtr->hParent, SB_VERT, 0, TRUE);
-    return TRUE;
+            Ret = TRUE;
+        }
+    }
+
+    return Ret;
 }

+
 static
 VOID
 OnVScroll(PMAP infoPtr,
@@ -447,7 +457,6 @@ OnVScroll(PMAP infoPtr,
          INT Pos)
 {
    INT iYDiff, iOldYStart = infoPtr->iYStart;
-    INT X, Y;

    switch (Value)
    {
@@ -471,30 +480,13 @@ OnVScroll(PMAP infoPtr,
            infoPtr->iYStart = Pos;
            break;

-        case SB_TOP:
-            infoPtr->iYStart = 0;
-            SetCaretXY(infoPtr, 0, 0, FALSE, TRUE);
-            return;
-
-        case SB_BOTTOM:
-            infoPtr->iYStart = infoPtr->NumRows;
-            SetCaretXY(infoPtr, XCELLS - 1, YCELLS - 1, FALSE, TRUE);
+       default:
            break;
-
-        default:
-            break;
-    }
+       }

    infoPtr->iYStart = max(0, infoPtr->iYStart);
    infoPtr->iYStart = min(infoPtr->iYStart, infoPtr->NumRows);

-    UpdateCells(infoPtr);
-
-    X = infoPtr->CaretX;
-    Y = infoPtr->CaretY;
-    LimitCaretXY(infoPtr, &X, &Y);
-    SetCaretXY(infoPtr, X, Y, IsWindow(infoPtr->hLrgWnd), FALSE);
-
    iYDiff = iOldYStart - infoPtr->iYStart;
    if (iYDiff)
    {
@@ -513,7 +505,7 @@ OnVScroll(PMAP infoPtr,
            RECT rect;

            /* Invalidate the rect around the active cell since a new cell will become active */
-            if (infoPtr->pActiveCell)
+            if (infoPtr->pActiveCell && infoPtr->pActiveCell->bActive)
            {
                InvalidateRect(infoPtr->hMapWnd,
                               &infoPtr->pActiveCell->CellExt,
@@ -544,8 +536,6 @@ OnVScroll(PMAP infoPtr,
            ShowWindow(infoPtr->hLrgWnd, SW_SHOW);
        }
    }
-
-    UpdateStatusBar(infoPtr->pActiveCell->ch);
 }


@@ -557,172 +547,38 @@ OnPaint(PMAP infoPtr,
    PAINTSTRUCT ps;
    HDC hdc;

+
    if (wParam != 0)
    {
-        if (!GetUpdateRect(infoPtr->hMapWnd, &ps.rcPaint, TRUE))
+        if (!GetUpdateRect(infoPtr->hMapWnd,
+                           &ps.rcPaint,
+                           TRUE))
+        {
            return;
-
+        }
        ps.hdc = (HDC)wParam;
    }
    else
    {
-        hdc = BeginPaint(infoPtr->hMapWnd, &ps);
+        hdc = BeginPaint(infoPtr->hMapWnd,
+                         &ps);
        if (hdc == NULL)
+        {
            return;
+        }
    }

+    DrawGrid(infoPtr, &ps);
+
    FillGrid(infoPtr, &ps);

    if (wParam == 0)
    {
-        EndPaint(infoPtr->hMapWnd, &ps);
+        EndPaint(infoPtr->hMapWnd,
+                 &ps);
    }
 }

-static
-VOID
-MoveUpDown(PMAP infoPtr, INT DY)
-{
-    INT Y = infoPtr->CaretY;
-
-    if (DY < 0) /* Move Up */
-    {
-        if (Y <= 0)
-        {
-            SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0);
-            return;
-        }
-
-        Y -= 1;
-    }
-    else if (DY > 0) /* Move Down */
-    {
-        if (Y + 1 >= YCELLS)
-        {
-            SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0);
-            return;
-        }
-
-        Y += 1;
-    }
-
-    SetCaretXY(infoPtr, infoPtr->CaretX, Y, IsWindow(infoPtr->hLrgWnd), FALSE);
-}
-
-static
-VOID
-MoveLeftRight(PMAP infoPtr, INT DX)
-{
-    INT X = infoPtr->CaretX;
-    INT Y = infoPtr->CaretY;
-
-    if (DX < 0) /* Move Left */
-    {
-        if (X <= 0) /* at left edge */
-        {
-            if (Y <= 0) /* at top */
-            {
-                Y = 0;
-                if (infoPtr->iYStart > 0)
-                    X = XCELLS - 1;
-                SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0);
-            }
-            else
-            {
-                X = XCELLS - 1;
-                Y -= 1;
-            }
-        }
-        else /* Not at left edge */
-        {
-            X -= 1;
-        }
-    }
-    else if (DX > 0) /* Move Right */
-    {
-        if (X + 1 >= XCELLS) /* at right edge */
-        {
-            if (Y + 1 >= YCELLS) /* at bottom */
-            {
-                Y = YCELLS - 1;
-                if (infoPtr->iYStart < infoPtr->NumRows)
-                    X = 0;
-                SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0);
-            }
-            else
-            {
-                X = 0;
-                Y += 1;
-            }
-        }
-        else
-        {
-            X += 1;
-        }
-    }
-
-    SetCaretXY(infoPtr, X, Y, IsWindow(infoPtr->hLrgWnd), FALSE);
-}
-
-static
-VOID
-OnKeyDown(PMAP infoPtr, WPARAM wParam, LPARAM lParam)
-{
-    BOOL bCtrlDown = (GetKeyState(VK_CONTROL) < 0);
-
-    switch (wParam)
-    {
-        case VK_UP:
-            if (bCtrlDown)
-                SetCaretXY(infoPtr, infoPtr->CaretX, 0, FALSE, FALSE);
-            else
-                MoveUpDown(infoPtr, -1);
-            break;
-
-        case VK_DOWN:
-            if (bCtrlDown)
-                SetCaretXY(infoPtr, infoPtr->CaretX, YCELLS - 1, FALSE, FALSE);
-            else
-                MoveUpDown(infoPtr, +1);
-            break;
-
-        case VK_LEFT:
-            if (bCtrlDown)
-                SetCaretXY(infoPtr, 0, infoPtr->CaretY, FALSE, FALSE);
-            else
-                MoveLeftRight(infoPtr, -1);
-            break;
-
-        case VK_RIGHT:
-            if (bCtrlDown)
-                SetCaretXY(infoPtr, XCELLS - 1, infoPtr->CaretY, FALSE, FALSE);
-            else
-                MoveLeftRight(infoPtr, +1);
-            break;
-
-        case VK_PRIOR: /* Page Up */
-            SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_PAGEUP, 0), 0);
-            break;
-
-        case VK_NEXT: /* Page Down */
-            SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_PAGEDOWN, 0), 0);
-            break;
-
-        case VK_HOME:
-            if (bCtrlDown)
-                SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_TOP, 0), 0);
-            else
-                SetCaretXY(infoPtr, 0, infoPtr->CaretY, FALSE, FALSE);
-            break;
-
-        case VK_END:
-            if (bCtrlDown)
-                SendMessageW(infoPtr->hMapWnd, WM_VSCROLL, MAKEWPARAM(SB_BOTTOM, 0), 0);
-            else
-                SetCaretXY(infoPtr, XCELLS - 1, infoPtr->CaretY, FALSE, FALSE);
-            break;
-    }
-}

 LRESULT
 CALLBACK
@@ -731,10 +587,13 @@ MapWndProc(HWND hwnd,
           WPARAM wParam,
           LPARAM lParam)
 {
-    PMAP infoPtr = (PMAP)GetWindowLongPtrW(hwnd, 0);
+    PMAP infoPtr;
    LRESULT Ret = 0;
    WCHAR lfFaceName[LF_FACESIZE];

+    infoPtr = (PMAP)GetWindowLongPtrW(hwnd,
+                                      0);
+
    switch (uMsg)
    {
        case WM_CREATE:
@@ -749,16 +608,12 @@ MapWndProc(HWND hwnd,
            break;
        }

-        case WM_KEYDOWN:
-        {
-            OnKeyDown(infoPtr, wParam, lParam);
-            break;
-        }
-
        case WM_LBUTTONDOWN:
        {
-            SetFocus(hwnd);
-            OnClick(infoPtr, LOWORD(lParam), HIWORD(lParam));
+            OnClick(infoPtr,
+                    LOWORD(lParam),
+                    HIWORD(lParam));
+
            break;
        }

@@ -766,48 +621,52 @@ MapWndProc(HWND hwnd,
        {
            if (wParam & MK_LBUTTON)
            {
-                OnClick(infoPtr, LOWORD(lParam), HIWORD(lParam));
+                OnClick(infoPtr,
+                        LOWORD(lParam),
+                        HIWORD(lParam));
            }
            break;
        }

        case WM_LBUTTONDBLCLK:
        {
-            if (!infoPtr->pActiveCell || GetFocus() != hwnd)
+            if (!infoPtr->pActiveCell)
                break;

            NotifyParentOfSelection(infoPtr,
                                    FM_SETCHAR,
                                    infoPtr->pActiveCell->ch);

-            if (infoPtr->hLrgWnd)
+            if (infoPtr->pActiveCell->bLarge)
            {
                DestroyWindow(infoPtr->hLrgWnd);
                infoPtr->hLrgWnd = NULL;
            }
+
+            infoPtr->pActiveCell->bLarge = FALSE;
+
            break;
        }

        case WM_VSCROLL:
        {
-            OnVScroll(infoPtr, LOWORD(wParam), HIWORD(wParam));
+            OnVScroll(infoPtr,
+                      LOWORD(wParam),
+                      HIWORD(wParam));
+
            break;
        }

        case FM_SETCHARMAP:
-            infoPtr->CaretX = infoPtr->CaretY = infoPtr->iYStart = 0;
            infoPtr->CharMap = LOWORD(wParam);
            wcsncpy(lfFaceName,
                    infoPtr->CurrentFont.lfFaceName,
                    SIZEOF(lfFaceName));
            SetFont(infoPtr, lfFaceName);
-            SetCaretXY(infoPtr, infoPtr->CaretX, infoPtr->CaretY, FALSE, TRUE);
            break;

        case FM_SETFONT:
-            infoPtr->CaretX = infoPtr->CaretY = infoPtr->iYStart = 0;
            SetFont(infoPtr, (LPWSTR)lParam);
-            SetCaretXY(infoPtr, infoPtr->CaretX, infoPtr->CaretY, FALSE, TRUE);
            break;

        case FM_GETCHAR:
@@ -820,27 +679,32 @@ MapWndProc(HWND hwnd,
            return (LRESULT)infoPtr->hFont;

        case WM_PAINT:
-            OnPaint(infoPtr, wParam);
+        {
+            OnPaint(infoPtr,
+                    wParam);
            break;
+        }

        case WM_DESTROY:
+        {
            DeleteObject(infoPtr->hFont);
-            HeapFree(GetProcessHeap(), 0, infoPtr);
-            SetWindowLongPtrW(hwnd, 0, (LONG_PTR)NULL);
-            break;
-
-        case WM_GETDLGCODE:
-            return DLGC_WANTARROWS;
-
-        case WM_SETFOCUS:
-        case WM_KILLFOCUS:
-            if (!infoPtr->hLrgWnd)
-                InvalidateRect(hwnd, &(infoPtr->pActiveCell->CellInt), FALSE);
+            HeapFree(GetProcessHeap(),
+                     0,
+                     infoPtr);
+            SetWindowLongPtrW(hwnd,
+                              0,
+                              (DWORD_PTR)NULL);
            break;
+        }

        default:
-            Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam);
+        {
+            Ret = DefWindowProcW(hwnd,
+                                 uMsg,
+                                 wParam,
+                                 lParam);
            break;
+        }
    }

    return Ret;
@@ -876,6 +740,9 @@ RegisterMapClasses(HINSTANCE hInstance)
 VOID
 UnregisterMapClasses(HINSTANCE hInstance)
 {
-    UnregisterClassW(szMapWndClass, hInstance);
-    UnregisterClassW(szLrgCellWndClass, hInstance);
+    UnregisterClassW(szMapWndClass,
+                    hInstance);
+
+    UnregisterClassW(szLrgCellWndClass,
+                    hInstance);
 }
--- a/base/applications/charmap/precomp.h
+++ b/base/applications/charmap/precomp.h
@@ -37,6 +37,8 @@ typedef struct _CELL
 {
    RECT CellExt;
    RECT CellInt;
+    BOOL bActive;
+    BOOL bLarge;
    WCHAR ch;
 } CELL, *PCELL;

@@ -51,13 +53,13 @@ typedef struct _MAP
    PCELL pActiveCell;
    HFONT hFont;
    LOGFONTW CurrentFont;
-    INT CaretX, CaretY;
    INT iYStart;
    INT NumRows;
    INT CharMap;

    USHORT ValidGlyphs[MAX_GLYPHS];
    USHORT NumValidGlyphs;
+
 } MAP, *PMAP;

 typedef struct {
--- a/base/applications/charmap/settings.c
+++ b/base/applications/charmap/settings.c
@@ -93,7 +93,7 @@ extern void LoadSettings(void)
        lstatus = RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvancedChecked, &size);
        if (lstatus == ERROR_SUCCESS && type == REG_DWORD && dwAdvancedChecked != FALSE)
        {
-            SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, 0, 0);
+            SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, MF_CHECKED, 0);
        }

    RegCloseKey(hKey);
--- 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Faber	8294696f3b	[CRT] Fix MSVC version of call_handler	2022-01-16 23:31:07 -05:00
Thomas Faber	3ccbd2a842	[NTOS:MM] Randomly allocate from special pool	2022-01-16 23:31:07 -05:00
Thomas Faber	cf373fbc57	[WIN32K:NTUSER] Regularly validate thread window list. CORE-18002	2022-01-16 23:31:07 -05:00
Thomas Faber	f120239ba1	[PORTCLS] DEBUG: Fill memory on free	2022-01-16 23:30:55 -05:00
Thomas Faber	77cdca0d49	[PORTCLS] HACK: Force zeroing in operator new, even though this is not standard-compliant	2022-01-16 23:30:50 -05:00
Thomas Faber	e7c4b00017	[PORTCLS] Centralize AddRef/Release implementation and make it thread-safe.	2022-01-16 23:30:19 -05:00