[0.4.13] Branch releases/0.4.13 & change KERNEL_VERSION_BUILD_TYPE "RC"

.clang-format

@@ -1,35 +0,0 @@
-# full manual is at https://clang.llvm.org/docs/ClangFormatStyleOptions.html
----
-BasedOnStyle: Microsoft
-
-IndentWidth:     4
-UseTab:          Never
-
-IndentCaseLabels: true
-
-AllowAllArgumentsOnNextLine: false
-AllowAllParametersOfDeclarationOnNextLine: false
-
-BinPackParameters: false
-BinPackArguments: true
-
-# This applies to () [] <>
-AlignAfterOpenBracket: AlwaysBreak
-
-# Always break before braces
-BreakBeforeBraces: Allman
-
-# return type on it's own line
-AlwaysBreakAfterReturnType: All
-
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-...

.editorconfig

@@ -1,14 +0,0 @@
-# EditorConfig is awesome: https://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-[*]
-insert_final_newline = true
-charset = utf-8
-indent_size = 4
-indent_style = space
-trim_trailing_whitespace = true
-
-[*.{json,yml,md}]
-indent_size = 2

.github/FUNDING.yml

@@ -1,2 +1,2 @@
-custom: ['https://reactos.org/donate/', 'https://www.paypal.me/ReactOS']
+custom: ['https://reactos.org/donating', 'https://paypal.me/ReactOS']
 liberapay: ReactOS

.github/labeler.yml

@@ -1,15 +0,0 @@
-# Labelling by the files touched
-drivers:
-  - drivers/**
-  - sdk/lib/drivers/**
-  - any: ["win32ss/drivers/**", "!win32ss/drivers/font/**"]
-
-freeldr:
-  - boot/freeldr/**
-
-"kernel&hal":
-  - hal/**
-  - ntoskrnl/**
-
-ROSTESTS:
-  - modules/rostests/**

.github/workflows/build.yml

@@ -1,281 +0,0 @@
-name: Build
-on: [push, pull_request]
-
-jobs:
-  build-linux:
-    strategy:
-      matrix:
-        compiler: [gcc, clang]
-        arch: [i386, amd64]
-        config: [Debug, Release]
-      fail-fast: false
-    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 ::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@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')}}
-    - name: Compile RosBE
-      if: ${{ steps.get_rosbe.outputs.cache-hit != 'true' }}
-      run: |
-        chmod +x build_rosbe_ci.sh
-        ./build_rosbe_ci.sh ${{github.workspace}}/RosBE-CI
-    - name: Install ccache
-      run: sudo apt install ccache
-    - name: Install LLVM
-      if: ${{ matrix.compiler == 'clang' }}
-      run: |
-        export LLVM_VERSION=13
-        wget https://apt.llvm.org/llvm.sh
-        chmod +x llvm.sh
-        sudo ./llvm.sh $LLVM_VERSION
-        echo "D_CLANG_VERSION=-DCLANG_VERSION=$LLVM_VERSION" >> $GITHUB_ENV
-    - name: Source checkout
-      uses: actions/checkout@v2
-      with:
-        path: src
-    - name: Set up cache for ccache
-      uses: actions/cache@v2
-      with:
-        path: ccache
-        key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
-        restore-keys: |
-          ccache-${{matrix.compiler}}-${{matrix.arch}}-
-    - name: Set ccache settings
-      run: |
-        echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV
-        echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV
-        echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV
-        echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV
-    - name: Ease ccache compiler check (GCC)
-      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}} -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
-      run: echo 'cmake --build ${{github.workspace}}/build --target bootcd --target livecd' | ${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}}
-    - name: Print ccache statistics
-      run: ccache -s
-    - name: Upload ISOs
-      uses: actions/upload-artifact@v2
-      with:
-        name: reactos-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
-        path: |
-          build/bootcd.iso
-          build/livecd.iso
-
-  build-msvc:
-    strategy:
-      matrix:
-        toolset: ['14.2', '14.1'] # VS 2019, 2017
-        arch: [i386, amd64]
-        config: [Debug, Release]
-        include:
-        - arch: i386 # Not compiling on amd64 prompt
-          toolset: '14.0' # VS 2015
-      fail-fast: false
-    runs-on: windows-latest
-    steps:
-    - name: Install ninja
-      run: choco install -y ninja
-    - name: Install Flex & Bison
-      run: |
-        curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
-        7z x flexbison.7z -O${{github.workspace}}\bin
-        echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        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 (x86)
-      if: ${{ matrix.arch == 'i386' }}
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: amd64_x86
-        toolset: ${{matrix.toolset}}
-    - name: Activate VS cmd (amd64)
-      if: ${{ matrix.arch == 'amd64' }}
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: amd64
-        toolset: ${{matrix.toolset}}
-    - name: Source checkout
-      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
-      run: cmake --build build  -- -k0
-    - name: Generate ISOs
-      run: cmake --build build --target bootcd --target livecd
-    - name: Upload ISOs
-      uses: actions/upload-artifact@v2
-      with:
-        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@v2
-      with:
-        name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
-        path: build/msvc_pdb
-
-  build-msvc-arm:
-    strategy:
-      matrix:
-        toolset: ['14.2', '14.1'] # VS 2019, 2017
-        arch: [arm]
-        config: [Debug, Release]
-      fail-fast: false
-    runs-on: windows-latest
-    steps:
-    - name: Install ninja
-      run: choco install -y ninja
-    - name: Install Flex & Bison
-      run: |
-        curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
-        7z x flexbison.7z -O${{github.workspace}}\bin
-        echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        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)
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x86_arm
-        toolset: ${{matrix.toolset}}
-    - name: Source checkout
-      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 applications
-      run: cmake --build build --target base/applications/all
-    - name: Build control panel applets
-      run: cmake --build build --target dll/cpl/all
-    - name: Build rosapps
-      run: cmake --build build --target modules/rosapps/all
-    - name: Upload compiled binaries
-      uses: actions/upload-artifact@v2
-      with:
-        name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
-        path: |
-          build/base/applications
-          build/dll/cpl
-          build/modules/rosapps
-          !**/CMakeFiles
-          !**/cmake_install.cmake
-          !**/*.asm
-          !**/*.bin
-          !**/*.c
-          !**/*.def
-          !**/*.exp
-          !**/*.h
-          !**/*.lib
-          !**/*.mc
-          !**/*.obj
-          !**/*.rc
-          !**/*.tlb
-    - name: Upload debug symbols
-      if: ${{ matrix.config == 'Debug' }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
-        path: build/msvc_pdb
-
-  build-clang-cl:
-    strategy:
-      matrix:
-        arch: [i386, amd64]
-        config: [Debug, Release]
-      fail-fast: false
-    runs-on: windows-latest
-    steps:
-    - name: Install ninja
-      run: choco install -y ninja
-    - name: Install LLVM
-      run: |
-        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: |
-        curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
-        7z x flexbison.7z -O${{github.workspace}}\bin
-        echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        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 (x86)
-      if: ${{ matrix.arch == 'i386' }}
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: amd64_x86
-        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.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@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 -DUSE_CLANG_CL:BOOL=TRUE
-    - name: Build
-      run: cmake --build build -- -k0
-    - name: Generate ISOs
-      run: cmake --build build --target bootcd --target livecd
-    - name: Upload ISOs
-      uses: actions/upload-artifact@v2
-      with:
-        name: reactos-clang-cl-${{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@v2
-      with:
-        name: reactos-syms-clang-cl-${{matrix.arch}}-${{matrix.config}}-${{github.sha}}
-        path: build/msvc_pdb
-
-  build-msbuild-i386:
-    name: MSBuild (i386)
-    runs-on: windows-latest
-    steps:
-    - name: Install Flex and Bison
-      run: |
-        curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
-        7z x flexbison.7z -O${{github.workspace}}\bin
-        echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        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: Add CL to PATH
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: amd64_x86
-    - uses: actions/checkout@v2
-      with:
-        path: src
-    - name: Configure
-      run: |
-        mkdir build
-        cd build
-        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

.github/workflows/labeler.yml

@@ -1,11 +0,0 @@
-name: "Pull Request Labeler"
-on:
-- pull_request_target
-
-jobs:
-  triage:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/labeler@v3
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -1,14 +1,13 @@
-compile_commands.json
 output-*
 modules/optional
 modules/bootcd_extras
 modules/livecd_extras
 modules/hybridcd_extras
 modules/3rdparty
-modules/[Aa][Hh][Kk]_[Tt]ests
-.cache
+modules/ahk_tests
+modules/AHK_Tests
 .cproject
 .project
 .settings
+build
 .vscode
-sdk/tools/winesync/winesync.cfg

.gitmessage

@@ -4,9 +4,9 @@
 # [MODULE] A short but descriptive summary (#pr-num)
 #
 # A comprehensible description of WHY you did this work. Do not limit
-# yourself here.
-# The width of the description is arbitary, but it is a good idea to
-# wrap the text by 72 chars.
+# yourself here. 
+# The width of the description is arbitary, but it is a good idea to 
+# wrap the text by 72 chars. 
 #
 # CORE-XXXX CIDXXXXX
 # ----------------------
@@ -17,6 +17,6 @@
 # * Description of a commit should explain WHY a change was made.
 # * JIRA, Coverity ID references should be placed at the bottom row.
 # * There must be a newline between summary, description and bug IDs.
-# * GitHub Pull Request ID should be referenced in the summary in
-#   parens. If the resulting summary is longer than 70 chars it may
+# * GitHub Pull Request ID should be referenced in the summary in 
+#   parens. If the resulting summary is longer than 70 chars it may 
 #   be placed last in the ID row to prevent hard wrapping on GitHub.

.gitpod.Dockerfile

@@ -1,22 +0,0 @@
-FROM gitpod/workspace-full-vnc
-
-USER gitpod
-
-# Install custom tools, runtime, etc. using apt-get
-# For example, the command below would install "bastet" - a command line tetris clone:
-#
-# RUN sudo apt-get -q update && #     sudo apt-get install -yq bastet && #     sudo rm -rf /var/lib/apt/lists/*
-#
-# More information: https://www.gitpod.io/docs/config-docker/
-RUN sudo apt-get -q update && \
-    sudo apt-get -yq upgrade && \
-    sudo apt-get -yq install qemu-system-x86 qemu-utils gdb-mingw-w64 && \
-    sudo rm -rf /var/lib/apt/lists/*
-
-RUN wget https://svn.reactos.org/amine/RosBEBinFull.tar.gz && \
-    sudo tar -xzvf RosBEBinFull.tar.gz -C /usr/local --one-top-level=RosBE --strip-components 1 && \
-    rm -f RosBEBinFull.tar.gz
-
-RUN echo 'export PATH=/usr/local/RosBE/i386/bin:$PATH' >> /home/gitpod/.profile
-
-RUN qemu-img create -f qcow2 reactos_hdd.qcow 10G

.gitpod.yml

@@ -1,18 +0,0 @@
-tasks:
-  - before: > 
-      brew install cmake ninja
-    init: >
-      mkdir -p /workspace/reactos/build &&
-      cd /workspace/reactos/build &&
-      cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DGDB:BOOL=TRUE -DSEPARATE_DBG:BOOL=TRUE -D_WINKD_:BOOL=TRUE -DKDBG:BOOL=FALSE -DENABLE_ROSTESTS:BOOL=TRUE -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -G "Ninja" &&
-      ninja xdk psdk 
-    command: >
-      cd /workspace/reactos/build &&
-      ninja all
-
-image:
-  file: .gitpod.Dockerfile
-
-vscode:
-  extensions:
-    - ms-vscode.cpptools@0.27.0-insiders3:Djj3Csw0GXjmueWAPWvTsg==

.theia/launch.json

@@ -1,29 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "cppdbg",
-      "request": "launch",
-      "name": "livecd (qemu)",
-      "preLaunchTask": "launch livecd",
-      "miDebuggerServerAddress": "localhost:9091",
-      "miDebuggerArgs": "-l 15 -ex 'set sysroot ${workspaceRoot}/build/symbols'",
-      "program": "${workspaceRoot}/build/ntoskrnl/ntoskrnl.exe",
-      "cwd": "${workspaceRoot}/build",
-      "miDebuggerPath": "i686-w64-mingw32-gdb"
-    },
-    {
-      "type": "cppdbg",
-      "request": "launch",
-      "name": "bootcd (qemu)",
-      "preLaunchTask": "launch bootcd",
-      "miDebuggerServerAddress": "localhost:9091",
-      "miDebuggerArgs": "-l 15 -ex 'set sysroot ${workspaceRoot}/build/symbols'",
-      "program": "${workspaceRoot}/build/ntoskrnl/ntoskrnl.exe",
-      "cwd": "${workspaceRoot}/build",
-      "miDebuggerPath": "i686-w64-mingw32-gdb"
-    }
-  ]
-}

.theia/settings.json

@@ -1,10 +0,0 @@
-{
-    "cpp.buildConfigurations": [
-        {
-            "name": "build",
-            "directory": "${workspaceFolder}/build"
-        }
-    ],
-    "cpp.clangdArgs": "--background-index",
-    "C_Cpp.intelliSenseEngine": "Disabled",
-}

.theia/tasks.json

@@ -1,91 +0,0 @@
-{
-	// See https://go.microsoft.com/fwlink/?LinkId=733558
-	// for the documentation about the tasks.json format
-	"version": "2.0.0",
-	"tasks": [
-        {
-            "label": "build livecd",
-            "type": "shell",
-            "command": "ninja livecd",
-            "options": {
-                "cwd": "${workspaceFolder}/build"
-            },
-            "group": "build",
-            "problemMatcher": [
-                {
-                    "owner": "cpp",
-                    "fileLocation": ["relative", "${workspaceFolder}/build"],
-                    "pattern": {
-                        "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
-                        "file": 1,
-                        "line": 2,
-                        "column": 3,
-                        "severity": 4,
-                        "message": 5
-                    }
-                }
-            ]
-        },
-        {
-            "label": "build bootcd",
-            "type": "shell",
-            "command": "ninja bootcd",
-            "options": {
-                "cwd": "${workspaceFolder}/build"
-            },
-            "group": "build",
-            "problemMatcher": [
-                {
-                    "base": "$gcc",
-                    "fileLocation": ["relative", "${workspaceFolder}/build"],
-                },
-            ]
-        },
-        {
-            "label": "launch livecd",
-            "type": "process",
-            "options": {
-                "cwd": "${workspaceFolder}/build"
-            },
-            "dependsOn": [
-                "build livecd"
-            ],
-            "dependsOrder": "sequence",
-            "command": "qemu-system-i386",
-            "args": [
-                "-cdrom", "livecd.iso",
-                "-chardev", "socket,port=9091,host=localhost,server,nowait,id=char0",
-                "-serial", "chardev:char0",
-                "-nic", "user,model=e1000",
-                "-boot", "d",
-                "-chardev", "socket,path=/tmp/livecd_dbg,server,nowait,id=char1", "-serial", "chardev:char1",
-                "-daemonize"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "launch bootcd",
-            "type": "process",
-            "options": {
-                "cwd": "${workspaceFolder}/build"
-            },
-            "dependsOn": [
-                "build bootcd"
-            ],
-            "dependsOrder": "sequence",
-            "command": "qemu-system-i386",
-            "args": [
-                "-cdrom", "bootcd.iso",
-                "-hda", "${env:HOME}/reactos_hdd.qcow",
-                "-boot", "d",
-                "-m", "1024",
-                "-chardev", "socket,port=9091,host=localhost,server,nowait,id=char0",
-                "-serial", "chardev:char0",
-                "-nic", "user,model=e1000",
-                "-chardev", "socket,path=/tmp/bootcd_dbg,server,nowait,id=char1", "-serial", "chardev:char1",
-                "-daemonize"
-            ],
-            "problemMatcher": []
-        },
-    ],
-}

.travis.yml

@@ -0,0 +1,12 @@
+language: bash
+
+git:
+  depth: 5
+
+before_script:
+  - wget https://svn.reactos.org/amine/RosBEBinFull.tar.gz -O RosBE.tar.gz
+  - tar -xzf RosBE.tar.gz
+  - echo 'mkdir ../Build && cd ../Build && $TRAVIS_BUILD_DIR/configure.sh -DENABLE_ROSTESTS=1 && ninja -k 0 && ninja bootcd' > tmp_file
+
+script:
+  - ./RosBEBinFull/RosBE.sh < tmp_file

CMakeLists.txt

@@ -1,21 +1,26 @@
 
-cmake_minimum_required(VERSION 3.17.0)
+cmake_minimum_required(VERSION 3.2.1)
+cmake_policy(VERSION 3.2.1)
 
 if(NOT CMAKE_VERSION MATCHES "ReactOS")
     message(WARNING "Building with \"${CMAKE_COMMAND}\", which is not the custom CMake included in RosBE, might cause build issues...")
 endif()
 
-include(CMakeDependentOption)
+if(POLICY CMP0058)
+    # Ninja requires custom command byproducts to be explicit
+    cmake_policy(SET CMP0058 OLD)
+endif()
 
-# CMAKE_CROSSCOMPILING and MSVC_IDE are not set until project() is called, so let's test this instead
-if ((DEFINED CMAKE_TOOLCHAIN_FILE) AND (CMAKE_GENERATOR MATCHES "Visual Studio.*"))
-# Do not use MSVC_RUNTIME_LIBRARY target property. We use our own flags instead
-message(WARNING "Setting policy CMP0091 to OLD behaviour")
-cmake_policy(SET CMP0091 OLD)
+if(POLICY CMP0065)
+    # Do not add flags to export symbols from executables without the ENABLE_EXPORTS target property
+    cmake_policy(SET CMP0065 NEW)
 endif()
 
 project(REACTOS)
 
+# Versioning
+include(sdk/include/reactos/version.cmake)
+
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
@@ -24,13 +29,10 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE)
 set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE)
 set(CMAKE_COLOR_MAKEFILE OFF)
 set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
-set(CMAKE_C_STANDARD 99)
-set(CMAKE_CXX_STANDARD 11)
 #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 
-# check that the ARCH (target architecture) variable is defined
 if(NOT ARCH)
-    message(FATAL_ERROR "Target architecture (ARCH) is not defined. Please, choose one of: i386, amd64, arm, arm64")
+    set(ARCH i386)
 endif()
 # Now the ARCH variable will be in lowercase.
 # It is needed because STREQUAL comparison
@@ -39,93 +41,34 @@ endif()
 # for more information.
 string(TOLOWER ${ARCH} ARCH)
 
-# set possible values for cmake GUI
-set_property(CACHE ARCH PROPERTY STRINGS "i386" "amd64" "arm" "arm64")
-
-# Alternative WinNT-compatible architecture string
-if(ARCH STREQUAL "i386")
-    set(WINARCH "x86")
-else()
-    set(WINARCH ${ARCH})
-endif()
-
-# set CMAKE_BUILD_TYPE if not set
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    message(STATUS "Setting build type to Debug as none was specified.")
-    set(CMAKE_BUILD_TYPE "Debug" CACHE
-        STRING "Choose the type of build." FORCE)
-    # Set the possible values of build type for cmake-gui
-    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-                 "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
-endif()
-
-# Versioning
-include(sdk/include/reactos/version.cmake)
-
 # Compile options
-include(sdk/cmake/config.cmake)
+if(ARCH STREQUAL "i386")
+    include(sdk/cmake/config.cmake)
+elseif(ARCH STREQUAL "amd64")
+    include(sdk/cmake/config-amd64.cmake)
+elseif(ARCH STREQUAL "arm")
+    include(sdk/cmake/config-arm.cmake)
+endif()
 
 # Compiler flags handling
 include(sdk/cmake/compilerflags.cmake)
 
 add_definitions(-D__REACTOS__)
 
+# Double escape, since CMake unescapes before putting it on the command-line, where it's unescaped again by GCC/CL.
+add_definitions(-DREACTOS_SOURCE_DIR="${REACTOS_SOURCE_DIR}")
+add_definitions(-DREACTOS_BINARY_DIR="${REACTOS_BINARY_DIR}")
+
 # 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 (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}=)
-else()
-    string(LENGTH ${_PATH_PREFIX} _PATH_PREFIX_LENGTH)
-    string(LENGTH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_LENGTH)
-    math(EXPR REACTOS_SOURCE_DIR_LENGTH "${REACTOS_SOURCE_DIR_LENGTH} + 1")
-    add_compile_definitions("$<$<COMPILE_LANGUAGE:C,CXX>:__RELFILE__=&__FILE__[__FILE__[0] == '.' ? ${_PATH_PREFIX_LENGTH} : ${REACTOS_SOURCE_DIR_LENGTH}]>")
-endif()
+add_compile_flags(-D__RELFILE__="&__FILE__[__FILE__[0] == '.' ? sizeof \\\"${_PATH_PREFIX}\\\" - 1 : sizeof REACTOS_SOURCE_DIR]")
 
 if(MSVC_IDE)
-    add_compile_options("/MP")
+    add_compile_flags("/MP")
 endif()
 
 # Bison and Flex support
-find_package(BISON REQUIRED)
-find_package(FLEX REQUIRED)
-
-if(MSVC_IDE)
-    # Bison needs M4 and BISON_PKGDATADIR set at build time,
-    # but visual studio is hardly ever opened from the configure-time environment.
-    # Since cmake does not support setting env variables for a custom command,
-    # we have to write a wrapper that sets the variables and then executes bison.
-    # Idea taken from https://stackoverflow.com/a/35032051/4928207
-    if(DEFINED ENV{M4})
-        # Store this environment variable for configure re-runs from withing visual studio.
-        SET(ROS_SAVED_M4 "$ENV{M4}" CACHE INTERNAL "")
-    endif()
-    if(DEFINED ENV{BISON_PKGDATADIR})
-        SET(ROS_SAVED_BISON_PKGDATADIR "$ENV{BISON_PKGDATADIR}" CACHE INTERNAL "")
-    endif()
-
-    # Tell the user about a misconfigured environment
-    if("x${ROS_SAVED_M4}x" STREQUAL "xx" OR "x${ROS_SAVED_BISON_PKGDATADIR}x" STREQUAL "xx")
-        message(FATAL_ERROR "\nM4 or BISON_PKGDATADIR environment variables not set, cannot continue!\n"
-            "See https://reactos.org/wiki/Visual_Studio for more information!")
-    endif()
-
-    file(WRITE "${CMAKE_BINARY_DIR}/bison_wrapper.cmd"
-                "@ECHO OFF\n"
-                "set M4=${ROS_SAVED_M4}\n"
-                "set BISON_PKGDATADIR=${ROS_SAVED_BISON_PKGDATADIR}\n"
-                "${BISON_EXECUTABLE} %*\n")
-    set(BISON_EXECUTABLE "${CMAKE_BINARY_DIR}/bison_wrapper.cmd")
-    # And the same hacks for FLEX
-    file(WRITE "${CMAKE_BINARY_DIR}/flex_wrapper.cmd"
-                "@ECHO OFF\n"
-                "set M4=${ROS_SAVED_M4}\n"
-                "set BISON_PKGDATADIR=${ROS_SAVED_BISON_PKGDATADIR}\n"
-                "${FLEX_EXECUTABLE} %*\n")
-    set(FLEX_EXECUTABLE "${CMAKE_BINARY_DIR}/flex_wrapper.cmd")
-endif()
+# include(sdk/cmake/bison-flex.cmake)
 
 if(NOT CMAKE_CROSSCOMPILING)
     set(TOOLS_FOLDER ${CMAKE_CURRENT_BINARY_DIR})
@@ -140,8 +83,13 @@ if(NOT CMAKE_CROSSCOMPILING)
         if(MSVC_VERSION GREATER 1699)
             add_definitions(/D_ALLOW_KEYWORD_MACROS)
         endif()
+        if(NOT USE_CLANG_CL)
+            # FIXME: Inspect
+            add_definitions(/Dinline=__inline)
+        endif()
     endif()
-    add_subdirectory(sdk/include/host)
+
+    include_directories(sdk/include/host)
 
     if(NOT MSVC)
         add_subdirectory(dll/win32/dbghelp)
@@ -151,10 +99,12 @@ if(NOT CMAKE_CROSSCOMPILING)
 
     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 rsym pefixup)
+        list(APPEND NATIVE_TARGETS rsym)
     endif()
 
-    install(TARGETS ${NATIVE_TARGETS})
+    export(TARGETS ${NATIVE_TARGETS} FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+    configure_file(sdk/cmake/host-tools.in ${CMAKE_BINARY_DIR}/TargetList.cmake)
+
 else()
     # Add host tools target
     include(sdk/cmake/host-tools.cmake)
@@ -163,21 +113,8 @@ else()
     # We don't need CMake importlib handling.
     unset(CMAKE_IMPORT_LIBRARY_SUFFIX)
 
-    # Print build type(s)
-    if(CMAKE_CONFIGURATION_TYPES)
-        # Multi-config generators, like Visual Studio (MSBuild).
-        message("-- Configuration types: ${CMAKE_CONFIGURATION_TYPES}")
-    else()
-        # Single-configuration generators, like Ninja.
-        message("-- Build type: ${CMAKE_BUILD_TYPE}")
-    endif()
-
-    # Always add /MT in VS CMAKE_GENERATOR and define _SBCS otherwise VS thinks it's a multi-byte or whatever project
-    if (MSVC_IDE)
-        add_compile_options("/MT")
-        add_compile_definitions(_SBCS)
-    endif()
-
+    # Print build type
+    message("-- Build Type: ${CMAKE_BUILD_TYPE}")
 
     # adjust the default behaviour of the FIND_XXX() commands:
     # search headers and libraries in the target environment, search
@@ -186,26 +123,8 @@ else()
     set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
     set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
 
-    # Add our own target properties
-    # General module definitions
-    define_property(TARGET PROPERTY REACTOS_MODULE_TYPE
-        BRIEF_DOCS "The type of this module"
-        FULL_DOCS [[
-The type of this module.
-One of "nativecui", "nativedll", "kernelmodedriver", "wdmdriver", "kerneldll", "win32cui", "win32gui", "win32dll", "win32ocx", "cpl" or "module"]])
-
-    # C++
-    define_property(TARGET PROPERTY WITH_CXX_EXCEPTIONS
-        BRIEF_DOCS "Enable C++ exceptions on this target"
-        FULL_DOCS [[
-Enables C++ exception handling.
-Enable this if the module uses try/catch or throw. You might also need this if you use a standard operator new (the one without nothrow).]])
-    define_property(TARGET PROPERTY WITH_CXX_RTTI
-        BRIEF_DOCS "Enable C++ RTTI on this target"
-        FULL_DOCS [[
-Enables run-time type information.
-Enable this if the module uses typeid or dynamic_cast. You will probably need to link yith cpprt as well, if you are not already using STL.]])
-
+    #useful stuff!
+    include(CMakeParseArguments)
 
     if(DBG)
         add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE)
@@ -221,15 +140,10 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
         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(GCC)
-        message(WARNING "-- Disabling precompiled headers on GCC by default CORE-17108.")
-        option(PCH "Whether to use precompiled headers" OFF)
+    if(CMAKE_VERSION MATCHES "ReactOS")
+        set(PCH 1 CACHE BOOL "Whether to use precompiled headers")
     else()
-        option(PCH "Whether to use precompiled headers" ON)
+        set(PCH 0 CACHE BOOL "Whether to use precompiled headers")
     endif()
 
     # Version Options
@@ -246,26 +160,14 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
             add_definitions(-D_M_IX86)
         endif()
         add_definitions(-D_X86_ -D__i386__ -Di386)
-        if(SARCH STREQUAL "xbox")
-            add_definitions(-DSARCH_XBOX)
-        elseif(SARCH STREQUAL "pc98")
-            add_definitions(-DSARCH_PC98)
-        endif()
     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)
-        endif()
-        add_definitions(-D_AMD64_ -D__x86_64__ -D_WIN64)
+        add_definitions(-D_M_AMD64 -D_AMD64_ -D__x86_64__ -D_WIN64)
     elseif(ARCH STREQUAL "arm")
         # _M_ARM is already defined by toolchain
         add_definitions(-D_ARM_ -D__arm__ -DWIN32)
-        if(SARCH STREQUAL "omap3-zoom2")
+        if(SARCH STREQUAL "omap-zoom2")
             add_definitions(-D_ZOOM2_)
         endif()
-    elseif(ARCH STREQUAL "arm64")
-        # GNU tools refer to arm64 as aarch64
-        add_definitions(-D_ARM64_ -D__arm64__ -D__aarch64__ -D_WIN64)
     endif()
 
     # Other
@@ -273,17 +175,13 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
     if(ARCH STREQUAL "i386")
         add_definitions(-DUSE_COMPILER_EXCEPTIONS -D_USE_32BIT_TIME_T)
     elseif(ARCH STREQUAL "amd64")
-        add_compile_definitions(USE_COMPILER_EXCEPTIONS)
+        add_definitions(-DUSE_COMPILER_EXCEPTIONS -DNO_UNDERSCORE_PREFIX)
     elseif(ARCH STREQUAL "arm")
-        add_compile_definitions(USE_COMPILER_EXCEPTIONS)
+        add_definitions(-DUSE_COMPILER_EXCEPTIONS -DNO_UNDERSCORE_PREFIX)
     endif()
 
     # Activate support for assembly source files
-    if (MSVC)
-        enable_language(ASM_MASM)
-    else()
-        enable_language(ASM)
-    endif()
+    enable_language(ASM)
 
     # Activate language support for resource files
     enable_language(RC)
@@ -341,21 +239,13 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to
     if(NO_ROSSYM)
         include(sdk/cmake/baseaddress_dwarf.cmake)
     elseif(MSVC)
-        if (ARCH STREQUAL "amd64")
-            include(sdk/cmake/baseaddress_msvc_x64.cmake)
-        else()
-            include(sdk/cmake/baseaddress_msvc.cmake)
-        endif()
+        include(sdk/cmake/baseaddress_msvc.cmake)
     else()
         include(sdk/cmake/baseaddress.cmake)
     endif()
 
     # For MSVC builds, this puts all debug symbols file in the same directory.
-    if(MSVC)
-        set(CMAKE_PDB_OUTPUT_DIRECTORY "${REACTOS_BINARY_DIR}/msvc_pdb")
-    elseif(SEPARATE_DBG)
-        set(CMAKE_PDB_OUTPUT_DIRECTORY "${REACTOS_BINARY_DIR}/symbols")
-    endif()
+    set(CMAKE_PDB_OUTPUT_DIRECTORY "${REACTOS_BINARY_DIR}/msvc_pdb")
 
     #begin with boot so reactos_cab target is defined before all other modules
     add_subdirectory(boot)

CODEOWNERS

@@ -39,7 +39,7 @@
 ## As responsible, he may refuse a local patch if you did not try to
 ## upstream your changes.
 
-## If you want to get listed in this file, either put yourself in the
+## If you want to get listed in that file, either put yourself in the
 ## file and push it, or open a pull request. You can also ask a person
 ## who has push access to add yourself.
 
@@ -107,7 +107,7 @@
 /sdk/tools/xml2sdb/     @learn-more
 
 # Cache Manager
-#   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   M: HeisSpiter, Pierre Schweitzer
 #   S: Maintained
 /modules/rostests/kmtests/ntos_cc/  @HeisSpiter
 /ntoskrnl/cc/                       @HeisSpiter
@@ -121,8 +121,8 @@
 #   R: learn-more, learn_more, Mark Jansen
 #   R: ThFabba, Thomas Faber
 #   S: Maintained
-/sdk/cmake/     @learn-more
-*.cmake         @learn-more
+/sdk/cmake/     @learn-more @ThFabba
+*.cmake         @learn-more @ThFabba
 
 # File Patch API
 #   M: learn-more, learn_more, Mark Jansen
@@ -130,19 +130,14 @@
 /dll/win32/mspatcha/    @learn-more
 
 # File Systems
-#   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   M: HeisSpiter, Pierre Schweitzer
 #   S: Maintained
 #   C: Also see "Upstream File Systems"
 /drivers/filesystems/   @HeisSpiter
 /sdk/lib/fslib/         @HeisSpiter
 
-# Filesystem Filter Manager
-#   M: gedmurphy, Ged, Ged Murphy
-#   S: Maintained
-/drivers/filters/fltmgr/ @gedmurphy
-
 # File Systems Run Time Library
-#   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   M: HeisSpiter, Pierre Schweitzer
 #   S: Maintained
 /modules/rostests/kmtests/ntos_fsrtl/       @HeisSpiter
 /modules/rostests/kmtests/novp_fsrtl/       @HeisSpiter
@@ -169,7 +164,7 @@
 
 # Kernel
 #   M:
-#   R: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   R: HeisSpiter, Pierre Schweitzer
 #   R: ThFabba, Thomas Faber
 #   R: tkreuzer, ThePhysicist, Timo Kreuzer
 #   S: Maintained
@@ -182,11 +177,6 @@
 /dll/3rdparty/mbedtls/              @ThFabba
 /sdk/include/reactos/libs/mbedtls/  @ThFabba
 
-# Mount Point Manager
-#   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
-#   S: Maintained
-/drivers/storage/mountmgr/ @HeisSpiter
-
 # Network Drivers
 #   M:
 #   R: ThFabba, Thomas Faber
@@ -201,31 +191,26 @@
 /drivers/network/dd/e1000/   @ThFabba @Extravert-ir
 
 # Network File Systems kernel libraries
-#   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   M: HeisSpiter, Pierre Schweitzer
 #   S: Maintained
 /sdk/lib/drivers/rdbsslib/  @HeisSpiter
 /sdk/lib/drivers/rxce/      @HeisSpiter
 
 # NTDLL
 #   M:
-#   R: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   R: HeisSpiter, Pierre Schweitzer
 #   R: learn-more, learn_more, Mark Jansen
 #   R: ThFabba, Thomas Faber
 #   R: tkreuzer, ThePhysicist, Timo Kreuzer
 #   S: Maintained
 /dll/ntdll/ @HeisSpiter @learn-more @ThFabba @tkreuzer
 
-# Printing
-#   M: ColinFinck, Colin Finck
-#   S: Maintained
-/win32ss/printing/ @ColinFinck
-
 # ReactOS API Tests
 #   M:
 #   R: learn-more, learn_more, Mark Jansen
 #   R: ThFabba, Thomas Faber
 #   S: Maintained
-/modules/rostests/apitests/ @learn-more
+/modules/rostests/apitests/ @learn-more @ThFabba
 
 # ReactOS Kernel-Mode Tests
 #   M: ThFabba, Thomas Faber
@@ -233,30 +218,24 @@
 /modules/rostests/kmtests/  @ThFabba
 
 # ROS internals tools
-#   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   M: HeisSpiter, Pierre Schweitzer
 #   S: Maintained
 /modules/rosapps/applications/rosinternals/ @HeisSpiter
 
 # Run-Time Library (RTL)
 #   M:
-#   R: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   R: HeisSpiter, Pierre Schweitzer
 #   R: learn-more, learn_more, Mark Jansen
 #   R: ThFabba, Thomas Faber
 #   R: tkreuzer, ThePhysicist, Timo Kreuzer
 #   S: Maintained
 /sdk/lib/rtl/   @HeisSpiter @learn-more @ThFabba @tkreuzer
 
-# Security Manager
-#   M: GeoB99, George Bișoc
-#   S: Maintained
-/modules/rostests/kmtests/ntos_se/   @GeoB99
-/ntoskrnl/se/                        @GeoB99
-
 # Shell Extensions
 #   M:
 #   R: learn-more, learn_more, Mark Jansen
 #   S: Maintained
-/dll/shellext/  @learn-more
+/dll/shellext   @learn-more
 
 # UniATA
 #   M: ThFabba, Thomas Faber
@@ -264,7 +243,7 @@
 /drivers/storage/ide/uniata/   @ThFabba
 
 # Upstream File Systems
-#   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   M: HeisSpiter, Pierre Schweitzer
 #   S: Upstream
 /base/services/nfsd/                @HeisSpiter
 /dll/np/nfs/                        @HeisSpiter
@@ -273,7 +252,9 @@
 /drivers/filesystems/cdfs/          @HeisSpiter
 /drivers/filesystems/ext2/          @HeisSpiter
 /drivers/filesystems/fastfat_new/   @HeisSpiter
+/drivers/filesystems/ffs/           @HeisSpiter
 /drivers/filesystems/nfs/           @HeisSpiter
+/drivers/filesystems/reiserfs/      @HeisSpiter
 /media/doc/README.FSD               @HeisSpiter
 /sdk/lib/fslib/btrfslib/            @HeisSpiter
 /sdk/lib/fslib/ext2lib/             @HeisSpiter
@@ -284,28 +265,29 @@
 #   R: Extravert-ir, extravert34, Victor Perevertkin
 #   S: Maintained
 /drivers/usb/                           @ThFabba @Extravert-ir
+/sdk/lib/drivers/libusb/                @ThFabba @Extravert-ir
 /sdk/include/reactos/drivers/usbport/   @ThFabba @Extravert-ir
 
 # Virtual CD-ROM
-#   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   M: HeisSpiter, Pierre Schweitzer
 #   S: Maintained
 /modules/rosapps/applications/cmdutils/vcdcli/  @HeisSpiter
 /modules/rosapps/applications/vcdcontroltool/   @HeisSpiter
 /modules/rosapps/drivers/vcdrom/                @HeisSpiter
 
 # Virtual Floppy Disk
-#   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   M: HeisSpiter, Pierre Schweitzer
 #   S: Upstream
 /modules/rosapps/applications/cmdutils/vfdcmd/  @HeisSpiter
 /modules/rosapps/drivers/vfd/                   @HeisSpiter
 
 # Win32 file functions
-#   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   M: HeisSpiter, Pierre Schweitzer
 #   S: Maintained
 /dll/win32/kernel32/client/file/    @HeisSpiter
 
 # Windows Network File Systems functions
-#   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
+#   M: HeisSpiter, Pierre Schweitzer
 #   S: Upstream
 /dll/win32/mpr/wnet.c   @HeisSpiter
 
@@ -329,25 +311,5 @@ amd64/                                      @tkreuzer
 /boot/freeldr/freeldr/arch/realmode/amd64.S @tkreuzer
 
 # 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/
-de-DE.*    @reactos/lang-german
-es-ES.*    @reactos/lang-spanish
-et-EE.*    @reactos/lang-estonian
-fr-FR.*    @reactos/lang-french
-he-IL.*    @reactos/lang-hebrew
-hi-IN.*    @reactos/lang-hindi
-hu-HU.*    @reactos/lang-hungarian
-id-ID.*    @reactos/lang-indonesian
-it-IT.*    @reactos/lang-italian
-nl-NL.*    @reactos/lang-dutch
-pl-PL.*    @reactos/lang-polish
-pt-BR.*    @reactos/lang-portuguese
-pt-PT.*    @reactos/lang-portuguese
-ro-RO.*    @reactos/lang-romanian
-ru-RU.*    @reactos/lang-russian
-tr-TR.*    @reactos/lang-turkish
-uk-UA.*    @reactos/lang-ukrainian
-zh-CN.*    @reactos/lang-chinese
-zh-HK.*    @reactos/lang-chinese
-zh-TW.*    @reactos/lang-chinese
+de-DE.rc    @reactos/lang-german
+nl-NL.rc    @reactos/lang-dutch

CONTRIBUTING.md

@@ -7,8 +7,8 @@ There are several ways to contribute to the development of ReactOS. The most oft
 - [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
->nor any Microsoft product that may be related to the proposed project that is under a license incompatible
+>I hereby swear that I have not used nor seen the source code to any version of the Windows operating system 
+>nor any Microsoft product that may be related to the proposed project that is under a license incompatible 
 >with contribution to ReactOS, including but not limited to the leaked Windows 2000 source code and the Windows Research Kernel.
 
 ## What To Do?
@@ -53,7 +53,7 @@ Since our [migration to GitHub] we gladly accept __[Pull Requests]__. Pull reque
 
 ### Patches
 
-A __[patch]__ is a set of changes to existing source code. The changes in a patch can be merged into existing source code. This process is referred to as applying a patch (to source code). Which changes a patch contains and the way the patch is structured can have significant impact on the consequences that can happen from applying the patch.
+A __[patch]__ is a set of changes to existing source code. The changes in a patch can be merged into existing source code. This process is referred to as applying a patch (to source code). Which changes a patch contains and the way the patch is structured can have significant impact on the consequences that can happen from applying the patch. 
 
 See [Submitting Patches] for details.
 
@@ -77,7 +77,7 @@ To amend your commit with your name and e-mail (in any case you've forgot to set
 
 Finding a good project to start with can be a challenge, because when starting out you are (usually) not aware of all the possibilities. To help you find a project, here are some ideas to try:
 
-- Find a test that fails, and try to make it succeed: <https://reactos.org/testman/>
+- Find a test that fails, and try to make it succeed: <https://www.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 on [IRC]
 - Additionally, there are some tests that cause crashes/hangs, but these might be slightly harder: <https://jira.reactos.org/browse/ROSTESTS-125>
@@ -86,11 +86,11 @@ Finding a good project to start with can be a challenge, because when starting o
   [debug]:                                                       https://reactos.org/wiki/Debugging
   [JIRA]:                                                        https://jira.reactos.org/
   [filing a bug report]:                                         https://reactos.org/wiki/File_Bugs
-  [testman]:                                                     https://reactos.org/testman/
-  [migration to GitHub]:                                         https://reactos.org/project-news/reactos-repository-migrated-github/
+  [testman]:                                                     https://www.reactos.org/testman/
+  [migration to GitHub]:                                         https://www.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/
-  [tips for reviewing patches]:                                  https://www.drupal.org/patch/review
+  [tips for reviewing patches]:                                  https://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

COPYING.ARM

@@ -1,12 +1,12 @@
-Copyright 2008 ReactOS Portable Systems Group. All rights reserved.
+Copyright 2008 ReactOS Portable Systems Group. All rights reserved. 
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided
-that the following conditions are met:
+that the following conditions are met: 
 1. Redistributions of source code must retain the above copyright notice, this list of conditions and
-   the following disclaimer.
+   the following disclaimer. 
 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions
-   and the following disclaimer in the documentation and/or other materials provided with the
-   distribution.
+   and the following disclaimer in the documentation and/or other materials provided with the 
+   distribution. 
 
 THIS SOFTWARE IS PROVIDED BY THE REACTOS PORTABLE SYSTEMS GROUP ``AS IS'' AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

CREDITS

@@ -28,7 +28,6 @@ Filip Navara <xnavara@volny.cz>
 Frederik Leemans
 Ge van Geldorp <ge@gse.nl>
 Ged Murphy <gedmurphy@reactos.org>
-George Bisoc <george.bisoc@reactos.org>
 Giannis Adamopoulos <gadamopoulos@reactos.org>
 Gregor Brunmar <gregor brunmar at home se>
 Gregor Schneider <grschneider@gmail.com>
@@ -45,11 +44,11 @@ Jason Eager
 Jason Filby <jasonfilby@yahoo.com>
 Jason Weiler
 Jean Michault
-Jeffrey Morlan <mrnobo1024@yahoo.com>
+Jeffrey Morlan <mrnobo1024@yahoo.com> 
 Jerome Gardou <jerome.gardou@reactos.org>
 Jim Noeth
 Joachim Henze <joachim.henze@reactos.org>
-Johannes Anderwald <johannes.anderwald@reactos.org>
+Johannes Anderwald <johannes.anderwald@reactos.org> 
 Jonathan Wilson <jonwil@tpgi.com.au>
 Jurgen van Gael <jurgen.vangael@student.kuleuven.ac.be>
 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
@@ -94,6 +93,6 @@ Vizzini <vizzini@plasmic.com>
 
 Graphic Design from
 
-Mindflyer <mf@mufunyo.net>
-Tango Desktop Project <http://tango-project.org/>
-Everaldo <https://www.everaldo.com/>
+Mindflyer <mf@mufunyo.net> 
+Tango Desktop Project <http://tango-project.org>
+Everaldo <http://everaldo.com>

INSTALL

@@ -3,7 +3,7 @@
 
 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: https://reactos.org/wiki/Build_Environment
+from our download page at: http://www.reactos.org/wiki/Build_Environment/
 
 Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+, together
 with separate installations of CMake and the Ninja build utility.
@@ -13,7 +13,7 @@ with separate installations of CMake and the Ninja build utility.
 -------------------
 
 A throughout guide for how to build ReactOS can be found at:
-  https://reactos.org/wiki/Building_ReactOS
+  http://www.reactos.org/wiki/Building_ReactOS
 
 In the following we only make a quick overview.
 
@@ -88,10 +88,10 @@ contents. Then burn the CD image, boot from it, and follow instructions.
 -------
 
 If you run into problems or have suggestions for making ReactOS better, please
-visit the address below. Mailing lists are available for a variety of topics,
-bugs should be submitted to JIRA and general chat takes place in the forums,
+visit the address below. Mailing lists are available for a variety of topics, 
+bugs should be submitted to JIRA and general chat takes place in the forums, 
 or #reactos on freenode.
 
-https://reactos.org/
+http://www.reactos.org/
 
 ReactOS Development Team

README.md

@@ -1,5 +1,5 @@
 <p align=center>
-  <a href="https://reactos.org/">
+  <a href="https://reactos.org">
     <img alt="ReactOS" src="https://reactos.org/wiki/images/0/02/ReactOS_logo.png">
   </a>
 </p>
@@ -7,19 +7,19 @@
 ---
 
 <p align=center>
-  <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 href="https://reactos.org/project-news/reactos-0411-released">
+    <img alt="ReactOS 0.4.11 Release" src="https://img.shields.io/badge/release-0.4.11-0688CB.svg">
   </a>
-  <a href="https://reactos.org/download/">
+  <a href="https://reactos.org/download">
     <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg">
   </a>
-  <a href="https://sourceforge.net/projects/reactos/">
+  <a href="https://sourceforge.net/projects/reactos">
     <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>
-  <a href="https://reactos.org/donate/">
+  <a href="https://reactos.org/donating">
     <img alt="Donate" src="https://img.shields.io/badge/%24-donate-E44E4A.svg">
   </a>
   <a href="https://twitter.com/reactos">
@@ -28,36 +28,33 @@
 </p>
 
 ## Quick Links
-[Website](https://reactos.org/) &bull;
-[Official chat](https://chat.reactos.org/) &bull;
-[Wiki](https://reactos.org/wiki/) &bull;
-[Forum](https://reactos.org/forum/) &bull;
-[JIRA Bug Tracker](https://jira.reactos.org/issues/) &bull;
-[ReactOS Git mirror](https://git.reactos.org/) &bull;
+[Website](https://reactos.org) &bull; 
+[Official chat](https://chat.reactos.org) &bull; 
+[Wiki](https://reactos.org/wiki) &bull; 
+[Forum](https://reactos.org/forum) &bull; 
+[JIRA Bug Tracker](https://jira.reactos.org/issues) &bull; 
+[ReactOS Git mirror](https://git.reactos.org) &bull; 
 [Testman](https://reactos.org/testman/)
 
+
 ## What is ReactOS?
 
-ReactOS™ is an Open Source effort to develop a quality operating system that is compatible with applications and drivers written for the Microsoft® Windows™ NT family of operating systems (NT4, 2000, XP, 2003, Vista, 7).
+ReactOS™ is an Open Source effort to develop a quality operating system that is compatible with applications and drivers written for the Microsoft® Windows™ NT family of operating systems (NT4, 2000, XP, 2003, Vista, Seven).
 
 The ReactOS project, although currently focused on Windows Server 2003 compatibility, is always keeping an eye toward compatibility with Windows Vista and future Windows NT releases.
 
 The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/reactos/blob/master/COPYING).
 
-### Product quality warning
-
-**ReactOS is currently an Alpha quality operating system.** This means that ReactOS is under heavy development and you have to be ready to encounter some problems. Different things may not work well and it can corrupt the data present on your hard disk. It is HIGHLY recommended to test ReactOS on a virtual machine or on a computer with no sensitive or critical data!
+***ReactOS is currently an Alpha quality operating system. This means that ReactOS is under heavy development, things may not work well and it can corrupt the data present on your hard disk. It is recommended to test ReactOS on a virtual machine or on a computer with no sensitive or critical data!***
 
 ## Building
 
-![Build](https://github.com/reactos/reactos/workflows/Build/badge.svg) [![rosbewin.badge]][rosbewin.link] [![rosbeunix.badge]][rosbeunix.link] [![coverity.badge]][coverity.link]
+[![appveyor.badge]][appveyor.link] [![travis.badge]][travis.link] [![rosbewin.badge]][rosbewin.link] [![rosbeunix.badge]][rosbeunix.link] [![coverity.badge]][coverity.link]
 
 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).
+Up-to-date versions for Windows and for Unix/GNU-Linux are available from our download page at: ["Build Environment"](http://www.reactos.org/wiki/Build_Environment).
 
-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.
+Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+. Building with MSVC is covered here: ["Visual Studio or Microsoft Visual C++"](https://www.reactos.org/wiki/CMake#Visual_Studio_or_Microsoft_Visual_C.2B.2B).
 
 ### Binaries
 
@@ -65,52 +62,51 @@ To build ReactOS you must run the `configure` script in the directory you want t
 
 ### Bootable images
 
-To build a bootable CD image run `ninja bootcd` from the build directory. This will create a CD image with a filename `bootcd.iso`.
+To build a bootable CD image run `ninja bootcd` from the
+build directory. This will create a CD image with a filename `bootcd.iso`.
 
-You can always download fresh binary builds of bootable images from the ["Daily builds"](https://reactos.org/getbuilds/) page.
+See ["Building ReactOS"](http://www.reactos.org/wiki/Building_ReactOS) for more details.
+
+You can always download fresh binary builds of bootable images from the ["Daily builds"](https://www.reactos.org/getbuilds/) page.
 
 ## Installing
 
-By default, ReactOS currently can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition.
+By default, ReactOS currently can only be installed on a machine that has a FAT16 or FAT32 partition as the active (bootable) partition. 
 The partition on which ReactOS is to be installed (which may or may not be the bootable partition) must also be formatted as FAT16 or FAT32.
 ReactOS Setup can format the partitions if needed.
 
-Starting with 0.4.10, ReactOS can be installed using the BtrFS file system. But consider this as an experimental feature and thus regressions not triggered on FAT setup may be observed.
+Starting 0.4.10, ReactOS can be installed using the BtrFS file system. But
+consider this as an experimental feature and thus regressions not triggered on
+FAT setup may be observed.
 
 To install ReactOS from the bootable CD distribution, extract the archive contents. Then burn the CD image, boot from it, and follow the instructions.
 
-See ["Installing ReactOS"](https://reactos.org/wiki/Installing_ReactOS) Wiki page or [INSTALL](INSTALL) for more details.
+See ["Installing ReactOS"](https://www.reactos.org/wiki/Installing_ReactOS) Wiki page or [INSTALL](INSTALL) for more details.
 
 ## Testing
 
 If you discover a bug in ReactOS search on JIRA first - it might be reported already. If not report the bug providing logs and as much information as possible.
 
-See ["File Bugs"](https://reactos.org/wiki/File_Bugs) for a guide.
+See ["File Bugs"](https://www.reactos.org/wiki/File_Bugs) for a guide.
 
-__NOTE:__ The bug tracker is _not_ for discussions. Please use our [official chat](https://chat.reactos.org/) or our [forum](https://reactos.org/forum/).
+__NOTE:__ The bug tracker is _not_ for discussions. Please use `#reactos` Freenode IRC channel or our [forum](https://reactos.org/forum).
 
-## Contributing  [![prwelcome.badge]](https://reactos.org/wiki/Commiting_Changes)
+## Contributing  ![prwelcome.badge]
 
 We are always looking for developers! Check [how to contribute](CONTRIBUTING.md) if you are willing to participate.
 
-__Legal notice__: If you have seen proprietary Microsoft Windows source code (including but not limited to the leaked Windows NT 3.5, NT 4, 2000 source code and the Windows Research Kernel), your contribution won't be accepted because of potential copyright violation.
-
-Try out cloud-based ReactOS development using Gitpod and Docker:
-
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/reactos/reactos)
-
-You can also support ReactOS by [donating](https://reactos.org/donate/)! We rely on our backers to maintain our servers and accelerate development by [hiring full-time devs](https://reactos.org/contributing/#paid-jobs).
+You can also support ReactOS by [donating](https://reactos.org/donating)! We rely on our backers to maintain our servers and accelerate development by [hiring full-time devs](https://reactos.org/node/785).
 
 ## More information
 
-ReactOS is a Free and Open Source operating system based on the Windows architecture,
+ReactOS is a Free and Open Source operating system based on the Windows architecture, 
 providing support for existing applications and drivers, and an alternative to the current dominant consumer operating system.
 
-It is not another wrapper built on Linux, like WINE. It does not attempt or plan to compete with WINE; in fact, the user-mode part of ReactOS is almost entirely WINE-based and our two teams have cooperated closely in the past.
+It is not another wrapper built on Linux, like WINE. It does not attempt or plan to compete with WINE; in fact, the user-mode part of ReactOS is almost entirely WINE-based and our two teams have cooperated closely in the past. 
 
 ReactOS is also not "yet another OS". It does not attempt to be a third player like any other alternative OS out there. People are not meant to uninstall Linux and use ReactOS instead; ReactOS is a replacement for Windows users who want a Windows replacement that behaves just like Windows.
 
-More information is available at: [reactos.org](https://reactos.org/).
+More information is available at: [reactos.org](https://www.reactos.org).
 
 Also see the [media/doc](/media/doc/) subdirectory for some sparse notes.
 
@@ -125,11 +121,15 @@ 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.
 
+[travis.badge]:     https://travis-ci.org/reactos/reactos.svg?branch=master
+[appveyor.badge]:   https://ci.appveyor.com/api/projects/status/github/reactos/reactos?branch=master&svg=true
 [coverity.badge]:   https://scan.coverity.com/projects/205/badge.svg?flat=1
-[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
+[rosbewin.badge]:   https://img.shields.io/badge/RosBE_Windows-2.1.6-0688CB.svg
+[rosbeunix.badge]:  https://img.shields.io/badge/RosBE_Unix-2.1.2-0688CB.svg
 [prwelcome.badge]:  https://img.shields.io/badge/PR-welcome-0688CB.svg
 
+[travis.link]:      https://travis-ci.org/reactos/reactos
+[appveyor.link]:    https://ci.appveyor.com/project/AmineKhaldi/reactos
 [coverity.link]:    https://scan.coverity.com/projects/205
-[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/
+[rosbewin.link]:    https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.1.6/
+[rosbeunix.link]:   https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.1.2/

appveyor.yml

@@ -0,0 +1,59 @@
+environment:
+  matrix:
+    - BuildType: "msvc-x64"
+    - BuildType: "msvc"
+#    - BuildType: "clang-cl"
+#    - BuildType: vssolution
+
+version: reactos.appveyor.{build}
+skip_branch_with_pr: true
+clone_depth: 5
+clone_folder: c:\reactos-cov
+matrix:
+  fast_finish: true
+
+init:
+  - ps: (New-Object System.Net.WebClient).DownloadFile("https://svn.reactos.org/amine/RosCMakeNinja.zip","C:\RosCMakeNinja.zip")
+  - 7z x C:\RosCMakeNinja.zip -oC:\RosCMakeNinja
+  - ps: >-
+      If ($env:BuildType -Match "clang-cl") {
+        $env:clang_configure_option="clang"
+        (New-Object System.Net.WebClient).DownloadFile("https://svn.reactos.org/amine/clang-cl.7z","C:\clang-cl.7z")
+        7z x C:\clang-cl.7z -oC:\RosCMakeNinja\bin
+      } Else {
+        $env:clang_configure_option=""
+      }
+
+build_script:
+  - set PATH=C:\RosCMakeNinja\bin;%PATH%
+  - if "%BuildType%" == "msvc-x64" (
+        call "C:\PROGRA~2\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+      ) else (
+        call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
+      )
+  - cmake --version
+  - md c:\ros_build
+  - cd c:\ros_build
+  - call %APPVEYOR_BUILD_FOLDER%\configure.cmd %clang_configure_option% -DENABLE_ROSTESTS=1
+  - ps: >-
+      & ninja -k0 2>&1 | select-string -pattern "\[\d+\/\d+\] " -NotMatch | %{$_.Line}
+  - ps: >-
+      & ninja bootcd 2>&1 | select-string -pattern "\[\d+\/\d+\] " -NotMatch | %{$_.Line}
+
+test: off
+deploy: off
+
+for:
+-
+  matrix:
+    only:
+      - BuildType: vssolution
+
+  build_script:
+    - set PATH=C:\RosCMakeNinja\bin;%PATH%
+    - call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
+    - cmake --version
+    - md C:\ros_build
+    - cd C:\ros_build
+    - call %APPVEYOR_BUILD_FOLDER%\configure.cmd VSSolution -DENABLE_ROSTESTS=1
+    - msbuild /verbosity:quiet /target:bootcd REACTOS.sln

base/applications/CMakeLists.txt

@@ -30,12 +30,10 @@ add_subdirectory(network)
 add_subdirectory(notepad)
 add_subdirectory(osk)
 add_subdirectory(rapps)
-add_subdirectory(rapps_com)
 add_subdirectory(regedit)
 add_subdirectory(regedt32)
 add_subdirectory(sc)
 add_subdirectory(screensavers)
-add_subdirectory(sdbinst)
 add_subdirectory(setup16)
 add_subdirectory(shutdown)
 add_subdirectory(sndrec32)

base/applications/atactl/CMakeLists.txt

@@ -1,4 +1,5 @@
 
+set_cpp()
 add_definitions(-DUSER_MODE)
 include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/ide/uniata)
 add_executable(atactl atactl.cpp atactl.rc)

base/applications/cacls/cacls.rc

@@ -60,9 +60,6 @@
 #ifdef LANGUAGE_PT_BR
     #include "lang/pt-BR.rc"
 #endif
-#ifdef LANGUAGE_PT_PT
-    #include "lang/pt-PT.rc"
-#endif
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
@@ -78,9 +75,6 @@
 #ifdef LANGUAGE_SQ_AL
     #include "lang/sq-AL.rc"
 #endif
-#ifdef LANGUAGE_SR_SP
-    #include "lang/sr-SP.rc"
-#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
@@ -90,9 +84,6 @@
 #ifdef LANGUAGE_ZH_CN
     #include "lang/zh-CN.rc"
 #endif
-#ifdef LANGUAGE_ZH_HK
-    #include "lang/zh-HK.rc"
-#endif
 #ifdef LANGUAGE_ZH_TW
     #include "lang/zh-TW.rc"
 #endif

base/applications/cacls/lang/bg-BG.rc

@@ -7,7 +7,7 @@ CACLS файлово_име [/T] [/E] [/C] [/G потребител:права [
                [/P потребител:права [...]] [/D име [...]]\n\
    файлово_име      Показване на СзД.\n\
    /T            Променя СзД на указаните файлове в\n\
-                 текущата папка и всички подпапки.\n\
+                 текущата папка и всички подпапки. \n\
    /E            Промяна на СзД, вместо замяна.\n\
    /C            Продължаване поради грешки поради отказ на достъп.\n\
    /G потребител:права  Предоставяне на права на достъп на указания потребител.\n\
@@ -21,7 +21,7 @@ CACLS файлово_име [/T] [/E] [/C] [/G потребител:права [
                               R  Четене\n\
                               W  Писане\n\
                               C  Промяна (писане)\n\
-                              F  Всички права\n\
+                              F  Всички права \n\
    /D потребител       Лишаване на потребител от достъп.\n\
 Могат да се използват заместващи знаци (* и ?) за указване на повече от един файл..\n\n\
 Съкращения:\n\

base/applications/cacls/lang/cs-CZ.rc

@@ -1,4 +1,4 @@
-/*
+/* 
  * FILE:       base/applications/cacls/lang/cs-CZ.rc
  * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
  * UPDATED:    2008-02-29

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

@@ -18,7 +18,7 @@ CACLS nomfichier [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
    /R user       Supprime les droits d'accès de l'utilisateur spécifié\n\
                  (valide uniquement avec /E).\n\
    /P user:perm  Remplace les droits d'accès de l'utilisateur spécifié.\n\
-                 Perm peut valoir : N  Aucun\n\
+                 Perm peut valoir : N  Aucun \n\
                                     R  Lecture\n\
                                     W  Écriture\n\
                                     C  Modification (Écriture)\n\

base/applications/cacls/lang/pt-BR.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN

base/applications/cacls/lang/pt-PT.rc

@@ -1,74 +0,0 @@
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    IDS_HELP "Mostra ou modifica as listas de controle de acesso (ACLs) de ficheiros\n\n\
-CACLS nome-ficheiro [/T] [/E] [/C] [/G utilizador:perm] [/R utilizador [...]]\n\
-                   [/P utilizador:perm [...]] [/D utilizador [...]]\n\
-   nome-ficheiro     Mostra ACLs.\n\
-   /T               Altera ACLs de ficheiros especificados\n\
-                    na pasta actual e em todas as subpastas.\n\
-   /E               Edita ACL em vez de substituí-la.\n\
-   /C               Continua ao encontrar erros de acesso negado.\n\
-   /G utilizador:perm  Concede os direitos de acesso ao utilizador especificado.\n\
-                    Perm pode ser: R  Ler\n\
-                              W  Gravar\n\
-                              C  Alterar (gravar)\n\
-                              F  Controle total\n\
-   /R utilizador       Revoga os direitos de acesso do utilizador especificado\n\
-                    (válido somente com /E).\n\
-   /P utilizador:perm  Substitui os direitos de acesso do utilizador especificado.\n\
-                    Perm pode ser: N  Nenhum\n\
-                              R  Ler\n\
-                              W  Gravar\n\
-                              C  Alterar (gravar)\n\
-                              F  Controle total\n\
-   /D utilizador       Nega o acesso ao utilizador especificado.\n\
-Caracteres curinga podem ser usados para especificar mais de um ficheiro\n\
-num comando.\n\
-Pode especificar mais de um utilizador num comando.\n\n\
-Abreviaçäes:\n\
-   CI - Herança de recipiente.\n\
-        O ACE será herdado pelas pastas.\n\
-   OI - Herança de objeto.\n\
-        O ACE será herdado pelos ficheiros.\n\
-   IO - Somente herança.\n\
-        O ACE não se aplica ao ficheiro/pasta actual.\n"
-    IDS_ABBR_CI "(CI)"
-    IDS_ABBR_OI "(OI)"
-    IDS_ABBR_IO "(IO)"
-    IDS_ABBR_FULL "F"
-    IDS_ABBR_READ "R"
-    IDS_ABBR_WRITE "W"
-    IDS_ABBR_CHANGE "C"
-    IDS_ABBR_NONE "N"
-    IDS_ALLOW ""
-    IDS_DENY "(DENY)"
-    IDS_SPECIAL_ACCESS "(special access:)"
-    IDS_GENERIC_READ "GENERIC_READ"
-    IDS_GENERIC_WRITE "GENERIC_WRITE"
-    IDS_GENERIC_EXECUTE "GENERIC_EXECUTE"
-    IDS_GENERIC_ALL "GENERIC_ALL"
-    IDS_FILE_GENERIC_EXECUTE "FILE_GENERIC_EXECUTE"
-    IDS_FILE_GENERIC_READ "FILE_GENERIC_READ"
-    IDS_FILE_GENERIC_WRITE "FILE_GENERIC_WRITE"
-    IDS_FILE_READ_DATA "FILE_READ_DATA"
-    IDS_FILE_WRITE_DATA "FILE_WRITE_DATA"
-    IDS_FILE_APPEND_DATA "FILE_APPEND_DATA"
-    IDS_FILE_READ_EA "FILE_READ_EA"
-    IDS_FILE_WRITE_EA "FILE_WRITE_EA"
-    IDS_FILE_EXECUTE "FILE_EXECUTE"
-    IDS_FILE_DELETE_CHILD "FILE_DELETE_CHILD"
-    IDS_FILE_READ_ATTRIBUTES "FILE_READ_ATTRIBUTES"
-    IDS_FILE_WRITE_ATTRIBUTES "FILE_WRITE_ATTRIBUTES"
-    IDS_MAXIMUM_ALLOWED "MAXIMUM_ALLOWED"
-    IDS_ACCESS_SYSTEM_SECURITY "ACCESS_SYSTEM_SECURITY"
-    IDS_SPECIFIC_RIGHTS_ALL "SPECIFIC_RIGHTS_ALL"
-    IDS_STANDARD_RIGHTS_REQUIRED "STANDARD_RIGHTS_REQUIRED"
-    IDS_SYNCHRONIZE "SYNCHRONIZE"
-    IDS_WRITE_OWNER "WRITE_OWNER"
-    IDS_WRITE_DAC "WRITE_DAC"
-    IDS_READ_CONTROL "READ_CONTROL"
-    IDS_DELETE "DELETE"
-    IDS_STANDARD_RIGHTS_ALL "STANDARD_RIGHTS_ALL"
-END

base/applications/cacls/lang/sr-SP.rc

@@ -1,149 +0,0 @@
-LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC
-
-STRINGTABLE
-BEGIN
-    IDS_HELP "Прикажи или измени листе за управљање приступима фајловима.\n\
-              (access control lists ACLs)\n\n\
-CACLS имефајла [/T] [/E] [/C] [/G корисник:дозвола [...]] [/R корисник [...]]\n\
-               [/P корисник:дозвола [...]] [/D корисник [...]]\n\
-   имефајла             Прикажи листе приступа.\n\
-   /T                   Измени листе приступа задатих фајлова у\n\
-                        текућем и свим поддиректоријумима.\n\
-   /E                   Измени постојећу листу приступа уместо да је замениш.\n\
-   /C                   Настави након грешке о забрањеном приступу.\n\
-   /G корисник:дозвола  Додели наведена права корисничког приступа.\n\
-                        Дозвола може бити:  R  Читање\n\
-                                            W  Писање\n\
-                                            C  Измена (писање)\n\
-                                            F  Потпуно управљање\n\
-   /R корисник          Повуци дозволе приступа наведеног корисника\n\
-                        (исправно једино уз /E).\n\
-   /P корисник:дозвола  Замени дозволе приступа наведеног корисника.\n\
-                        Дозвола може бити:  N  Без приступа\n\
-                                            R  Читање\n\
-                                            W  Писање\n\
-                                            C  Измена (писање)\n\
-                                            F  Потпуно управљање\n\
-   /D корисник          Онемогући приступ наведеном кориснику.\n\
-У команди се могу користити џокер знаци ради задавања више од једног фајла.\n\
-У команди се може навести више од једног корисника.\n\n\
-Скраћенице:\n\
-   CI - Наслеђивање по контејнерима (Container Inherit).\n\
-        Нови упис (ACE) наслеђују директоријуми.\n\
-   OI - Наслеђивање по објекту (Object Inherit).\n\
-        Нови упис (ACE) наслеђују фајлови.\n\
-   IO - Само наслеђивање (Inherit Only).\n\
-        Упис не важи за текући фајл/директоријум.\n"
-    IDS_ABBR_CI "(CI)"
-    IDS_ABBR_OI "(OI)"
-    IDS_ABBR_IO "(IO)"
-    IDS_ABBR_FULL "F"
-    IDS_ABBR_READ "R"
-    IDS_ABBR_WRITE "W"
-    IDS_ABBR_CHANGE "C"
-    IDS_ABBR_NONE "N"
-    IDS_ALLOW ""
-    IDS_DENY "(DENY)"
-    IDS_SPECIAL_ACCESS "(special access:)"
-    IDS_GENERIC_READ "GENERIC_READ"
-    IDS_GENERIC_WRITE "GENERIC_WRITE"
-    IDS_GENERIC_EXECUTE "GENERIC_EXECUTE"
-    IDS_GENERIC_ALL "GENERIC_ALL"
-    IDS_FILE_GENERIC_EXECUTE "FILE_GENERIC_EXECUTE"
-    IDS_FILE_GENERIC_READ "FILE_GENERIC_READ"
-    IDS_FILE_GENERIC_WRITE "FILE_GENERIC_WRITE"
-    IDS_FILE_READ_DATA "FILE_READ_DATA"
-    IDS_FILE_WRITE_DATA "FILE_WRITE_DATA"
-    IDS_FILE_APPEND_DATA "FILE_APPEND_DATA"
-    IDS_FILE_READ_EA "FILE_READ_EA"
-    IDS_FILE_WRITE_EA "FILE_WRITE_EA"
-    IDS_FILE_EXECUTE "FILE_EXECUTE"
-    IDS_FILE_DELETE_CHILD "FILE_DELETE_CHILD"
-    IDS_FILE_READ_ATTRIBUTES "FILE_READ_ATTRIBUTES"
-    IDS_FILE_WRITE_ATTRIBUTES "FILE_WRITE_ATTRIBUTES"
-    IDS_MAXIMUM_ALLOWED "MAXIMUM_ALLOWED"
-    IDS_ACCESS_SYSTEM_SECURITY "ACCESS_SYSTEM_SECURITY"
-    IDS_SPECIFIC_RIGHTS_ALL "SPECIFIC_RIGHTS_ALL"
-    IDS_STANDARD_RIGHTS_REQUIRED "STANDARD_RIGHTS_REQUIRED"
-    IDS_SYNCHRONIZE "SYNCHRONIZE"
-    IDS_WRITE_OWNER "WRITE_OWNER"
-    IDS_WRITE_DAC "WRITE_DAC"
-    IDS_READ_CONTROL "READ_CONTROL"
-    IDS_DELETE "DELETE"
-    IDS_STANDARD_RIGHTS_ALL "STANDARD_RIGHTS_ALL"
-END
-
-LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN
-
-STRINGTABLE
-BEGIN
-    IDS_HELP "Prikaži ili izmeni liste za upravljanje pristupima fajlovima.\n\
-              (access control lists ACLs)\n\n\
-CACLS imefajla [/T] [/E] [/C] [/G korisnik:dozvola [...]] [/R korisnik [...]]\n\
-               [/P korisnik:dozvola [...]] [/D korisnik [...]]\n\
-   imefajla             Prikaži liste pristupa.\n\
-   /T                   Izmeni liste pristupa zadatih fajlova u\n\
-                        tekućem i svim poddirektorijumima.\n\
-   /E                   Izmeni postojeću listu pristupa umesto da je zameniš.\n\
-   /C                   Nastavi nakon greške o zabranjenom pristupu.\n\
-   /G korisnik:dozvola  Dodeli navedena prava korisničkog pristupa.\n\
-                        Dozvola može biti:  R  Čitanje\n\
-                                            W  Pisanje\n\
-                                            C  Izmena (pisanje)\n\
-                                            F  Potpuno upravljanje\n\
-   /R korisnik          Povuci dozvole pristupa navedenog korisnika\n\
-                        (ispravno jedino uz /E).\n\
-   /P korisnik:dozvola  Zameni dozvole pristupa navedenog korisnika.\n\
-                        Dozvola može biti:  N  Bez pristupa\n\
-                                            R  Čitanje\n\
-                                            W  Pisanje\n\
-                                            C  Izmena (pisanje)\n\
-                                            F  Potpuno upravljanje\n\
-   /D korisnik          Onemogući pristup navedenom korisniku.\n\
-U komandi se mogu koristiti džoker znaci radi zadavanja više od jednog fajla.\n\
-U komandi se može navesti više od jednog korisnika.\n\n\
-Skraćenice:\n\
-   CI - Nasleđivanje po kontejnerima (Container Inherit).\n\
-        Novi upis (ACE) nasleđuju direktorijumi.\n\
-   OI - Nasleđivanje po objektu (Object Inherit).\n\
-        Novi upis (ACE) nasleđuju fajlovi.\n\
-   IO - Samo nasleđivanje (Inherit Only).\n\
-        Upis ne važi za tekući fajl/direktorijum.\n"
-    IDS_ABBR_CI "(CI)"
-    IDS_ABBR_OI "(OI)"
-    IDS_ABBR_IO "(IO)"
-    IDS_ABBR_FULL "F"
-    IDS_ABBR_READ "R"
-    IDS_ABBR_WRITE "W"
-    IDS_ABBR_CHANGE "C"
-    IDS_ABBR_NONE "N"
-    IDS_ALLOW ""
-    IDS_DENY "(DENY)"
-    IDS_SPECIAL_ACCESS "(special access:)"
-    IDS_GENERIC_READ "GENERIC_READ"
-    IDS_GENERIC_WRITE "GENERIC_WRITE"
-    IDS_GENERIC_EXECUTE "GENERIC_EXECUTE"
-    IDS_GENERIC_ALL "GENERIC_ALL"
-    IDS_FILE_GENERIC_EXECUTE "FILE_GENERIC_EXECUTE"
-    IDS_FILE_GENERIC_READ "FILE_GENERIC_READ"
-    IDS_FILE_GENERIC_WRITE "FILE_GENERIC_WRITE"
-    IDS_FILE_READ_DATA "FILE_READ_DATA"
-    IDS_FILE_WRITE_DATA "FILE_WRITE_DATA"
-    IDS_FILE_APPEND_DATA "FILE_APPEND_DATA"
-    IDS_FILE_READ_EA "FILE_READ_EA"
-    IDS_FILE_WRITE_EA "FILE_WRITE_EA"
-    IDS_FILE_EXECUTE "FILE_EXECUTE"
-    IDS_FILE_DELETE_CHILD "FILE_DELETE_CHILD"
-    IDS_FILE_READ_ATTRIBUTES "FILE_READ_ATTRIBUTES"
-    IDS_FILE_WRITE_ATTRIBUTES "FILE_WRITE_ATTRIBUTES"
-    IDS_MAXIMUM_ALLOWED "MAXIMUM_ALLOWED"
-    IDS_ACCESS_SYSTEM_SECURITY "ACCESS_SYSTEM_SECURITY"
-    IDS_SPECIFIC_RIGHTS_ALL "SPECIFIC_RIGHTS_ALL"
-    IDS_STANDARD_RIGHTS_REQUIRED "STANDARD_RIGHTS_REQUIRED"
-    IDS_SYNCHRONIZE "SYNCHRONIZE"
-    IDS_WRITE_OWNER "WRITE_OWNER"
-    IDS_WRITE_DAC "WRITE_DAC"
-    IDS_READ_CONTROL "READ_CONTROL"
-    IDS_DELETE "DELETE"
-    IDS_STANDARD_RIGHTS_ALL "STANDARD_RIGHTS_ALL"
-END

base/applications/cacls/lang/tr-TR.rc

@@ -1,44 +1,41 @@
-/* TRANSLATOR:
-2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net),
-2021 Süleyman Poyraz (zaryob [dot] dev [at] gmail [dot] com)
-*/
+/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_HELP "Dosyaların erişim kontrol listelerini (ACL'ler) görüntüler veya değiştirir.\n\n\
-CACLS dosya adı [/T] [/E] [/C] [/G kullanıcı:izin [...]] [/R kullanıcı [...]]\n\
+    IDS_HELP "Kütüklerin erişim denetim dizelgelerini (ACL'lerini) görüntüler ya da değiştirir.\n\n\
+CACLS kütük adı [/T] [/E] [/C] [/G kullanıcı:izin [...]] [/R kullanıcı [...]]\n\
                [/P kullanıcı:izin [...]] [/D kullanıcı [...]]\n\
-   dosya adı          ACL'leri görüntüler.\n\
+   kütük adı          ACL'leri görüntüler.\n\
    /T                 Şimdiki dizin ve alt dizinlerin içinde\n\
-                      belirtilen dosyaların ACL'lerini değiştirir.\n\
-   /E                 ACL'yi yenisiyle değiştirmek yerine onu düzenler.\n\
-   /C                 Erişim engellendi hatalarına rağmen devam eder.\n\
-   /G kullanıcı:izin  Belirtilen kullanıcı erişim yetkilerini verir.\n\
-                      Yetkilerin biri şu olabilir: R  Okuma\n\
-                                                   W  Yazma\n\
-                                                   C  Değiştirme (yazma)\n\
-                                                   F  Tüm denetim\n\
-   /R kullanıcı       Belirtilen kullanıcının erişim yetkilerini geri alır.\n\
+                      belirtilen kütülerin ACL'lerini değiştirir.\n\
+   /E                 ACL'yi yenisiyle değiştirme yerine onu düzenle.\n\
+   /C                 Erişim engellendi yanlışlıklarıyla sürdür.\n\
+   /G kullanıcı:izin  Belirtilen kullanıcı erişim yetkilerini ver.\n\
+                      İzin şu olabilir: R  Okuma\n\
+                                        W  Yazma\n\
+                                        C  Değiştirme (yazma)\n\
+                                        F  Tüm denetim\n\
+   /R kullanıcı       Belirtilen kullanıcının erişim yetkilerini geri al\n\
                      (yalnızca /E ile geçerli).\n\
    /P kullanıcı:izin  Belirtilen kullanıcının erişim yetkilerini yenileriyle\n\
-                      değiştirir.\n\
-                      Yetkilerin biri şu olabilir: N  Yok\n\
-                                                   R  Okuma\n\
-                                                   W  Yazma\n\
-                                                   C  Değiştirme (yazma)\n\
-                                                   F  Tüm denetim\n\
+                      değiştir.\n\
+                      İzin şu olabilir: N  Yok\n\
+                                        R  Okuma\n\
+                                        W  Yazma\n\
+                                        C  Değiştirme (yazma)\n\
+                                        F  Tüm denetim\n\
    /D kullanıcı       Belirtilen kullanıcı erişimini verme.\n\
-Özel semboller, bir komutta birden fazla dosya belirtmek için kullanılabilir.\n\
-Bir komutta birden fazla kullanıcı belirtebilirsiniz.\n\n\
+Umûmî arama damgaları, bir komutta birden çok kütük belirtmek için kullanılabilir.\n\
+Bir komutta birden çok kullanıcı belirtebilirsiniz.\n\n\
 Kısaltmalar:\n\
-   CI - Kapsayıcı Devralma.\n\
+   CI - Kapsayıcı Devral.\n\
         ACE dizinlerle devralınacak.\n\
-   OI - Nesnel Devralma.\n\
-        ACE dosyalarla devralınacak.\n\
+   OI - Nesne Devral.\n\
+        ACE kütüklerle devralınacak.\n\
    IO - Yalnızca Devral.\n\
-        ACE'yi şimdiki dosyaya ya da dizine uygulama.\n"
+        ACE'yi şimdiki kütüğe ya da dizine uygulama.\n"
     IDS_ABBR_CI "(CI)"
     IDS_ABBR_OI "(OI)"
     IDS_ABBR_IO "(IO)"
@@ -48,8 +45,8 @@ Kısaltmalar:\n\
     IDS_ABBR_CHANGE "C"
     IDS_ABBR_NONE "N"
     IDS_ALLOW ""
-    IDS_DENY "(REDDET)"
-    IDS_SPECIAL_ACCESS "(özel erişim:)"
+    IDS_DENY "(VERME)"
+    IDS_SPECIAL_ACCESS "(husûsî erişim:)"
     IDS_GENERIC_READ "GENERIC_READ"
     IDS_GENERIC_WRITE "GENERIC_WRITE"
     IDS_GENERIC_EXECUTE "GENERIC_EXECUTE"

base/applications/cacls/lang/zh-CN.rc

@@ -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\

base/applications/cacls/lang/zh-HK.rc

@@ -1,80 +0,0 @@
-/*
- * PROJECT:     ReactOS CACLS
- * LICENSE:     LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
- * PURPOSE:     Chinese (Hong Kong) resource file
- * TRANSLATORS: Copyright 2021 Chan Chilung <eason066@gmail.com>
- * REFERENCES:  Chinese (Traditional) resource file
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
-
-STRINGTABLE
-BEGIN
-    IDS_HELP "顯示或修改文件的存取控制串列\n\n\
-CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
-               [/P user:perm [...]] [/D user [...]]\n\
-   filename      顯示 ACLs。\n\
-   /T            更改目前目錄及其所有子目錄\n\
-                 指定文件的 ACL。\n\
-   /E            編輯 ACL 而不替換。\n\
-   /C            在出現拒絕存取錯誤時繼續。\n\
-   /G user:perm  賦予指定使用者存取權限。\n\
-                 perm 可以是: R  讀取\n\
-                              W  寫入\n\
-                              C  更改 (寫入)\n\
-                              F  完全控制\n\
-   /R user       撤銷指定使用者的存取權限 (與 /E 一齊使用時才會有效)。\n\
-   /P user:perm  更改指定使用者的存取權限。\n\
-                 perm 可以是: N  無\n\
-                              R  讀取\n\
-                              W  寫入\n\
-                              C  更改 (寫入)\n\
-                              F  完全控制\n\
-   /D user       拒絕指定使用者的存取。\n\
-在命令中可以使用通配符指定多個檔案。\n\
-您亦可以在命令中指定多個使用者。\n\n\
-縮寫:\n\
-   CI - 容器繼承。\n\
-        ACE會由目錄繼承。\n\
-   OI - 對象繼承。\n\
-        ACE 會由文件繼承。\n\
-   IO - 只繼承。\n\
-        ACE 不適用於目前檔案／目錄。\n"
-    IDS_ABBR_CI "(CI)"
-    IDS_ABBR_OI "(OI)"
-    IDS_ABBR_IO "(IO)"
-    IDS_ABBR_FULL "F"
-    IDS_ABBR_READ "R"
-    IDS_ABBR_WRITE "W"
-    IDS_ABBR_CHANGE "C"
-    IDS_ABBR_NONE "N"
-    IDS_ALLOW ""
-    IDS_DENY "(DENY)"
-    IDS_SPECIAL_ACCESS "(特殊存取:)"
-    IDS_GENERIC_READ "GENERIC_READ"
-    IDS_GENERIC_WRITE "GENERIC_WRITE"
-    IDS_GENERIC_EXECUTE "GENERIC_EXECUTE"
-    IDS_GENERIC_ALL "GENERIC_ALL"
-    IDS_FILE_GENERIC_EXECUTE "FILE_GENERIC_EXECUTE"
-    IDS_FILE_GENERIC_READ "FILE_GENERIC_READ"
-    IDS_FILE_GENERIC_WRITE "FILE_GENERIC_WRITE"
-    IDS_FILE_READ_DATA "FILE_READ_DATA"
-    IDS_FILE_WRITE_DATA "FILE_WRITE_DATA"
-    IDS_FILE_APPEND_DATA "FILE_APPEND_DATA"
-    IDS_FILE_READ_EA "FILE_READ_EA"
-    IDS_FILE_WRITE_EA "FILE_WRITE_EA"
-    IDS_FILE_EXECUTE "FILE_EXECUTE"
-    IDS_FILE_DELETE_CHILD "FILE_DELETE_CHILD"
-    IDS_FILE_READ_ATTRIBUTES "FILE_READ_ATTRIBUTES"
-    IDS_FILE_WRITE_ATTRIBUTES "FILE_WRITE_ATTRIBUTES"
-    IDS_MAXIMUM_ALLOWED "MAXIMUM_ALLOWED"
-    IDS_ACCESS_SYSTEM_SECURITY "ACCESS_SYSTEM_SECURITY"
-    IDS_SPECIFIC_RIGHTS_ALL "SPECIFIC_RIGHTS_ALL"
-    IDS_STANDARD_RIGHTS_REQUIRED "STANDARD_RIGHTS_REQUIRED"
-    IDS_SYNCHRONIZE "SYNCHRONIZE"
-    IDS_WRITE_OWNER "WRITE_OWNER"
-    IDS_WRITE_DAC "WRITE_DAC"
-    IDS_READ_CONTROL "READ_CONTROL"
-    IDS_DELETE "DELETE"
-    IDS_STANDARD_RIGHTS_ALL "STANDARD_RIGHTS_ALL"
-END

base/applications/cacls/lang/zh-TW.rc

@@ -1,45 +1,45 @@
 /*
- * PROJECT:     ReactOS CACLS
- * LICENSE:     LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
- * PURPOSE:     Chinese (Traditional) resource file
- * TRANSLATORS: Copyright 2007 Chaoming Tseng <jauming.tw@gmail.com>
- *              Copyright 2021 Chan Chilung <eason066@gmail.com>
+ * PROJECT:    ReactOS CACLS
+ * FILE:       base/applications/cacls/lang/zh-TW.rc
+ * LICENSE:    LGPL - See COPYING.LIB in the top level directory
+ * PURPOSE:    TRADITIONAL Chinese resource file
+ * TRANSLATOR: jauming <jauming.tw@gmail.com>
  */
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 STRINGTABLE
 BEGIN
-    IDS_HELP "顯示或修改文件的存取控制串列\n\n\
+    IDS_HELP "顯示或者修改文件的訪問控制表\n\n\
 CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
                [/P user:perm [...]] [/D user [...]]\n\
    filename      顯示 ACLs。\n\
-   /T            更改目前目錄及其所有子目錄\n\
+   /T            更改當前目錄及其所有子目錄中\n\
                  指定文件的 ACL。\n\
    /E            編輯 ACL 而不替換。\n\
-   /C            在出現拒絕存取錯誤時繼續。\n\
-   /G user:perm  賦予指定使用者存取權限。\n\
-                 perm 可以是: R  讀取\n\
+   /C            在出現拒絕訪問錯誤時繼續。\n\
+   /G user:perm  賦予指定使用者訪問權限。\n\
+                 Perm 可以是: R  讀取\n\
                               W  寫入\n\
                               C  更改(寫入)\n\
                               F  完全控制\n\
-   /R user       撤銷指定使用者的存取權限 (僅在與 /E 一起使用時才有效)。\n\
-   /P user:perm  替換指定使用者的存取權限。\n\
-                 perm 可以是: N  無\n\
+   /R user       撤銷指定使用者的訪問權限(僅在与 /E 一起使用時合法)。\n\
+   /P user:perm  替換指定使用者的訪問權限。\n\
+                 Perm 可以是: N  無\n\
                               R  讀取\n\
                               W  寫入\n\
-                              C  更改(寫入)\n\
-                              F  完全控制\n\
-   /D user       拒絕指定使用者的存取。\n\
+                              C  更改(寫入) \n\
+                              F  完全控制 \n\
+   /D user       拒絕指定使用者的訪問。\n\
 在命令中可以使用通配符指定多個文件。\n\
 您也可以在命令中指定多個使用者。\n\n\
-縮寫:\n\
+縮寫: \n\
    CI - 容器繼承。\n\
         ACE會由目錄繼承。\n\
    OI - 對象繼承。\n\
         ACE 會由文件繼承。\n\
    IO - 只繼承。\n\
-        ACE 不適用於目前文件/目錄。\n"
+        ACE 不適用於當前文件/目錄。\n"
     IDS_ABBR_CI "(CI)"
     IDS_ABBR_OI "(OI)"
     IDS_ABBR_IO "(IO)"
@@ -50,7 +50,7 @@ CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
     IDS_ABBR_NONE "N"
     IDS_ALLOW ""
     IDS_DENY "(DENY)"
-    IDS_SPECIAL_ACCESS "(特殊存取:)"
+    IDS_SPECIAL_ACCESS "(special access:)"
     IDS_GENERIC_READ "GENERIC_READ"
     IDS_GENERIC_WRITE "GENERIC_WRITE"
     IDS_GENERIC_EXECUTE "GENERIC_EXECUTE"

base/applications/calc/convert.c

@@ -512,7 +512,7 @@ static const conv_t conv_VOLUME[] = {
 1 chang = 20 tamlung
 1 tamlung = 4 baht
 1 baht = 4 saloung
-1 saloung =
+1 saloung = 
 
 1 chang = 6/5 kg = 1200 g
 1 tamlung = 1/20 chang = 60 g

base/applications/calc/fun_ieee.c

@@ -55,7 +55,7 @@ double acosh(double x)
 {
     // must be x>=1, if not return Nan (Not a Number)
     if(!(x>=1.0)) return sqrt(-1.0);
-
+    
     // return only the positive result (as sqrt does).
     return log(x+sqrt(x*x-1.0));
 }
@@ -64,7 +64,7 @@ double atanh(double x)
 {
     // must be x>-1, x<1, if not return Nan (Not a Number)
     if(!(x>-1.0 && x<1.0)) return sqrt(-1.0);
-
+    
     return log((1.0+x)/(1.0-x))/2.0;
 }
 
@@ -372,7 +372,7 @@ static __int64 cbrti(__int64 x) {
 
    s = 60;
    y = 0;
-   while(s >= 0) {
+   while(s >= 0) { 
       y = 2*y;
       b = (3*y*(y + 1) + 1) << s;
       s = s - 3;

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

@@ -1,6 +1,6 @@
 /* Translation and UTF-8 Conversion by mkbu95 <mkbu95@gmail.com> (August, 2011) */
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 /* Dialogs */
 

base/applications/calc/lang/pt-PT.rc

@@ -1,711 +0,0 @@
-/* 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 0, 0, 316, 163
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora ReactOS"
-MENU IDR_MENU_SCIENTIFIC_1
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
-    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    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
-    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
-    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 |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Apagar", 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 0, 0, 169, 128
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora ReactOS"
-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 "Apagar", 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 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Calculadora ReactOS"
-MENU IDR_MENU_STANDARD
-FONT 8, "MS Shell Dlg"
-BEGIN
-    PUSHBUTTON "Converter", IDC_BUTTON_CONVERT, 35, 105, 76, 17
-    COMBOBOX IDC_COMBO_CATEGORY, 5, 31, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
-             WS_TABSTOP | CBS_SORT
-    LTEXT "Categoria:", IDC_STATIC, 5, 20, 56, 8
-    COMBOBOX IDC_COMBO_FROM, 5, 60, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
-             WS_TABSTOP | CBS_SORT
-    LTEXT "Converter de:", IDC_STATIC, 5, 49, 56, 8
-    COMBOBOX IDC_COMBO_TO, 5, 87, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
-             WS_TABSTOP | CBS_SORT
-    LTEXT "Converter para:", 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 "Apagar", 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 "Caixa de estatísticas"
-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 "Editar"
-    BEGIN
-        MENUITEM "Copiar\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "Colar\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "Visualizar"
-    BEGIN
-        MENUITEM "Padrão", IDM_VIEW_STANDARD
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Conversão", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "Decimal\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "Octal\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binário\tF8", IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Graus\tF2", IDM_VIEW_DEG, CHECKED
-        MENUITEM "Radianos\tF3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "Grados\tF4", IDM_VIEW_GRAD, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Agrupar dígitos", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Ajuda"
-    BEGIN
-        MENUITEM "Tópicos de ajuda", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "Sobre Calculadora ReactOS", IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_SCIENTIFIC_2 MENU
-BEGIN
-    POPUP "Editar"
-    BEGIN
-        MENUITEM "Copiar\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "Colar\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "Visualizar"
-    BEGIN
-        MENUITEM "Padrão", IDM_VIEW_STANDARD
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Conversão", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "Decimal\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "Octal\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "Binário\tF8", IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED
-        MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED
-        MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED
-        MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Agrupar dígitos", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Ajuda"
-    BEGIN
-        MENUITEM "Tópicos de ajuda", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "Sobre Calculadora ReactOS", IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_STANDARD MENU
-BEGIN
-    POPUP "Editar"
-    BEGIN
-        MENUITEM "Copiar\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "Colar\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "Visualizar"
-    BEGIN
-        MENUITEM "Padrão", IDM_VIEW_STANDARD
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
-        MENUITEM "Conversão", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "Agrupar dígitos", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "Ajuda"
-    BEGIN
-        MENUITEM "Tópicos de ajuda", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "Sobre Calculadora ReactOS", IDM_HELP_ABOUT
-    END
-END
-
-/* String Tables */
-
-STRINGTABLE
-BEGIN
-    IDS_MATH_ERROR "Erro"
-    IDS_QUICKHELP "Ajuda rápida"
-END
-
-/* About */
-STRINGTABLE
-BEGIN
-    IDS_CALC_NAME "Calcuadora ReactOS"
-    IDS_AUTHOR "Escrita por Carlo Bramini"
-END
-
-/* Types of conversion */
-STRINGTABLE
-BEGIN
-    IDS_CONV_ANGLE "Ângulo"
-    IDS_CONV_AREA "Área"
-    IDS_CONV_CONSUMPTION "Consumo (veículos)"
-    IDS_CONV_CURRENCY "Monetária"
-    IDS_CONV_ENERGY "Energia"
-    IDS_CONV_LENGTH "Distância"
-    IDS_CONV_POWER "Potência"
-    IDS_CONV_PRESSURE "Pressão"
-    IDS_CONV_TEMPERATURE "Temperatura"
-    IDS_CONV_TIME "Tempo"
-    IDS_CONV_VELOCITY "Velocidade"
-    IDS_CONV_VOLUME "Volume"
-    IDS_CONV_WEIGHT "Peso"
-END
-
-/* Angles */
-STRINGTABLE
-BEGIN
-    IDS_ANGLE_ARCMINUTES "Minute of arc"
-    IDS_ANGLE_ARCSECONDS "Second of arc"
-    IDS_ANGLE_DEGREES "Graus"
-    IDS_ANGLE_GRADIANS "Grados"
-    IDS_ANGLE_RADIANS "Radianos"
-END
-
-/* Areas */
-STRINGTABLE
-BEGIN
-    IDS_AREA_ACRES "Acres"
-    IDS_AREA_ACRES_BRAZIL "Acres (Brasil)"
-    IDS_AREA_ACRES_FRANCE "Acres (França)"
-    IDS_AREA_ACRES_SCOTS "Acres (Escócia)"
-    IDS_AREA_ACRES_US "Acres (EUA)"
-    IDS_AREA_ARES "Ares"
-    IDS_AREA_CHOU "Chou"
-    IDS_AREA_DANBO "Danbo"
-    IDS_AREA_HECTARES "Hectares"
-    IDS_AREA_JEONGBO "Jeongbo"
-    IDS_AREA_MORGEN_HUNGARY "Morgen (Hungária)"
-    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 "Centímetros quadrados"
-    IDS_AREA_SQUARE_CHR "Chr quadradas"
-    IDS_AREA_SQUARE_FATHOMS "Braças quadradas"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Braças quadradas (Hungária)"
-    IDS_AREA_SQUARE_FEET "Pés quadrados"
-    IDS_AREA_SQUARE_INCHES "Polegadas quadradas"
-    IDS_AREA_SQUARE_KILOMETERS "Quilômetros quadrados"
-    IDS_AREA_SQUARE_LAR "Lar quadradas"
-    IDS_AREA_SQUARE_METER "Metros quadrados"
-    IDS_AREA_SQUARE_MILES "Milhas quadradas"
-    IDS_AREA_SQUARE_MILLIMETERS "Milímetros quadrados"
-    IDS_AREA_SQUARE_SHAKU "Shaku quadradas"
-    IDS_AREA_SQUARE_TSUEN "Tsuen quadrados"
-    IDS_AREA_SQUARE_VA "Va quadrados"
-    IDS_AREA_SQUARE_YARD "Jardas quadradas"
-    IDS_AREA_TAN "Tan"
-    IDS_AREA_TSUBO "Tsubo"
-END
-
-/* Consumptions */
-STRINGTABLE
-BEGIN
-    IDS_CONSUMPTION_KM_PER_L "Quilômetros/litro"
-    IDS_CONSUMPTION_L_PER_100_KM "Litros/100 quilômetros"
-    IDS_CONSUMPTION_MILES_GALLON_UK "Milhas/galão (UK)"
-    IDS_CONSUMPTION_MILES_GALLON_US "Milhas/galão (EUA)"
-END
-
-/* Currencies */
-STRINGTABLE
-BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Xelim austríaco"
-    IDS_CURRENCY_BELGIAN_FRANC "Franco belga"
-    IDS_CURRENCY_CYPRIOT_POUND "Libra cipriota"
-    IDS_CURRENCY_CZECH_KORUNA "Coroa checa"
-    IDS_CURRENCY_DEUTSCHE_MARK "Marco alemão"
-    IDS_CURRENCY_DUTCH_GUILDER "Florim neerlandês"
-    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
-    IDS_CURRENCY_EURO "Euro"
-    IDS_CURRENCY_FINNISH_MARKKA "Marco finlandês"
-    IDS_CURRENCY_FRENCH_FRANC "Franco francês"
-    IDS_CURRENCY_GREEK_DRACHMA "Dracma"
-    IDS_CURRENCY_IRISH_POUND "Libra irlandesa"
-    IDS_CURRENCY_ITALIAN_LIRA "Lira italiana"
-    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
-    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
-    IDS_CURRENCY_LUXEMBOURG_FRANC "Franco luxemburguês"
-    IDS_CURRENCY_MALTESE_LIRA "Lira maltesa"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo português"
-    IDS_CURRENCY_SLOVAK_KORUNA "Coroa eslovaca"
-    IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar"
-    IDS_CURRENCY_SPANISH_PESETA "Peseta"
-END
-
-/* Energies */
-STRINGTABLE
-BEGIN
-    IDS_ENERGY_15_C_CALORIES "15 °C calorias"
-    IDS_ENERGY_BTUS "British Thermal Unit"
-    IDS_ENERGY_ERGS "Ergs (Cgs)"
-    IDS_ENERGY_EVS "Elétron-volt"
-    IDS_ENERGY_FOOT_POUNDS "Foot-Pounds"
-    IDS_ENERGY_IT_CALORIES "Tabela Internacional de calorias"
-    IDS_ENERGY_IT_KILOCALORIES "Tabela Internacional de quilocalorias"
-    IDS_ENERGY_JOULES "Joules"
-    IDS_ENERGY_KILOJOULES "Quilojoules"
-    IDS_ENERGY_KILOWATT_HOURS "Quilowatt-hora"
-    IDS_ENERGY_NUTRITION_CALORIES "Calorias nutritivas"
-    IDS_ENERGY_TH_CALORIES "Caloria termoquímica"
-END
-
-/* Lengths */
-STRINGTABLE
-BEGIN
-    IDS_LENGTH_ANGSTROMS "Ångström"
-    IDS_LENGTH_ASTRONOMICAL_UNITS "Unidade astronômica"
-    IDS_LENGTH_BARLEYCORNS "Barleycorns"
-    IDS_LENGTH_CENTIMETERS "Centímetros"
-    IDS_LENGTH_CHAINS_UK "Correntes (UK)"
-    IDS_LENGTH_CHI "Chi"
-    IDS_LENGTH_CHOU "Chou"
-    IDS_LENGTH_CHR "Chr"
-    IDS_LENGTH_CUN "Cun"
-    IDS_LENGTH_FATHOMS "Braças"
-    IDS_LENGTH_FATHOMS_HUNGARY "Braças (Hungária)"
-    IDS_LENGTH_FEET "Pés"
-    IDS_LENGTH_FURLONGS "Furlongs"
-    IDS_LENGTH_GAN "Gan"
-    IDS_LENGTH_HANDS "Mãos"
-    IDS_LENGTH_HUNH "Hunh"
-    IDS_LENGTH_INCHES "Polegadas"
-    IDS_LENGTH_JA "Ja"
-    IDS_LENGTH_JEONG "Jeong"
-    IDS_LENGTH_KABIET "Kabiet"
-    IDS_LENGTH_KEN "Ken"
-    IDS_LENGTH_KEUB "Keub"
-    IDS_LENGTH_KILOMETERS "Quilômetors"
-    IDS_LENGTH_LAR "Lar"
-    IDS_LENGTH_LIGHT_YEARS "Anos-luz"
-    IDS_LENGTH_LINKS_UK "Links (UK)"
-    IDS_LENGTH_METERS "Metros"
-    IDS_LENGTH_MICRONS "Micrômetro"
-    IDS_LENGTH_MILES "Milhas"
-    IDS_LENGTH_MILLIMETERS "Milímetros"
-    IDS_LENGTH_NAUTICAL_MILES "Milhas náuticas"
-    IDS_LENGTH_NIEU "Nieu"
-    IDS_LENGTH_PARSECS "Parsecs"
-    IDS_LENGTH_PICAS "Paicas"
-    IDS_LENGTH_RI_JAPAN "Ri (Japão)"
-    IDS_LENGTH_RI_KOREA "Ri (Coreia)"
-    IDS_LENGTH_RODS "Varas"
-    IDS_LENGTH_SAWK "Sawk"
-    IDS_LENGTH_SEN "Sen"
-    IDS_LENGTH_SHAKU "Shaku"
-    IDS_LENGTH_SPAN "Span"
-    IDS_LENGTH_SUN "Sun"
-    IDS_LENGTH_TSUEN "Tsuen"
-    IDS_LENGTH_VA "Va"
-    IDS_LENGTH_YARDS "Jardas"
-    IDS_LENGTH_YOTE "Yote"
-    IDS_LENGTH_ZHANG "Zhang"
-END
-
-/* Powers */
-STRINGTABLE
-BEGIN
-    IDS_POWER_BTUS_PER_MINUTE "British Thermal Units por minuto"
-    IDS_POWER_FPS_PER_MINUTE "Foot-Pounds por minuto"
-    IDS_POWER_HORSEPOWER "Cavalos de potência"
-    IDS_POWER_KILOWATTS "Quilowatts"
-    IDS_POWER_MEGAWATTS "Megawatts"
-    IDS_POWER_WATTS "Watts"
-END
-
-/* Pressures */
-STRINGTABLE
-BEGIN
-    IDS_PRESSURE_ATMOSPHERES "Atmosferas"
-    IDS_PRESSURE_BARS "Bars"
-    IDS_PRESSURE_HECTOPASCALS "Hectopascais"
-    IDS_PRESSURE_KILOPASCALS "Quilopascais"
-    IDS_PRESSURE_MM_OF_MERCURY "Milímetros de mercúrio"
-    IDS_PRESSURE_PASCALS "Pascais"
-    IDS_PRESSURE_PSI "Pounds-force per square inch (PSI)"
-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 "Dias"
-    IDS_TIME_HOURS "Horas"
-    IDS_TIME_NANOSECONDS "Nanosegundos"
-    IDS_TIME_MICROSECONDS "Microsegundos"
-    IDS_TIME_MILLISECONDS "Milisegundos"
-    IDS_TIME_MINUTES "Minutos"
-    IDS_TIME_SECONDS "Segundos"
-    IDS_TIME_WEEKS "Semanas"
-    IDS_TIME_YEARS "Anos"
-END
-
-/* Velocities */
-STRINGTABLE
-BEGIN
-    IDS_VELOCITY_CMS_SECOND "Centímetros/hora"
-    IDS_VELOCITY_FEET_HOUR "Pés/hora"
-    IDS_VELOCITY_FEET_SECOND "Pés/segundo"
-    IDS_VELOCITY_KILOMETERS_HOUR "Quilômetros/hora"
-    IDS_VELOCITY_KNOTS "Nós"
-    IDS_VELOCITY_MACH "Mach"
-    IDS_VELOCITY_METERS_SECOND "Metros/segundo"
-    IDS_VELOCITY_MILES_HOUR "Milhas/hora"
-END
-
-/* Volumes */
-STRINGTABLE
-BEGIN
-    IDS_VOLUME_BARRELS_UK "Barris (UK)"
-    IDS_VOLUME_BARRELS_OIL "Barris de petróleo"
-    IDS_VOLUME_BUN "Bun"
-    IDS_VOLUME_BUSHELS_UK "Celemim (UK)"
-    IDS_VOLUME_BUSHELS_US "Celemim (EUA)"
-    IDS_VOLUME_CUBIC_CENTIMETERS "Centímetros cúbicos"
-    IDS_VOLUME_CUBIC_FEET "Pés cúbicos"
-    IDS_VOLUME_CUBIC_INCHES "Polegadas cúbicas"
-    IDS_VOLUME_CUBIC_METERS "Metros cúbicos"
-    IDS_VOLUME_CUBIC_YARDS "Jardas cúbicas"
-    IDS_VOLUME_DOE "Doe"
-    IDS_VOLUME_FLUID_OUNCES_UK "Onças líquidas (UK)"
-    IDS_VOLUME_FLUID_OUNCES_US "Onças líquidas (EUA)"
-    IDS_VOLUME_GALLONS_UK "Galões (EUA)"
-    IDS_VOLUME_GALLONS_DRY_US "Galões secos (EUA)"
-    IDS_VOLUME_GALLONS_LIQUID_US "Galões líquidos (EUA)"
-    IDS_VOLUME_GOU "Gou"
-    IDS_VOLUME_HOP "Hop"
-    IDS_VOLUME_ICCE "Icce"
-    IDS_VOLUME_KWIAN "Kwian"
-    IDS_VOLUME_LITERS "Litros"
-    IDS_VOLUME_MAL "Mal"
-    IDS_VOLUME_MILLILITERS "Milímetros"
-    IDS_VOLUME_PINTS_UK "Pintos (UK)"
-    IDS_VOLUME_PINTS_DRY_US "Pintos secos (EUA)"
-    IDS_VOLUME_PINTS_LIQUID_US "Pints líquidos (EUA)"
-    IDS_VOLUME_QUARTS_UK "Quartos (UK)"
-    IDS_VOLUME_QUARTS_DRY_US "Quartos secos (EUA)"
-    IDS_VOLUME_QUARTS_LIQUID_US "Quartos líquidos (EUA)"
-    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 "Quilate"
-    IDS_WEIGHT_CHUNG "Chung"
-    IDS_WEIGHT_DON "Don"
-    IDS_WEIGHT_GEUN "Geun"
-    IDS_WEIGHT_GRAMS "Gramas"
-    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 "Quilogramas"
-    IDS_WEIGHT_KIN "Kin"
-    IDS_WEIGHT_LIANG_CHINA "Liang (China)"
-    IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)"
-    IDS_WEIGHT_MONME "Monme"
-    IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Onças avoirdupois"
-    IDS_WEIGHT_OUNCES_TROY "Onças troy"
-    IDS_WEIGHT_POUNDS "Libras"
-    IDS_WEIGHT_QUINTAL_METRIC "Quintal (métrico)"
-    IDS_WEIGHT_SALOUNG "Saloung"
-    IDS_WEIGHT_STONES "Pedras"
-    IDS_WEIGHT_TAMLUNG "Tamlung"
-    IDS_WEIGHT_TONNES "Toneladas"
-    IDS_WEIGHT_TONS_UK "Toneladas (UK)"
-    IDS_WEIGHT_TONS_US "Toneladas (EUA)"
-END

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

@@ -1,7 +1,4 @@
-/* TRANSLATOR:
-2013-2014, 2016, 2019 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net),
-2021 Süleyman Poyraz (zaryob [dot] dev [at] gmail [dot] com)
-*/
+/* TRANSLATOR: 2013-2014, 2016, 2019 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -19,11 +16,11 @@ BEGIN
     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
+    CONTROL "Ters", IDC_CHECK_INV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 41, 26, 10
+    CONTROL "Aşırı", 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 |
+    PUSHBUTTON "İst", IDC_BUTTON_STA, 5, 60, 24, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON "Ort", IDC_BUTTON_AVE, 5, 80, 24, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
@@ -33,9 +30,9 @@ BEGIN
                BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON "Ekle", 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 |
+    PUSHBUTTON "BG", 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 |
+    PUSHBUTTON "DDS", 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
@@ -63,13 +60,13 @@ BEGIN
                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 |
+    PUSHBUTTON "BS", 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 |
+    PUSHBUTTON "BG", 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 |
+    PUSHBUTTON "BK", 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 |
+    PUSHBUTTON "BE", 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
@@ -115,39 +112,39 @@ BEGIN
                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 |
+    PUSHBUTTON "Veya", 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 |
+    PUSHBUTTON "Sola", 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 |
+    PUSHBUTTON "Ve", 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 |
+    PUSHBUTTON "Ya da", 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 |
+    PUSHBUTTON "Değil", 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 |
+    PUSHBUTTON "Tam", 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
-    CONTROL "Qword", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
+    CONTROL "Dörtlü Sözcük", IDC_RADIO_QWORD, "Button", BS_AUTORADIOBUTTON |
             NOT WS_VISIBLE, 150, 21, 38, 10
-    CONTROL "Dword", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
+    CONTROL "İkili Sözcük", IDC_RADIO_DWORD, "Button", BS_AUTORADIOBUTTON |
             NOT WS_VISIBLE, 190, 21, 38, 10
-    CONTROL "Word", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
+    CONTROL "Sözcük", IDC_RADIO_WORD, "Button", BS_AUTORADIOBUTTON |
             NOT WS_VISIBLE, 230, 21, 38, 10
-    CONTROL "Byte", IDC_RADIO_BYTE, "Button", BS_AUTORADIOBUTTON |
+    CONTROL "Bayt", 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 |
+    CONTROL "Radyan", IDC_RADIO_RAD, "Button", BS_AUTORADIOBUTTON, 204, 21, 45, 10
+    CONTROL "Gradyan", IDC_RADIO_GRAD, "Button", BS_AUTORADIOBUTTON, 258, 21, 45, 10
+    PUSHBUTTON "Baştan", 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 |
+    PUSHBUTTON "Sil", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON "Geri", IDC_BUTTON_BACK, 177, 38, 43, 18, BS_CENTER |
                BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
@@ -161,9 +158,9 @@ CAPTION "ReactOS Hesap Makinesi"
 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 |
+    PUSHBUTTON "Baştan", 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 |
+    PUSHBUTTON "Sil", IDC_BUTTON_CE, 80, 23, 41, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
     PUSHBUTTON "Geri", IDC_BUTTON_BACK, 36, 23, 42, 18, BS_CENTER | BS_VCENTER |
                BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
@@ -200,7 +197,7 @@ BEGIN
                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 |
+    PUSHBUTTON "Karekök", 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
@@ -209,13 +206,13 @@ BEGIN
     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 |
+    PUSHBUTTON "BS", 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 |
+    PUSHBUTTON "BG", 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 |
+    PUSHBUTTON "BK", 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 |
+    PUSHBUTTON "BE", 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
@@ -232,13 +229,13 @@ BEGIN
     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 "Şundan dönüştür:", IDC_STATIC, 5, 49, 56, 8
+    LTEXT "Şundan Dönüştür:", IDC_STATIC, 5, 49, 56, 8
     COMBOBOX IDC_COMBO_TO, 5, 87, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
              WS_TABSTOP | CBS_SORT
     LTEXT "Şuna Dönüştür:", IDC_STATIC, 5, 76, 56, 8
-    CONTROL "C", IDC_BUTTON_CANC, "Button", BS_OWNERDRAW | BS_CENTER |
+    CONTROL "Baştan", 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 |
+    CONTROL "Sil", IDC_BUTTON_CE, "Button", BS_OWNERDRAW | BS_CENTER |
             BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 232, 24, 40, 17
     CONTROL "Geri", IDC_BUTTON_BACK, "Button", BS_OWNERDRAW | BS_CENTER |
             BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 24, 40,17
@@ -275,7 +272,7 @@ BEGIN
             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 |
+    CONTROL "Karekök", 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
@@ -284,13 +281,13 @@ BEGIN
     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 |
+    CONTROL "BS", 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 |
+    CONTROL "BG", 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 |
+    CONTROL "BK", 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 |
+    CONTROL "BE", 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
@@ -301,10 +298,10 @@ CAPTION "İstatistik Kutusu"
 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
+    PUSHBUTTON "&Geri Dön", IDC_BUTTON_RET, 4, 48, 36, 16
+    PUSHBUTTON "&Yükle", IDC_BUTTON_LOAD, 44, 48, 36, 16
+    PUSHBUTTON "&Sil", IDC_BUTTON_CD, 84, 48, 36, 16
+    PUSHBUTTON "&Tümünü Sil", IDC_BUTTON_CAD, 124, 48, 36, 16
     CTEXT "n=0", IDC_TEXT_NITEMS, 4, 68, 156, 12, SS_CENTERIMAGE | SS_SUNKEN
 END
 
@@ -589,7 +586,7 @@ STRINGTABLE
 BEGIN
     IDS_POWER_BTUS_PER_MINUTE "Dakikadaki İngiliz Isı Birimi"
     IDS_POWER_FPS_PER_MINUTE "Dakikadaki ayak pond kuvveti"
-    IDS_POWER_HORSEPOWER "Beygir gücü"
+    IDS_POWER_HORSEPOWER "At gücü"
     IDS_POWER_KILOWATTS "Kilovat"
     IDS_POWER_MEGAWATTS "Megavat"
     IDS_POWER_WATTS "Vat"

base/applications/calc/lang/zh-HK.rc

@@ -1,717 +0,0 @@
-/*
- * PROJECT:     ReactOS Calc
- * LICENSE:     LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later)
- * PURPOSE:     Chinese (Hong Kong) resource file
- * TRANSLATORS: Copyright 2021 Chan Chilung <eason066@gmail.com>
- * REFERENCES:  Chinese (Simplified) resource file
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
-
-/* Dialogs */
-
-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 9, "新細明體", 0, 0, 0x1
-BEGIN
-    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    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
-    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
-    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 |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Back", IDC_BUTTON_BACK, 177, 38, 43, 18, BS_CENTER |
-               BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 305, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
-END
-
-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
-FONT 9, "新細明體", 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 "Back", 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 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-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
-    COMBOBOX IDC_COMBO_FROM, 5, 60, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
-             WS_TABSTOP | CBS_SORT
-    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
-    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 "Back", IDC_BUTTON_BACK, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 24, 40,17
-    RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 312, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    CONTROL "7", IDC_BUTTON_7, "Button", BS_OWNERDRAW | BS_CENTER |
-            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 "統計框"
-FONT 9, "新細明體"
-BEGIN
-    LISTBOX IDC_LIST_STAT, 4, 4, 156, 40, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "返回", IDC_BUTTON_RET, 4, 48, 36, 16
-    PUSHBUTTON "載入", IDC_BUTTON_LOAD, 44, 48, 36, 16
-    PUSHBUTTON "清除", IDC_BUTTON_CD, 84, 48, 36, 16
-    PUSHBUTTON "全清", 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 "編輯"
-    BEGIN
-        MENUITEM "複製\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "貼上\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "查看"
-    BEGIN
-        MENUITEM "標準型", IDM_VIEW_STANDARD
-        MENUITEM "工程型", IDM_VIEW_SCIENTIFIC
-        MENUITEM "轉換", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "十六進制\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "十進制\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "八進制\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "二進制\tF8", IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "角度\tF2", IDM_VIEW_DEG, CHECKED
-        MENUITEM "弧度\tF3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "梯度\tF4", IDM_VIEW_GRAD, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "數字分組", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "說明"
-    BEGIN
-        MENUITEM "說明主題", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "關於 ReactOS 計數機", IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_SCIENTIFIC_2 MENU
-BEGIN
-    POPUP "編輯"
-    BEGIN
-        MENUITEM "複製\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "貼上\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "查看"
-    BEGIN
-        MENUITEM "標準型", IDM_VIEW_STANDARD
-        MENUITEM "工程型", IDM_VIEW_SCIENTIFIC
-        MENUITEM "轉換", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "十六進制\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "十進制\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "八進制\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "二進制\tF8", IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED
-        MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED
-        MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED
-        MENUITEM "位元組\tF4", IDM_VIEW_BYTE, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "數字分組", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "說明"
-    BEGIN
-        MENUITEM "說明主題", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "關於 ReactOS 計數機", IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_STANDARD MENU
-BEGIN
-    POPUP "編輯"
-    BEGIN
-        MENUITEM "複製\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "貼上\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "查看"
-    BEGIN
-        MENUITEM "標準型", IDM_VIEW_STANDARD
-        MENUITEM "工程型", IDM_VIEW_SCIENTIFIC
-        MENUITEM "轉換", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "數字分組", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "說明"
-    BEGIN
-        MENUITEM "說明主題", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "關於 ReactOS 計數機", IDM_HELP_ABOUT
-    END
-END
-
-/* String Tables */
-
-STRINGTABLE
-BEGIN
-    IDS_MATH_ERROR "錯誤"
-    IDS_QUICKHELP "快速說明"
-END
-
-/* About */
-STRINGTABLE
-BEGIN
-    IDS_CALC_NAME "ReactOS 計數機"
-    IDS_AUTHOR "作者 Carlo Bramini"
-END
-
-/* Types of conversion */
-STRINGTABLE
-BEGIN
-    IDS_CONV_ANGLE "角度"
-    IDS_CONV_AREA "面積"
-    IDS_CONV_CONSUMPTION "油耗（引擎）"
-    IDS_CONV_CURRENCY "貨幣"
-    IDS_CONV_ENERGY "能量"
-    IDS_CONV_LENGTH "長度"
-    IDS_CONV_POWER "功率"
-    IDS_CONV_PRESSURE "壓力"
-    IDS_CONV_TEMPERATURE "溫度"
-    IDS_CONV_TIME "時間"
-    IDS_CONV_VELOCITY "速度"
-    IDS_CONV_VOLUME "體積"
-    IDS_CONV_WEIGHT "質量"
-END
-
-/* Angles */
-STRINGTABLE
-BEGIN
-    IDS_ANGLE_ARCMINUTES "角分"
-    IDS_ANGLE_ARCSECONDS "角秒"
-    IDS_ANGLE_DEGREES "角度"
-    IDS_ANGLE_GRADIANS "梯度"
-    IDS_ANGLE_RADIANS "弧度"
-END
-
-/* Areas */
-STRINGTABLE
-BEGIN
-    IDS_AREA_ACRES "英畝"
-    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_MU "畝"
-    IDS_AREA_PING "坪"
-    IDS_AREA_PYEONG "坪（韓國）"
-    IDS_AREA_PYEONGBANGJA "Pyeongbangja"
-    IDS_AREA_RAI "萊"
-    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_FEET "平方英尺"
-    IDS_AREA_SQUARE_INCHES "平方英寸"
-    IDS_AREA_SQUARE_KILOMETERS "平方公里"
-    IDS_AREA_SQUARE_LAR "平方拉爾"
-    IDS_AREA_SQUARE_METER "平方米"
-    IDS_AREA_SQUARE_MILES "平方英里"
-    IDS_AREA_SQUARE_MILLIMETERS "平方毫米"
-    IDS_AREA_SQUARE_SHAKU "平方尺"
-    IDS_AREA_SQUARE_TSUEN "平方寸"
-    IDS_AREA_SQUARE_VA "Square va"
-    IDS_AREA_SQUARE_YARD "平方碼"
-    IDS_AREA_TAN "段"
-    IDS_AREA_TSUBO "坪（日本）"
-END
-
-/* Consumptions */
-STRINGTABLE
-BEGIN
-    IDS_CONSUMPTION_KM_PER_L "公里／升"
-    IDS_CONSUMPTION_L_PER_100_KM "升／100 公里"
-    IDS_CONSUMPTION_MILES_GALLON_UK "英里／加侖（英國）"
-    IDS_CONSUMPTION_MILES_GALLON_US "英里／加侖（美國）"
-END
-
-/* Currencies */
-STRINGTABLE
-BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "奥地利先令"
-    IDS_CURRENCY_BELGIAN_FRANC "比利時法郎"
-    IDS_CURRENCY_CYPRIOT_POUND "賽普勒斯鎊"
-    IDS_CURRENCY_CZECH_KORUNA "捷克克朗"
-    IDS_CURRENCY_DEUTSCHE_MARK "德國馬克"
-    IDS_CURRENCY_DUTCH_GUILDER "荷蘭盾"
-    IDS_CURRENCY_ESTONIAN_KROON "愛沙尼亞克朗"
-    IDS_CURRENCY_EURO "歐元"
-    IDS_CURRENCY_FINNISH_MARKKA "芬蘭馬克"
-    IDS_CURRENCY_FRENCH_FRANC "法郎"
-    IDS_CURRENCY_GREEK_DRACHMA "希臘德拉克馬"
-    IDS_CURRENCY_IRISH_POUND "愛爾蘭鎊"
-    IDS_CURRENCY_ITALIAN_LIRA "義大利里拉"
-    IDS_CURRENCY_LATVIAN_LATS "拉脫維亞拉特"
-    IDS_CURRENCY_LITHUANIAN_LITAS "拉脫維亞拉分"
-    IDS_CURRENCY_LUXEMBOURG_FRANC "盧森堡法郎"
-    IDS_CURRENCY_MALTESE_LIRA "馬爾他里拉"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯庫多"
-    IDS_CURRENCY_SLOVAK_KORUNA "斯洛伐克克朗"
-    IDS_CURRENCY_SLOVENIAN_TOLAR "斯洛維尼亞拖拉"
-    IDS_CURRENCY_SPANISH_PESETA "西班牙比塞塔"
-END
-
-/* Energies */
-STRINGTABLE
-BEGIN
-    IDS_ENERGY_15_C_CALORIES "15 °C 卡路里"
-    IDS_ENERGY_BTUS "英制熱量單位"
-    IDS_ENERGY_ERGS "爾格"
-    IDS_ENERGY_EVS "電子伏特"
-    IDS_ENERGY_FOOT_POUNDS "英尺-磅"
-    IDS_ENERGY_IT_CALORIES "國際蒸汽表卡路里"
-    IDS_ENERGY_IT_KILOCALORIES "國際蒸汽表千卡路里"
-    IDS_ENERGY_JOULES "焦耳"
-    IDS_ENERGY_KILOJOULES "千焦耳"
-    IDS_ENERGY_KILOWATT_HOURS "千瓦時"
-    IDS_ENERGY_NUTRITION_CALORIES "營養卡路里"
-    IDS_ENERGY_TH_CALORIES "熱化學卡路里"
-END
-
-/* Lengths */
-STRINGTABLE
-BEGIN
-    IDS_LENGTH_ANGSTROMS "埃"
-    IDS_LENGTH_ASTRONOMICAL_UNITS "天文單位"
-    IDS_LENGTH_BARLEYCORNS "Barleycorns"
-    IDS_LENGTH_CENTIMETERS "釐米"
-    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_FEET "英尺"
-    IDS_LENGTH_FURLONGS "化朗"
-    IDS_LENGTH_GAN "杆"
-    IDS_LENGTH_HANDS "掌寬"
-    IDS_LENGTH_HUNH "Hunh"
-    IDS_LENGTH_INCHES "英尺"
-    IDS_LENGTH_JA "尺（韓國）"
-    IDS_LENGTH_JEONG "Jeong"
-    IDS_LENGTH_KABIET "Kabiet"
-    IDS_LENGTH_KEN "Ken"
-    IDS_LENGTH_KEUB "Keub"
-    IDS_LENGTH_KILOMETERS "公里"
-    IDS_LENGTH_LAR "拉爾"
-    IDS_LENGTH_LIGHT_YEARS "光年"
-    IDS_LENGTH_LINKS_UK "Links（英國）"
-    IDS_LENGTH_METERS "米"
-    IDS_LENGTH_MICRONS "微米"
-    IDS_LENGTH_MILES "英里"
-    IDS_LENGTH_MILLIMETERS "毫米"
-    IDS_LENGTH_NAUTICAL_MILES "海里"
-    IDS_LENGTH_NIEU "Nieu"
-    IDS_LENGTH_PARSECS "秒差距"
-    IDS_LENGTH_PICAS "派卡"
-    IDS_LENGTH_RI_JAPAN "里（日本）"
-    IDS_LENGTH_RI_KOREA "里（韓國）"
-    IDS_LENGTH_RODS "杆"
-    IDS_LENGTH_SAWK "Sawk"
-    IDS_LENGTH_SEN "Sen"
-    IDS_LENGTH_SHAKU "尺（日本）"
-    IDS_LENGTH_SPAN "拃"
-    IDS_LENGTH_SUN "寸（日本）"
-    IDS_LENGTH_TSUEN "寸"
-    IDS_LENGTH_VA "Va"
-    IDS_LENGTH_YARDS "碼"
-    IDS_LENGTH_YOTE "約特"
-    IDS_LENGTH_ZHANG "丈"
-END
-
-/* Powers */
-STRINGTABLE
-BEGIN
-    IDS_POWER_BTUS_PER_MINUTE "英制熱量單位每分鐘"
-    IDS_POWER_FPS_PER_MINUTE "英尺-磅每分鐘"
-    IDS_POWER_HORSEPOWER "馬力"
-    IDS_POWER_KILOWATTS "千瓦"
-    IDS_POWER_MEGAWATTS "兆瓦"
-    IDS_POWER_WATTS "瓦"
-END
-
-/* Pressures */
-STRINGTABLE
-BEGIN
-    IDS_PRESSURE_ATMOSPHERES "大氣壓"
-    IDS_PRESSURE_BARS "巴"
-    IDS_PRESSURE_HECTOPASCALS "百帕"
-    IDS_PRESSURE_KILOPASCALS "千帕"
-    IDS_PRESSURE_MM_OF_MERCURY "毫米汞柱"
-    IDS_PRESSURE_PASCALS "帕斯卡"
-    IDS_PRESSURE_PSI "英磅-力每平方英尺"
-END
-
-/* Temperatures */
-STRINGTABLE
-BEGIN
-    IDS_TEMPERATURE_CELSIUS "攝氏度"
-    IDS_TEMPERATURE_FAHRENHEIT "華氏度"
-    IDS_TEMPERATURE_KELVIN "開爾文"
-    IDS_TEMPERATURE_RANKINE "蘭金度"
-END
-
-/* Time */
-STRINGTABLE
-BEGIN
-    IDS_TIME_DAYS "日"
-    IDS_TIME_HOURS "小時"
-    IDS_TIME_NANOSECONDS "納秒"
-    IDS_TIME_MICROSECONDS "微秒"
-    IDS_TIME_MILLISECONDS "毫秒"
-    IDS_TIME_MINUTES "分"
-    IDS_TIME_SECONDS "秒"
-    IDS_TIME_WEEKS "周"
-    IDS_TIME_YEARS "年"
-END
-
-/* Velocities */
-STRINGTABLE
-BEGIN
-    IDS_VELOCITY_CMS_SECOND "厘米／小時"
-    IDS_VELOCITY_FEET_HOUR "英尺／小時"
-    IDS_VELOCITY_FEET_SECOND "英尺／秒"
-    IDS_VELOCITY_KILOMETERS_HOUR "公里／小時"
-    IDS_VELOCITY_KNOTS "節"
-    IDS_VELOCITY_MACH "馬赫"
-    IDS_VELOCITY_METERS_SECOND "米／秒"
-    IDS_VELOCITY_MILES_HOUR "英里／小時"
-END
-
-/* Volumes */
-STRINGTABLE
-BEGIN
-    IDS_VOLUME_BARRELS_UK "桶（英國）"
-    IDS_VOLUME_BARRELS_OIL "桶油"
-    IDS_VOLUME_BUN "Bun"
-    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_GOU "合"
-    IDS_VOLUME_HOP "Hop"
-    IDS_VOLUME_ICCE "Icce"
-    IDS_VOLUME_KWIAN "Kwian"
-    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_SEKI "Seki"
-    IDS_VOLUME_SYOU "Syou"
-    IDS_VOLUME_TANANLOUNG "Tananloung"
-    IDS_VOLUME_TANG "Tang"
-    IDS_VOLUME_TO "斗（日本）"
-END
-
-/* Weights */
-STRINGTABLE
-BEGIN
-    IDS_WEIGHT_BAHT "銖"
-    IDS_WEIGHT_CARATS "克拉"
-    IDS_WEIGHT_CHUNG "Chung"
-    IDS_WEIGHT_DON "Don"
-    IDS_WEIGHT_GEUN "Geun"
-    IDS_WEIGHT_GRAMS "克"
-    IDS_WEIGHT_GWAN "Gwan"
-    IDS_WEIGHT_HARB "Harb"
-    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_OUNCES_AVOIRDUPOIS "常衡安士"
-    IDS_WEIGHT_OUNCES_TROY "金衡安士"
-    IDS_WEIGHT_POUNDS "英磅"
-    IDS_WEIGHT_QUINTAL_METRIC "公擔"
-    IDS_WEIGHT_SALOUNG "Saloung"
-    IDS_WEIGHT_STONES "石"
-    IDS_WEIGHT_TAMLUNG "Tamlung"
-    IDS_WEIGHT_TONNES "噸"
-    IDS_WEIGHT_TONS_UK "噸（英國）"
-    IDS_WEIGHT_TONS_US "噸（美國）"
-END

base/applications/calc/lang/zh-TW.rc

@@ -1,711 +0,0 @@
-// Traditional Chinese translation by 2021 Chan Chilung <eason066@gmail.com>
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-
-/* Dialogs */
-
-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 9, "新細明體", 0, 0, 0x1
-BEGIN
-    GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20
-    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
-    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
-    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 |
-               BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    PUSHBUTTON "Back", IDC_BUTTON_BACK, 177, 38, 43, 18, BS_CENTER |
-               BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP
-    RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 305, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
-END
-
-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
-FONT 9, "新細明體", 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 "Back", 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 0, 0, 320, 130
-STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-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
-    COMBOBOX IDC_COMBO_FROM, 5, 60, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL |
-             WS_TABSTOP | CBS_SORT
-    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
-    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 "Back", IDC_BUTTON_BACK, "Button", BS_OWNERDRAW | BS_CENTER |
-            BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 24, 40,17
-    RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 312, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE
-    CONTROL "7", IDC_BUTTON_7, "Button", BS_OWNERDRAW | BS_CENTER |
-            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 "統計框"
-FONT 9, "新細明體"
-BEGIN
-    LISTBOX IDC_LIST_STAT, 4, 4, 156, 40, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "返回", IDC_BUTTON_RET, 4, 48, 36, 16
-    PUSHBUTTON "載入", IDC_BUTTON_LOAD, 44, 48, 36, 16
-    PUSHBUTTON "清除", IDC_BUTTON_CD, 84, 48, 36, 16
-    PUSHBUTTON "全清", 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 "編輯"
-    BEGIN
-        MENUITEM "複製\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "貼上\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "查看"
-    BEGIN
-        MENUITEM "標準型", IDM_VIEW_STANDARD
-        MENUITEM "工程型", IDM_VIEW_SCIENTIFIC
-        MENUITEM "轉換", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "十六進制\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "十進制\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "八進制\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "二進制\tF8", IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "角度\tF2", IDM_VIEW_DEG, CHECKED
-        MENUITEM "弧度\tF3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "梯度\tF4", IDM_VIEW_GRAD, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "數字分組", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "說明"
-    BEGIN
-        MENUITEM "說明主題", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "關於 ReactOS 計算機", IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_SCIENTIFIC_2 MENU
-BEGIN
-    POPUP "編輯"
-    BEGIN
-        MENUITEM "複製\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "貼上\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "查看"
-    BEGIN
-        MENUITEM "標準型", IDM_VIEW_STANDARD
-        MENUITEM "工程型", IDM_VIEW_SCIENTIFIC
-        MENUITEM "轉換", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "十六進制\tF5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "十進制\tF6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "八進制\tF7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "二進制\tF8", IDM_VIEW_BIN, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED
-        MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED
-        MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED
-        MENUITEM "位元組\tF4", IDM_VIEW_BYTE, CHECKED
-        MENUITEM SEPARATOR
-        MENUITEM "數字分組", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "說明"
-    BEGIN
-        MENUITEM "說明主題", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "關於 ReactOS 計算機", IDM_HELP_ABOUT
-    END
-END
-
-IDR_MENU_STANDARD MENU
-BEGIN
-    POPUP "編輯"
-    BEGIN
-        MENUITEM "複製\tCtrl+C", IDM_EDIT_COPY
-        MENUITEM "貼上\tCtrl+V", IDM_EDIT_PASTE
-    END
-    POPUP "查看"
-    BEGIN
-        MENUITEM "標準型", IDM_VIEW_STANDARD
-        MENUITEM "工程型", IDM_VIEW_SCIENTIFIC
-        MENUITEM "轉換", IDM_VIEW_CONVERSION
-        MENUITEM SEPARATOR
-        MENUITEM "數字分組", IDM_VIEW_GROUP, CHECKED
-    END
-    POPUP "說明"
-    BEGIN
-        MENUITEM "說明主題", IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "關於 ReactOS 計算機", IDM_HELP_ABOUT
-    END
-END
-
-/* String Tables */
-
-STRINGTABLE
-BEGIN
-    IDS_MATH_ERROR "錯誤"
-    IDS_QUICKHELP "快速說明"
-END
-
-/* About */
-STRINGTABLE
-BEGIN
-    IDS_CALC_NAME "ReactOS 計算機"
-    IDS_AUTHOR "作者 Carlo Bramini"
-END
-
-/* Types of conversion */
-STRINGTABLE
-BEGIN
-    IDS_CONV_ANGLE "角度"
-    IDS_CONV_AREA "面積"
-    IDS_CONV_CONSUMPTION "油耗 (引擎)"
-    IDS_CONV_CURRENCY "貨幣"
-    IDS_CONV_ENERGY "能量"
-    IDS_CONV_LENGTH "長度"
-    IDS_CONV_POWER "功率"
-    IDS_CONV_PRESSURE "壓力"
-    IDS_CONV_TEMPERATURE "溫度"
-    IDS_CONV_TIME "時間"
-    IDS_CONV_VELOCITY "速度"
-    IDS_CONV_VOLUME "體積"
-    IDS_CONV_WEIGHT "質量"
-END
-
-/* Angles */
-STRINGTABLE
-BEGIN
-    IDS_ANGLE_ARCMINUTES "角分"
-    IDS_ANGLE_ARCSECONDS "角秒"
-    IDS_ANGLE_DEGREES "角度"
-    IDS_ANGLE_GRADIANS "梯度"
-    IDS_ANGLE_RADIANS "弧度"
-END
-
-/* Areas */
-STRINGTABLE
-BEGIN
-    IDS_AREA_ACRES "英畝"
-    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_MU "畝"
-    IDS_AREA_PING "坪"
-    IDS_AREA_PYEONG "坪 (韓國)"
-    IDS_AREA_PYEONGBANGJA "Pyeongbangja"
-    IDS_AREA_RAI "萊"
-    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_FEET "平方英尺"
-    IDS_AREA_SQUARE_INCHES "平方英寸"
-    IDS_AREA_SQUARE_KILOMETERS "平方公里"
-    IDS_AREA_SQUARE_LAR "平方拉爾"
-    IDS_AREA_SQUARE_METER "平方米"
-    IDS_AREA_SQUARE_MILES "平方英里"
-    IDS_AREA_SQUARE_MILLIMETERS "平方毫米"
-    IDS_AREA_SQUARE_SHAKU "平方尺"
-    IDS_AREA_SQUARE_TSUEN "平方寸"
-    IDS_AREA_SQUARE_VA "Square va"
-    IDS_AREA_SQUARE_YARD "平方碼"
-    IDS_AREA_TAN "段"
-    IDS_AREA_TSUBO "坪 (日本)"
-END
-
-/* Consumptions */
-STRINGTABLE
-BEGIN
-    IDS_CONSUMPTION_KM_PER_L "公里/升"
-    IDS_CONSUMPTION_L_PER_100_KM "升/100 公里"
-    IDS_CONSUMPTION_MILES_GALLON_UK "英里/加侖 (英國)"
-    IDS_CONSUMPTION_MILES_GALLON_US "英里/加侖 (美國)"
-END
-
-/* Currencies */
-STRINGTABLE
-BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "奥地利先令"
-    IDS_CURRENCY_BELGIAN_FRANC "比利時法郎"
-    IDS_CURRENCY_CYPRIOT_POUND "賽普勒斯鎊"
-    IDS_CURRENCY_CZECH_KORUNA "捷克克朗"
-    IDS_CURRENCY_DEUTSCHE_MARK "德國馬克"
-    IDS_CURRENCY_DUTCH_GUILDER "荷蘭盾"
-    IDS_CURRENCY_ESTONIAN_KROON "愛沙尼亞克朗"
-    IDS_CURRENCY_EURO "歐元"
-    IDS_CURRENCY_FINNISH_MARKKA "芬蘭馬克"
-    IDS_CURRENCY_FRENCH_FRANC "法郎"
-    IDS_CURRENCY_GREEK_DRACHMA "希臘德拉克馬"
-    IDS_CURRENCY_IRISH_POUND "愛爾蘭鎊"
-    IDS_CURRENCY_ITALIAN_LIRA "義大利里拉"
-    IDS_CURRENCY_LATVIAN_LATS "拉脫維亞拉特"
-    IDS_CURRENCY_LITHUANIAN_LITAS "拉脫維亞拉分"
-    IDS_CURRENCY_LUXEMBOURG_FRANC "盧森堡法郎"
-    IDS_CURRENCY_MALTESE_LIRA "馬爾他里拉"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO "葡萄牙埃斯庫多"
-    IDS_CURRENCY_SLOVAK_KORUNA "斯洛伐克克朗"
-    IDS_CURRENCY_SLOVENIAN_TOLAR "斯洛維尼亞拖拉"
-    IDS_CURRENCY_SPANISH_PESETA "西班牙比塞塔"
-END
-
-/* Energies */
-STRINGTABLE
-BEGIN
-    IDS_ENERGY_15_C_CALORIES "15 °C 卡路里"
-    IDS_ENERGY_BTUS "英制熱量單位"
-    IDS_ENERGY_ERGS "爾格"
-    IDS_ENERGY_EVS "電子伏特"
-    IDS_ENERGY_FOOT_POUNDS "英尺-磅"
-    IDS_ENERGY_IT_CALORIES "國際蒸汽表卡路里"
-    IDS_ENERGY_IT_KILOCALORIES "國際蒸汽表千卡路里"
-    IDS_ENERGY_JOULES "焦耳"
-    IDS_ENERGY_KILOJOULES "千焦耳"
-    IDS_ENERGY_KILOWATT_HOURS "千瓦時"
-    IDS_ENERGY_NUTRITION_CALORIES "營養卡路里"
-    IDS_ENERGY_TH_CALORIES "熱化學卡路里"
-END
-
-/* Lengths */
-STRINGTABLE
-BEGIN
-    IDS_LENGTH_ANGSTROMS "埃"
-    IDS_LENGTH_ASTRONOMICAL_UNITS "天文單位"
-    IDS_LENGTH_BARLEYCORNS "Barleycorns"
-    IDS_LENGTH_CENTIMETERS "釐米"
-    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_FEET "英尺"
-    IDS_LENGTH_FURLONGS "化朗"
-    IDS_LENGTH_GAN "杆"
-    IDS_LENGTH_HANDS "掌寬"
-    IDS_LENGTH_HUNH "Hunh"
-    IDS_LENGTH_INCHES "英尺"
-    IDS_LENGTH_JA "尺 (韓國)"
-    IDS_LENGTH_JEONG "Jeong"
-    IDS_LENGTH_KABIET "Kabiet"
-    IDS_LENGTH_KEN "Ken"
-    IDS_LENGTH_KEUB "Keub"
-    IDS_LENGTH_KILOMETERS "公里"
-    IDS_LENGTH_LAR "拉爾"
-    IDS_LENGTH_LIGHT_YEARS "光年"
-    IDS_LENGTH_LINKS_UK "Links (英國)"
-    IDS_LENGTH_METERS "米"
-    IDS_LENGTH_MICRONS "微米"
-    IDS_LENGTH_MILES "英里"
-    IDS_LENGTH_MILLIMETERS "毫米"
-    IDS_LENGTH_NAUTICAL_MILES "海里"
-    IDS_LENGTH_NIEU "Nieu"
-    IDS_LENGTH_PARSECS "秒差距"
-    IDS_LENGTH_PICAS "派卡"
-    IDS_LENGTH_RI_JAPAN "里 (日本)"
-    IDS_LENGTH_RI_KOREA "里 (韓國)"
-    IDS_LENGTH_RODS "杆"
-    IDS_LENGTH_SAWK "Sawk"
-    IDS_LENGTH_SEN "Sen"
-    IDS_LENGTH_SHAKU "尺 (日本)"
-    IDS_LENGTH_SPAN "拃"
-    IDS_LENGTH_SUN "寸 (日本)"
-    IDS_LENGTH_TSUEN "寸"
-    IDS_LENGTH_VA "Va"
-    IDS_LENGTH_YARDS "碼"
-    IDS_LENGTH_YOTE "約特"
-    IDS_LENGTH_ZHANG "丈"
-END
-
-/* Powers */
-STRINGTABLE
-BEGIN
-    IDS_POWER_BTUS_PER_MINUTE "英制熱量單位每分鐘"
-    IDS_POWER_FPS_PER_MINUTE "英尺-磅每分鐘"
-    IDS_POWER_HORSEPOWER "馬力"
-    IDS_POWER_KILOWATTS "千瓦"
-    IDS_POWER_MEGAWATTS "兆瓦"
-    IDS_POWER_WATTS "瓦"
-END
-
-/* Pressures */
-STRINGTABLE
-BEGIN
-    IDS_PRESSURE_ATMOSPHERES "大氣壓"
-    IDS_PRESSURE_BARS "巴"
-    IDS_PRESSURE_HECTOPASCALS "百帕"
-    IDS_PRESSURE_KILOPASCALS "千帕"
-    IDS_PRESSURE_MM_OF_MERCURY "毫米汞柱"
-    IDS_PRESSURE_PASCALS "帕斯卡"
-    IDS_PRESSURE_PSI "英磅-力每平方英尺"
-END
-
-/* Temperatures */
-STRINGTABLE
-BEGIN
-    IDS_TEMPERATURE_CELSIUS "攝氏度"
-    IDS_TEMPERATURE_FAHRENHEIT "華氏度"
-    IDS_TEMPERATURE_KELVIN "開爾文"
-    IDS_TEMPERATURE_RANKINE "蘭金度"
-END
-
-/* Time */
-STRINGTABLE
-BEGIN
-    IDS_TIME_DAYS "日"
-    IDS_TIME_HOURS "小時"
-    IDS_TIME_NANOSECONDS "納秒"
-    IDS_TIME_MICROSECONDS "微秒"
-    IDS_TIME_MILLISECONDS "毫秒"
-    IDS_TIME_MINUTES "分"
-    IDS_TIME_SECONDS "秒"
-    IDS_TIME_WEEKS "周"
-    IDS_TIME_YEARS "年"
-END
-
-/* Velocities */
-STRINGTABLE
-BEGIN
-    IDS_VELOCITY_CMS_SECOND "釐米/小時"
-    IDS_VELOCITY_FEET_HOUR "英尺/小時"
-    IDS_VELOCITY_FEET_SECOND "英尺/秒"
-    IDS_VELOCITY_KILOMETERS_HOUR "公里/小時"
-    IDS_VELOCITY_KNOTS "節"
-    IDS_VELOCITY_MACH "馬赫"
-    IDS_VELOCITY_METERS_SECOND "米/秒"
-    IDS_VELOCITY_MILES_HOUR "英里/小時"
-END
-
-/* Volumes */
-STRINGTABLE
-BEGIN
-    IDS_VOLUME_BARRELS_UK "桶 (英國)"
-    IDS_VOLUME_BARRELS_OIL "桶油"
-    IDS_VOLUME_BUN "Bun"
-    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_GOU "合"
-    IDS_VOLUME_HOP "Hop"
-    IDS_VOLUME_ICCE "Icce"
-    IDS_VOLUME_KWIAN "Kwian"
-    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_SEKI "Seki"
-    IDS_VOLUME_SYOU "Syou"
-    IDS_VOLUME_TANANLOUNG "Tananloung"
-    IDS_VOLUME_TANG "Tang"
-    IDS_VOLUME_TO "斗 (日本)"
-END
-
-/* Weights */
-STRINGTABLE
-BEGIN
-    IDS_WEIGHT_BAHT "銖"
-    IDS_WEIGHT_CARATS "克拉"
-    IDS_WEIGHT_CHUNG "Chung"
-    IDS_WEIGHT_DON "Don"
-    IDS_WEIGHT_GEUN "Geun"
-    IDS_WEIGHT_GRAMS "克"
-    IDS_WEIGHT_GWAN "Gwan"
-    IDS_WEIGHT_HARB "Harb"
-    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_OUNCES_AVOIRDUPOIS "常衡盎司"
-    IDS_WEIGHT_OUNCES_TROY "金衡盎司"
-    IDS_WEIGHT_POUNDS "英磅"
-    IDS_WEIGHT_QUINTAL_METRIC "公擔"
-    IDS_WEIGHT_SALOUNG "Saloung"
-    IDS_WEIGHT_STONES "石"
-    IDS_WEIGHT_TAMLUNG "Tamlung"
-    IDS_WEIGHT_TONNES "噸"
-    IDS_WEIGHT_TONS_UK "噸 (英國)"
-    IDS_WEIGHT_TONS_US "噸 (美國)"
-END

base/applications/calc/resource.rc

@@ -84,9 +84,6 @@ IDI_CALC ICON DISCARDABLE "res/calc.ico"
 #ifdef LANGUAGE_PT_BR
     #include "lang/pt-BR.rc"
 #endif
-#ifdef LANGUAGE_PT_PT
-    #include "lang/pt-PT.rc"
-#endif
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
@@ -114,9 +111,3 @@ IDI_CALC ICON DISCARDABLE "res/calc.ico"
 #ifdef LANGUAGE_ZH_CN
     #include "lang/zh-CN.rc"
 #endif
-#ifdef LANGUAGE_ZH_HK
-    #include "lang/zh-HK.rc"
-#endif
-#ifdef LANGUAGE_ZH_TW
-    #include "lang/zh-TW.rc"
-#endif

base/applications/calc/whatsnew.txt

@@ -133,7 +133,7 @@
 * "DOT" function can be used for starting a number (integer part will be zero).
 * Added repeat function.
 * If the number is greater than maximum resolution, it will be displayed with exponential notation.
-* Removed mouse and keyboard focuses from displayed buttons.
+* Removed mouse and keyboard focuses from displayed buttons. 
 * Added normal and small icons.
 
 1.00 (20070323)

base/applications/calc/winmain.c

@@ -852,7 +852,7 @@ static void update_memory_flag(HWND hWnd, BOOL mem_flag)
 
 static void update_n_stats_items(HWND hWnd, TCHAR *buffer)
 {
-    unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0);
+    unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0); 
 
     _stprintf(buffer, _T("n=%u"), n);
     SetDlgItemText(hWnd, IDC_TEXT_NITEMS, buffer);
@@ -1211,7 +1211,7 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp)
 #else
     (void)idm;
 #endif
-}
+} 
 
 static void run_canc(calc_number_t *c)
 {

base/applications/charmap/charmap.c

@@ -13,7 +13,7 @@
 #include <richedit.h>
 #include <winnls.h>
 
-//#define REMOVE_ADVANCED
+#define REMOVE_ADVANCED
 
 #define ID_ABOUT    0x1
 
@@ -25,55 +25,6 @@ HICON     hSmIcon;
 HICON     hBgIcon;
 SETTINGS  Settings;
 
-static
-VOID
-FillCharacterSetComboList(HWND hwndCombo)
-{
-    WCHAR szCharSetText[256];
-    LPWSTR trimmedName;
-    CPINFOEXW cpInfo;
-    INT i;
-
-    if (LoadStringW(hInstance, IDS_UNICODE, szCharSetText, SIZEOF(szCharSetText)))
-    {
-        SendMessageW(hwndCombo,
-                     CB_ADDSTRING,
-                     0,
-                     (LPARAM)szCharSetText);
-    }
-
-    for (i = 0; i < SIZEOF(codePages); i++)
-    {
-        if (GetCPInfoExW(codePages[i], 0, &cpInfo))
-        {
-            trimmedName = wcschr(cpInfo.CodePageName, L'(');
-            if (!trimmedName)
-                trimmedName = cpInfo.CodePageName;
-
-            SendMessageW(hwndCombo,
-                         CB_ADDSTRING,
-                         0,
-                         (LPARAM)trimmedName);
-        }
-    }
-
-    SendMessageW(hwndCombo, CB_SETCURSEL, 0, 0);
-}
-
-static
-VOID
-FillGroupByComboList(HWND hwndCombo)
-{
-    WCHAR szAllText[256];
-
-    if (LoadStringW(hInstance, IDS_ALL, szAllText, SIZEOF(szAllText)))
-    {
-        SendMessageW(hwndCombo, CB_ADDSTRING, 0, (LPARAM)szAllText);
-    }
-
-    SendMessageW(hwndCombo, CB_SETCURSEL, 0, 0);
-}
-
 /* Font-enumeration callback */
 static
 int
@@ -325,26 +276,18 @@ ChangeView(HWND hWnd)
     RECT rcCharmap;
 #ifndef REMOVE_ADVANCED
     RECT rcAdvanced;
-#else
-    RECT rcCopy;
 #endif
     RECT rcPanelExt;
     RECT rcPanelInt;
     RECT rcStatus;
     UINT DeX, DeY;
-    LONG xPos, yPos;
+    UINT xPos, yPos;
     UINT Width, Height;
     UINT DeskTopWidth, DeskTopHeight;
-#ifdef REMOVE_ADVANCED
-    HWND hCopy;
-#endif
 
     GetClientRect(hCharmapDlg, &rcCharmap);
 #ifndef REMOVE_ADVANCED
     GetClientRect(hAdvancedDlg, &rcAdvanced);
-#else
-    hCopy = GetDlgItem(hCharmapDlg, IDC_COPY);
-    GetClientRect(hCopy, &rcCopy);
 #endif
     GetWindowRect(hWnd, &rcPanelExt);
     GetClientRect(hWnd, &rcPanelInt);
@@ -369,17 +312,12 @@ ChangeView(HWND hWnd)
 #ifndef REMOVE_ADVANCED
     if (Settings.IsAdvancedView)
         Height += rcAdvanced.bottom;
-#else
-    /* The lack of advanced button leaves an empty gap at the bottom of the window.
-       Shrink the window height a bit here to accomodate for that lost control. */
-    Height = rcCharmap.bottom + rcCopy.bottom + 10;
 #endif
-    // FIXME: This fails on multi monitor setups
     if ((xPos + Width) > DeskTopWidth)
-        xPos = DeskTopWidth - Width;
+        xPos += DeskTopWidth - (xPos + Width);
 
     if ((yPos + Height) > DeskTopHeight)
-        yPos = DeskTopHeight - Height;
+        yPos += DeskTopHeight - (yPos + Height);
 
     MoveWindow(hWnd,
                xPos, yPos,
@@ -488,26 +426,6 @@ AdvancedDlgProc(HWND hDlg,
         case WM_INITDIALOG:
             return TRUE;
 
-        case WM_COMMAND:
-        {
-            switch (LOWORD(wParam))
-            {
-                case IDC_COMBO_CHARSET:
-                    if (HIWORD(wParam) == CBN_SELCHANGE)
-                    {
-                        INT idx = (INT)SendMessageW((HWND)lParam,
-                                                    CB_GETCURSEL,
-                                                    0, 0);
-                        SendMessageW(GetDlgItem(hCharmapDlg, IDC_FONTMAP),
-                                     FM_SETCHARMAP,
-                                     idx, 0);
-
-                        EnableWindow(GetDlgItem(hAdvancedDlg, IDC_EDIT_UNICODE), idx == 0);
-                    }
-                    break;
-            }
-        }
-
         default:
             return FALSE;
     }
@@ -526,21 +444,11 @@ PanelOnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
                                MAKEINTRESOURCE(IDD_CHARMAP),
                                hWnd,
                                CharMapDlgProc);
-
-    // For now, the Help push button is disabled because of lacking of HTML Help support
-    EnableWindow(GetDlgItem(hCharmapDlg, IDC_CMHELP), FALSE);
-
 #ifndef REMOVE_ADVANCED
     hAdvancedDlg = CreateDialog(hInstance,
                                 MAKEINTRESOURCE(IDD_ADVANCED),
                                 hWnd,
                                 AdvancedDlgProc);
-
-    FillCharacterSetComboList(GetDlgItem(hAdvancedDlg, IDC_COMBO_CHARSET));
-
-    FillGroupByComboList(GetDlgItem(hAdvancedDlg, IDC_COMBO_GROUPBY));
-    EnableWindow(GetDlgItem(hAdvancedDlg, IDC_COMBO_GROUPBY), FALSE);   // FIXME: Implement
-    EnableWindow(GetDlgItem(hAdvancedDlg, IDC_BUTTON_SEARCH), FALSE);   // FIXME: Implement
 #endif
     hStatusWnd = CreateWindow(STATUSCLASSNAME,
                               NULL,
@@ -575,6 +483,8 @@ PanelWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     switch (msg) {
     case WM_CREATE:
+        // For now, the Help push button is disabled because of lacking of HTML Help support
+        EnableWindow(GetDlgItem(hWnd, IDC_CMHELP), FALSE);
         return PanelOnCreate(hWnd, wParam, lParam);
 
     case WM_CLOSE:
@@ -678,7 +588,7 @@ wWinMain(HINSTANCE hInst,
     MSG Msg;
 
     hInstance = hInst;
-
+    
     /* Mirroring code for the titlebar */
     switch (GetUserDefaultUILanguage())
     {

base/applications/charmap/charmap.rc

@@ -99,9 +99,6 @@ IDI_ICON ICON "res/charmap.ico"
 #ifdef LANGUAGE_ZH_CN
     #include "lang/zh-CN.rc"
 #endif
-#ifdef LANGUAGE_ZH_HK
-    #include "lang/zh-HK.rc"
-#endif
 #ifdef LANGUAGE_ZH_TW
     #include "lang/zh-TW.rc"
 #endif

base/applications/charmap/lang/bg-BG.rc

@@ -54,6 +54,4 @@ BEGIN
     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 "&За..."
     IDS_TITLE "Character Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/ca-ES.rc

@@ -51,6 +51,4 @@ BEGIN
     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 "&En quant a..."
     IDS_TITLE "Character Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/cs-CZ.rc

@@ -56,6 +56,4 @@ BEGIN
     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 "&O programu..."
     IDS_TITLE "Mapa znaků"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/de-DE.rc

@@ -51,6 +51,4 @@ BEGIN
     IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\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 "Ü&ber..."
     IDS_TITLE "Zeichentabelle"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/el-GR.rc

@@ -51,6 +51,4 @@ BEGIN
     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 "&Πληροφορίες..."
     IDS_TITLE "Character Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/en-US.rc

@@ -51,6 +51,4 @@ BEGIN
     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 "A&bout..."
     IDS_TITLE "Character Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

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

@@ -54,6 +54,4 @@ BEGIN
     IDS_LICENSE "Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo los términos de la GNU General Public License tal y como se publica por la Free Software Foundation; ya sea la versión 2 de la Licencia, o (bajo tu discreción) cualquier versión posterior.\r\n\r\nEste programa se distribuye con el fin de ser útil, pero viene SIN NINGUNA GARANTÍA; sin tan siquiera la garantía implícita de COMERCIALIZACIÓN o la de IDONEIDAD PARA UN PROPÓSITO CONCRETO. Para más información lee la GNU General Public License.\r\n\r\nDeberías de haber recibido una copia de la GNU General Public License con el programa; si no, puedes escribir a la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 EE.UU."
     IDS_ABOUT "&Acerca de ..."
     IDS_TITLE "Mapa de caracteres"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/et-EE.rc

@@ -51,6 +51,4 @@ BEGIN
     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 "T&eave..."
     IDS_TITLE "Märgistik"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/fr-FR.rc

@@ -51,6 +51,4 @@ BEGIN
     IDS_LICENSE "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier tout en respectant les termes de la ""GNU General Public License"" publiée par la Free Software Foundation; dans sa version 2 (ou selon votre préférence) toute version ultérieure.\r\n\r\nCe programme est distribué dans l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. \r\n\r\nVoir la Licence Publique Générale GNU pour plus de détails. Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
     IDS_ABOUT "À propos..."
     IDS_TITLE "Table des Caractères"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "Tous"
 END

base/applications/charmap/lang/he-IL.rc

@@ -55,6 +55,4 @@ BEGIN
     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 "&אודות..."
     IDS_TITLE "מפת תווים"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/id-ID.rc

@@ -4,18 +4,18 @@ IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
 BEGIN
-    LTEXT "Fon:", IDC_STATIC, 6, 7, 24, 9
+    LTEXT "Font:", 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 "Bantuan", IDC_CMHELP, 249, 5, 35, 13
     CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
             WS_VSCROLL, 20, 22, 266, 156
-    LTEXT "Karakter untuk disalin:", IDC_STATIC, 6, 188, 66, 9
+    LTEXT "Karakter untuk di-copy :", 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 "Pilih", IDC_SELECT, 194, 186, 44, 13
-    PUSHBUTTON "Salin", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-    CONTROL "Tampilan rinci", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
+    PUSHBUTTON "Copy", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+    CONTROL "Advanced view", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
             WS_TABSTOP, 8, 208, 95, 10
 END
 
@@ -25,11 +25,11 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Charset:", IDC_STATIC, 8, 8, 48, 8
     COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Kelompokkan:", 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 "Cari", 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 "Cari untuk:", 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
@@ -51,6 +51,4 @@ BEGIN
     IDS_LICENSE "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU.  Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
     IDS_ABOUT "Te&ntang..."
     IDS_TITLE "Character Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/it-IT.rc

@@ -51,6 +51,4 @@ BEGIN
     IDS_LICENSE "Questo programma è software libero; può redistribuirlo e/o modificarlo sotto\ni termini della licenza pubblica GNU come pubblicata dalla Free Software Foundation; sia la versione 2 sia una versione successiva (a sua scelta).\r\n\r\nQuesto programma è distribuito\nnella speranza che sia utile, ma SENZA ALCUNA GARANZIA; senza neanche la garanzia implicita\ndi NEGOZIABILITA' o APPLICABILITA' per un particolare scopo.  Si veda la licenza generale pubblica GNU per maggiori dettagli.\r\n\r\nDovrebbe aver ricevuto una copia assieme a questo programma; se così non fosse, scriva alla Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
     IDS_ABOUT "&Informazioni su..."
     IDS_TITLE "Mappa caratteri"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/ja-JP.rc

@@ -51,6 +51,4 @@ BEGIN
     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 "Character Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/ko-KR.rc

@@ -55,6 +55,4 @@ BEGIN
     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 "정보(&A)"
     IDS_TITLE "Character Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/lt-LT.rc

@@ -60,6 +60,4 @@ BEGIN
     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 "&Apie..."
     IDS_TITLE "Character Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/nl-NL.rc

@@ -51,6 +51,4 @@ BEGIN
     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 "Over..."
     IDS_TITLE "Character Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/no-NO.rc

@@ -51,6 +51,4 @@ BEGIN
     IDS_LICENSE "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation;  version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i håp for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORMÅL.  Se på GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke har motatt det, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
     IDS_ABOUT "O&m..."
     IDS_TITLE "Character Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/pl-PL.rc

@@ -4,41 +4,40 @@
  *    Updated by Olaf Siejka (May, 2011)
  *    UTF-8 conversion by Caemyr (May, 2011)
  *    Updated by Saibamen - Adam Stachowicz (saibamenppl@gmail.com) (August, 2011)
- *    Updated by pithwz - Piotr Hetnarowicz (piotrhwz@gmail.com) (April, 2020)
  */
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-IDD_CHARMAP DIALOGEX 6, 6, 294, 224
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 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 |
+    LTEXT "Czci&onka:", IDC_STATIC, 6, 7, 28, 9
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
              WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-    PUSHBUTTON "Pomo&c", IDC_CMHELP, 237, 7, 50, 14
+    PUSHBUTTON "Pomo&c", IDC_CMHELP, 249, 5, 35, 13
     CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
             WS_VSCROLL, 20, 22, 266, 156
-    LTEXT "&Znaki do skopiowania:", IDC_STATIC, 7, 190, 62, 17
+    LTEXT "&Znaki do skopiowania:", IDC_STATIC, 6, 188, 70, 9
     CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 76, 190, 103, 16
-    DEFPUSHBUTTON "Wy&bierz", IDC_SELECT, 183, 190, 50, 14
-    PUSHBUTTON "&Kopiuj", IDC_COPY, 237, 190, 50, 14, WS_DISABLED
+            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
+    DEFPUSHBUTTON "Wy&bierz", IDC_SELECT, 194, 186, 44, 13
+    PUSHBUTTON "&Kopiuj", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
     CONTROL "Widok zaawansowany", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
-            WS_TABSTOP, 8, 210, 87, 10
+            WS_TABSTOP, 8, 208, 95, 10
 END
 
 IDD_ADVANCED DIALOGEX 0, 0, 292, 64
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Zestaw znaków:", IDC_STATIC, 7, 8, 53, 8
-    COMBOBOX IDC_COMBO_CHARSET, 76, 4, 103, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Grupowanie według:", IDC_STATIC, 7, 28, 67, 8
-    COMBOBOX IDC_COMBO_GROUPBY, 76, 24, 103, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "&Wyszukaj", IDC_BUTTON_SEARCH, 183, 44, 50, 14
-    EDITTEXT IDC_EDIT_SEARCH, 76, 44, 103, 14, ES_AUTOHSCROLL
-    LTEXT "Wyszukaj:", IDC_STATIC, 7, 48, 42, 8
+    LTEXT "Zestaw znaków:", IDC_STATIC, 8, 8, 53, 8
+    COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Grupowanie według:", IDC_STATIC, 8, 28, 67, 8
+    COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Szukaj", IDC_BUTTON_SEARCH, 200, 44, 50, 14
+    EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL
+    LTEXT "Wyszukaj:", IDC_STATIC, 8, 48, 42, 8
     LTEXT "Symbol Unicode:", IDC_STATIC, 200, 8, 30, 8
     EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL
 END
@@ -60,6 +59,4 @@ BEGIN
     IDS_LICENSE "Niniejszy program jest wolnym oprogramowaniem; możesz go rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania - według wersji 2 tej Licencji lub (według twojego wyboru) którejś z późniejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKRESLONYCH ZASTOSOWAŃ. W celu uzyskania bliższych informacji sięgnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewnością wraz z niniejszym programem otrzymałeś też egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie - napisz do Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
     IDS_ABOUT "&O programie..."
     IDS_TITLE "Tablica znaków"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "Wszystko"
 END

base/applications/charmap/lang/pt-BR.rc

@@ -51,6 +51,4 @@ BEGIN
     IDS_LICENSE "Este programa é software livre; você pode redistribuí-lo e/ou modificá-lo sob os termos da GNU General Public License conforme publicada pela Free Software Foundation; quer a versão 2 da licença, ou (conforme você escolha) qualquer versão posterior.\r\n\r\nEste programa é  distribuído com a esperança de que seja útil, mas SEM QUALQUER GARANTIA; mesmo sem a garantia  implícita de MERCANTIBILIDADE OU ADEQUAÇÃO A UM DETERMINADO PROPÓSITO. Para mais detalhes,  veja a GNU General Public License.\r\n\r\nVocê deve ter recebido uma cópia da GNU General  Public License juntamente com este programa; caso contrário, escreva para a Free Software  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
     IDS_ABOUT "So&bre..."
     IDS_TITLE "Mapa de Caracteres"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

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

@@ -57,6 +57,4 @@ BEGIN
     IDS_LICENSE "Această aplicație este publică; fiind permisă modificarea și/sau (re)distribuția sa în termenii Licenței Publice Generale GNU publicată de Free Software Foundation; sau versiunea 2 a Licenței, sau (la alegere) a oricărei versiuni ulterioare.\r\n\r\nAceastă aplicație este distribuită doar în speranța de a fi utilă, FĂRĂ însă NICI O GARANȚIE; nici măcar cu garanția implicită a VANDABILITĂȚII sau a UTILITĂȚII ÎNTR-UN SCOP ANUME. Pentru mai multe detalii consultați Licența Publică Generală GNU.\r\n\r\nPuteți vedea această licență aici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDe asemenea puteți consulta traduceri neoficiale ale acestei licențe aici:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_ABOUT "&Despre…"
     IDS_TITLE "Hartă de caractere"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

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

@@ -53,6 +53,4 @@ 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_ABOUT "&О программе..."
     IDS_TITLE "Таблица символов"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/sk-SK.rc

@@ -60,6 +60,4 @@ BEGIN
     IDS_LICENSE "Tento program je voľný softvér; môžete ho šíriť a/alebo modifikovať podľa podmienok GNU Všeobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buď verzie 2 tejto licencie, alebo (podľa Vášho uváženia) niektorej neskoršej verzie.\r\n\r\nTento program je distribuovaný v nádeji, že bude užitočný, avšak BEZ AKEJKOĽVEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URČITÝ ÚČEL. Pre viac detailov si pozrite GNU Všeobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Všeobecnej verejnej licencie GNU ste mali dostať spolu s týmto programom; ak nie, napíšte si o ňu na Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
     IDS_ABOUT "Č&o je Mapa znakov"
     IDS_TITLE "Character Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/sq-AL.rc

@@ -1,4 +1,4 @@
-/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
+/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com) 
  * DATE OF TR:  29-11-2013
 */
 
@@ -55,6 +55,4 @@ BEGIN
     IDS_LICENSE "Ky program eshte falas; ju mund ta shperndani ose modifikoni nen termat e liçenses publike te GNU nga Free Software Foundation; ose versionin 2 te Liçenses, ose (opsionet tend) versionet me te reja.\r\n\r\nKy program shperndahet me shpresen qe do te jete i nevojshem, POR PA ASNJE GARANCI; madje dhe pa nënkuptimin e garancisë së tregtimit apo përshtatshmerise për qëllim të veçantë. Shiko liçensen publike te GNU per me shume detaje.\r\n\r\nJu duhet te jeni paisur me nje kopje te liçenses GNU perkrah ketij programi; nese jo, shkruani Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
     IDS_ABOUT "R&reth..."
     IDS_TITLE "Karakter Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/sv-SE.rc

@@ -58,6 +58,4 @@ BEGIN
     IDS_LICENSE "Detta programmet är fri programvara; du kan distribuera det och/eller ändra det under villkoren enligt GNU General Public License som är utgivet av Free Software Foundation;  version 2, eller (om du så önskar) alla senare versioner.\r\n\r\nDette programmet er utgivet i hopp om att det skall kunne användas, men DET FINNS INGA GARANTIER; även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL.  Se på GNU General Public Licensen för mer detaljer.\r\n\r\nDu skall ha motagit en kopia av GNU General Public Licensen tillsammans med detta programmet; om du inte har fått det, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
     IDS_ABOUT "O&m..."
     IDS_TITLE "Character Map"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

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

@@ -1,7 +1,4 @@
-/* TRANSLATOR:
-2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net),
-2021 Süleyman Poyraz (zaryob [dot] dev [at] gmail [dot] com)
-*/
+/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -15,7 +12,7 @@ BEGIN
     PUSHBUTTON "Yardım", IDC_CMHELP, 249, 5, 35, 13
     CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
             WS_VSCROLL, 20, 22, 266, 156
-    LTEXT "Çoğaltılacak Karakterler:", IDC_STATIC, 6, 188, 66, 9
+    LTEXT "Çoğaltılacak Damgalar:", 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ç", IDC_SELECT, 194, 186, 44, 13
@@ -28,23 +25,23 @@ IDD_ADVANCED DIALOGEX 0, 0, 292, 64
 STYLE DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Karakter Yığını:", IDC_STATIC, 8, 8, 48, 8
+    LTEXT "Damga Öbeği:", IDC_STATIC, 8, 8, 48, 8
     COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Gruplandır:", IDC_STATIC, 8, 28, 50, 8
+    LTEXT "Takımla:", IDC_STATIC, 8, 28, 50, 8
     COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON "Ara", IDC_BUTTON_SEARCH, 200, 44, 50, 14
     EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL
     LTEXT "Ada Göre Ara:", IDC_STATIC, 8, 48, 42, 8
-    LTEXT "&Unicode:", IDC_STATIC, 200, 8, 30, 8
+    LTEXT "Evrenlik Kod:", IDC_STATIC, 200, 8, 30, 8
     EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL
 END
 
 IDD_ABOUTBOX DIALOGEX 22, 16, 210, 182
-CAPTION "Karakter Seçici Hakkında"
+CAPTION "Damga Eşlemi Üzerine"
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-    LTEXT "Karakter Seçici - Sürüm: 0.1\nTelif Hakkı: 2007 - Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
+    LTEXT "Damga Eşlemi - Sürüm: 0.1\nTelif Hakkı: 2007 - Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
     PUSHBUTTON "Tamam", IDOK, 75, 162, 44, 15
     ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30
     EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL |
@@ -53,9 +50,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmi olmayan çevirisidir. Çeviri metniyle özgün metin arasında farklar olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu program özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Genel Kamu Lisansı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (seçiminize bağlı olarak.) şartları altında yeniden dağıtabilir veya değiştirebilirsiniz.\r\n\r\nBu program, kullanışlı olabileceği beklentisiyle dağıtılmıştır; ancak, bu program HİÇBİR GÜVENCE VEREMEZ, SATILABİLİRLİĞİN ve BELİRLİ BİR AMACA UYGUNLUĞUN güvencesi de verilemez. Daha çok bilgi için GNU Genel Kamu Lisansı'na bakınız.\r\n\r\nBu programla birlikte GNU Genel Kamu Lisansı'nın bir kopyasını almış olmalısınız, eğer yoksa Özgür Yazılım Vakfı AŞ'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
-    IDS_ABOUT "&Hakkında..."
-    IDS_TITLE "Karakter Seçici"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "Hepsi"
+    IDS_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) şartları altında yeniden dağıtabilir veyâ değiştirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceği beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBİR GÜVENCESİ YOKTUR, SATILABİLİRLİĞİN ve BELİRLİ BİR AMACA UYGUNLUĞUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eğer yoksa Özgür Yazılım Vakfı AŞ'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+    IDS_ABOUT "&Üzerine..."
+    IDS_TITLE "Damga Eşlemi"
 END

base/applications/charmap/lang/uk-UA.rc

@@ -59,6 +59,4 @@ 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_ABOUT "&Про програму..."
     IDS_TITLE "Таблиця Cимволів"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/zh-CN.rc

@@ -59,6 +59,4 @@ BEGIN
     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., 675 Mass Ave, Cambridge, MA 02139, USA."
     IDS_ABOUT "关于(&A)..."
     IDS_TITLE "字符映射表"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/lang/zh-HK.rc

@@ -1,64 +0,0 @@
-/*
- * PROJECT:     ReactOS Character Map
- * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:     Chinese (Hong Kong) resource file
- * TRANSLATORS: Copyright 2021 Chan Chilung <eason066@gmail.com>
- * REFERENCES:  Chinese (Traditional) resource file
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
-
-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_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
-    CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
-    DEFPUSHBUTTON "選擇", IDC_SELECT, 194, 186, 44, 13
-    PUSHBUTTON "複製", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-    CONTROL "進階檢視", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
-            WS_TABSTOP, 8, 208, 95, 10
-END
-
-IDD_ADVANCED DIALOGEX 0, 0, 292, 64
-STYLE DS_SHELLFONT | WS_CHILD
-FONT 9, "新細明體"
-BEGIN
-    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
-    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
-    EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL
-END
-
-IDD_ABOUTBOX DIALOGEX 22, 16, 210, 182
-CAPTION "關於字元對應表"
-FONT 9, "新細明體", 0, 0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-    LTEXT "字元對應表 v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
-    PUSHBUTTON "關閉", IDOK, 75, 162, 44, 15
-    ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30
-    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL |
-             WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE
-BEGIN
-    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 "關於(&A)..."
-    IDS_TITLE "字元對應表"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
-END

base/applications/charmap/lang/zh-TW.rc

@@ -12,7 +12,7 @@ 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
+    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
@@ -56,9 +56,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LICENSE "本程式為自由軟體，在自由軟體聯盟發佈的 GNU 通用公共授權合約的約束下，你可以對其進行再發佈及修改，協議版本為第二版或（隨你）更新的版本。\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 "關於(&A)..."
     IDS_TITLE "字元對應表"
-    IDS_UNICODE "Unicode"
-    IDS_ALL "All"
 END

base/applications/charmap/map.c

@@ -10,7 +10,6 @@
 #include "precomp.h"
 
 #include <stdlib.h>
-#include <winnls.h>
 
 static const WCHAR szMapWndClass[] = L"FontMapWnd";
 static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd";
@@ -41,7 +40,6 @@ SetGrid(PMAP infoPtr)
     }
 }
 
-
 static
 VOID
 DrawActiveCell(PMAP infoPtr,
@@ -113,8 +111,6 @@ FillGrid(PMAP infoPtr,
     for (y = 0; y < YCELLS; y++)
     for (x = 0; x < XCELLS; x++)
     {
-        if (i >= infoPtr->NumValidGlyphs) break;
-
         ch = (WCHAR)infoPtr->ValidGlyphs[i];
 
         Cell = &infoPtr->Cells[y][x];
@@ -210,38 +206,6 @@ MoveLargeCell(PMAP infoPtr)
 }
 
 
-static
-VOID
-GetPossibleCharacters(WCHAR* ch, INT chLen, INT codePageIdx)
-{
-    INT i, j;
-
-    memset(ch, 0, sizeof(ch[0]) * chLen);
-
-    if (codePageIdx <= 0 || codePageIdx > SIZEOF(codePages))
-    {
-        /* this is unicode, so just load up the first MAX_GLYPHS characters
-           start at 0x21 to bypass whitespace characters */
-        INT len = min(MAX_GLYPHS, chLen);
-        for (i = 0x21, j = 0; i < len; i++)
-            ch[j++] = (WCHAR)i;
-    }
-    else
-    {
-        /* This is a codepage, so use NLS to translate the first 256 characters */
-        CHAR multiByteString[256] = { 0 };
-        for (i = 0x21; i < SIZEOF(multiByteString); i++)
-            multiByteString[i] = (CHAR)i;
-
-        if (!MultiByteToWideChar(codePages[codePageIdx - 1], 0, multiByteString, sizeof(multiByteString), ch, chLen))
-        {
-            /* Failed for some reason, so clear the array */
-            memset(ch, 0, sizeof(ch[0]) * chLen);
-        }
-    }
-}
-
-
 static
 VOID
 SetFont(PMAP infoPtr,
@@ -266,9 +230,9 @@ SetFont(PMAP infoPtr,
     infoPtr->CurrentFont.lfHeight = GetDeviceCaps(hdc, LOGPIXELSY) / 5;
 
     infoPtr->CurrentFont.lfCharSet =  DEFAULT_CHARSET;
-    lstrcpynW(infoPtr->CurrentFont.lfFaceName,
-              lpFontName,
-              SIZEOF(infoPtr->CurrentFont.lfFaceName));
+    wcsncpy(infoPtr->CurrentFont.lfFaceName,
+            lpFontName,
+            sizeof(infoPtr->CurrentFont.lfFaceName) / sizeof(infoPtr->CurrentFont.lfFaceName[0]));
 
     infoPtr->hFont = CreateFontIndirectW(&infoPtr->CurrentFont);
 
@@ -276,17 +240,14 @@ 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);
 
-    // Get the code page associated with the selected 'character set'
-    GetPossibleCharacters(ch, MAX_GLYPHS, infoPtr->CharMap);
+    for (i = 0; i < MAX_GLYPHS; i++)
+        ch[i] = (WCHAR)i;
 
     if (GetGlyphIndicesW(hdc,
                          ch,
@@ -297,7 +258,7 @@ SetFont(PMAP infoPtr,
         j = 0;
         for (i = 0; i < MAX_GLYPHS; i++)
         {
-            if (out[i] != 0xffff && out[i] != 0x0000 && ch[i] != 0x0000)
+            if (out[i] != 0xffff)
             {
                 infoPtr->ValidGlyphs[j] = ch[i];
                 j++;
@@ -351,55 +312,64 @@ OnClick(PMAP infoPtr,
         WORD ptx,
         WORD pty)
 {
-    INT x, y, i;
+    POINT pt;
+    INT x, y;
 
-    /*
-     * Find the cell the mouse pointer is over.
-     * Since each cell is the same size, this can be done quickly using CellSize.
-     * Clamp to XCELLS - 1 and YCELLS - 1 because the map can sometimes be slightly
-     * larger than infoPtr.CellSize * XCELLS , due to the map size being a non integer
-     * multiple of infoPtr.CellSize .
-     */
-    x = min(XCELLS - 1, ptx / max(1, infoPtr->CellSize.cx));
-    y = min(YCELLS - 1, pty / max(1, infoPtr->CellSize.cy));
+    pt.x = ptx;
+    pt.y = pty;
 
-    /* Make sure the mouse is within a valid glyph */
-    i = XCELLS * infoPtr->iYStart + y * XCELLS + x;
-    if (i >= infoPtr->NumValidGlyphs)
+    for (x = 0; x < XCELLS; x++)
+    for (y = 0; y < YCELLS; y++)
     {
-        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)
+        if (PtInRect(&infoPtr->Cells[y][x].CellInt,
+                     pt))
         {
-            /* invalidate normal cells, required when
-             * moving a small active cell via keyboard */
-            if (!infoPtr->pActiveCell->bLarge)
+            /* if the cell is not already active */
+            if (!infoPtr->Cells[y][x].bActive)
             {
-                InvalidateRect(infoPtr->hMapWnd,
-                               &infoPtr->pActiveCell->CellInt,
-                               TRUE);
+                /* 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);
+            }
+            else
+            {
+                /* flick between large and small */
+                if (infoPtr->pActiveCell->bLarge)
+                {
+                    DestroyWindow(infoPtr->hLrgWnd);
+                    infoPtr->hLrgWnd = NULL;
+                }
+                else
+                {
+                    CreateLargeCell(infoPtr);
+                }
+
+                infoPtr->pActiveCell->bLarge = (infoPtr->pActiveCell->bLarge) ? FALSE : TRUE;
             }
 
-            infoPtr->pActiveCell->bActive = FALSE;
-            infoPtr->pActiveCell->bLarge = FALSE;
+            break;
         }
-
-        /* 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);
     }
 }
 
@@ -503,15 +473,6 @@ OnVScroll(PMAP infoPtr,
         if (abs(iYDiff) < YCELLS)
         {
             RECT rect;
-
-            /* Invalidate the rect around the active cell since a new cell will become active */
-            if (infoPtr->pActiveCell && infoPtr->pActiveCell->bActive)
-            {
-                InvalidateRect(infoPtr->hMapWnd,
-                               &infoPtr->pActiveCell->CellExt,
-                               TRUE);
-            }
-
             GetClientRect(infoPtr->hMapWnd, &rect);
             rect.top += 2;
             rect.bottom -= 2;
@@ -589,7 +550,6 @@ MapWndProc(HWND hwnd,
 {
     PMAP infoPtr;
     LRESULT Ret = 0;
-    WCHAR lfFaceName[LF_FACESIZE];
 
     infoPtr = (PMAP)GetWindowLongPtrW(hwnd,
                                       0);
@@ -617,33 +577,12 @@ MapWndProc(HWND hwnd,
             break;
         }
 
-        case WM_MOUSEMOVE:
-        {
-            if (wParam & MK_LBUTTON)
-            {
-                OnClick(infoPtr,
-                        LOWORD(lParam),
-                        HIWORD(lParam));
-            }
-            break;
-        }
-
         case WM_LBUTTONDBLCLK:
         {
-            if (!infoPtr->pActiveCell)
-                break;
-
             NotifyParentOfSelection(infoPtr,
                                     FM_SETCHAR,
                                     infoPtr->pActiveCell->ch);
 
-            if (infoPtr->pActiveCell->bLarge)
-            {
-                DestroyWindow(infoPtr->hLrgWnd);
-                infoPtr->hLrgWnd = NULL;
-            }
-
-            infoPtr->pActiveCell->bLarge = FALSE;
 
             break;
         }
@@ -657,14 +596,6 @@ MapWndProc(HWND hwnd,
             break;
         }
 
-        case FM_SETCHARMAP:
-            infoPtr->CharMap = LOWORD(wParam);
-            wcsncpy(lfFaceName,
-                    infoPtr->CurrentFont.lfFaceName,
-                    SIZEOF(lfFaceName));
-            SetFont(infoPtr, lfFaceName);
-            break;
-
         case FM_SETFONT:
             SetFont(infoPtr, (LPWSTR)lParam);
             break;

base/applications/charmap/precomp.h

@@ -19,17 +19,10 @@
 #define XLARGE 45
 #define YLARGE 25
 
-#define FM_SETFONT    (WM_USER + 1)
-#define FM_GETCHAR    (WM_USER + 2)
-#define FM_SETCHAR    (WM_USER + 3)
-#define FM_GETHFONT   (WM_USER + 4)
-#define FM_SETCHARMAP (WM_USER + 5)
-
-// the code pages to display in the advanced 'character set' combobox
-static const UINT codePages[] = {
-    864, 775, 863, 855, 737, 856, 862, 861, 852, 869, 850, 858, 865, 860, 866, 857, 437,    // OEM code pages
-    1256, 1257, 1250, 1251, 1253, 1255, 932, 949, 1252, 936, 874, 950, 1254, 1258           // ANSI code pages
-};
+#define FM_SETFONT  (WM_USER + 1)
+#define FM_GETCHAR  (WM_USER + 2)
+#define FM_SETCHAR  (WM_USER + 3)
+#define FM_GETHFONT (WM_USER + 4)
 
 extern HINSTANCE hInstance;
 
@@ -55,7 +48,6 @@ typedef struct _MAP
     LOGFONTW CurrentFont;
     INT iYStart;
     INT NumRows;
-    INT CharMap;
 
     USHORT ValidGlyphs[MAX_GLYPHS];
     USHORT NumValidGlyphs;

base/applications/charmap/resource.h

@@ -28,5 +28,3 @@
 #define IDS_LICENSE 1010
 #define IDS_ABOUT   1011
 #define IDS_TITLE   1012
-#define IDS_UNICODE 1013
-#define IDS_ALL     1014

base/applications/charmap/settings.c

@@ -59,8 +59,7 @@ extern void LoadSettings(void)
     {
         TCHAR szBuffer[MAX_PATH];
         DWORD dwAdvancedChecked;
-        DWORD type, size = sizeof(dwAdvancedChecked);
-        LSTATUS lstatus;
+        unsigned long type = REG_DWORD, size = 1024;
 
         /* Restore last selected font */
         if (QueryStringValue(HKEY_CURRENT_USER, g_szGeneralRegKey, _T("Font"), szBuffer, (sizeof(szBuffer)/sizeof(szBuffer[0]))) == ERROR_SUCCESS)
@@ -90,11 +89,10 @@ extern void LoadSettings(void)
             }
         }
 
-        lstatus = RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvancedChecked, &size);
-        if (lstatus == ERROR_SUCCESS && type == REG_DWORD && dwAdvancedChecked != FALSE)
-        {
+        RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvancedChecked, &size);
+
+        if(dwAdvancedChecked != FALSE)
             SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, MF_CHECKED, 0);
-        }
 
     RegCloseKey(hKey);
     }

base/applications/charmap_new/CMakeLists.txt

@@ -1,6 +1,14 @@
 PROJECT(CHARMAP)
 
+set_cpp(WITH_RTTI WITH_RUNTIME WITH_EXCEPTIONS)
+
+if(NOT MSVC)
+    # HACK: this should be enabled globally!
+    add_compile_flags_language("-std=c++11" "CXX")
+endif()
+
 include_directories(
+    ${REACTOS_SOURCE_DIR}/sdk/lib/atl 
     includes)
 
 list(APPEND SOURCE
@@ -13,8 +21,7 @@ add_library(charmap MODULE
     charmap.rc)
 
 set_module_type(charmap win32gui UNICODE)
-target_link_libraries(charmap uuid wine cpprt atl_classes)
-set_target_cpp_properties(charmap WITH_EXCEPTIONS WITH_RTTI)
+target_link_libraries(charmap uuid wine)
 add_importlibs(charmap advapi32 user32 gdi32 comctl32 version msvcrt kernel32 ole32 uxtheme ntdll)
 add_pch(charmap precomp.h SOURCE)
 add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all)

base/applications/charmap_new/GridView.cpp

@@ -155,7 +155,7 @@ CGridView::UpdateCellCoordinates(
     )
 {
     // Go through all the cells and calculate
-    // their coordinates within the grid
+    // their coordinates within the grid 
     for (int y = 0; y < m_yNumCells; y++)
     for (int x = 0; x < m_xNumCells; x++)
     {
@@ -262,6 +262,7 @@ VOID
 CGridView::OnVScroll(_In_ INT Value,
                      _In_ INT Pos)
 {
+    
     INT PrevScrollPosition = m_ScrollPosition;
 
     switch (Value)

base/applications/charmap_new/MainWindow.cpp

@@ -99,7 +99,7 @@ CCharMapWindow::Run(void)
 {
     MSG Msg;
 
-    // Pump the message queue
+    // Pump the message queue 
     while (GetMessageW(&Msg, NULL, 0, 0) != 0)
     {
         TranslateMessage(&Msg);
@@ -195,7 +195,7 @@ CCharMapWindow::OnCreate(_In_ HWND hDlg)
         }
     }
 
-    // Add all the fonts to the list
+    // Add all the fonts to the 
     if (!CreateFontComboBox())
         return FALSE;
 
@@ -373,8 +373,9 @@ CCharMapWindow::DialogProc(
         switch (wParam)
         {
         case ID_ABOUT:
+            // Apportion blame
             MessageBoxW(This->m_hMainWnd,
-                        L"ReactOS Character Map\nCopyright Ged Murphy 2015",
+                        L"ReactOS Character Map\r\nCopyright Ged Murphy 2015",
                         L"About",
                         MB_OK | MB_APPLMODAL);
             break;

base/applications/charmap_new/charmap.rc

@@ -18,39 +18,87 @@ IDI_ICON ICON "res/charmap.ico"
 /* UTF-8 */
 #pragma code_page(65001)
 
+#ifdef LANGUAGE_BG_BG
+    #include "lang/bg-BG.rc"
+#endif
+#ifdef LANGUAGE_CA_ES
+    #include "lang/ca-ES.rc"
+#endif
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif
+#ifdef LANGUAGE_EL_GR
+    #include "lang/el-GR.rc"
+#endif
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
 #ifdef LANGUAGE_ET-EE
     #include "lang/et-EE.rc"
 #endif
-#ifdef LANGUAGE_EU_ES
-    #include "lang/eu-ES.rc"
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_HE_IL
+    #include "lang/he-IL.rc"
+#endif
+#ifdef LANGUAGE_ID_ID
+    #include "lang/id-ID.rc"
 #endif
 #ifdef LANGUAGE_IT_IT
     #include "lang/it-IT.rc"
 #endif
+#ifdef LANGUAGE_JA_JP
+    #include "lang/ja-JP.rc"
+#endif
+#ifdef LANGUAGE_KO_KR
+    #include "lang/ko-KR.rc"
+#endif
+#ifdef LANGUAGE_LT_LT
+    #include "lang/lt-LT.rc"
+#endif
+#ifdef LANGUAGE_NL_NL
+    #include "lang/nl-NL.rc"
+#endif
+#ifdef LANGUAGE_NB_NO
+    #include "lang/no-NO.rc"
+#endif
 #ifdef LANGUAGE_PL_PL
     #include "lang/pl-PL.rc"
 #endif
+#ifdef LANGUAGE_PT_BR
+    #include "lang/pt-BR.rc"
+#endif
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
+#ifdef LANGUAGE_SK_SK
+    #include "lang/sk-SK.rc"
+#endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
+#ifdef LANGUAGE_SV_SE
+    #include "lang/sv-SE.rc"
+#endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
+#endif
 #ifdef LANGUAGE_ZH_CN
     #include "lang/zh-CN.rc"
 #endif
-#ifdef LANGUAGE_ZH_HK
-    #include "lang/zh-HK.rc"
-#endif
 #ifdef LANGUAGE_ZH_TW
     #include "lang/zh-TW.rc"
 #endif

base/applications/charmap_new/lang/de-DE.rc

@@ -1,22 +0,0 @@
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-
-IDD_CHARMAP DIALOGEX 6, 6, 290, 224
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX
-CAPTION "ReactOS Zeichentabelle"
-BEGIN
-    LTEXT "Schriftart:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE |
-            WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-    LTEXT "Zu kopierende Zeichen:", 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 "Auswählen", IDC_SELECT, 194, 186, 44, 13
-    PUSHBUTTON "Kopieren", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-END
-
-STRINGTABLE
-BEGIN
-    IDS_ABOUT "Ü&ber..."
-    IDS_TITLE "Zeichentabelle"
-END

base/applications/charmap_new/lang/es-ES.rc

@@ -1,22 +0,0 @@
-LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
-
-IDD_CHARMAP DIALOGEX 6, 6, 290, 224
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX
-CAPTION "Mapa de caracteres de ReactOS"
-BEGIN
-    LTEXT "Fuente:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE |
-            WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-    LTEXT "Caracteres para copiar:", IDC_STATIC, 6, 188, 66, 9
-    CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER |
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13
-    DEFPUSHBUTTON "Seleccionar", IDC_SELECT, 194, 186, 44, 13
-    PUSHBUTTON "Copiar", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-END
-
-STRINGTABLE
-BEGIN
-    IDS_ABOUT "A&cerca de..."
-    IDS_TITLE "Mapa de Caracteres"
-END

base/applications/charmap_new/lang/eu-ES.rc

@@ -1,22 +0,0 @@
-LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT
-
-IDD_CHARMAP DIALOGEX 6, 6, 290, 224
-FONT 8, "MS Shell Dlg", 0, 0
-STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX
-CAPTION "ReactOS karaktere mapa"
-BEGIN
-    LTEXT "Iturri:", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE |
-            WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-    LTEXT "Karaktere kpoiatzeko:", 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 "Aukeratu", IDC_SELECT, 194, 186, 44, 13
-    PUSHBUTTON "Copiatu", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-END
-
-STRINGTABLE
-BEGIN
-    IDS_ABOUT "Zer&i buruz..."
-    IDS_TITLE "Karaktere Mapa"
-END

base/applications/charmap_new/lang/it-IT.rc

@@ -2,7 +2,7 @@
  * PROJECT:     ReactOS Character Map
  * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
  * PURPOSE:     Italian Translation for ReactOS Character Map
- * COPYRIGHT:   George Bișoc (george.bisoc@reactos.org)
+ * COPYRIGHT:   Bișoc George (fraizeraust99 at gmail dot com)
  */
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

base/applications/charmap_new/lang/ro-RO.rc

@@ -2,7 +2,7 @@
  * PROJECT:     ReactOS Character Map
  * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
  * PURPOSE:     Romanian Translation for ReactOS Character Map
- * COPYRIGHT:   George Bișoc (george.bisoc@reactos.org)
+ * COPYRIGHT:   Bișoc George (fraizeraust99 at gmail dot com)
  */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

base/applications/charmap_new/lang/tr-TR.rc

@@ -1,27 +1,23 @@
-/* TRANSLATOR:
-2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net),
-2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net),
-2021 Süleyman Poyraz (zaryob [dot] dev [at] gmail [dot] com)
-*/
+/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net)*/
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 IDD_CHARMAP DIALOGEX 6, 6, 292, 224
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX
-CAPTION "ReactOS Karakter Seçici"
+CAPTION "ReactOS Karakter Eşlem"
 BEGIN
     LTEXT "Yazı Tipi:", 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
-    LTEXT "Kopyalanacak Karakterler:", IDC_STATIC, 6, 188, 66, 9
+    LTEXT "Çoğaltılacak Karakterler:", 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ç", IDC_SELECT, 194, 186, 44, 13
-    PUSHBUTTON "Kopyala", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+    PUSHBUTTON "Çoğalt", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
     //CONTROL "Gelişmiş Görünüm", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
     //        WS_TABSTOP, 8, 208, 95, 10
-    //LTEXT "Karakter Dizisi:", IDC_STATIC, 8, 8, 48, 8
+    //LTEXT "Karakter Öbeği:", IDC_STATIC, 8, 8, 48, 8
     //COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     //LTEXT "Takımla:", IDC_STATIC, 8, 28, 50, 8
     //COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -35,5 +31,5 @@ END
 STRINGTABLE
 BEGIN
     IDS_ABOUT "&Hakkında"
-    IDS_TITLE "Karakter Seçici"
+    IDS_TITLE "Karakter Eşlem"
 END

base/applications/charmap_new/lang/zh-HK.rc

@@ -1,30 +0,0 @@
-/*
- * PROJECT:      ReactOS Character Map
- * LICENSE:      GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
- * PURPOSE:      Chinese (Hong Kong) resource file
- * TRANSLATORS:  Copyright 2021 Chan Chilung <eason066@gmail.com>
- * REFERENCES:   Chinese (Traditional) resource file
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
-
-IDD_CHARMAP DIALOGEX 6, 6, 290, 224
-FONT 9, "新細明體", 0, 0
-STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX
-CAPTION "ReactOS 字元對應表"
-BEGIN
-    LTEXT "字體：", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE |
-            WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-    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
-    PUSHBUTTON "複製", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-END
-
-STRINGTABLE
-BEGIN
-    IDS_ABOUT "關於(&B)..."
-    IDS_TITLE "字元對應表"
-END

base/applications/charmap_new/lang/zh-TW.rc

@@ -1,22 +0,0 @@
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-
-IDD_CHARMAP DIALOGEX 6, 6, 290, 224
-FONT 9, "新細明體", 0, 0
-STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX
-CAPTION "ReactOS 字元對應表"
-BEGIN
-    LTEXT "字體：", IDC_STATIC, 6, 7, 24, 9
-    COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE |
-            WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-    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
-    PUSHBUTTON "複製", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-END
-
-STRINGTABLE
-BEGIN
-    IDS_ABOUT "關於(&B)..."
-    IDS_TITLE "字元對應表"
-END

base/applications/clipbrd/clipbrd.c

@@ -32,7 +32,7 @@ static void SaveClipboardToFile(void)
     sfn.lpstrFilter = szFilterMask;
     sfn.lpstrFile = szFileName;
     sfn.nMaxFile = ARRAYSIZE(szFileName);
-    sfn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT;
+    sfn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT;
     sfn.lpstrDefExt = L"clp";
 
     if (!GetSaveFileNameW(&sfn))

base/applications/clipbrd/clipbrd.rc

@@ -44,18 +44,12 @@ CLPFILE_ICON ICON "res/clpfile.ico"
 #ifdef LANGUAGE_HE_IL
     #include "lang/he-IL.rc"
 #endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
 #ifdef LANGUAGE_IT_IT
     #include "lang/it-IT.rc"
 #endif
 #ifdef LANGUAGE_PL_PL
     #include "lang/pl-PL.rc"
 #endif
-#ifdef LANGUAGE_PT_PT
-    #include "lang/pt-PT.rc"
-#endif
 #ifdef LANGUAGE_RO_RO
     #include "lang/ro-RO.rc"
 #endif
@@ -68,9 +62,6 @@ CLPFILE_ICON ICON "res/clpfile.ico"
 #ifdef LANGUAGE_ZH_CN
     #include "lang/zh-CN.rc"
 #endif
-#ifdef LANGUAGE_ZH_HK
-    #include "lang/zh-HK.rc"
-#endif
 #ifdef LANGUAGE_ZH_TW
     #include "lang/zh-TW.rc"
 #endif

base/applications/clipbrd/lang/de-DE.rc

@@ -32,8 +32,8 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_CLIPBOARD "Zwischenablagenanzeige"
-    STRING_CLIPFILE  "Zwischenablagen-Element"
+    STRING_CLIPBOARD "Clipboard Viewer"
+    STRING_CLIPFILE  "Clipboard Element"
     STRING_DELETE_MSG "Soll der Inhalt der Zwischenablage gelöscht werden?"
     STRING_DELETE_TITLE "Zwischenablage löschen"
     STRING_FORMAT_NT "Zwischenablagedateien für ReactOS (*.clp)"

base/applications/clipbrd/lang/es-ES.rc

@@ -18,7 +18,7 @@ BEGIN
     END
     POPUP "&Edición"
     BEGIN
-        MENUITEM "&Borrar\tSupr", CMD_DELETE
+        MENUITEM "&Borrar\tDel", CMD_DELETE
     END
     POPUP "&Visualización"
     BEGIN
@@ -34,8 +34,8 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_CLIPBOARD "Visor del Portapapeles"
-    STRING_CLIPFILE  "Elemento del Portapapeles"
+    STRING_CLIPBOARD "Clipboard Viewer"
+    STRING_CLIPFILE  "Clipboard Element"
     STRING_DELETE_MSG "¿Borrar contenidos del Portapapeles?"
     STRING_DELETE_TITLE "Vaciar Portapapeles"
     STRING_FORMAT_NT "Archivos de Portapapeles de ReactOS (*.clp)"

base/applications/clipbrd/lang/id-ID.rc

@@ -1,65 +0,0 @@
-LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
-
-ID_ACCEL ACCELERATORS
-BEGIN
-    VK_DELETE, CMD_DELETE, VIRTKEY
-END
-
-MAIN_MENU MENU
-BEGIN
-    POPUP "Be&rkas"
-    BEGIN
-        MENUITEM "&Buka...", CMD_OPEN
-        MENUITEM "&Simpan Sebagai...", CMD_SAVE_AS
-        MENUITEM SEPARATOR
-        MENUITEM "&Keluar", CMD_EXIT
-    END
-    POPUP "&Edit"
-    BEGIN
-        MENUITEM "&Hapus\tDel", CMD_DELETE
-    END
-    POPUP "&Tampilan"
-    BEGIN
-        MENUITEM "&otomatis", CMD_AUTOMATIC
-    END
-    POPUP "&Bantuan"
-    BEGIN
-        MENUITEM "Topik &Bantuan", CMD_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "&Tentang", CMD_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    STRING_CLIPBOARD "Penampil Papan Klip"
-    STRING_CLIPFILE  "Elemen Papan Klip"
-    STRING_DELETE_MSG "Bersihkan isi papan klip?"
-    STRING_DELETE_TITLE "Bersihkan papan klip"
-    STRING_FORMAT_NT "Berkas papan klip untuk ReactOS (*.clp)"
-    STRING_FORMAT_GEN "Berkas papan klip (*.clp)"
-END
-
-STRINGTABLE
-BEGIN
-    STRING_CF_UNKNOWN "Format Tidak Diketahui"
-    STRING_CF_TEXT "Teks"
-    STRING_CF_BITMAP "Bitmap"
-    STRING_CF_OEMTEXT "Teks OEM"
-    STRING_CF_UNICODETEXT "Teks Unicode"
-    STRING_CF_DIB "Bitmap DIB"
-    STRING_CF_LOCALE "Data Lokal"
-    STRING_CF_ENHMETAFILE "Meta-berkas yang Ditingkatkan"
-    STRING_CF_METAFILEPICT "Meta-berkas"
-    STRING_CF_PALETTE "Palet Warna"
-    STRING_CF_DIBV5 "Bitmap DIB (Versi 5)"
-    STRING_CF_SYLK "Format Tautan Simbolik"
-    STRING_CF_DIF "Format Pertukaran Data"
-    STRING_CF_HDROP "Data yang Ditaruh"
-END
-
-STRINGTABLE
-BEGIN
-    ERROR_UNSUPPORTED_FORMAT "The Clipboard contains data in a format, sehingga tidak bisa ditampilkan."
-    ERROR_INVALID_FILE_FORMAT "Berkas yang dipilih bukan berkas papan klip yang sah."
-END

base/applications/clipbrd/lang/it-IT.rc

@@ -2,7 +2,7 @@
  * PROJECT:     ReactOS Clipboard Viewer
  * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
  * PURPOSE:     Implementation of Italian language for Clipboard Viewer
- * COPYRIGHT:   Copyright 2018 George Bișoc (george.bisoc@reactos.org)
+ * COPYRIGHT:   Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com)
  */
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

base/applications/clipbrd/lang/pt-PT.rc

@@ -1,67 +0,0 @@
-/* Translation and UTF-8 Conversion by Gabriel Aguiar(fgsoftware1) <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> (July, 2021) */
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
-
-ID_ACCEL ACCELERATORS
-BEGIN
-    VK_DELETE, CMD_DELETE, VIRTKEY
-END
-
-MAIN_MENU MENU
-BEGIN
-    POPUP "&Ficheiro"
-    BEGIN
-        MENUITEM "&Abrir...", CMD_OPEN
-        MENUITEM "Guardar &como...", CMD_SAVE_AS
-        MENUITEM SEPARATOR
-        MENUITEM "S&air", CMD_EXIT
-    END
-    POPUP "&Editar"
-    BEGIN
-        MENUITEM "&Apagar\tDel", CMD_DELETE
-    END
-    POPUP "&Ecrã"
-    BEGIN
-        MENUITEM "&Automático", CMD_AUTOMATIC
-    END
-    POPUP "&Ajuda"
-    BEGIN
-        MENUITEM "&Ajuda", CMD_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "&Sobre", CMD_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    STRING_CLIPBOARD "Visualizador da área de transferência"
-    STRING_CLIPFILE  "Elemento da área de transferência"
-    STRING_DELETE_MSG "Apagar conteúdos da área de transferência?"
-    STRING_DELETE_TITLE "Limpar área de transferência"
-    STRING_FORMAT_NT "Ficheiros da área de transferência para ReactOS (*.clp)"
-    STRING_FORMAT_GEN "Ficheiros da área de transferência (*.clp)"
-END
-
-STRINGTABLE
-BEGIN
-    STRING_CF_UNKNOWN "Formato desconhecido"
-    STRING_CF_TEXT "Texto"
-    STRING_CF_BITMAP "Bitmap"
-    STRING_CF_OEMTEXT "Texto OEM"
-    STRING_CF_UNICODETEXT "Texto unicode"
-    STRING_CF_DIB "DIB Bitmap"
-    STRING_CF_LOCALE "Dados locais"
-    STRING_CF_ENHMETAFILE "Ficheiro meta melhorado"
-    STRING_CF_METAFILEPICT "Ficheiro meta"
-    STRING_CF_PALETTE "Palete de cores"
-    STRING_CF_DIBV5 "DIB Bitmap (Version 5)"
-    STRING_CF_SYLK "Formato de ligação simbólica"
-    STRING_CF_DIF "Formato de intercâmbio de dados"
-    STRING_CF_HDROP "Apagar dados"
-END
-
-STRINGTABLE
-BEGIN
-    ERROR_UNSUPPORTED_FORMAT "A área de transferência contém dados num formato não suportado"
-    ERROR_INVALID_FILE_FORMAT "O ficheiro seleccionado nao é válido"
-END

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

@@ -1,8 +1,4 @@
-/* TRANSLATOR:
-2015, 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net),
-2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net),
-2021 Süleyman Poyraz (zaryob [dot] dev [at] gmail [dot] com)
-*/
+/* TRANSLATOR: 2015, 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
@@ -40,10 +36,10 @@ STRINGTABLE
 BEGIN
     STRING_CLIPBOARD "Pano Görüntüleyicisi"
     STRING_CLIPFILE  "Pano Ögesi"
-    STRING_DELETE_MSG "Pano içeriği silinsin mi?"
-    STRING_DELETE_TITLE "Panoyu Temizle"
-    STRING_FORMAT_NT "ReactOS İçin Pano Dosyaları (*.clp)"
-    STRING_FORMAT_GEN "Pano Dosyaları (*.clp)"
+    STRING_DELETE_MSG "Pano içeriğini sil?"
+    STRING_DELETE_TITLE "Pano Sil"
+    STRING_FORMAT_NT "ReactOS İçin Pano Kütükleri (*.clp)"
+    STRING_FORMAT_GEN "Pano Kütükleri (*.clp)"
 END
 
 STRINGTABLE
@@ -51,17 +47,17 @@ BEGIN
     STRING_CF_UNKNOWN "Bilinmeyen Biçim"
     STRING_CF_TEXT "Metin"
     STRING_CF_BITMAP "Bit Eşlem"
-    STRING_CF_OEMTEXT "OEM Metni"
-    STRING_CF_UNICODETEXT "Evrensel Kodlu Metin"
+    STRING_CF_OEMTEXT "OEM Metin"
+    STRING_CF_UNICODETEXT "Evrenlik Kodlu Metin"
     STRING_CF_DIB "DIB Bit Eşlem"
-    STRING_CF_LOCALE "Yerel Veri"
-    STRING_CF_ENHMETAFILE "Geliştirilmiş Meta Dosyasıs"
+    STRING_CF_LOCALE "Yerli Veri"
+    STRING_CF_ENHMETAFILE "Geliştirilmiş Metafile"
     STRING_CF_METAFILEPICT "Meta dosyası"
     STRING_CF_PALETTE "Renklik"
     STRING_CF_DIBV5 "DIB Bit Eşlem (Sürüm 5)"
-    STRING_CF_SYLK "Sembolik Bağlantı Biçimi"
+    STRING_CF_SYLK "Simgelik Bağlantı Biçimi"
     STRING_CF_DIF "Veri Değiş Tokuş Biçimi"
-    STRING_CF_HDROP "Veriyi Kaldır"
+    STRING_CF_HDROP "Bırakma Verisi"
 END
 
 STRINGTABLE