[NETWORK_STACK] Sync Jerome's work from the tcpip_revolution branch.

svn path=/branches/network_stack/; revision=71024

.gitattributes

@@ -1,83 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Files with these extensions are accepted source files inside the ReactOS
-# tree. They should have native line endings of the OS.
-*.acf text
-*.asm text
-*.c text
-*.cc text
-*.cmake text
-*.cpp text
-*.cxx text
-*.h text
-*.hpp text
-*.hxx text
-*.idl text
-*.inc text
-*.inl text
-*.klc text
-*.l text
-*.lds text
-*.md text
-*.rc text
-*.s text
-*.S text
-*.sfd text
-*.spec text
-*.svg text
-*.txt text
-*.TXT text
-*.y text
-
-# Files with these extensions end up in the built ReactOS system, so they
-# need to have CRLF line endings.
-*.bat text eol=crlf
-*.cmd text eol=crlf
-*.exp text eol=crlf
-*.hhc text eol=crlf
-*.hhp text eol=crlf
-*.ini text eol=crlf
-*.INI text eol=crlf
-*.inf text eol=crlf
-*.inf.tpl text eol=crlf
-*.js text eol=crlf
-*.manifest text eol=crlf
-*.mc text eol=crlf
-*.mof text eol=crlf
-*.rgs text eol=crlf
-*.sif text eol=crlf
-*.vbs text eol=crlf
-*.vcxproj text eol=crlf
-*.xml text eol=crlf
-
-# Files with these extensions are accepted binary files inside the ReactOS
-# tree. Git must not tamper with them at all!
-*.avi binary
-*.bin binary
-*.bmf binary
-*.bmp binary
-*.BMP binary
-*.chm binary
-*.cur binary
-*.dll binary
-*.emf binary
-*.gif binary
-*.ico binary
-*.jpg binary
-*.mp3 binary
-*.nls binary
-*.otf binary
-*.pdn binary
-*.pfb binary
-*.pfm binary
-*.png binary
-*.psd binary
-*.ttc binary
-*.ttf binary
-*.wav binary
-*.xcf binary
-
-# All other extensions not explicitly mentioned here are left for Git to
-# handle automatically.
-# You must not rely on them having a particular line ending style!

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,13 +0,0 @@
-## Purpose
-
-_Do a quick recap of your work here._
-
-JIRA issue: [CORE-XXXX](https://jira.reactos.org/browse/CORE-XXXX)
-
-## Proposed changes
-- 
-- 
-
-## TODO
-- [ ] Task 1
-- [ ] Task 2

.gitignore

@@ -1,2 +0,0 @@
-output-*
-modules/optional

.travis.yml

@@ -1,12 +0,0 @@
-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 && cd reactos && ninja -k 0 && ninja bootcd' > tmp_file
-
-script:
-  - ./RosBEBinFull/RosBE.sh < tmp_file

CMakeLists.txt

@@ -16,15 +16,10 @@ if(POLICY CMP0051)
     cmake_policy(SET CMP0051 NEW)
 endif()
 
-if(POLICY CMP0058)
-    # Ninja requires custom command byproducts to be explicit
-    cmake_policy(SET CMP0058 OLD)
-endif()
-
 project(REACTOS)
 
 # Versioning
-include(sdk/include/reactos/version.cmake)
+include(include/reactos/version.cmake)
 
 # Don't escape preprocessor definition values added via add_definitions
 cmake_policy(SET CMP0005 OLD)
@@ -40,6 +35,7 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE)
 set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE)
 set(CMAKE_COLOR_MAKEFILE OFF)
 #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
+set(CMAKE_SKIP_INSTALL_RULES ON)
 
 if(NOT DEFINED NEW_STYLE_BUILD)
     set(NEW_STYLE_BUILD TRUE)
@@ -57,15 +53,15 @@ string(TOLOWER ${ARCH} ARCH)
 
 # Compile options
 if(ARCH STREQUAL "i386")
-    include(sdk/cmake/config.cmake)
+    include(cmake/config.cmake)
 elseif(ARCH STREQUAL "amd64")
-    include(sdk/cmake/config-amd64.cmake)
+    include(cmake/config-amd64.cmake)
 elseif(ARCH STREQUAL "arm")
-    include(sdk/cmake/config-arm.cmake)
+    include(cmake/config-arm.cmake)
 endif()
 
 # Compiler flags handling
-include(sdk/cmake/compilerflags.cmake)
+include(cmake/compilerflags.cmake)
 
 add_definitions(-D__REACTOS__)
 
@@ -80,7 +76,7 @@ if(NOT MSVC_IDE)
 endif()
 
 # Bison and Flex support
-# include(sdk/cmake/bison-flex.cmake)
+# include(cmake/bison-flex.cmake)
 
 if(NOT CMAKE_CROSSCOMPILING)
 
@@ -98,28 +94,30 @@ if(NOT CMAKE_CROSSCOMPILING)
             add_definitions(/D_ALLOW_KEYWORD_MACROS)
         endif()
         add_definitions(/Dinline=__inline)
+    else()
+        add_compile_flags("-fshort-wchar -Wno-multichar")
     endif()
 
-    include_directories(sdk/include/host)
+    include_directories(include/host)
 
     if(NOT MSVC)
         add_subdirectory(dll/win32/dbghelp)
     endif()
-    add_subdirectory(sdk/tools)
-    add_subdirectory(sdk/lib)
+    add_subdirectory(tools)
+    add_subdirectory(lib)
 
     if(NOT NEW_STYLE_BUILD)
         if(NOT MSVC)
-            export(TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc rsym mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc rsym mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
         else()
-            export(TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
         endif()
     endif()
 
 else()
 
     if(NEW_STYLE_BUILD)
-        include(sdk/cmake/host-tools.cmake)
+        include(cmake/host-tools.cmake)
     endif()
 
     # Print build type
@@ -209,61 +207,59 @@ else()
     enable_language(RC)
 
     # Localization definitions
-    include(sdk/cmake/localization.cmake)
+    include(cmake/localization.cmake)
     set(I18N_DEFS "")
     # This will set I18N_DEFS for later use
     set_i18n_language(${I18N_LANG})
 
     # Compiler specific definitions and macros
     if(MSVC)
-        include(sdk/cmake/msvc.cmake)
+        include(cmake/msvc.cmake)
     else()
-        include(sdk/cmake/gcc.cmake)
+        include(cmake/gcc.cmake)
     endif()
 
     # Generic macros
-    include(sdk/cmake/CMakeMacros.cmake)
+    include(cmake/CMakeMacros.cmake)
 
     # IDL macros for widl/midl
     # We're using widl now for both MSVC and GCC builds
-    include(sdk/cmake/widl-support.cmake)
+    include(cmake/widl-support.cmake)
 
     include_directories(
-        sdk/include
-        sdk/include/psdk
-        sdk/include/dxsdk
-        ${REACTOS_BINARY_DIR}/sdk/include
-        ${REACTOS_BINARY_DIR}/sdk/include/psdk
-        ${REACTOS_BINARY_DIR}/sdk/include/dxsdk
-        ${REACTOS_BINARY_DIR}/sdk/include/ddk
-        ${REACTOS_BINARY_DIR}/sdk/include/reactos
-        ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc
-        sdk/include/crt
-        sdk/include/ddk
-        sdk/include/ndk
-        sdk/include/reactos
-        sdk/include/reactos/libs)
+        include
+        include/psdk
+        include/dxsdk
+        ${REACTOS_BINARY_DIR}/include
+        ${REACTOS_BINARY_DIR}/include/psdk
+        ${REACTOS_BINARY_DIR}/include/dxsdk
+        ${REACTOS_BINARY_DIR}/include/ddk
+        ${REACTOS_BINARY_DIR}/include/reactos
+        include/crt
+        include/ddk
+        include/ndk
+        include/reactos
+        include/reactos/libs)
 
     if(ARCH STREQUAL "arm")
-        include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/arm)
+        include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm)
     endif()
 
     add_dependency_header()
 
-    add_subdirectory(sdk/include/ndk/tests)
-    add_subdirectory(sdk/include/xdk)
-    add_subdirectory(sdk/include/psdk)
-    add_subdirectory(sdk/include/dxsdk)
-    add_subdirectory(sdk/include/reactos/wine)
-    add_subdirectory(sdk/include/reactos/mc)
-    add_subdirectory(sdk/include/asm)
+    add_subdirectory(include/xdk)
+    add_subdirectory(include/psdk)
+    add_subdirectory(include/dxsdk)
+    add_subdirectory(include/reactos/wine)
+    add_subdirectory(include/reactos/mc)
+    add_subdirectory(include/asm)
 
     if(NO_ROSSYM)
-        include(sdk/cmake/baseaddress_dwarf.cmake)
+        include(cmake/baseaddress_dwarf.cmake)
     elseif(MSVC)
-        include(sdk/cmake/baseaddress_msvc.cmake)
+        include(cmake/baseaddress_msvc.cmake)
     else()
-        include(sdk/cmake/baseaddress.cmake)
+        include(cmake/baseaddress.cmake)
     endif()
 
     # For MSVC builds, this puts all debug symbols file in the same directory.
@@ -275,12 +271,12 @@ else()
     add_subdirectory(dll)
     add_subdirectory(drivers)
     add_subdirectory(hal)
-    add_subdirectory(sdk/lib)
+    add_subdirectory(lib)
     add_subdirectory(media)
     add_subdirectory(modules)
     add_subdirectory(ntoskrnl)
     add_subdirectory(subsystems)
-    add_subdirectory(sdk/tools/wpp)
+    add_subdirectory(tools/wpp)
     add_subdirectory(win32ss)
 
     # Create the registry hives
@@ -289,7 +285,7 @@ else()
     # Create {bootcd, livecd, bootcdregtest}.lst
     create_iso_lists()
 
-    file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/sdk/include/reactos)
+    file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)
 
     add_dependency_footer()
 endif()

CONTRIBUTING.md

@@ -1,93 +0,0 @@
-# How To Contribute
-
-There are several ways to contribute to the development of ReactOS. The most often encountered problem is not knowing where to begin or what to do. If you are able to program or understand the technical information that is pertinent to this project, helping the development can be easy.
-
-- [What To Do?](#what-to-do?)
-- [How To Contribute?](#how-to-contribute?)
-- [Where To Start?](#where-to-start?)
-
-## What To Do?
-
-### Fix bugs
-
-You can try to fix a few bugs that are already listed in [JIRA]. Squashing bugs is not a simple task. It requires a lot more skill than simply searching for them, and can be time consuming; however, by doing that you greatly help ReactOS become a stable system.
-
-_NOTE: patches related to 3rd party code such as Wine or BtrFS should be sent to upstream of the said projects. See [3rd Party Files.txt], [README.WINE] and [README.FSD] in [media/doc](media/doc) for details._
-
-### Fix tests
-
-Tests are used to check the functionality and correctness of APIs on ReactOS compared to Windows implementations. There are some unit tests that you could help ReactOS pass, which can be found [in the Web Test Manager][testman] and some that are broken or yet to be written.
-
-### Fix Coverity scans
-
-[Coverity] is enhanced static analysis that uncovers leaks, buffer overflows, security issues and other. We do such scans on ReactOS codebase pretty often. You can [request][request-coverity] to see Coverity 'defects' and help to fix them.
-
-### Test ReactOS
-
-By localizing bugs, developers can identify what causes the bug and which part it affects. There are a variety of methods to [debug] ReactOS while testing it. After identifying a bug, check if it is already known about by searching on JIRA and adding any additional information to the report. If you think that it is an unidentified bug, consider [filing a bug report].
-
-### Implement new things
-
-Considering ReactOS is alpha quality software, there is a lot of [missing functionality] that Windows operating systems have. Before starting a project to implement something, find out whether another person is working on the same thing. If you find that someone is already working on it, ask if any assistance is needed for what specifically is being worked on or a related project. More often than not, someone will start to implement something and move onto something else before it's complete. Make sure you stay committed to what you are going to implement, and do not be afraid to ask for assistance if you need help with something.
-
-### Write documentation
-
-There are some important points if you would like to help document ReactOS:
-
-1. Make sure the documentation does not exist yet (if it does, help improve it).
-2. Respect [clean room reverse engineering] practices.
-3. Add your knowledge to a place where the other developers can find it.
-
-## How To Contribute?
-
-Your contribution can be of numerous forms. We currently accept two ways to contribute - Pull Requests and Patches.
-
-### Pull Requests
-
-Since our [migration to GitHub] we gladly accept __[Pull Requests]__. Pull requests let you tell others about changes you have pushed to a repository on GitHub. Once a pull request is opened, you can discuss and review the potential changes with collaborators and add follow-up commits before the changes are merged into the repository. __Pull request is a prefered way to submit your work__ - it makes reviewing and merging your contribution much easier.
-
-### 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. 
-
-See [Submitting Patches] for details.
-
-### Rules and Recommendations
-
-- *Use your __real name__ and __real email__.* We do not accept anonymous contributions!
-- *Ensure your contribution is properly described.* Include the relevant issue number if applicable.
-- *Put only related changes.* It will make reviewing easier as the reviewer needs to recall less information about the existing source code that is changed.
-- *Search for similar pull requests/patches before submitting.* It may be that a similar pull request or issue was opened previously. Comment and review on that one instead.
-- *Keep your contribution small and focused on the topic.* It can be tempting to fix existing issues as you come across them while reading the source code. Resist the temptation and put in a note in the source code instead, or (even better) put the issue in the issue tracking system.
-- *Respect our __[Coding Style]__ and __[Programming Guidelines]__.*
-- *Do not be afraid to ask questions.* Ask our developers on JIRA or [IRC] channel.
-
-## Where To Start?
-
-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://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>
-
-  [clean room reverse engineering]:                              https://en.wikipedia.org/wiki/Clean_room_design
-  [debug]:                                                       https://reactos.org/wiki/Debugging
-  [JIRA]:                                                        https://jira.reactos.org/
-  [filing a bug report]:                                         https://reactos.org/wiki/File_Bugs
-  [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://drupal.org/patch/review
-  [missing functionality]:                                       https://reactos.org/wiki/Missing_ReactOS_Functionality
-  [patch]:                                                       https://git-scm.com/docs/git-format-patch
-  [Submitting Patches]:                                          https://reactos.org/wiki/Submitting_Patches
-  [Coding Style]:                                                https://reactos.org/wiki/Coding_Style
-  [IRC]:                                                         https://reactos.org/wiki/Connect_to_the_ReactOS_IRC_Channels
-  [Programming Guidelines]:                                      https://reactos.org/wiki/Programming_Guidelines
-  [3rd Party Files.txt]:                                         /media/doc/3rd_Party_Files.txt
-  [README.WINE]:                                                 /media/doc/README.WINE
-  [README.FSD]:                                                  /media/doc/README.FSD
-  [Coverity]:                                                    https://scan.coverity.com/projects/reactos
-  [request-coverity]:                                            https://scan.coverity.com/memberships/new?project_id=reactos

PreLoad.cmake

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

README

@@ -0,0 +1,32 @@
+========================
+ReactOS<EFBFBD> Version 0.4.x
+Updated January 5, 2016
+========================
+
+1. What is ReactOS?
+-------------------
+
+ReactOS<EFBFBD> is an Open Source effort to develop a quality operating system that is
+compatible with applications and drivers written for the Microsoft<66> Windows<77> 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.
+
+More information is available at: http://www.reactos.org
+
+2. Building ReactOS
+-------------------
+
+See the INSTALL file for more details.
+
+3. More information
+-------------------
+
+See the media\doc subdirectory for some sparse notes.
+
+4. Who is responsible
+---------------------
+
+See the CREDITS file.

README.md

@@ -1,112 +0,0 @@
-# ReactOS Project [![release.badge]][release.link] [![sfstats.badge]][sfstats.link] [![travis.badge]][travis.link] [![appveyor.badge]][appveyor.link]
-
-<p align=center>
-<img src="https://reactos.org/wiki/images/0/02/ReactOS_logo.png">
-</p>
-
-[![license.badge]][license.link] [![ghcontrib.badge]][ghcontrib.link] [![ghstats.badge]][ghstats.link] [![commits.badge]][commits.link] [![coverity.badge]][coverity.link] 
-
-## Quick Links
-
-- [Website](https://reactos.org)
-- [Wiki](https://reactos.org/wiki)
-- [Forum](https://reactos.org/forum)
-- [JIRA Bug Tracker](https://jira.reactos.org/issues)
-- [ReactOS Git mirror](https://git.reactos.org)
-- [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, 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://spdx.org/licenses/GPL-2.0+.html).
-
-## Building [![rosbewin.badge]][rosbewin.link] [![rosbeunix.badge]][rosbeunix.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: http://www.reactos.org/wiki/Build_Environment.
-
-Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+. Building with MSVC is covered here: https://www.reactos.org/wiki/Building_with_MSVC.
-
-### Binaries
-
-To build ReactOS you must run the `configure` script in the directory you want to have your build files. Choose `configure.cmd` or `configure.sh` depending on your system. Then run `ninja <modulename>` to build a module you want or just `ninja` to build all modules.
-
-### 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`.
-
-See ["Building ReactOS"](http://www.reactos.org/wiki/Building_ReactOS) for more details.
-
-## Installing
-
-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.
-
-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://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 many information as possible. 
-
-See ["File Bugs"](https://www.reactos.org/wiki/File_Bugs) for a guide.
-
-__NOTE:__ The bug tracker is _not_ for discussions. Please use `#reactos` Freenode IRC channel or our [forum](https://reactos.org/forum).
-
-## Contributing
-
-We are always looking for developers! Check [how to contribute](CONTRIBUTING.md) if you are willing to participate.
-
-## More information
-
-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. 
-
-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: https://www.reactos.org.
-
-Also see the [media/doc](/media/doc/) subdirectory for some sparse notes.
-
-## Who is responsible
-
-Active devs are listed as members of [GitHub organization](https://github.com/orgs/reactos/people). 
-See also the [CREDITS](CREDITS) file for others.
-
-## Code mirrors
-
-The main development is done on [GitHub](https://github.com/reactos/reactos). We have an [alternative mirror](https://git.reactos.org/) in case GitHub is down. 
-
-There is also an obsolete [SVN archive repository](https://svn.reactos.org/svn/reactos?view=revision) 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
-[commits.badge]:    https://img.shields.io/github/commits-since/reactos/reactos/0.4.7-dev.svg
-[release.badge]:    https://img.shields.io/badge/release-0.4.6-brightgreen.svg
-[license.badge]:    https://img.shields.io/badge/license-GNU_GPL_2.0+-blue.svg
-[sfstats.badge]:    https://img.shields.io/sourceforge/dm/reactos.svg
-[ghstats.badge]:    https://img.shields.io/github/commit-activity/4w/reactos/reactos.svg
-[ghcontrib.badge]:  https://img.shields.io/github/contributors/reactos/reactos.svg
-[rosbewin.badge]:   https://img.shields.io/badge/RosBE_Windows-2.1.5-blue.svg   
-[rosbeunix.badge]:  https://img.shields.io/badge/RosBE_Unix-2.1.2-blue.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
-[commits.link]:     https://github.com/reactos/reactos/commits/master
-[release.link]:     https://sourceforge.net/projects/reactos/files/ReactOS/0.4.6
-[license.link]:     https://spdx.org/licenses/GPL-2.0+.html
-[sfstats.link]:     https://sourceforge.net/projects/reactos
-[ghstats.link]:     https://github.com/reactos/reactos/graphs/commit-activity
-[ghcontrib.link]:   https://github.com/reactos/reactos/graphs/contributors
-[rosbewin.link]:    https://sourceforge.net/projects/reactos/files/RosBE-Windows/i386/2.1.5/
-[rosbeunix.link]:   https://sourceforge.net/projects/reactos/files/RosBE-Unix/2.1.2/

base/applications/CMakeLists.txt

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

base/applications/atactl/atactl.cpp

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

base/applications/cacls/CMakeLists.txt

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

base/applications/cacls/cacls.c

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

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

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

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

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

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

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

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

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

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

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

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

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

base/applications/cacls/precomp.h

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

base/applications/calc/CMakeLists.txt

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

base/applications/calc/about.c

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

base/applications/calc/calc.h

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

base/applications/calc/convert.c

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

base/applications/calc/help.txt

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -290,6 +290,22 @@ BEGIN
     DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE
 END
 
+IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS 電卓について"
+FONT 9, "MS UI Gothic"
+BEGIN
+    DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16
+    CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE |
+            SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48
+    LTEXT "ReactOS 電卓", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE
+    LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE
+    LTEXT "Written by Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE
+    GROUPBOX "", IDC_STATIC, 112, 0, 148, 52
+    GROUPBOX "", IDC_STATIC, 5, 56, 256, 88
+    EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL
+END
+
 IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Statistics box"
@@ -397,17 +413,11 @@ END
 
 STRINGTABLE
 BEGIN
+    IDS_STRING_LICENSE "ReactOS 電卓はGNU GPLライセンスの元で提供されるフリーソフトウェアです。\r\n\r\nこちらでGNU GPLライセンスのコピーを得ることができます:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nこちらでGNU GPLライセンスの翻訳を得ることができます:\r\nhttp://www.gnu.org/licenses/translations.html"
     IDS_MATH_ERROR "エラー"
     IDS_QUICKHELP "クイックヘルプ"
 END
 
-/* About */
-STRINGTABLE
-BEGIN
-    IDS_CALC_NAME "ReactOS 電卓"
-    IDS_AUTHOR "Written by Carlo Bramini"
-END
-
 /* Types of conversion */
 STRINGTABLE
 BEGIN
@@ -491,15 +501,12 @@ BEGIN
     IDS_CURRENCY_CZECH_KORUNA "チェコ コルナ"
     IDS_CURRENCY_DEUTSCHE_MARK "ドイツ マルク"
     IDS_CURRENCY_DUTCH_GUILDER "オランダ ギルダー"
-    IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon"
     IDS_CURRENCY_EURO "ユーロ"
     IDS_CURRENCY_FINNISH_MARKKA "フィンランド マルッカ"
     IDS_CURRENCY_FRENCH_FRANC "フランス フラン"
     IDS_CURRENCY_GREEK_DRACHMA "ギリシャ ドラクマ"
     IDS_CURRENCY_IRISH_POUND "アイルランド ポンド"
     IDS_CURRENCY_ITALIAN_LIRA "イタリア リラ"
-    IDS_CURRENCY_LATVIAN_LATS "Latvian lats"
-    IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas"
     IDS_CURRENCY_LUXEMBOURG_FRANC "ルクセンブルク フラン"
     IDS_CURRENCY_MALTESE_LIRA "マルタ リラ"
     IDS_CURRENCY_PORTOGUESE_ESCUDO "ポルトガル エスクード"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

base/applications/calc/resource.h

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

base/applications/calc/resource.rc

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

base/applications/calc/rpn.c

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

base/applications/calc/rpn_mpfr.c

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

base/applications/calc/utl.c

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

base/applications/calc/utl_mpfr.c

@@ -39,7 +39,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
             width = 1 + mpfr_get_si(t, MPFR_DEFAULT_RND);
             mpfr_clear(t);
         }
-        if ((calc.sci_out != FALSE) || (width > max_ld_width) || (width < -max_ld_width))
+        if (calc.sci_out == TRUE || width > max_ld_width || width < -max_ld_width)
             ptr = temp + gmp_sprintf(temp, "%*.*#Fe", 1, max_ld_width, ff);
         else {
             ptr = temp + gmp_sprintf(temp, "%#*.*Ff", width, ((max_ld_width-width-1)>=0) ? max_ld_width-width-1 : 0, ff);

base/applications/calc/whatsnew.txt

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

base/applications/calc/winmain.c

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

base/applications/charmap/charmap.c

@@ -24,10 +24,6 @@ HICON     hSmIcon;
 HICON     hBgIcon;
 SETTINGS  Settings;
 
-/* GetUName prototype */
-typedef int (WINAPI * GETUNAME)(WORD wCharCode, LPWSTR lpbuf);
-GETUNAME GetUName;
-
 /* Font-enumeration callback */
 static
 int
@@ -261,20 +257,6 @@ UpdateSettings(HWND hDlg)
 }
 #endif
 
-VOID
-UpdateStatusBar(WCHAR wch)
-{
-    WCHAR buff[MAX_PATH];
-    WCHAR szDesc[MAX_PATH];
-
-    if (GetUName)
-    {
-        GetUName(wch, szDesc);
-        wsprintfW(buff, L"U+%04X: %s", wch, szDesc);
-        SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)buff);
-    }
-}
-
 static
 void
 ChangeView(HWND hWnd)
@@ -589,7 +571,6 @@ wWinMain(HINSTANCE hInst,
     INT Ret = 1;
     HMODULE hRichEd20;
     MSG Msg;
-    HINSTANCE hGetUName = NULL;
 
     hInstance = hInst;
 
@@ -597,18 +578,6 @@ wWinMain(HINSTANCE hInst,
     iccx.dwICC = ICC_TAB_CLASSES;
     InitCommonControlsEx(&iccx);
 
-    /* Loading the GetUName function */
-    hGetUName = LoadLibraryW(L"getuname.dll");
-    if (hGetUName != NULL)
-    {
-        GetUName = (GETUNAME) GetProcAddress(hGetUName, "GetUName");
-        if (GetUName == NULL)
-        {
-            FreeLibrary(hGetUName);
-            hGetUName = NULL;
-        }
-    }
-
     if (RegisterMapClasses(hInstance))
     {
         hRichEd20 = LoadLibraryW(L"RICHED20.DLL");
@@ -634,8 +603,5 @@ wWinMain(HINSTANCE hInst,
         UnregisterMapClasses(hInstance);
     }
 
-    if (hGetUName != NULL)
-        FreeLibrary(hGetUName);
-
     return Ret;
 }

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

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

base/applications/charmap/lrgcell.c

@@ -140,7 +140,6 @@ LrgCellWndProc(HWND hwnd,
             EndPaint(hwnd,
                      &ps);
 
-            UpdateStatusBar(infoPtr->pActiveCell->ch);
             break;
         }
 

base/applications/charmap/map.c

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

base/applications/charmap/precomp.h

@@ -74,7 +74,6 @@ BOOL RegisterMapClasses(HINSTANCE hInstance);
 VOID UnregisterMapClasses(HINSTANCE hInstance);
 
 /* charmap.c */
-VOID UpdateStatusBar(WCHAR wch);
 extern VOID ChangeMapFont(HWND hDlg);
 
 /* settings.c */

base/applications/charmap/settings.c

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

base/applications/charmap_new/CMakeLists.txt

@@ -8,7 +8,7 @@ if(NOT MSVC)
 endif()
 
 include_directories(
-    ${REACTOS_SOURCE_DIR}/sdk/lib/atl 
+    ${REACTOS_SOURCE_DIR}/lib/atl 
     includes)
 
 list(APPEND SOURCE

base/applications/charmap_new/GridView.cpp

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

base/applications/charmap_new/charmap.cpp

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

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

@@ -1,22 +0,0 @@
-LANGUAGE LANG_POLISH, 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 "Tablica znaków ReactOS"
-BEGIN
-    LTEXT "Czcionka:", 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 "Znaki do skopiowania:", 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 "Wybierz", IDC_SELECT, 194, 186, 44, 13
-    PUSHBUTTON "Kopiuj", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-END
-
-STRINGTABLE
-BEGIN
-    IDS_ABOUT "&Informacje..."
-    IDS_TITLE "Tablica znaków"
-END

base/applications/clipbrd/clipbrd.c

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

base/applications/clipbrd/clipbrd.rc

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

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

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

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

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

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

@@ -1,65 +0,0 @@
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
-ID_ACCEL ACCELERATORS
-BEGIN
-    VK_DELETE, CMD_DELETE, VIRTKEY
-END
-
-MAIN_MENU MENU
-BEGIN
-    POPUP "&Plik"
-    BEGIN
-        MENUITEM "&Otwórz...", CMD_OPEN
-        MENUITEM "Zapisz &jako...", CMD_SAVE_AS
-        MENUITEM SEPARATOR
-        MENUITEM "Za&kończ", CMD_EXIT
-    END
-    POPUP "&Edycja"
-    BEGIN
-        MENUITEM "&Usuń\tDel", CMD_DELETE
-    END
-    POPUP "&Widok"
-    BEGIN
-        MENUITEM "&Automatycznie", CMD_AUTOMATIC
-    END
-    POPUP "&Pomoc"
-    BEGIN
-        MENUITEM "&Tematy Pomocy", CMD_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "&Informacje", CMD_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    STRING_CLIPBOARD "Podgląd Wieloschowka"
-    STRING_CLIPFILE  "Element Wieloschowka"
-    STRING_DELETE_MSG "Czy chcesz wyczyścić zawartość Schowka?"
-    STRING_DELETE_TITLE "Wyczyść Schowek"
-    STRING_FORMAT_NT "Pliki Schowka NT (*.clp)"
-    STRING_FORMAT_GEN "Pliki Schowka (*.clp)"
-END
-
-STRINGTABLE
-BEGIN
-    STRING_CF_UNKNOWN "Unknown Format"
-    STRING_CF_TEXT "Text"
-    STRING_CF_BITMAP "Bitmap"
-    STRING_CF_OEMTEXT "OEM Text"
-    STRING_CF_UNICODETEXT "Unicode Text"
-    STRING_CF_DIB "DIB Bitmap"
-    STRING_CF_LOCALE "Locale Data"
-    STRING_CF_ENHMETAFILE "Enhanced Metafile"
-    STRING_CF_METAFILEPICT "Metafile"
-    STRING_CF_PALETTE "Color Palette"
-    STRING_CF_DIBV5 "DIB Bitmap (Version 5)"
-    STRING_CF_SYLK "Symbolic Link Format"
-    STRING_CF_DIF "Data Interchange Format"
-    STRING_CF_HDROP "Drop Data"
-END
-
-STRINGTABLE
-BEGIN
-    ERROR_UNSUPPORTED_FORMAT "Schowek zawiera dane w formacie, w którym nie mogą być wyświetlone."
-    ERROR_INVALID_FILE_FORMAT "Wybrany plik nie jest prawidłowym plikiem Schowka."
-END

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

@@ -33,8 +33,8 @@ END
 
 STRINGTABLE
 BEGIN
-    STRING_CLIPBOARD "Inspector de Clipboard"
-    STRING_CLIPFILE  "Element de Clipboard"
+    STRING_CLIPBOARD "Clipboard Viewer"
+    STRING_CLIPFILE  "Clipboard Element"
     STRING_DELETE_MSG "Elimină conținutul din Clipboard?"
     STRING_DELETE_TITLE "Curăță Clipboard"
     STRING_FORMAT_NT "Fișiere clipboard pentru ReactOS (*.clp)"

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

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

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

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

base/applications/clipbrd/scrollutils.c

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

base/applications/clipbrd/scrollutils.h

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

base/applications/clipbrd/winutils.c

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

base/applications/cmdutils/CMakeLists.txt

@@ -1,24 +1,17 @@
-add_subdirectory(at)
-add_subdirectory(chcp)
 add_subdirectory(clip)
 add_subdirectory(comp)
 add_subdirectory(cscript)
 add_subdirectory(dbgprint)
 add_subdirectory(doskey)
-add_subdirectory(eventcreate)
 add_subdirectory(find)
-add_subdirectory(fsutil)
 add_subdirectory(help)
 add_subdirectory(hostname)
 add_subdirectory(lodctr)
 add_subdirectory(mode)
-add_subdirectory(mofcomp)
 add_subdirectory(more)
 add_subdirectory(reg)
-add_subdirectory(schtasks)
 add_subdirectory(sort)
 add_subdirectory(taskkill)
-add_subdirectory(timeout)
 add_subdirectory(tree)
 add_subdirectory(whoami)
 add_subdirectory(wmic)

base/applications/cmdutils/at/CMakeLists.txt

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

base/applications/cmdutils/at/at.c

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

base/applications/cmdutils/at/at.rc

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

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

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

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

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

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

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

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

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

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

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

base/applications/cmdutils/at/resource.h

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

base/applications/cmdutils/chcp/CMakeLists.txt

@@ -1,9 +0,0 @@
-
-include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
-
-add_executable(chcp chcp.c chcp.rc)
-set_module_type(chcp win32cui UNICODE)
-target_link_libraries(chcp conutils ${PSEH_LIB})
-add_importlibs(chcp msvcrt kernel32)
-set_target_properties(chcp PROPERTIES SUFFIX ".com")
-add_cd_file(TARGET chcp DESTINATION reactos/system32 FOR all)

base/applications/cmdutils/chcp/chcp.c

@@ -1,95 +0,0 @@
-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS Change CodePage Command
- * FILE:            base/applications/cmdutils/chcp/chcp.c
- * PURPOSE:         Displays or changes the active console input and output codepages.
- * PROGRAMMERS:     Eric Kohl
- *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
- */
-/*
- * CHCP.C - chcp internal command.
- *
- * 23-Dec-1998 (Eric Kohl)
- *     Started.
- *
- * 02-Apr-2005 (Magnus Olsen <magnus@greatlord.com>)
- *     Remove all hardcoded strings in En.rc
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wincon.h>
-
-#include <conutils.h>
-
-#include "resource.h"
-
-// INT CommandChcp(LPTSTR cmd, LPTSTR param)
-int wmain(int argc, WCHAR* argv[])
-{
-    UINT uOldCodePage, uNewCodePage;
-
-    /* Initialize the Console Standard Streams */
-    ConInitStdStreams();
-
-    /* Print help */
-    if (argc > 1 && wcscmp(argv[1], L"/?") == 0)
-    {
-        ConResPuts(StdOut, STRING_CHCP_HELP);
-        return 0;
-    }
-
-    if (argc == 1)
-    {
-        /* Display the active code page number */
-        ConResPrintf(StdOut, STRING_CHCP_ERROR1, GetConsoleOutputCP());
-        return 0;
-    }
-
-    if (argc > 2)
-    {
-        /* Too many parameters */
-        ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[2]);
-        return 1;
-    }
-
-    uNewCodePage = (UINT)_wtoi(argv[1]);
-
-    if (uNewCodePage == 0)
-    {
-        ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[1]);
-        return 1;
-    }
-
-    /*
-     * Save the original console codepage to be restored in case
-     * SetConsoleCP() or SetConsoleOutputCP() fails.
-     */
-    uOldCodePage = GetConsoleCP();
-
-    /*
-     * Try changing the console input codepage. If it works then also change
-     * the console output codepage, and refresh our local codepage cache.
-     */
-    if (SetConsoleCP(uNewCodePage))
-    {
-        if (SetConsoleOutputCP(uNewCodePage))
-        {
-            /* Display the active code page number */
-            ConResPrintf(StdOut, STRING_CHCP_ERROR1, GetConsoleOutputCP());
-            return 0;
-        }
-        else
-        {
-            /* Failure, restore the original console codepage */
-            SetConsoleCP(uOldCodePage);
-        }
-    }
-
-    /* An error happened, display an error and bail out */
-    ConResPuts(StdErr, STRING_CHCP_ERROR4);
-    return 1;
-}

base/applications/cmdutils/chcp/chcp.rc

@@ -1,77 +0,0 @@
-#include <windef.h>
-
-#include "resource.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Change CodePage Command"
-#define REACTOS_STR_INTERNAL_NAME       "chcp"
-#define REACTOS_STR_ORIGINAL_FILENAME   "chcp.com"
-#include <reactos/version.rc>
-
-/* UTF-8 */
-#pragma code_page(65001)
-
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_HU_HU
-    #include "lang/hu-HU.rc"
-#endif
-#ifdef LANGUAGE_ID_ID
-    #include "lang/id-ID.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_JA_JP
-    #include "lang/ja-JP.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.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_SV_SE
-    #include "lang/sv-SE.rc"
-#endif
-#ifdef LANGUAGE_SQ_AL
-    #include "lang/sq-AL.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_TW
-    #include "lang/zh-TW.rc"
-#endif

base/applications/cmdutils/chcp/lang/cs-CZ.rc

@@ -1,17 +0,0 @@
-/* FILE:       base/shell/cmd/lang/cs-CZ.rc
- * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
- * UPDATED:    2015-04-12
- */
-
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Specifies the active code page number.\n\n\
-Type CHCP without a parameter to display the active code page number.\n"
-    STRING_CHCP_ERROR1 "Aktivní znaková stránka: %u\n"
-    STRING_CHCP_ERROR4 "Neplatná znaková stránka\n"
-    STRING_ERROR_INVALID_PARAM_FORMAT "Neplatný formát parametru - %s\n"
-END

base/applications/cmdutils/chcp/lang/de-DE.rc

@@ -1,14 +0,0 @@
-/* German language file by Klemens Friedl <frik85> 2005-06-03 */
-
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    STRING_CHCP_HELP "Zeigt die aktuelle Codepage an oder wechselt diese.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Codepage angeben.\n\n\
-Der Befehl CHCP ohne Parameter zeigt die Nummer der aktuellen Codepage an."
-    STRING_CHCP_ERROR1 "Aktive Codepage: %u\n"
-    STRING_CHCP_ERROR4 "Ungültige Codepage\n"
-    STRING_ERROR_INVALID_PARAM_FORMAT "Ungültiges Parameterformat - %s\n"
-END

base/applications/cmdutils/chcp/lang/el-GR.rc

@@ -1,17 +0,0 @@
-/*
- * Αρχική έκδοση - Ημιτελής.
- * Ελληνική μετάφραση - Απόστολος Αλεξιάδης
- */
-
-LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
-
-STRINGTABLE
-BEGIN
-    STRING_CHCP_HELP "Εμφανίζει ή ορίζει τον αριθμό της ενεργού κωδικοσελίδας.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Καθορίζει έναν αριθμό κωδικοσελίδας.\n\n\
-Πληκτρολογήστε CHCP χωρίς παράμετρο, για να εμφανιστεί ο τρέχων αριθμός κωδικοσελίδας.\n"
-    STRING_CHCP_ERROR1 "Active code page: %u\n"
-    STRING_CHCP_ERROR4 "Invalid code page\n"
-    STRING_ERROR_INVALID_PARAM_FORMAT "Μη έγκυρο φορμά παραμέτρου - %s\n"
-END

base/applications/cmdutils/chcp/lang/en-US.rc

@@ -1,12 +0,0 @@
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-STRINGTABLE
-BEGIN
-    STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Specifies the active code page number.\n\n\
-Type CHCP without a parameter to display the active code page number.\n"
-    STRING_CHCP_ERROR1 "Active code page: %u\n"
-    STRING_CHCP_ERROR4 "Invalid code page\n"
-    STRING_ERROR_INVALID_PARAM_FORMAT "Invalid parameter format - %s\n"
-END

base/applications/cmdutils/chcp/lang/es-ES.rc

@@ -1,14 +0,0 @@
-/* Spanish translation by HUMA2000, Jose Pedro Fernández Pascual e Ismael Ferreras Morezuelas (Swyter) */
-
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    STRING_CHCP_HELP "Muestra o configura el número de página de código activa.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Especifica el número de página de código activa.\n\n\
-Escribe CHCP sin ningún parámetro para mostrar el código de página activo.\n"
-    STRING_CHCP_ERROR1 "Página codificación activa: %u\n"
-    STRING_CHCP_ERROR4 "Código de página inválido\n"
-    STRING_ERROR_INVALID_PARAM_FORMAT "Formato de parámetro erróneo - %s\n"
-END

base/applications/cmdutils/chcp/lang/fr-FR.rc

@@ -1,14 +0,0 @@
-/* French translation by Sylvain Pétréolle, Pierre Schweitzer */
-
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-STRINGTABLE
-BEGIN
-    STRING_CHCP_HELP "Affiche ou change la page de codes active.\n\n\
-CHCP [nnn]\n\n\
-  nnn   Indique la page de codes.\n\n\
-Taper CHCP sans paramètre pour afficher la page de codes active."
-    STRING_CHCP_ERROR1 "Page de codes actuelle : %u\n"
-    STRING_CHCP_ERROR4 "Page de codes invalide \n"
-    STRING_ERROR_INVALID_PARAM_FORMAT "Format de paramètre incorrect - %s\n"
-END